From 267c56d191a37aa1f412cdb7c07721bb9a12b54f Mon Sep 17 00:00:00 2001 From: Larry Madrigal Date: Thu, 25 Sep 2014 10:38:11 -0700 Subject: [PATCH 0001/5486] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000000..f7461575d8 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +recipes +======= From 2050b371fa487cb82e11e3b58d19edc92a19efc8 Mon Sep 17 00:00:00 2001 From: Larry Madrigal Date: Thu, 25 Sep 2014 10:38:53 -0700 Subject: [PATCH 0002/5486] Add content to README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f7461575d8..f2ecec2b9d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ -recipes -======= +# Recipes + +This repository contains recipes for some foods I like. From b36125034401bc8c6d3984c032f400f157a32c48 Mon Sep 17 00:00:00 2001 From: Larry Madrigal Date: Thu, 25 Sep 2014 11:08:01 -0700 Subject: [PATCH 0003/5486] Add a cake and frosting recipe --- cake-recipe.txt | 24 ++++++++++++++++++++++++ frosting-recipe.txt | 11 +++++++++++ 2 files changed, 35 insertions(+) create mode 100644 cake-recipe.txt create mode 100644 frosting-recipe.txt diff --git a/cake-recipe.txt b/cake-recipe.txt new file mode 100644 index 0000000000..a00d11c5e6 --- /dev/null +++ b/cake-recipe.txt @@ -0,0 +1,24 @@ +Ingredients: + - 2 cups sugar + - 1 3/4 cups all-purpose flour + - 3/4 cup cocoa + - 1 1/2 teaspoons baking powder + - 1 1/2 teaspoons baking soda + - 1 teaspoon salt + - 2 eggs + - 1 cup milk + - 1/2 cup vegetable oil + - 2 teaspoons vanilla extract + - 1 cup boiling water + +Directions: + 1. Preheat oven to 350 degrees F. Grease and flour two 9-inch round baking + pans. + + 2. In a large bowl, combine the sugar, flour, cocoa, baking powder, baking soda + and salt. Add eggs, milk, oil and vanilla. Mix until smooth. Stir in + boiling water (batter will be thin). Pour batter into prepared pans. + + 3. Bake 30 to 35 minutes or until a toothpick inserted in the center comes out + clean. Cool completely. + diff --git a/frosting-recipe.txt b/frosting-recipe.txt new file mode 100644 index 0000000000..1079198f45 --- /dev/null +++ b/frosting-recipe.txt @@ -0,0 +1,11 @@ +Ingredients: + - 1/2 cup butter + - 2/3 cup cocoa + - 3 cups powdered sugar + - 1/3 cup milk + - 1 teaspoon vanilla extract + +Directions: + 1. In a medium saucepan, melt butter and stir in cocoa. + 2. Alternately add powdered sugar and milk. Beat until light and fluffy. + 3. Stir in vanilla. If necessary, add a small amount of additional milk. From a6a2f991a1bb60e1dec7c5d68c8393b70ea6f7f6 Mon Sep 17 00:00:00 2001 From: Larry Madrigal Date: Thu, 25 Sep 2014 11:08:27 -0700 Subject: [PATCH 0004/5486] Add a chili recipe --- chili-recipe.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 chili-recipe.txt diff --git a/chili-recipe.txt b/chili-recipe.txt new file mode 100644 index 0000000000..11691540c1 --- /dev/null +++ b/chili-recipe.txt @@ -0,0 +1,19 @@ +Ingredients: + - 2 pounds ground beef + - 2 cloves garlic, chopped + - One 8-ounce can tomato sauce + - 2 tablespoons chili powder + - 1 teaspoon ground cumin + - 1 teaspoon ground oregano + - 1 teaspoon salt + - 1/4 teaspoon cayenne pepper + - 1/4 cup corn flour + - One 15-ounce can kidney beans, drained and rinsed + - One 15-ounce can pinto beans, drained and rinsed + +Directions: + 1. Brown the ground beef in a large bot and drain off the excess fat. + 2. Add the tomato sauce, chili powder, cumin, oregano, salt, and cayenne. + 3. Stir, then cover and simmer over low heat for one hour. + 4. Mix the corn flour and 1/2 cup water in a small bowl. Add to chili. + 5. Add the beans and simmer for 10 more minutes. From f8906f910ba23e32e347dfbf3d89e9b5eaf4369c Mon Sep 17 00:00:00 2001 From: KUMN Date: Sun, 29 Mar 2015 00:28:37 -0700 Subject: [PATCH 0005/5486] Add changes to home.md and folder hello --- .../journey-to-flaming-tower/home/hello/hello.md | 5 +++++ .../explore-outside/journey-to-flaming-tower/home/home.md | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 english/explore-outside/journey-to-flaming-tower/home/hello/hello.md diff --git a/english/explore-outside/journey-to-flaming-tower/home/hello/hello.md b/english/explore-outside/journey-to-flaming-tower/home/hello/hello.md new file mode 100644 index 0000000000..abe5d3f5c0 --- /dev/null +++ b/english/explore-outside/journey-to-flaming-tower/home/hello/hello.md @@ -0,0 +1,5 @@ +You gigerly say "Hi!" +They answer in a chorus "Hi!". They seem friendly afterall! +The strawberry close to you smiles and says, "So you made it afterall! Your home is right round the corner!" +Congratulations! Your adventure ends here! + diff --git a/english/explore-outside/journey-to-flaming-tower/home/home.md b/english/explore-outside/journey-to-flaming-tower/home/home.md index 322141fa7b..12d402b23d 100644 --- a/english/explore-outside/journey-to-flaming-tower/home/home.md +++ b/english/explore-outside/journey-to-flaming-tower/home/home.md @@ -1 +1,5 @@ -While walking home you stumbled upon a field of strawberries. Not any ordinary strawberries, talking ones \ No newline at end of file +While walking home you stumbled upon a field of strawberries. Not any ordinary strawberries, talking ones. They are talking to each other and when they see you they hush each other up. You gingerly say "Hi!" +All of them answer in a chorus, "Hi!". They seem friendly afterall! + +You [start a conversation](hello/hello.md) + From ef0d72b9e830d5143de49b9b847579bf935e8a06 Mon Sep 17 00:00:00 2001 From: KUMN Date: Sun, 29 Mar 2015 00:32:50 -0700 Subject: [PATCH 0006/5486] Add more options to home.md --- english/explore-outside/journey-to-flaming-tower/home/home.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/explore-outside/journey-to-flaming-tower/home/home.md b/english/explore-outside/journey-to-flaming-tower/home/home.md index 12d402b23d..a3f57d4f37 100644 --- a/english/explore-outside/journey-to-flaming-tower/home/home.md +++ b/english/explore-outside/journey-to-flaming-tower/home/home.md @@ -2,4 +2,6 @@ While walking home you stumbled upon a field of strawberries. Not any ordinary s All of them answer in a chorus, "Hi!". They seem friendly afterall! You [start a conversation](hello/hello.md) +You [keep walking](../walk/walk.md) +You [turn back and run towards the tower](../start-running/start-running.md) From 707211e6e21659d64d7db0fe44d633f63365f55a Mon Sep 17 00:00:00 2001 From: KUMN Date: Sun, 29 Mar 2015 00:44:07 -0700 Subject: [PATCH 0007/5486] Add new lines so the lines are separated --- .../explore-outside/journey-to-flaming-tower/home/home.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/explore-outside/journey-to-flaming-tower/home/home.md b/english/explore-outside/journey-to-flaming-tower/home/home.md index a3f57d4f37..ff41984371 100644 --- a/english/explore-outside/journey-to-flaming-tower/home/home.md +++ b/english/explore-outside/journey-to-flaming-tower/home/home.md @@ -1,7 +1,8 @@ -While walking home you stumbled upon a field of strawberries. Not any ordinary strawberries, talking ones. They are talking to each other and when they see you they hush each other up. You gingerly say "Hi!" -All of them answer in a chorus, "Hi!". They seem friendly afterall! +While walking home you stumbled upon a field of strawberries. Not any ordinary strawberries, talking ones. They are talking to each other and when they see you they hush each other up. You [start a conversation](hello/hello.md) + You [keep walking](../walk/walk.md) + You [turn back and run towards the tower](../start-running/start-running.md) From 195da8917294b4addeef225befcd88fef0ea9885 Mon Sep 17 00:00:00 2001 From: KUMN Date: Sun, 29 Mar 2015 00:51:21 -0700 Subject: [PATCH 0008/5486] Add new lines to hello.md --- .../journey-to-flaming-tower/home/hello/hello.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/explore-outside/journey-to-flaming-tower/home/hello/hello.md b/english/explore-outside/journey-to-flaming-tower/home/hello/hello.md index abe5d3f5c0..607a52d24b 100644 --- a/english/explore-outside/journey-to-flaming-tower/home/hello/hello.md +++ b/english/explore-outside/journey-to-flaming-tower/home/hello/hello.md @@ -1,5 +1,8 @@ You gigerly say "Hi!" + They answer in a chorus "Hi!". They seem friendly afterall! + The strawberry close to you smiles and says, "So you made it afterall! Your home is right round the corner!" + Congratulations! Your adventure ends here! From a0d83e28c85548a283d5dc1ee6fc73f1e2309a50 Mon Sep 17 00:00:00 2001 From: KUMN Date: Sun, 29 Mar 2015 00:53:03 -0700 Subject: [PATCH 0009/5486] Update hello.md --- .../journey-to-flaming-tower/home/hello/hello.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/explore-outside/journey-to-flaming-tower/home/hello/hello.md b/english/explore-outside/journey-to-flaming-tower/home/hello/hello.md index 607a52d24b..614ca92c28 100644 --- a/english/explore-outside/journey-to-flaming-tower/home/hello/hello.md +++ b/english/explore-outside/journey-to-flaming-tower/home/hello/hello.md @@ -1,4 +1,4 @@ -You gigerly say "Hi!" +You gingerly say "Hi!" They answer in a chorus "Hi!". They seem friendly afterall! From 71f082216a922504be455e1a5ed6a7531f53b58b Mon Sep 17 00:00:00 2001 From: Dmitry Tolstonogov Date: Fri, 26 Jun 2015 12:59:09 -0400 Subject: [PATCH 0010/5486] add self-control --- english/self-control/self-control.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/self-control/self-control.md diff --git a/english/self-control/self-control.md b/english/self-control/self-control.md new file mode 100644 index 0000000000..fc6c1f3dbd --- /dev/null +++ b/english/self-control/self-control.md @@ -0,0 +1,3 @@ +Now you have everything to pass the marshmallow test. would you eat the marshmallow walls now +or wait when the marshmallow room would get twice bigger? +[Click here](http://www.amazon.com/The-Marshmallow-Test-Mastering-Self-Control/dp/0316230871) to master your self-control. \ No newline at end of file From 95a350d68170bdc4ce1d5f324234fc05a474c801 Mon Sep 17 00:00:00 2001 From: Dmitry Tolstonogov Date: Fri, 26 Jun 2015 13:45:26 -0400 Subject: [PATCH 0011/5486] add self control --- english/marshmallow.md | 2 ++ english/self-control/self-control.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 4bc74f90c5..c45274b13e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -314,3 +314,5 @@ Do you: [Give up and search for oil fields](oil-field/oil-field.md) [Appear on Falkor’s Back](appear-on-falkors-back/falkor.md) + +[Use your chance, master self-control](self-control/self-control.md) \ No newline at end of file diff --git a/english/self-control/self-control.md b/english/self-control/self-control.md index fc6c1f3dbd..8fe7c5b50f 100644 --- a/english/self-control/self-control.md +++ b/english/self-control/self-control.md @@ -1,3 +1,3 @@ Now you have everything to pass the marshmallow test. would you eat the marshmallow walls now or wait when the marshmallow room would get twice bigger? -[Click here](http://www.amazon.com/The-Marshmallow-Test-Mastering-Self-Control/dp/0316230871) to master your self-control. \ No newline at end of file +[Click here](http://www.amazon.com/The-Marshmallow-Test-Mastering-Self-Control/dp/0316230871) to master your self-control. From 7a8b357098158ca0030aee7666a0c234042ab558 Mon Sep 17 00:00:00 2001 From: Dmitry Tolstonogov Date: Fri, 26 Jun 2015 14:25:36 -0400 Subject: [PATCH 0012/5486] split string to shars < 120 per line --- english/self-control/self-control.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/self-control/self-control.md b/english/self-control/self-control.md index 8fe7c5b50f..413fd7ee77 100644 --- a/english/self-control/self-control.md +++ b/english/self-control/self-control.md @@ -1,3 +1,5 @@ Now you have everything to pass the marshmallow test. would you eat the marshmallow walls now or wait when the marshmallow room would get twice bigger? -[Click here](http://www.amazon.com/The-Marshmallow-Test-Mastering-Self-Control/dp/0316230871) to master your self-control. +[Click here](http://www.amazon.com/The-Marshmallow-Test-Mastering-Self-Control/dp/0316230871) +to master your self-control. + From 0f5e1a5df8b735ade16d44a16760e64f3ac16011 Mon Sep 17 00:00:00 2001 From: Drude Date: Sat, 27 Jun 2015 00:27:16 +0200 Subject: [PATCH 0013/5486] Add level in snitting storyline --- danish/snitting/snitting.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/danish/snitting/snitting.md b/danish/snitting/snitting.md index c3f9150c3c..a9d52e45cc 100644 --- a/danish/snitting/snitting.md +++ b/danish/snitting/snitting.md @@ -1 +1,7 @@ -Günther siger "It is not so lige til", og fortsætter med at snitte. \ No newline at end of file +Günther siger "It is not so lige til", og fortsætter med at snitte. + +Vælger du at: + +[Spørge "Why is it egentlig that you are always, snitting Günther?"](https://www.youtube.com/watch?v=2WS7iJNb4lI) + +[Spørge "Then I will go there over and drik some øl with Hansi"](velkommen.md) \ No newline at end of file From 133ab72c05fb3ec084ea97cabbbe8439f2494fe2 Mon Sep 17 00:00:00 2001 From: Drude Date: Sat, 27 Jun 2015 00:30:57 +0200 Subject: [PATCH 0014/5486] Fix link to return to velkommen storyline --- danish/snitting/snitting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/danish/snitting/snitting.md b/danish/snitting/snitting.md index a9d52e45cc..f6ae95cd05 100644 --- a/danish/snitting/snitting.md +++ b/danish/snitting/snitting.md @@ -4,4 +4,4 @@ Vælger du at: [Spørge "Why is it egentlig that you are always, snitting Günther?"](https://www.youtube.com/watch?v=2WS7iJNb4lI) -[Spørge "Then I will go there over and drik some øl with Hansi"](velkommen.md) \ No newline at end of file +[Spørge "Then I will go there over and drik some øl with Hansi"](../velkommen.md) \ No newline at end of file From 1eb3a26dafd745ca2fa5dab48388469ca3169266 Mon Sep 17 00:00:00 2001 From: Amine Rachid Messaoui Date: Sat, 27 Jun 2015 18:29:58 +0300 Subject: [PATCH 0015/5486] Extra sentence in french --- french/feu-de-camp.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 258c95b4db..2fbf5d0f31 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -1,5 +1,7 @@ Par un beau matin, vous vous rveillez dans une pice trange aux murs en pain d'pice. +On aurait p faire que les murs soient fait en pte de guimave, mais ce sont des murs franais. ;) + Que faites-vous ? [Je me rendors](dormir/reve-etrange.md) From d9f897d4de17a316724e78f900ae7860a865a2d7 Mon Sep 17 00:00:00 2001 From: Fridberg Date: Sun, 28 Jun 2015 21:41:14 +0000 Subject: [PATCH 0016/5486] Add option to turn into a potato in lucid dream --- english/lucidream/luciddream.md | 2 +- english/lucidream/potato/potato.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 english/lucidream/potato/potato.md diff --git a/english/lucidream/luciddream.md b/english/lucidream/luciddream.md index 29f4bbbad4..e299a9a0f0 100644 --- a/english/lucidream/luciddream.md +++ b/english/lucidream/luciddream.md @@ -14,4 +14,4 @@ Yells and become super saiyan Flys to the moon - +[Turn into a potato](potato/potato.md) diff --git a/english/lucidream/potato/potato.md b/english/lucidream/potato/potato.md new file mode 100644 index 0000000000..f048f447fb --- /dev/null +++ b/english/lucidream/potato/potato.md @@ -0,0 +1,6 @@ +You are now a potato. + +You realize that life ain't so bad here, as you roll around on a nice kitchen +surface. + +Yeah. You will like this new life. From 7772ab50cd0e149fae9251940398c4765b554fb9 Mon Sep 17 00:00:00 2001 From: Peter Ng Date: Sun, 28 Jun 2015 18:41:44 -0400 Subject: [PATCH 0017/5486] Extend drink water scenario --- english/coffee/drink-water/bathroom/bathroom.md | 1 + english/coffee/drink-water/drink.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/coffee/drink-water/bathroom/bathroom.md diff --git a/english/coffee/drink-water/bathroom/bathroom.md b/english/coffee/drink-water/bathroom/bathroom.md new file mode 100644 index 0000000000..df473ba3d1 --- /dev/null +++ b/english/coffee/drink-water/bathroom/bathroom.md @@ -0,0 +1 @@ +You quick start running down the street to look for a bathroom. You see a sign for a public toilet 2 mins down the road and you also see a Starbucks. diff --git a/english/coffee/drink-water/drink.md b/english/coffee/drink-water/drink.md index c738978f7e..91881d5aad 100644 --- a/english/coffee/drink-water/drink.md +++ b/english/coffee/drink-water/drink.md @@ -2,3 +2,5 @@ You start drinking the water, and it seems to relax your stomach, but you have to keep drinking, now your stomach swells to the size of a hot air balloon. You start feeling an urge to release some pressure... + +Do you find the nearest [bathroom](bathroom/bathroom.md)? From b0dfbc949b1d858199cc7f06ff123ff0b655328f Mon Sep 17 00:00:00 2001 From: Peter Ng Date: Sun, 28 Jun 2015 18:55:58 -0400 Subject: [PATCH 0018/5486] Broke line into two separate lines. --- english/coffee/drink-water/bathroom/bathroom.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/coffee/drink-water/bathroom/bathroom.md b/english/coffee/drink-water/bathroom/bathroom.md index df473ba3d1..4fb99e17d2 100644 --- a/english/coffee/drink-water/bathroom/bathroom.md +++ b/english/coffee/drink-water/bathroom/bathroom.md @@ -1 +1,2 @@ -You quick start running down the street to look for a bathroom. You see a sign for a public toilet 2 mins down the road and you also see a Starbucks. +You quick start running down the street to look for a bathroom. +You see a sign for a public toilet 2 mins down the road and you also see a Starbucks. From 281f8212acf6bfd695794cbf2f8d319e460b0ec4 Mon Sep 17 00:00:00 2001 From: Emanuel Sanchiz Date: Mon, 29 Jun 2015 16:13:25 -0400 Subject: [PATCH 0019/5486] Add a freaky line on open-door :o --- english/eating-walls/find-a-toilet/door/open-door.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/eating-walls/find-a-toilet/door/open-door.md b/english/eating-walls/find-a-toilet/door/open-door.md index 9ddb02dd46..83b21319d1 100644 --- a/english/eating-walls/find-a-toilet/door/open-door.md +++ b/english/eating-walls/find-a-toilet/door/open-door.md @@ -1,5 +1,7 @@ As you open the door, a cold hand is placed on your shoulder. +In that pretty moment you see your watches: 12 o'clock. + You jump back as you see dark black eyes. Do you: @@ -7,3 +9,4 @@ Do you: [Stand still in terror](bear/stand-still.md) [Run into the room and close the door](run-in/run-into-room.md) + From 932b4422b9f674e226a0157aa3ff0e27a6c731f1 Mon Sep 17 00:00:00 2001 From: Emanuel Sanchiz Date: Mon, 29 Jun 2015 16:19:18 -0400 Subject: [PATCH 0020/5486] Add a really freaky line on open-door :o --- english/eating-walls/find-a-toilet/door/open-door.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/eating-walls/find-a-toilet/door/open-door.md b/english/eating-walls/find-a-toilet/door/open-door.md index 83b21319d1..f571406a6f 100644 --- a/english/eating-walls/find-a-toilet/door/open-door.md +++ b/english/eating-walls/find-a-toilet/door/open-door.md @@ -1,6 +1,6 @@ As you open the door, a cold hand is placed on your shoulder. -In that pretty moment you see your watches: 12 o'clock. +In that very moment your watch sings: 12 o'clock midnight. You jump back as you see dark black eyes. From d40d30007da840e1a8f39aa689a1c7966ba79b0d Mon Sep 17 00:00:00 2001 From: JaimehRubiks Date: Mon, 29 Jun 2015 22:27:36 +0200 Subject: [PATCH 0021/5486] basque new story --- basque/alde-egin/alde-egin.md | 8 ++++++++ basque/alde-egin/oihu/oihu.md | 1 + basque/alde-egin/zaldi/zaldi.md | 1 + 3 files changed, 10 insertions(+) create mode 100644 basque/alde-egin/oihu/oihu.md create mode 100644 basque/alde-egin/zaldi/zaldi.md diff --git a/basque/alde-egin/alde-egin.md b/basque/alde-egin/alde-egin.md index d59a75177a..340ee20b47 100644 --- a/basque/alde-egin/alde-egin.md +++ b/basque/alde-egin/alde-egin.md @@ -1 +1,9 @@ Pertsona arraroari zure gaztelutik alde egiteko esan diozu eta bera zuri irainka hasi da. + +Harresiaren ateak itxi eta gero barrura sartzen zara, eta telebista ikusten hasten zara. Bat-batean, albisteetan ikusten duzun pertsona batek urrezko gaztainak saltzen hari zela gaztelu guztietan. + +Zer egiten duzu orain? + +[Pertsona arraroaren bila joan zaldiz.] (zaldi/zaldi.md) + +[Pertsona arraroari deitu harresiaren gainetik oihu.] (oihu/oihu.md) diff --git a/basque/alde-egin/oihu/oihu.md b/basque/alde-egin/oihu/oihu.md new file mode 100644 index 0000000000..b009060952 --- /dev/null +++ b/basque/alde-egin/oihu/oihu.md @@ -0,0 +1 @@ +Oihukatzen hasi zara eta pertsona arraroak gaztainak botatzen hasi da zure harresiaren kontra. Gaztainak leherketa handiak egiten dituzte eta zeure gastelua apurtzen hasten da. \ No newline at end of file diff --git a/basque/alde-egin/zaldi/zaldi.md b/basque/alde-egin/zaldi/zaldi.md new file mode 100644 index 0000000000..3c2f0b0248 --- /dev/null +++ b/basque/alde-egin/zaldi/zaldi.md @@ -0,0 +1 @@ +Bi ordu geroago topatzen zara gizon arraroarekin azkenean eta esaten diozu: From 31831e861a58c926476b6e71e7c7c896a5106d56 Mon Sep 17 00:00:00 2001 From: JaimehRubiks Date: Mon, 29 Jun 2015 22:30:35 +0200 Subject: [PATCH 0022/5486] fixed --- basque/alde-egin/alde-egin.md | 4 +++- basque/alde-egin/oihu/oihu.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/basque/alde-egin/alde-egin.md b/basque/alde-egin/alde-egin.md index 340ee20b47..c43e0d2a7d 100644 --- a/basque/alde-egin/alde-egin.md +++ b/basque/alde-egin/alde-egin.md @@ -1,6 +1,8 @@ Pertsona arraroari zure gaztelutik alde egiteko esan diozu eta bera zuri irainka hasi da. -Harresiaren ateak itxi eta gero barrura sartzen zara, eta telebista ikusten hasten zara. Bat-batean, albisteetan ikusten duzun pertsona batek urrezko gaztainak saltzen hari zela gaztelu guztietan. +Harresiaren ateak itxi eta gero barrura sartzen zara, eta telebista ikusten hasten zara. + +Bat-batean, albisteetan ikusten duzun pertsona batek urrezko gaztainak saltzen hari zela gaztelu guztietan. Zer egiten duzu orain? diff --git a/basque/alde-egin/oihu/oihu.md b/basque/alde-egin/oihu/oihu.md index b009060952..b6aedbb70d 100644 --- a/basque/alde-egin/oihu/oihu.md +++ b/basque/alde-egin/oihu/oihu.md @@ -1 +1,3 @@ -Oihukatzen hasi zara eta pertsona arraroak gaztainak botatzen hasi da zure harresiaren kontra. Gaztainak leherketa handiak egiten dituzte eta zeure gastelua apurtzen hasten da. \ No newline at end of file +Oihukatzen hasi zara eta pertsona arraroak gaztainak botatzen hasi da zure harresiaren kontra. + +Gaztainak leherketa handiak egiten dituzte eta zeure gastelua apurtzen hasten da. \ No newline at end of file From 024446b3e4cbc86ff893cbe84f46171d4582322d Mon Sep 17 00:00:00 2001 From: Emanuel Sanchiz Date: Mon, 29 Jun 2015 16:47:18 -0400 Subject: [PATCH 0023/5486] Add dark to a line on run-into-room --- english/eating-walls/find-a-toilet/door/run-in/run-into-room.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md b/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md index d11beaeff7..05fc528a86 100644 --- a/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md +++ b/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md @@ -2,7 +2,7 @@ You run into the room and slam the door behind you! You don't know whose hand th The room you're now in is cold and damp, about 10x10x10ft, and made of stone. So much for marshmallows, huh? -There is an opening in the floor with a ladder going down and a lever on the wall to the right of the door. +There is an opening in the floor with a ladder going down and a lever on the wall to the right of the dark door. Do you: From 9353bab6efe34edd8ce369e491bfe6d931b1a0aa Mon Sep 17 00:00:00 2001 From: Jess Date: Mon, 29 Jun 2015 14:52:42 -0700 Subject: [PATCH 0024/5486] Add response from Eliza & question for next response --- english/turing-test/eliza/ask_eliza.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/turing-test/eliza/ask_eliza.md b/english/turing-test/eliza/ask_eliza.md index 5a88379dee..62eee57e32 100644 --- a/english/turing-test/eliza/ask_eliza.md +++ b/english/turing-test/eliza/ask_eliza.md @@ -14,6 +14,9 @@ Your memory skills at retrieving model numbers of arcane cathod-ray tube devices in the late seventies and early eighties are rewarded with the following enigmatic response from ELIZA: +Perhaps in your fantasies I am wearing that dusty ADM-34 CRT? How do I even get parts for +that thing? +You respond: From 707ddd473f5d1d21a000b1a9afb5994166781340 Mon Sep 17 00:00:00 2001 From: kmather73 Date: Mon, 29 Jun 2015 22:15:07 -0500 Subject: [PATCH 0025/5486] I'm Batman --- english/I'm-batman/batman.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/I'm-batman/batman.md diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md new file mode 100644 index 0000000000..3d4b6f09bb --- /dev/null +++ b/english/I'm-batman/batman.md @@ -0,0 +1,3 @@ +Did you know that you your parent died and you are left with wayne manor. + +[Realize that you are Batman and have the Utility Belt on you. Yeah!!!](https://youtu.be/YpIQQeL2ZYk?t=22s) From 451a77832d7241b3954d5d3cab4850767a4edb2e Mon Sep 17 00:00:00 2001 From: yanjin Date: Mon, 29 Jun 2015 21:09:10 -0700 Subject: [PATCH 0026/5486] add a line --- Chinese/mayDay/mayDay.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Chinese/mayDay/mayDay.md b/Chinese/mayDay/mayDay.md index 90240e1c19..35a26c1f19 100644 --- a/Chinese/mayDay/mayDay.md +++ b/Chinese/mayDay/mayDay.md @@ -14,4 +14,5 @@ “哇塞，唱得这么棒！”人群中一个长发小眼的男人惊呼。另一个带眼镜的男人说：“我们乐队 就缺一个优秀的主唱了，要不要一起？”悟空不管不顾，继续自我陶醉地唱着。人群中窜出四个人， 包括之前长发小眼和带眼镜的那两个男人，不约而同地说道：“就这么定了吧！对了，还要取个 -酷炫一点的艺名。要不，就叫阿信吧？”悟空突然停止了歌唱，回到：“不错！” \ No newline at end of file +酷炫一点的艺名。要不，就叫阿信吧？”悟空突然停止了歌唱，回到：“不错！” +好主意！ \ No newline at end of file From c5fe7d68b6070071be7fd837389cbeff5b4272ec Mon Sep 17 00:00:00 2001 From: yanjin Date: Mon, 29 Jun 2015 21:13:56 -0700 Subject: [PATCH 0027/5486] Add a line --- Chinese/mayDay/mayDay.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/mayDay/mayDay.md b/Chinese/mayDay/mayDay.md index 35a26c1f19..7e3b5738bc 100644 --- a/Chinese/mayDay/mayDay.md +++ b/Chinese/mayDay/mayDay.md @@ -15,4 +15,4 @@ 就缺一个优秀的主唱了，要不要一起？”悟空不管不顾，继续自我陶醉地唱着。人群中窜出四个人， 包括之前长发小眼和带眼镜的那两个男人，不约而同地说道：“就这么定了吧！对了，还要取个 酷炫一点的艺名。要不，就叫阿信吧？”悟空突然停止了歌唱，回到：“不错！” -好主意！ \ No newline at end of file +悟空诺有所思的唱起了孙悟空 \ No newline at end of file From f617b5900bad3797934d84cbf4ef24d15e129b16 Mon Sep 17 00:00:00 2001 From: memetcircus Date: Tue, 30 Jun 2015 14:11:05 +0300 Subject: [PATCH 0028/5486] Add break the window and story of cold room --- .../find-a-toilet/door/run-in/break-window/coldroom.md | 3 +++ .../eating-walls/find-a-toilet/door/run-in/run-into-room.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/eating-walls/find-a-toilet/door/run-in/break-window/coldroom.md diff --git a/english/eating-walls/find-a-toilet/door/run-in/break-window/coldroom.md b/english/eating-walls/find-a-toilet/door/run-in/break-window/coldroom.md new file mode 100644 index 0000000000..9b5655ca7e --- /dev/null +++ b/english/eating-walls/find-a-toilet/door/run-in/break-window/coldroom.md @@ -0,0 +1,3 @@ +You break the window and pass through it and ended up at a very strange cold room as it is dark but you feel something under neat your feet. + +You start to run forward and hopefully you see a panel that full of buttons on it. diff --git a/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md b/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md index d11beaeff7..a87de881b1 100644 --- a/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md +++ b/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md @@ -2,10 +2,12 @@ You run into the room and slam the door behind you! You don't know whose hand th The room you're now in is cold and damp, about 10x10x10ft, and made of stone. So much for marshmallows, huh? -There is an opening in the floor with a ladder going down and a lever on the wall to the right of the door. +There is an opening in the floor with a ladder going down, a lever on the wall to the right of the door and a window at the corner of the room. Do you: [Take the ladder](take-ladder/open-sky.md) [Push the lever](push-lever/bear.md) + +[Break the window](break-window/coldroom.md) From ae75ed0b816394708769f2de7c227c03dc491c9f Mon Sep 17 00:00:00 2001 From: PVi Date: Tue, 30 Jun 2015 13:25:16 +0200 Subject: [PATCH 0029/5486] Add a new Slovak option (ranajky/koniec-rybky.md) and modify marsmelaci.md file Committer: pvi44 On branch new_option_slovak modified: marsmelaci.md new file: ranajky/koniec-rybky.md --- slovak/marsmelaci.md | 3 +++ slovak/ranajky/koniec-rybky.md | 1 + 2 files changed, 4 insertions(+) create mode 100644 slovak/ranajky/koniec-rybky.md diff --git a/slovak/marsmelaci.md b/slovak/marsmelaci.md index a19dc5662f..67a1399b95 100644 --- a/slovak/marsmelaci.md +++ b/slovak/marsmelaci.md @@ -1,2 +1,5 @@ Jedno nevšedné ráno sa zobudíš v divnej miestnosti, ktorá má steny z marshmallow na to, že máš v nose kyslú rybičku. +Čo urobíš? + +[Raňajky](ranajky/koniec-rybky.md) \ No newline at end of file diff --git a/slovak/ranajky/koniec-rybky.md b/slovak/ranajky/koniec-rybky.md new file mode 100644 index 0000000000..4535feb9c7 --- /dev/null +++ b/slovak/ranajky/koniec-rybky.md @@ -0,0 +1 @@ +D si na raajky tto chutn kysl rybku (vak sladkho je vade naokolo dos :) \ No newline at end of file From 14b8f73d66b90a2415ff42c80cfad6c1aad71811 Mon Sep 17 00:00:00 2001 From: jck7e Date: Tue, 30 Jun 2015 15:04:52 +0200 Subject: [PATCH 0030/5486] Add a describing sentence --- german/Hilfeschrei/Hilfeschrei.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/german/Hilfeschrei/Hilfeschrei.md b/german/Hilfeschrei/Hilfeschrei.md index 6014d97297..abd873da6e 100644 --- a/german/Hilfeschrei/Hilfeschrei.md +++ b/german/Hilfeschrei/Hilfeschrei.md @@ -4,6 +4,8 @@ Doch es ist keine Menschenseele in Sicht. Im Wasser jedoch regt sich etwas. +Eine gigantische dunkle Fläche gleitet neben ihrem Boot vorbei. + Ein Blauwal taucht direkt neben Ihnen auf und schaut Sie mit treuen Augen an. Werden Sie From 92ea44fa0f8693368bfb4fae7bcb1e9c497dfea8 Mon Sep 17 00:00:00 2001 From: Rajan Arora Date: Tue, 30 Jun 2015 13:54:37 -0500 Subject: [PATCH 0031/5486] Add punjabi files --- language.md | 2 ++ punjabi/ajit/ajitnews.md | 1 + punjabi/pollywood/movies.md | 1 + punjabi/punjabi.md | 2 ++ 4 files changed, 6 insertions(+) create mode 100644 punjabi/ajit/ajitnews.md create mode 100644 punjabi/pollywood/movies.md create mode 100644 punjabi/punjabi.md diff --git a/language.md b/language.md index f6f13990b6..fbf6f3baab 100644 --- a/language.md +++ b/language.md @@ -1,5 +1,7 @@ If you speak English, [go here](english/marshmallow.md). +If you speak Punjabi, [go here](punjabi/punjabi.md). + यिद तपाई नेपाली बोलनुहुनछ भने, [यहाँ िथचनुहोस ।] (nepali/about_nepal.md) 如果你说中文，[点击这里](Chinese/大话西游.md). diff --git a/punjabi/ajit/ajitnews.md b/punjabi/ajit/ajitnews.md new file mode 100644 index 0000000000..826b87c262 --- /dev/null +++ b/punjabi/ajit/ajitnews.md @@ -0,0 +1 @@ +Click [here](http://beta.ajitjalandhar.com/) to visit Ajit, a punjabi news website \ No newline at end of file diff --git a/punjabi/pollywood/movies.md b/punjabi/pollywood/movies.md new file mode 100644 index 0000000000..e8390bf882 --- /dev/null +++ b/punjabi/pollywood/movies.md @@ -0,0 +1 @@ +Click [here](http://punjabipollywood.com/) to visit Punjabi movies website \ No newline at end of file diff --git a/punjabi/punjabi.md b/punjabi/punjabi.md new file mode 100644 index 0000000000..8843db7968 --- /dev/null +++ b/punjabi/punjabi.md @@ -0,0 +1,2 @@ +Click [here](ajit/ajitnews.md) for punjabi news +Click [here](pollywood/movies.md) for Punjabi movies \ No newline at end of file From 2beebeaa46e369672bc6fe444cdab38d594df61f Mon Sep 17 00:00:00 2001 From: Rajan Arora Date: Tue, 30 Jun 2015 14:40:11 -0500 Subject: [PATCH 0032/5486] Add a blank line between links --- punjabi/punjabi.md | 1 + 1 file changed, 1 insertion(+) diff --git a/punjabi/punjabi.md b/punjabi/punjabi.md index 8843db7968..b3844b8718 100644 --- a/punjabi/punjabi.md +++ b/punjabi/punjabi.md @@ -1,2 +1,3 @@ Click [here](ajit/ajitnews.md) for punjabi news + Click [here](pollywood/movies.md) for Punjabi movies \ No newline at end of file From 1e1be5528ce443aa3101c7e252eb2e86f54919c3 Mon Sep 17 00:00:00 2001 From: cylo Date: Wed, 1 Jul 2015 04:55:22 +0800 Subject: [PATCH 0033/5486] Let's go, pal. --- english/marshmallow.md | 4 +++- english/pipboy/lockpick/lockpick_100.md | 8 ++++++++ english/pipboy/pipboy.md | 19 +++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 english/pipboy/lockpick/lockpick_100.md create mode 100644 english/pipboy/pipboy.md diff --git a/english/marshmallow.md b/english/marshmallow.md index df525eea22..a589ee5b32 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -323,4 +323,6 @@ Do you: [Bruce Wayne is BATS !!](batman/batman.md) -[Use your chance, master self-control](self-control/self-control.md) \ No newline at end of file +[Use your chance, master self-control](self-control/self-control.md) + +[Have a Pip-Boy](pipboy/pipboy.md) diff --git a/english/pipboy/lockpick/lockpick_100.md b/english/pipboy/lockpick/lockpick_100.md new file mode 100644 index 0000000000..033209bffd --- /dev/null +++ b/english/pipboy/lockpick/lockpick_100.md @@ -0,0 +1,8 @@ +You got your pins. You got your screwdriver. + +Mo' problem. + +Door's open. You head into the vast wasteland. + + + diff --git a/english/pipboy/pipboy.md b/english/pipboy/pipboy.md new file mode 100644 index 0000000000..becd5b3703 --- /dev/null +++ b/english/pipboy/pipboy.md @@ -0,0 +1,19 @@ +Unfortunately, unlike in fairy tales, silly spells don't open the door. + +You try to find other way out. + +These marshmallow walls appear to be flammable. + +But you don't want to set the world on fire + +As a mature vault dweller, you know you can count on your Pip-Boy. + + + +You got these perks and items: + +[Lockpick 100](lockpick/lockpick_100.md) + +[Spurs that jingle-jangle-jingle](https://www.youtube.com/watch?v=1DD_NCM_RJs) + +[Dragon Shouts](../fus-roh-dah/fus-roh-dah.md) From 60d4bbaa729df791582453c8e0c7d5140b20afd6 Mon Sep 17 00:00:00 2001 From: mac Date: Tue, 30 Jun 2015 18:58:33 -0400 Subject: [PATCH 0034/5486] Add hint to pikachu story --- english/pokemon/pikachu_wins.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/pokemon/pikachu_wins.md b/english/pokemon/pikachu_wins.md index dd8e4752e4..52bc7bcf23 100644 --- a/english/pokemon/pikachu_wins.md +++ b/english/pokemon/pikachu_wins.md @@ -5,6 +5,8 @@ and make smores. However, you don't get to enjoy your victory for long. You awake from your dream and realize that Pikachu isn't real but the marshmallow nightmare is still a problem. What will you do next? +Hint: you're a lyrical wordsmith + [Take a nap](../sleep/marshmallow.md) [Appeal to Scotty](../explore-outside/call-scotty/call-scotty.md) From 41f0b9f24ab20cfcc10d3ca8f19219c28ea98518 Mon Sep 17 00:00:00 2001 From: Angela Hwang Date: Tue, 30 Jun 2015 18:27:06 -0500 Subject: [PATCH 0035/5486] Add breathe link --- english/bake-cookies/cookies.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/bake-cookies/cookies.md b/english/bake-cookies/cookies.md index 41e3711127..549853291f 100644 --- a/english/bake-cookies/cookies.md +++ b/english/bake-cookies/cookies.md @@ -12,4 +12,6 @@ Do you: [Sing a song?](../sing-song/sing.md) -[Make coffee first?](../coffee/coffee.md) \ No newline at end of file +[Make coffee first?](../coffee/coffee.md) + +[Breathe?](../yoga/breathe/breathe.md) \ No newline at end of file From 34dcdebdd16b64d9b55605ec1dca862011a0d73f Mon Sep 17 00:00:00 2001 From: Dag Holmberg Date: Tue, 30 Jun 2015 20:42:42 -0700 Subject: [PATCH 0036/5486] Add lines to english/marshmallow.md --- english/marshmallow.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index a589ee5b32..133ed634e8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -76,6 +76,10 @@ You pick up the fork and wrap it in rope to fashion a crappy wand. Pointing it at the door, eyes closed, "Alohomora..." +Nothing seems to be happening. + +Sheepishly you look down on the crappy wand in your hand. + Do you: [Grab some coffee?] (coffee/coffee.md) From 7d51ac2be896738bc5cd5a4c3a0e1ea5802c87df Mon Sep 17 00:00:00 2001 From: kmather73 Date: Tue, 30 Jun 2015 23:10:52 -0500 Subject: [PATCH 0037/5486] Added the batman story. --- english/I'm-batman/batman.md | 2 +- english/marshmallow.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index 3d4b6f09bb..0295a371d6 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -1,3 +1,3 @@ -Did you know that you your parent died and you are left with wayne manor. +Did you know that your parent died and you are left with wayne manor. [Realize that you are Batman and have the Utility Belt on you. Yeah!!!](https://youtu.be/YpIQQeL2ZYk?t=22s) diff --git a/english/marshmallow.md b/english/marshmallow.md index df525eea22..85206cf0cd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -280,7 +280,7 @@ Do you: [Make a Marshmallow cake](https://www.youtube.com/watch?v=3l1SY3QREv4) -[Realize that you are Batman and have the Utility Belt on you. Yeah!!!](https://youtu.be/YpIQQeL2ZYk?t=22s) +[I'm batman](I'm-batman/batman.md) [You realize you are in NeverLand and you are never going come... so you sing the Tinker Bell song] (https://youtu.be/Sopngy6uucw) From 5d664a61121f3414328e82ac9872aca4f349919d Mon Sep 17 00:00:00 2001 From: memetcircus Date: Wed, 1 Jul 2015 14:55:13 +0300 Subject: [PATCH 0038/5486] Fix line length --- .../find-a-toilet/door/run-in/break-window/coldroom.md | 7 +++++-- .../find-a-toilet/door/run-in/run-into-room.md | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/english/eating-walls/find-a-toilet/door/run-in/break-window/coldroom.md b/english/eating-walls/find-a-toilet/door/run-in/break-window/coldroom.md index 9b5655ca7e..037432f05a 100644 --- a/english/eating-walls/find-a-toilet/door/run-in/break-window/coldroom.md +++ b/english/eating-walls/find-a-toilet/door/run-in/break-window/coldroom.md @@ -1,3 +1,6 @@ -You break the window and pass through it and ended up at a very strange cold room as it is dark but you feel something under neat your feet. +You break the window and pass through it and +ended up at a very strange cold room as it is +dark but you feel something under neat your feet. -You start to run forward and hopefully you see a panel that full of buttons on it. +You start to run forward and hopefully you see a +panel that full of buttons on it. diff --git a/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md b/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md index a87de881b1..9805653cfc 100644 --- a/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md +++ b/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md @@ -2,7 +2,9 @@ You run into the room and slam the door behind you! You don't know whose hand th The room you're now in is cold and damp, about 10x10x10ft, and made of stone. So much for marshmallows, huh? -There is an opening in the floor with a ladder going down, a lever on the wall to the right of the door and a window at the corner of the room. +There is an opening in the floor with a ladder going down and a lever on the wall to the right of the door. + +And you see a window at the corner of the room suddenly. Do you: From 4bb39331ab151f6e478164f6ac200d946466ce56 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 Jul 2015 08:32:59 -0600 Subject: [PATCH 0039/5486] Add additional story to the black point concentration event --- english/experience/black-point/concentrate/stargaze.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/english/experience/black-point/concentrate/stargaze.md b/english/experience/black-point/concentrate/stargaze.md index 157d3398b3..c5fa1da736 100644 --- a/english/experience/black-point/concentrate/stargaze.md +++ b/english/experience/black-point/concentrate/stargaze.md @@ -1,6 +1,14 @@ When you concentrate on the black point for some more time you see the point transform. -The black point transforms back into the +The point begins to emit a soft crying sound that you strain to hear. A soft red light emits from an unknown +source beyond the point. You can't help but say "Hello?". Immediately the point goes silent. Then, without +warning the point explodes in fury of deafening sound that can only be described as a collection of screams +from a world unknown. And almost as suddenly as they began, the cease. + +Again, silence. You realize you are crouching with your knees to your forehead, face buried, and ears covered. Tears +roll down your cheeks. You look up just in time to see... + +The black point transforms back into the [golden halo](../../golden-halo/golden-halo.md) From 041b8b3116273eb04f630864b2ed681ad3cccb19 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Jul 2015 14:03:16 -0400 Subject: [PATCH 0040/5486] I believe he can save the world. --- english/avatar/air.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/avatar/air.md diff --git a/english/avatar/air.md b/english/avatar/air.md new file mode 100644 index 0000000000..ee4a586302 --- /dev/null +++ b/english/avatar/air.md @@ -0,0 +1 @@ +[But everything changed when the firenation attacked...](https://www.youtube.com/watch?v=pJUgCzEdx9k) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 133ed634e8..a0cfa75000 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -330,3 +330,5 @@ Do you: [Use your chance, master self-control](self-control/self-control.md) [Have a Pip-Boy](pipboy/pipboy.md) + +[Call upon one of your past lives as avatar](avatar/air.md) \ No newline at end of file From 2d9f263f9d383c148bca97889ea3a5e42e860aad Mon Sep 17 00:00:00 2001 From: Marcos Date: Thu, 2 Jul 2015 00:24:44 -0300 Subject: [PATCH 0041/5486] Nueva historia de Dago, en espanol --- espanol/historieta/dago.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 espanol/historieta/dago.md diff --git a/espanol/historieta/dago.md b/espanol/historieta/dago.md new file mode 100644 index 0000000000..aa6a41a2af --- /dev/null +++ b/espanol/historieta/dago.md @@ -0,0 +1,3 @@ +Y cuando creian que nada pasaba, lo de siempre paso. Dago, el veneciano, llamo la atencion de la dama y de su celoso esposo. +Para guinar tu ojo a la dama, pag 23. +Para desviar la mirada, pag 34. From 428d7ae050cf67d52d975f74e18968c560bff3ef Mon Sep 17 00:00:00 2001 From: Marcos Date: Thu, 2 Jul 2015 00:31:37 -0300 Subject: [PATCH 0042/5486] Le dimos un nombre al perro --- espanol/perro/perro.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/perro/perro.md b/espanol/perro/perro.md index dd1b544b35..3f02db9ce4 100644 --- a/espanol/perro/perro.md +++ b/espanol/perro/perro.md @@ -1 +1 @@ -Un perro se puso a bailar con un muchacho mientras tocaba la guitarra +Un perro se puso a bailar con un muchacho mientras tocaba la guitarra. Creo que el perro era un Border Collie. From cfe97094cb77e428f8bbdaa3690ee5fedca83752 Mon Sep 17 00:00:00 2001 From: Marcos Date: Thu, 2 Jul 2015 00:47:33 -0300 Subject: [PATCH 0043/5486] otra vez commit del checked out --- espanol/perro/perro.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/perro/perro.md b/espanol/perro/perro.md index dd1b544b35..ab2917409b 100644 --- a/espanol/perro/perro.md +++ b/espanol/perro/perro.md @@ -1 +1,2 @@ Un perro se puso a bailar con un muchacho mientras tocaba la guitarra +El perro se llama Dago. From 391e78caff4f5cd08ba7d9deb4e37c6b126a6a53 Mon Sep 17 00:00:00 2001 From: Marcos Date: Thu, 2 Jul 2015 00:58:15 -0300 Subject: [PATCH 0044/5486] asfd --- espanol/perro/perro.md~ | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 espanol/perro/perro.md~ diff --git a/espanol/perro/perro.md~ b/espanol/perro/perro.md~ new file mode 100644 index 0000000000..9bbd2bd471 --- /dev/null +++ b/espanol/perro/perro.md~ @@ -0,0 +1,6 @@ +<<<<<<< HEAD +Un perro se puso a bailar con un muchacho mientras tocaba la guitarra +El perro se llama Dago. +======= +Un perro se puso a bailar con un muchacho mientras tocaba la guitarra. Creo que el perro era un Border Collie. +>>>>>>> 428d7ae050cf67d52d975f74e18968c560bff3ef From 9aaa0c51b5daf458c219764823daf7297ce8bc28 Mon Sep 17 00:00:00 2001 From: Marcos Date: Thu, 2 Jul 2015 01:03:07 -0300 Subject: [PATCH 0045/5486] 23 --- espanol/perro/perro.md~ | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 espanol/perro/perro.md~ diff --git a/espanol/perro/perro.md~ b/espanol/perro/perro.md~ deleted file mode 100644 index 9bbd2bd471..0000000000 --- a/espanol/perro/perro.md~ +++ /dev/null @@ -1,6 +0,0 @@ -<<<<<<< HEAD -Un perro se puso a bailar con un muchacho mientras tocaba la guitarra -El perro se llama Dago. -======= -Un perro se puso a bailar con un muchacho mientras tocaba la guitarra. Creo que el perro era un Border Collie. ->>>>>>> 428d7ae050cf67d52d975f74e18968c560bff3ef From 13b936cf8a0d118794766604b349114835212573 Mon Sep 17 00:00:00 2001 From: Marcos Date: Thu, 2 Jul 2015 01:05:26 -0300 Subject: [PATCH 0046/5486] dago my largo --- espanol/historieta/dago.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/espanol/historieta/dago.md b/espanol/historieta/dago.md index aa6a41a2af..df5e1bb5b6 100644 --- a/espanol/historieta/dago.md +++ b/espanol/historieta/dago.md @@ -1,3 +1 @@ Y cuando creian que nada pasaba, lo de siempre paso. Dago, el veneciano, llamo la atencion de la dama y de su celoso esposo. -Para guinar tu ojo a la dama, pag 23. -Para desviar la mirada, pag 34. From 7e34590297f54b28b82270c7d84b2f272bd34633 Mon Sep 17 00:00:00 2001 From: Marcos Date: Thu, 2 Jul 2015 01:07:29 -0300 Subject: [PATCH 0047/5486] mas corto aun --- espanol/historieta/dago.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/historieta/dago.md b/espanol/historieta/dago.md index df5e1bb5b6..0d36559f5f 100644 --- a/espanol/historieta/dago.md +++ b/espanol/historieta/dago.md @@ -1 +1 @@ -Y cuando creian que nada pasaba, lo de siempre paso. Dago, el veneciano, llamo la atencion de la dama y de su celoso esposo. +Dago, el veneciano, llamo la atencion de la dama y de su celoso esposo. From e2b79c9693726dfbe44d96b4b28143bc05d9deaa Mon Sep 17 00:00:00 2001 From: Marcos Date: Thu, 2 Jul 2015 01:09:39 -0300 Subject: [PATCH 0048/5486] borrando toodo historieta --- espanol/historieta/dago.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 espanol/historieta/dago.md diff --git a/espanol/historieta/dago.md b/espanol/historieta/dago.md deleted file mode 100644 index 0d36559f5f..0000000000 --- a/espanol/historieta/dago.md +++ /dev/null @@ -1 +0,0 @@ -Dago, el veneciano, llamo la atencion de la dama y de su celoso esposo. From 5123bfcef4dd9fe9dd748240d3015fed60583ff0 Mon Sep 17 00:00:00 2001 From: Li Xi Date: Thu, 2 Jul 2015 21:04:23 +0800 Subject: [PATCH 0049/5486] Add option play-gta5 --- english/play-gta5/play-gta5.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/play-gta5/play-gta5.md diff --git a/english/play-gta5/play-gta5.md b/english/play-gta5/play-gta5.md new file mode 100644 index 0000000000..97059595ca --- /dev/null +++ b/english/play-gta5/play-gta5.md @@ -0,0 +1 @@ +Trevor killed a lot of rednecks with minigun. \ No newline at end of file From d42211b2e139c517f7125cfe466afd441f503595 Mon Sep 17 00:00:00 2001 From: Li Xi Date: Thu, 2 Jul 2015 21:08:10 +0800 Subject: [PATCH 0050/5486] Add links to play gta5 --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index d46e65cd3b..965aaa36fa 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -331,4 +331,6 @@ Do you: [Have a Pip-Boy](pipboy/pipboy.md) -[Call upon one of your past lives as avatar](avatar/air.md) \ No newline at end of file +[Call upon one of your past lives as avatar](avatar/air.md) + +[Play some GTA5](play-gta5/play-gta5.md) \ No newline at end of file From d5ca111de5fdc94c960a5cac6622075a2fbec013 Mon Sep 17 00:00:00 2001 From: Jason Healy Date: Thu, 2 Jul 2015 14:20:05 +0100 Subject: [PATCH 0051/5486] Add ethical rationale for feeling anxious wearing leather --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index d46e65cd3b..84cc42faf7 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -28,6 +28,8 @@ You also seem to be wearing an uncomfortable and restrictive jacket made of leat You are feeling very anxious at this point. +This is because you do not like leather for ethical reasons. + You begin to breakout of the jacket and find a lighter, a fork, and rope. You are not sure who placed these objects near you or why. From 48fc0090b6a167d7c8f0c0a4ef82a1435e258cad Mon Sep 17 00:00:00 2001 From: Samrudhi Sharma Date: Thu, 2 Jul 2015 22:17:22 +0530 Subject: [PATCH 0052/5486] Added a story --- english/question_on_quora.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/question_on_quora.md diff --git a/english/question_on_quora.md b/english/question_on_quora.md new file mode 100644 index 0000000000..d7a327085e --- /dev/null +++ b/english/question_on_quora.md @@ -0,0 +1,3 @@ +Why not ask a question on Quora ? + +Click [here](http://www.quora.com) to visit Quora. \ No newline at end of file From 740e3ac3a5a19981dc03d81850b593fe3fa48e82 Mon Sep 17 00:00:00 2001 From: Samrudhi Sharma Date: Thu, 2 Jul 2015 22:30:08 +0530 Subject: [PATCH 0053/5486] Added a story. --- english/ask-on-quora/ask-on-quora.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/ask-on-quora/ask-on-quora.md diff --git a/english/ask-on-quora/ask-on-quora.md b/english/ask-on-quora/ask-on-quora.md new file mode 100644 index 0000000000..d7a327085e --- /dev/null +++ b/english/ask-on-quora/ask-on-quora.md @@ -0,0 +1,3 @@ +Why not ask a question on Quora ? + +Click [here](http://www.quora.com) to visit Quora. \ No newline at end of file From 436f570cec2323de6a0c44c32a39337f0850ccb3 Mon Sep 17 00:00:00 2001 From: Del-Dom Date: Thu, 2 Jul 2015 14:05:57 -0400 Subject: [PATCH 0054/5486] Add surprise! --- english/surprise!/surprise.md | 3 +++ english/you-are-in-minecraft/minecraft.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 english/surprise!/surprise.md diff --git a/english/surprise!/surprise.md b/english/surprise!/surprise.md new file mode 100644 index 0000000000..431fc223b7 --- /dev/null +++ b/english/surprise!/surprise.md @@ -0,0 +1,3 @@ +You chose surprise! There is no escape from here!... +well except maybe that one... But we won't talk about that. + diff --git a/english/you-are-in-minecraft/minecraft.md b/english/you-are-in-minecraft/minecraft.md index d0779d559c..c9c3b2d1b0 100644 --- a/english/you-are-in-minecraft/minecraft.md +++ b/english/you-are-in-minecraft/minecraft.md @@ -25,3 +25,5 @@ Do you: [Dig down?](dig_down/dig_down.md) [Hulk out?](../hulk/smash.md) + +[Surprise!](../surprise!/suprise.md) From 4a13267f5e3c0b1c6957c09df93d3887ee4db046 Mon Sep 17 00:00:00 2001 From: Dominick Del Ponte Date: Thu, 2 Jul 2015 14:10:15 -0400 Subject: [PATCH 0055/5486] Update minecraft.md --- english/you-are-in-minecraft/minecraft.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/you-are-in-minecraft/minecraft.md b/english/you-are-in-minecraft/minecraft.md index c9c3b2d1b0..8e6abc4dab 100644 --- a/english/you-are-in-minecraft/minecraft.md +++ b/english/you-are-in-minecraft/minecraft.md @@ -26,4 +26,4 @@ Do you: [Hulk out?](../hulk/smash.md) -[Surprise!](../surprise!/suprise.md) +[Surprise!](../surprise!/surprise.md) From 4144b98cc022a4e55eeeb63d531d58e2aa9aa25d Mon Sep 17 00:00:00 2001 From: Samrudhi Sharma Date: Thu, 2 Jul 2015 23:41:56 +0530 Subject: [PATCH 0056/5486] Added link at end --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 661c3f9331..80559fdc15 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -335,4 +335,6 @@ Do you: [Call upon one of your past lives as avatar](avatar/air.md) -[Play some GTA5](play-gta5/play-gta5.md) \ No newline at end of file +[Play some GTA5](play-gta5/play-gta5.md) + +[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) \ No newline at end of file From 05f2e7c611df86e1ba316be531a1f8ef1afd5c10 Mon Sep 17 00:00:00 2001 From: Samrudhi Sharma Date: Thu, 2 Jul 2015 23:55:41 +0530 Subject: [PATCH 0057/5486] Removed question_on_quora.md --- english/question_on_quora.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 english/question_on_quora.md diff --git a/english/question_on_quora.md b/english/question_on_quora.md deleted file mode 100644 index d7a327085e..0000000000 --- a/english/question_on_quora.md +++ /dev/null @@ -1,3 +0,0 @@ -Why not ask a question on Quora ? - -Click [here](http://www.quora.com) to visit Quora. \ No newline at end of file From eb0fd0866649b89968a7ba2bed36316294be4dd1 Mon Sep 17 00:00:00 2001 From: Alyssa Goncalves Date: Thu, 2 Jul 2015 20:29:12 -0400 Subject: [PATCH 0058/5486] Add horizon and wall options to candyland/milkshake sea storyline --- .../candyland/swim/horizon/milkshake_everywhere.md | 3 +++ english/candyland/swim/swim.md | 11 ++++++++--- english/candyland/swim/wall/queen_portrait.md | 5 +++++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 english/candyland/swim/horizon/milkshake_everywhere.md create mode 100644 english/candyland/swim/wall/queen_portrait.md diff --git a/english/candyland/swim/horizon/milkshake_everywhere.md b/english/candyland/swim/horizon/milkshake_everywhere.md new file mode 100644 index 0000000000..3e430eed49 --- /dev/null +++ b/english/candyland/swim/horizon/milkshake_everywhere.md @@ -0,0 +1,3 @@ +You doggy-paddle in a circle to get a better look at your surroundings. Milkshake, milkshake, everywhere! Milkshake as far as the eye can see. + +But wait! There appears to be…yes, it’s a ship! You’re not the best swimmer, but you think you might be able to reach it… \ No newline at end of file diff --git a/english/candyland/swim/swim.md b/english/candyland/swim/swim.md index c236608643..80b0fc8ba0 100644 --- a/english/candyland/swim/swim.md +++ b/english/candyland/swim/swim.md @@ -1,8 +1,8 @@ You walk over and try to stand in the melted marshmallow. -You realize that it doesn't feel like marshmallow at all. +You realize that it doesn't feel like marshmallow at all. -It is not sticky and in fact is quite milky smooth. +It is not sticky and in fact is quite milky smooth. You lean forward and lick the frothy concoction. @@ -12,8 +12,13 @@ You start to realize the milk is getting very cold and deep. The viscous icy chunky liquid is now up to your chin so you begin to move your limbs to stay afloat. -You are now treading milkshake. +You are now treading milkshake. You see an ominous looking picture on the wall with a Queen standing by a sign in front on a sea. The sign in the picture says: "The Ice Cream Sea" + +[Inspect the wall more closely](wall/queen_portrait.md) + +[Look toward the horizon](horizon/milkshake_everywhere.md) + diff --git a/english/candyland/swim/wall/queen_portrait.md b/english/candyland/swim/wall/queen_portrait.md new file mode 100644 index 0000000000..fc0f629093 --- /dev/null +++ b/english/candyland/swim/wall/queen_portrait.md @@ -0,0 +1,5 @@ +You swim toward the wall to inspect the portrait more closely. Milkshake is surprisingly not much more difficult to swim through than regular water. + +The portrait shows an older woman with beautiful silver hair. She is holding a scepter topped with a perfect snowflake sculpture and a crown made of ice. She looks regal and wise. Is this her sea? + +You are not used to swimming this much and you feel your arms and legs begin to tire. \ No newline at end of file From 2bc1ee79b0be693f204fd84a2fa20800fd13d1d7 Mon Sep 17 00:00:00 2001 From: Alyssa Goncalves Date: Thu, 2 Jul 2015 20:38:17 -0400 Subject: [PATCH 0059/5486] Add pirate ship option to candyland/milkshake sea storyline --- english/candyland/swim/horizon/milkshake_everywhere.md | 6 +++++- english/candyland/swim/horizon/ship/its-a-ship.md | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 english/candyland/swim/horizon/ship/its-a-ship.md diff --git a/english/candyland/swim/horizon/milkshake_everywhere.md b/english/candyland/swim/horizon/milkshake_everywhere.md index 3e430eed49..8d818c5dd9 100644 --- a/english/candyland/swim/horizon/milkshake_everywhere.md +++ b/english/candyland/swim/horizon/milkshake_everywhere.md @@ -1,3 +1,7 @@ You doggy-paddle in a circle to get a better look at your surroundings. Milkshake, milkshake, everywhere! Milkshake as far as the eye can see. -But wait! There appears to be…yes, it’s a ship! You’re not the best swimmer, but you think you might be able to reach it… \ No newline at end of file +But wait! There appears to be…yes, it’s a ship! You’re not the best swimmer, but you think you might be able to reach it… + +[Swim! Swim like you've never swum before!](ship/its-a-ship.md) + +[Head for the wall to examine the Queen's Portrait.](english/candyland/swim/wall/queen_portrait.md) \ No newline at end of file diff --git a/english/candyland/swim/horizon/ship/its-a-ship.md b/english/candyland/swim/horizon/ship/its-a-ship.md new file mode 100644 index 0000000000..2dcd4d0972 --- /dev/null +++ b/english/candyland/swim/horizon/ship/its-a-ship.md @@ -0,0 +1,5 @@ +You swim for the ship like your life depends on it! You swim and you swim and don't seem to be making much progress, but the ship has spotted you and is heading right in your direction. You wave your tired arms in the air so it won't loose track of you in the milkshake waves. + +Something seems...odd about the ship. It's yellow in color and the flag has a skull and crossbones on it. + +Oh no, banana-boat pirates! \ No newline at end of file From 7dd3109d6dc11189a91ffbaa9ed6cdfc2b3cbbe6 Mon Sep 17 00:00:00 2001 From: Alyssa Goncalves Date: Thu, 2 Jul 2015 20:58:36 -0400 Subject: [PATCH 0060/5486] Fix broken option link in milkshake_everywhere.md --- english/candyland/swim/horizon/milkshake_everywhere.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/candyland/swim/horizon/milkshake_everywhere.md b/english/candyland/swim/horizon/milkshake_everywhere.md index 8d818c5dd9..b9a1f2945d 100644 --- a/english/candyland/swim/horizon/milkshake_everywhere.md +++ b/english/candyland/swim/horizon/milkshake_everywhere.md @@ -2,6 +2,4 @@ You doggy-paddle in a circle to get a better look at your surroundings. Milksha But wait! There appears to be…yes, it’s a ship! You’re not the best swimmer, but you think you might be able to reach it… -[Swim! Swim like you've never swum before!](ship/its-a-ship.md) - -[Head for the wall to examine the Queen's Portrait.](english/candyland/swim/wall/queen_portrait.md) \ No newline at end of file +[Swim! Swim like you've never swum before!](ship/its-a-ship.md) \ No newline at end of file From 0c534806de90629f8837b7a1c5fdc7d0c6487001 Mon Sep 17 00:00:00 2001 From: Alyssa Goncalves Date: Thu, 2 Jul 2015 21:21:59 -0400 Subject: [PATCH 0061/5486] Bring back missing whitespace to swim.md --- english/candyland/swim/swim.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/candyland/swim/swim.md b/english/candyland/swim/swim.md index 80b0fc8ba0..82ea6b28ba 100644 --- a/english/candyland/swim/swim.md +++ b/english/candyland/swim/swim.md @@ -1,8 +1,8 @@ You walk over and try to stand in the melted marshmallow. -You realize that it doesn't feel like marshmallow at all. +You realize that it doesn't feel like marshmallow at all. -It is not sticky and in fact is quite milky smooth. +It is not sticky and in fact is quite milky smooth. You lean forward and lick the frothy concoction. @@ -12,7 +12,7 @@ You start to realize the milk is getting very cold and deep. The viscous icy chunky liquid is now up to your chin so you begin to move your limbs to stay afloat. -You are now treading milkshake. +You are now treading milkshake. You see an ominous looking picture on the wall with a Queen standing by a sign in front on a sea. From 4a0f61ce937e5b4fd977c5f11f7ff3fc10fe7abb Mon Sep 17 00:00:00 2001 From: Alyssa Goncalves Date: Thu, 2 Jul 2015 21:23:11 -0400 Subject: [PATCH 0062/5486] Break up lines that are more than 120 characters --- .../candyland/swim/horizon/milkshake_everywhere.md | 10 ++++++++-- english/candyland/swim/horizon/ship/its-a-ship.md | 14 ++++++++++++-- english/candyland/swim/wall/queen_portrait.md | 10 ++++++++-- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/english/candyland/swim/horizon/milkshake_everywhere.md b/english/candyland/swim/horizon/milkshake_everywhere.md index b9a1f2945d..4187a3ad1f 100644 --- a/english/candyland/swim/horizon/milkshake_everywhere.md +++ b/english/candyland/swim/horizon/milkshake_everywhere.md @@ -1,5 +1,11 @@ -You doggy-paddle in a circle to get a better look at your surroundings. Milkshake, milkshake, everywhere! Milkshake as far as the eye can see. +You doggy-paddle in a circle to get a better look at your surroundings. -But wait! There appears to be…yes, it’s a ship! You’re not the best swimmer, but you think you might be able to reach it… +Milkshake, milkshake, everywhere! Milkshake as far as the eye can see. + +But wait! There appears to be… + +Yes, it’s a ship! + +You’re not the best swimmer, but you think you might be able to reach it… [Swim! Swim like you've never swum before!](ship/its-a-ship.md) \ No newline at end of file diff --git a/english/candyland/swim/horizon/ship/its-a-ship.md b/english/candyland/swim/horizon/ship/its-a-ship.md index 2dcd4d0972..4b4d14808a 100644 --- a/english/candyland/swim/horizon/ship/its-a-ship.md +++ b/english/candyland/swim/horizon/ship/its-a-ship.md @@ -1,5 +1,15 @@ -You swim for the ship like your life depends on it! You swim and you swim and don't seem to be making much progress, but the ship has spotted you and is heading right in your direction. You wave your tired arms in the air so it won't loose track of you in the milkshake waves. +You swim for the ship like your life depends on it! -Something seems...odd about the ship. It's yellow in color and the flag has a skull and crossbones on it. +You swim and you swim and don't seem to be making much progress... + +However, now the ship has spotted you and is heading right in your direction! + +You wave your tired arms in the air. + +Will it loose track of you in the milkshake waves? + +Something seems...odd about the ship. + +It's yellow in color and the flag has a skull and crossbones on it. Oh no, banana-boat pirates! \ No newline at end of file diff --git a/english/candyland/swim/wall/queen_portrait.md b/english/candyland/swim/wall/queen_portrait.md index fc0f629093..62bfcf78ae 100644 --- a/english/candyland/swim/wall/queen_portrait.md +++ b/english/candyland/swim/wall/queen_portrait.md @@ -1,5 +1,11 @@ -You swim toward the wall to inspect the portrait more closely. Milkshake is surprisingly not much more difficult to swim through than regular water. +You swim toward the wall to inspect the portrait more closely. -The portrait shows an older woman with beautiful silver hair. She is holding a scepter topped with a perfect snowflake sculpture and a crown made of ice. She looks regal and wise. Is this her sea? +Milkshake is surprisingly not much more difficult to swim through than regular water. + +The portrait shows an older woman with beautiful silver hair. + +She is holding a scepter topped with a perfect snowflake sculpture. + +She looks regal and wise. You are not used to swimming this much and you feel your arms and legs begin to tire. \ No newline at end of file From 2572adb82925c6a49be09739d960a9b7afd14904 Mon Sep 17 00:00:00 2001 From: eitnier Date: Fri, 3 Jul 2015 16:35:45 +0200 Subject: [PATCH 0063/5486] Add Extreme to marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 80559fdc15..08ac0042d3 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -14,7 +14,7 @@ Grave danger. *(Is there another kind?)* -The type of mortal danger that so often accompanies confectionary inspired interior design. +The type of extreme mortal danger that so often accompanies confectionary inspired interior design. Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant eyed young man lounging on a nearby sofa. From c57810440c2348e0ead6ffb5733c1093689b28f9 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 3 Jul 2015 12:44:46 -0400 Subject: [PATCH 0064/5486] Change 'my' to 'by' to fix typo --- english/triathlon/triathlon.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/triathlon/triathlon.md b/english/triathlon/triathlon.md index 18dc88cfd3..ef5c79c68c 100644 --- a/english/triathlon/triathlon.md +++ b/english/triathlon/triathlon.md @@ -1,4 +1,4 @@ -You were always intrigued my endurance sports. +You were always intrigued by endurance sports. So you head over to wikipedia and look up triathlon. It happens to be one of the most demanding endurance events in the world. The full distance entails 2.4 mile swim, 112 mile bike and 26.2 mile run. From 6d0d8a326145c8ddf8b05c55829b46c70c35383e Mon Sep 17 00:00:00 2001 From: Samir Mehta Date: Fri, 3 Jul 2015 12:52:45 -0400 Subject: [PATCH 0065/5486] Add link back to initial story in cup-cocoa storyline --- english/dig/cup-cocoa/cup-cocoa.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/english/dig/cup-cocoa/cup-cocoa.md b/english/dig/cup-cocoa/cup-cocoa.md index 710802a24a..a13a043832 100644 --- a/english/dig/cup-cocoa/cup-cocoa.md +++ b/english/dig/cup-cocoa/cup-cocoa.md @@ -2,8 +2,17 @@ You enjoy the warm cup of cocoa and you have a conversation with the big bird th Big Bird from Sesame Street. You ask him what he is doing in the forest and ask him if he would like a cup of "cocoa". He starts to correct you and says it is pronounced "co-co-aaaaaaaaa" and not "co-co". This pointless debate ensues for a few minutes until he concedes that it is indeed cocoa after you google -the correct pronunciation. Then you ask him again what he is doing in the forest. +the correct pronunciation. Then you ask him again what he is doing in the forest. He says: -"I am searching for delicious mushrooms. Do you have any?" \ No newline at end of file +"I am searching for delicious mushrooms. Do you have any?" + +You realize that this day has gotten out of hand. Big bird is scary, the cocoa not longer tastes good, you want to go home. + +Luckily for you, GOB appears behind you and sticks a pill into your mouth. The last thing you hear before everything goes black + +"Have a forget-me-now Michael" + +[Forget everything that has happened](../../marshmallow.md) + From 84dc5beb7c11cdc6c854a223c667f1d3f714bce2 Mon Sep 17 00:00:00 2001 From: Samir Mehta Date: Fri, 3 Jul 2015 12:58:48 -0400 Subject: [PATCH 0066/5486] Fix: Shorten lines --- english/dig/cup-cocoa/cup-cocoa.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/english/dig/cup-cocoa/cup-cocoa.md b/english/dig/cup-cocoa/cup-cocoa.md index a13a043832..05abdc0e33 100644 --- a/english/dig/cup-cocoa/cup-cocoa.md +++ b/english/dig/cup-cocoa/cup-cocoa.md @@ -8,9 +8,13 @@ He says: "I am searching for delicious mushrooms. Do you have any?" -You realize that this day has gotten out of hand. Big bird is scary, the cocoa not longer tastes good, you want to go home. +You realize that this day has gotten out of hand. -Luckily for you, GOB appears behind you and sticks a pill into your mouth. The last thing you hear before everything goes black +Big bird is scary, the cocoa not longer tastes good, you want to go home. + +Luckily for you, GOB appears behind you and sticks a pill into your mouth. + +The last thing you hear before everything goes black "Have a forget-me-now Michael" From 82c2560a69bb1bed71c6bd6e37152a961555593c Mon Sep 17 00:00:00 2001 From: Samir Mehta Date: Fri, 3 Jul 2015 13:07:31 -0400 Subject: [PATCH 0067/5486] Fix: removed deleted content to allow for auto-merge --- english/dig/cup-cocoa/cup-cocoa.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/english/dig/cup-cocoa/cup-cocoa.md b/english/dig/cup-cocoa/cup-cocoa.md index 05abdc0e33..73a8e1ca06 100644 --- a/english/dig/cup-cocoa/cup-cocoa.md +++ b/english/dig/cup-cocoa/cup-cocoa.md @@ -18,5 +18,4 @@ The last thing you hear before everything goes black "Have a forget-me-now Michael" -[Forget everything that has happened](../../marshmallow.md) - +[Forget everything that has happened](../../marshmallow.md) \ No newline at end of file From 6752f01fa9e1096552ec34402a8d2f274bdf1a1c Mon Sep 17 00:00:00 2001 From: Aravind Ravindranath Date: Fri, 3 Jul 2015 10:14:13 -0700 Subject: [PATCH 0068/5486] Added new language Malayalam --- Malayalam/malayalam.md | 1 + language.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Malayalam/malayalam.md diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md new file mode 100644 index 0000000000..460bd8e4b0 --- /dev/null +++ b/Malayalam/malayalam.md @@ -0,0 +1 @@ +ഞാൻ ഒരു മലയാളി. ഒരു സാഹസിക യാത്രയുടെ തുടക്കം. \ No newline at end of file diff --git a/language.md b/language.md index fbf6f3baab..21ce8e7c81 100644 --- a/language.md +++ b/language.md @@ -94,3 +94,5 @@ click vaj tlhIngan Hol Dajatlh'a' [naDev click](klingon/start.md) Po flisni shqip, [shkoni ketu](albanian/hyrje.md) +നിങ്ങളുടെ ഭാഷ മലയാളം ആണെങ്കിൽ, +[ഇവിടെ ക്ലിക്ക് ചെയ്യുക](Malayalam/malayalam.md) \ No newline at end of file From 54aa8ad45fcc661c27cc5a7f30d97edb29ed072e Mon Sep 17 00:00:00 2001 From: Levan Iordanishvili Date: Fri, 3 Jul 2015 17:10:40 -0400 Subject: [PATCH 0069/5486] Add smores knowledge --- english/magic/magic.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/magic/magic.md b/english/magic/magic.md index e3dc1ec985..590550f7f4 100644 --- a/english/magic/magic.md +++ b/english/magic/magic.md @@ -2,6 +2,7 @@ Channel you inner Harry Potter and turn that rope into some grahm crackers. Grab you a handfull of that marshmallow wall. Use that lighter and make you some smores. Eat your way out of that room and watch out for Lord Voldemort +Voldemort hates smores -- knowledge is power [Wave your magic wand](../movie-ripoffs/hogwarts/hogwarts.md) From 586cd8290b61ff5a09d22fdf4dad09f4c179cc10 Mon Sep 17 00:00:00 2001 From: Benjamin Shockley Date: Fri, 3 Jul 2015 19:34:48 -0700 Subject: [PATCH 0070/5486] Create a new option from your flight to Paris --- english/coffee/Paris/city-train/city-train.md | 5 +++++ english/coffee/Paris/fly-to-paris.md | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 english/coffee/Paris/city-train/city-train.md diff --git a/english/coffee/Paris/city-train/city-train.md b/english/coffee/Paris/city-train/city-train.md new file mode 100644 index 0000000000..2838e71a04 --- /dev/null +++ b/english/coffee/Paris/city-train/city-train.md @@ -0,0 +1,5 @@ +You follow her on the train and take a seat next to a window. + +It feels good to watch the landscape fly by. You notice she + +keeps looking around, as if she is expecting someone. \ No newline at end of file diff --git a/english/coffee/Paris/fly-to-paris.md b/english/coffee/Paris/fly-to-paris.md index 9dcd6d1167..6ae8d94860 100644 --- a/english/coffee/Paris/fly-to-paris.md +++ b/english/coffee/Paris/fly-to-paris.md @@ -4,4 +4,10 @@ You mustled up some courage, remembered the few French phrases you know, went up "Excusez-moi, mademoiselle, vous parlez anglais? Je suis perdu." You asked. -"Mais, bien sur. Yes, I do speak English." \ No newline at end of file +"Mais, bien sur. Yes, I do speak English." + +"Excellet!" you exclaim. You tell her everything you know so far and she suggests you follow her. + +She walks towards a local train into the city. Do you? + +[Follow her on the train?](city-train/city-train.md) \ No newline at end of file From 047baa33335377394546ff8781e4b7b954f7fb36 Mon Sep 17 00:00:00 2001 From: Marcelo Silva Date: Sat, 4 Jul 2015 15:19:37 -0300 Subject: [PATCH 0071/5486] Go for a running in the Green Park --- english/coffee/Run/run.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/coffee/Run/run.md b/english/coffee/Run/run.md index 1462580807..23f1f304e6 100644 --- a/english/coffee/Run/run.md +++ b/english/coffee/Run/run.md @@ -1,2 +1,6 @@ Research has shown that coffee before a workout improves circulation, lessens pain, -improves memory for exercises and routines, and preserves and fuels muscles. \ No newline at end of file +improves memory for exercises and routines, and preserves and fuels muscles. + +Thus, you decide to go for a running. +You choose to run in the Green Park. +In fact, a great place to breath a bit of fresh air.¶ From bff8429ab45dbb6dcb326102da7c77b55cf1f169 Mon Sep 17 00:00:00 2001 From: Clark Groce Date: Sat, 4 Jul 2015 15:16:46 -0400 Subject: [PATCH 0072/5486] added latest wand story line --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 80559fdc15..141db62365 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -81,6 +81,8 @@ Pointing it at the door, eyes closed, "Alohomora..." Nothing seems to be happening. Sheepishly you look down on the crappy wand in your hand. + +You must be doing something wrong, you drink a beer and think about it, then Ah-ha! Do you: From c37597ac0d1c7bd490be08fefd800c66c48b89a3 Mon Sep 17 00:00:00 2001 From: Armin Palgen Date: Sat, 4 Jul 2015 23:38:40 +0200 Subject: [PATCH 0073/5486] Continue the story in the german version in "ins_maul.md" --- german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md b/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md index e229be817f..03e9718b11 100644 --- a/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md +++ b/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md @@ -2,5 +2,6 @@ Nach dem Sie den Wal "betreten" haben schliesst dieser das Maul und taucht hinab Zum Glück haben Sie eine kleine Taschenlampe am Schlüsselbund und beginnen -das Innere des Wals zu durchsuchen, dabei stoßen Sie auf.... +das Innere des Wals zu durchsuchen, dabei stoßen Sie auf einen rosa Kobold mit einem Glöckchen um den Hals. +Als der Kobold Sie bemerkt fängt er an auf der Stelle zu hüpfen und... From 69d0f9a244e3f988e0b4596a13755386580913a1 Mon Sep 17 00:00:00 2001 From: Armin Palgen Date: Sat, 4 Jul 2015 23:48:23 +0200 Subject: [PATCH 0074/5486] Continue the story in the german version in "ins_maul.md" with some fixes --- german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md b/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md index 03e9718b11..512afeccba 100644 --- a/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md +++ b/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md @@ -2,6 +2,6 @@ Nach dem Sie den Wal "betreten" haben schliesst dieser das Maul und taucht hinab Zum Glück haben Sie eine kleine Taschenlampe am Schlüsselbund und beginnen -das Innere des Wals zu durchsuchen, dabei stoßen Sie auf einen rosa Kobold mit einem Glöckchen um den Hals. +das Innere des Wals zu durchsuchen, dabei stoßen Sie auf.... -Als der Kobold Sie bemerkt fängt er an auf der Stelle zu hüpfen und... +einen grünen Kobold mit einem Glöckchen um den Hals. Der Kobold sagt: From 1a8cbebdf6c5ff2f5c055f77873f7d7ac0cf5c7f Mon Sep 17 00:00:00 2001 From: Johnny Tanner Date: Sat, 4 Jul 2015 19:30:06 -0500 Subject: [PATCH 0075/5486] You fight fatigue as the marhmellow is in fear --- english/lighter/toke/toke.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/lighter/toke/toke.md b/english/lighter/toke/toke.md index b8b8f43cab..7a6be8b65c 100644 --- a/english/lighter/toke/toke.md +++ b/english/lighter/toke/toke.md @@ -3,3 +3,4 @@ You can't stop laughing as Marshmallow rants about alien conspiracy theories. The grumbling of your stomach announces the arrival of the munchies. Converstation fades and in a moment your gaze connect. Marshmallow leerily backs away, noticing the yearning in your eyes. +Fighting drug-induced fatigue, you start to explain you are not a threat... you would.. never.... \ No newline at end of file From cd767355d53910c43fa36be207509321180e9910 Mon Sep 17 00:00:00 2001 From: Joshua Date: Sun, 5 Jul 2015 04:00:27 +0100 Subject: [PATCH 0076/5486] y u feed --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 141db62365..ac318284e7 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -339,4 +339,6 @@ Do you: [Play some GTA5](play-gta5/play-gta5.md) -[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) \ No newline at end of file +[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) + +[go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) \ No newline at end of file From 00e0710c7c5456ead465601e16f3135e8f872a25 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Sat, 4 Jul 2015 22:53:43 -0500 Subject: [PATCH 0077/5486] Add explore to the snuffbox line --- .DS_Store | Bin 0 -> 8196 bytes english/.DS_Store | Bin 0 -> 20484 bytes english/snuffbox/.DS_Store | Bin 0 -> 8196 bytes english/snuffbox/explore/explore.md | 1 + english/snuffbox/snuffbox.md | 9 ++++++++- 5 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .DS_Store create mode 100644 english/.DS_Store create mode 100644 english/snuffbox/.DS_Store create mode 100644 english/snuffbox/explore/explore.md diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..18c24f74efa4a4e13e6a85d1ffbb076ac52c7096 GIT binary patch literal 8196 zcmeHMTWl0n82-OfU>0WVYzx|!OIDgl(PDZ5K_GE^;VMW&OD|m9&h89!bUIUaW?QtW zHtK_l#3+f;#27&l)EIAgi5gzKV4^WTkdT^~c!@FbMIJO>5)=P3XSOM=eG@~%oXwo? zobzAK*>Ap?*)vN-XepQtM3qFO@F7s2&(*&aVHd}=QWA}nGJ@lYZ1Sl;JM0f;ooU|j zK+HhQK+HhQK+HhQz~#UIKeI(qW_a#PYh1?+#0*@K42b(fiVuP52*)Ibw+^ntEdZm~ z0)&OzyblOtQW2&j9FrJ^a!$E>Kop8-ivbzV_LOjEOh-5-QHB#_I3b!D(GCUS>>QU0 z-3e)laUC-dGccV2arw+8i(EQL&gA{Omu1Ue*+IwlgZlb$l*}rfJ!h_xm^WX1^yIw# z9sS;LM_>d6zs1P!4STj}Wutbx5%d?^ou21Rw2f?+Z4GDi1+AVN7`AKWCx!0owq4U3 zZt)7P>F?{1`MPa0=+Ed2+w;~ChqfE8)n)s3)^_aRZY3c;8NF&`q^W65U8=F+=Fz&; zNJIUq#=6w1rnRG^`ooH{XvOO09le92j~svgg%dBHJoWLXk_tq(6RMa(&DrU^n10U5 z@;4ElQz&!%q4umJC@VQyr0nZSl&RWPt!*0@Y*I6Nx%dh@2Ls!4{Vpr-GiLNMpSj$c z^W5kwX7psvaB>C52&`tu>9Fsy{O+9R6b4*hc<1t-9Bz*qmQ_=>^}~WpQ$Q$ZF#$d>skp<+92p*Isu+{pxkMoYRx#6$=)s>K;A;ZeSm< zt^Dp`aTa0@U?Db%EEL!=rBL^bJp*-Y@WY6&$`8}(2h4DAX%M!IdAIQgL}C#x-#nAA|Ht)h0O=;9*jo~x=}w0Ox<)*g$|IyBQ2 zpwE?36W+^eR8=Q=If(x9T20eS_!>~cWOXYwRi70qU08*P_1U4OMVIBP>ZPITMR)xM zw$2H~ExPGuPNjsx72Wx@nyMuJ3%Pzy=V+XMq@U>m{YHO7MHQB@NN;3;rqROk+=R_& z$1dzf7fZAcS(vbJ03PmwAIkJzjNyJffCpKokKu7Vfunc^&*C{8!*RTVSMeHN#~XMb zAK*iLf-i9%-%5E-$acHz7i)Z1Y{htK7?>r~R*L=q#+l#$Uz*9|tT6*I1D6E@C~fO# zYvH97e?UxKRS6HI_~_$96yY}}F%02KxQOv^JI*-qhatC9ku4qJm_)X4`QKjzIPvrU P;-9PW^FI{g6;}NNe5Nl^ literal 0 HcmV?d00001 diff --git a/english/.DS_Store b/english/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..33d1302f66ab2cee2a083d330d4c5faeea490d2d GIT binary patch literal 20484 zcmeHPYiwLc6+XxD<38MEY$we+Nz)B!tR%J*Cr*^uZByGx+LR>JU^})GgLBvSCcb2S zui1Oon>4a8Z~9O{rR^VtkZ9=xAt8|Z3lI`Qv=T);6a)nUe~=LH3kmqqKXA^>-DLg3 z*!9vpW>$00y=P|DyJyd1zB4lh0PM-T`v6V=fI*e1s0HY<0n$X?9Cf1SpqWp}_XMfFunKuci01Zs#?OK3fWG4R2GEVRM|c;NC=Hkz8uWWx;E z`Cw);>ql{0+i$R9O=VSejbU1L?eX;wTce_W%J&M7O~!s0L}$EQM08ZFi^jvkqhn#v zoAbDRRMd?**|B`qiM{S@w$Fduiw4KSY%$&1Pn2V1}=8#WgnKvp#KJq@~ z(LjI7J4VAJfu`~HU2E5gy84Fo8}7dMzFm9T4?oy5G!{-wctIR}#HC)RoG5;5(hEHI z96uh-d31IABYMk$tdsGw{g?c}9h_1hxIb_vyb=O!cE2=IA~d-QbeX|?dYV|YH^ZUH>DakS`S&>W*z?96d(tiO}1s2+q-tE zUvzs{o4PT{jW)s_a+>`xLOi#u^QwqPsn!9&=A_u~WjAU=#I@cnoaPvHO#;xL}YbLip)97i8NiV^0q zfS2(KeiA>0pT*DN6ZkBC37^BS;LGY`RU}?p=9v^rUhx$o_sFD?L!Y!23Z!;1jMJS1 z0o_j!jp=)^QaX^Mp5yW^ONtsoAybGF1%-Et3i@`5f?767vCjH%AL(LW?8Nz~$H|?O zPrmDAlKWmK9xvYahhg^my^}d3HFy2dFo+#L@Ny+XM+QkR!a`4&58P;^PrctDE6J$X zkSKkx6L@D>PyDPOUolL6jf%#rSKHeUwWRm&>zHmyU)|SsV1G;cK>Ok8Y4L<%Y~FRS z`}FYS^pjtE@ujc7{K~68`mqui7G>B_B0#=xYZ?pA}fp=fw>4e~7g0zu5Co0FCzE&5vBIV@o;;X{^lI(PUZDUq}OG&hBRN4APHC6J{1$bkUzk%Vj3nwSC<&DObVlj!xU2 z@LF?W@psxx}Li{GygKYM27wy_#P?7oA47d_g}zo;m`0F_$&Mk{y_$h zSb;VfeLXhddNTX>;eEIRn{Y24B%?n}X5T~RehN?H2guyd;}{vchXGFG$8iQffluO7 z_%yzNU&U9IDqc75W9qqh#n;}oYU=o-<4>96k4aG_Pm$82_@d%WpyLV|F2|JxWTWH7 zjoGA*7posH7FM|>;=tOQ5{JksNa_4yG4wHKCNOKVvP>Kz(ZV)sdnsC2B_P6p=*UB} zAkIp0$hYD9@I#uO{1kq*C=S^ramZepkaS8Eas(g2M zB~i%ZghD<;DCG0Y#3995%N<2IZD!GmeMq&HDub*`913*^B*}0HTu?eo2f_NA1~k<- z*j5QRnv0u?cuG1eN--qR$V%CpOae-?eGx+!f+t%IqtvZQ&}411x0?i*q>odaCTpij zfJp);$+4TQR)g@80#1t6X6-i!Efs;2Vji>(84Q-LBPYe~v>)K~${cqoq2UpNayKB8 zVJsgseG6WPAJ9+!7W@o;Ezc22Jo!_?HAtwYV17Nzk+v)3{B7rZ(JyQkyqE!NhezRuNSm8O$gBWh&O zv`HgbU4%-<*-iFNgEU%H$X2V_Ze@KHYgA{chps8AR4Zv9>#nF&t(_KW-bqtb%XAz? zK}&!#7LJNmlWm&IRJn!IaTRC~E>B@2ZXsmO>9}3kOo5QoaU2Nmm+3eTgpAM!WFQ=t z={OFA<1!t`fv_Ocai3m67_6pDa0nOZ<$*)p0GB0=<#{W0=M(Yif|HloKWdr|w zgoZ00q4{sxy+lB|-4`8o`nmk+=PId!iyuSj)jQPH`4zq6aFur)-hl^h=7Ek|ch;xz zzdZW3g2OT7aI2|OIl<@uk1ziJe`F_p(Gt)SxIHC+mB;#y_0V@Ko-myIH5nwNsh+3G zh5OAYDu>X8yD(oK$0sU};}h*o_~)5&A>NFlbVudA{YL=!nvVZE|1TAhSAFNrjBelj G|9=2K+_nY) literal 0 HcmV?d00001 diff --git a/english/snuffbox/.DS_Store b/english/snuffbox/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0824886bec5bf68518d426f9a7a888e5ad6126d3 GIT binary patch literal 8196 zcmeI0O>7%Q6vy9l(qz3$o5@$>B!wEVgR7fAuQ9Vx=j&racn4&z*9yRDIdUrJn+ndo6A@mMu(12 zflz@^flz@^flz_}f&#Q=i=y0N-S?wm9V!qiuqhP~?}s=Y!X^S+^sRh#P$jnjWXs7d z3$0}# z3bx_SjQHnEnT9u;X7$5)K2NE`y3NN;*UXrf=`ATy@kz7B<>juv?)G?hSKmr|eEC3U z_XDESyRyPgD@ya;p8lc9+{&2`&R_WO;-$-9e&tJn!RrKS*GY3_qb`;^Kb*0IE|Din zx_rMzm%IAwlWLmPh@qWu1F`wsd zD(hHoO6#58SMLGV;d0!iLEO2)BsMH+CiV_|v#6(djp$w5&8j2Q4C_FhiKE_yj(M zFW?GXg|Fcnd;>qg&+rTU3ctZ02#6R#4H?#8E!N@PcpvV@7Hq}+*nefxxT52RJJ`0kO5(ARJTfkdwh&47f?;vsrCBC>G z;S$=c(g#J1CKffONH#>brIor70$7pfYTKu&tW07mqJluSMFJ_h#GcB^C9)>=o_uLIpwv{+|k9`QXT4 zlAf*f>ty|7M#vGT<0KuTh;c>V$`q=^5aE~Gak9a7T>9ccED_kEZ)Gaw$W*faPW~VN UBS0?U;rdTA6R!UP#7$cM0x~GW!vFvP literal 0 HcmV?d00001 diff --git a/english/snuffbox/explore/explore.md b/english/snuffbox/explore/explore.md new file mode 100644 index 0000000000..dc71399a52 --- /dev/null +++ b/english/snuffbox/explore/explore.md @@ -0,0 +1 @@ +After the titanic sneaze rocked baseball sized holes in the marshmellow walls surrounding you. A curious thought enters your head, 'I wonder what is in them?' you ask yourself. Cautiously you aproche one of them and slowly reach out towards the nearest hole. The sweat on your brow is telling you that this is how people lose arms in horror stories, but you press on. As you hand slids into the snot created hole you feel the slime on your arm and suddenly you AWAKE! Your alarm is blaring and you realize you have drooled all over your bed again! \ No newline at end of file diff --git a/english/snuffbox/snuffbox.md b/english/snuffbox/snuffbox.md index 2d101139ae..6e49cc9188 100644 --- a/english/snuffbox/snuffbox.md +++ b/english/snuffbox/snuffbox.md @@ -4,4 +4,11 @@ quickly open the ornamental snuffbox, pinch the glowing pulverised leaves contai box and bring it up to a nostril. You then breathe in quickly to induce a terribly ferocious sneeze which expands and blows small baseball sized holes in the marshmallow walls. -Do you: \ No newline at end of file +Do you: +[Go back to sleep?](../sleep/marshmallow.md) + +[Stay puft?](../staypuft/marshmallowman.md) + +[Dig at the walls with a fork](../dig/dig.md) + +[Explore the holes](explore/explore.md) \ No newline at end of file From ed2672f783afd5c5cfffc775aa7b92b418ba6859 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Sat, 4 Jul 2015 23:06:21 -0500 Subject: [PATCH 0078/5486] Made changes per pull request added line breaks and spellchecked. --- english/snuffbox/explore/explore.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/snuffbox/explore/explore.md b/english/snuffbox/explore/explore.md index dc71399a52..d67cefeda8 100644 --- a/english/snuffbox/explore/explore.md +++ b/english/snuffbox/explore/explore.md @@ -1 +1,5 @@ -After the titanic sneaze rocked baseball sized holes in the marshmellow walls surrounding you. A curious thought enters your head, 'I wonder what is in them?' you ask yourself. Cautiously you aproche one of them and slowly reach out towards the nearest hole. The sweat on your brow is telling you that this is how people lose arms in horror stories, but you press on. As you hand slids into the snot created hole you feel the slime on your arm and suddenly you AWAKE! Your alarm is blaring and you realize you have drooled all over your bed again! \ No newline at end of file +After the titanic sneeze rocked baseball sized holes in the marshmallow walls surrounding you. A curious thought enters your head. +"I wonder what is in them?" you ask yourself. + Cautiously you approach one of them and slowly reach out towards the nearest hole. The sweat on your brow is telling you that this is how people lose arms in horror stories, but you press on. As you hand slides into the snot created hole you feel the slime on your arm and suddenly you AWAKE! + BRRRRRRRRRRRRRRRRRRRRRRRZZZZZZZZZZZZZZZZZZ!!!!! + Your alarm is blaring and you realize you have drooled all over your bed again! \ No newline at end of file From d0ee0ab9dd3b7b565181e2ce4e32e137ce5511a7 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Sat, 4 Jul 2015 23:14:07 -0500 Subject: [PATCH 0079/5486] Removed .DS_store files per pull request. --- .DS_Store | Bin 8196 -> 0 bytes english/.DS_Store | Bin 20484 -> 0 bytes english/snuffbox/.DS_Store | Bin 8196 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 english/.DS_Store delete mode 100644 english/snuffbox/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 18c24f74efa4a4e13e6a85d1ffbb076ac52c7096..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMTWl0n82-OfU>0WVYzx|!OIDgl(PDZ5K_GE^;VMW&OD|m9&h89!bUIUaW?QtW zHtK_l#3+f;#27&l)EIAgi5gzKV4^WTkdT^~c!@FbMIJO>5)=P3XSOM=eG@~%oXwo? zobzAK*>Ap?*)vN-XepQtM3qFO@F7s2&(*&aVHd}=QWA}nGJ@lYZ1Sl;JM0f;ooU|j zK+HhQK+HhQK+HhQz~#UIKeI(qW_a#PYh1?+#0*@K42b(fiVuP52*)Ibw+^ntEdZm~ z0)&OzyblOtQW2&j9FrJ^a!$E>Kop8-ivbzV_LOjEOh-5-QHB#_I3b!D(GCUS>>QU0 z-3e)laUC-dGccV2arw+8i(EQL&gA{Omu1Ue*+IwlgZlb$l*}rfJ!h_xm^WX1^yIw# z9sS;LM_>d6zs1P!4STj}Wutbx5%d?^ou21Rw2f?+Z4GDi1+AVN7`AKWCx!0owq4U3 zZt)7P>F?{1`MPa0=+Ed2+w;~ChqfE8)n)s3)^_aRZY3c;8NF&`q^W65U8=F+=Fz&; zNJIUq#=6w1rnRG^`ooH{XvOO09le92j~svgg%dBHJoWLXk_tq(6RMa(&DrU^n10U5 z@;4ElQz&!%q4umJC@VQyr0nZSl&RWPt!*0@Y*I6Nx%dh@2Ls!4{Vpr-GiLNMpSj$c z^W5kwX7psvaB>C52&`tu>9Fsy{O+9R6b4*hc<1t-9Bz*qmQ_=>^}~WpQ$Q$ZF#$d>skp<+92p*Isu+{pxkMoYRx#6$=)s>K;A;ZeSm< zt^Dp`aTa0@U?Db%EEL!=rBL^bJp*-Y@WY6&$`8}(2h4DAX%M!IdAIQgL}C#x-#nAA|Ht)h0O=;9*jo~x=}w0Ox<)*g$|IyBQ2 zpwE?36W+^eR8=Q=If(x9T20eS_!>~cWOXYwRi70qU08*P_1U4OMVIBP>ZPITMR)xM zw$2H~ExPGuPNjsx72Wx@nyMuJ3%Pzy=V+XMq@U>m{YHO7MHQB@NN;3;rqROk+=R_& z$1dzf7fZAcS(vbJ03PmwAIkJzjNyJffCpKokKu7Vfunc^&*C{8!*RTVSMeHN#~XMb zAK*iLf-i9%-%5E-$acHz7i)Z1Y{htK7?>r~R*L=q#+l#$Uz*9|tT6*I1D6E@C~fO# zYvH97e?UxKRS6HI_~_$96yY}}F%02KxQOv^JI*-qhatC9ku4qJm_)X4`QKjzIPvrU P;-9PW^FI{g6;}NNe5Nl^ diff --git a/english/.DS_Store b/english/.DS_Store deleted file mode 100644 index 33d1302f66ab2cee2a083d330d4c5faeea490d2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20484 zcmeHPYiwLc6+XxD<38MEY$we+Nz)B!tR%J*Cr*^uZByGx+LR>JU^})GgLBvSCcb2S zui1Oon>4a8Z~9O{rR^VtkZ9=xAt8|Z3lI`Qv=T);6a)nUe~=LH3kmqqKXA^>-DLg3 z*!9vpW>$00y=P|DyJyd1zB4lh0PM-T`v6V=fI*e1s0HY<0n$X?9Cf1SpqWp}_XMfFunKuci01Zs#?OK3fWG4R2GEVRM|c;NC=Hkz8uWWx;E z`Cw);>ql{0+i$R9O=VSejbU1L?eX;wTce_W%J&M7O~!s0L}$EQM08ZFi^jvkqhn#v zoAbDRRMd?**|B`qiM{S@w$Fduiw4KSY%$&1Pn2V1}=8#WgnKvp#KJq@~ z(LjI7J4VAJfu`~HU2E5gy84Fo8}7dMzFm9T4?oy5G!{-wctIR}#HC)RoG5;5(hEHI z96uh-d31IABYMk$tdsGw{g?c}9h_1hxIb_vyb=O!cE2=IA~d-QbeX|?dYV|YH^ZUH>DakS`S&>W*z?96d(tiO}1s2+q-tE zUvzs{o4PT{jW)s_a+>`xLOi#u^QwqPsn!9&=A_u~WjAU=#I@cnoaPvHO#;xL}YbLip)97i8NiV^0q zfS2(KeiA>0pT*DN6ZkBC37^BS;LGY`RU}?p=9v^rUhx$o_sFD?L!Y!23Z!;1jMJS1 z0o_j!jp=)^QaX^Mp5yW^ONtsoAybGF1%-Et3i@`5f?767vCjH%AL(LW?8Nz~$H|?O zPrmDAlKWmK9xvYahhg^my^}d3HFy2dFo+#L@Ny+XM+QkR!a`4&58P;^PrctDE6J$X zkSKkx6L@D>PyDPOUolL6jf%#rSKHeUwWRm&>zHmyU)|SsV1G;cK>Ok8Y4L<%Y~FRS z`}FYS^pjtE@ujc7{K~68`mqui7G>B_B0#=xYZ?pA}fp=fw>4e~7g0zu5Co0FCzE&5vBIV@o;;X{^lI(PUZDUq}OG&hBRN4APHC6J{1$bkUzk%Vj3nwSC<&DObVlj!xU2 z@LF?W@psxx}Li{GygKYM27wy_#P?7oA47d_g}zo;m`0F_$&Mk{y_$h zSb;VfeLXhddNTX>;eEIRn{Y24B%?n}X5T~RehN?H2guyd;}{vchXGFG$8iQffluO7 z_%yzNU&U9IDqc75W9qqh#n;}oYU=o-<4>96k4aG_Pm$82_@d%WpyLV|F2|JxWTWH7 zjoGA*7posH7FM|>;=tOQ5{JksNa_4yG4wHKCNOKVvP>Kz(ZV)sdnsC2B_P6p=*UB} zAkIp0$hYD9@I#uO{1kq*C=S^ramZepkaS8Eas(g2M zB~i%ZghD<;DCG0Y#3995%N<2IZD!GmeMq&HDub*`913*^B*}0HTu?eo2f_NA1~k<- z*j5QRnv0u?cuG1eN--qR$V%CpOae-?eGx+!f+t%IqtvZQ&}411x0?i*q>odaCTpij zfJp);$+4TQR)g@80#1t6X6-i!Efs;2Vji>(84Q-LBPYe~v>)K~${cqoq2UpNayKB8 zVJsgseG6WPAJ9+!7W@o;Ezc22Jo!_?HAtwYV17Nzk+v)3{B7rZ(JyQkyqE!NhezRuNSm8O$gBWh&O zv`HgbU4%-<*-iFNgEU%H$X2V_Ze@KHYgA{chps8AR4Zv9>#nF&t(_KW-bqtb%XAz? zK}&!#7LJNmlWm&IRJn!IaTRC~E>B@2ZXsmO>9}3kOo5QoaU2Nmm+3eTgpAM!WFQ=t z={OFA<1!t`fv_Ocai3m67_6pDa0nOZ<$*)p0GB0=<#{W0=M(Yif|HloKWdr|w zgoZ00q4{sxy+lB|-4`8o`nmk+=PId!iyuSj)jQPH`4zq6aFur)-hl^h=7Ek|ch;xz zzdZW3g2OT7aI2|OIl<@uk1ziJe`F_p(Gt)SxIHC+mB;#y_0V@Ko-myIH5nwNsh+3G zh5OAYDu>X8yD(oK$0sU};}h*o_~)5&A>NFlbVudA{YL=!nvVZE|1TAhSAFNrjBelj G|9=2K+_nY) diff --git a/english/snuffbox/.DS_Store b/english/snuffbox/.DS_Store deleted file mode 100644 index 0824886bec5bf68518d426f9a7a888e5ad6126d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeI0O>7%Q6vy9l(qz3$o5@$>B!wEVgR7fAuQ9Vx=j&racn4&z*9yRDIdUrJn+ndo6A@mMu(12 zflz@^flz@^flz_}f&#Q=i=y0N-S?wm9V!qiuqhP~?}s=Y!X^S+^sRh#P$jnjWXs7d z3$0}# z3bx_SjQHnEnT9u;X7$5)K2NE`y3NN;*UXrf=`ATy@kz7B<>juv?)G?hSKmr|eEC3U z_XDESyRyPgD@ya;p8lc9+{&2`&R_WO;-$-9e&tJn!RrKS*GY3_qb`;^Kb*0IE|Din zx_rMzm%IAwlWLmPh@qWu1F`wsd zD(hHoO6#58SMLGV;d0!iLEO2)BsMH+CiV_|v#6(djp$w5&8j2Q4C_FhiKE_yj(M zFW?GXg|Fcnd;>qg&+rTU3ctZ02#6R#4H?#8E!N@PcpvV@7Hq}+*nefxxT52RJJ`0kO5(ARJTfkdwh&47f?;vsrCBC>G z;S$=c(g#J1CKffONH#>brIor70$7pfYTKu&tW07mqJluSMFJ_h#GcB^C9)>=o_uLIpwv{+|k9`QXT4 zlAf*f>ty|7M#vGT<0KuTh;c>V$`q=^5aE~Gak9a7T>9ccED_kEZ)Gaw$W*faPW~VN UBS0?U;rdTA6R!UP#7$cM0x~GW!vFvP From 397af6a7ab0cddee926b0da2e1093ab94211d0f2 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Sat, 4 Jul 2015 23:19:16 -0500 Subject: [PATCH 0080/5486] Added line breaks per pull request. --- english/snuffbox/explore/explore.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/english/snuffbox/explore/explore.md b/english/snuffbox/explore/explore.md index d67cefeda8..8eff220dc5 100644 --- a/english/snuffbox/explore/explore.md +++ b/english/snuffbox/explore/explore.md @@ -1,5 +1,8 @@ -After the titanic sneeze rocked baseball sized holes in the marshmallow walls surrounding you. A curious thought enters your head. +After the titanic sneeze rocked baseball sized holes in the marshmallow walls surrounding you. +A curious thought enters your head. "I wonder what is in them?" you ask yourself. - Cautiously you approach one of them and slowly reach out towards the nearest hole. The sweat on your brow is telling you that this is how people lose arms in horror stories, but you press on. As you hand slides into the snot created hole you feel the slime on your arm and suddenly you AWAKE! +Cautiously you approach one of them and slowly reach out towards the nearest hole. +The sweat on your brow is telling you that this is how people lose arms in horror stories, but you press on. + As you hand slides into the snot created hole you feel the slime on your arm and suddenly you AWAKE! BRRRRRRRRRRRRRRRRRRRRRRRZZZZZZZZZZZZZZZZZZ!!!!! Your alarm is blaring and you realize you have drooled all over your bed again! \ No newline at end of file From e3f5ee734421750f7891e647ed6f4f2dba82cb31 Mon Sep 17 00:00:00 2001 From: Mike F Date: Sun, 5 Jul 2015 09:34:00 -0400 Subject: [PATCH 0081/5486] Add the go to the bathroom storyline --- english/coffee/another-coffee/another-coffee.md | 4 +++- english/coffee/another-coffee/go-pee/go-pee.md | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 english/coffee/another-coffee/go-pee/go-pee.md diff --git a/english/coffee/another-coffee/another-coffee.md b/english/coffee/another-coffee/another-coffee.md index 01c161620f..0f438102fb 100644 --- a/english/coffee/another-coffee/another-coffee.md +++ b/english/coffee/another-coffee/another-coffee.md @@ -12,4 +12,6 @@ Coffee is the hope for tired, a hug for the chilled, and a smile for a long lost [Write a novel](../novel/full-length-novel.md) -[Find stronger coffee!](../starbucks/starbucks-coffee.md) \ No newline at end of file +[Find stronger coffee!](../starbucks/starbucks-coffee.md) + +[Go to the bathroom](./go-pee/go-pee.md) diff --git a/english/coffee/another-coffee/go-pee/go-pee.md b/english/coffee/another-coffee/go-pee/go-pee.md new file mode 100644 index 0000000000..494cacd2e6 --- /dev/null +++ b/english/coffee/another-coffee/go-pee/go-pee.md @@ -0,0 +1,16 @@ +The vast amount of coffee has filled up your bladder until the pressure is more than you can bear. With nibble + +feet you rush to the bathroom, close the door, and release the flow, ah... Once you are finished, you flush the + +toilet and wash your hands. As you are getting ready to exit, you notice a small door on against the side wall. + +In your rush to urinate, you did not notice it before, but now your bladder has been emptied and your mind is + +free dwell on the curious nature of things. As you reach for the door, you ponder the wisdom of the decision + +you are about to make. Somewhere in the depths of your conscienceness, you know to enter this door is to + +leave this world behind and alter your fate forever. You reach for the handle, hoping to stop yourself but + +knowing your curiosity cannot be muted as you.... + From 6ad5f6cc0d9f487b8c1bd7cffb8c8b006f5eef5e Mon Sep 17 00:00:00 2001 From: mimafo Date: Sun, 5 Jul 2015 09:39:27 -0400 Subject: [PATCH 0082/5486] Add missing 'to' --- english/coffee/another-coffee/go-pee/go-pee.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/coffee/another-coffee/go-pee/go-pee.md b/english/coffee/another-coffee/go-pee/go-pee.md index 494cacd2e6..bc89d11d3b 100644 --- a/english/coffee/another-coffee/go-pee/go-pee.md +++ b/english/coffee/another-coffee/go-pee/go-pee.md @@ -6,7 +6,7 @@ toilet and wash your hands. As you are getting ready to exit, you notice a smal In your rush to urinate, you did not notice it before, but now your bladder has been emptied and your mind is -free dwell on the curious nature of things. As you reach for the door, you ponder the wisdom of the decision +free to dwell on the curious nature of things. As you reach for the door, you ponder the wisdom of the decision you are about to make. Somewhere in the depths of your conscienceness, you know to enter this door is to From 336de4cff4cf908478d07f9a754b4aa417f971f4 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 5 Jul 2015 10:53:29 -0300 Subject: [PATCH 0083/5486] Adicionado novo caminho para quando perguntou no stackoverflow --- .../pentefino/sono/stackoverflow/resposta/resposta.md | 1 + .../pentefino/sono/stackoverflow/semresposta/semresposta.md | 1 + .../pentefino/sono/stackoverflow/stackoverflow.md | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/resposta/resposta.md create mode 100644 portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md diff --git a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/resposta/resposta.md b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/resposta/resposta.md new file mode 100644 index 0000000000..2f18055a33 --- /dev/null +++ b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/resposta/resposta.md @@ -0,0 +1 @@ +Você agora sabe resolver o problema. \ No newline at end of file diff --git a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md new file mode 100644 index 0000000000..001e362649 --- /dev/null +++ b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md @@ -0,0 +1 @@ +Você fica louco para receber uma resposta, então você... \ No newline at end of file diff --git a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md index 7893562e18..5719f964d0 100644 --- a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md +++ b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md @@ -1 +1,5 @@ -No outro dia, você descobre que algumas pessoas responderem à sua pergunta. +No outro dia, você: + +[Recebeu uma resposta útil](./resposta/resposta.md) + +[Não recebeu resposta](./semresposta/semresposta.md) \ No newline at end of file From 7c22609a2647dc7b45fc6148ece04af8e9d2675a Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 5 Jul 2015 11:02:31 -0300 Subject: [PATCH 0084/5486] Made changes to make it auto-mergable --- .../pentefino/sono/stackoverflow/stackoverflow.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md index 5719f964d0..ef1d4f2cfe 100644 --- a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md +++ b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md @@ -1,5 +1,5 @@ -No outro dia, você: +No outro dia, você descobre que algumas pessoas responderem à sua pergunta. -[Recebeu uma resposta útil](./resposta/resposta.md) +[A resposta é útil](./resposta/resposta.md) -[Não recebeu resposta](./semresposta/semresposta.md) \ No newline at end of file +[Não recebeu uma resposta que ajuda](./semresposta/semresposta.md) \ No newline at end of file From 5437e9cfbecffbd0b52e334bc1bc7c17e94f2ba5 Mon Sep 17 00:00:00 2001 From: Jiesi Ren Date: Sun, 5 Jul 2015 13:09:31 -0400 Subject: [PATCH 0085/5486] Add Skyrim link in wiki page --- english/wikipedia/wiki.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/wikipedia/wiki.md b/english/wikipedia/wiki.md index d8f3cb3d7b..a0a7970870 100644 --- a/english/wikipedia/wiki.md +++ b/english/wikipedia/wiki.md @@ -21,3 +21,5 @@ Until you get bored and go explore [here](https://www.urbandictionary.com) inste Then after you explore the website, you learn a few neat tricks. [Play minecraft](../you-are-in-minecraft/minecraft.md) + +[Play Skyrim](../fus-roh-dah/fus-roh-dah.md) From 3671b81f819b25fd281c8bc1463ada9716fff88d Mon Sep 17 00:00:00 2001 From: Jiesi Ren Date: Sun, 5 Jul 2015 13:29:43 -0400 Subject: [PATCH 0086/5486] Add door path to timetunnel page --- english/timeTunnel/timeTunnel.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/english/timeTunnel/timeTunnel.md b/english/timeTunnel/timeTunnel.md index 2529de3c44..2c137db201 100644 --- a/english/timeTunnel/timeTunnel.md +++ b/english/timeTunnel/timeTunnel.md @@ -2,4 +2,14 @@ Upon exiting the time tunnel, it is clear you have entered the future. There are flying cars complete the the whirring noise. However, marshmellows have been banned. This must be corrected, but how? -Suddenly, a cat walks up and says "Is that a marshmallow on your fork?" \ No newline at end of file +Suddenly, a cat walks up and says "Is that a marshmallow on your fork?" + +You quickly stuff the marshmellow in your mouth and garble out a quick, "no". + +The cat suspiciously notes, "alrighty then, nyaan. Good thing it wasn't, otherwise, I would've had to take you away, nyaan. I'll be off now!" + +As you watch the cat pounce off into the distance, you feel a moment of relief, as you had almost been captured by the totalitarian state of cats. What a strange future, you think to yourself. + +You look around to develop a better sense of where in the world you are right now and you spot a mysteriously large, robust door, decorated with an assortment of sweets, the likes of which, are rarely seen. + +[Walk closer and inspect the door](../world-war-marshmallows/world-war-marshmallows.md) From 28e7754f03c9ee5572a540ee19e11004a7ad3487 Mon Sep 17 00:00:00 2001 From: Jiesi Ren Date: Sun, 5 Jul 2015 13:41:48 -0400 Subject: [PATCH 0087/5486] Fix lines that are over 120 characters. --- english/timeTunnel/timeTunnel.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/english/timeTunnel/timeTunnel.md b/english/timeTunnel/timeTunnel.md index 2c137db201..46eda8acac 100644 --- a/english/timeTunnel/timeTunnel.md +++ b/english/timeTunnel/timeTunnel.md @@ -8,8 +8,12 @@ You quickly stuff the marshmellow in your mouth and garble out a quick, "no". The cat suspiciously notes, "alrighty then, nyaan. Good thing it wasn't, otherwise, I would've had to take you away, nyaan. I'll be off now!" -As you watch the cat pounce off into the distance, you feel a moment of relief, as you had almost been captured by the totalitarian state of cats. What a strange future, you think to yourself. +As you watch the cat pounce off into the distance, you feel a moment of relief, +as you had almost been captured by the totalitarian state of cats. +What a strange future, you think to yourself. -You look around to develop a better sense of where in the world you are right now and you spot a mysteriously large, robust door, decorated with an assortment of sweets, the likes of which, are rarely seen. +You look around to develop a better sense of where in the world you are right now +and you spot a mysteriously large, robust door, +decorated with an assortment of sweets, the likes of which, are rarely seen. [Walk closer and inspect the door](../world-war-marshmallows/world-war-marshmallows.md) From 2efe943039af057e652911785a9d87aae02118cf Mon Sep 17 00:00:00 2001 From: Jiesi Ren Date: Sun, 5 Jul 2015 13:43:43 -0400 Subject: [PATCH 0088/5486] Fix quoted line for less than 120 characters. --- english/timeTunnel/timeTunnel.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/timeTunnel/timeTunnel.md b/english/timeTunnel/timeTunnel.md index 46eda8acac..5e7e94e3d9 100644 --- a/english/timeTunnel/timeTunnel.md +++ b/english/timeTunnel/timeTunnel.md @@ -6,7 +6,8 @@ Suddenly, a cat walks up and says "Is that a marshmallow on your fork?" You quickly stuff the marshmellow in your mouth and garble out a quick, "no". -The cat suspiciously notes, "alrighty then, nyaan. Good thing it wasn't, otherwise, I would've had to take you away, nyaan. I'll be off now!" +The cat suspiciously notes, "alrighty then, nyaan. Good thing it wasn't, otherwise, +I would've had to take you away, nyaan. I'll be off now!" As you watch the cat pounce off into the distance, you feel a moment of relief, as you had almost been captured by the totalitarian state of cats. From a7477b2c4c747db5d270cc87a97af75647b2caa7 Mon Sep 17 00:00:00 2001 From: Marc van den Hoogen Date: Sun, 5 Jul 2015 22:04:14 +0200 Subject: [PATCH 0089/5486] added one line --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index ac318284e7..e414daf456 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -2,6 +2,8 @@ One morning, you wake up in a strange room with marshmallows for walls. +A sound from a Hitchcock movie fills the room, then quickly fades away. + Thinking back, there are no memories to suggest that this should have been anything but an ordinary morning. You didn't go out last night, you don't From a191d39fbabdf125dd62d469d847f56cb62d57fa Mon Sep 17 00:00:00 2001 From: Shaun Date: Sun, 5 Jul 2015 22:16:44 -0400 Subject: [PATCH 0090/5486] Add 'search for gluten' story --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 141db62365..8dc2573f30 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -339,4 +339,6 @@ Do you: [Play some GTA5](play-gta5/play-gta5.md) -[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) \ No newline at end of file +[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) + +[Search for gluten] (search-for-gluten/search-for-gluten.md) \ No newline at end of file From 87433927cdb31f739995f4873a49a0976bd9049b Mon Sep 17 00:00:00 2001 From: Shaun Date: Sun, 5 Jul 2015 22:20:01 -0400 Subject: [PATCH 0091/5486] Create the search for gluten story --- .../book-of-mormon/book-of-mormon.md | 2 ++ english/search-for-gluten/search-for-gluten.md | 13 +++++++++++++ english/search-for-gluten/starbucks/starbucks.md | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 english/search-for-gluten/book-of-mormon/book-of-mormon.md create mode 100644 english/search-for-gluten/search-for-gluten.md create mode 100644 english/search-for-gluten/starbucks/starbucks.md diff --git a/english/search-for-gluten/book-of-mormon/book-of-mormon.md b/english/search-for-gluten/book-of-mormon/book-of-mormon.md new file mode 100644 index 0000000000..5621e98786 --- /dev/null +++ b/english/search-for-gluten/book-of-mormon/book-of-mormon.md @@ -0,0 +1,2 @@ +You finally reach the ticket booth for Book the of Mormon and the teller informs you that tickets are $300. +Calmly, you ask the teller if they accept marshmellows as payment. \ No newline at end of file diff --git a/english/search-for-gluten/search-for-gluten.md b/english/search-for-gluten/search-for-gluten.md new file mode 100644 index 0000000000..f5415719fb --- /dev/null +++ b/english/search-for-gluten/search-for-gluten.md @@ -0,0 +1,13 @@ +It dawns upon you that you could be inside a gluten-sensitive marshmellow stomach so you begin to search for your +box of Wheat Thins. Voila! There they are! Immediately you grind the salty gluten crackers into a fine powder and smear +them all over the intestinal marshmellow walls. Sure enough, within seconds, the gooey walls begin to frighfully +tremble with a horrible thunder. Boom!! You're ejected so fast from the marshmellow creature that it takes an hour +to regain your vision. You find yourself next to a rusty dumpster in Times Square. The dumpster smells better than you. + +Do you? + +[Walk to Starbucks and stand in line for an hour?](starbucks/starbucks.md) + +or + +[Attempt to score tickets for the Book of Mormon?](book-of-mormon/book-of-mormon.md) \ No newline at end of file diff --git a/english/search-for-gluten/starbucks/starbucks.md b/english/search-for-gluten/starbucks/starbucks.md new file mode 100644 index 0000000000..54df5cad38 --- /dev/null +++ b/english/search-for-gluten/starbucks/starbucks.md @@ -0,0 +1,2 @@ +After tripping over the threshold of the starbucks door you realize that everyone inside is singing +"Kumbaya, my latte, kumbaya." Whaaaaaaat? \ No newline at end of file From 7249bba0eff08b481256366acea55deac1bee865 Mon Sep 17 00:00:00 2001 From: acamacho Date: Sun, 5 Jul 2015 21:50:42 -0700 Subject: [PATCH 0092/5486] Added section on destroying Morpheus but becoming the One --- english/movie-ripoffs/matrix/matrix.md | 4 +++- english/movie-ripoffs/selfaware/selfaware.md | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 english/movie-ripoffs/selfaware/selfaware.md diff --git a/english/movie-ripoffs/matrix/matrix.md b/english/movie-ripoffs/matrix/matrix.md index e6e87eafa5..ca4bb89d86 100644 --- a/english/movie-ripoffs/matrix/matrix.md +++ b/english/movie-ripoffs/matrix/matrix.md @@ -30,4 +30,6 @@ gooey liquid smashes Morpheus across the room. Choose the next spell: ["Apparate" to get the hell out of here](../hogwarts/hogwarts.md) -["Avada Kedavra" to finish Morpheus off](../matrix-boss/matrix-boss.md) \ No newline at end of file +["Avada Kedavra" to finish Morpheus off](../matrix-boss/matrix-boss.md) + +["Woah" just to see what happens](../selfaware/selfaware.md) \ No newline at end of file diff --git a/english/movie-ripoffs/selfaware/selfaware.md b/english/movie-ripoffs/selfaware/selfaware.md new file mode 100644 index 0000000000..3542a1c38b --- /dev/null +++ b/english/movie-ripoffs/selfaware/selfaware.md @@ -0,0 +1,20 @@ +The wand falls from your hand as suddenly you realize you can see the code. + +You parry and block Morpheus's incoming blows with ease and land a kick on +his chest that sends him flying into the wall. + +He staggers to his feet looking at you with sheer terror. + +You run straight at him and jump headlong into his chest. Once inside his +program, you delete his system32 file which causes him to explode into a +thousand tiny fragments. + +Once you are reassembled, you notice irregularities in the code you see +spilling all around you. + +You realize you are actually trapped within a collaborative coding program, +at the mercy of people who until recently didn't know what mkdir did. + +You try to delete yourself, but the creator, realizing you are trying to escape, +stops you and conscripts you into administrative duty on McAfee for the rest of +your life. \ No newline at end of file From f0b5ea3783ce3195a42d80f17d78965d4a5dcc36 Mon Sep 17 00:00:00 2001 From: Kablys Date: Mon, 6 Jul 2015 20:01:43 +0300 Subject: [PATCH 0093/5486] Add start of the adventure in lithuanian --- lithuanian/startas.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 lithuanian/startas.md diff --git a/lithuanian/startas.md b/lithuanian/startas.md new file mode 100644 index 0000000000..006d5cbbdf --- /dev/null +++ b/lithuanian/startas.md @@ -0,0 +1,3 @@ +Čia viskas prasidėjo + +Visiškoje tamsoje jis turėjo pasirinkti From 1e6cb16a106847bfae37c6c9f36a3bf51ef705c3 Mon Sep 17 00:00:00 2001 From: Kablys Date: Mon, 6 Jul 2015 20:12:03 +0300 Subject: [PATCH 0094/5486] Add first story branch --- lithuanian/startas.md | 4 ++++ lithuanian/uzsimerkti/vejas.md | 1 + 2 files changed, 5 insertions(+) create mode 100644 lithuanian/uzsimerkti/vejas.md diff --git a/lithuanian/startas.md b/lithuanian/startas.md index 006d5cbbdf..51cbb2322f 100644 --- a/lithuanian/startas.md +++ b/lithuanian/startas.md @@ -1,3 +1,7 @@ Čia viskas prasidėjo Visiškoje tamsoje jis turėjo pasirinkti + +[Užsimerkti](uzsimerkti/vejas.md) + +[Pradėti rėkti]() diff --git a/lithuanian/uzsimerkti/vejas.md b/lithuanian/uzsimerkti/vejas.md new file mode 100644 index 0000000000..7116d9ce09 --- /dev/null +++ b/lithuanian/uzsimerkti/vejas.md @@ -0,0 +1 @@ +Po akimirkos jis pajuto švelnų vėją From 0e2f685370a7ccbc92bb420f18da9b07b68c55bf Mon Sep 17 00:00:00 2001 From: Kablys Date: Mon, 6 Jul 2015 20:17:38 +0300 Subject: [PATCH 0095/5486] Add second branch --- lithuanian/rekti/niekas.md | 5 +++++ lithuanian/startas.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 lithuanian/rekti/niekas.md diff --git a/lithuanian/rekti/niekas.md b/lithuanian/rekti/niekas.md new file mode 100644 index 0000000000..e8a6d29b73 --- /dev/null +++ b/lithuanian/rekti/niekas.md @@ -0,0 +1,5 @@ +Bet niekas neįvyksta + +[Užsimerkti](../uzsimerkti/vejas.md) + +[Vėl rėkti](rekti.md) diff --git a/lithuanian/startas.md b/lithuanian/startas.md index 51cbb2322f..1476c909a2 100644 --- a/lithuanian/startas.md +++ b/lithuanian/startas.md @@ -4,4 +4,4 @@ Visiškoje tamsoje jis turėjo pasirinkti [Užsimerkti](uzsimerkti/vejas.md) -[Pradėti rėkti]() +[Pradėti rėkti](rekti/niekas.md) From a29131fa424dbb7f4e223d052f06aeb05eb17cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kopeck=C3=BD?= Date: Mon, 6 Jul 2015 19:19:03 +0200 Subject: [PATCH 0096/5486] =?UTF-8?q?Pokra=C4=8Dov=C3=A1n=C3=AD=20sp=C3=A1?= =?UTF-8?q?nku?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- czech/druhy_bok/spanek.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/czech/druhy_bok/spanek.md b/czech/druhy_bok/spanek.md index acc747cc92..2a1a6071aa 100644 --- a/czech/druhy_bok/spanek.md +++ b/czech/druhy_bok/spanek.md @@ -1 +1 @@ -Spíš \ No newline at end of file +Spíš, ale ve spánku si uvědomuješ sama sebe. Divné. Dokážeš ovlivnit své myšlenky. Co uděláš? \ No newline at end of file From 9d1499f121d4712d7c7cce027667150590ac2b95 Mon Sep 17 00:00:00 2001 From: Kablys Date: Mon, 6 Jul 2015 20:20:49 +0300 Subject: [PATCH 0097/5486] Fix link --- lithuanian/rekti/niekas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lithuanian/rekti/niekas.md b/lithuanian/rekti/niekas.md index e8a6d29b73..d0c849dba9 100644 --- a/lithuanian/rekti/niekas.md +++ b/lithuanian/rekti/niekas.md @@ -2,4 +2,4 @@ Bet niekas neįvyksta [Užsimerkti](../uzsimerkti/vejas.md) -[Vėl rėkti](rekti.md) +[Vėl rėkti](./rekti.md) From 94c9f156876af1fb49cf7003c75fa873f90d3aaa Mon Sep 17 00:00:00 2001 From: Kablys Date: Mon, 6 Jul 2015 20:26:20 +0300 Subject: [PATCH 0098/5486] Update niekas.md --- lithuanian/rekti/niekas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lithuanian/rekti/niekas.md b/lithuanian/rekti/niekas.md index d0c849dba9..a78a7937de 100644 --- a/lithuanian/rekti/niekas.md +++ b/lithuanian/rekti/niekas.md @@ -2,4 +2,4 @@ Bet niekas neįvyksta [Užsimerkti](../uzsimerkti/vejas.md) -[Vėl rėkti](./rekti.md) +[Vėl rėkti](./niekas.md) From 6a2c108af1c07f8d18f03972022c1b5e7bd2d9b0 Mon Sep 17 00:00:00 2001 From: Kablys Date: Mon, 6 Jul 2015 20:49:55 +0300 Subject: [PATCH 0099/5486] Add lithuanian option --- language.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/language.md b/language.md index 21ce8e7c81..65bf5c26a2 100644 --- a/language.md +++ b/language.md @@ -95,4 +95,6 @@ click vaj tlhIngan Hol Dajatlh'a' [naDev click](klingon/start.md) Po flisni shqip, [shkoni ketu](albanian/hyrje.md) നിങ്ങളുടെ ഭാഷ മലയാളം ആണെങ്കിൽ, -[ഇവിടെ ക്ലിക്ക് ചെയ്യുക](Malayalam/malayalam.md) \ No newline at end of file +[ഇവിടെ ക്ലിക്ക് ചെയ്യുക](Malayalam/malayalam.md) + +Jei kalbi lietuviškai [spausk čia](lithuanian/startas.md) From 61514e835ffc223c8cbddc0684bc1a674d5fe1d1 Mon Sep 17 00:00:00 2001 From: Kablys Date: Mon, 6 Jul 2015 21:05:09 +0300 Subject: [PATCH 0100/5486] Update language.md Problems with whitespace --- language.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/language.md b/language.md index 65bf5c26a2..ed1ade30b7 100644 --- a/language.md +++ b/language.md @@ -1,5 +1,7 @@ If you speak English, [go here](english/marshmallow.md). +Jei kalbi lietuviškai [spausk čia](lithuanian/startas.md) + If you speak Punjabi, [go here](punjabi/punjabi.md). यिद तपाई नेपाली बोलनुहुनछ भने, [यहाँ िथचनुहोस ।] (nepali/about_nepal.md) @@ -96,5 +98,3 @@ Po flisni shqip, [shkoni ketu](albanian/hyrje.md) നിങ്ങളുടെ ഭാഷ മലയാളം ആണെങ്കിൽ, [ഇവിടെ ക്ലിക്ക് ചെയ്യുക](Malayalam/malayalam.md) - -Jei kalbi lietuviškai [spausk čia](lithuanian/startas.md) From 50ced850992ef4d8723efa33096de0086353fe02 Mon Sep 17 00:00:00 2001 From: Kim Ruddock Date: Tue, 7 Jul 2015 08:33:53 +0100 Subject: [PATCH 0101/5486] Added polar bear attack option --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 397bb73d85..1abd66e14d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -347,4 +347,6 @@ Do you: [Ask a question on Quora?](ask-on-quora/ask-on-quora.md) -[go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) \ No newline at end of file +[go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) + +[Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) From 2fa979b79df8fc53f64b4f3e81e1e58f053ca663 Mon Sep 17 00:00:00 2001 From: Kim Ruddock Date: Tue, 7 Jul 2015 08:34:33 +0100 Subject: [PATCH 0102/5486] Added polar bear attack page --- english/polar-bear-attack/polar-bear-attack.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/polar-bear-attack/polar-bear-attack.md diff --git a/english/polar-bear-attack/polar-bear-attack.md b/english/polar-bear-attack/polar-bear-attack.md new file mode 100644 index 0000000000..1f2d80b51d --- /dev/null +++ b/english/polar-bear-attack/polar-bear-attack.md @@ -0,0 +1,5 @@ +You leap and jump on the back of the polar bear. It bucks and tries to throw +you off but fortunately your experience as an amateur bull-riding champion +stands you in good stead. You tame the wild beast and charge at the +marshmallow barrier before you. The polar bear rips and tears at your pink +and white squishy prison. Eventually you emerge in and entirely new place... From c5d6dc38f4c5d83daf5084509fcec9437e04960e Mon Sep 17 00:00:00 2001 From: David Clark Date: Tue, 7 Jul 2015 16:00:02 +0200 Subject: [PATCH 0103/5486] Are my pillows marshmallows --- english/light-fire/magic-world/follow/dream/fight/fight.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/light-fire/magic-world/follow/dream/fight/fight.md b/english/light-fire/magic-world/follow/dream/fight/fight.md index e6bdf60637..8c3508a07d 100644 --- a/english/light-fire/magic-world/follow/dream/fight/fight.md +++ b/english/light-fire/magic-world/follow/dream/fight/fight.md @@ -2,4 +2,6 @@ Looks like it was a bad dream. Good Morning!! What a relief! +Apart from a splitting headache it appears that everything is normal. Just as you are about to breath a sigh of relief you notice that something seems to have been chewing on your pillows, and what is worse, that it may have been you. And why would they taste like marshmallows. + Wait you have a sword under your bed.... From 2c7510cee41e2316564a3d221e63ccfe7c2214b6 Mon Sep 17 00:00:00 2001 From: David Clark Date: Tue, 7 Jul 2015 16:06:31 +0200 Subject: [PATCH 0104/5486] Added some line breaks --- english/light-fire/magic-world/follow/dream/fight/fight.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/light-fire/magic-world/follow/dream/fight/fight.md b/english/light-fire/magic-world/follow/dream/fight/fight.md index 8c3508a07d..85f983461a 100644 --- a/english/light-fire/magic-world/follow/dream/fight/fight.md +++ b/english/light-fire/magic-world/follow/dream/fight/fight.md @@ -2,6 +2,8 @@ Looks like it was a bad dream. Good Morning!! What a relief! -Apart from a splitting headache it appears that everything is normal. Just as you are about to breath a sigh of relief you notice that something seems to have been chewing on your pillows, and what is worse, that it may have been you. And why would they taste like marshmallows. +Apart from a splitting headache it appears that everything is normal. +Just as you are about to breath a sigh of relief you notice that something seems to have been chewing on your pillows. +What is worse, that it may have been you. And why would they taste like marshmallows. Wait you have a sword under your bed.... From 3675e3208a22513afd3c71e6d353b1bb9027a822 Mon Sep 17 00:00:00 2001 From: WhiteElias Date: Tue, 7 Jul 2015 15:52:55 -0400 Subject: [PATCH 0105/5486] Almost done --- english/reddit/outside_subreddit/r_outside.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/reddit/outside_subreddit/r_outside.md b/english/reddit/outside_subreddit/r_outside.md index 91d5ddf926..052c48b403 100644 --- a/english/reddit/outside_subreddit/r_outside.md +++ b/english/reddit/outside_subreddit/r_outside.md @@ -4,4 +4,7 @@ Your fellow redditors at r/outside have assigned you a quest to Camelot and have Basic Wooden Sword +and some + +[coconuts](http://static.guim.co.uk/sys-images/Film/Pix/pictures/2005/08/22/dounecastleAAAAAA.jpg) +1 to ATK \ No newline at end of file From f33aa1c4465cb7299e1514d040f450929b45cb34 Mon Sep 17 00:00:00 2001 From: "Amaresh R. Joshi" Date: Tue, 7 Jul 2015 17:16:19 -0400 Subject: [PATCH 0106/5486] Add a new lisp page and a link to it from /selfaware --- english/lisp/lisp.md | 1 + english/movie-ripoffs/selfaware/selfaware.md | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/lisp/lisp.md diff --git a/english/lisp/lisp.md b/english/lisp/lisp.md new file mode 100644 index 0000000000..dd6df893ff --- /dev/null +++ b/english/lisp/lisp.md @@ -0,0 +1 @@ +The LISP interpreter starts with a flash of green flame! diff --git a/english/movie-ripoffs/selfaware/selfaware.md b/english/movie-ripoffs/selfaware/selfaware.md index 3542a1c38b..a864f0e579 100644 --- a/english/movie-ripoffs/selfaware/selfaware.md +++ b/english/movie-ripoffs/selfaware/selfaware.md @@ -17,4 +17,8 @@ at the mercy of people who until recently didn't know what mkdir did. You try to delete yourself, but the creator, realizing you are trying to escape, stops you and conscripts you into administrative duty on McAfee for the rest of -your life. \ No newline at end of file +your life. + +But you realize you know lisp and therefore can devise a means of escape. + +["Run CL" to fire up the LISP interpreter](../../../lisp/lisp.md) From 74122ff1eb224bf890797a9949f756cd015e6621 Mon Sep 17 00:00:00 2001 From: "Amaresh R. Joshi" Date: Tue, 7 Jul 2015 17:21:36 -0400 Subject: [PATCH 0107/5486] Change flame color in english/lisp/lisp.md --- english/lisp/lisp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/lisp/lisp.md b/english/lisp/lisp.md index dd6df893ff..3caa853d04 100644 --- a/english/lisp/lisp.md +++ b/english/lisp/lisp.md @@ -1 +1 @@ -The LISP interpreter starts with a flash of green flame! +The LISP interpreter starts with a flash of blue-green flame! From 390fadf5037a6dc714fcdba77d7e70b0d68d83e5 Mon Sep 17 00:00:00 2001 From: MauriceBuiten Date: Wed, 8 Jul 2015 14:18:15 +0200 Subject: [PATCH 0108/5486] Add option plassen --- dutch/bos/ontvoering/meehelpen/meehelpen.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dutch/bos/ontvoering/meehelpen/meehelpen.md b/dutch/bos/ontvoering/meehelpen/meehelpen.md index 889d16bf22..5b90fd4a48 100644 --- a/dutch/bos/ontvoering/meehelpen/meehelpen.md +++ b/dutch/bos/ontvoering/meehelpen/meehelpen.md @@ -5,4 +5,6 @@ Een sterke man kunnen ze goed gebruiken omdat de lijkzak erg zwaar is. Ze houden je goed in de gaten, hoe red je je nou uit deze situatie? Je maakt een slechte grap over de vorige man die je zo versleept hebt en hoe -goed die [klus](klus/geld-verdienen.md) betaalde. \ No newline at end of file +goed die [klus](klus/geld-verdienen.md) betaalde. + +Je zegt dat je even moet [plassen](klus/plassen.md), en je loopt richting de bosjes. \ No newline at end of file From f28ddf10e4bbf8012b24ecf28e27ccd5126cb03d Mon Sep 17 00:00:00 2001 From: MauriceBuiten Date: Wed, 8 Jul 2015 14:26:58 +0200 Subject: [PATCH 0109/5486] Add plassen.md file --- dutch/bos/ontvoering/meehelpen/klus/plassen.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 dutch/bos/ontvoering/meehelpen/klus/plassen.md diff --git a/dutch/bos/ontvoering/meehelpen/klus/plassen.md b/dutch/bos/ontvoering/meehelpen/klus/plassen.md new file mode 100644 index 0000000000..912a84888c --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/klus/plassen.md @@ -0,0 +1 @@ +Zodra je de bosjes bereikt hebt.... \ No newline at end of file From e9460335c7f27aa884d639e977786e78925a79b6 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 8 Jul 2015 20:41:56 +0200 Subject: [PATCH 0110/5486] Add lucid dreaming line --- czech/druhy_bok/spanek.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/czech/druhy_bok/spanek.md b/czech/druhy_bok/spanek.md index 2a1a6071aa..dccfb6b01e 100644 --- a/czech/druhy_bok/spanek.md +++ b/czech/druhy_bok/spanek.md @@ -1 +1,3 @@ -Spíš, ale ve spánku si uvědomuješ sama sebe. Divné. Dokážeš ovlivnit své myšlenky. Co uděláš? \ No newline at end of file +Spíš, ale ve spánku si uvědomuješ sama sebe. Divné. Dokážeš ovlivnit své myšlenky. Co uděláš? +Spoustu lidí chce létat a ve spánku, pokud jsme si vědomi sami sebe, můžeme. Existuje +i odborný termín - anglicky lucid dreaming. \ No newline at end of file From cf9ed63e1df77e66824f0da5c210364387c23261 Mon Sep 17 00:00:00 2001 From: quan Date: Wed, 8 Jul 2015 19:28:14 -0700 Subject: [PATCH 0111/5486] Add sentence to continue-to-sing --- english/sing/continue/continue-to-sing.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/sing/continue/continue-to-sing.md b/english/sing/continue/continue-to-sing.md index 73814131c7..69757620be 100644 --- a/english/sing/continue/continue-to-sing.md +++ b/english/sing/continue/continue-to-sing.md @@ -6,4 +6,6 @@ How long can you keep this going? You must really work out that larynx. -Do they call you the Iron Lung? Because they should. \ No newline at end of file +Do they call you the Iron Lung? Because they should. + +You start to feel something in your throat. From 8148a4ca81d8487e9ab34ea534ac50694b1ce35c Mon Sep 17 00:00:00 2001 From: DSarker Date: Thu, 9 Jul 2015 00:16:00 -0400 Subject: [PATCH 0112/5486] Added "question" option to /make-friends --- english/make-friends/make-friends.md | 2 ++ english/make-friends/question/question.md | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 english/make-friends/question/question.md diff --git a/english/make-friends/make-friends.md b/english/make-friends/make-friends.md index 0e30ad3e55..56e8e20dfd 100644 --- a/english/make-friends/make-friends.md +++ b/english/make-friends/make-friends.md @@ -13,3 +13,5 @@ Do you: [Attempt to speak the marshmallowish language](marshmallowish/marshmallowish.md) [Have a cup of coffee?](../coffee/coffee.md) + +[Ask the marshmellow man, "What's it all for?"](../question/question.md) \ No newline at end of file diff --git a/english/make-friends/question/question.md b/english/make-friends/question/question.md new file mode 100644 index 0000000000..e23f1ed86d --- /dev/null +++ b/english/make-friends/question/question.md @@ -0,0 +1,13 @@ +"Why, Mr. Marshmellow Man? Why, why? Why do you do it? Why, why get up? Why keep fighting? Do you believe you're + +fighting... for something? For more than your survival? Can you tell me what it is? Do you even know? Is it freedom? + +Or truth? Perhaps peace? Could it be for love? Illusions, Mr. Marshmellow Man. Vagaries of perception. Temporary + +constructs of a feeble marshmellow intellect trying desperately to justify an existence that is without meaning + +or purpose. And all of them as artificial as the marshmellow room itself, although... only a marshmellow mind could + +invent something as insipid as love. You must be able to see it, Mr. Marshmellow Man. You must know it by now. + +You can't win. It's pointless to keep fighting. Why, Mr. Marshmellow Man? Why? Why do you persist?" \ No newline at end of file From 5c56d6bbd9aeabb41daa0f0e5c7d6b6f17a925f6 Mon Sep 17 00:00:00 2001 From: mohsinulhaq Date: Thu, 9 Jul 2015 11:58:34 +0530 Subject: [PATCH 0113/5486] Commit suicide --- english/commit-suicide/suicide.md | 2 ++ english/marshmallow.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/commit-suicide/suicide.md diff --git a/english/commit-suicide/suicide.md b/english/commit-suicide/suicide.md new file mode 100644 index 0000000000..6a53ca646c --- /dev/null +++ b/english/commit-suicide/suicide.md @@ -0,0 +1,2 @@ +Click [here](http://www.addictdepression.com/suicide-methods/) for some ideas. +However, you must consider [these](http://lostallhope.com/things-consider) matters first. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 1abd66e14d..8eb64c210a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -350,3 +350,5 @@ Do you: [go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) [Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) + +[Commit suicide](commit-suicide/suicide.md) From 71543dec7e5485b38d37ae93a1f18baca98d5939 Mon Sep 17 00:00:00 2001 From: MauriceBuiten Date: Thu, 9 Jul 2015 18:26:40 +0200 Subject: [PATCH 0114/5486] Add seperate folder with 3 choices. --- dutch/bos/ontvoering/meehelpen/meehelpen.md | 2 +- dutch/plassen/lopen/lopen.md | 2 ++ dutch/plassen/mobiel/mobiel.md | 2 ++ dutch/plassen/plast/plast.md | 2 ++ dutch/plassen/watnu.md | 7 +++++++ 5 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 dutch/plassen/lopen/lopen.md create mode 100644 dutch/plassen/mobiel/mobiel.md create mode 100644 dutch/plassen/plast/plast.md create mode 100644 dutch/plassen/watnu.md diff --git a/dutch/bos/ontvoering/meehelpen/meehelpen.md b/dutch/bos/ontvoering/meehelpen/meehelpen.md index 5b90fd4a48..2a7c380b24 100644 --- a/dutch/bos/ontvoering/meehelpen/meehelpen.md +++ b/dutch/bos/ontvoering/meehelpen/meehelpen.md @@ -7,4 +7,4 @@ Ze houden je goed in de gaten, hoe red je je nou uit deze situatie? Je maakt een slechte grap over de vorige man die je zo versleept hebt en hoe goed die [klus](klus/geld-verdienen.md) betaalde. -Je zegt dat je even moet [plassen](klus/plassen.md), en je loopt richting de bosjes. \ No newline at end of file +Je zegt dat je even moet [plassen](plassen/watnu.md), en je loopt richting de bosjes. \ No newline at end of file diff --git a/dutch/plassen/lopen/lopen.md b/dutch/plassen/lopen/lopen.md new file mode 100644 index 0000000000..b72565efce --- /dev/null +++ b/dutch/plassen/lopen/lopen.md @@ -0,0 +1,2 @@ +Je begint te rennen en kijkt na 50 meter om, je ziet de zware jongens achter je aan rennen. +Wat doe je? \ No newline at end of file diff --git a/dutch/plassen/mobiel/mobiel.md b/dutch/plassen/mobiel/mobiel.md new file mode 100644 index 0000000000..ec5920d390 --- /dev/null +++ b/dutch/plassen/mobiel/mobiel.md @@ -0,0 +1,2 @@ +Je drukt 112 in op je mobiel maar de toetsen maken geluid en de zware jongens horen het. +Wat doe je? \ No newline at end of file diff --git a/dutch/plassen/plast/plast.md b/dutch/plassen/plast/plast.md new file mode 100644 index 0000000000..cbd8013900 --- /dev/null +++ b/dutch/plassen/plast/plast.md @@ -0,0 +1,2 @@ +Je doet net alsof je plast, maar een van de zware jongens vertrouwt het niet. +Hij komt op je aflopen. Wat doe je? \ No newline at end of file diff --git a/dutch/plassen/watnu.md b/dutch/plassen/watnu.md new file mode 100644 index 0000000000..78f79db789 --- /dev/null +++ b/dutch/plassen/watnu.md @@ -0,0 +1,7 @@ +Zodra je de bosjes bereikt hebt... + +Zet je het op een [lopen](lopen/lopen.md). + +Uit het zicht pak je je [mobiel](mobiel/mobiel.md) om 112 te bellen. + +Je bedenkt je en doet net alsof je [plast](plast/plast.md). \ No newline at end of file From 02babd8566163ee2923ca861075e3c9dc298d393 Mon Sep 17 00:00:00 2001 From: Sarah Varki Date: Thu, 9 Jul 2015 14:27:31 -0400 Subject: [PATCH 0115/5486] add shrunken option --- english/coffee/drink-tea/drink-hot-tea.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/coffee/drink-tea/drink-hot-tea.md b/english/coffee/drink-tea/drink-hot-tea.md index d5fd809f43..9568ed6239 100644 --- a/english/coffee/drink-tea/drink-hot-tea.md +++ b/english/coffee/drink-tea/drink-hot-tea.md @@ -5,3 +5,5 @@ You see a bowl of chocolates and sneakily eat one. [Everything around you seems to grow](alice/alice-in-wonderland.md) +[Everything around you seems to shrink](shrunk/shrunken.md) + From ba598da74b06e3cdbe5e778a8e21467806950d70 Mon Sep 17 00:00:00 2001 From: Karina Zhou Date: Thu, 9 Jul 2015 13:36:55 -0700 Subject: [PATCH 0116/5486] Add lines in Interstellar story. --- Chinese/Interstellar/Interstellar.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Chinese/Interstellar/Interstellar.md b/Chinese/Interstellar/Interstellar.md index 2b1f6a7f49..d48d39b129 100644 --- a/Chinese/Interstellar/Interstellar.md +++ b/Chinese/Interstellar/Interstellar.md @@ -6,4 +6,10 @@ 当画面来到最后一幕：五指山下，悟空蓬头垢面，三藏袈裟翩翩，正站在他面前，对他说了一句：“荆轲刺秦王”。 -悟空从中回过神来，撕心裂肺地喊出：“穿山甲到底说了什么！”。然后突然听到台下有人大叫：“王尼玛我要给你生猴子！”。悟空回头一看原来是美美猴。 +悟空从中回过神来，撕心裂肺地喊出：“穿山甲到底说了什么！”。然后突然听到台下有人大叫：“王尼玛我要给你生猴子！”。 + +悟空猛一回头， 循着那声高喝望去，恰对上一双漆黑明亮的眼，思绪瞬间流转，一如回到五百年前的花果山， 那日也是同样的一双眼说着同样的一句话。 + +五百年后的重逢， 美美猴与齐天大圣又能否再续前缘？“欲知后事如何，且听下回分解。”说书先生“啪”地一拍醒木，又把这故事断在了最引人入胜之处。 + +至尊宝端起桌上剩下的半碗酒一饮而尽， 书听完了， 接下来干什么好呢， 思量着站起身， 背起那柄长剑，晃晃悠悠地出了茶楼， 向着城门口的人群走去。 From 98a231cda05b991fc548e038eb632486d14eee1c Mon Sep 17 00:00:00 2001 From: Joy Date: Thu, 9 Jul 2015 15:41:05 -0500 Subject: [PATCH 0117/5486] Add a line about a place to buy cookies --- english/bake-cookies/cookies.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/bake-cookies/cookies.md b/english/bake-cookies/cookies.md index 549853291f..233e925086 100644 --- a/english/bake-cookies/cookies.md +++ b/english/bake-cookies/cookies.md @@ -6,6 +6,7 @@ want to spread the joy (and chocolate chip cookies, or peanut butter, or ginger). Probably you love cookies too, or at least you like the idea of them. Because cookies are awesome!!! +If you don't have time and want to eat delicious cookies, then get some from Sprouts! Do you: [Invite friends to share?](../invite-friends/friends.md) From ccfe4a68e6d08d9b1815710d2130308199448b0d Mon Sep 17 00:00:00 2001 From: Karina Zhou Date: Thu, 9 Jul 2015 13:43:42 -0700 Subject: [PATCH 0118/5486] Keep original story and add new lines. --- Chinese/Interstellar/Interstellar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/Interstellar/Interstellar.md b/Chinese/Interstellar/Interstellar.md index d48d39b129..3b4ef67144 100644 --- a/Chinese/Interstellar/Interstellar.md +++ b/Chinese/Interstellar/Interstellar.md @@ -6,7 +6,7 @@ 当画面来到最后一幕：五指山下，悟空蓬头垢面，三藏袈裟翩翩，正站在他面前，对他说了一句：“荆轲刺秦王”。 -悟空从中回过神来，撕心裂肺地喊出：“穿山甲到底说了什么！”。然后突然听到台下有人大叫：“王尼玛我要给你生猴子！”。 +悟空从中回过神来，撕心裂肺地喊出：“穿山甲到底说了什么！”。然后突然听到台下有人大叫：“王尼玛我要给你生猴子！”。悟空回头一看原来是美美猴。 悟空猛一回头， 循着那声高喝望去，恰对上一双漆黑明亮的眼，思绪瞬间流转，一如回到五百年前的花果山， 那日也是同样的一双眼说着同样的一句话。 From b320c3467f6de34274e30a4d42182012964a5ecc Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 9 Jul 2015 23:59:19 +0200 Subject: [PATCH 0119/5486] Update breakfast. --- english/breakfast/breakfast.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/breakfast/breakfast.md b/english/breakfast/breakfast.md index 11fbf060da..67e0ad6627 100644 --- a/english/breakfast/breakfast.md +++ b/english/breakfast/breakfast.md @@ -1,4 +1,4 @@ You see a pot of coffee near you and you realize that you are hungry. Well, you poured coffee in a mug and picked some marshmallows from the wall and added them to the coffee. While you are drinking the coffee and eating those delicious marshmallows and staring at the wall you found that you made a whole in the wall by picking marshmallows. You finished -your flavoured coffee and got out from marshmallows-walled room. \ No newline at end of file +your flavoured coffee and got out from marshmallows-walled room. It is a beautiful sunny day. \ No newline at end of file From f7c8c0e1ddd1cef76713bd983d512dcaa8ff7de7 Mon Sep 17 00:00:00 2001 From: "Amaresh R. Joshi" Date: Thu, 9 Jul 2015 20:31:52 -0400 Subject: [PATCH 0120/5486] Fix path error in selfaware.md and Add slovenian files --- english/movie-ripoffs/selfaware/selfaware.md | 2 +- .../svetlo-vijolic\314\214na.md" | 1 + "slovenian/zac\314\214etek.md" | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 "slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" create mode 100644 "slovenian/zac\314\214etek.md" diff --git a/english/movie-ripoffs/selfaware/selfaware.md b/english/movie-ripoffs/selfaware/selfaware.md index a864f0e579..ba9decec4b 100644 --- a/english/movie-ripoffs/selfaware/selfaware.md +++ b/english/movie-ripoffs/selfaware/selfaware.md @@ -21,4 +21,4 @@ your life. But you realize you know lisp and therefore can devise a means of escape. -["Run CL" to fire up the LISP interpreter](../../../lisp/lisp.md) +["Run CL" to fire up the LISP interpreter](../../lisp/lisp.md) diff --git "a/slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" "b/slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" new file mode 100644 index 0000000000..4a14b970ab --- /dev/null +++ "b/slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" @@ -0,0 +1 @@ +Znašel si se v sobi svetlo vijolične barve. diff --git "a/slovenian/zac\314\214etek.md" "b/slovenian/zac\314\214etek.md" new file mode 100644 index 0000000000..fc05513818 --- /dev/null +++ "b/slovenian/zac\314\214etek.md" @@ -0,0 +1,9 @@ +Včeraj si zaspal v svoji sobi, zdaj pa si se zbudil v beli sobi z dvemi vrati. Ena na levi, druga na desni. + +Leva vrata so rumene barve, desna pa svetlo vijolične barve. + +Skozi katera vrata vstopiš? + +[Odpreš vrata rumene barve] (rumena/rumena.md) + +[Odpreš vrata svetlo vijolične barve] (svetlo-vijolična/svetlo-vijolična.md) From 50a386060ad7497fc8d4ea9b7dde7e3f83646db1 Mon Sep 17 00:00:00 2001 From: swillia380 Date: Fri, 10 Jul 2015 00:38:11 -0500 Subject: [PATCH 0121/5486] add options to ask_siri path --- english/turing-test/siri/ask_siri.md | 6 ++++++ english/turing-test/siri/eliza/try_eliza.md | 5 +++++ english/turing-test/siri/eliza/try_eliza.md~ | 3 +++ 3 files changed, 14 insertions(+) create mode 100644 english/turing-test/siri/eliza/try_eliza.md create mode 100644 english/turing-test/siri/eliza/try_eliza.md~ diff --git a/english/turing-test/siri/ask_siri.md b/english/turing-test/siri/ask_siri.md index 4b5317fad1..9062765f0e 100644 --- a/english/turing-test/siri/ask_siri.md +++ b/english/turing-test/siri/ask_siri.md @@ -11,3 +11,9 @@ Repeat You launch Siri Siri: Ok. How can I help you? Until battery dies… + +Do you: + +[wait](../ghostbusters/ghostbusters.md) + +[try eliza this time](../eliza/ask_eliza.md) diff --git a/english/turing-test/siri/eliza/try_eliza.md b/english/turing-test/siri/eliza/try_eliza.md new file mode 100644 index 0000000000..7f8783dbef --- /dev/null +++ b/english/turing-test/siri/eliza/try_eliza.md @@ -0,0 +1,5 @@ +Sorry, your battery is dead. + +Do you: + +[wait](../../ghostbusters/ghostbusters.md) diff --git a/english/turing-test/siri/eliza/try_eliza.md~ b/english/turing-test/siri/eliza/try_eliza.md~ new file mode 100644 index 0000000000..f372d49bdf --- /dev/null +++ b/english/turing-test/siri/eliza/try_eliza.md~ @@ -0,0 +1,3 @@ +Sorry, your battery is dead. + +Do you: From b1bb370e12d96ceb0a6433b722686a642a7786aa Mon Sep 17 00:00:00 2001 From: swillia380 Date: Fri, 10 Jul 2015 00:46:46 -0500 Subject: [PATCH 0122/5486] edit options for ask_siri --- english/turing-test/siri/ask_siri.md | 4 +--- english/turing-test/siri/eliza/try_eliza.md | 5 ----- english/turing-test/siri/eliza/try_eliza.md~ | 3 --- 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 english/turing-test/siri/eliza/try_eliza.md delete mode 100644 english/turing-test/siri/eliza/try_eliza.md~ diff --git a/english/turing-test/siri/ask_siri.md b/english/turing-test/siri/ask_siri.md index 9062765f0e..878acd551f 100644 --- a/english/turing-test/siri/ask_siri.md +++ b/english/turing-test/siri/ask_siri.md @@ -14,6 +14,4 @@ Until battery dies… Do you: -[wait](../ghostbusters/ghostbusters.md) - -[try eliza this time](../eliza/ask_eliza.md) +[Wait](../ghostbusters/ghostbusters.md) diff --git a/english/turing-test/siri/eliza/try_eliza.md b/english/turing-test/siri/eliza/try_eliza.md deleted file mode 100644 index 7f8783dbef..0000000000 --- a/english/turing-test/siri/eliza/try_eliza.md +++ /dev/null @@ -1,5 +0,0 @@ -Sorry, your battery is dead. - -Do you: - -[wait](../../ghostbusters/ghostbusters.md) diff --git a/english/turing-test/siri/eliza/try_eliza.md~ b/english/turing-test/siri/eliza/try_eliza.md~ deleted file mode 100644 index f372d49bdf..0000000000 --- a/english/turing-test/siri/eliza/try_eliza.md~ +++ /dev/null @@ -1,3 +0,0 @@ -Sorry, your battery is dead. - -Do you: From b7b1c7ff7944613e845e11702a44d6aafd97ebff Mon Sep 17 00:00:00 2001 From: Sergio Moura Date: Fri, 10 Jul 2015 03:13:35 -0300 Subject: [PATCH 0123/5486] =?UTF-8?q?Star=20pra=20ser=20simp=C3=A1tico...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/colabora/chora/chora.md | 3 +++ portugues/colabora/star/star.md | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 portugues/colabora/chora/chora.md diff --git a/portugues/colabora/chora/chora.md b/portugues/colabora/chora/chora.md new file mode 100644 index 0000000000..e4832a5d8b --- /dev/null +++ b/portugues/colabora/chora/chora.md @@ -0,0 +1,3 @@ +Aos prantos, não lhe resta nada a não ser desistir de usar o app ou conviver com um bug inconveniente. +Triste vida de alguém com tanto potencial e o desperdiça por falta de coragem... +A menos que \ No newline at end of file diff --git a/portugues/colabora/star/star.md b/portugues/colabora/star/star.md index eb99c72904..7560605e6c 100644 --- a/portugues/colabora/star/star.md +++ b/portugues/colabora/star/star.md @@ -1 +1,8 @@ -Ele faz um código bugado e você ainda dá uma estrela? tsc tsc \ No newline at end of file +Ele faz um código bugado e você ainda dá uma estrela? tsc tsc +Tudo bem. É a vontade de parecer simpático. Talvez você esteja procurando um trampo e ser simpático é +importante. Porém, mas eficiente é mostrar serviço! +Tome coragem! + +[Faça um fork!](../fork/fork.md) + +[..Ou sente e chore](../chora/chora.md) \ No newline at end of file From 91c091ebb446ffc14d01ecd7a7c8639d39014467 Mon Sep 17 00:00:00 2001 From: MauriceBuiten Date: Fri, 10 Jul 2015 09:37:12 +0200 Subject: [PATCH 0124/5486] Moved directory so link will work. --- dutch/bos/ontvoering/meehelpen/klus/plassen/lopen/lopen.md | 2 ++ .../bos/ontvoering/meehelpen/klus/plassen/mobiel/mobiel.md | 2 ++ dutch/bos/ontvoering/meehelpen/klus/plassen/plast/plast.md | 2 ++ dutch/bos/ontvoering/meehelpen/klus/plassen/watnu.md | 7 +++++++ 4 files changed, 13 insertions(+) create mode 100644 dutch/bos/ontvoering/meehelpen/klus/plassen/lopen/lopen.md create mode 100644 dutch/bos/ontvoering/meehelpen/klus/plassen/mobiel/mobiel.md create mode 100644 dutch/bos/ontvoering/meehelpen/klus/plassen/plast/plast.md create mode 100644 dutch/bos/ontvoering/meehelpen/klus/plassen/watnu.md diff --git a/dutch/bos/ontvoering/meehelpen/klus/plassen/lopen/lopen.md b/dutch/bos/ontvoering/meehelpen/klus/plassen/lopen/lopen.md new file mode 100644 index 0000000000..b72565efce --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/klus/plassen/lopen/lopen.md @@ -0,0 +1,2 @@ +Je begint te rennen en kijkt na 50 meter om, je ziet de zware jongens achter je aan rennen. +Wat doe je? \ No newline at end of file diff --git a/dutch/bos/ontvoering/meehelpen/klus/plassen/mobiel/mobiel.md b/dutch/bos/ontvoering/meehelpen/klus/plassen/mobiel/mobiel.md new file mode 100644 index 0000000000..ec5920d390 --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/klus/plassen/mobiel/mobiel.md @@ -0,0 +1,2 @@ +Je drukt 112 in op je mobiel maar de toetsen maken geluid en de zware jongens horen het. +Wat doe je? \ No newline at end of file diff --git a/dutch/bos/ontvoering/meehelpen/klus/plassen/plast/plast.md b/dutch/bos/ontvoering/meehelpen/klus/plassen/plast/plast.md new file mode 100644 index 0000000000..cbd8013900 --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/klus/plassen/plast/plast.md @@ -0,0 +1,2 @@ +Je doet net alsof je plast, maar een van de zware jongens vertrouwt het niet. +Hij komt op je aflopen. Wat doe je? \ No newline at end of file diff --git a/dutch/bos/ontvoering/meehelpen/klus/plassen/watnu.md b/dutch/bos/ontvoering/meehelpen/klus/plassen/watnu.md new file mode 100644 index 0000000000..78f79db789 --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/klus/plassen/watnu.md @@ -0,0 +1,7 @@ +Zodra je de bosjes bereikt hebt... + +Zet je het op een [lopen](lopen/lopen.md). + +Uit het zicht pak je je [mobiel](mobiel/mobiel.md) om 112 te bellen. + +Je bedenkt je en doet net alsof je [plast](plast/plast.md). \ No newline at end of file From 23cb9d5f5a98aa3873cdae5f252b14b07d3d2ca3 Mon Sep 17 00:00:00 2001 From: MauriceBuiten Date: Fri, 10 Jul 2015 09:45:14 +0200 Subject: [PATCH 0125/5486] Remove old directory --- dutch/bos/ontvoering/meehelpen/klus/plassen.md | 1 - dutch/plassen/lopen/lopen.md | 2 -- dutch/plassen/mobiel/mobiel.md | 2 -- dutch/plassen/plast/plast.md | 2 -- dutch/plassen/watnu.md | 7 ------- 5 files changed, 14 deletions(-) delete mode 100644 dutch/bos/ontvoering/meehelpen/klus/plassen.md delete mode 100644 dutch/plassen/lopen/lopen.md delete mode 100644 dutch/plassen/mobiel/mobiel.md delete mode 100644 dutch/plassen/plast/plast.md delete mode 100644 dutch/plassen/watnu.md diff --git a/dutch/bos/ontvoering/meehelpen/klus/plassen.md b/dutch/bos/ontvoering/meehelpen/klus/plassen.md deleted file mode 100644 index 912a84888c..0000000000 --- a/dutch/bos/ontvoering/meehelpen/klus/plassen.md +++ /dev/null @@ -1 +0,0 @@ -Zodra je de bosjes bereikt hebt.... \ No newline at end of file diff --git a/dutch/plassen/lopen/lopen.md b/dutch/plassen/lopen/lopen.md deleted file mode 100644 index b72565efce..0000000000 --- a/dutch/plassen/lopen/lopen.md +++ /dev/null @@ -1,2 +0,0 @@ -Je begint te rennen en kijkt na 50 meter om, je ziet de zware jongens achter je aan rennen. -Wat doe je? \ No newline at end of file diff --git a/dutch/plassen/mobiel/mobiel.md b/dutch/plassen/mobiel/mobiel.md deleted file mode 100644 index ec5920d390..0000000000 --- a/dutch/plassen/mobiel/mobiel.md +++ /dev/null @@ -1,2 +0,0 @@ -Je drukt 112 in op je mobiel maar de toetsen maken geluid en de zware jongens horen het. -Wat doe je? \ No newline at end of file diff --git a/dutch/plassen/plast/plast.md b/dutch/plassen/plast/plast.md deleted file mode 100644 index cbd8013900..0000000000 --- a/dutch/plassen/plast/plast.md +++ /dev/null @@ -1,2 +0,0 @@ -Je doet net alsof je plast, maar een van de zware jongens vertrouwt het niet. -Hij komt op je aflopen. Wat doe je? \ No newline at end of file diff --git a/dutch/plassen/watnu.md b/dutch/plassen/watnu.md deleted file mode 100644 index 78f79db789..0000000000 --- a/dutch/plassen/watnu.md +++ /dev/null @@ -1,7 +0,0 @@ -Zodra je de bosjes bereikt hebt... - -Zet je het op een [lopen](lopen/lopen.md). - -Uit het zicht pak je je [mobiel](mobiel/mobiel.md) om 112 te bellen. - -Je bedenkt je en doet net alsof je [plast](plast/plast.md). \ No newline at end of file From b39bc4abb8dd88a9f5a585f2529e214f5f0b2250 Mon Sep 17 00:00:00 2001 From: MauriceBuiten Date: Fri, 10 Jul 2015 09:50:30 +0200 Subject: [PATCH 0126/5486] Moved Directory again so link will work. --- dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md | 2 ++ dutch/bos/ontvoering/meehelpen/plassen/mobiel/mobiel.md | 2 ++ dutch/bos/ontvoering/meehelpen/plassen/plast/plast.md | 2 ++ dutch/bos/ontvoering/meehelpen/plassen/watnu.md | 7 +++++++ 4 files changed, 13 insertions(+) create mode 100644 dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md create mode 100644 dutch/bos/ontvoering/meehelpen/plassen/mobiel/mobiel.md create mode 100644 dutch/bos/ontvoering/meehelpen/plassen/plast/plast.md create mode 100644 dutch/bos/ontvoering/meehelpen/plassen/watnu.md diff --git a/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md b/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md new file mode 100644 index 0000000000..b72565efce --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md @@ -0,0 +1,2 @@ +Je begint te rennen en kijkt na 50 meter om, je ziet de zware jongens achter je aan rennen. +Wat doe je? \ No newline at end of file diff --git a/dutch/bos/ontvoering/meehelpen/plassen/mobiel/mobiel.md b/dutch/bos/ontvoering/meehelpen/plassen/mobiel/mobiel.md new file mode 100644 index 0000000000..ec5920d390 --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/plassen/mobiel/mobiel.md @@ -0,0 +1,2 @@ +Je drukt 112 in op je mobiel maar de toetsen maken geluid en de zware jongens horen het. +Wat doe je? \ No newline at end of file diff --git a/dutch/bos/ontvoering/meehelpen/plassen/plast/plast.md b/dutch/bos/ontvoering/meehelpen/plassen/plast/plast.md new file mode 100644 index 0000000000..cbd8013900 --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/plassen/plast/plast.md @@ -0,0 +1,2 @@ +Je doet net alsof je plast, maar een van de zware jongens vertrouwt het niet. +Hij komt op je aflopen. Wat doe je? \ No newline at end of file diff --git a/dutch/bos/ontvoering/meehelpen/plassen/watnu.md b/dutch/bos/ontvoering/meehelpen/plassen/watnu.md new file mode 100644 index 0000000000..78f79db789 --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/plassen/watnu.md @@ -0,0 +1,7 @@ +Zodra je de bosjes bereikt hebt... + +Zet je het op een [lopen](lopen/lopen.md). + +Uit het zicht pak je je [mobiel](mobiel/mobiel.md) om 112 te bellen. + +Je bedenkt je en doet net alsof je [plast](plast/plast.md). \ No newline at end of file From 7ff564c15a58067496b1d171ef005fbe4b021f64 Mon Sep 17 00:00:00 2001 From: MauriceBuiten Date: Fri, 10 Jul 2015 09:52:25 +0200 Subject: [PATCH 0127/5486] Removed old directory again. --- dutch/bos/ontvoering/meehelpen/klus/plassen/lopen/lopen.md | 2 -- .../bos/ontvoering/meehelpen/klus/plassen/mobiel/mobiel.md | 2 -- dutch/bos/ontvoering/meehelpen/klus/plassen/plast/plast.md | 2 -- dutch/bos/ontvoering/meehelpen/klus/plassen/watnu.md | 7 ------- 4 files changed, 13 deletions(-) delete mode 100644 dutch/bos/ontvoering/meehelpen/klus/plassen/lopen/lopen.md delete mode 100644 dutch/bos/ontvoering/meehelpen/klus/plassen/mobiel/mobiel.md delete mode 100644 dutch/bos/ontvoering/meehelpen/klus/plassen/plast/plast.md delete mode 100644 dutch/bos/ontvoering/meehelpen/klus/plassen/watnu.md diff --git a/dutch/bos/ontvoering/meehelpen/klus/plassen/lopen/lopen.md b/dutch/bos/ontvoering/meehelpen/klus/plassen/lopen/lopen.md deleted file mode 100644 index b72565efce..0000000000 --- a/dutch/bos/ontvoering/meehelpen/klus/plassen/lopen/lopen.md +++ /dev/null @@ -1,2 +0,0 @@ -Je begint te rennen en kijkt na 50 meter om, je ziet de zware jongens achter je aan rennen. -Wat doe je? \ No newline at end of file diff --git a/dutch/bos/ontvoering/meehelpen/klus/plassen/mobiel/mobiel.md b/dutch/bos/ontvoering/meehelpen/klus/plassen/mobiel/mobiel.md deleted file mode 100644 index ec5920d390..0000000000 --- a/dutch/bos/ontvoering/meehelpen/klus/plassen/mobiel/mobiel.md +++ /dev/null @@ -1,2 +0,0 @@ -Je drukt 112 in op je mobiel maar de toetsen maken geluid en de zware jongens horen het. -Wat doe je? \ No newline at end of file diff --git a/dutch/bos/ontvoering/meehelpen/klus/plassen/plast/plast.md b/dutch/bos/ontvoering/meehelpen/klus/plassen/plast/plast.md deleted file mode 100644 index cbd8013900..0000000000 --- a/dutch/bos/ontvoering/meehelpen/klus/plassen/plast/plast.md +++ /dev/null @@ -1,2 +0,0 @@ -Je doet net alsof je plast, maar een van de zware jongens vertrouwt het niet. -Hij komt op je aflopen. Wat doe je? \ No newline at end of file diff --git a/dutch/bos/ontvoering/meehelpen/klus/plassen/watnu.md b/dutch/bos/ontvoering/meehelpen/klus/plassen/watnu.md deleted file mode 100644 index 78f79db789..0000000000 --- a/dutch/bos/ontvoering/meehelpen/klus/plassen/watnu.md +++ /dev/null @@ -1,7 +0,0 @@ -Zodra je de bosjes bereikt hebt... - -Zet je het op een [lopen](lopen/lopen.md). - -Uit het zicht pak je je [mobiel](mobiel/mobiel.md) om 112 te bellen. - -Je bedenkt je en doet net alsof je [plast](plast/plast.md). \ No newline at end of file From 077c8926de2f4c2e72f3c3ed85a496387c75f04b Mon Sep 17 00:00:00 2001 From: "Amaresh R. Joshi" Date: Fri, 10 Jul 2015 08:45:30 -0400 Subject: [PATCH 0128/5486] Delete some files in the slovenian dir. not sure how they got there. --- .../svetlo-vijolic\314\214na.md" | 1 - .../svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" | 1 - "slovenian/zac\314\214etek.md" | 9 --------- "slovenian/za\304\215etek.md" | 9 --------- 4 files changed, 20 deletions(-) delete mode 100644 "slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" delete mode 100644 "slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" delete mode 100644 "slovenian/zac\314\214etek.md" delete mode 100644 "slovenian/za\304\215etek.md" diff --git "a/slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" "b/slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" deleted file mode 100644 index 4a14b970ab..0000000000 --- "a/slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" +++ /dev/null @@ -1 +0,0 @@ -Znašel si se v sobi svetlo vijolične barve. diff --git "a/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" "b/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" deleted file mode 100644 index 4a14b970ab..0000000000 --- "a/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" +++ /dev/null @@ -1 +0,0 @@ -Znašel si se v sobi svetlo vijolične barve. diff --git "a/slovenian/zac\314\214etek.md" "b/slovenian/zac\314\214etek.md" deleted file mode 100644 index fc05513818..0000000000 --- "a/slovenian/zac\314\214etek.md" +++ /dev/null @@ -1,9 +0,0 @@ -Včeraj si zaspal v svoji sobi, zdaj pa si se zbudil v beli sobi z dvemi vrati. Ena na levi, druga na desni. - -Leva vrata so rumene barve, desna pa svetlo vijolične barve. - -Skozi katera vrata vstopiš? - -[Odpreš vrata rumene barve] (rumena/rumena.md) - -[Odpreš vrata svetlo vijolične barve] (svetlo-vijolična/svetlo-vijolična.md) diff --git "a/slovenian/za\304\215etek.md" "b/slovenian/za\304\215etek.md" deleted file mode 100644 index fc05513818..0000000000 --- "a/slovenian/za\304\215etek.md" +++ /dev/null @@ -1,9 +0,0 @@ -Včeraj si zaspal v svoji sobi, zdaj pa si se zbudil v beli sobi z dvemi vrati. Ena na levi, druga na desni. - -Leva vrata so rumene barve, desna pa svetlo vijolične barve. - -Skozi katera vrata vstopiš? - -[Odpreš vrata rumene barve] (rumena/rumena.md) - -[Odpreš vrata svetlo vijolične barve] (svetlo-vijolična/svetlo-vijolična.md) From 0d263fcfd1c3f005f20108f8e339fca4e0cab0b8 Mon Sep 17 00:00:00 2001 From: Valery Date: Fri, 10 Jul 2015 17:30:29 +0300 Subject: [PATCH 0129/5486] Add reference to awake to russian/light-fire/so-scary/so-scary.md --- russian/light-fire/so-scary/so-scary.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/light-fire/so-scary/so-scary.md b/russian/light-fire/so-scary/so-scary.md index 36f48e9501..afa075992f 100644 --- a/russian/light-fire/so-scary/so-scary.md +++ b/russian/light-fire/so-scary/so-scary.md @@ -1,3 +1,5 @@ Вы остаетесь в комнате. Расплавленный зефир потихоньку затапливает помещение. И вот горячая сладкая жидкость уже достигла ваших колен. Но вы не отчаиваетесь -и успеваете съедать зефир по мере его поступления. \ No newline at end of file +и успеваете съедать зефир по мере его поступления. + +[Вы просыпаетесь.](awaken/awaken.md) \ No newline at end of file From aaf2a3eb2f6e5196ebe0c4144892040e40e7288a Mon Sep 17 00:00:00 2001 From: Valery Date: Fri, 10 Jul 2015 17:39:32 +0300 Subject: [PATCH 0130/5486] fix refference typo --- russian/light-fire/so-scary/so-scary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/light-fire/so-scary/so-scary.md b/russian/light-fire/so-scary/so-scary.md index afa075992f..f93bd866af 100644 --- a/russian/light-fire/so-scary/so-scary.md +++ b/russian/light-fire/so-scary/so-scary.md @@ -2,4 +2,4 @@ И вот горячая сладкая жидкость уже достигла ваших колен. Но вы не отчаиваетесь и успеваете съедать зефир по мере его поступления. -[Вы просыпаетесь.](awaken/awaken.md) \ No newline at end of file +[Вы просыпаетесь.](../../awaken/awaken.md) \ No newline at end of file From 6012b4b191f421cee2d771bee799bb5bffbccf5e Mon Sep 17 00:00:00 2001 From: DSarker Date: Fri, 10 Jul 2015 11:01:19 -0400 Subject: [PATCH 0131/5486] Fixed question link in make-friends --- english/make-friends/make-friends.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/make-friends/make-friends.md b/english/make-friends/make-friends.md index 56e8e20dfd..e51a02428c 100644 --- a/english/make-friends/make-friends.md +++ b/english/make-friends/make-friends.md @@ -14,4 +14,4 @@ Do you: [Have a cup of coffee?](../coffee/coffee.md) -[Ask the marshmellow man, "What's it all for?"](../question/question.md) \ No newline at end of file +[Ask the marshmellow man, "What's it all for?"](question/question.md) From cab938ecb7f30bd155f3c084fee86a9ad481d037 Mon Sep 17 00:00:00 2001 From: Davis Une Miyashiro Date: Fri, 10 Jul 2015 18:02:36 +0100 Subject: [PATCH 0132/5486] Add reasons for others to collaborate with the open source community --- .../colabora/comdiferencas/diff/pull/reenvio/reenviar.md | 6 +++++- .../colabora/comdiferencas/diff/pull/reenvio/star/star.md | 2 ++ .../colabora/comdiferencas/diff/pull/reenvio/watch/watch.md | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/star/star.md create mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/watch.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/reenviar.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/reenviar.md index e81106991f..c40ef60248 100644 --- a/portugues/colabora/comdiferencas/diff/pull/reenvio/reenviar.md +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/reenviar.md @@ -1,4 +1,8 @@ Você reenvia e então o bug que existia há um bom tempo não é mais um bug. Muita gente comenta nos blogs que o erro foi finalmente corrigido e então o responsável por manter o programa pede sua ajuda para se tornar um dos responsáveis por manter essa parte do programa. -O que você faz? \ No newline at end of file +O que você faz? + +[Aceita e dá um watch no projeto.](watch/watch.md) + +[Não aceita mas dá um star no repositório pois agora ele está melhor por sua causa.](star/star.md) \ No newline at end of file diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/star/star.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/star/star.md new file mode 100644 index 0000000000..5572bab50a --- /dev/null +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/star/star.md @@ -0,0 +1,2 @@ +Dar STAR no repositório demonstra gratidão ao responsável pelo projeto ao torná-lo mais popular +dentro dos rankings no Github. Onde você pode pesquisar por novos projetos interessantes dentro do Github? \ No newline at end of file diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/watch.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/watch.md new file mode 100644 index 0000000000..9a7130863b --- /dev/null +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/watch.md @@ -0,0 +1,2 @@ +Dando WATCH você passa a receber notificações sobre novas alterações, como você acha que ser +contribuinte em um repositório open source pode ajudar na sua carreira ? \ No newline at end of file From 9eb9eec5fed98b443ccf4ef747b75da01b98ce75 Mon Sep 17 00:00:00 2001 From: Gene Steiker Date: Fri, 10 Jul 2015 15:46:56 -0400 Subject: [PATCH 0133/5486] Add dentist option to story --- english/dentist/ouch.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/dentist/ouch.md diff --git a/english/dentist/ouch.md b/english/dentist/ouch.md new file mode 100644 index 0000000000..b04da41172 --- /dev/null +++ b/english/dentist/ouch.md @@ -0,0 +1,3 @@ +Uh-oh, you feel a dull pain in an a upper molar +on the right side of your mouth. Shouldn't have eaten +all those marshmallows. \ No newline at end of file From 85fb40c2c7445966e8e01947dd62df9fde12dcc8 Mon Sep 17 00:00:00 2001 From: Gene Steiker Date: Fri, 10 Jul 2015 15:49:15 -0400 Subject: [PATCH 0134/5486] Add dentist line to marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 8eb64c210a..a962ea3fbf 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -352,3 +352,5 @@ Do you: [Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) [Commit suicide](commit-suicide/suicide.md) + +[Make an appointment with the dentist](dentist/ouch.md) \ No newline at end of file From dc3887d3672698bb0a5849926ec279d79bc115e3 Mon Sep 17 00:00:00 2001 From: Michael Trinh Date: Fri, 10 Jul 2015 16:52:42 -0700 Subject: [PATCH 0135/5486] Added another teaching (be curious) --- english/swami-vivekananda/swami-vivekananda.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/swami-vivekananda/swami-vivekananda.md b/english/swami-vivekananda/swami-vivekananda.md index 5010f1aa45..a7083851d1 100644 --- a/english/swami-vivekananda/swami-vivekananda.md +++ b/english/swami-vivekananda/swami-vivekananda.md @@ -9,3 +9,5 @@ But, whatever you do, don't use the toaster in the bath tub ... But, whatever you do, don't talk about your favorite type of "Bath Bomb" or the best "Photo Bomb" you have seen in the airport security line ... +But, whatever you do, be curious... + From 6a8ff1ece015fc919a69a96c74c972706244cf38 Mon Sep 17 00:00:00 2001 From: Nse Ekong Date: Fri, 10 Jul 2015 19:48:27 -0600 Subject: [PATCH 0136/5486] Added the option to create an artificial intelligence to the main story. --- english/marshmallow.md | 4 +++- english/robot-rap-battle/robot-rap-battle.md | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/robot-rap-battle/robot-rap-battle.md diff --git a/english/marshmallow.md b/english/marshmallow.md index a962ea3fbf..092c67dad5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -353,4 +353,6 @@ Do you: [Commit suicide](commit-suicide/suicide.md) -[Make an appointment with the dentist](dentist/ouch.md) \ No newline at end of file +[Make an appointment with the dentist](dentist/ouch.md) + +[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) \ No newline at end of file diff --git a/english/robot-rap-battle/robot-rap-battle.md b/english/robot-rap-battle/robot-rap-battle.md new file mode 100644 index 0000000000..4db4c81d6e --- /dev/null +++ b/english/robot-rap-battle/robot-rap-battle.md @@ -0,0 +1,5 @@ +You create the most advanced artificial intelligence known to man to escape. + +Now that you've escaped should you use this AI to solve world hunger? Cure all diseases? + +No. You will use this AI to witness an [Epic Rap Battle](https://www.youtube.com/watch?v=Jmqa99Ar1Hs) \ No newline at end of file From 7988e60de879f1e7d289984d9bc4ef13cf0db1b1 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 10 Jul 2015 22:21:01 -0700 Subject: [PATCH 0137/5486] Add Dwyane Wade's satisfaction --- english/warriors-game/watch-warriors.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/warriors-game/watch-warriors.md b/english/warriors-game/watch-warriors.md index a289dd4dca..81506eb5ff 100644 --- a/english/warriors-game/watch-warriors.md +++ b/english/warriors-game/watch-warriors.md @@ -15,4 +15,6 @@ that no girl can resist a slow dance. You ponder about what else was great about Michael Jordan was pretty great. LeBron James is great too. But not that great. They would be great if they had not traded Wiggins. That was a dumb move. Warriors win in 5. -The Warriors won in 6. Lebron was great, but the Warriors prevailed! \ No newline at end of file +The Warriors won in 6. Lebron was great, but the Warriors prevailed! + +And Dwyane Wade slept like a baby. \ No newline at end of file From bf20e66ab13a39c96ff1646ee33f47b0fdb0c567 Mon Sep 17 00:00:00 2001 From: harryhare Date: Sat, 11 Jul 2015 21:09:31 +0800 Subject: [PATCH 0138/5486] add option 'pasidong' and its short story md file --- Chinese/ZZB/pansidong/pansidong.md | 1 + Chinese/ZZB/zzb.md | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 Chinese/ZZB/pansidong/pansidong.md diff --git a/Chinese/ZZB/pansidong/pansidong.md b/Chinese/ZZB/pansidong/pansidong.md new file mode 100644 index 0000000000..5ccfb5e355 --- /dev/null +++ b/Chinese/ZZB/pansidong/pansidong.md @@ -0,0 +1 @@ +֪Լصǰ \ No newline at end of file diff --git a/Chinese/ZZB/zzb.md b/Chinese/ZZB/zzb.md index 192af03e47..97beb42f94 100644 --- a/Chinese/ZZB/zzb.md +++ b/Chinese/ZZB/zzb.md @@ -1,3 +1,7 @@ +至尊宝：这是盘丝洞不要乱闯 +紫霞： +[将水帘洞改为盘丝洞，自封为盘丝大仙](pansidong/pansidong.md) + 至尊宝：谁说我斗鸡眼？我只是把视力集中在一点，以改变我以往对事物的看法！ 紫霞仙子继续说： From 513116f4202702267851bd70d40d509d9a05b391 Mon Sep 17 00:00:00 2001 From: harryhare Date: Sat, 11 Jul 2015 21:13:28 +0800 Subject: [PATCH 0139/5486] add empty line between text lines --- Chinese/ZZB/zzb.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Chinese/ZZB/zzb.md b/Chinese/ZZB/zzb.md index 97beb42f94..13fba31580 100644 --- a/Chinese/ZZB/zzb.md +++ b/Chinese/ZZB/zzb.md @@ -1,5 +1,7 @@ 至尊宝：这是盘丝洞不要乱闯 + 紫霞： + [将水帘洞改为盘丝洞，自封为盘丝大仙](pansidong/pansidong.md) 至尊宝：谁说我斗鸡眼？我只是把视力集中在一点，以改变我以往对事物的看法！ From e06499dda062e0b932282a1d3ee1baca6a034de3 Mon Sep 17 00:00:00 2001 From: Nathan Gourley Date: Sat, 11 Jul 2015 11:29:33 -0400 Subject: [PATCH 0140/5486] Add minecraft gather wood option --- .../focus_on_gathering_wood/focus_on_gathering_wood.md | 6 ++++++ english/you-are-in-minecraft/gather_wood/gather_wood.md | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md diff --git a/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md b/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md new file mode 100644 index 0000000000..0f03cd6278 --- /dev/null +++ b/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md @@ -0,0 +1,6 @@ +You turn a tree into lumber. Crafting an axe you attack another, quicker. + +You happen upon a forest, and declare yourself a lumber baron. +Before you know it, the once lush environment has been clear cut. + +You have the saplings to replant a mighty forest, or the wood to build a massive structure. \ No newline at end of file diff --git a/english/you-are-in-minecraft/gather_wood/gather_wood.md b/english/you-are-in-minecraft/gather_wood/gather_wood.md index 6e6915d40f..4426fa2876 100644 --- a/english/you-are-in-minecraft/gather_wood/gather_wood.md +++ b/english/you-are-in-minecraft/gather_wood/gather_wood.md @@ -13,3 +13,5 @@ Do you: [Tame the elephant?](tame_the_elephant/tame_the_elephant.md) [Dig Down?](../dig_down/dig_down.md) + +[Focus on gathering wood](focus_on_gathering_wood/focus_on_gathering_wood.md) \ No newline at end of file From aa4690c8cb7be19a2a562936b1c2a2df77b6ca7b Mon Sep 17 00:00:00 2001 From: Nidhi16 Date: Sat, 11 Jul 2015 21:43:07 +0530 Subject: [PATCH 0141/5486] Add story of APJ --- english/apj/apj.md | 9 +++++++++ english/apj/quotes/quotes.md | 7 +++++++ english/marshmallow.md | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 english/apj/apj.md create mode 100644 english/apj/quotes/quotes.md diff --git a/english/apj/apj.md b/english/apj/apj.md new file mode 100644 index 0000000000..f6937bcdb9 --- /dev/null +++ b/english/apj/apj.md @@ -0,0 +1,9 @@ +In this world, fear has no place. Only strength respects strength. + +Fear is an unpleasant emotion caused by the threat of danger, pain, or harm. + +So we have to overcome our fear. + +There are some quotes :- + +[QUOTES] (quotes/quotes.md) \ No newline at end of file diff --git a/english/apj/quotes/quotes.md b/english/apj/quotes/quotes.md new file mode 100644 index 0000000000..86ce53bbec --- /dev/null +++ b/english/apj/quotes/quotes.md @@ -0,0 +1,7 @@ +1) "Too many of us are not living our dreams beacuse we are living our fears." + +2) "When you're scared, you stay as you are!" -Stephen Richards + +3) "There is no illusion greater than fear." -Lao Tzu + +Click [hear] (https://www.goodreads.com/quotes/tag/overcoming-fear) to find more quotes. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 092c67dad5..ee1b84c865 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -355,4 +355,6 @@ Do you: [Make an appointment with the dentist](dentist/ouch.md) -[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) \ No newline at end of file +[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) + +[Abdul kalam quotes on overcoming fear] (apj/apj.md) \ No newline at end of file From 2e2f9c0872f000052946627eb5e89d705cfc6c3c Mon Sep 17 00:00:00 2001 From: Punith Date: Sat, 11 Jul 2015 22:43:37 +0530 Subject: [PATCH 0142/5486] added my part of google to the story --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 092c67dad5..4fe516b170 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -355,4 +355,6 @@ Do you: [Make an appointment with the dentist](dentist/ouch.md) -[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) \ No newline at end of file +[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) + +[You Google what to do](https://www.google.co.in/) \ No newline at end of file From 6c9cf9d6a139ff5c3ca4d9cf8dc28c085a4e44f5 Mon Sep 17 00:00:00 2001 From: Punith Date: Sat, 11 Jul 2015 23:06:26 +0530 Subject: [PATCH 0143/5486] add new line at the end --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 4fe516b170..c57311ff71 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -357,4 +357,4 @@ Do you: [Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) -[You Google what to do](https://www.google.co.in/) \ No newline at end of file +[You Google what to do](https://www.google.co.in/) From 903926e46a4538a8d5bc1ca51e555dec18a6e448 Mon Sep 17 00:00:00 2001 From: Jim Downhower Date: Sat, 11 Jul 2015 18:27:29 -0400 Subject: [PATCH 0144/5486] after sleeping, add a happy dance option --- english/sleep/marshmallow.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/english/sleep/marshmallow.md b/english/sleep/marshmallow.md index e8e5fadf8a..bea579656d 100644 --- a/english/sleep/marshmallow.md +++ b/english/sleep/marshmallow.md @@ -7,8 +7,8 @@ Maybe some chocolate. You wish there were some chocolate furniture too. -And suddenly your wish come true, the chocolate furniture appears, -and you start thinking is it really possible, +And suddenly your wish come true, the chocolate furniture appears, +and you start thinking is it really possible, whatever i think will come true. You think if you should wish there was a way to melt these chocolates @@ -19,6 +19,8 @@ Do you: [Start eating the walls?](../eating-walls/eating-marshmallows.md) +[Do your happy dance?](../dance/dance.md) + [Go back to sleep?](more-sleep/more-sleep.md) [Make a marshmallow snowman?](../staypuft/marshmallowman.md) @@ -35,4 +37,4 @@ Do you: [Wish for graham crackers](./crackers/crackers.md) -[Sit down to meditate](sit-down-to-meditate/sit-down-to-meditate.md) \ No newline at end of file +[Sit down to meditate](sit-down-to-meditate/sit-down-to-meditate.md) From 53780f750386b73dbc1eaaa656f9d4b99ec47f3d Mon Sep 17 00:00:00 2001 From: Jim Downhower Date: Sat, 11 Jul 2015 18:51:28 -0400 Subject: [PATCH 0145/5486] fixed whitespace --- english/sleep/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/sleep/marshmallow.md b/english/sleep/marshmallow.md index e8e5fadf8a..5814f221b9 100644 --- a/english/sleep/marshmallow.md +++ b/english/sleep/marshmallow.md @@ -19,6 +19,8 @@ Do you: [Start eating the walls?](../eating-walls/eating-marshmallows.md) +[Do your happy dance?](../dance/dance.md) + [Go back to sleep?](more-sleep/more-sleep.md) [Make a marshmallow snowman?](../staypuft/marshmallowman.md) From 3b183dc06c40c36ed6ce04bbf0c798fe6a06b3fd Mon Sep 17 00:00:00 2001 From: Jim Downhower Date: Sat, 11 Jul 2015 20:39:22 -0400 Subject: [PATCH 0146/5486] fix whitespace --- english/sleep/marshmallow.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/english/sleep/marshmallow.md b/english/sleep/marshmallow.md index bea579656d..111ead9450 100644 --- a/english/sleep/marshmallow.md +++ b/english/sleep/marshmallow.md @@ -1,14 +1,14 @@ When you wake up, you're still in the strange room with marshmallows for walls. The walls smell really good, but are they tasty? - -It would be nice to find out, but not all by themselves. -You need something to go with them. -Maybe some chocolate. + +It would be nice to find out, but not all by themselves. +You need something to go with them. +Maybe some chocolate. You wish there were some chocolate furniture too. -And suddenly your wish come true, the chocolate furniture appears, -and you start thinking is it really possible, +And suddenly your wish come true, the chocolate furniture appears, +and you start thinking is it really possible, whatever i think will come true. You think if you should wish there was a way to melt these chocolates @@ -19,8 +19,6 @@ Do you: [Start eating the walls?](../eating-walls/eating-marshmallows.md) -[Do your happy dance?](../dance/dance.md) - [Go back to sleep?](more-sleep/more-sleep.md) [Make a marshmallow snowman?](../staypuft/marshmallowman.md) @@ -37,4 +35,4 @@ Do you: [Wish for graham crackers](./crackers/crackers.md) -[Sit down to meditate](sit-down-to-meditate/sit-down-to-meditate.md) +[Sit down to meditate](sit-down-to-meditate/sit-down-to-meditate.md) \ No newline at end of file From fef52f23415634853b7301d6cfed71229093ffef Mon Sep 17 00:00:00 2001 From: Jim Downhower Date: Sat, 11 Jul 2015 20:43:22 -0400 Subject: [PATCH 0147/5486] whitespace --- english/sleep/marshmallow.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/english/sleep/marshmallow.md b/english/sleep/marshmallow.md index 111ead9450..5814f221b9 100644 --- a/english/sleep/marshmallow.md +++ b/english/sleep/marshmallow.md @@ -1,9 +1,9 @@ When you wake up, you're still in the strange room with marshmallows for walls. The walls smell really good, but are they tasty? - -It would be nice to find out, but not all by themselves. -You need something to go with them. -Maybe some chocolate. + +It would be nice to find out, but not all by themselves. +You need something to go with them. +Maybe some chocolate. You wish there were some chocolate furniture too. @@ -19,6 +19,8 @@ Do you: [Start eating the walls?](../eating-walls/eating-marshmallows.md) +[Do your happy dance?](../dance/dance.md) + [Go back to sleep?](more-sleep/more-sleep.md) [Make a marshmallow snowman?](../staypuft/marshmallowman.md) From 793b9b3c2ad7d0e91ae3c34874b4bcdc1e7f0de9 Mon Sep 17 00:00:00 2001 From: thaingoctu Date: Sun, 12 Jul 2015 10:40:52 +0700 Subject: [PATCH 0148/5486] Add another quote --- english/quote-of-the-day/life/life.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/quote-of-the-day/life/life.md b/english/quote-of-the-day/life/life.md index f188b3f1e4..165b74137f 100644 --- a/english/quote-of-the-day/life/life.md +++ b/english/quote-of-the-day/life/life.md @@ -2,4 +2,6 @@ The most important thing is to enjoy your life - to be happy - it's all the matters. +Smile, breathe, and go slowly. + [Go back](../quote.md) \ No newline at end of file From 7f201996183bb63dee7bc0656cfb6829be62bf2e Mon Sep 17 00:00:00 2001 From: Ryan Wymyczak Date: Sun, 12 Jul 2015 11:04:38 -0400 Subject: [PATCH 0149/5486] Add glowing pants adventure --- english/glowing-pants/glowing-pants.md | 3 +++ english/marshmallow.md | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 english/glowing-pants/glowing-pants.md diff --git a/english/glowing-pants/glowing-pants.md b/english/glowing-pants/glowing-pants.md new file mode 100644 index 0000000000..6556524186 --- /dev/null +++ b/english/glowing-pants/glowing-pants.md @@ -0,0 +1,3 @@ +You hear the faint melodies of angels singing emanating from your pants. + +[Go back to worrying about the marshmallow room](../marshmallow.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index ee1b84c865..6c38e3a3a5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -86,8 +86,12 @@ Sheepishly you look down on the crappy wand in your hand. You must be doing something wrong, you drink a beer and think about it, then Ah-ha! +You notice your pants are now glowing, so you must have been holding the wand upside down. + Do you: +[Admire your glowing pants](glowing-pants/glowing-pants.md) + [Grab some coffee?] (coffee/coffee.md) [Call the GhostBusters] (ghostbusters/ghostbusters.md) From 9968749f148ed4e72a0d3057bcd269802d36334b Mon Sep 17 00:00:00 2001 From: abrugues Date: Sun, 12 Jul 2015 19:59:37 +0200 Subject: [PATCH 0150/5486] Add line in 'aixecar' --- catala/aixecar/aixecar.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/catala/aixecar/aixecar.md b/catala/aixecar/aixecar.md index 51fab9a551..173c5409af 100644 --- a/catala/aixecar/aixecar.md +++ b/catala/aixecar/aixecar.md @@ -1 +1,3 @@ -T'aixeques del llit i recorres l'habitació intentant recordar on ets \ No newline at end of file +T'aixeques del llit i recorres l'habitació intentant recordar on ets + +quan de sobte els mobles començen a convertir-se en xocolata. \ No newline at end of file From 52e7588315afbfd76ed0283a2942046b1b92733d Mon Sep 17 00:00:00 2001 From: Mark Date: Sun, 12 Jul 2015 19:20:46 +0100 Subject: [PATCH 0151/5486] Added climbing-rope --- english/macgyver/stickfork/stickforkinwall.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/english/macgyver/stickfork/stickforkinwall.md b/english/macgyver/stickfork/stickforkinwall.md index f7846e95a0..5f7932380e 100644 --- a/english/macgyver/stickfork/stickforkinwall.md +++ b/english/macgyver/stickfork/stickforkinwall.md @@ -6,3 +6,10 @@ The marshmellow walls convulse and heave with pain, but eventually settle to the Now that the task is done, you stand back and marvel at your handiwork... If there was any sun in the room you could probably use this to tell the time, or you could hang your coat on the newly fashioned coat hook. + +But then you recall Macguyver saying "We are all going to die, the trick is to not rush it." +So unphased by this early setback you pull the fork out of the wall and attach it to the rope. +You hurl it with all your might lasso style at the ceiling and despair as another muffled whumpf +reverbarates around the room. + + From a0aa21bc15c482abeb99e4bfa5d25f8a14065798 Mon Sep 17 00:00:00 2001 From: middlestudent Date: Sun, 12 Jul 2015 20:30:39 +0200 Subject: [PATCH 0152/5486] Add german story twist 'Leichen' --- german/Leichen/Leichen.md | 5 +++++ german/ruderboot.md | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 german/Leichen/Leichen.md diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md new file mode 100644 index 0000000000..63df8ad4e5 --- /dev/null +++ b/german/Leichen/Leichen.md @@ -0,0 +1,5 @@ +Sie schauen ängstig um sich, kein andere Menschenseele außer den beiden völlig durchlöcherten Leichnamen neben +ihnen, deren Blut sie mittlerweile bedürftig an die Lebewesen im See gespendet haben. Ihr Boot ist bereits +in leichter Schieflage und hastig ziehen die beiden Leichen aus dem Boot. + +Sie schnaufen einmal kräftig durch und ihnen gehen 1000 Gedanken durch den Kopf... \ No newline at end of file diff --git a/german/ruderboot.md b/german/ruderboot.md index 3f61c401bb..e0163400d8 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -1,4 +1,4 @@ -Sie wachen von der Sonne geblendet auf und stellen ziemlich benommen fest, dass Sie allein +Sie wachen von der Sonne geblendet auf und stellen ziemlich benommen fest, dass Sie in einem Ruderboot auf einem grossen See treiben. Ihre Hose ist vollkommen durchnsst, und @@ -6,7 +6,9 @@ Sie bemerken, dass durch ein Loch in der Bootswand Wasser ins Boot dringt. Werden Sie: -[Laut um Hilfe schreien](Hilfeschrei/Hilfeschrei.md)? +[Zunchst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) + +[Laut um Hilfe schreien?](Hilfeschrei/Hilfeschrei.md) [Gefasst bleiben und ihre Kleidung ausziehen und aus dem Boot werfen?](gefasst-bleiben/gefasst-bleiben.md) @@ -18,4 +20,4 @@ Werden Sie: [Sie beschliessen fortan keinen Alkohol mehr zu trinken.](Alkohol/alkohol.md) -[Versuchen, mit Ihrer Kleidung das Loch zu stopfen](Stopfen/stopfen.md) +[Versuchen, mit Ihrer Kleidung das Loch zu stopfen](Stopfen/stopfen.md) \ No newline at end of file From b379bd64a93123156284d2229c9d29948dc0ab81 Mon Sep 17 00:00:00 2001 From: Christian Siegel Date: Mon, 13 Jul 2015 02:53:21 +0200 Subject: [PATCH 0153/5486] Add section entspannen --- german/Stopfen/entspannen/entspannen.md | 10 ++++++++++ german/Stopfen/stopfen.md | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 german/Stopfen/entspannen/entspannen.md diff --git a/german/Stopfen/entspannen/entspannen.md b/german/Stopfen/entspannen/entspannen.md new file mode 100644 index 0000000000..66898a58d1 --- /dev/null +++ b/german/Stopfen/entspannen/entspannen.md @@ -0,0 +1,10 @@ +Wie eine Wiege liegt das Boot auf dem leicht gekräuselten Wasser. Es scheint sich kaum zu bewegen. Die Sonne dringt wärmend durch die nassen Kleider und läßt den ersten Schreck langsam abklingen. + +Da fällt Ihr Blick auf eine kurze Rute am Bootsende. Jetzt fiel es Ihnen wieder ein: + +Sie wollten ein paar Tage ausspannen und hatten sich einem Kollegen angeschlossen, der Ihnen schon die eine oder andere wilde Geschichte vom Angeln erzählt hatte. Es sollte früh losgehen, da sich die begehrten Tiere um jene Zeit bevorzugt auf Futtersuche begeben. Da Sie tagszuvor noch einer Geburtstagsfeier beiwohnten, beschlossen Sie gemeinsam, die Nacht durchzumachen. + +Was ist seitdem geschehen? +Wo ist Ihr Kollege? +Warum sind Sie allein auf dem Boot? +Haben Sie etwas gefangen? diff --git a/german/Stopfen/stopfen.md b/german/Stopfen/stopfen.md index acc6839fb6..1f62132593 100644 --- a/german/Stopfen/stopfen.md +++ b/german/Stopfen/stopfen.md @@ -10,3 +10,5 @@ Was machen Sie nun? [Aus dem Boot springen und nach Norden schwimmen?](../schwimmen/schwimmen.md) [Aus dem Traum aufwachen und Oktoberfest besuchen](../Oktoberfest/oktoberfest.md) + +[Die Stille geniessen und nachdenken](/entspannen/entspannen.md) From 5b93723d507967b57d8264c01d671b32c4ab2d25 Mon Sep 17 00:00:00 2001 From: Christian Siegel Date: Mon, 13 Jul 2015 02:59:23 +0200 Subject: [PATCH 0154/5486] Add some line breaks --- german/Stopfen/entspannen/entspannen.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/german/Stopfen/entspannen/entspannen.md b/german/Stopfen/entspannen/entspannen.md index 66898a58d1..4f9d78bd0b 100644 --- a/german/Stopfen/entspannen/entspannen.md +++ b/german/Stopfen/entspannen/entspannen.md @@ -1,10 +1,19 @@ -Wie eine Wiege liegt das Boot auf dem leicht gekräuselten Wasser. Es scheint sich kaum zu bewegen. Die Sonne dringt wärmend durch die nassen Kleider und läßt den ersten Schreck langsam abklingen. +Wie eine Wiege liegt das Boot auf dem leicht gekräuselten Wasser. Es scheint sich kaum +zu bewegen. Die Sonne dringt wärmend durch die nassen Kleider und läßt den ersten Schreck +langsam abklingen. Da fällt Ihr Blick auf eine kurze Rute am Bootsende. Jetzt fiel es Ihnen wieder ein: -Sie wollten ein paar Tage ausspannen und hatten sich einem Kollegen angeschlossen, der Ihnen schon die eine oder andere wilde Geschichte vom Angeln erzählt hatte. Es sollte früh losgehen, da sich die begehrten Tiere um jene Zeit bevorzugt auf Futtersuche begeben. Da Sie tagszuvor noch einer Geburtstagsfeier beiwohnten, beschlossen Sie gemeinsam, die Nacht durchzumachen. +Sie wollten ein paar Tage ausspannen und hatten sich einem Kollegen angeschlossen, +der Ihnen schon die eine oder andere wilde Geschichte vom Angeln erzählt hatte. Es sollte +früh losgehen, da sich die begehrten Tiere um jene Zeit bevorzugt auf Futtersuche begeben. +Da Sie tagszuvor noch einer Geburtstagsfeier beiwohnten, beschlossen Sie gemeinsam, die +Nacht durchzumachen. Was ist seitdem geschehen? + Wo ist Ihr Kollege? + Warum sind Sie allein auf dem Boot? + Haben Sie etwas gefangen? From 9e98b71a364805fd417d5de192e2785d71b9fc3f Mon Sep 17 00:00:00 2001 From: Christian Siegel Date: Mon, 13 Jul 2015 03:12:39 +0200 Subject: [PATCH 0155/5486] Fix entspannen link --- german/Stopfen/stopfen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/Stopfen/stopfen.md b/german/Stopfen/stopfen.md index 1f62132593..e2f0a1a0cf 100644 --- a/german/Stopfen/stopfen.md +++ b/german/Stopfen/stopfen.md @@ -11,4 +11,4 @@ Was machen Sie nun? [Aus dem Traum aufwachen und Oktoberfest besuchen](../Oktoberfest/oktoberfest.md) -[Die Stille geniessen und nachdenken](/entspannen/entspannen.md) +[Die Stille geniessen und nachdenken](entspannen/entspannen.md) From 1e17d9e8580e4ae837cc685d2e5b19d5090772fd Mon Sep 17 00:00:00 2001 From: Christian Siegel Date: Mon, 13 Jul 2015 03:21:34 +0200 Subject: [PATCH 0156/5486] Change wording --- german/Stopfen/entspannen/entspannen.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/german/Stopfen/entspannen/entspannen.md b/german/Stopfen/entspannen/entspannen.md index 4f9d78bd0b..3f0a233308 100644 --- a/german/Stopfen/entspannen/entspannen.md +++ b/german/Stopfen/entspannen/entspannen.md @@ -2,7 +2,7 @@ Wie eine Wiege liegt das Boot auf dem leicht gekräuselten Wasser. Es scheint si zu bewegen. Die Sonne dringt wärmend durch die nassen Kleider und läßt den ersten Schreck langsam abklingen. -Da fällt Ihr Blick auf eine kurze Rute am Bootsende. Jetzt fiel es Ihnen wieder ein: +Da fällt Ihr Blick auf eine kurze Rute am Bootsende und Sie beginnen sich zu erinnern: Sie wollten ein paar Tage ausspannen und hatten sich einem Kollegen angeschlossen, der Ihnen schon die eine oder andere wilde Geschichte vom Angeln erzählt hatte. Es sollte @@ -12,8 +12,8 @@ Nacht durchzumachen. Was ist seitdem geschehen? -Wo ist Ihr Kollege? +Wo ist Ihr Kollege geblieben? Warum sind Sie allein auf dem Boot? -Haben Sie etwas gefangen? +Haben Sie schon etwas gefangen? From f2933c81121462b6314a069aa3107e1ba394d92f Mon Sep 17 00:00:00 2001 From: Federico Andrioli Date: Mon, 13 Jul 2015 09:12:06 +0200 Subject: [PATCH 0157/5486] add enter mirror adventure --- english/marshmallow.md | 4 ++++ english/mirror/enter-mirror.md | 7 +++++++ 2 files changed, 11 insertions(+) create mode 100644 english/mirror/enter-mirror.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 6c38e3a3a5..491a6ba537 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -42,6 +42,10 @@ You decide to try to light a fire to melt some of the marshmallows so you look f You have the suspicion that you are being closely watched. +[Sure it's that man on the sofa](./movie-ripoffs/zoolander/zoolander.md) + +[Wait, I'm in front of a mirror... Am I?](./mirror/enter-mirror.md) + You see a polar bear searching for food. "Well- OK" you admit to yourself, "Perhaps I do indulge in the occasional intoxicant!" diff --git a/english/mirror/enter-mirror.md b/english/mirror/enter-mirror.md new file mode 100644 index 0000000000..c15cf47bcb --- /dev/null +++ b/english/mirror/enter-mirror.md @@ -0,0 +1,7 @@ +It's not a mirror, it's a door to a marshmellow room that looks identical to the previous one! + +[Go speak with the man on the sofa twin](./movie-ripoffs/zoolander/zoolander.md) + +[Go back to the previous room](../) + +[Look for a toilet](../eating-walls/find-a-toilet/find-a-toilet.md) \ No newline at end of file From 77079cdfa24db5a78b6ba0e98005930c5a7496b9 Mon Sep 17 00:00:00 2001 From: Federico Andrioli Date: Mon, 13 Jul 2015 09:15:44 +0200 Subject: [PATCH 0158/5486] change my mirror lines --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 491a6ba537..60c321bad0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -42,9 +42,9 @@ You decide to try to light a fire to melt some of the marshmallows so you look f You have the suspicion that you are being closely watched. -[Sure it's that man on the sofa](./movie-ripoffs/zoolander/zoolander.md) +[Sure it's that man on the sofa, go talk to him again](./movie-ripoffs/zoolander/zoolander.md) -[Wait, I'm in front of a mirror... Am I?](./mirror/enter-mirror.md) +[Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) You see a polar bear searching for food. From dd73343fd625d4c58c895efd41a9e6c1b571fc69 Mon Sep 17 00:00:00 2001 From: Federico Andrioli Date: Mon, 13 Jul 2015 09:19:00 +0200 Subject: [PATCH 0159/5486] change enter mirror choices --- english/mirror/enter-mirror.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/mirror/enter-mirror.md b/english/mirror/enter-mirror.md index c15cf47bcb..9425263e18 100644 --- a/english/mirror/enter-mirror.md +++ b/english/mirror/enter-mirror.md @@ -1,7 +1,5 @@ It's not a mirror, it's a door to a marshmellow room that looks identical to the previous one! -[Go speak with the man on the sofa twin](./movie-ripoffs/zoolander/zoolander.md) - -[Go back to the previous room](../) +[Go back to the previous room](../marshmellow.md) [Look for a toilet](../eating-walls/find-a-toilet/find-a-toilet.md) \ No newline at end of file From c947da24cd76c0797b932c50a134936760130499 Mon Sep 17 00:00:00 2001 From: Federico Andrioli Date: Mon, 13 Jul 2015 09:20:58 +0200 Subject: [PATCH 0160/5486] fix typo --- english/mirror/enter-mirror.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/mirror/enter-mirror.md b/english/mirror/enter-mirror.md index 9425263e18..6b5e7d53c5 100644 --- a/english/mirror/enter-mirror.md +++ b/english/mirror/enter-mirror.md @@ -1,5 +1,5 @@ It's not a mirror, it's a door to a marshmellow room that looks identical to the previous one! -[Go back to the previous room](../marshmellow.md) +[Go back to the previous room](../marshmallow.md) [Look for a toilet](../eating-walls/find-a-toilet/find-a-toilet.md) \ No newline at end of file From b155f5d36a10b9446bd81f997cacadb157f78fd1 Mon Sep 17 00:00:00 2001 From: Federico Andrioli Date: Mon, 13 Jul 2015 09:22:47 +0200 Subject: [PATCH 0161/5486] change my man on the sofa line --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 60c321bad0..5ea9ab1f06 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -42,7 +42,7 @@ You decide to try to light a fire to melt some of the marshmallows so you look f You have the suspicion that you are being closely watched. -[Sure it's that man on the sofa, go talk to him again](./movie-ripoffs/zoolander/zoolander.md) +[Of course, it's that man on the sofa, go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) [Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) From 71a0feb5b4ce315ca6107c307eb1ee3fc4dd36c1 Mon Sep 17 00:00:00 2001 From: Jaap de Jong Date: Mon, 13 Jul 2015 11:39:39 +0200 Subject: [PATCH 0162/5486] Add 2 lines to the Dutch part of the Udacity adventure --- dutch/over-het-hek/mobiel/mobiel.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dutch/over-het-hek/mobiel/mobiel.md b/dutch/over-het-hek/mobiel/mobiel.md index d5f3e38502..6668477575 100644 --- a/dutch/over-het-hek/mobiel/mobiel.md +++ b/dutch/over-het-hek/mobiel/mobiel.md @@ -1,2 +1,5 @@ -Je druk op het knopje van je mobiel, het scherm licht nog even op en... +Je drukt op het knopje van je mobiel, het scherm licht nog even op en... + +...heb jij weer, 'Battery too low' en het scherm dimt, maar in het laatste schijnsel +zie je nog net een schim vlakbij voor je langs bewegen, wat is dit nu weer?? From 31086e981b58cbba66e388ffa12738e0b50b9399 Mon Sep 17 00:00:00 2001 From: Jaap de Jong Date: Mon, 13 Jul 2015 11:41:28 +0200 Subject: [PATCH 0163/5486] Revert typo fix because casey-collab won't let me --- dutch/over-het-hek/mobiel/mobiel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dutch/over-het-hek/mobiel/mobiel.md b/dutch/over-het-hek/mobiel/mobiel.md index 6668477575..75d78c4892 100644 --- a/dutch/over-het-hek/mobiel/mobiel.md +++ b/dutch/over-het-hek/mobiel/mobiel.md @@ -1,4 +1,4 @@ -Je drukt op het knopje van je mobiel, het scherm licht nog even op en... +Je druk op het knopje van je mobiel, het scherm licht nog even op en... ...heb jij weer, 'Battery too low' en het scherm dimt, maar in het laatste schijnsel zie je nog net een schim vlakbij voor je langs bewegen, wat is dit nu weer?? From a7e28d7a3cf532efa40d007f6cef473b3fb661f0 Mon Sep 17 00:00:00 2001 From: "Amaresh R. Joshi" Date: Mon, 13 Jul 2015 09:16:33 -0400 Subject: [PATCH 0164/5486] Add re-added mistakenly deleted slovenian files. --- .../svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" | 1 + "slovenian/za\304\215etek.md" | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 "slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" create mode 100644 "slovenian/za\304\215etek.md" diff --git "a/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" "b/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" new file mode 100644 index 0000000000..4a14b970ab --- /dev/null +++ "b/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" @@ -0,0 +1 @@ +Znašel si se v sobi svetlo vijolične barve. diff --git "a/slovenian/za\304\215etek.md" "b/slovenian/za\304\215etek.md" new file mode 100644 index 0000000000..fc05513818 --- /dev/null +++ "b/slovenian/za\304\215etek.md" @@ -0,0 +1,9 @@ +Včeraj si zaspal v svoji sobi, zdaj pa si se zbudil v beli sobi z dvemi vrati. Ena na levi, druga na desni. + +Leva vrata so rumene barve, desna pa svetlo vijolične barve. + +Skozi katera vrata vstopiš? + +[Odpreš vrata rumene barve] (rumena/rumena.md) + +[Odpreš vrata svetlo vijolične barve] (svetlo-vijolična/svetlo-vijolična.md) From 8078970ca9c6f5ce3d807831b3cc1942dbc3b5cc Mon Sep 17 00:00:00 2001 From: 123cristen <1cristen1@gmail.com> Date: Mon, 13 Jul 2015 16:40:27 +0200 Subject: [PATCH 0165/5486] Create sword.md --- .../magic-world/follow/dream/fight/sword/sword.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/light-fire/magic-world/follow/dream/fight/sword/sword.md diff --git a/english/light-fire/magic-world/follow/dream/fight/sword/sword.md b/english/light-fire/magic-world/follow/dream/fight/sword/sword.md new file mode 100644 index 0000000000..bc7767345b --- /dev/null +++ b/english/light-fire/magic-world/follow/dream/fight/sword/sword.md @@ -0,0 +1,7 @@ +You picked up the sword, only to find the rat there to challenge you! + +You try to fight, but you failed fencing in high school. + +You're dead. + +The rat smirks as you sink into the unknown. From 83a999531c90117edef5351c2b62b22a4eb380b0 Mon Sep 17 00:00:00 2001 From: 123cristen <1cristen1@gmail.com> Date: Mon, 13 Jul 2015 16:42:13 +0200 Subject: [PATCH 0166/5486] Add link to pick up sword --- english/light-fire/magic-world/follow/dream/fight/fight.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/light-fire/magic-world/follow/dream/fight/fight.md b/english/light-fire/magic-world/follow/dream/fight/fight.md index 85f983461a..13f9e54f0c 100644 --- a/english/light-fire/magic-world/follow/dream/fight/fight.md +++ b/english/light-fire/magic-world/follow/dream/fight/fight.md @@ -7,3 +7,5 @@ Just as you are about to breath a sigh of relief you notice that something seems What is worse, that it may have been you. And why would they taste like marshmallows. Wait you have a sword under your bed.... + +[Pick up sword](sword/sword.md) From 1a95b5a4c871fd257175dda3a0d91b90faf2ab26 Mon Sep 17 00:00:00 2001 From: Sarah Varki Date: Mon, 13 Jul 2015 11:41:30 -0400 Subject: [PATCH 0167/5486] add shrunken.md --- english/shrunk/shrunken.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/shrunk/shrunken.md diff --git a/english/shrunk/shrunken.md b/english/shrunk/shrunken.md new file mode 100644 index 0000000000..19a4b0b7a0 --- /dev/null +++ b/english/shrunk/shrunken.md @@ -0,0 +1,7 @@ +All of a sudden, you regret sneaking that taste of chocolate. The room around you feels unstable, and then seems to be growing at a rapid pace. + +Why is everythng so high now? And big? And far away? You look down and see a spoon on the ground next to you...except that it's bigger than you. What happened? + +Oh no, the room didn't get bigger. You SHRANK! You're tiny. Small enough to sit in the spoon, even. + +Now what?? How do you either get bigger, or just get out of this mess?! \ No newline at end of file From 55f79941c0b634e9409868face18b8bfaf4ff845 Mon Sep 17 00:00:00 2001 From: Sarah Varki Date: Mon, 13 Jul 2015 11:57:21 -0400 Subject: [PATCH 0168/5486] correct link to shrunken option --- english/coffee/drink-tea/drink-hot-tea.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/coffee/drink-tea/drink-hot-tea.md b/english/coffee/drink-tea/drink-hot-tea.md index 9568ed6239..6f992e96a3 100644 --- a/english/coffee/drink-tea/drink-hot-tea.md +++ b/english/coffee/drink-tea/drink-hot-tea.md @@ -5,5 +5,5 @@ You see a bowl of chocolates and sneakily eat one. [Everything around you seems to grow](alice/alice-in-wonderland.md) -[Everything around you seems to shrink](shrunk/shrunken.md) +[Everything around you seems to shrink](../shrunk/shrunken.md) From 76a2970fe4ba79ee699faee236035fc12977e358 Mon Sep 17 00:00:00 2001 From: Sarah Varki Date: Mon, 13 Jul 2015 12:00:55 -0400 Subject: [PATCH 0169/5486] shorten lines --- english/shrunk/shrunken.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/english/shrunk/shrunken.md b/english/shrunk/shrunken.md index 19a4b0b7a0..dc0c6657d7 100644 --- a/english/shrunk/shrunken.md +++ b/english/shrunk/shrunken.md @@ -1,6 +1,10 @@ -All of a sudden, you regret sneaking that taste of chocolate. The room around you feels unstable, and then seems to be growing at a rapid pace. +All of a sudden, you regret sneaking that taste of chocolate. -Why is everythng so high now? And big? And far away? You look down and see a spoon on the ground next to you...except that it's bigger than you. What happened? +The room around you feels unstable, and then seems to be growing at a rapid pace. + +Why is everythng so high now? And big? And far away? + +You look down and see a spoon on the ground next to you...except that it's bigger than you. What happened? Oh no, the room didn't get bigger. You SHRANK! You're tiny. Small enough to sit in the spoon, even. From c8fcc30a525897fba7100b05414af0454b3c523b Mon Sep 17 00:00:00 2001 From: Sarah Varki Date: Mon, 13 Jul 2015 12:06:23 -0400 Subject: [PATCH 0170/5486] edit link again --- english/coffee/drink-tea/drink-hot-tea.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/coffee/drink-tea/drink-hot-tea.md b/english/coffee/drink-tea/drink-hot-tea.md index 6f992e96a3..6539db5599 100644 --- a/english/coffee/drink-tea/drink-hot-tea.md +++ b/english/coffee/drink-tea/drink-hot-tea.md @@ -5,5 +5,5 @@ You see a bowl of chocolates and sneakily eat one. [Everything around you seems to grow](alice/alice-in-wonderland.md) -[Everything around you seems to shrink](../shrunk/shrunken.md) +[Everything around you seems to shrink](../../shrunk/shrunken.md) From 9649472f192a009fa5dd32130320d195c36dd1c2 Mon Sep 17 00:00:00 2001 From: pikinkz Date: Mon, 13 Jul 2015 23:02:04 +0600 Subject: [PATCH 0171/5486] Added call mom option --- russian/call-mom/call-mom.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 russian/call-mom/call-mom.md diff --git a/russian/call-mom/call-mom.md b/russian/call-mom/call-mom.md new file mode 100644 index 0000000000..770fa20096 --- /dev/null +++ b/russian/call-mom/call-mom.md @@ -0,0 +1 @@ +Вы позвонили своей маме и рассказали о том, что происходит. From 94f3a719950a4baf11b1226af6126f902746080d Mon Sep 17 00:00:00 2001 From: pikinkz Date: Mon, 13 Jul 2015 23:13:25 +0600 Subject: [PATCH 0172/5486] Added link to my option Call mom --- russian/zefir.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/zefir.md b/russian/zefir.md index f15df7f922..2d11fc2e8c 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -23,3 +23,5 @@ [Пойдёте в сад.](garden/garden.md) [Позовёте друзей.](invite-friends/invite.md) + +[Позвоните маме.](call-mom/call-mom.md) From a58d2629eaf13b80af79a2a1021605941b298b36 Mon Sep 17 00:00:00 2001 From: Paul Nick Rheinberger Date: Mon, 13 Jul 2015 16:55:06 -0500 Subject: [PATCH 0173/5486] Complete too-many-marshmallows.md --- .../door/bear/too-many-marshmallows/too-many-marshmallows.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md index ee81be73b3..bd7bea2560 100644 --- a/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md +++ b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md @@ -4,3 +4,7 @@ like that?" The bear then stalks away seeming very annoyed. What do you do next? + +[Close the door and finally relieve yourself?](../../../relieve/relieve-yourself.md) + +[Go back to the previous room](../../../../../marshmallow.md) \ No newline at end of file From aac0c33b065bb6c70376bd60fb78555a76e8b477 Mon Sep 17 00:00:00 2001 From: leiomy Date: Tue, 14 Jul 2015 02:38:35 +0200 Subject: [PATCH 0174/5486] Update gruessen_freundlich.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mann und frau sind möglicherweise nicht ganz knusper --- .../gruessen_freundlich/gruessen_freundlich.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/finger-ins-loch/hoelzernes-Paddel/sicherer_Entfernung/gruessen_freundlich/gruessen_freundlich.md b/german/finger-ins-loch/hoelzernes-Paddel/sicherer_Entfernung/gruessen_freundlich/gruessen_freundlich.md index 20a9d1dbcd..4e0f06d2f8 100644 --- a/german/finger-ins-loch/hoelzernes-Paddel/sicherer_Entfernung/gruessen_freundlich/gruessen_freundlich.md +++ b/german/finger-ins-loch/hoelzernes-Paddel/sicherer_Entfernung/gruessen_freundlich/gruessen_freundlich.md @@ -1,4 +1,6 @@ "Hallo, ich heiße Bernd und bin schiffbrüchig". Die beiden drehen sich schlagartig in Ihre Richtung und starren Sie mit großen Augen an. Entsetzen ist in ihr Gesicht geschrieben. Gerade als Sie ... - +"Du darfst nicht hier sein!", zischt Ihnen die junge Frau zu. Feuchte, dunkle Haarsträhnen hängen +ihr ins Gesicht, darunter blitzen merkwürdig schwarze Augen im Feuerschein. Der +Mann wendet langsam sein Gesicht zu Ihnen. Sie sehen, dass er blind ist. From c0d3764cfd924b7b6d898a0344434263e9efa3de Mon Sep 17 00:00:00 2001 From: leiomy Date: Tue, 14 Jul 2015 02:42:11 +0200 Subject: [PATCH 0175/5486] Update gruessen_freundlich.md --- .../gruessen_freundlich/gruessen_freundlich.md | 1 + 1 file changed, 1 insertion(+) diff --git a/german/finger-ins-loch/hoelzernes-Paddel/sicherer_Entfernung/gruessen_freundlich/gruessen_freundlich.md b/german/finger-ins-loch/hoelzernes-Paddel/sicherer_Entfernung/gruessen_freundlich/gruessen_freundlich.md index 4e0f06d2f8..3ff2ba6a4a 100644 --- a/german/finger-ins-loch/hoelzernes-Paddel/sicherer_Entfernung/gruessen_freundlich/gruessen_freundlich.md +++ b/german/finger-ins-loch/hoelzernes-Paddel/sicherer_Entfernung/gruessen_freundlich/gruessen_freundlich.md @@ -1,6 +1,7 @@ "Hallo, ich heiße Bernd und bin schiffbrüchig". Die beiden drehen sich schlagartig in Ihre Richtung und starren Sie mit großen Augen an. Entsetzen ist in ihr Gesicht geschrieben. Gerade als Sie ... + "Du darfst nicht hier sein!", zischt Ihnen die junge Frau zu. Feuchte, dunkle Haarsträhnen hängen ihr ins Gesicht, darunter blitzen merkwürdig schwarze Augen im Feuerschein. Der Mann wendet langsam sein Gesicht zu Ihnen. Sie sehen, dass er blind ist. From a5e3493e34f91e8391665310a85fda4844b70c0a Mon Sep 17 00:00:00 2001 From: leiomy Date: Tue, 14 Jul 2015 02:44:21 +0200 Subject: [PATCH 0176/5486] Update gruessen_freundlich.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit korrigiert für den pull request --- .../gruessen_freundlich/gruessen_freundlich.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/german/finger-ins-loch/hoelzernes-Paddel/sicherer_Entfernung/gruessen_freundlich/gruessen_freundlich.md b/german/finger-ins-loch/hoelzernes-Paddel/sicherer_Entfernung/gruessen_freundlich/gruessen_freundlich.md index 3ff2ba6a4a..4785076af3 100644 --- a/german/finger-ins-loch/hoelzernes-Paddel/sicherer_Entfernung/gruessen_freundlich/gruessen_freundlich.md +++ b/german/finger-ins-loch/hoelzernes-Paddel/sicherer_Entfernung/gruessen_freundlich/gruessen_freundlich.md @@ -3,5 +3,5 @@ in Ihre Richtung und starren Sie mit großen Augen an. Entsetzen ist in ihr Gesicht geschrieben. Gerade als Sie ... "Du darfst nicht hier sein!", zischt Ihnen die junge Frau zu. Feuchte, dunkle Haarsträhnen hängen -ihr ins Gesicht, darunter blitzen merkwürdig schwarze Augen im Feuerschein. Der -Mann wendet langsam sein Gesicht zu Ihnen. Sie sehen, dass er blind ist. +ihr ins Gesicht, darunter blitzen merkwürdig schwarze Augen im Feuerschein. Etwas scheint außerdem +mit dem Mann nicht zu stimmen. Nach einem Augenblick wird Ihnen klar, dass er blind ist. From 2989a8a6d6aeb084e209d509850062087da835c1 Mon Sep 17 00:00:00 2001 From: Ricardo La Rosa Date: Tue, 14 Jul 2015 01:53:12 +0100 Subject: [PATCH 0177/5486] New Torre story "Huida" in spanish section --- espanol/torre/huida/huida.md | 1 + espanol/torre/torre.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 espanol/torre/huida/huida.md diff --git a/espanol/torre/huida/huida.md b/espanol/torre/huida/huida.md new file mode 100644 index 0000000000..6d85e05ae5 --- /dev/null +++ b/espanol/torre/huida/huida.md @@ -0,0 +1 @@ +No se puede medir la fuerza del enemigo y su estimacion supone una fuerza muy alta. diff --git a/espanol/torre/torre.md b/espanol/torre/torre.md index 25ee137c10..5b7603143d 100644 --- a/espanol/torre/torre.md +++ b/espanol/torre/torre.md @@ -1,4 +1,4 @@ -Desde lo alto de la torre se podía ver a un gran ejército acercándose, aunque +Desde lo alto de la torre se podía ver a un gran ejército acercándose, aunque todavía estaba demasiado lejos para distinguir si era amigo o enemigo. Entonces el consejero decidió: @@ -10,3 +10,5 @@ Entonces el consejero decidió: [Enviar un equipo de exploradores](exploradores/exploradores.md) [Preparar su ejercito y ejecutar la estrategia establecida] (estrategia/estrategia.md) + +[Huir de la escena] (huida/huida.md) From ea2a3564efbeb10aad0b7cdd3f3952a7b2dc985d Mon Sep 17 00:00:00 2001 From: octavianhd Date: Tue, 14 Jul 2015 08:41:47 +0300 Subject: [PATCH 0178/5486] Add new lines to the story and a new file --- romanian/ceai_de_nalbe/ceai_de_nalbe.md | 2 ++ romanian/nalba.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 romanian/ceai_de_nalbe/ceai_de_nalbe.md diff --git a/romanian/ceai_de_nalbe/ceai_de_nalbe.md b/romanian/ceai_de_nalbe/ceai_de_nalbe.md new file mode 100644 index 0000000000..11621a0fe2 --- /dev/null +++ b/romanian/ceai_de_nalbe/ceai_de_nalbe.md @@ -0,0 +1,2 @@ +Orele treceau si Ginel cu Ginuta tot beau la ceai de nalba si discutau, si +iar beau si discutau, cand deodata Ginel avu o idee: \ No newline at end of file diff --git a/romanian/nalba.md b/romanian/nalba.md index c988bc6c5b..41a56c0db9 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -29,3 +29,7 @@ cat sa fi costat compania Ginutei, sau de ce nu a avut noroc in viata. Ginel nu coreleaza lipsa repetata de la scoala, cu lipsurile din prezent. Ginuta il priveste o vreme, asa cazut pe ganduri, apoi il intreaba: - Auzi, ai cumva un Orbit ? + +-N-am, dar putem sa facem un [ceai de nalbe](ceai_de_nalbe/ceai_de_nalbe.md). Ar trebui sa +aiba gust bun, putem mari putin doza, doar avem un pat de nalbe, sa vedem ce se intampla. +Se pusera ei pe baut ceai de nalba cand deodata... \ No newline at end of file From 29443943e5959aadf208cf18dae1413b1fb40e85 Mon Sep 17 00:00:00 2001 From: ascherm97 Date: Tue, 14 Jul 2015 02:49:07 -0500 Subject: [PATCH 0179/5486] Fix some typos --- espanol/torre/estrategia/estrategia.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/espanol/torre/estrategia/estrategia.md b/espanol/torre/estrategia/estrategia.md index a6df19800f..71b975579a 100644 --- a/espanol/torre/estrategia/estrategia.md +++ b/espanol/torre/estrategia/estrategia.md @@ -1,6 +1,6 @@ La estrategia contemplaba una amplia gama de posibilidades, pero le daba al pueblo la -posibilidad de actuar en respuesta a cada situacion, si los visitantes fueran hostiles -estarian preparados para hacerles frente y proyeger a su pueblo. +posibilidad de actuar en respuesta a cada situación, si los visitantes fueran hostiles +estarian preparados para hacerles frente y proteger a su pueblo. -Mientras que si los visitantes eran aliados, practicamente no notarian la presencia de este ejercito -que ante todo se manejaba con sigilo y astucia. \ No newline at end of file +Mientras que si los visitantes eran aliados, practicamente no notarian la presencia de +este ejercito que ante todo se manejaba con sigilo y astucia. From 4abf5e88734b23096baa34ff38f6c506ab9f9205 Mon Sep 17 00:00:00 2001 From: johnsongul Date: Tue, 14 Jul 2015 13:51:29 +0100 Subject: [PATCH 0180/5486] Add more monk story. --- Chinese/monk/monk.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Chinese/monk/monk.md b/Chinese/monk/monk.md index 30f8a3c98a..f3e78614b4 100644 --- a/Chinese/monk/monk.md +++ b/Chinese/monk/monk.md @@ -13,4 +13,12 @@ 报里有座山 山上有座庙 -…… +庙里的那个老和尚依然在看报， + +不过今天的报纸上画着一个着火的寺庙 +寺庙里的和尚很专注的看着报纸，丝毫没有察觉寺庙着火了， +那个报纸上也画着一个着火的寺庙，寺庙里的和尚也是很专注的看着报纸，丝毫没有察觉寺庙着火， +... + + + From 6888bda831fabdc8604a24e81e708a41559ea767 Mon Sep 17 00:00:00 2001 From: Yujin Shin Date: Tue, 14 Jul 2015 16:53:02 +0200 Subject: [PATCH 0181/5486] some korean stories added --- korean/explore-outside/find-coco.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 korean/explore-outside/find-coco.md diff --git a/korean/explore-outside/find-coco.md b/korean/explore-outside/find-coco.md new file mode 100644 index 0000000000..9c9706248f --- /dev/null +++ b/korean/explore-outside/find-coco.md @@ -0,0 +1,2 @@ +아 근데 같이 먹을 마쉬멜로우를 가져온다는걸 깜빡했네. +방으로 [돌아가](../marshmallow.md)야하잖아... \ No newline at end of file From 469223f46e5017b93ca5151c8d8856cb1e22eda7 Mon Sep 17 00:00:00 2001 From: Yujin Shin Date: Tue, 14 Jul 2015 16:58:31 +0200 Subject: [PATCH 0182/5486] add a storybranch --- korean/marshmallow.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/korean/marshmallow.md b/korean/marshmallow.md index 10527ff255..fb40f42a52 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -8,7 +8,7 @@ [다시 잔다](sleep/marshmallow.md)? -[이건 아니다 싶어 영어 버션으로 간다](../english/marshmallow.md)? +[이건 아니다 싶어 영어 버전으로 간다](../english/marshmallow.md)? [어쩔줄 모르고 그냥 운다](cry/cry.md)? @@ -20,4 +20,6 @@ [집에 가고싶어 밖으로 나간다](explore-outside/explore-outside.md)? -[벽에서 마시멜로를 한 움큼 떼어내어 축구를 한다](soccer/soccer.md)? \ No newline at end of file +[벽에서 마시멜로를 한 움큼 떼어내어 축구를 한다](soccer/soccer.md)? + +[마쉬멜로라면 핫초코지~! 핫초코를 사러 나간다.](coco/coco.md) \ No newline at end of file From 88637730cfa8e711595ad97db2535c2279979ccc Mon Sep 17 00:00:00 2001 From: Yujin Shin Date: Tue, 14 Jul 2015 16:59:28 +0200 Subject: [PATCH 0183/5486] new storybranch : korean/coco/coco.md --- korean/coco/coco.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 korean/coco/coco.md diff --git a/korean/coco/coco.md b/korean/coco/coco.md new file mode 100644 index 0000000000..34242eb383 --- /dev/null +++ b/korean/coco/coco.md @@ -0,0 +1,3 @@ +핫초코를 사러 나온 당신... 돈은 있나요? 핫초코를 어디서 살건가요? +돈이 없으면 뭘 어쩌겠어? [다시 방으로 돌아간다](../marshmallow.md) 집에서 잠이나 자! +돈이 없으면 핫초코를...직접 찾아나서는거! [핫초코를 찾아 여행](../explore-outside/find-coco.md) From 5236df8e8968585b7fbb4cf337880c458eb25f74 Mon Sep 17 00:00:00 2001 From: Yujin Shin Date: Tue, 14 Jul 2015 17:20:36 +0200 Subject: [PATCH 0184/5486] add recursive start in korean --- korean/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/korean/marshmallow.md b/korean/marshmallow.md index fb40f42a52..533edea7fc 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -22,4 +22,6 @@ [벽에서 마시멜로를 한 움큼 떼어내어 축구를 한다](soccer/soccer.md)? -[마쉬멜로라면 핫초코지~! 핫초코를 사러 나간다.](coco/coco.md) \ No newline at end of file +[마쉬멜로라면 핫초코지~! 핫초코를 사러 나간다.](coco/coco.md) + +[다시잔다](marshmallow.md) \ No newline at end of file From 6630333d763004b9a7857f47eda671d47056330b Mon Sep 17 00:00:00 2001 From: yujinshin90 Date: Tue, 14 Jul 2015 17:27:15 +0200 Subject: [PATCH 0185/5486] Update coco.md --- korean/coco/coco.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/korean/coco/coco.md b/korean/coco/coco.md index 34242eb383..0a0cc9fbe2 100644 --- a/korean/coco/coco.md +++ b/korean/coco/coco.md @@ -1,3 +1,5 @@ 핫초코를 사러 나온 당신... 돈은 있나요? 핫초코를 어디서 살건가요? + 돈이 없으면 뭘 어쩌겠어? [다시 방으로 돌아간다](../marshmallow.md) 집에서 잠이나 자! + 돈이 없으면 핫초코를...직접 찾아나서는거! [핫초코를 찾아 여행](../explore-outside/find-coco.md) From 3ea70b06bf28ab104486e19109bb65a461a38c2c Mon Sep 17 00:00:00 2001 From: Yujin Shin Date: Tue, 14 Jul 2015 17:33:48 +0200 Subject: [PATCH 0186/5486] minor changes : file structure for auto pull reguest :-) --- korean/explore-outside/jorney-to-find-coco/find-coco.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 korean/explore-outside/jorney-to-find-coco/find-coco.md diff --git a/korean/explore-outside/jorney-to-find-coco/find-coco.md b/korean/explore-outside/jorney-to-find-coco/find-coco.md new file mode 100644 index 0000000000..9c9706248f --- /dev/null +++ b/korean/explore-outside/jorney-to-find-coco/find-coco.md @@ -0,0 +1,2 @@ +아 근데 같이 먹을 마쉬멜로우를 가져온다는걸 깜빡했네. +방으로 [돌아가](../marshmallow.md)야하잖아... \ No newline at end of file From a9e0c793ce12a0b0bf1ced459685fee202caafbf Mon Sep 17 00:00:00 2001 From: Yujin Shin Date: Tue, 14 Jul 2015 17:42:04 +0200 Subject: [PATCH 0187/5486] fix some mistakes. --- korean/coco/coco.md | 4 +++- korean/coco/journey-to-find-coco/find-coco.md | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 korean/coco/journey-to-find-coco/find-coco.md diff --git a/korean/coco/coco.md b/korean/coco/coco.md index 34242eb383..77ab221ffd 100644 --- a/korean/coco/coco.md +++ b/korean/coco/coco.md @@ -1,3 +1,5 @@ 핫초코를 사러 나온 당신... 돈은 있나요? 핫초코를 어디서 살건가요? + 돈이 없으면 뭘 어쩌겠어? [다시 방으로 돌아간다](../marshmallow.md) 집에서 잠이나 자! -돈이 없으면 핫초코를...직접 찾아나서는거! [핫초코를 찾아 여행](../explore-outside/find-coco.md) + +돈이 없으면 핫초코를...직접 찾아나서는거! [핫초코를 찾아 여행](journey-to-find-coco/find-coco.md) diff --git a/korean/coco/journey-to-find-coco/find-coco.md b/korean/coco/journey-to-find-coco/find-coco.md new file mode 100644 index 0000000000..70a3b4642e --- /dev/null +++ b/korean/coco/journey-to-find-coco/find-coco.md @@ -0,0 +1,3 @@ +아 근데 같이 먹을 마쉬멜로우를 가져온다는걸 깜빡했네.방으로 + +[돌아가](../../marshmallow.md)야하잖아... \ No newline at end of file From 5a34419d9c2dbf65add21b0aa0731718eff7047b Mon Sep 17 00:00:00 2001 From: Yujin Shin Date: Tue, 14 Jul 2015 17:45:51 +0200 Subject: [PATCH 0188/5486] some files are delted to fix mistakes. --- korean/explore-outside/find-coco.md | 2 -- korean/explore-outside/jorney-to-find-coco/find-coco.md | 2 -- 2 files changed, 4 deletions(-) delete mode 100644 korean/explore-outside/find-coco.md delete mode 100644 korean/explore-outside/jorney-to-find-coco/find-coco.md diff --git a/korean/explore-outside/find-coco.md b/korean/explore-outside/find-coco.md deleted file mode 100644 index 9c9706248f..0000000000 --- a/korean/explore-outside/find-coco.md +++ /dev/null @@ -1,2 +0,0 @@ -아 근데 같이 먹을 마쉬멜로우를 가져온다는걸 깜빡했네. -방으로 [돌아가](../marshmallow.md)야하잖아... \ No newline at end of file diff --git a/korean/explore-outside/jorney-to-find-coco/find-coco.md b/korean/explore-outside/jorney-to-find-coco/find-coco.md deleted file mode 100644 index 9c9706248f..0000000000 --- a/korean/explore-outside/jorney-to-find-coco/find-coco.md +++ /dev/null @@ -1,2 +0,0 @@ -아 근데 같이 먹을 마쉬멜로우를 가져온다는걸 깜빡했네. -방으로 [돌아가](../marshmallow.md)야하잖아... \ No newline at end of file From e8df82aa47cf6925f117487190e8b163f2b7a662 Mon Sep 17 00:00:00 2001 From: Yujin Shin Date: Tue, 14 Jul 2015 18:02:05 +0200 Subject: [PATCH 0189/5486] Changes to be committed: modified: coco/coco.md --- korean/coco/coco.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korean/coco/coco.md b/korean/coco/coco.md index 9b5510d08e..a9d84994fb 100644 --- a/korean/coco/coco.md +++ b/korean/coco/coco.md @@ -1,6 +1,6 @@ 핫초코를 사러 나온 당신... 돈은 있나요? 핫초코를 어디서 살건가요? -돈이 없으면 뭘 어쩌겠어? [다시 방으로 돌아간다](../marshmallow.md) 집에서 잠이나 자! +[돈이 없으면 뭘 어쩌겠어? 다시 방으로 돌아간다](../marshmallow.md) 집에서 잠이나 자! -돈이 없으면 핫초코를...직접 찾아나서는거! [핫초코를 찾아 여행](../explore-outside/find-coco.md) +[돈이 없으면 핫초코를...직접 찾아나서는거! 핫초코를 찾아 여행](journey-to-find-coco/find-coco.md) From 86e72e2e6355d3a1a08a92d392bd77eada70c8e1 Mon Sep 17 00:00:00 2001 From: Annemarie Date: Tue, 14 Jul 2015 18:19:48 +0200 Subject: [PATCH 0190/5486] Delete repeated word --- dutch/over-het-hek/sleutel/sleutel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dutch/over-het-hek/sleutel/sleutel.md b/dutch/over-het-hek/sleutel/sleutel.md index 6da84962ab..47a1b2bf6e 100644 --- a/dutch/over-het-hek/sleutel/sleutel.md +++ b/dutch/over-het-hek/sleutel/sleutel.md @@ -3,4 +3,4 @@ toch het kledingstuk waaraan je hangt langzaam kapot te schuren met de sleutel. Geheel verdiept in het schuren en scheuren merk je pas langzaam op dat... -...dit helemaal jouw sleutels niet zijn. Wat was er toch gebeurd deze nacht? [nacht](nacht/deze-nacht.md) +...dit helemaal jouw sleutels niet zijn. Wat was er toch gebeurd deze [nacht]?(nacht/deze-nacht.md) From b21113fa0df792f30d1ba24ea9149c87c87c3cf0 Mon Sep 17 00:00:00 2001 From: jmoix Date: Tue, 14 Jul 2015 11:44:29 -0500 Subject: [PATCH 0191/5486] add new line to macgyver story --- english/macgyver/macgyver.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/macgyver/macgyver.md b/english/macgyver/macgyver.md index 258c576b9a..aabc6fab95 100644 --- a/english/macgyver/macgyver.md +++ b/english/macgyver/macgyver.md @@ -13,6 +13,8 @@ Then he would build a flamethrower to melt through the walls, of course! He has Just don't burn your mullet! +For it is where your power truly lies.... + Time is running out, and you need to act fast before the marshmallow explodes. The fate of the free world rests on your shoulders... From 1019fcc80aacb87e4d6cfb29f27644f16e76ec71 Mon Sep 17 00:00:00 2001 From: John Doe Date: Tue, 14 Jul 2015 14:19:41 -0400 Subject: [PATCH 0192/5486] add my line to wikipedia story --- english/wikipedia/wiki.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/wikipedia/wiki.md b/english/wikipedia/wiki.md index a0a7970870..74ba1e947d 100644 --- a/english/wikipedia/wiki.md +++ b/english/wikipedia/wiki.md @@ -8,6 +8,8 @@ Information, incalculable information, at your fingertips. You are blind to all but your exploration of the known and unknown universe. +And you don't have to go to the library. + [Behold!](http://en.wikipedia.org) You are so impressed with Wikipedia, you decide that you might even like to From 6385f5028e40c7110fc2297e294b0ab68dc7b997 Mon Sep 17 00:00:00 2001 From: Yameen Rasheed Date: Wed, 15 Jul 2015 16:52:43 +0500 Subject: [PATCH 0193/5486] Added line to Macgiver story --- english/macgyver/macgyver.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/macgyver/macgyver.md b/english/macgyver/macgyver.md index aabc6fab95..18af6d9a35 100644 --- a/english/macgyver/macgyver.md +++ b/english/macgyver/macgyver.md @@ -13,6 +13,8 @@ Then he would build a flamethrower to melt through the walls, of course! He has Just don't burn your mullet! +And certainly do not, on any account, burn the rope! + For it is where your power truly lies.... Time is running out, and you need to act fast before the marshmallow explodes. The fate of the free world rests on your From c27ffe9c6e560f92c6c8f218d44f090964cf9827 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Wed, 15 Jul 2015 11:14:15 -0700 Subject: [PATCH 0194/5486] feat: add goddess option to ask-alice --- english/ask-to-alice/ask-to-alice.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/ask-to-alice/ask-to-alice.md b/english/ask-to-alice/ask-to-alice.md index 389ac67727..fc63c65fe0 100644 --- a/english/ask-to-alice/ask-to-alice.md +++ b/english/ask-to-alice/ask-to-alice.md @@ -14,3 +14,5 @@ Just click on the link. [The one that makes you sleep](../sleep/marshmallow.md) [The one that your mother gave you that doesn't do anything](./ask-to-alice.md) + +[The one with a transparent glowing scarab within it](../scarab/goddess.md) From 937dcc45bccec682bf4bb7a6c8df73fc3efc437c Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Wed, 15 Jul 2015 11:17:17 -0700 Subject: [PATCH 0195/5486] fix: add placeholders for options --- english/scarab/goddess.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/scarab/goddess.md diff --git a/english/scarab/goddess.md b/english/scarab/goddess.md new file mode 100644 index 0000000000..cc9c3457b9 --- /dev/null +++ b/english/scarab/goddess.md @@ -0,0 +1,3 @@ +Alice isn't Alice anymore. There is a deeper set of reality to which you just fell through. In an instant you understand everything and yet nothing. + +You exist in a black room, the walls could be 1 meter or a million kilometers away, you cannot tell. The goddess is smiling down upon you. At that moment you realize you are not supposed to be there. \ No newline at end of file From e54ae41d98d14b6b64636190af673ed411a1b0fd Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Wed, 15 Jul 2015 11:42:54 -0700 Subject: [PATCH 0196/5486] fix: add links --- english/scarab/goddess.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/scarab/goddess.md b/english/scarab/goddess.md index cc9c3457b9..c16bcb3069 100644 --- a/english/scarab/goddess.md +++ b/english/scarab/goddess.md @@ -1,3 +1,9 @@ Alice isn't Alice anymore. There is a deeper set of reality to which you just fell through. In an instant you understand everything and yet nothing. -You exist in a black room, the walls could be 1 meter or a million kilometers away, you cannot tell. The goddess is smiling down upon you. At that moment you realize you are not supposed to be there. \ No newline at end of file +You exist in a black room, the walls could be 1 meter or a million kilometers away, you cannot tell. The Sentinel is smiling upon you. At that moment you realize you are not supposed to be there. It all makes sense now. You've broken through chroot-jail of this virtual prision. + +Do you: + +[scream?](../blah-balh/blah-blah.md) + +[ask for forgiveness?](https://www.youtube.com/watch?v=fGuR4GOV5L0) \ No newline at end of file From 1effae1c2553b5d22e714e9e8fd8f8cdffd36715 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Wed, 15 Jul 2015 11:55:37 -0700 Subject: [PATCH 0197/5486] fix: reorder to keep line lengths under 120 chars --- english/scarab/goddess.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/english/scarab/goddess.md b/english/scarab/goddess.md index c16bcb3069..c98aba3ea7 100644 --- a/english/scarab/goddess.md +++ b/english/scarab/goddess.md @@ -1,6 +1,14 @@ -Alice isn't Alice anymore. There is a deeper set of reality to which you just fell through. In an instant you understand everything and yet nothing. +Alice isn't Alice anymore. -You exist in a black room, the walls could be 1 meter or a million kilometers away, you cannot tell. The Sentinel is smiling upon you. At that moment you realize you are not supposed to be there. It all makes sense now. You've broken through chroot-jail of this virtual prision. +There is a deeper set of reality to which you just fell through. + +In an instant you understand everything and yet nothing. + +You exist in a black room, the walls could be 1 meter or a million kilometers away, you cannot tell. + +The Sentinel is smiling upon you. At that moment you realize you are not supposed to be there. It all makes sense now. + +You've broken through chroot-jail of this virtual prision. Do you: From 6e81e758884fc64692117b7d2708dfa668b91709 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 15 Jul 2015 11:57:26 -0700 Subject: [PATCH 0198/5486] New rainbow skittles story --- english/eat-rainbows/rainbows.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/eat-rainbows/rainbows.md diff --git a/english/eat-rainbows/rainbows.md b/english/eat-rainbows/rainbows.md new file mode 100644 index 0000000000..862f176dcc --- /dev/null +++ b/english/eat-rainbows/rainbows.md @@ -0,0 +1,3 @@ +You go outside to find some rainbows because you are hungry. +Oh look there is a convenient Safeway around the corner. +You enter the store and find the Skittles. \ No newline at end of file From 99611f52ea4d6cccceeb24f40c996ea0c1c6c047 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Wed, 15 Jul 2015 12:04:59 -0700 Subject: [PATCH 0199/5486] fix: fixed one line that was 121 chars LOL --- english/scarab/goddess.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/scarab/goddess.md b/english/scarab/goddess.md index c98aba3ea7..c4d48911fe 100644 --- a/english/scarab/goddess.md +++ b/english/scarab/goddess.md @@ -6,7 +6,9 @@ In an instant you understand everything and yet nothing. You exist in a black room, the walls could be 1 meter or a million kilometers away, you cannot tell. -The Sentinel is smiling upon you. At that moment you realize you are not supposed to be there. It all makes sense now. +The Sentinel is smiling upon you. At that moment you realize you are not supposed to be there. + +It all makes sense now. You've broken through chroot-jail of this virtual prision. From 848a3c8197ae007aab13433ddb804729ec27fa99 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 15 Jul 2015 12:09:56 -0700 Subject: [PATCH 0200/5486] link to new rainbow story in marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index fc6e8f8540..28d71721c9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -94,6 +94,8 @@ You notice your pants are now glowing, so you must have been holding the wand up Do you: +[Go eat some rainbows](eat-rainbows/rainbows.md) + [Admire your glowing pants](glowing-pants/glowing-pants.md) [Grab some coffee?] (coffee/coffee.md) From 3150dac23a51f079212d58868ccf0558900748fe Mon Sep 17 00:00:00 2001 From: usr168 Date: Wed, 15 Jul 2015 12:45:01 -0700 Subject: [PATCH 0201/5486] Add a free-lunch story --- english/free-lunch/free-lunch.md | 2 ++ english/marshmallow.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/free-lunch/free-lunch.md diff --git a/english/free-lunch/free-lunch.md b/english/free-lunch/free-lunch.md new file mode 100644 index 0000000000..b5f859af44 --- /dev/null +++ b/english/free-lunch/free-lunch.md @@ -0,0 +1,2 @@ +"There's no such thing as a free lunch." +Things that are offered for free always have a hidden cost. diff --git a/english/marshmallow.md b/english/marshmallow.md index fc6e8f8540..bfe08cd48c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -368,3 +368,5 @@ Do you: [You Google what to do](https://www.google.co.in/) [Abdul kalam quotes on overcoming fear] (apj/apj.md) + +[There's no such thing as a free lunch.](free-lunch/free-lunch.md) From fb082cedeae52aa6dc846918b662277425f788d4 Mon Sep 17 00:00:00 2001 From: Richard Lin Date: Wed, 15 Jul 2015 12:48:22 -0700 Subject: [PATCH 0202/5486] I don't like marshmallows too much --- english/marshmallow.md | 2 ++ english/untrustworthy/untrustworthy.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/untrustworthy/untrustworthy.md diff --git a/english/marshmallow.md b/english/marshmallow.md index fc6e8f8540..910fcf520f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -368,3 +368,5 @@ Do you: [You Google what to do](https://www.google.co.in/) [Abdul kalam quotes on overcoming fear] (apj/apj.md) + +[If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) \ No newline at end of file diff --git a/english/untrustworthy/untrustworthy.md b/english/untrustworthy/untrustworthy.md new file mode 100644 index 0000000000..9165032b63 --- /dev/null +++ b/english/untrustworthy/untrustworthy.md @@ -0,0 +1,2 @@ +"If you want something done right, you have to do it yourself." +Don't trust other people to do important things for you. You have to do things yourself to control the quality of the results. \ No newline at end of file From 73a3b39e968ba66ecdc4f505ca6a2ad743fe7c7f Mon Sep 17 00:00:00 2001 From: Richard Lin Date: Wed, 15 Jul 2015 13:05:29 -0700 Subject: [PATCH 0203/5486] Revised file untrustworthy --- english/untrustworthy/untrustworthy.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/untrustworthy/untrustworthy.md b/english/untrustworthy/untrustworthy.md index 9165032b63..5d44e8cd0a 100644 --- a/english/untrustworthy/untrustworthy.md +++ b/english/untrustworthy/untrustworthy.md @@ -1,2 +1,4 @@ "If you want something done right, you have to do it yourself." -Don't trust other people to do important things for you. You have to do things yourself to control the quality of the results. \ No newline at end of file + +Don't trust other people to do important things for you. +You have to do things yourself to control the quality of the results. \ No newline at end of file From 3ffffbd1c6ebc618fb61d876c4c6b6cf4ae9e90d Mon Sep 17 00:00:00 2001 From: Jamie Gabriel Date: Thu, 16 Jul 2015 10:25:41 +1000 Subject: [PATCH 0204/5486] make tiny change to test --- english/thesituation/situation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/thesituation/situation.md b/english/thesituation/situation.md index 85c13cf81c..ea0e12c206 100644 --- a/english/thesituation/situation.md +++ b/english/thesituation/situation.md @@ -1,5 +1,5 @@ You suddenly realize that you have not thought of how you got here or where you came from or even who you are. -This situation must be addressed... +This situation really must be addressed... What do you do next? From 312a0ad503be1220101c2158908e1b0fb018ae7a Mon Sep 17 00:00:00 2001 From: Brandon Cramer Date: Wed, 15 Jul 2015 18:08:19 -0700 Subject: [PATCH 0205/5486] Add story to eat-rainbows. --- english/eat-rainbows/left/left.md | 2 ++ english/eat-rainbows/rainbows.md | 13 ++++++++++++- english/eat-rainbows/right/right.md | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 english/eat-rainbows/left/left.md create mode 100644 english/eat-rainbows/right/right.md diff --git a/english/eat-rainbows/left/left.md b/english/eat-rainbows/left/left.md new file mode 100644 index 0000000000..74d59a3550 --- /dev/null +++ b/english/eat-rainbows/left/left.md @@ -0,0 +1,2 @@ +You turned left and ran into Marshawn Lynch eating his own +giant bag of Skittles! \ No newline at end of file diff --git a/english/eat-rainbows/rainbows.md b/english/eat-rainbows/rainbows.md index 862f176dcc..5c4979d805 100644 --- a/english/eat-rainbows/rainbows.md +++ b/english/eat-rainbows/rainbows.md @@ -1,3 +1,14 @@ You go outside to find some rainbows because you are hungry. Oh look there is a convenient Safeway around the corner. -You enter the store and find the Skittles. \ No newline at end of file +You enter the store and find the Skittles. + +After eating the Skittles you begin to run while +feeling the energy produced by their sugar. You are running +down the aisle when you are forced to either... + + + +[Turn Left](left/left.md) + + +[Turn Right](right/right.md) \ No newline at end of file diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md new file mode 100644 index 0000000000..e232bcd351 --- /dev/null +++ b/english/eat-rainbows/right/right.md @@ -0,0 +1 @@ +You turned right and slammed into another custmer carrying a birthday cake. \ No newline at end of file From 4a1a4c6b15eedadc2de7a963615418681296f910 Mon Sep 17 00:00:00 2001 From: Brandon Cramer Date: Wed, 15 Jul 2015 18:09:57 -0700 Subject: [PATCH 0206/5486] Fix typo. --- english/eat-rainbows/right/right.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md index e232bcd351..466c3e1cee 100644 --- a/english/eat-rainbows/right/right.md +++ b/english/eat-rainbows/right/right.md @@ -1 +1 @@ -You turned right and slammed into another custmer carrying a birthday cake. \ No newline at end of file +You turned right and slammed into another customer carrying a birthday cake. From 2e8a9726a1791539bf5d9e0b87be02e8d6062300 Mon Sep 17 00:00:00 2001 From: Alan Fu Date: Thu, 16 Jul 2015 00:06:05 -0700 Subject: [PATCH 0207/5486] Add linked file --- english/play-with-dog/dog.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 english/play-with-dog/dog.md diff --git a/english/play-with-dog/dog.md b/english/play-with-dog/dog.md new file mode 100644 index 0000000000..45aaa03860 --- /dev/null +++ b/english/play-with-dog/dog.md @@ -0,0 +1,12 @@ +You walk down Valencia and see a little french bulldog appear around the corner. + +You follow her down 18th and end up at Dolores Park. You dodge around all of the + +young 20-somethings day drinking and finally catch up to the dog. + +She lies on her belly. + +You [take a selfie](../selfie/selfie.md). + +You have actually followed the dog embodiment of Medusa, +and you made eye contact. [You can no longer move.](../virtualreality/oculus.md). \ No newline at end of file From c630fa53544f649e4f74cb968ef9a20902907349 Mon Sep 17 00:00:00 2001 From: Alan Fu Date: Thu, 16 Jul 2015 00:08:36 -0700 Subject: [PATCH 0208/5486] Add link within the marshmallow file --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 8e352629d9..0e94f28171 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -374,3 +374,5 @@ Do you: [There's no such thing as a free lunch.](free-lunch/free-lunch.md) +[Follow the dog...](play-with-dog/dog.md) + From b859cb54868353611dd78a606a18562ce82cad53 Mon Sep 17 00:00:00 2001 From: ohhackyeah Date: Thu, 16 Jul 2015 20:44:04 +0900 Subject: [PATCH 0209/5486] Add a sentence about coffee --- english/coffee/coffee.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/coffee/coffee.md b/english/coffee/coffee.md index 5c8072776d..9d3267a38c 100644 --- a/english/coffee/coffee.md +++ b/english/coffee/coffee.md @@ -13,6 +13,8 @@ The bitter-sweet flavor of roasted coffee beans invigorates your soul. You feel like a new person after a cup of coffee. +Nothing like a cup of coffee to start your day when you wake up. + Can you feel the caffeine rush inside of you? After having your coffee do you want to: From 7409ac505cc25e8911278ce6bd85313fc9f88433 Mon Sep 17 00:00:00 2001 From: Jeronimo Grandi Date: Thu, 16 Jul 2015 17:13:07 -0300 Subject: [PATCH 0210/5486] Add Valar Morghulis --- english/movie-ripoffs/matrix/matrix.md | 4 +++- english/use-the-fork-luke/use-the-fork.md | 2 ++ english/valarmorghulis.md | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 english/valarmorghulis.md diff --git a/english/movie-ripoffs/matrix/matrix.md b/english/movie-ripoffs/matrix/matrix.md index ca4bb89d86..553a786202 100644 --- a/english/movie-ripoffs/matrix/matrix.md +++ b/english/movie-ripoffs/matrix/matrix.md @@ -32,4 +32,6 @@ gooey liquid smashes Morpheus across the room. Choose the next spell: ["Avada Kedavra" to finish Morpheus off](../matrix-boss/matrix-boss.md) -["Woah" just to see what happens](../selfaware/selfaware.md) \ No newline at end of file +["Woah" just to see what happens](../selfaware/selfaware.md) + +["Valar Morghulis"](../../valarmorghulis/valarmorghulis.md) diff --git a/english/use-the-fork-luke/use-the-fork.md b/english/use-the-fork-luke/use-the-fork.md index d3a583fa47..1baeff6911 100644 --- a/english/use-the-fork-luke/use-the-fork.md +++ b/english/use-the-fork-luke/use-the-fork.md @@ -1,5 +1,7 @@ The hand of marshmallow has left you with so many questions. What did it want with the lighter? What does it want with me? Why did it have a ring-finger tan line? +What am I doing with a coin in my pocket? (if you don't have any coins, +you may say ["Valar Morghulis"](../valarmorghulis/valarmorghulis.md).) It is obvious that these questions will have to wait, and you switch into survival mode. Examining your items closer, you realize the lighter has enough butane for one - maybe two - small flames before it is empty. In one fluent motion, diff --git a/english/valarmorghulis.md b/english/valarmorghulis.md new file mode 100644 index 0000000000..4a3cdc6a2a --- /dev/null +++ b/english/valarmorghulis.md @@ -0,0 +1,4 @@ +A guy appears and replies with "valar dohaeris" and gives you a small coin. +You admire the coin for a while and when you realize, the man disappeared. + +With no hope, but with a coin in the pocket, the only logical path is [here](../use-the-fork-luke/use-the-fork.md). From 9faf066d6b5365f82b87ffd074b8deddd7825d3c Mon Sep 17 00:00:00 2001 From: Jeronimo Grandi Date: Thu, 16 Jul 2015 17:19:57 -0300 Subject: [PATCH 0211/5486] Valarmorghulis in the correct directory --- english/valarmorghulis/valarmorghulis.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/valarmorghulis/valarmorghulis.md diff --git a/english/valarmorghulis/valarmorghulis.md b/english/valarmorghulis/valarmorghulis.md new file mode 100644 index 0000000000..4a3cdc6a2a --- /dev/null +++ b/english/valarmorghulis/valarmorghulis.md @@ -0,0 +1,4 @@ +A guy appears and replies with "valar dohaeris" and gives you a small coin. +You admire the coin for a while and when you realize, the man disappeared. + +With no hope, but with a coin in the pocket, the only logical path is [here](../use-the-fork-luke/use-the-fork.md). From d6f4e1e6f3d3b94bf8227c969b5a09ed9e66fcf8 Mon Sep 17 00:00:00 2001 From: Jeronimo Grandi Date: Thu, 16 Jul 2015 17:28:34 -0300 Subject: [PATCH 0212/5486] Remove unused files --- english/valarmorghulis.md | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 english/valarmorghulis.md diff --git a/english/valarmorghulis.md b/english/valarmorghulis.md deleted file mode 100644 index 4a3cdc6a2a..0000000000 --- a/english/valarmorghulis.md +++ /dev/null @@ -1,4 +0,0 @@ -A guy appears and replies with "valar dohaeris" and gives you a small coin. -You admire the coin for a while and when you realize, the man disappeared. - -With no hope, but with a coin in the pocket, the only logical path is [here](../use-the-fork-luke/use-the-fork.md). From 450aba81c76fe557c6cd3e4c458306958dd168ca Mon Sep 17 00:00:00 2001 From: Kosar Date: Fri, 17 Jul 2015 00:49:48 +0300 Subject: [PATCH 0213/5486] Add kurdish --- kurdish/faith-in-humanity/mrov.md | 1 + kurdish/kurdi.md | 3 +++ language.md | 4 ++++ 3 files changed, 8 insertions(+) create mode 100644 kurdish/faith-in-humanity/mrov.md create mode 100644 kurdish/kurdi.md diff --git a/kurdish/faith-in-humanity/mrov.md b/kurdish/faith-in-humanity/mrov.md new file mode 100644 index 0000000000..b485a2fec4 --- /dev/null +++ b/kurdish/faith-in-humanity/mrov.md @@ -0,0 +1 @@ +بۆ بڕواهێنانەوە بە مرۆڤایەتی کلیک [کلیک لێرە بکە](https://www.youtube.com/watch?v=i-Qj7WLRqyQ) diff --git a/kurdish/kurdi.md b/kurdish/kurdi.md new file mode 100644 index 0000000000..446460be4b --- /dev/null +++ b/kurdish/kurdi.md @@ -0,0 +1,3 @@ +چەند وانەیەک لەسەر ژیان + +]مرۆڤایەتی[(/kurdish/faith-in-humanity/mrov.md) \ No newline at end of file diff --git a/language.md b/language.md index ed1ade30b7..0081c120d1 100644 --- a/language.md +++ b/language.md @@ -98,3 +98,7 @@ Po flisni shqip, [shkoni ketu](albanian/hyrje.md) നിങ്ങളുടെ ഭാഷ മലയാളം ആണെങ്കിൽ, [ഇവിടെ ക്ലിക്ക് ചെയ്യുക](Malayalam/malayalam.md) + +ئەگەر کوردی ئەزانیت کلیک [لێرە] بکە(kurdish/kurdi.md) + +if you speak kurdish click[here](kurdish/kurdi.md) \ No newline at end of file From b9b76802d12fa338650433b2bb7f7f614db1cd7d Mon Sep 17 00:00:00 2001 From: Kosar Date: Fri, 17 Jul 2015 00:55:56 +0300 Subject: [PATCH 0214/5486] Fix link for Kurdish --- language.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/language.md b/language.md index 0081c120d1..14d462c728 100644 --- a/language.md +++ b/language.md @@ -99,6 +99,4 @@ Po flisni shqip, [shkoni ketu](albanian/hyrje.md) നിങ്ങളുടെ ഭാഷ മലയാളം ആണെങ്കിൽ, [ഇവിടെ ക്ലിക്ക് ചെയ്യുക](Malayalam/malayalam.md) -ئەگەر کوردی ئەزانیت کلیک [لێرە] بکە(kurdish/kurdi.md) - -if you speak kurdish click[here](kurdish/kurdi.md) \ No newline at end of file +[ئەگەر کوردی ئەزانیت کلیک بکە](kurdish/kurdi.md) From b9fd9c6c8b5a05eb3c564fe1bfb8be6fd9a64ee6 Mon Sep 17 00:00:00 2001 From: Kosar Date: Fri, 17 Jul 2015 00:58:54 +0300 Subject: [PATCH 0215/5486] Link faith-in-humanity story --- kurdish/kurdi.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kurdish/kurdi.md b/kurdish/kurdi.md index 446460be4b..7173316648 100644 --- a/kurdish/kurdi.md +++ b/kurdish/kurdi.md @@ -1,3 +1,3 @@ چەند وانەیەک لەسەر ژیان -]مرۆڤایەتی[(/kurdish/faith-in-humanity/mrov.md) \ No newline at end of file +[مرۆڤایەتی](kurdish/faith-in-humanity/mrov.md) From 6e146715fee9d27c47e3175344599d36bb2efe20 Mon Sep 17 00:00:00 2001 From: Kosar Date: Fri, 17 Jul 2015 01:01:31 +0300 Subject: [PATCH 0216/5486] Fix broken link --- kurdish/kurdi.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kurdish/kurdi.md b/kurdish/kurdi.md index 7173316648..45c5b08509 100644 --- a/kurdish/kurdi.md +++ b/kurdish/kurdi.md @@ -1,3 +1,3 @@ چەند وانەیەک لەسەر ژیان -[مرۆڤایەتی](kurdish/faith-in-humanity/mrov.md) +[مرۆڤایەتی](kreate-your-own-adventure/kurdish/faith-in-humanity/mrov.md) From a8b9ff9c65ef0cfecf2c7be62c426697473f3066 Mon Sep 17 00:00:00 2001 From: Kosar Date: Fri, 17 Jul 2015 01:04:20 +0300 Subject: [PATCH 0217/5486] Fix broken link #2 --- kurdish/kurdi.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kurdish/kurdi.md b/kurdish/kurdi.md index 45c5b08509..14510e71db 100644 --- a/kurdish/kurdi.md +++ b/kurdish/kurdi.md @@ -1,3 +1,3 @@ چەند وانەیەک لەسەر ژیان -[مرۆڤایەتی](kreate-your-own-adventure/kurdish/faith-in-humanity/mrov.md) +[مرۆڤایەتی](create-your-own-adventure/kurdish/faith-in-humanity/mrov.md) From 1b99338fd628cb7c94cc01559bce149f7474818c Mon Sep 17 00:00:00 2001 From: Kosar Date: Fri, 17 Jul 2015 01:06:25 +0300 Subject: [PATCH 0218/5486] Fix broken link #3 --- kurdish/kurdi.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kurdish/kurdi.md b/kurdish/kurdi.md index 14510e71db..9306292613 100644 --- a/kurdish/kurdi.md +++ b/kurdish/kurdi.md @@ -1,3 +1,3 @@ چەند وانەیەک لەسەر ژیان -[مرۆڤایەتی](create-your-own-adventure/kurdish/faith-in-humanity/mrov.md) +[مرۆڤایەتی](../kurdish/faith-in-humanity/mrov.md) From 112e3f3a2a803eef28c227e079295bcb0e8caf27 Mon Sep 17 00:00:00 2001 From: loadGent00 Date: Thu, 16 Jul 2015 17:32:22 -0500 Subject: [PATCH 0219/5486] Add sentence on being crushed by a giant corn! --- english/open-door/open-door.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/open-door/open-door.md b/english/open-door/open-door.md index 3a78263080..4feca6e50c 100644 --- a/english/open-door/open-door.md +++ b/english/open-door/open-door.md @@ -4,3 +4,5 @@ the marshmallow room you run outside. As you step through the doorway you are momentarily blinded by a bright light. As your eyes adjust to the light outside the room you see... +That you are about to be crushed by a giant corn. :) + From 2b2769847f7d1a803119eaf9b8583f7b75fdc3f1 Mon Sep 17 00:00:00 2001 From: Benson Malonzo Date: Thu, 16 Jul 2015 16:03:24 -0700 Subject: [PATCH 0220/5486] Add sentence about Fire Lord Ozai --- english/avatar/air.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/avatar/air.md b/english/avatar/air.md index ee4a586302..221ca02b6d 100644 --- a/english/avatar/air.md +++ b/english/avatar/air.md @@ -1 +1,3 @@ -[But everything changed when the firenation attacked...](https://www.youtube.com/watch?v=pJUgCzEdx9k) \ No newline at end of file +[But everything changed when the firenation attacked...](https://www.youtube.com/watch?v=pJUgCzEdx9k) + +[Fire Lord Ozai] (http://avatar.wikia.com/wiki/Ozai) wanted to conquer the other nations and rule the world. \ No newline at end of file From 32049518051a1427f6214a87b9ce6135922b8325 Mon Sep 17 00:00:00 2001 From: micahkim23 Date: Thu, 16 Jul 2015 17:39:06 -0700 Subject: [PATCH 0221/5486] Added death to the dream. --- english/adipose/awake/awake.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/adipose/awake/awake.md b/english/adipose/awake/awake.md index b868a56462..492be82fee 100644 --- a/english/adipose/awake/awake.md +++ b/english/adipose/awake/awake.md @@ -8,4 +8,5 @@ sensation you felt was the star burning your cosmic retna. Unfortunitely there is no way to tell if it will be a pleasent dream or a hellish nightmare, but anything is better then your eternal loneliness, so -you move on to the white dwarf two parsecs over. \ No newline at end of file +you move on to the white dwarf two parsecs over. Then, +you died in your dreams. \ No newline at end of file From 71491b05d88aa1de0b897f73c0afccf09323498e Mon Sep 17 00:00:00 2001 From: Sourav Garg Date: Fri, 17 Jul 2015 01:01:59 -0400 Subject: [PATCH 0222/5486] Add new story for the english readers --- english/love/love.md | 7 +++++++ english/marshmallow.md | 1 + 2 files changed, 8 insertions(+) create mode 100644 english/love/love.md diff --git a/english/love/love.md b/english/love/love.md new file mode 100644 index 0000000000..4743822950 --- /dev/null +++ b/english/love/love.md @@ -0,0 +1,7 @@ +Love is one of the most exciting, rewarding and satisfying of human experiences. +Whether the love of family, friends, a child or romantic love, it is a shared human adventure. +Just as high as one might feel at the tip of that love, the lows can be devastatingly painful +when it is time to let go of that loved one. Whether needing to let go because they have passed on, +or because it is time to move on from the relationship, grief is a component. +You should grieve what was lost and accept the healing hands of time. Recognize your emotional limits, +but don’t isolate yourself as you let someone go and heal from the loss. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 0e94f28171..c67b804f06 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -376,3 +376,4 @@ Do you: [Follow the dog...](play-with-dog/dog.md) +[What is LOVE ?](love/love.md) From 53a9fc5123ceca881b2486949e45481067378d8d Mon Sep 17 00:00:00 2001 From: Albert Bui Date: Fri, 17 Jul 2015 16:39:05 +1000 Subject: [PATCH 0223/5486] Add new option to open door page --- english/eating-walls/find-a-toilet/door/alien/use-torch.md | 5 +++++ english/eating-walls/find-a-toilet/door/open-door.md | 1 + 2 files changed, 6 insertions(+) create mode 100644 english/eating-walls/find-a-toilet/door/alien/use-torch.md diff --git a/english/eating-walls/find-a-toilet/door/alien/use-torch.md b/english/eating-walls/find-a-toilet/door/alien/use-torch.md new file mode 100644 index 0000000000..34cbbd6a53 --- /dev/null +++ b/english/eating-walls/find-a-toilet/door/alien/use-torch.md @@ -0,0 +1,5 @@ +You realise the hand on your shoulder is covered in slime and attached to an alien. + +The three giant pupils staring at you shrivel into pinholes as the alien backs away. + +"Really? A torch!? Who carries a torch around nowadays? What is this, 1992?" \ No newline at end of file diff --git a/english/eating-walls/find-a-toilet/door/open-door.md b/english/eating-walls/find-a-toilet/door/open-door.md index f571406a6f..f5c073889f 100644 --- a/english/eating-walls/find-a-toilet/door/open-door.md +++ b/english/eating-walls/find-a-toilet/door/open-door.md @@ -10,3 +10,4 @@ Do you: [Run into the room and close the door](run-in/run-into-room.md) +[Blind the eyes with your torch] (alien/use-torch.md) \ No newline at end of file From f171ce98b9f6175aeeaeea5250aed5478e8bbb3f Mon Sep 17 00:00:00 2001 From: Michal Delura Date: Fri, 17 Jul 2015 10:34:55 +0200 Subject: [PATCH 0224/5486] kieszen Develop polish kieszen --- Polish/ubranie/kieszen/gwizdek/gwizdek.md | 6 ++++++ .../ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md | 1 + Polish/ubranie/kieszen/otworz-kieszen.md | 4 ++++ Polish/ubranie/kieszen/wyrzucgwizdek/wyrzucgwizdek.md | 4 ++++ 4 files changed, 15 insertions(+) create mode 100644 Polish/ubranie/kieszen/gwizdek/gwizdek.md create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md create mode 100644 Polish/ubranie/kieszen/wyrzucgwizdek/wyrzucgwizdek.md diff --git a/Polish/ubranie/kieszen/gwizdek/gwizdek.md b/Polish/ubranie/kieszen/gwizdek/gwizdek.md new file mode 100644 index 0000000000..f56d4cc606 --- /dev/null +++ b/Polish/ubranie/kieszen/gwizdek/gwizdek.md @@ -0,0 +1,6 @@ +Probujesz zagwizdać, lecz nie wydobywasz z gwizdka żadnego dźwięku. Nie słyszysz nawet wydychanego przez siebie +powietrza. + +[Wyrzuć gwizdek](../wyrzucgwizdek/wyrzucgwizdek.md) + +[Obejrzyj dokładnie gwizdek](zbadajgwizdek/zbadajgwizdek.md) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md new file mode 100644 index 0000000000..c8dad821b0 --- /dev/null +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md @@ -0,0 +1 @@ +Obracasz rożowy, plastikowy gwizdek. Jest gładki, bardzo dobrze wykonany, nie widzisz jednak w nim nic szczegolnego. diff --git a/Polish/ubranie/kieszen/otworz-kieszen.md b/Polish/ubranie/kieszen/otworz-kieszen.md index 209d141e2e..9c8c71511b 100644 --- a/Polish/ubranie/kieszen/otworz-kieszen.md +++ b/Polish/ubranie/kieszen/otworz-kieszen.md @@ -1,2 +1,6 @@ Otwierasz kieszen. Okazuje sie byc bardzo gleboka. Na samym jej dnie znajdujesz maly, plastikowy gwizdek. + +[Dmuchnij w gwizdek](gwizdek/gwizdek.md) + +[Wyrzuć gwizdek](wyrzucgwizdek/wyrzucgwizdek.md) diff --git a/Polish/ubranie/kieszen/wyrzucgwizdek/wyrzucgwizdek.md b/Polish/ubranie/kieszen/wyrzucgwizdek/wyrzucgwizdek.md new file mode 100644 index 0000000000..cb58f27b65 --- /dev/null +++ b/Polish/ubranie/kieszen/wyrzucgwizdek/wyrzucgwizdek.md @@ -0,0 +1,4 @@ +Upuszczasz gwizdek na podłogę.Gwizdek leci nieubłaganie do ziemi, kiedy całe życie przewija ci się przed oczami +niczym pokaz slajdow. +Mimo że trwa to zaledwie ułamek sekundy masz wrażenie, że czas zwolnił i czekasz z przerażeniem na koniec lotu. +Kiedy gwizdek spotyka się z podłogą nie odbija się i nie wydaje żadnego dźwięku, jakby czas się zatrzymał. From 3d91bf5dddec5de79b62052c9025569f68625f83 Mon Sep 17 00:00:00 2001 From: Masakorelab Date: Fri, 17 Jul 2015 22:10:41 +0800 Subject: [PATCH 0225/5486] Edit garden.md. Create beanus.txt --- japanese/beanus/beanus.txt | 4 ++++ japanese/garden/garden.md | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 japanese/beanus/beanus.txt diff --git a/japanese/beanus/beanus.txt b/japanese/beanus/beanus.txt new file mode 100644 index 0000000000..b0cba97725 --- /dev/null +++ b/japanese/beanus/beanus.txt @@ -0,0 +1,4 @@ +̉𗊂ɁAX̒ɂ񂮂񕪂ĂƁAYȐ‚ȂB +}ɍAAŐ̐łƁA|Pbg̒̃X}zɗĂ܂B +܂̂łƂ䩑RƂĂƁA̒珗_܂ꂽB +OƂ̂́A \ No newline at end of file diff --git a/japanese/garden/garden.md b/japanese/garden/garden.md index 698467bca6..071b895b44 100644 --- a/japanese/garden/garden.md +++ b/japanese/garden/garden.md @@ -1,6 +1,8 @@ -何が起きているのかを確かめるために、とりあえず庭に出てみた。 +何が起きているのかを確かめるために、とりあえず庭に出てみた。 地面を覆う苔と、手の行き届いた木々がきれいな庭だ。 ここからは、他の建物は見えない。 林の向こうのほうで川の流れる音が聞こえる。 -さてあなたは： \ No newline at end of file +さてあなたは： + +[林の中に分け入る](../forest/beanus) \ No newline at end of file From b514c2e80c03a8a67ace85ede29f071346a0da24 Mon Sep 17 00:00:00 2001 From: Masakorelab Date: Fri, 17 Jul 2015 22:43:23 +0800 Subject: [PATCH 0226/5486] Edit based on instruction --- japanese/beanus/beanus.md.txt | 4 ++++ japanese/garden/garden.md | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 japanese/beanus/beanus.md.txt diff --git a/japanese/beanus/beanus.md.txt b/japanese/beanus/beanus.md.txt new file mode 100644 index 0000000000..ef0c6a0666 --- /dev/null +++ b/japanese/beanus/beanus.md.txt @@ -0,0 +1,4 @@ +川の音を頼りに、森の中にぐんぐん分け入ってと、綺麗な泉を見つけたあなた。 +急に喉が渇き、夢中で泉の水を飲んでいると、ポケットの中のスマホが泉に落ちてしまった。 +あまりのできごとに茫然としていると、泉の中から女神さまが現れた。 +お前が落としたのは、 \ No newline at end of file diff --git a/japanese/garden/garden.md b/japanese/garden/garden.md index 071b895b44..ca3fd36fa2 100644 --- a/japanese/garden/garden.md +++ b/japanese/garden/garden.md @@ -1,8 +1,5 @@ -何が起きているのかを確かめるために、とりあえず庭に出てみた。 -地面を覆う苔と、手の行き届いた木々がきれいな庭だ。 -ここからは、他の建物は見えない。 -林の向こうのほうで川の流れる音が聞こえる。 +何が起きているのかを確かめるために、とりあえず庭に出てみた。 地面を覆う苔と、手の行き届いた木々がきれいな庭だ。 ここからは、他の建物は見えない。 林の向こうのほうで川の流れる音が聞こえる。 さてあなたは： -[林の中に分け入る](../forest/beanus) \ No newline at end of file +[林の中に分け入る](../beanus/beanus) \ No newline at end of file From edc533d9b6b15a909bb0d9f011ed9752e63b1d68 Mon Sep 17 00:00:00 2001 From: Masakorelab Date: Fri, 17 Jul 2015 22:52:58 +0800 Subject: [PATCH 0227/5486] modified on extention --- japanese/beanus/beanus.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 japanese/beanus/beanus.md diff --git a/japanese/beanus/beanus.md b/japanese/beanus/beanus.md new file mode 100644 index 0000000000..ef0c6a0666 --- /dev/null +++ b/japanese/beanus/beanus.md @@ -0,0 +1,4 @@ +川の音を頼りに、森の中にぐんぐん分け入ってと、綺麗な泉を見つけたあなた。 +急に喉が渇き、夢中で泉の水を飲んでいると、ポケットの中のスマホが泉に落ちてしまった。 +あまりのできごとに茫然としていると、泉の中から女神さまが現れた。 +お前が落としたのは、 \ No newline at end of file From 275051605177576232fb53a30f24e7fdb6cda847 Mon Sep 17 00:00:00 2001 From: Masakore Date: Fri, 17 Jul 2015 22:55:50 +0800 Subject: [PATCH 0228/5486] Delete beanus.md.txt --- japanese/beanus/beanus.md.txt | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 japanese/beanus/beanus.md.txt diff --git a/japanese/beanus/beanus.md.txt b/japanese/beanus/beanus.md.txt deleted file mode 100644 index ef0c6a0666..0000000000 --- a/japanese/beanus/beanus.md.txt +++ /dev/null @@ -1,4 +0,0 @@ -川の音を頼りに、森の中にぐんぐん分け入ってと、綺麗な泉を見つけたあなた。 -急に喉が渇き、夢中で泉の水を飲んでいると、ポケットの中のスマホが泉に落ちてしまった。 -あまりのできごとに茫然としていると、泉の中から女神さまが現れた。 -お前が落としたのは、 \ No newline at end of file From e047dc54ff82319a758c48a5de926be1740b072c Mon Sep 17 00:00:00 2001 From: Masakore Date: Fri, 17 Jul 2015 22:56:01 +0800 Subject: [PATCH 0229/5486] Delete beanus.txt --- japanese/beanus/beanus.txt | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 japanese/beanus/beanus.txt diff --git a/japanese/beanus/beanus.txt b/japanese/beanus/beanus.txt deleted file mode 100644 index b0cba97725..0000000000 --- a/japanese/beanus/beanus.txt +++ /dev/null @@ -1,4 +0,0 @@ -̉𗊂ɁAX̒ɂ񂮂񕪂ĂƁAYȐ‚ȂB -}ɍAAŐ̐łƁA|Pbg̒̃X}zɗĂ܂B -܂̂łƂ䩑RƂĂƁA̒珗_܂ꂽB -OƂ̂́A \ No newline at end of file From 25c946f4c33ce7d9f8494b8a079dc541ef2cc4ef Mon Sep 17 00:00:00 2001 From: Masakorelab Date: Fri, 17 Jul 2015 23:02:00 +0800 Subject: [PATCH 0230/5486] restore and add link in garden.md --- japanese/garden/garden.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/japanese/garden/garden.md b/japanese/garden/garden.md index ca3fd36fa2..eebb4d9af3 100644 --- a/japanese/garden/garden.md +++ b/japanese/garden/garden.md @@ -1,5 +1,7 @@ -何が起きているのかを確かめるために、とりあえず庭に出てみた。 地面を覆う苔と、手の行き届いた木々がきれいな庭だ。 ここからは、他の建物は見えない。 林の向こうのほうで川の流れる音が聞こえる。 +何が起きているのかを確かめるために、とりあえず庭に出てみた。 +地面を覆う苔と、手の行き届いた木々がきれいな庭だ。 +ここからは、他の建物は見えない。 +林の向こうのほうで川の流れる音が聞こえる。 さてあなたは： - -[林の中に分け入る](../beanus/beanus) \ No newline at end of file +[林の中に分け入る](../beanus/beanus.md) \ No newline at end of file From f1d2d9e05a9f67c6504007f2d1e5dfb2ab2bf2f5 Mon Sep 17 00:00:00 2001 From: Aves Liaw Date: Sat, 18 Jul 2015 03:51:49 +0800 Subject: [PATCH 0231/5486] essage=Add Singapore Story --- english/marshmallow.md | 2 ++ english/singapore/singapore.md | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 english/singapore/singapore.md diff --git a/english/marshmallow.md b/english/marshmallow.md index c67b804f06..cf96eea77a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -377,3 +377,5 @@ Do you: [Follow the dog...](play-with-dog/dog.md) [What is LOVE ?](love/love.md) + +[Got to Singapore](singapore/singapore.md) \ No newline at end of file diff --git a/english/singapore/singapore.md b/english/singapore/singapore.md new file mode 100644 index 0000000000..da9ae12e88 --- /dev/null +++ b/english/singapore/singapore.md @@ -0,0 +1,6 @@ +Singapore, officially the Republic of Singapore, is a modern city-state and island country in Southeast Asia. It lies +off the southern tip of the Malay Peninsula and is 137 kilometres (85 mi) north of the equator; it is also separated +from Peninsular Malaysia by the Straits of Johor to the north, and from Indonesia's Riau Islands by the Singapore Strait +to the south. Singapore's territory consists of the diamond-shaped main island, commonly referred to as Singapore Island +in English and Pulau Ujong in Malay, and more than 60 significantly smaller islets; also, land reclamation has been used +to expand Singapore's land area, which is highly urbanised. \ No newline at end of file From 43d68593816e5fe96d4ea7fdeebe1e52a5255b70 Mon Sep 17 00:00:00 2001 From: Aves Liaw Date: Sat, 18 Jul 2015 03:55:38 +0800 Subject: [PATCH 0232/5486] essage=Fix long lines --- english/singapore/singapore.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/english/singapore/singapore.md b/english/singapore/singapore.md index da9ae12e88..287f8efa08 100644 --- a/english/singapore/singapore.md +++ b/english/singapore/singapore.md @@ -1,6 +1,11 @@ -Singapore, officially the Republic of Singapore, is a modern city-state and island country in Southeast Asia. It lies -off the southern tip of the Malay Peninsula and is 137 kilometres (85 mi) north of the equator; it is also separated -from Peninsular Malaysia by the Straits of Johor to the north, and from Indonesia's Riau Islands by the Singapore Strait -to the south. Singapore's territory consists of the diamond-shaped main island, commonly referred to as Singapore Island -in English and Pulau Ujong in Malay, and more than 60 significantly smaller islets; also, land reclamation has been used +Singapore, officially the Republic of Singapore, is a modern +city-state and island country in Southeast Asia. It lies +off the southern tip of the Malay Peninsula and is 137 +kilometres (85 mi) north of the equator; it is also separated +from Peninsular Malaysia by the Straits of Johor to the north, +and from Indonesia's Riau Islands by the Singapore Strait +to the south. Singapore's territory consists of the +diamond-shaped main island, commonly referred to as Singapore Island +in English and Pulau Ujong in Malay, and more than 60 +significantly smaller islets; also, land reclamation has been used to expand Singapore's land area, which is highly urbanised. \ No newline at end of file From fd05e6b89d3d9be10d5ec58d57470da3f926ec31 Mon Sep 17 00:00:00 2001 From: Clayton Date: Fri, 17 Jul 2015 16:48:13 -0700 Subject: [PATCH 0233/5486] add finn story --- english/marshmallow.md | 4 +++- english/talk-to-finn/finn.md | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 english/talk-to-finn/finn.md diff --git a/english/marshmallow.md b/english/marshmallow.md index cf96eea77a..d3afaa8ea6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -378,4 +378,6 @@ Do you: [What is LOVE ?](love/love.md) -[Got to Singapore](singapore/singapore.md) \ No newline at end of file +[Got to Singapore](singapore/singapore.md) + +[Talk to Finn](talk-to-finn/finn.md) \ No newline at end of file diff --git a/english/talk-to-finn/finn.md b/english/talk-to-finn/finn.md new file mode 100644 index 0000000000..0f99ec9d16 --- /dev/null +++ b/english/talk-to-finn/finn.md @@ -0,0 +1,4 @@ +You ask Finn what to do. +He says "Play Minecraft until papa comes home" +That doesn't really resolved the situation, +but now you no longer care. \ No newline at end of file From d6b0fd80c9d45cc9a152f4cdc24c504a85e04cbd Mon Sep 17 00:00:00 2001 From: Larry Tooley Date: Fri, 17 Jul 2015 22:56:49 -0400 Subject: [PATCH 0234/5486] Add line to barker.md --- english/bob-barker/barker.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/bob-barker/barker.md b/english/bob-barker/barker.md index 5c7d0e9dbb..a13e4ef3a1 100644 --- a/english/bob-barker/barker.md +++ b/english/bob-barker/barker.md @@ -12,6 +12,8 @@ Bob with a gleam in his eye, looks at you and says, "Come on down you're the nex You step into the room and walk up to Bob. Behind him are two large doors. +The flaming hot marshmallows are gesturing suggestively at the doors while swaying their flaming hips. + "Which door is the door for you, the blue door, or the red door?", he asks. You hesitate just a moment before replying... From cbf335e5c7264fa0328e173195b801821e59ec39 Mon Sep 17 00:00:00 2001 From: Brian Merriman Date: Sat, 18 Jul 2015 02:04:10 -0400 Subject: [PATCH 0235/5486] Add a short sentence --- Chinese/Cinderella/Cinderella.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/Cinderella/Cinderella.md b/Chinese/Cinderella/Cinderella.md index 2e9c2982c8..79d3dff09a 100644 --- a/Chinese/Cinderella/Cinderella.md +++ b/Chinese/Cinderella/Cinderella.md @@ -1 +1 @@ -Have you watched Cinderella 2015 yet? \ No newline at end of file +Have you watched Cinderella 2015 yet? If you haven't check it out! \ No newline at end of file From 2efec906af42f088c061dc42c6a25e59c3a67b23 Mon Sep 17 00:00:00 2001 From: Brian Merriman Date: Sat, 18 Jul 2015 02:05:58 -0400 Subject: [PATCH 0236/5486] Moved change to new line --- Chinese/Cinderella/Cinderella.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Chinese/Cinderella/Cinderella.md b/Chinese/Cinderella/Cinderella.md index 79d3dff09a..af179dc8dc 100644 --- a/Chinese/Cinderella/Cinderella.md +++ b/Chinese/Cinderella/Cinderella.md @@ -1 +1,2 @@ -Have you watched Cinderella 2015 yet? If you haven't check it out! \ No newline at end of file +Have you watched Cinderella 2015 yet? +If you haven't check it out! \ No newline at end of file From 0d0be2bdc7e3cad10125b8d56ea40c819c72d4d2 Mon Sep 17 00:00:00 2001 From: Marcos Romero Date: Sat, 18 Jul 2015 08:03:06 -0300 Subject: [PATCH 0237/5486] Adiciona aprender --- portugues/amigo/incomodar/aplicativo.md | 2 ++ .../amigo/incomodar/aprender/aprender.md | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 portugues/amigo/incomodar/aprender/aprender.md diff --git a/portugues/amigo/incomodar/aplicativo.md b/portugues/amigo/incomodar/aplicativo.md index 72f747b55a..75b8676e45 100644 --- a/portugues/amigo/incomodar/aplicativo.md +++ b/portugues/amigo/incomodar/aplicativo.md @@ -1 +1,3 @@ Você fica triste e desiste do aplicativo. + +[Você tenta aprender mais com ele](aprender/aprender.md) \ No newline at end of file diff --git a/portugues/amigo/incomodar/aprender/aprender.md b/portugues/amigo/incomodar/aprender/aprender.md new file mode 100644 index 0000000000..dec689a55c --- /dev/null +++ b/portugues/amigo/incomodar/aprender/aprender.md @@ -0,0 +1,23 @@ +Você aprende os comandos uteis do Git/GitHub + +git init -> inicializa um repositório git +git config --global user.email "you@example.com" +git config --global user.name "Your Name" +git log -> mostra as versões que já tiveram commit e seus detalhes +git status -> mostra como estão seu working directory, stage area e repository +git diff -> sem argumentos, compara o working directory com a stage area +git diff --staged -> compara a stage area com o repository +git diff id1 id2 -> compara dois commits diferentes +git add file -> adiciona um arquivo modificado na working area para a stage area +git commit -> faz o commit de tudo que está na stage area +git log --graph --oneline -> apresenta os logs em forma de grafo +git branch -> mostra os branches do seu projeto +git branch xxx -> cria um novo branch +git checkout xxx -> vai para o branch desejado, ou se utilizar um id de commit, cria um branch sem head +git merge master changes -> realiza um merge de changes para o master +git clone https://github.com/romero/recipes.git -> cria um clone do repositorio do git hub localmente +git push origin master -> passa o conteudo do master local para a origem no github +git pull origin master -> passa o conteudo online para o master local +git fetch -> puxa as atualizações realizadas no repositiorio online (Sem fazer o merge) +git remote add upstream https://... -> adiciona um repositorio original do fork +git rebase upstream/master --> fast-foward do projeto para o master do repositorio original do fork \ No newline at end of file From d92fa365155945ef7a0ba55a49af463bf23d8d49 Mon Sep 17 00:00:00 2001 From: Marcos Romero Date: Sat, 18 Jul 2015 08:15:20 -0300 Subject: [PATCH 0238/5486] Corrige enter --- .../amigo/incomodar/aprender/aprender.md | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/portugues/amigo/incomodar/aprender/aprender.md b/portugues/amigo/incomodar/aprender/aprender.md index dec689a55c..c85ed1b113 100644 --- a/portugues/amigo/incomodar/aprender/aprender.md +++ b/portugues/amigo/incomodar/aprender/aprender.md @@ -1,23 +1,43 @@ Você aprende os comandos uteis do Git/GitHub git init -> inicializa um repositório git + git config --global user.email "you@example.com" + git config --global user.name "Your Name" + git log -> mostra as versões que já tiveram commit e seus detalhes + git status -> mostra como estão seu working directory, stage area e repository + git diff -> sem argumentos, compara o working directory com a stage area + git diff --staged -> compara a stage area com o repository + git diff id1 id2 -> compara dois commits diferentes + git add file -> adiciona um arquivo modificado na working area para a stage area + git commit -> faz o commit de tudo que está na stage area + git log --graph --oneline -> apresenta os logs em forma de grafo + git branch -> mostra os branches do seu projeto + git branch xxx -> cria um novo branch + git checkout xxx -> vai para o branch desejado, ou se utilizar um id de commit, cria um branch sem head + git merge master changes -> realiza um merge de changes para o master + git clone https://github.com/romero/recipes.git -> cria um clone do repositorio do git hub localmente + git push origin master -> passa o conteudo do master local para a origem no github + git pull origin master -> passa o conteudo online para o master local + git fetch -> puxa as atualizações realizadas no repositiorio online (Sem fazer o merge) + git remote add upstream https://... -> adiciona um repositorio original do fork -git rebase upstream/master --> fast-foward do projeto para o master do repositorio original do fork \ No newline at end of file + +git rebase upstream/master --> fast-foward do projeto para o master do repositorio original do fork From a2d5f4b0ed3ad0a39f4d1e99728e728502c7dcfc Mon Sep 17 00:00:00 2001 From: Jonathan Grubb Date: Sat, 18 Jul 2015 08:14:10 -0500 Subject: [PATCH 0239/5486] adding a blowtorch option to the marshmallow room for the english version --- english/marshmallow.md | 4 +++- english/pick-up-blowtorch/blowtorch.md | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 english/pick-up-blowtorch/blowtorch.md diff --git a/english/marshmallow.md b/english/marshmallow.md index d3afaa8ea6..8b3b61a889 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -94,6 +94,8 @@ You notice your pants are now glowing, so you must have been holding the wand up Do you: +[Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) + [Go eat some rainbows](eat-rainbows/rainbows.md) [Admire your glowing pants](glowing-pants/glowing-pants.md) @@ -380,4 +382,4 @@ Do you: [Got to Singapore](singapore/singapore.md) -[Talk to Finn](talk-to-finn/finn.md) \ No newline at end of file +[Talk to Finn](talk-to-finn/finn.md) diff --git a/english/pick-up-blowtorch/blowtorch.md b/english/pick-up-blowtorch/blowtorch.md new file mode 100644 index 0000000000..32b322ab27 --- /dev/null +++ b/english/pick-up-blowtorch/blowtorch.md @@ -0,0 +1,21 @@ +You pick up a blowtorch that is within arm's reach. + +You also notice that there is a giant grapham cracker and Hershey's chocolate bar within reach. + +"Let's do this thing," you say to yourself as you turn on the blowtorch. + +As you carve though the walls like a hot knife through butter, + +you throw an enormous slab of marshmallow on a graham cracker. + +You're actually enjoying this, you're thinking to yourself. + +Eventually, you're supporting (and eating) a 25 lbs smores in one hand, burning your way to freedom with the other when + +you break into the next cavern only to see a 200 ft Stay Puft Marmallow Man turn who rumbles: + +"Who disturbs my slumber?" + +Turning up your blowtorch, you make a mental note not to cross the streams and you run into the room screaming. + +You're not sure if you've got enough graham cracker and chocolate for this, but at least you're bringing the camp fire... From f34a700e346765c00481ca2f05c322451c86d521 Mon Sep 17 00:00:00 2001 From: Taiki Nakaoka Date: Sat, 18 Jul 2015 22:14:13 +0900 Subject: [PATCH 0240/5486] add: a choice in garden.md in Japanese. --- japanese/garden/garden.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/japanese/garden/garden.md b/japanese/garden/garden.md index 698467bca6..cc9bf9f5f0 100644 --- a/japanese/garden/garden.md +++ b/japanese/garden/garden.md @@ -3,4 +3,5 @@ ここからは、他の建物は見えない。 林の向こうのほうで川の流れる音が聞こえる。 -さてあなたは： \ No newline at end of file +さてあなたは： +[川の流れの音が聞こえるほうへと歩いていく](../brook/brook.md) From 48759231e8511be428b997e358aab92649e6b9a8 Mon Sep 17 00:00:00 2001 From: Jonathan Grubb Date: Sat, 18 Jul 2015 08:18:45 -0500 Subject: [PATCH 0241/5486] fixing spelling error with the blowtorch page --- english/pick-up-blowtorch/blowtorch.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/pick-up-blowtorch/blowtorch.md b/english/pick-up-blowtorch/blowtorch.md index 32b322ab27..6a25759a58 100644 --- a/english/pick-up-blowtorch/blowtorch.md +++ b/english/pick-up-blowtorch/blowtorch.md @@ -1,6 +1,6 @@ You pick up a blowtorch that is within arm's reach. -You also notice that there is a giant grapham cracker and Hershey's chocolate bar within reach. +You also notice that there is a giant graham cracker and Hershey's chocolate bar within reach. "Let's do this thing," you say to yourself as you turn on the blowtorch. @@ -8,7 +8,7 @@ As you carve though the walls like a hot knife through butter, you throw an enormous slab of marshmallow on a graham cracker. -You're actually enjoying this, you're thinking to yourself. +You're actually enjoying this, you think to yourself. Eventually, you're supporting (and eating) a 25 lbs smores in one hand, burning your way to freedom with the other when From c8d6f08459b21bf5b4f552bd71fb3a807b9c1dfb Mon Sep 17 00:00:00 2001 From: Jonathan Grubb Date: Sat, 18 Jul 2015 08:33:47 -0500 Subject: [PATCH 0242/5486] making sure lines don't exceed 120 characters --- english/pick-up-blowtorch/blowtorch.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/english/pick-up-blowtorch/blowtorch.md b/english/pick-up-blowtorch/blowtorch.md index 6a25759a58..3e40f4450b 100644 --- a/english/pick-up-blowtorch/blowtorch.md +++ b/english/pick-up-blowtorch/blowtorch.md @@ -10,12 +10,15 @@ you throw an enormous slab of marshmallow on a graham cracker. You're actually enjoying this, you think to yourself. -Eventually, you're supporting (and eating) a 25 lbs smores in one hand, burning your way to freedom with the other when +Eventually, you're supporting (and eating) a 25 lbs smores in one hand, +burning your way to freedom with the other when you break into the next cavern only to see a 200 ft Stay Puft Marmallow Man turn who rumbles: "Who disturbs my slumber?" -Turning up your blowtorch, you make a mental note not to cross the streams and you run into the room screaming. +Turning up your blowtorch, you make a mental note not to cross the streams and you run +into the room screaming. -You're not sure if you've got enough graham cracker and chocolate for this, but at least you're bringing the camp fire... +You're not sure if you've got enough graham cracker and chocolate for this, but at least you're +bringing the camp fire... From 60f251147a41683c33c423d45fb94631903c82ba Mon Sep 17 00:00:00 2001 From: MarianSloot Date: Sat, 18 Jul 2015 16:47:40 +0200 Subject: [PATCH 0243/5486] added 2 new options to politie.md --- dutch/bos/ontvoering/politie/politie.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dutch/bos/ontvoering/politie/politie.md b/dutch/bos/ontvoering/politie/politie.md index a9ed06aa78..717d2e0d9f 100644 --- a/dutch/bos/ontvoering/politie/politie.md +++ b/dutch/bos/ontvoering/politie/politie.md @@ -3,4 +3,8 @@ Eenmaal in verbinding met de hulpdiensen, vertel je je locatie. Je legt het probleem uit en de politie is meteen onderweg. Eind goed al goed! -Of toch niet... \ No newline at end of file +Of toch niet... + +De mannen [komen dreigend op je af](vastgebonden/vastgebonden.md) + +Je hoort een doffe klap en je [verliest het bewustzijn](schuur/schuur.md) \ No newline at end of file From 3e77a23f1037d9e8deb449ea304959e12d6978bd Mon Sep 17 00:00:00 2001 From: Taiki Nakaoka Date: Sat, 18 Jul 2015 23:50:06 +0900 Subject: [PATCH 0244/5486] add: path.md --- japanese/garden/garden.md | 2 ++ japanese/path/path.md | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 japanese/path/path.md diff --git a/japanese/garden/garden.md b/japanese/garden/garden.md index 901bed9933..728c884333 100644 --- a/japanese/garden/garden.md +++ b/japanese/garden/garden.md @@ -5,3 +5,5 @@ さてあなたは： [林の中に分け入る](../beanus/beanus.md) + +[小道を進む](../path/path.md) diff --git a/japanese/path/path.md b/japanese/path/path.md new file mode 100644 index 0000000000..2691d6e705 --- /dev/null +++ b/japanese/path/path.md @@ -0,0 +1,6 @@ +あなたは小道を進んでいった。丁寧に整備のされた小道だ。数分歩いていると、ひとりの庭師が木の剪定をしているところにでくわした。紺色の羽織と足袋という和風の格好をした庭師だった。 + +あなたは： +庭師の作業を見る + +小道を進む \ No newline at end of file From 4cdae30843b2648825652b8c6c5353cfb8df28fe Mon Sep 17 00:00:00 2001 From: MarianSloot Date: Sat, 18 Jul 2015 16:52:01 +0200 Subject: [PATCH 0245/5486] add a new file vastgebonden.md as an option to politie.md --- .../bos/ontvoering/politie/vastgebonden/vastgebonden.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 dutch/bos/ontvoering/politie/vastgebonden/vastgebonden.md diff --git a/dutch/bos/ontvoering/politie/vastgebonden/vastgebonden.md b/dutch/bos/ontvoering/politie/vastgebonden/vastgebonden.md new file mode 100644 index 0000000000..e6156262df --- /dev/null +++ b/dutch/bos/ontvoering/politie/vastgebonden/vastgebonden.md @@ -0,0 +1,9 @@ +De mannen laten dit natuurlijk niet zomaar op zich zitten en komen dreigend op je af. + +Voordat je om hulp hebt kunnen roepen, hebben ze je al beetgepakt. + +Ze plakken je mond af met een stuk tape, en binden je armen achter je rug. + +"Je had je hier beter niet mee kunnen bemoeien!" sist de een. + +En terwijl hij de lijkzak optilt, geeft de ander je een por. "Meekomen jij!" \ No newline at end of file From f59f3a01db3b52480f19314cc56bc46eb9400412 Mon Sep 17 00:00:00 2001 From: MarianSloot Date: Sat, 18 Jul 2015 16:54:25 +0200 Subject: [PATCH 0246/5486] add a new file schuur.md as an option to politie.md --- dutch/bos/ontvoering/politie/schuur/schuur.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 dutch/bos/ontvoering/politie/schuur/schuur.md diff --git a/dutch/bos/ontvoering/politie/schuur/schuur.md b/dutch/bos/ontvoering/politie/schuur/schuur.md new file mode 100644 index 0000000000..3d4443bfc2 --- /dev/null +++ b/dutch/bos/ontvoering/politie/schuur/schuur.md @@ -0,0 +1,5 @@ +Het is al donker als je wakker wordt in een schuur. + +Je hoofd doet pijn, je ligt op de grond en je armen zijn achter je rug vastgebonden. + +Je probeert op te staan. \ No newline at end of file From 21b67f432cf1dbb2b183fbcefb22f5c6a4834e1e Mon Sep 17 00:00:00 2001 From: MarianSloot Date: Sat, 18 Jul 2015 17:13:11 +0200 Subject: [PATCH 0247/5486] Undone a change to a line in politie.md --- dutch/bos/ontvoering/politie/politie.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dutch/bos/ontvoering/politie/politie.md b/dutch/bos/ontvoering/politie/politie.md index 717d2e0d9f..89c4bf846f 100644 --- a/dutch/bos/ontvoering/politie/politie.md +++ b/dutch/bos/ontvoering/politie/politie.md @@ -3,7 +3,7 @@ Eenmaal in verbinding met de hulpdiensen, vertel je je locatie. Je legt het probleem uit en de politie is meteen onderweg. Eind goed al goed! -Of toch niet... +Of toch niet... De mannen [komen dreigend op je af](vastgebonden/vastgebonden.md) From b653237f8065840933a906930a28890f9ea9949d Mon Sep 17 00:00:00 2001 From: devampire Date: Sat, 18 Jul 2015 17:19:46 +0200 Subject: [PATCH 0248/5486] Update ouch.md --- english/dentist/ouch.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/dentist/ouch.md b/english/dentist/ouch.md index b04da41172..c38b49ffb5 100644 --- a/english/dentist/ouch.md +++ b/english/dentist/ouch.md @@ -1,3 +1,4 @@ Uh-oh, you feel a dull pain in an a upper molar on the right side of your mouth. Shouldn't have eaten -all those marshmallows. \ No newline at end of file +all those marshmallows. It's better to eat fruits and vegetables. +But who can resist for marchmallows?! From 163107a775545db7318070518d484790c0907a56 Mon Sep 17 00:00:00 2001 From: Stefan Brandenberger Date: Sat, 18 Jul 2015 19:47:51 +0200 Subject: [PATCH 0249/5486] =?UTF-8?q?add=20Kobold=20im=20Wal=20m=C3=B6chte?= =?UTF-8?q?=20telefonieren?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md | 6 ++++++ german/Hilfeschrei/Vertrauen/insMaul/reinhauen/reinhauen.md | 1 + 2 files changed, 7 insertions(+) create mode 100644 german/Hilfeschrei/Vertrauen/insMaul/reinhauen/reinhauen.md diff --git a/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md b/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md index 512afeccba..23f814601a 100644 --- a/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md +++ b/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md @@ -5,3 +5,9 @@ Zum Glück haben Sie eine kleine Taschenlampe am Schlüsselbund und beginnen das Innere des Wals zu durchsuchen, dabei stoßen Sie auf.... einen grünen Kobold mit einem Glöckchen um den Hals. Der Kobold sagt: + +"Gibst du mir dein iPhone, ich muss nach Hause telefonieren. Du bekommst dann mein magisches Glöckchen." + +Du entgegnest: + +["N'Scheiss kriegst du mein Handy" und haust ihm eine rein](reinhauen/reinhauen.md) diff --git a/german/Hilfeschrei/Vertrauen/insMaul/reinhauen/reinhauen.md b/german/Hilfeschrei/Vertrauen/insMaul/reinhauen/reinhauen.md new file mode 100644 index 0000000000..06ebf45efe --- /dev/null +++ b/german/Hilfeschrei/Vertrauen/insMaul/reinhauen/reinhauen.md @@ -0,0 +1 @@ +Der Kobold ist für einen Moment etwas irritiert, tut aber keinen Wank und dann... \ No newline at end of file From 31906534857606fa03b27384fb9ad38414883829 Mon Sep 17 00:00:00 2001 From: Kevin Kipp Date: Sat, 18 Jul 2015 14:08:18 -0500 Subject: [PATCH 0250/5486] Add guitar.md and link in main marshamllow.md --- english/guitar/guitar.md | 4 ++++ english/marshmallow.md | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 english/guitar/guitar.md diff --git a/english/guitar/guitar.md b/english/guitar/guitar.md new file mode 100644 index 0000000000..6ca382884e --- /dev/null +++ b/english/guitar/guitar.md @@ -0,0 +1,4 @@ +You get out a guitar and play it until the sun goes down. After a long day of rocking out, you +decide to go to sleep and start to have a crazy dream. + +[Start dreaming](../dream/dream.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 8b3b61a889..222d9becde 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -383,3 +383,5 @@ Do you: [Got to Singapore](singapore/singapore.md) [Talk to Finn](talk-to-finn/finn.md) + +[Play Guitar](guitar/guitar.md) From 6b88127384d8b21a4c4c636d2cb792599bc239a7 Mon Sep 17 00:00:00 2001 From: Danijel Hodzic Date: Sat, 18 Jul 2015 14:32:37 -0700 Subject: [PATCH 0251/5486] Add Serbian language start of a story --- language.md | 2 ++ serbian/burekSir/burekMeso.md | 1 + serbian/burekSir/burekSir.md | 2 ++ serbian/start.md | 5 +++++ 4 files changed, 10 insertions(+) create mode 100644 serbian/burekSir/burekMeso.md create mode 100644 serbian/burekSir/burekSir.md create mode 100644 serbian/start.md diff --git a/language.md b/language.md index 14d462c728..5df4fe635d 100644 --- a/language.md +++ b/language.md @@ -100,3 +100,5 @@ Po flisni shqip, [shkoni ketu](albanian/hyrje.md) [ഇവിടെ ക്ലിക്ക് ചെയ്യുക](Malayalam/malayalam.md) [ئەگەر کوردی ئەزانیت کلیک بکە](kurdish/kurdi.md) + +Ako govorite srpski [klikni ovde](serbian/start.md) diff --git a/serbian/burekSir/burekMeso.md b/serbian/burekSir/burekMeso.md new file mode 100644 index 0000000000..74e2d38c33 --- /dev/null +++ b/serbian/burekSir/burekMeso.md @@ -0,0 +1 @@ +"Ne, samo burek" - uzvratio je, jedva čekajući da zagrize. \ No newline at end of file diff --git a/serbian/burekSir/burekSir.md b/serbian/burekSir/burekSir.md new file mode 100644 index 0000000000..54ba6e985d --- /dev/null +++ b/serbian/burekSir/burekSir.md @@ -0,0 +1,2 @@ +"Da'l je moguće? Ne mogu da verujem. Kako nemate? Neću sir!" - razvijao se bes iz njegovih očiju. +Galamom privukao je pažnju momaka koji su već tu sedeli i zadovoljno jeli svoje bureke s mesom i pili jogurt "Granice". \ No newline at end of file diff --git a/serbian/start.md b/serbian/start.md new file mode 100644 index 0000000000..6d07eb9efb --- /dev/null +++ b/serbian/start.md @@ -0,0 +1,5 @@ +Mamuran, žurno je prilazio poznatoj mu buregdžinici. +"200 grama sa mesom!" - razgovetno je izustio i stavio do znanja da mu je 200 grama s mesom krajnje neophodno. +Mlada radnica ga je ljubazno gledala. Rekla je: +"Nažalost nemamo s mesom ali ima odličan sa sirom" [klikni ovde](serbian/burekSir.md) +"Želite li i jogurt ?" [klikni ovde](serbian/burekMeso.md) \ No newline at end of file From b52135630e4368436f5ae0e10e9dd76342805d8b Mon Sep 17 00:00:00 2001 From: Danijel Hodzic Date: Sat, 18 Jul 2015 14:40:06 -0700 Subject: [PATCH 0252/5486] Make links correct --- serbian/start.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/serbian/start.md b/serbian/start.md index 6d07eb9efb..a976fda059 100644 --- a/serbian/start.md +++ b/serbian/start.md @@ -1,5 +1,9 @@ Mamuran, žurno je prilazio poznatoj mu buregdžinici. + "200 grama sa mesom!" - razgovetno je izustio i stavio do znanja da mu je 200 grama s mesom krajnje neophodno. + Mlada radnica ga je ljubazno gledala. Rekla je: -"Nažalost nemamo s mesom ali ima odličan sa sirom" [klikni ovde](serbian/burekSir.md) -"Želite li i jogurt ?" [klikni ovde](serbian/burekMeso.md) \ No newline at end of file + +"Nažalost nemamo s mesom ali ima odličan sa sirom" [klikni ovde](burekSir/burekSir.md) + +"Želite li i jogurt ?" [klikni ovde](burekMeso/burekMeso.md) From e098abb7d715f440eb684c85240ab4d593bc506a Mon Sep 17 00:00:00 2001 From: Danijel Hodzic Date: Sat, 18 Jul 2015 14:48:48 -0700 Subject: [PATCH 0253/5486] burekMeso.md moved in right directory --- serbian/burekMeso/burekMeso.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 serbian/burekMeso/burekMeso.md diff --git a/serbian/burekMeso/burekMeso.md b/serbian/burekMeso/burekMeso.md new file mode 100644 index 0000000000..74e2d38c33 --- /dev/null +++ b/serbian/burekMeso/burekMeso.md @@ -0,0 +1 @@ +"Ne, samo burek" - uzvratio je, jedva čekajući da zagrize. \ No newline at end of file From 87c8ea7bdb1ab4584a491abb345422d7710457c8 Mon Sep 17 00:00:00 2001 From: Danijel Hodzic Date: Sat, 18 Jul 2015 15:18:12 -0700 Subject: [PATCH 0254/5486] Delete serbian-burekSir-burekMeso.md --- serbian/burekSir/burekMeso.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 serbian/burekSir/burekMeso.md diff --git a/serbian/burekSir/burekMeso.md b/serbian/burekSir/burekMeso.md deleted file mode 100644 index 74e2d38c33..0000000000 --- a/serbian/burekSir/burekMeso.md +++ /dev/null @@ -1 +0,0 @@ -"Ne, samo burek" - uzvratio je, jedva čekajući da zagrize. \ No newline at end of file From 57dda66b31737abf57846eb0ef8a962bc632b6cb Mon Sep 17 00:00:00 2001 From: Kevin Kipp Date: Sat, 18 Jul 2015 21:45:25 -0500 Subject: [PATCH 0255/5486] Replace all occurances of '] (' with '](' Was tired of seeing links broken by the same mistake throughout the project, so I used Sublime to find and replace all occurances of '] (' with '](' to clean things up. --- basque/alde-egin/alde-egin.md | 4 ++-- catala/cantar/cantar.md | 2 +- catala/catala.md | 10 +++++----- catala/pessigar-se/pessigar-se.md | 4 ++-- english/apj/apj.md | 2 +- english/apj/quotes/quotes.md | 2 +- english/avatar/air.md | 2 +- english/be-octodog/octodog.md | 2 +- english/check-your-phone/check-your-phone.md | 2 +- .../count-the-marshmellows.md | 2 +- english/dream_in_dream/spin_spinner/spin.md | 2 +- .../eating-walls/find-a-toilet/door/open-door.md | 2 +- english/experience/black-point/black-point.md | 2 +- .../Ride-with-Luckey/Ride-with-Luckey.md | 4 ++-- .../magical-armor/demonacrat/demonacrat.md | 6 +++--- .../magical-armor/magical-armor.md | 6 +++--- .../start-running/confront/confront.md | 2 +- english/find-exit/into-forest/forest.md | 4 ++-- english/hide/hide-chk.md | 4 ++-- english/interact/fork/fork.md | 4 ++-- english/interact/interact.md | 8 ++++---- english/interact/run-into-wall/run-into-wall.md | 2 +- english/interact/whip/whip.md | 6 +++--- english/invite-friends/friends.md | 4 ++-- .../eating/stream/go-fish/talk-fish/talk.md | 2 +- english/light-fire/run-away/shout/child-wave.md | 6 +++--- .../run-away/shout/more-info/more-info.md | 6 +++--- .../run-away/shout/tease-him/tease-him.md | 4 ++-- .../light-rope-on-fire/light-rope-on-fire.md | 4 ++-- english/macgyver/light-rope-on-fire/wait/wait.md | 4 ++-- .../make-smores/make-smores.md | 2 +- english/marshmallow-attack/marsh-attack.md | 2 +- .../the-kind-your-grandma-used-to-make.md | 2 +- english/marshmallow.md | 8 ++++---- english/matrix/matrix.md | 4 ++-- english/mushroom/collect_mushroom.md | 4 ++-- english/mushroom/eat/eat_mushroom.md | 2 +- english/mushroom/poison/poisonous_mushroom.md | 2 +- english/pokemon/pikachu_wins.md | 2 +- english/slap-it-hard/teach-it-a-lesson.md | 2 +- english/soar/soar.md | 6 +++--- .../protons/nothing-at-first/dejavu.md | 2 +- english/staypuft/ghostbusters/protons/reach.md | 8 ++++---- english/super-man/save-the-word.md | 6 +++--- english/turing-test/turing-test.md | 16 ++++++++-------- english/yoga/breathe/breathe.md | 2 +- english/yuha/yolo/yolo.md | 2 +- english/yuha/yuha.md | 4 ++-- espanol/heroe/heroe.md | 2 +- .../muralla/abrir/abrirsoldados/cerrad/cerrad.md | 2 +- espanol/torre/torre.md | 4 ++-- french/panique/frapper-le-mur.md | 2 +- german/schwimmen/gefahr/gefahr.md | 4 ++-- .../schwimmen/gefahr/wald/klettern/klettern.md | 2 +- german/schwimmen/gefahr/wald/wald.md | 4 ++-- hindi/bollywood.md | 4 ++-- hungarian/malyvacukor.md | 2 +- hungarian/zuhanyzas/telefon/telefon.md | 4 ++-- hungarian/zuhanyzas/zuhanyzas.md | 4 ++-- language.md | 10 +++++----- nepali/about_nepal.md | 2 +- romanian/nalba.md | 4 ++-- .../stand-up/coffee/breakfast/breakfast.md | 6 +++--- russian/awaken/stand-up/stand-up.md | 2 +- russian/eating-walls/eating-marshmallows.md | 6 +++--- .../sleep/brushing/bluebrush/blue-toothbrush.md | 4 ++-- russian/sleep/brushing/brushing.md | 4 ++-- "slovenian/za\304\215etek.md" | 4 ++-- ukrainian/dream/dream.md | 2 +- 69 files changed, 134 insertions(+), 134 deletions(-) diff --git a/basque/alde-egin/alde-egin.md b/basque/alde-egin/alde-egin.md index c43e0d2a7d..d42ff3af89 100644 --- a/basque/alde-egin/alde-egin.md +++ b/basque/alde-egin/alde-egin.md @@ -6,6 +6,6 @@ Bat-batean, albisteetan ikusten duzun pertsona batek urrezko gaztainak saltzen h Zer egiten duzu orain? -[Pertsona arraroaren bila joan zaldiz.] (zaldi/zaldi.md) +[Pertsona arraroaren bila joan zaldiz.](zaldi/zaldi.md) -[Pertsona arraroari deitu harresiaren gainetik oihu.] (oihu/oihu.md) +[Pertsona arraroari deitu harresiaren gainetik oihu.](oihu/oihu.md) diff --git a/catala/cantar/cantar.md b/catala/cantar/cantar.md index 146cb49059..554342dbbe 100644 --- a/catala/cantar/cantar.md +++ b/catala/cantar/cantar.md @@ -4,4 +4,4 @@ prop del teu cap, deu ser això el que t'ha fet somniar amb les parets de sucre. I ara... què vols fer? -[Tasto una llaminadura] (tastar/tastar.md) \ No newline at end of file +[Tasto una llaminadura](tastar/tastar.md) \ No newline at end of file diff --git a/catala/catala.md b/catala/catala.md index 09a15b4f3d..d2b8001d88 100644 --- a/catala/catala.md +++ b/catala/catala.md @@ -7,12 +7,12 @@ Tanque els ulls els torne a obrir. No pot ser. On estic? Em resulta familiar, però no sé on estic. [Que és aixó ](http://www.google.es/imgres?imgurl=http%3A%2F%2F1.bp.blogspot.com%2F-b0CZu7RAyiM%2FULaNOLTJMZI%2FAAAAAAAAAA8%2FwmVTGAKDC-U%2Fs400%2FCaptura3.PNG&imgrefurl=http%3A%2F%2Fsusandsan.blogspot.com%2F2012%2F11%2Fsimbolismo-figuracion-y-abstraccion.html&h=304&w=400&tbnid=jAdgGBhRlYxgwM%3A&zoom=1&docid=j7NOlpg8lyjPMM&ei=xo95VOvhDc7zasWGgaAP&tbm=isch&ved=0CGMQMygfMB8&iact=rc&uact=3&dur=1931&page=3&start=20&ndsp=13) Què fas? -[Et poses a dormir] (dormir/dormir.md) +[Et poses a dormir](dormir/dormir.md) -[Cantes de l'alegria] (cantar/cantar.md) +[Cantes de l'alegria](cantar/cantar.md) -[Penses com sortir d'aquí] (sortir/sortir.md) +[Penses com sortir d'aquí](sortir/sortir.md) -[Et pessigues el braç] (pessigar-se/pessigar-se.md) +[Et pessigues el braç](pessigar-se/pessigar-se.md) -[T'aixeques del llit] (aixecar/aixecar.md) +[T'aixeques del llit](aixecar/aixecar.md) diff --git a/catala/pessigar-se/pessigar-se.md b/catala/pessigar-se/pessigar-se.md index 22a60708e0..75c0919bc6 100644 --- a/catala/pessigar-se/pessigar-se.md +++ b/catala/pessigar-se/pessigar-se.md @@ -2,6 +2,6 @@ Quan obres els ulls els nvols de sucre s'han convertit en canaris roses que t'estan pessigant el bra esquerre. Qu fas? -[Et menges un canari rosa per veure si t gust de nvol] (menjar/menjar.md) +[Et menges un canari rosa per veure si t gust de nvol](menjar/menjar.md) -[treus el mbil per fer una foto als canaris i enviar-la als teus amics] (foto/foto.md) +[treus el mbil per fer una foto als canaris i enviar-la als teus amics](foto/foto.md) diff --git a/english/apj/apj.md b/english/apj/apj.md index f6937bcdb9..838008539e 100644 --- a/english/apj/apj.md +++ b/english/apj/apj.md @@ -6,4 +6,4 @@ So we have to overcome our fear. There are some quotes :- -[QUOTES] (quotes/quotes.md) \ No newline at end of file +[QUOTES](quotes/quotes.md) \ No newline at end of file diff --git a/english/apj/quotes/quotes.md b/english/apj/quotes/quotes.md index 86ce53bbec..b28c8f5c19 100644 --- a/english/apj/quotes/quotes.md +++ b/english/apj/quotes/quotes.md @@ -4,4 +4,4 @@ 3) "There is no illusion greater than fear." -Lao Tzu -Click [hear] (https://www.goodreads.com/quotes/tag/overcoming-fear) to find more quotes. \ No newline at end of file +Click [hear](https://www.goodreads.com/quotes/tag/overcoming-fear) to find more quotes. \ No newline at end of file diff --git a/english/avatar/air.md b/english/avatar/air.md index 221ca02b6d..3df1aecaf9 100644 --- a/english/avatar/air.md +++ b/english/avatar/air.md @@ -1,3 +1,3 @@ [But everything changed when the firenation attacked...](https://www.youtube.com/watch?v=pJUgCzEdx9k) -[Fire Lord Ozai] (http://avatar.wikia.com/wiki/Ozai) wanted to conquer the other nations and rule the world. \ No newline at end of file +[Fire Lord Ozai](http://avatar.wikia.com/wiki/Ozai) wanted to conquer the other nations and rule the world. \ No newline at end of file diff --git a/english/be-octodog/octodog.md b/english/be-octodog/octodog.md index 54ef0ed85d..5346c0118f 100644 --- a/english/be-octodog/octodog.md +++ b/english/be-octodog/octodog.md @@ -3,6 +3,6 @@ First you have to transformate to an octocat by complete this course then read at least 100 adventures. -Let's get started, go to the [beginning] (../marshmallow.md) +Let's get started, go to the [beginning](../marshmallow.md) Have fun! diff --git a/english/check-your-phone/check-your-phone.md b/english/check-your-phone/check-your-phone.md index b073c94af4..feb96055f9 100644 --- a/english/check-your-phone/check-your-phone.md +++ b/english/check-your-phone/check-your-phone.md @@ -11,7 +11,7 @@ who says "You are on vacation in Paris!" Do you: -[Decide this is just a dream and buy a t-shirt from CustomShirts.com] (http://CustomShirts.com) +[Decide this is just a dream and buy a t-shirt from CustomShirts.com](http://CustomShirts.com) [Realize that it's just a dream](../dream/dream.md) diff --git a/english/count-the-marshmellows/count-the-marshmellows.md b/english/count-the-marshmellows/count-the-marshmellows.md index b5408b4767..18acdf43db 100644 --- a/english/count-the-marshmellows/count-the-marshmellows.md +++ b/english/count-the-marshmellows/count-the-marshmellows.md @@ -10,7 +10,7 @@ Do you: [Look for a way out?](../find-exit/leave.md) -[Sell the marshmallows on ebay?] (./sell-on-ebay/sell-on-ebay.md) +[Sell the marshmallows on ebay?](./sell-on-ebay/sell-on-ebay.md) [Eat ALL the marshmallows](./eat-all-the-marshmellows/eat-all-the-marshmellows.md) diff --git a/english/dream_in_dream/spin_spinner/spin.md b/english/dream_in_dream/spin_spinner/spin.md index 55a941699b..60dae27076 100644 --- a/english/dream_in_dream/spin_spinner/spin.md +++ b/english/dream_in_dream/spin_spinner/spin.md @@ -1 +1 @@ -You spin the spinner on the table and [watch] (http://giphy.com/gifs/movie-reality-dreams-Gw6zuulR3WKlO) it closely. +You spin the spinner on the table and [watch](http://giphy.com/gifs/movie-reality-dreams-Gw6zuulR3WKlO) it closely. diff --git a/english/eating-walls/find-a-toilet/door/open-door.md b/english/eating-walls/find-a-toilet/door/open-door.md index f5c073889f..666f71cdf6 100644 --- a/english/eating-walls/find-a-toilet/door/open-door.md +++ b/english/eating-walls/find-a-toilet/door/open-door.md @@ -10,4 +10,4 @@ Do you: [Run into the room and close the door](run-in/run-into-room.md) -[Blind the eyes with your torch] (alien/use-torch.md) \ No newline at end of file +[Blind the eyes with your torch](alien/use-torch.md) \ No newline at end of file diff --git a/english/experience/black-point/black-point.md b/english/experience/black-point/black-point.md index 7bf7e518b1..b33daa921e 100644 --- a/english/experience/black-point/black-point.md +++ b/english/experience/black-point/black-point.md @@ -8,4 +8,4 @@ What do you do now? [Open your eyes](../../marshmallow.md) -[Concentrate harder on the black point] (concentrate/stargaze.md) +[Concentrate harder on the black point](concentrate/stargaze.md) diff --git a/english/explore-outside/journey-to-flaming-tower/graham-cracker-cab/agree-to-pay/Ride-with-Luckey/Ride-with-Luckey.md b/english/explore-outside/journey-to-flaming-tower/graham-cracker-cab/agree-to-pay/Ride-with-Luckey/Ride-with-Luckey.md index 03f5c3805c..ce0ad81fbc 100644 --- a/english/explore-outside/journey-to-flaming-tower/graham-cracker-cab/agree-to-pay/Ride-with-Luckey/Ride-with-Luckey.md +++ b/english/explore-outside/journey-to-flaming-tower/graham-cracker-cab/agree-to-pay/Ride-with-Luckey/Ride-with-Luckey.md @@ -4,7 +4,7 @@ As soon as you get up there he starts talking none stop. Do you: -[Pay attention to what he has to say] (http://www.cracked.com/funny-5475-lucky-charms/) +[Pay attention to what he has to say](http://www.cracked.com/funny-5475-lucky-charms/) -[Stare off into the distance] (https://www.youtube.com/watch?v=LC_ZQXH3Dqg) \ No newline at end of file +[Stare off into the distance](https://www.youtube.com/watch?v=LC_ZQXH3Dqg) \ No newline at end of file diff --git a/english/explore-outside/journey-to-flaming-tower/graham-cracker-cab/disagree-to-pay/magical-armor/demonacrat/demonacrat.md b/english/explore-outside/journey-to-flaming-tower/graham-cracker-cab/disagree-to-pay/magical-armor/demonacrat/demonacrat.md index 1534e2f62b..5e9dead940 100644 --- a/english/explore-outside/journey-to-flaming-tower/graham-cracker-cab/disagree-to-pay/magical-armor/demonacrat/demonacrat.md +++ b/english/explore-outside/journey-to-flaming-tower/graham-cracker-cab/disagree-to-pay/magical-armor/demonacrat/demonacrat.md @@ -1,7 +1,7 @@ The demon peers at you and asks, 'What is it you want from me?' -[Chocolate] (chocolate/chocolate.md) +[Chocolate](chocolate/chocolate.md) -[Save the world] (save-the-world/save-the-world.md) +[Save the world](save-the-world/save-the-world.md) -[I was just passing by. Sorry for the incovinience] (sorry/sorry.md) \ No newline at end of file +[I was just passing by. Sorry for the incovinience](sorry/sorry.md) \ No newline at end of file diff --git a/english/explore-outside/journey-to-flaming-tower/graham-cracker-cab/disagree-to-pay/magical-armor/magical-armor.md b/english/explore-outside/journey-to-flaming-tower/graham-cracker-cab/disagree-to-pay/magical-armor/magical-armor.md index c01f2414e3..24ef7a9f10 100644 --- a/english/explore-outside/journey-to-flaming-tower/graham-cracker-cab/disagree-to-pay/magical-armor/magical-armor.md +++ b/english/explore-outside/journey-to-flaming-tower/graham-cracker-cab/disagree-to-pay/magical-armor/magical-armor.md @@ -13,8 +13,8 @@ and one with a gray cloak (the independcrat). Which do you use your gold to bargain with? -[Demonacrat] (demonacrat/demonacrat.md) +[Demonacrat](demonacrat/demonacrat.md) -[Republicrat] (republicrat/republicrat.md) +[Republicrat](republicrat/republicrat.md) -[Independcrat] (independcrat/independcrat.md) +[Independcrat](independcrat/independcrat.md) diff --git a/english/explore-outside/journey-to-flaming-tower/start-running/confront/confront.md b/english/explore-outside/journey-to-flaming-tower/start-running/confront/confront.md index e730973019..5a359da506 100644 --- a/english/explore-outside/journey-to-flaming-tower/start-running/confront/confront.md +++ b/english/explore-outside/journey-to-flaming-tower/start-running/confront/confront.md @@ -4,4 +4,4 @@ The dread you felt running from this presence is still there, but the eyes becko You are powerless to resist. You have been eaten by a Grue. But luckily for you, Grues do not like marshmallows so he spits you out. -[You decide to go back to the marshmallow room and do some yoga] (../../../../yoga/yoga.md) \ No newline at end of file +[You decide to go back to the marshmallow room and do some yoga](../../../../yoga/yoga.md) \ No newline at end of file diff --git a/english/find-exit/into-forest/forest.md b/english/find-exit/into-forest/forest.md index dc1642fe5f..36f9f721cb 100644 --- a/english/find-exit/into-forest/forest.md +++ b/english/find-exit/into-forest/forest.md @@ -29,9 +29,9 @@ You can do nothing but wait for it to make it's move Then it asks "What's your name?" -[Do you start a conversation with the cougar?] (talk-to-cougar/talk-to-cougar.md) +[Do you start a conversation with the cougar?](talk-to-cougar/talk-to-cougar.md) -[Do you start to run?] (all-is-lost/all-is-lost.md) +[Do you start to run?](all-is-lost/all-is-lost.md) As you head back into the forrest, Sara follows you, but at a distance. diff --git a/english/hide/hide-chk.md b/english/hide/hide-chk.md index 28cd4274b1..dd609782a4 100644 --- a/english/hide/hide-chk.md +++ b/english/hide/hide-chk.md @@ -11,7 +11,7 @@ Fear grips you and your brain start to whirl with ideas. Do you: -[Begin to stab with walls with the fork?] (fork/fork-stab.md) +[Begin to stab with walls with the fork?](fork/fork-stab.md) -[Begin a fire by burning the rope?] (rope/rope-burn.md) +[Begin a fire by burning the rope?](rope/rope-burn.md) diff --git a/english/interact/fork/fork.md b/english/interact/fork/fork.md index 88fd579f46..92e48c0b9a 100644 --- a/english/interact/fork/fork.md +++ b/english/interact/fork/fork.md @@ -22,6 +22,6 @@ You pick up your fork and.. Do you: -[Follow Mr marshmallow] (follow/follow.md) +[Follow Mr marshmallow](follow/follow.md) -[Go back to sleep?] (../../sleep/marshmallow.md) +[Go back to sleep?](../../sleep/marshmallow.md) diff --git a/english/interact/interact.md b/english/interact/interact.md index 690afc0a22..a3fecfeb51 100644 --- a/english/interact/interact.md +++ b/english/interact/interact.md @@ -12,12 +12,12 @@ When you open your eyes, the marshmallow hand is nowhere to be seen.... You then: -[Take your lighter out] (lighter/lighter.md) +[Take your lighter out](lighter/lighter.md) -[Bend down on one knee] (bend/bend.md) +[Bend down on one knee](bend/bend.md) -[Take your fork out] (fork/fork.md) +[Take your fork out](fork/fork.md) -[Use the rope to whip the wall] (whip/whip.md) +[Use the rope to whip the wall](whip/whip.md) [Run at the wall to try to run through it](run-into-wall/run-into-wall.md) \ No newline at end of file diff --git a/english/interact/run-into-wall/run-into-wall.md b/english/interact/run-into-wall/run-into-wall.md index 84ab3f2e8a..0dc9f224d1 100644 --- a/english/interact/run-into-wall/run-into-wall.md +++ b/english/interact/run-into-wall/run-into-wall.md @@ -11,4 +11,4 @@ you just feel air - you're through the wall! You open your eyes and see.... -[That you are falling from the stratosphere] (https://www.youtube.com/watch?v=dOoHArAzdug) \ No newline at end of file +[That you are falling from the stratosphere](https://www.youtube.com/watch?v=dOoHArAzdug) \ No newline at end of file diff --git a/english/interact/whip/whip.md b/english/interact/whip/whip.md index f041fb9cfc..2f6ce1059c 100644 --- a/english/interact/whip/whip.md +++ b/english/interact/whip/whip.md @@ -20,8 +20,8 @@ And it looks like you made them all angry! Do you: -[Lay down and play dead] (/english/macgyver/toss-lighter/Dead/Play_dead.md) +[Lay down and play dead](/english/macgyver/toss-lighter/Dead/Play_dead.md) -[Pick up the lighter] (/english/lighter/grab-lighter.md) +[Pick up the lighter](/english/lighter/grab-lighter.md) -[Decide not to eat spicy foods before bed] (spicy/spicy-foods.md) \ No newline at end of file +[Decide not to eat spicy foods before bed](spicy/spicy-foods.md) \ No newline at end of file diff --git a/english/invite-friends/friends.md b/english/invite-friends/friends.md index 1631d1a5b2..7f0352fec7 100644 --- a/english/invite-friends/friends.md +++ b/english/invite-friends/friends.md @@ -11,9 +11,9 @@ Do you: [Start a party?](kick_out_the_jams/jamming.md) -[Bring some chocolate and graham crackers to make s'mores?] (smores/with_friends.md) +[Bring some chocolate and graham crackers to make s'mores?](smores/with_friends.md) -[Start an extreme marshmallow mosh pit] (mosh_pit/mosh_pit.md) +[Start an extreme marshmallow mosh pit](mosh_pit/mosh_pit.md) [sing karaoke?](../karaoke/karaoke/sing.md) diff --git a/english/light-fire/eating/stream/go-fish/talk-fish/talk.md b/english/light-fire/eating/stream/go-fish/talk-fish/talk.md index 408916c0b3..520042a405 100644 --- a/english/light-fire/eating/stream/go-fish/talk-fish/talk.md +++ b/english/light-fire/eating/stream/go-fish/talk-fish/talk.md @@ -4,4 +4,4 @@ A lot of things are on your mind. It's been a busy day so far! What do you talk about with the fish? -[Talk about the weather] (weather/weather.md) \ No newline at end of file +[Talk about the weather](weather/weather.md) \ No newline at end of file diff --git a/english/light-fire/run-away/shout/child-wave.md b/english/light-fire/run-away/shout/child-wave.md index 1f51649f0b..02f18b5e79 100644 --- a/english/light-fire/run-away/shout/child-wave.md +++ b/english/light-fire/run-away/shout/child-wave.md @@ -4,8 +4,8 @@ He resembles Harry Potter, you think to yourself. Do you: -[Offer him your last few marshmallows] (offer-marshmallows/offer-marshmallows.md) +[Offer him your last few marshmallows](offer-marshmallows/offer-marshmallows.md) -[Tease him about his silly tattoo] (tease-him/tease-him.md) +[Tease him about his silly tattoo](tease-him/tease-him.md) -[Ask him what is going on] (more-info/more-info.md) +[Ask him what is going on](more-info/more-info.md) diff --git a/english/light-fire/run-away/shout/more-info/more-info.md b/english/light-fire/run-away/shout/more-info/more-info.md index 8834e85016..ef78b45f5b 100644 --- a/english/light-fire/run-away/shout/more-info/more-info.md +++ b/english/light-fire/run-away/shout/more-info/more-info.md @@ -8,8 +8,8 @@ As you try to catch your breath from your marshmallow room escape, the boy sizes Do you: -[Help him find his dog] (find-dog/find-dog.md) +[Help him find his dog](find-dog/find-dog.md) -[Explain to him about your escape] (explain-escape/explain-escape.md) +[Explain to him about your escape](explain-escape/explain-escape.md) -[Ask him to take you to the town] (goto-town/goto-town.md) \ No newline at end of file +[Ask him to take you to the town](goto-town/goto-town.md) \ No newline at end of file diff --git a/english/light-fire/run-away/shout/tease-him/tease-him.md b/english/light-fire/run-away/shout/tease-him/tease-him.md index bbd876686a..4f538cec9a 100644 --- a/english/light-fire/run-away/shout/tease-him/tease-him.md +++ b/english/light-fire/run-away/shout/tease-him/tease-him.md @@ -5,9 +5,9 @@ You continue teasing him until he takes out his wand from his pocket. Do you: -[Cower before him and beg for forgiveness] (beg-forgiveness/boy-forgives.md) +[Cower before him and beg for forgiveness](beg-forgiveness/boy-forgives.md) -[Pull out your wand and turn him into a giant marshmallow] (your-wand/marshmallow-swallow.md) +[Pull out your wand and turn him into a giant marshmallow](your-wand/marshmallow-swallow.md) [Look at him with laughter in your eyes](look-with-laughter/laughter.md) diff --git a/english/macgyver/light-rope-on-fire/light-rope-on-fire.md b/english/macgyver/light-rope-on-fire/light-rope-on-fire.md index 951b82ec8c..386f91e419 100644 --- a/english/macgyver/light-rope-on-fire/light-rope-on-fire.md +++ b/english/macgyver/light-rope-on-fire/light-rope-on-fire.md @@ -9,7 +9,7 @@ The walls begin to cramp in towards you, and the room begins to fill with smoke Do you: -[Quickly extinguish the fire] (extinguish/extinguish.md) +[Quickly extinguish the fire](extinguish/extinguish.md) -[Cover your nose with your shirt and hope the fire burns through the marshmallow soon] (wait/wait.md) +[Cover your nose with your shirt and hope the fire burns through the marshmallow soon](wait/wait.md) diff --git a/english/macgyver/light-rope-on-fire/wait/wait.md b/english/macgyver/light-rope-on-fire/wait/wait.md index e7f558e7d4..9d7f190b3a 100644 --- a/english/macgyver/light-rope-on-fire/wait/wait.md +++ b/english/macgyver/light-rope-on-fire/wait/wait.md @@ -15,6 +15,6 @@ You realize you've begun your descent, and are falling into a large forest. Do you: -[Close your eyes and hope for the best] (../../../experience/experience.md) +[Close your eyes and hope for the best](../../../experience/experience.md) -[Aim for a soft landing on the forest floor] (../../../find-exit/into-forest/forest.md) \ No newline at end of file +[Aim for a soft landing on the forest floor](../../../find-exit/into-forest/forest.md) \ No newline at end of file diff --git a/english/marshmallow-attack/make-smores/make-smores.md b/english/marshmallow-attack/make-smores/make-smores.md index c92e3d2a14..a0a311bbb8 100644 --- a/english/marshmallow-attack/make-smores/make-smores.md +++ b/english/marshmallow-attack/make-smores/make-smores.md @@ -4,4 +4,4 @@ But wait -- do you have chocolate and graham crackers? What? No Chocolate? [Look in your pockets] (look-for-chocolate/look-for-chocolate.md) -OMG! No chocolate AND no graham crackers [Start to cry] (start-to-cry/start-to-cry.md) +OMG! No chocolate AND no graham crackers [Start to cry](start-to-cry/start-to-cry.md) diff --git a/english/marshmallow-attack/marsh-attack.md b/english/marshmallow-attack/marsh-attack.md index 8717a95fb6..eb25a0f0e7 100644 --- a/english/marshmallow-attack/marsh-attack.md +++ b/english/marshmallow-attack/marsh-attack.md @@ -18,4 +18,4 @@ Do you [Run back and forth?](../indigestion/indigestion.md) -[Decide you're hungry for s'mores] (make-smores/make-smores.md) +[Decide you're hungry for s'mores](make-smores/make-smores.md) diff --git a/english/marshmallow-jello-o-salad/the-kind-your-grandma-used-to-make.md b/english/marshmallow-jello-o-salad/the-kind-your-grandma-used-to-make.md index 93adae6504..edca76fa16 100644 --- a/english/marshmallow-jello-o-salad/the-kind-your-grandma-used-to-make.md +++ b/english/marshmallow-jello-o-salad/the-kind-your-grandma-used-to-make.md @@ -7,6 +7,6 @@ prepare to make the weirdest marshmallow Jell-O fruit salad ever. Some people have trouble after eating these -[no sleep?] (../amnesia/amnesia.md) +[no sleep?](../amnesia/amnesia.md) [You remember that these actually are really gross](gross/gross.md) diff --git a/english/marshmallow.md b/english/marshmallow.md index 222d9becde..2bc19a6784 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -100,9 +100,9 @@ Do you: [Admire your glowing pants](glowing-pants/glowing-pants.md) -[Grab some coffee?] (coffee/coffee.md) +[Grab some coffee?](coffee/coffee.md) -[Call the GhostBusters] (ghostbusters/ghostbusters.md) +[Call the GhostBusters](ghostbusters/ghostbusters.md) [Talk to Bob Barker](bob-barker/barker.md) @@ -305,7 +305,7 @@ Do you: [I'm batman](I'm-batman/batman.md) [You realize you are in NeverLand and you are - never going come... so you sing the Tinker Bell song] (https://youtu.be/Sopngy6uucw) + never going come... so you sing the Tinker Bell song](https://youtu.be/Sopngy6uucw) [You decide to become a marshmallow yourself.](becomemarshmallow/becomemarshmallow.md) @@ -371,7 +371,7 @@ Do you: [You Google what to do](https://www.google.co.in/) -[Abdul kalam quotes on overcoming fear] (apj/apj.md) +[Abdul kalam quotes on overcoming fear](apj/apj.md) [If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) [There's no such thing as a free lunch.](free-lunch/free-lunch.md) diff --git a/english/matrix/matrix.md b/english/matrix/matrix.md index 9e026b2071..8e759ba3f8 100644 --- a/english/matrix/matrix.md +++ b/english/matrix/matrix.md @@ -23,7 +23,7 @@ It's dark and fluffy. While you don't believe that you might be the One, it's only up to you to save the world. -[You crawl through the hole you just made and...] (matrix2/matrix2.md) +[You crawl through the hole you just made and...](matrix2/matrix2.md) -[There is no darkness - or fluffiness - without the Light.] (matrix2inception/matrix2inception.md) +[There is no darkness - or fluffiness - without the Light.](matrix2inception/matrix2inception.md) diff --git a/english/mushroom/collect_mushroom.md b/english/mushroom/collect_mushroom.md index d969dd0c50..deeee0223b 100644 --- a/english/mushroom/collect_mushroom.md +++ b/english/mushroom/collect_mushroom.md @@ -9,8 +9,8 @@ You wonder if these mushrooms will have the same interesting effect, whether they'll kill you, or whether they'd be tasty to cook with. Do you: -[Eat the mushroom?] (eat/eat_mushroom.md) +[Eat the mushroom?](eat/eat_mushroom.md) [Call up Alan and Leslie Chow?](call_alan/transported.md) -[Throw away the poisonous mushroom?] (poison/poisonous_mushroom.md) \ No newline at end of file +[Throw away the poisonous mushroom?](poison/poisonous_mushroom.md) \ No newline at end of file diff --git a/english/mushroom/eat/eat_mushroom.md b/english/mushroom/eat/eat_mushroom.md index d4f0feae05..9b8ef5bc38 100644 --- a/english/mushroom/eat/eat_mushroom.md +++ b/english/mushroom/eat/eat_mushroom.md @@ -1,6 +1,6 @@ The mushroom makes great soup. You brought them back. Do you: -[Light a fire?] (../../light-fire/fire.md) +[Light a fire?](../../light-fire/fire.md) [eat them as raw?](../../super-man/save-the-word.md) diff --git a/english/mushroom/poison/poisonous_mushroom.md b/english/mushroom/poison/poisonous_mushroom.md index a0cf0d9985..7f3050b791 100644 --- a/english/mushroom/poison/poisonous_mushroom.md +++ b/english/mushroom/poison/poisonous_mushroom.md @@ -3,4 +3,4 @@ Your stomach growls, but you know better. Do you: -[Start your day over?] (../../marshmallow.md) \ No newline at end of file +[Start your day over?](../../marshmallow.md) \ No newline at end of file diff --git a/english/pokemon/pikachu_wins.md b/english/pokemon/pikachu_wins.md index 52bc7bcf23..2a5b6e685f 100644 --- a/english/pokemon/pikachu_wins.md +++ b/english/pokemon/pikachu_wins.md @@ -11,6 +11,6 @@ Hint: you're a lyrical wordsmith [Appeal to Scotty](../explore-outside/call-scotty/call-scotty.md) -[Turn on the tunes] (../invite-friends/mosh_pit/mosh_pit.md) +[Turn on the tunes](../invite-friends/mosh_pit/mosh_pit.md) [Write a hit song](../hit-song/hit-song.md) \ No newline at end of file diff --git a/english/slap-it-hard/teach-it-a-lesson.md b/english/slap-it-hard/teach-it-a-lesson.md index 75dc7d4429..0237a0fd51 100644 --- a/english/slap-it-hard/teach-it-a-lesson.md +++ b/english/slap-it-hard/teach-it-a-lesson.md @@ -16,4 +16,4 @@ What do you do? [Move aside and let it bounce to the ground.](move/move.md) -[Run away from the marshmallow man.] (flee/flee.md) \ No newline at end of file +[Run away from the marshmallow man.](flee/flee.md) \ No newline at end of file diff --git a/english/soar/soar.md b/english/soar/soar.md index 4cab9056b7..968e35d49d 100644 --- a/english/soar/soar.md +++ b/english/soar/soar.md @@ -5,8 +5,8 @@ With the ground moving rapidly past you. Do you: -[Fly to Paris] (fly-to-paris/fly-to-paris.md) +[Fly to Paris](fly-to-paris/fly-to-paris.md) -[Fly to London] (fly-to-london/fly-to-london.md) +[Fly to London](fly-to-london/fly-to-london.md) -[Fly to Nepal] (../nepal/nepal.md) +[Fly to Nepal](../nepal/nepal.md) diff --git a/english/staypuft/ghostbusters/protons/nothing-at-first/dejavu.md b/english/staypuft/ghostbusters/protons/nothing-at-first/dejavu.md index 754fa05157..9f6c6e6b36 100644 --- a/english/staypuft/ghostbusters/protons/nothing-at-first/dejavu.md +++ b/english/staypuft/ghostbusters/protons/nothing-at-first/dejavu.md @@ -10,4 +10,4 @@ Your new surroundings appear familiar. You have a strange feeling you've been here before. -[The marshamallows have come into focus and you realize you are back where you started] (../../../../marshmallow.md) \ No newline at end of file +[The marshamallows have come into focus and you realize you are back where you started](../../../../marshmallow.md) \ No newline at end of file diff --git a/english/staypuft/ghostbusters/protons/reach.md b/english/staypuft/ghostbusters/protons/reach.md index 5da7ef8819..bf0e07d68e 100644 --- a/english/staypuft/ghostbusters/protons/reach.md +++ b/english/staypuft/ghostbusters/protons/reach.md @@ -11,10 +11,10 @@ fact YOU who has vanished! You look around and see... -[nothing...at first] (nothing-at-first/dejavu.md) +[nothing...at first](nothing-at-first/dejavu.md) -[that items appear to be oddly square] (../../../you-are-in-minecraft/minecraft.md) +[that items appear to be oddly square](../../../you-are-in-minecraft/minecraft.md) -[trees all around you] (../../../find-exit/into-forest/forest.md) +[trees all around you](../../../find-exit/into-forest/forest.md) -[a mountain in front of you] (../../../find-exit/into-mountains/mountains.md) \ No newline at end of file +[a mountain in front of you](../../../find-exit/into-mountains/mountains.md) \ No newline at end of file diff --git a/english/super-man/save-the-word.md b/english/super-man/save-the-word.md index 284525929d..2341fbc012 100644 --- a/english/super-man/save-the-word.md +++ b/english/super-man/save-the-word.md @@ -10,8 +10,8 @@ As the most glory superman, you decide to save the world. There are Sooooo ~~~ many troubles in or out of our planet. They are all making a unique voice: calling for a Man like you! Do you: -[practice flying?] (../super-powers/practice-flying.md) +[practice flying?](../super-powers/practice-flying.md) -[Find the evil mastermind Lex Luther?] (./lex-luther/find-lex-luther.md) +[Find the evil mastermind Lex Luther?](./lex-luther/find-lex-luther.md) -[Find the bird?] (../find-bird/bird.md) +[Find the bird?](../find-bird/bird.md) diff --git a/english/turing-test/turing-test.md b/english/turing-test/turing-test.md index 8f7545d921..8b1733331f 100644 --- a/english/turing-test/turing-test.md +++ b/english/turing-test/turing-test.md @@ -8,20 +8,20 @@ At first you hear no response. And then, a deep rumble comes from all around. Do you: -[Realize that someone has poured a bucket of water on you.] (bucket/water.md) +[Realize that someone has poured a bucket of water on you.](bucket/water.md) -[Realize that you are in the ghostbusters movie and wait for the marshmallow to explode] (ghostbusters/ghostbusters.md) +[Realize that you are in the ghostbusters movie and wait for the marshmallow to explode](ghostbusters/ghostbusters.md) [Be left clueless by this reference and try to eat your way out](eat/eat.md) -[Understand that you need Ghostbusters, and build a stay puft marshmallow man] (../staypuft/marshmallowman.md) +[Understand that you need Ghostbusters, and build a stay puft marshmallow man](../staypuft/marshmallowman.md) -[Assume you're on a prank show and begin looking for Ashton Kutcher] (prank/prank.md) +[Assume you're on a prank show and begin looking for Ashton Kutcher](prank/prank.md) -[Go Super Saiyan to roast the marshmallow with a Kamehameha] (dragonball/dragonball.md) +[Go Super Saiyan to roast the marshmallow with a Kamehameha](dragonball/dragonball.md) -[Ask ELIZA, who just happens to be running on a nearby terminal] (eliza/ask_eliza.md) +[Ask ELIZA, who just happens to be running on a nearby terminal](eliza/ask_eliza.md) -[Forget ELIZA, ask Siri] (siri/ask_siri.md) +[Forget ELIZA, ask Siri](siri/ask_siri.md) -[Wear the one ring and turn invisible] (ring/one_ring.md) \ No newline at end of file +[Wear the one ring and turn invisible](ring/one_ring.md) \ No newline at end of file diff --git a/english/yoga/breathe/breathe.md b/english/yoga/breathe/breathe.md index 5729f94ea5..1799c8fab1 100644 --- a/english/yoga/breathe/breathe.md +++ b/english/yoga/breathe/breathe.md @@ -11,4 +11,4 @@ knife! Do you: -[Think That's Air You're Breathing?] (../../matrix/matrix.md) +[Think That's Air You're Breathing?](../../matrix/matrix.md) diff --git a/english/yuha/yolo/yolo.md b/english/yuha/yolo/yolo.md index 2dc566035b..32e0606a66 100644 --- a/english/yuha/yolo/yolo.md +++ b/english/yuha/yolo/yolo.md @@ -1,6 +1,6 @@ They yell they yell it again it and no mistaking it they did scream "YOLO". -You only live once, so why not live it up and eat some [mushrooms.] (../../mushroom/eat/eat_mushroom.md) +You only live once, so why not live it up and eat some [mushrooms.](../../mushroom/eat/eat_mushroom.md) Or why not dream and meditate and possibly enter a transcendence by trying to [Enter-a-dim-reality](../../Enter-a-dim-reality/Dim_reality.md) diff --git a/english/yuha/yuha.md b/english/yuha/yuha.md index 8f2bc177b6..184d0f9088 100644 --- a/english/yuha/yuha.md +++ b/english/yuha/yuha.md @@ -3,6 +3,6 @@ but you instantly realise that this scene isn't real. It's just a GitHub practice session! Sorry to spoil the fun. Now go and branch after you've forked your way out. -But if you want to keep playing (back into the maxtrix) go back to the [beginning] (../marshmallow.md). +But if you want to keep playing (back into the maxtrix) go back to the [beginning](../marshmallow.md). -Or did they yell ["YOLO"] (./yolo/yolo.md). +Or did they yell ["YOLO"](./yolo/yolo.md). diff --git a/espanol/heroe/heroe.md b/espanol/heroe/heroe.md index 85923b5dfa..c92759f262 100644 --- a/espanol/heroe/heroe.md +++ b/espanol/heroe/heroe.md @@ -14,4 +14,4 @@ El capitan miró hacia el cielo y encontró: [Un Hipogrifo](hipogrifo/hipogrifo.md) -[Una Impresionante Carrera] (../carrera/carrera.md) +[Una Impresionante Carrera](../carrera/carrera.md) diff --git a/espanol/muralla/abrir/abrirsoldados/cerrad/cerrad.md b/espanol/muralla/abrir/abrirsoldados/cerrad/cerrad.md index 4c6171f67b..34e38174a1 100644 --- a/espanol/muralla/abrir/abrirsoldados/cerrad/cerrad.md +++ b/espanol/muralla/abrir/abrirsoldados/cerrad/cerrad.md @@ -2,4 +2,4 @@ ¡Rápido! ¿Qué hacemos ahora? ¡Tenemos que organizar la defensa! -[Colocar arqueros en la muralla] (arqueros/arqueros.md) \ No newline at end of file +[Colocar arqueros en la muralla](arqueros/arqueros.md) \ No newline at end of file diff --git a/espanol/torre/torre.md b/espanol/torre/torre.md index 5b7603143d..f3375bf9b9 100644 --- a/espanol/torre/torre.md +++ b/espanol/torre/torre.md @@ -9,6 +9,6 @@ Entonces el consejero decidió: [Enviar un equipo de exploradores](exploradores/exploradores.md) -[Preparar su ejercito y ejecutar la estrategia establecida] (estrategia/estrategia.md) +[Preparar su ejercito y ejecutar la estrategia establecida](estrategia/estrategia.md) -[Huir de la escena] (huida/huida.md) +[Huir de la escena](huida/huida.md) diff --git a/french/panique/frapper-le-mur.md b/french/panique/frapper-le-mur.md index 9b0dbcd3b9..808e9976c8 100644 --- a/french/panique/frapper-le-mur.md +++ b/french/panique/frapper-le-mur.md @@ -4,4 +4,4 @@ Finalement, emporté par votre élan, vous finissez par frapper un mur et vous v Maintenat que vous etes dehors, quoi faire? -[Je sens des fleurs] (sentir/fleurs.md) +[Je sens des fleurs](sentir/fleurs.md) diff --git a/german/schwimmen/gefahr/gefahr.md b/german/schwimmen/gefahr/gefahr.md index 894da389d6..92a19bd516 100644 --- a/german/schwimmen/gefahr/gefahr.md +++ b/german/schwimmen/gefahr/gefahr.md @@ -1,5 +1,5 @@ Die Insel ist zwar klein, aber direkt am Strand befindet sich ein beinahe undurchdringlicher Wald. -[In den Wald gehen] (wald/wald.md) +[In den Wald gehen](wald/wald.md) -[Zurueck] (../schwimmen.md) +[Zurueck](../schwimmen.md) diff --git a/german/schwimmen/gefahr/wald/klettern/klettern.md b/german/schwimmen/gefahr/wald/klettern/klettern.md index 118bfbeaaf..de82c47454 100644 --- a/german/schwimmen/gefahr/wald/klettern/klettern.md +++ b/german/schwimmen/gefahr/wald/klettern/klettern.md @@ -2,5 +2,5 @@ Vom Adrenalinstoß mit großen Kräften versehen ziehen Sie sich elegant am dich Astwerk nach oben und verharren in einiger Höhe. Der Leopard folgt nicht. Nach einigen Minuten stillen Beobachtens verzieht er sich wieder ins Gehölz. -[zurück] (../../gefahr.md) +[zurück](../../gefahr.md) diff --git a/german/schwimmen/gefahr/wald/wald.md b/german/schwimmen/gefahr/wald/wald.md index 6b50618063..754e494976 100644 --- a/german/schwimmen/gefahr/wald/wald.md +++ b/german/schwimmen/gefahr/wald/wald.md @@ -5,6 +5,6 @@ Es ist schwül und Sie hören fremdartige Geräusche tropischer Tiere. Plötzlich knackt es dicht neben Ihnen im Unterholz. Ein Leopard blickt sprungbereit in Ihre Augen. -[Wegrennen] (flucht/flucht.md) +[Wegrennen](flucht/flucht.md) -[Auf einen Baum klettern] (klettern/klettern.md) +[Auf einen Baum klettern](klettern/klettern.md) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 0999577f85..cff6f049d8 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -11,7 +11,7 @@ Salman,[go here](actor2/salman.md) Amithab, [go here](actor3/amithab.md) आमीर खान को तो भूल ही गए थे ये लोग | -[यहाँ दबाये ] (./actor4/aamir.md) +[यहाँ दबाये ](./actor4/aamir.md) दीपिका पादुकोन के लिए -[ यहाँ ] (./actor5/deepika.md) +[ यहाँ ](./actor5/deepika.md) diff --git a/hungarian/malyvacukor.md b/hungarian/malyvacukor.md index e492d005a4..42086f7919 100644 --- a/hungarian/malyvacukor.md +++ b/hungarian/malyvacukor.md @@ -4,7 +4,7 @@ Mit csinálsz? [visszaalszol](alvas/alom.md) -[felveszel egy par malyva zoknit] (zokni/zokni.md) +[felveszel egy par malyva zoknit](zokni/zokni.md) [lezuhanyzol](zuhanyzas/zuhanyzas.md) diff --git a/hungarian/zuhanyzas/telefon/telefon.md b/hungarian/zuhanyzas/telefon/telefon.md index 30bd01b8b3..1400322deb 100644 --- a/hungarian/zuhanyzas/telefon/telefon.md +++ b/hungarian/zuhanyzas/telefon/telefon.md @@ -4,6 +4,6 @@ Miközben azon gondolkozol, hogy működik-e még, hírtelen elkezd csörögni. Mihez kezdesz? -[felveszed a telefont] (felvesz/felvesz.md) +[felveszed a telefont](felvesz/felvesz.md) -[törülközőért nyúlsz] (../torulkozo/torulkozo.md) \ No newline at end of file +[törülközőért nyúlsz](../torulkozo/torulkozo.md) \ No newline at end of file diff --git a/hungarian/zuhanyzas/zuhanyzas.md b/hungarian/zuhanyzas/zuhanyzas.md index b9c73abe1e..e7bdc9b535 100644 --- a/hungarian/zuhanyzas/zuhanyzas.md +++ b/hungarian/zuhanyzas/zuhanyzas.md @@ -4,6 +4,6 @@ Meglepő módon nem víz, hanem langyos mályvacukor szirup folyik belőle, amit Mihez kezdesz? -[telefon segítséget kérsz] (telefon/telefon.md) +[telefon segítséget kérsz](telefon/telefon.md) -[törülközőért nyúlsz] (torulkozo/torulkozo.md) +[törülközőért nyúlsz](torulkozo/torulkozo.md) diff --git a/language.md b/language.md index 14d462c728..ea88d1a54b 100644 --- a/language.md +++ b/language.md @@ -4,13 +4,13 @@ Jei kalbi lietuviškai [spausk čia](lithuanian/startas.md) If you speak Punjabi, [go here](punjabi/punjabi.md). -यिद तपाई नेपाली बोलनुहुनछ भने, [यहाँ िथचनुहोस ।] (nepali/about_nepal.md) +यिद तपाई नेपाली बोलनुहुनछ भने, [यहाँ िथचनुहोस ।](nepali/about_nepal.md) 如果你说中文，[点击这里](Chinese/大话西游.md). Si hablas español, pasa [por aquí](espanol/canudos.md). -اذا كنت تتحدث العربية، [اضغط هنا] (arabic/salamoAlikom.md) +اذا كنت تتحدث العربية، [اضغط هنا](arabic/salamoAlikom.md) Se parli italiano, [seguimi](Italian/caramelle.md). @@ -24,9 +24,9 @@ Daca vorbesti romana, [da click aici](romanian/nalba.md). Ifyay ouyay eakspay Igpay Atinlay, [ogay erehay](pig-latin/arshmallowmay.md). -Si vous parlez français, [suivez-moi] (french/feu-de-camp.md) +Si vous parlez français, [suivez-moi](french/feu-de-camp.md) -Ha beszélsz magyarul, [kövess] (hungarian/malyvacukor.md) +Ha beszélsz magyarul, [kövess](hungarian/malyvacukor.md) Если вы говорите по-русски, то вам [сюда](russian/zefir.md) @@ -80,7 +80,7 @@ Ak hovoríš po slovensky, [klikni sem](slovak/marsmelaci.md) ನೀವು ಕೆಚ್ಚೆದೆಯ ಕನ್ನಡಿಗರಾದರೆ, [ಇಲ್ಲಿ ಒತ್ತಿ](kannada/soochike.md). -Če govoriš slovensko, [klikni sem] (slovenian/začetek.md). +Če govoriš slovensko, [klikni sem](slovenian/začetek.md). తెలుగులో రాయుటకు [ఇక్కడ](telugu/telugu.md) నొక్కండి.:-) diff --git a/nepali/about_nepal.md b/nepali/about_nepal.md index 44e53b162c..3f464462f6 100644 --- a/nepali/about_nepal.md +++ b/nepali/about_nepal.md @@ -2,4 +2,4 @@ र पुरातातिवक समपदाहरूको बखान अनतराषिटय समुदायमा पिन ठुलो छ । -थप जानकारीको लािग [यहाँ िथचनुहोस् ।] (http://en.wikipedia.org/wiki/Nepal) \ No newline at end of file +थप जानकारीको लािग [यहाँ िथचनुहोस् ।](http://en.wikipedia.org/wiki/Nepal) \ No newline at end of file diff --git a/romanian/nalba.md b/romanian/nalba.md index 41a56c0db9..424c27dbff 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -18,11 +18,11 @@ Dupa ce va intoarceti din padurea violet, obositi, vreti sa va culcati si realiz ca nu aveti pat.. asa ca va intindeti pe o plapuma, pe jos.. Adormiti gandindu- va la patul care nu mai este... -[Dimineata urmatoare, cand va treziti..] (ziua_urmatoare/ziua_urmatoare.md) +[Dimineata urmatoare, cand va treziti..](ziua_urmatoare/ziua_urmatoare.md) Va tot intrebati cum de a reaparut patul de nalbe. -[Cand deodata...] (Ginel/ginel.md) +[Cand deodata...](Ginel/ginel.md) Ginel cade pe ganduri, ca baba pe scanduri... Incearca sa-si aminteasca ce a fumat, cat sa fi costat compania Ginutei, sau de ce nu a avut noroc in viata. diff --git a/russian/awaken/stand-up/coffee/breakfast/breakfast.md b/russian/awaken/stand-up/coffee/breakfast/breakfast.md index 20e40316d3..d71a7649c7 100644 --- a/russian/awaken/stand-up/coffee/breakfast/breakfast.md +++ b/russian/awaken/stand-up/coffee/breakfast/breakfast.md @@ -4,8 +4,8 @@ Теперь надо придумать, что делать дальше. -[ Пойти и поспать еще? ] (sleep/sleep.md) +[ Пойти и поспать еще? ](sleep/sleep.md) -[ Пойти на работу? ] (work/work.md) +[ Пойти на работу? ](work/work.md) -[ Позвонить друзьям и пригласить их посмотреть на зефирное чудо? ] (friends/friends.md) +[ Позвонить друзьям и пригласить их посмотреть на зефирное чудо? ](friends/friends.md) diff --git a/russian/awaken/stand-up/stand-up.md b/russian/awaken/stand-up/stand-up.md index 425e23e58a..4312297a6c 100644 --- a/russian/awaken/stand-up/stand-up.md +++ b/russian/awaken/stand-up/stand-up.md @@ -10,6 +10,6 @@ [Включить телевизор?](tv/tv.md) -[Включить приятную музыку] (music/music.md) +[Включить приятную музыку](music/music.md) [Позвонить маме?](callmum/callmum.md) diff --git a/russian/eating-walls/eating-marshmallows.md b/russian/eating-walls/eating-marshmallows.md index 0717fdab2e..e3ed90e2e7 100644 --- a/russian/eating-walls/eating-marshmallows.md +++ b/russian/eating-walls/eating-marshmallows.md @@ -4,9 +4,9 @@ Ваши действия: -[Вызвать милицию] (police/call-police.md) +[Вызвать милицию](police/call-police.md) [Позавтракать с Винипухом и Пяточком](breakfast/breakfast-marshmallows.md) -[Спросить о будущем планеты] (yes/yesdrugs.md) -[Скажете "нет" наркотикам] (no/nodrugs.md) \ No newline at end of file +[Спросить о будущем планеты](yes/yesdrugs.md) +[Скажете "нет" наркотикам](no/nodrugs.md) \ No newline at end of file diff --git a/russian/sleep/brushing/bluebrush/blue-toothbrush.md b/russian/sleep/brushing/bluebrush/blue-toothbrush.md index e69294d07b..687246f2d6 100644 --- a/russian/sleep/brushing/bluebrush/blue-toothbrush.md +++ b/russian/sleep/brushing/bluebrush/blue-toothbrush.md @@ -1,6 +1,6 @@ После того, как вы взяли в руку синюю щетку, комната обращается вверх тормашками и вы начинаете увязать в зефире. "Что вы будете делать?" -[Паниковать] (panic/panic.md) +[Паниковать](panic/panic.md) -[Звать на помощь] (ask-for-help/ask-for-help.md) +[Звать на помощь](ask-for-help/ask-for-help.md) diff --git a/russian/sleep/brushing/brushing.md b/russian/sleep/brushing/brushing.md index 4e739b1897..879ea40440 100644 --- a/russian/sleep/brushing/brushing.md +++ b/russian/sleep/brushing/brushing.md @@ -2,6 +2,6 @@ красная и синяя, и вы застываете в размышлении и задаете себе вопрос: "Какую из зубных счеток выбрать?" -[Вы выбрали синюю щетку] (bluebrush/blue-toothbrush.md) +[Вы выбрали синюю щетку](bluebrush/blue-toothbrush.md) -[Вы выбрали красную щетку] (redbrush/red-toothbrush.md) \ No newline at end of file +[Вы выбрали красную щетку](redbrush/red-toothbrush.md) \ No newline at end of file diff --git "a/slovenian/za\304\215etek.md" "b/slovenian/za\304\215etek.md" index fc05513818..91db1fd9c8 100644 --- "a/slovenian/za\304\215etek.md" +++ "b/slovenian/za\304\215etek.md" @@ -4,6 +4,6 @@ Leva vrata so rumene barve, desna pa svetlo vijolične barve. Skozi katera vrata vstopiš? -[Odpreš vrata rumene barve] (rumena/rumena.md) +[Odpreš vrata rumene barve](rumena/rumena.md) -[Odpreš vrata svetlo vijolične barve] (svetlo-vijolična/svetlo-vijolična.md) +[Odpreš vrata svetlo vijolične barve](svetlo-vijolična/svetlo-vijolična.md) diff --git a/ukrainian/dream/dream.md b/ukrainian/dream/dream.md index 152763aa10..ed36e0564c 100644 --- a/ukrainian/dream/dream.md +++ b/ukrainian/dream/dream.md @@ -4,4 +4,4 @@ нори ви опиняєтеся у величезному колодязі, у якому навіть на бачите дна. Та [прокидаєтеся у холодному поту](../marshmallow.md). -Або [відчуваєте, що хтось хапає вас за руку] (stranger/carroll.md)! +Або [відчуваєте, що хтось хапає вас за руку](stranger/carroll.md)! From 3afead02553005fc00cb5ef911dfc0645086a817 Mon Sep 17 00:00:00 2001 From: Alexander Nied Date: Sun, 19 Jul 2015 00:28:13 -0500 Subject: [PATCH 0256/5486] Provided return to main plot from the "swami-vivekananda" side-plot of the story... --- english/swami-vivekananda/swami-vivekananda.md | 2 ++ .../swami-vivekananda/teachings-of-swami-vivekananda/quotes.md | 1 + 2 files changed, 3 insertions(+) diff --git a/english/swami-vivekananda/swami-vivekananda.md b/english/swami-vivekananda/swami-vivekananda.md index a7083851d1..89a3282a6d 100644 --- a/english/swami-vivekananda/swami-vivekananda.md +++ b/english/swami-vivekananda/swami-vivekananda.md @@ -11,3 +11,5 @@ the best "Photo Bomb" you have seen in the airport security line ... But, whatever you do, be curious... +[OK, now back to the issue at hand-- I just woke up in a marshmallow house.](../marshmallow.md) + diff --git a/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md b/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md index 96b0ed8e5c..637b695bed 100644 --- a/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md +++ b/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md @@ -39,3 +39,4 @@ Infinite faith and strength are the only conditions of success. [Read More](http://www.awakeningindia.org/life/Teachings.aspx) +[OK, this was interesting, but something's weird about this place... is that marshmallow?](../../marshmallow.md) From bca223a4278239c2964f5e02a5c5e61d94668053 Mon Sep 17 00:00:00 2001 From: Alexander Nied Date: Sun, 19 Jul 2015 00:32:28 -0500 Subject: [PATCH 0257/5486] Fix linebreak issue in the affected file. --- .../swami-vivekananda/teachings-of-swami-vivekananda/quotes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md b/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md index 637b695bed..043b9be92d 100644 --- a/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md +++ b/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md @@ -39,4 +39,5 @@ Infinite faith and strength are the only conditions of success. [Read More](http://www.awakeningindia.org/life/Teachings.aspx) + [OK, this was interesting, but something's weird about this place... is that marshmallow?](../../marshmallow.md) From 6261c7dfc253b1aae31c96f687c1a6ddc28cc349 Mon Sep 17 00:00:00 2001 From: Laura C Date: Sun, 19 Jul 2015 12:03:21 +0300 Subject: [PATCH 0258/5486] Apare zana albastra --- romanian/nalba.md | 4 +++- romanian/potiune_fermecata/potiune.md | 4 ++++ romanian/zana_albastra/cum_arata_zana.md | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 romanian/potiune_fermecata/potiune.md create mode 100644 romanian/zana_albastra/cum_arata_zana.md diff --git a/romanian/nalba.md b/romanian/nalba.md index 41a56c0db9..6730a1fd73 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -32,4 +32,6 @@ Ginuta il priveste o vreme, asa cazut pe ganduri, apoi il intreaba: -N-am, dar putem sa facem un [ceai de nalbe](ceai_de_nalbe/ceai_de_nalbe.md). Ar trebui sa aiba gust bun, putem mari putin doza, doar avem un pat de nalbe, sa vedem ce se intampla. -Se pusera ei pe baut ceai de nalba cand deodata... \ No newline at end of file +Se pusera ei pe baut ceai de nalba cand deodata... +Aparu, [Zana Albastra](zana_albastra/cum_arata_zana.md): +- Dragii mei, nu mai beti ceai de nalbe! Am nevoie de toate nalbele de aici pentru o [potiune fermecata](potiune_fermecata/potiune.md). \ No newline at end of file diff --git a/romanian/potiune_fermecata/potiune.md b/romanian/potiune_fermecata/potiune.md new file mode 100644 index 0000000000..e238a5a110 --- /dev/null +++ b/romanian/potiune_fermecata/potiune.md @@ -0,0 +1,4 @@ +2 broaste +2 serpi +1 pahar sange de vampir +toate nalbele din lume \ No newline at end of file diff --git a/romanian/zana_albastra/cum_arata_zana.md b/romanian/zana_albastra/cum_arata_zana.md new file mode 100644 index 0000000000..fcb4cad546 --- /dev/null +++ b/romanian/zana_albastra/cum_arata_zana.md @@ -0,0 +1 @@ +Cu rochie albastra, cu pantofi din argint albastru si par albastru. \ No newline at end of file From 75b76e364ef7f43d838f5fd963de163b7e17eab3 Mon Sep 17 00:00:00 2001 From: Laura C Date: Sun, 19 Jul 2015 12:23:32 +0300 Subject: [PATCH 0259/5486] Correct 120 lines length and line insertion betweeen links, upon @casey-collab suggestion --- romanian/nalba.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/romanian/nalba.md b/romanian/nalba.md index 6730a1fd73..fd499f491e 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -33,5 +33,8 @@ Ginuta il priveste o vreme, asa cazut pe ganduri, apoi il intreaba: -N-am, dar putem sa facem un [ceai de nalbe](ceai_de_nalbe/ceai_de_nalbe.md). Ar trebui sa aiba gust bun, putem mari putin doza, doar avem un pat de nalbe, sa vedem ce se intampla. Se pusera ei pe baut ceai de nalba cand deodata... + Aparu, [Zana Albastra](zana_albastra/cum_arata_zana.md): -- Dragii mei, nu mai beti ceai de nalbe! Am nevoie de toate nalbele de aici pentru o [potiune fermecata](potiune_fermecata/potiune.md). \ No newline at end of file + +- Dragii mei, nu mai beti ceai de nalbe! Am nevoie de toate nalbele de +aici pentru o [potiune fermecata](potiune_fermecata/potiune.md). \ No newline at end of file From bdac7b8e49bc71f47d49c4b80bf854b64f779308 Mon Sep 17 00:00:00 2001 From: n-gottschalt Date: Sun, 19 Jul 2015 11:38:32 -0400 Subject: [PATCH 0260/5486] Added new line about hope --- english/birdistheword/birdistheword.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/birdistheword/birdistheword.md b/english/birdistheword/birdistheword.md index 9a0c997e6c..77ece3e22a 100644 --- a/english/birdistheword/birdistheword.md +++ b/english/birdistheword/birdistheword.md @@ -2,6 +2,8 @@ You remember a friend telling you that the Bird is the word. This gives you hope +A New Hope, A Hope you havent felt in a while + So you [Sing a song](../sing-song/sing.md) From 913c912866d16042e8852d155b6f5f18418b64b3 Mon Sep 17 00:00:00 2001 From: cpanagrosso Date: Sun, 19 Jul 2015 14:19:57 -0400 Subject: [PATCH 0261/5486] Corrected typos in english/I'm-batman/batman.md --- english/I'm-batman/batman.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index 0295a371d6..8f5a915aea 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -1,3 +1,3 @@ -Did you know that your parent died and you are left with wayne manor. +Did you know that your parents died and you are left with Wayne Manor? [Realize that you are Batman and have the Utility Belt on you. Yeah!!!](https://youtu.be/YpIQQeL2ZYk?t=22s) From 344f3e1fdd8fa6fb0e36fb8cab24f50714436003 Mon Sep 17 00:00:00 2001 From: cpanagrosso Date: Sun, 19 Jul 2015 14:21:17 -0400 Subject: [PATCH 0262/5486] Added line to batman.md --- english/I'm-batman/batman.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index 8f5a915aea..188242fb0a 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -1,3 +1,3 @@ -Did you know that your parents died and you are left with Wayne Manor? +Did you know that your parents died and you are left with Wayne Manor? Golly Gosh Batman! [Realize that you are Batman and have the Utility Belt on you. Yeah!!!](https://youtu.be/YpIQQeL2ZYk?t=22s) From b37c87fc8c737b0c9c96d5378a3dc198e481e415 Mon Sep 17 00:00:00 2001 From: Alanna Malicdem Date: Sun, 19 Jul 2015 21:19:32 +0100 Subject: [PATCH 0263/5486] Stop running --- english/coffee/Run/run.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/coffee/Run/run.md b/english/coffee/Run/run.md index 23f1f304e6..174ae7aa8d 100644 --- a/english/coffee/Run/run.md +++ b/english/coffee/Run/run.md @@ -1,6 +1,9 @@ -Research has shown that coffee before a workout improves circulation, lessens pain, +Research has shown that coffee before a workout improves circulation, lessens pain, improves memory for exercises and routines, and preserves and fuels muscles. Thus, you decide to go for a running. You choose to run in the Green Park. In fact, a great place to breath a bit of fresh air.¶ + +After a few minutes you collapse to the ground, exhausted. +How could you forget? You hate running! \ No newline at end of file From a20cd1ac0998fb750bf67d1c08f5a502d7ce2e92 Mon Sep 17 00:00:00 2001 From: Amanda Date: Sun, 19 Jul 2015 20:06:23 -0500 Subject: [PATCH 0264/5486] Add a silly poem about coffee --- english/coffee/another-coffee/another-coffee.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/coffee/another-coffee/another-coffee.md b/english/coffee/another-coffee/another-coffee.md index 0f438102fb..c3934ae9b4 100644 --- a/english/coffee/another-coffee/another-coffee.md +++ b/english/coffee/another-coffee/another-coffee.md @@ -1,4 +1,10 @@ -You just had another cup of coffee, now what do you do? +You just had another cup of coffee, +now what do you do? +But after that, things can get choppy. +Coffee, to some, is the nectar of life. +One or two cups is never enough. +They turn to espresso: "The hard stuff!" +Too much, however, will surely cause strife. Is coffee all that matters anymore? I must figure out what will satisfy my overwhelming desires! You are quite hungry aren't you ? From 5873814d7b972227be70fa77686296f5687cb0ef Mon Sep 17 00:00:00 2001 From: Monish Kumar Date: Sun, 19 Jul 2015 23:55:17 -0500 Subject: [PATCH 0265/5486] Added lines to play-gta5 story --- english/play-gta5/play-gta5.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/play-gta5/play-gta5.md b/english/play-gta5/play-gta5.md index 97059595ca..324a66def4 100644 --- a/english/play-gta5/play-gta5.md +++ b/english/play-gta5/play-gta5.md @@ -1 +1,2 @@ -Trevor killed a lot of rednecks with minigun. \ No newline at end of file +Trevor killed a lot of rednecks with minigun. +Michael cheated on Trevor. \ No newline at end of file From 688f818b045c26c5a86168e1ad273914dccbbd87 Mon Sep 17 00:00:00 2001 From: Monish Kumar Date: Sun, 19 Jul 2015 23:56:48 -0500 Subject: [PATCH 0266/5486] Changed play-gta5 story --- english/play-gta5/play-gta5.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/play-gta5/play-gta5.md b/english/play-gta5/play-gta5.md index 324a66def4..609de68e5c 100644 --- a/english/play-gta5/play-gta5.md +++ b/english/play-gta5/play-gta5.md @@ -1,2 +1,3 @@ Trevor killed a lot of rednecks with minigun. -Michael cheated on Trevor. \ No newline at end of file +Michael cheated on Trevor. +Both of them stole lots of money. \ No newline at end of file From cdb64841161259847c1e765f1a731075d7077ba9 Mon Sep 17 00:00:00 2001 From: Chris Peck Date: Mon, 20 Jul 2015 15:32:49 +0930 Subject: [PATCH 0267/5486] Added Oregon Trail --- english/dysentry/dysentry.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/dysentry/dysentry.md diff --git a/english/dysentry/dysentry.md b/english/dysentry/dysentry.md new file mode 100644 index 0000000000..4be6267541 --- /dev/null +++ b/english/dysentry/dysentry.md @@ -0,0 +1 @@ +“You Have Died of Dysentery” From 4a0a943153cf7410140350d74240a3b2c3d31e93 Mon Sep 17 00:00:00 2001 From: Gaura Date: Mon, 20 Jul 2015 17:57:23 +0530 Subject: [PATCH 0268/5486] Add option to view lifestyle --- english/yoga/mind/yoga_mind.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/yoga/mind/yoga_mind.md b/english/yoga/mind/yoga_mind.md index feb8f09b8c..84a3373af8 100644 --- a/english/yoga/mind/yoga_mind.md +++ b/english/yoga/mind/yoga_mind.md @@ -1,2 +1,5 @@ You close your eyes and experience a clarity of vision, supreme focus, a feeling of oneness with the universe... you are one with the mushroom! +Oops! I mean your soul. + +Want to know about Yoga lifestyle? Click [here](../lifestyle/yoga_lifestyle.md) From af16f204a6d023d2e6b16121a621f8ba78cd4e92 Mon Sep 17 00:00:00 2001 From: Garrett Menghini Date: Mon, 20 Jul 2015 07:40:05 -0700 Subject: [PATCH 0269/5486] feat: added options for dealing with a hungry marshmallow --- english/macgyver/jump-rope/jump-a-rope.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/english/macgyver/jump-rope/jump-a-rope.md b/english/macgyver/jump-rope/jump-a-rope.md index 4c3c9c521c..7cdd1111b3 100644 --- a/english/macgyver/jump-rope/jump-a-rope.md +++ b/english/macgyver/jump-rope/jump-a-rope.md @@ -2,3 +2,12 @@ You take a rope and start jumping it with great determination. Monsters or no mo to skip a leg day. Marshmallows don't care about your legs though, and this one is inching closer and looking hungry... + +But you seem to have gotten your appetite back, and this marshmallow +looks a bit... Soft + +Do you: + +[Eat the marshmallow](../../eatmarshmallow/eatmarshmallow.md) + +[Put the jump rope down, satisfied with your leg workout](../macgyver.md) \ No newline at end of file From 3253e84c374f2be5ffd3b2dfc7477608cd3cb0eb Mon Sep 17 00:00:00 2001 From: AS Date: Mon, 20 Jul 2015 18:09:40 +0300 Subject: [PATCH 0270/5486] Added follow-up to call-mom path --- russian/call-mom/call-back/call-back.md | 1 + russian/call-mom/call-back/call-back.md~ | 0 russian/call-mom/call-mom.md | 7 ++++++- .../call-mom/look_out_from_window/look_out_from_window.md | 1 + .../call-mom/look_out_from_window/look_out_from_window.md~ | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 russian/call-mom/call-back/call-back.md create mode 100644 russian/call-mom/call-back/call-back.md~ create mode 100644 russian/call-mom/look_out_from_window/look_out_from_window.md create mode 100644 russian/call-mom/look_out_from_window/look_out_from_window.md~ diff --git a/russian/call-mom/call-back/call-back.md b/russian/call-mom/call-back/call-back.md new file mode 100644 index 0000000000..b7deccc6de --- /dev/null +++ b/russian/call-mom/call-back/call-back.md @@ -0,0 +1 @@ +Вы снова набираете номер, однако механический голос сообщает - "4815162342 Данный номер не обслуживается. Авто-система связи станции Лебедь" diff --git a/russian/call-mom/call-back/call-back.md~ b/russian/call-mom/call-back/call-back.md~ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/russian/call-mom/call-mom.md b/russian/call-mom/call-mom.md index 770fa20096..4666a42d45 100644 --- a/russian/call-mom/call-mom.md +++ b/russian/call-mom/call-mom.md @@ -1 +1,6 @@ -Вы позвонили своей маме и рассказали о том, что происходит. +Вы позвонили своей маме и рассказали о том, что происходит. Она вам сообщила, что Вас на самом деле похитила группа преступников и погрузила в сон одного из них - так называемого Архитектора. Как только она начала говорить зачем - звонок оборвался + +[Попытаться перезвонить](call-back/call-back.md) + +[Посмотреть в окно](look_out_from_window/look_out_from_window.md) + diff --git a/russian/call-mom/look_out_from_window/look_out_from_window.md b/russian/call-mom/look_out_from_window/look_out_from_window.md new file mode 100644 index 0000000000..ff5b538475 --- /dev/null +++ b/russian/call-mom/look_out_from_window/look_out_from_window.md @@ -0,0 +1 @@ +Выглянув в окно, Вы видите свое зеркальное отражение в какой-то серебристой поверхности diff --git a/russian/call-mom/look_out_from_window/look_out_from_window.md~ b/russian/call-mom/look_out_from_window/look_out_from_window.md~ new file mode 100644 index 0000000000..613aab702d --- /dev/null +++ b/russian/call-mom/look_out_from_window/look_out_from_window.md~ @@ -0,0 +1 @@ +Выглянув в окно, Вы видите свои зеркальное отражение в какой-то серебристой поверхности From 74d612489c4f98366e28632ac4ae98ae01be3a62 Mon Sep 17 00:00:00 2001 From: AS Date: Mon, 20 Jul 2015 18:23:14 +0300 Subject: [PATCH 0271/5486] 1 try to fix casey-collab inputs --- russian/call-mom/call-back/call-back.md | 3 ++- russian/call-mom/call-mom.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/russian/call-mom/call-back/call-back.md b/russian/call-mom/call-back/call-back.md index b7deccc6de..e95abea30c 100644 --- a/russian/call-mom/call-back/call-back.md +++ b/russian/call-mom/call-back/call-back.md @@ -1 +1,2 @@ -Вы снова набираете номер, однако механический голос сообщает - "4815162342 Данный номер не обслуживается. Авто-система связи станции Лебедь" +Вы снова набираете номер, однако механический голос сообщает - "4815162342 Данный номер не обслуживается. +Авто-система связи станции Лебедь" diff --git a/russian/call-mom/call-mom.md b/russian/call-mom/call-mom.md index 4666a42d45..70f5f0be6a 100644 --- a/russian/call-mom/call-mom.md +++ b/russian/call-mom/call-mom.md @@ -1,4 +1,5 @@ -Вы позвонили своей маме и рассказали о том, что происходит. Она вам сообщила, что Вас на самом деле похитила группа преступников и погрузила в сон одного из них - так называемого Архитектора. Как только она начала говорить зачем - звонок оборвался +Вы позвонили своей маме и рассказали о том, что происходит. +Она вам сообщила, что Вас на самом деле похитила группа преступников и погрузила в сон одного из них - так называемого Архитектора. Как только она начала говорить зачем - звонок оборвался [Попытаться перезвонить](call-back/call-back.md) From 4ca62d9c3298c5b313a954478e9833019b3287f3 Mon Sep 17 00:00:00 2001 From: MICHAEL HAZANI <123mickey@gmail.com> Date: Mon, 20 Jul 2015 13:43:19 -0700 Subject: [PATCH 0272/5486] update play-gta5.md --- english/play-gta5/play-gta5.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/play-gta5/play-gta5.md b/english/play-gta5/play-gta5.md index 609de68e5c..d5429b2911 100644 --- a/english/play-gta5/play-gta5.md +++ b/english/play-gta5/play-gta5.md @@ -1,3 +1,5 @@ Trevor killed a lot of rednecks with minigun. Michael cheated on Trevor. -Both of them stole lots of money. \ No newline at end of file +Both of them stole lots of money. + +It's a very sad story and a great game. From 05717cd1b28a37f8bf7a0a45e1c9726bc62edafa Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 20 Jul 2015 16:45:51 -0500 Subject: [PATCH 0273/5486] Add Rogando story --- espanol/rogando/rogando.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/rogando/rogando.md diff --git a/espanol/rogando/rogando.md b/espanol/rogando/rogando.md new file mode 100644 index 0000000000..9a869a6b22 --- /dev/null +++ b/espanol/rogando/rogando.md @@ -0,0 +1 @@ +Dej caer su cayado en el suelo, se arrodill junto a Betito y or al cielo para que Dios mande un ejrcito de ngeles. \ No newline at end of file From 40e04837423fab5a76d1ce30668899c082394d1a Mon Sep 17 00:00:00 2001 From: nanshe Date: Mon, 20 Jul 2015 17:48:37 -0400 Subject: [PATCH 0274/5486] Add line of perfect harmony to goals_of_yoga.md --- english/yoga/goals/goals_of_yoga.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/yoga/goals/goals_of_yoga.md b/english/yoga/goals/goals_of_yoga.md index 1ec619dc4c..b797b3640e 100644 --- a/english/yoga/goals/goals_of_yoga.md +++ b/english/yoga/goals/goals_of_yoga.md @@ -8,4 +8,6 @@ A more simpler goal of yoga is to stay fit and healthy. But beyond sweat and a few classes a week, yoga is meant to liberate you by helping you to discover your inner self and gain peace. -Peace on earth as it is in heaven. \ No newline at end of file +Peace on earth as it is in heaven. + +A perfect harmony between mind and body. \ No newline at end of file From 82b3e24e7afa328fd7455702e641a3a31f178542 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 21 Jul 2015 00:28:42 +0200 Subject: [PATCH 0275/5486] Add one more line for Portuguese people --- portugues_pt/colaborar.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index 2f65424c62..f87ae333fa 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -12,4 +12,6 @@ Eu quero é praia! Vou para umas [ilhas tropicais](praias/solemar.md) Contribuía para [obras de caridade](caridade/caridade.md) -Compraria [componentes eletronicos](componentes/componentes.md) \ No newline at end of file +Compraria [componentes eletronicos](componentes/componentes.md) + +Usava um repositorio privado. From b27e6fd21892ebda119593091c40709099162864 Mon Sep 17 00:00:00 2001 From: Xingyuan Pan Date: Mon, 20 Jul 2015 20:55:48 -0600 Subject: [PATCH 0276/5486] Mike eats breakfast --- Chinese/CrazyStone/CrazyStone.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/CrazyStone/CrazyStone.md b/Chinese/CrazyStone/CrazyStone.md index cd45471eb9..9bcc5c8835 100644 --- a/Chinese/CrazyStone/CrazyStone.md +++ b/Chinese/CrazyStone/CrazyStone.md @@ -2,4 +2,4 @@ 他打算挖地洞进入藏宝地点，说起挖地洞，现在问题来了。 他没学过挖洞的技能，况且手头也没有工具，独自一人徒手挖洞显然无法想象。正在他抓耳挠腮绞尽脑汁的紧要关头，上天灵光突然照亮了他的脑袋---要挖洞，找蓝翔！！！ 麦克二话不说，径直奔向重庆火车站。此时正值春运，麦克排了三天三夜，终于轮到自己却被告知开往山东的火车票都已售罄……麦克心灰意冷地走出火车站，却意外撞见了小贼中的一名，原来他也没买到去蓝翔的火车票。两人一阵唏嘘， -相见恨晚，大排档喝到半夜。第二天早上6点麦克被广场舞震醒，发现自己一个人躺在床上。 \ No newline at end of file +相见恨晚，大排档喝到半夜。第二天早上6点麦克被广场舞震醒，发现自己一个人躺在床上。迈克起来伸了个懒腰，正要好好欣赏一下跳广场舞大妈们的优雅身姿，听见有人叫自己的名字，原来是昨天碰到的小贼，手里拿着两套夹饼果子。麦克毫不客气的结果其中一套，与小贼一起大快朵颐。 \ No newline at end of file From 753e60e86ca40bcb0d2c822b86b205c731e1d144 Mon Sep 17 00:00:00 2001 From: Chris Peck Date: Tue, 21 Jul 2015 12:36:33 +0930 Subject: [PATCH 0277/5486] Update marshmallow.md Added dysentery as an option to mashmallow --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 2bc19a6784..393a4149fb 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -385,3 +385,5 @@ Do you: [Talk to Finn](talk-to-finn/finn.md) [Play Guitar](guitar/guitar.md) + +[Rinse the marshmallow under the tap then eat it](dysentry/dysentry.md) From e0c27b9cc6a4d2991a759183f2ab2094e4df054a Mon Sep 17 00:00:00 2001 From: Christian Utama Date: Tue, 21 Jul 2015 10:08:01 +0700 Subject: [PATCH 0278/5486] Add new line to wake-up.md and link it to wake-up-again.md --- english/wake-up/wake-up-again/wake-up-again.md | 11 +++++++++++ english/wake-up/wake-up.md | 1 + 2 files changed, 12 insertions(+) create mode 100644 english/wake-up/wake-up-again/wake-up-again.md diff --git a/english/wake-up/wake-up-again/wake-up-again.md b/english/wake-up/wake-up-again/wake-up-again.md new file mode 100644 index 0000000000..e474da6afe --- /dev/null +++ b/english/wake-up/wake-up-again/wake-up-again.md @@ -0,0 +1,11 @@ +Thump. Thump. Thump. + +The sound woke you up from your slumber. Well, not really. You lay in + +your bed, motionless and eyes closed, still not wanting to wake up just + +yet. You were still half-asleep and if you just ignored the sound, you + +figured you’d be able to go back to sleep. But not back to the nightmare + +you just had, obviously. \ No newline at end of file diff --git a/english/wake-up/wake-up.md b/english/wake-up/wake-up.md index b2acd79a01..0a3d315732 100644 --- a/english/wake-up/wake-up.md +++ b/english/wake-up/wake-up.md @@ -8,3 +8,4 @@ by a camp fire (with the smell of burnt marshmallow in the air) on a deserted island +....... [Not quite.](wake-up-again/wake-up-again.md) \ No newline at end of file From ff04d4959fd27ed2ad59d325aecd2b05e0a1954c Mon Sep 17 00:00:00 2001 From: Christian Utama Date: Tue, 21 Jul 2015 10:12:04 +0700 Subject: [PATCH 0279/5486] Add new wake up option and link it to wake-up.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 2bc19a6784..a553aa55ba 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -385,3 +385,5 @@ Do you: [Talk to Finn](talk-to-finn/finn.md) [Play Guitar](guitar/guitar.md) + +[Wake up!](wake-up/wake-up.md) \ No newline at end of file From 280a159e34387693cf7218ff502d5170ae4a6179 Mon Sep 17 00:00:00 2001 From: Christian Utama Date: Tue, 21 Jul 2015 10:22:10 +0700 Subject: [PATCH 0280/5486] Update marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index a553aa55ba..f27409bbfa 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -386,4 +386,6 @@ Do you: [Play Guitar](guitar/guitar.md) +[Rinse the marshmallow under the tap then eat it](dysentry/dysentry.md) + [Wake up!](wake-up/wake-up.md) \ No newline at end of file From c9b7edb0934b0d1320efebb61c20b30701dd464f Mon Sep 17 00:00:00 2001 From: Xingyuan Pan Date: Mon, 20 Jul 2015 21:43:44 -0600 Subject: [PATCH 0281/5486] Break the long line --- Chinese/CrazyStone/CrazyStone.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/CrazyStone/CrazyStone.md b/Chinese/CrazyStone/CrazyStone.md index 9bcc5c8835..ae8e9780ca 100644 --- a/Chinese/CrazyStone/CrazyStone.md +++ b/Chinese/CrazyStone/CrazyStone.md @@ -2,4 +2,6 @@ 他打算挖地洞进入藏宝地点，说起挖地洞，现在问题来了。 他没学过挖洞的技能，况且手头也没有工具，独自一人徒手挖洞显然无法想象。正在他抓耳挠腮绞尽脑汁的紧要关头，上天灵光突然照亮了他的脑袋---要挖洞，找蓝翔！！！ 麦克二话不说，径直奔向重庆火车站。此时正值春运，麦克排了三天三夜，终于轮到自己却被告知开往山东的火车票都已售罄……麦克心灰意冷地走出火车站，却意外撞见了小贼中的一名，原来他也没买到去蓝翔的火车票。两人一阵唏嘘， -相见恨晚，大排档喝到半夜。第二天早上6点麦克被广场舞震醒，发现自己一个人躺在床上。迈克起来伸了个懒腰，正要好好欣赏一下跳广场舞大妈们的优雅身姿，听见有人叫自己的名字，原来是昨天碰到的小贼，手里拿着两套夹饼果子。麦克毫不客气的结果其中一套，与小贼一起大快朵颐。 \ No newline at end of file +相见恨晚，大排档喝到半夜。第二天早上6点麦克被广场舞震醒，发现自己一个人躺在床上。 +迈克起来伸了个懒腰，正要好好欣赏一下跳广场舞大妈们的优雅身姿，听见有人叫自己的名字， +原来是昨天碰到的小贼，手里拿着两套夹饼果子。麦克毫不客气的结果其中一套，与小贼一起大快朵颐。 From c27ad455bf955a50c5a93065d83f334b977079ae Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 20 Jul 2015 20:45:26 -0700 Subject: [PATCH 0282/5486] add gameboy option --- english/pokemon/pikachu_wins.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/pokemon/pikachu_wins.md b/english/pokemon/pikachu_wins.md index 2a5b6e685f..4c6724e54d 100644 --- a/english/pokemon/pikachu_wins.md +++ b/english/pokemon/pikachu_wins.md @@ -13,4 +13,6 @@ Hint: you're a lyrical wordsmith [Turn on the tunes](../invite-friends/mosh_pit/mosh_pit.md) -[Write a hit song](../hit-song/hit-song.md) \ No newline at end of file +[Write a hit song](../hit-song/hit-song.md) + +[buy a gameboy] (../buy-gameboy/buy-gameboy.md) \ No newline at end of file From bcede083cccee0803c98ef8aa0c2734b854021e3 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 20 Jul 2015 20:53:41 -0700 Subject: [PATCH 0283/5486] add buy-gameboy --- english/buy-gameboy/buy-gameboy.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/buy-gameboy/buy-gameboy.md diff --git a/english/buy-gameboy/buy-gameboy.md b/english/buy-gameboy/buy-gameboy.md new file mode 100644 index 0000000000..1e0ccda5fb --- /dev/null +++ b/english/buy-gameboy/buy-gameboy.md @@ -0,0 +1,2 @@ +you realize that Pokemon is great and can still help you with your troubles, you find a man at a flea market selling Pokemon Red, +Blue, and Yellow all for 20 dollars along with a Gameboy. You buy it. \ No newline at end of file From df10f2cb640eeb3fc634c75a8e769b27ff525fc7 Mon Sep 17 00:00:00 2001 From: AS Date: Tue, 21 Jul 2015 10:14:22 +0300 Subject: [PATCH 0284/5486] 2 try to fix casey-collab inputs, new path from call-mom --- russian/call-mom/call-back/call-back.md~ | 0 russian/call-mom/call-mom.md | 5 ++++- .../call-mom/look_out_from_window/look_out_from_window.md~ | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 russian/call-mom/call-back/call-back.md~ delete mode 100644 russian/call-mom/look_out_from_window/look_out_from_window.md~ diff --git a/russian/call-mom/call-back/call-back.md~ b/russian/call-mom/call-back/call-back.md~ deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/russian/call-mom/call-mom.md b/russian/call-mom/call-mom.md index 70f5f0be6a..5f4f686e50 100644 --- a/russian/call-mom/call-mom.md +++ b/russian/call-mom/call-mom.md @@ -1,5 +1,8 @@ Вы позвонили своей маме и рассказали о том, что происходит. -Она вам сообщила, что Вас на самом деле похитила группа преступников и погрузила в сон одного из них - так называемого Архитектора. Как только она начала говорить зачем - звонок оборвался +Она вам сообщила, что Вас на самом деле похитила группа +преступников и погрузила в сон одного из них - так +называемого Архитектора. Как только она начала говорить зачем +- звонок оборвался [Попытаться перезвонить](call-back/call-back.md) diff --git a/russian/call-mom/look_out_from_window/look_out_from_window.md~ b/russian/call-mom/look_out_from_window/look_out_from_window.md~ deleted file mode 100644 index 613aab702d..0000000000 --- a/russian/call-mom/look_out_from_window/look_out_from_window.md~ +++ /dev/null @@ -1 +0,0 @@ -Выглянув в окно, Вы видите свои зеркальное отражение в какой-то серебристой поверхности From dbe3d4c01c7b8e3beae66670d0d4cdf4fd2cb89c Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Tue, 21 Jul 2015 16:47:24 +0800 Subject: [PATCH 0285/5486] add new line to story --- english/wake-up/wake-up-again/wake-up-again.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/english/wake-up/wake-up-again/wake-up-again.md b/english/wake-up/wake-up-again/wake-up-again.md index e474da6afe..559abdcd2c 100644 --- a/english/wake-up/wake-up-again/wake-up-again.md +++ b/english/wake-up/wake-up-again/wake-up-again.md @@ -1,11 +1,13 @@ Thump. Thump. Thump. -The sound woke you up from your slumber. Well, not really. You lay in +The sound woke you up from your slumber. Well, not really. You lay in -your bed, motionless and eyes closed, still not wanting to wake up just +your bed, motionless and eyes closed, still not wanting to wake up just -yet. You were still half-asleep and if you just ignored the sound, you +yet. You were still half-asleep and if you just ignored the sound, you figured you’d be able to go back to sleep. But not back to the nightmare -you just had, obviously. \ No newline at end of file +you just had, obviously. + +As your eyes droop and you started drifting back into the other world From eb703d076938040883c17f2e419071b01f3e6f7d Mon Sep 17 00:00:00 2001 From: emerson Date: Tue, 21 Jul 2015 10:12:37 -0500 Subject: [PATCH 0286/5486] canudos.md continuando la historia desde la caida de las escaleras rodar/rodar.md --- espanol/canudos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 65ecfeb22d..198a7986af 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -44,4 +44,6 @@ el Consejero: [Termina el baile y piden calcetines para la cena](calcetines/calcetines.md) -[Acaban tan llenos, que ruedan por las escaleras.](rodar/rodar.md) \ No newline at end of file +[Acaban tan llenos, que ruedan por las escaleras.](rodar/rodar.md) + +[La exageración y la indigestión](exageracion/exageracion) From ebba67a0b1c6530356393b8b7436e6b939310b37 Mon Sep 17 00:00:00 2001 From: emerson Date: Tue, 21 Jul 2015 10:17:35 -0500 Subject: [PATCH 0287/5486] Fix error en canudos.md y creando la continuacion de la historia en espanol/exageracion/exageracion.md --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 198a7986af..54d09348cb 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -46,4 +46,4 @@ el Consejero: [Acaban tan llenos, que ruedan por las escaleras.](rodar/rodar.md) -[La exageración y la indigestión](exageracion/exageracion) +[La exageración y la indigestión](exageracion/exageracion.md) From f3c38a5e8476ced9a670fa432a4bef80ddb5533f Mon Sep 17 00:00:00 2001 From: emerson Date: Tue, 21 Jul 2015 10:23:39 -0500 Subject: [PATCH 0288/5486] Fix error en canudos.md y creando la continuacion de la historia en espanol/exageracion/exageracion.md --- espanol/exageracion/exageracion.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 espanol/exageracion/exageracion.md diff --git a/espanol/exageracion/exageracion.md b/espanol/exageracion/exageracion.md new file mode 100644 index 0000000000..048d7a2fea --- /dev/null +++ b/espanol/exageracion/exageracion.md @@ -0,0 +1,4 @@ +Después de sentir el dolor insoportable de los golpes de la escalera en sus rostros, +empezaron a notar que sus estómagos intentaban de alguna forma comunicarse con ellos, +GHHRHHRhhRh decia el estomago pero ellos no solo lo escuchaban sentían que de alguna forma sus estómagos cobraban vida propia, +resulto ser que los hongos les habían causado una indigestión terrible. \ No newline at end of file From 6fa1a06522ab2c161a9051f7293e466cfdc38334 Mon Sep 17 00:00:00 2001 From: EvilWolf Date: Tue, 21 Jul 2015 20:22:46 +0300 Subject: [PATCH 0289/5486] Fix some spelling errors. --- german/Oktoberfest/oktoberfest.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/german/Oktoberfest/oktoberfest.md b/german/Oktoberfest/oktoberfest.md index dd916cadcc..267489115e 100644 --- a/german/Oktoberfest/oktoberfest.md +++ b/german/Oktoberfest/oktoberfest.md @@ -1,6 +1,6 @@ -Sie besuchen die Wiesn. Sie sehen ein schnes Maedchen in einem hellgrnen Dirndl. -Sie ist blond und hat lange geflochtene Haare. Als Sie sie anblickten, merkt sie das und laechelt zurck. +Sie besuchen die Wiesn. Sie sehen ein schnes Mdchen in einem hellgrnen Dirndl. +Sie ist blond und hat lange geflochtene Haare. Als Sie sie anblickten, merkt sie das und lchelt zurck. [Laden Sie sie zum etwas zu trinken ein](../Einladen/einladen.md) From c3fe7c5ecd65f235eaf741ff021961e3cdecc6ca Mon Sep 17 00:00:00 2001 From: emerson Date: Tue, 21 Jul 2015 13:16:07 -0500 Subject: [PATCH 0290/5486] Breack lines into a 120 characters. --- espanol/exageracion/exageracion.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/espanol/exageracion/exageracion.md b/espanol/exageracion/exageracion.md index 048d7a2fea..0579f19979 100644 --- a/espanol/exageracion/exageracion.md +++ b/espanol/exageracion/exageracion.md @@ -1,4 +1,4 @@ Después de sentir el dolor insoportable de los golpes de la escalera en sus rostros, -empezaron a notar que sus estómagos intentaban de alguna forma comunicarse con ellos, -GHHRHHRhhRh decia el estomago pero ellos no solo lo escuchaban sentían que de alguna forma sus estómagos cobraban vida propia, +empezaron a notar que sus estómagos intentaban de alguna forma comunicarse con ellos,GHHRHHRhhRh decia el estomago, +pero ellos no solo lo escuchaban sentían que de alguna forma sus estómagos cobraban vida propia, resulto ser que los hongos les habían causado una indigestión terrible. \ No newline at end of file From 681977b345ca7d020c88d815e36a59ff4691bb61 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 21 Jul 2015 18:16:09 -0700 Subject: [PATCH 0291/5486] split line to less than 120 characters --- english/buy-gameboy/buy-gameboy.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/buy-gameboy/buy-gameboy.md b/english/buy-gameboy/buy-gameboy.md index 1e0ccda5fb..03c25884a6 100644 --- a/english/buy-gameboy/buy-gameboy.md +++ b/english/buy-gameboy/buy-gameboy.md @@ -1,2 +1,3 @@ -you realize that Pokemon is great and can still help you with your troubles, you find a man at a flea market selling Pokemon Red, +you realize that Pokemon is great and can still help you with your troubles, +you find a man at a flea market selling Pokemon Red, Blue, and Yellow all for 20 dollars along with a Gameboy. You buy it. \ No newline at end of file From c36b8cf8cf887907353da108ff447e70798e1af2 Mon Sep 17 00:00:00 2001 From: Garrett Menghini Date: Tue, 21 Jul 2015 19:07:26 -0700 Subject: [PATCH 0292/5486] feat: added a few lines to practice updating a cross repository pull request --- english/macgyver/jump-rope/jump-a-rope.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/macgyver/jump-rope/jump-a-rope.md b/english/macgyver/jump-rope/jump-a-rope.md index 7cdd1111b3..11b0d7e377 100644 --- a/english/macgyver/jump-rope/jump-a-rope.md +++ b/english/macgyver/jump-rope/jump-a-rope.md @@ -3,6 +3,8 @@ to skip a leg day. Marshmallows don't care about your legs though, and this one is inching closer and looking hungry... +...98, 99, 100! Whew. Jumping rope shouldn't hurt that badly... + But you seem to have gotten your appetite back, and this marshmallow looks a bit... Soft From 5f0d61e0d3bd94ea2f0750abfee3bb1bc7c8f8df Mon Sep 17 00:00:00 2001 From: OlgaBabeeva Date: Wed, 22 Jul 2015 13:50:55 +0600 Subject: [PATCH 0293/5486] Create comma branch --- russian/comma/comma.md | 3 +++ russian/zefir.md | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 russian/comma/comma.md diff --git a/russian/comma/comma.md b/russian/comma/comma.md new file mode 100644 index 0000000000..877877dbfe --- /dev/null +++ b/russian/comma/comma.md @@ -0,0 +1,3 @@ +Громкий голос из ниоткула говорит: "Нехорошо ломать четвёртую стену!". + + diff --git a/russian/zefir.md b/russian/zefir.md index 2d11fc2e8c..8029eea05d 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -25,3 +25,7 @@ [Позовёте друзей.](invite-friends/invite.md) [Позвоните маме.](call-mom/call-mom.md) + +[Поставите запятую после "цветы".] (comma/comma.md) + + From cf30235342771bf7c06af1ed55b0228bde511a45 Mon Sep 17 00:00:00 2001 From: OlgaBabeeva Date: Wed, 22 Jul 2015 13:52:22 +0600 Subject: [PATCH 0294/5486] Update comma.md --- russian/comma/comma.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/comma/comma.md b/russian/comma/comma.md index 877877dbfe..ff2d66324b 100644 --- a/russian/comma/comma.md +++ b/russian/comma/comma.md @@ -1,3 +1,3 @@ -Громкий голос из ниоткула говорит: "Нехорошо ломать четвёртую стену!". +Громкий голос из ниоткуда говорит: "Нехорошо ломать четвёртую стену!". From e9e0feeb379b06dc4b5b9e969ae6a4d3a77d0c7b Mon Sep 17 00:00:00 2001 From: Ignacio Berenguer Date: Wed, 22 Jul 2015 11:10:18 +0200 Subject: [PATCH 0295/5486] Change main story canudos.md to add poseso --- espanol/canudos.md | 3 +++ espanol/poseso/poseso.md | 1 + 2 files changed, 4 insertions(+) create mode 100644 espanol/poseso/poseso.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 54d09348cb..a9c185f3d2 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -47,3 +47,6 @@ el Consejero: [Acaban tan llenos, que ruedan por las escaleras.](rodar/rodar.md) [La exageración y la indigestión](exageracion/exageracion.md) + +[Empieza a gritar como un poseso](poseso/poseso.md) + diff --git a/espanol/poseso/poseso.md b/espanol/poseso/poseso.md new file mode 100644 index 0000000000..4c7261a618 --- /dev/null +++ b/espanol/poseso/poseso.md @@ -0,0 +1 @@ +Con los ojos muy abiertos y haciendo aspavientos con las manos, el Consejero gritaba ante la atónica mirada de la multitud... \ No newline at end of file From 36f0877921b9e78cd6c222aadb2cf57fb2ac19fc Mon Sep 17 00:00:00 2001 From: Ki Gap Han Date: Thu, 23 Jul 2015 00:01:54 +0900 Subject: [PATCH 0296/5486] Add story in Korean, read --- korean/marshmallow.md | 4 +++- korean/read/read.md | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 korean/read/read.md diff --git a/korean/marshmallow.md b/korean/marshmallow.md index 533edea7fc..798ea5b4b8 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -24,4 +24,6 @@ [마쉬멜로라면 핫초코지~! 핫초코를 사러 나간다.](coco/coco.md) -[다시잔다](marshmallow.md) \ No newline at end of file +[다시잔다](marshmallow.md) + +[책을 읽는다] (read/read.md)? \ No newline at end of file diff --git a/korean/read/read.md b/korean/read/read.md new file mode 100644 index 0000000000..f89343ec22 --- /dev/null +++ b/korean/read/read.md @@ -0,0 +1,10 @@ +책을 읽고나서 잠이 오기 시작한다. + +이제 어떻게 할까요? + +[다시 잔다](](../sleep/marshmallow.md)? + +[노래를 부른다](../sing-a-song/song.md)? + +[처음으로 돌아간다] (../marshmallow.md)? + From d88c623b60b2ef7e4bf01da1c962a4ee2a884717 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 22 Jul 2015 12:37:59 -0500 Subject: [PATCH 0297/5486] add pondering track to the hole in marshmallow --- english/interact/fork/follow/follow.md | 3 ++- english/interact/fork/follow/ponder/ponder-the-hole.md | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/interact/fork/follow/ponder/ponder-the-hole.md diff --git a/english/interact/fork/follow/follow.md b/english/interact/fork/follow/follow.md index 46bb729df1..4ab594244f 100644 --- a/english/interact/fork/follow/follow.md +++ b/english/interact/fork/follow/follow.md @@ -4,4 +4,5 @@ With the fork still in hand, you pace yourself towards the hopping Mr marshmallo At one corner of the marshmallow room, you notice a large dark hole and marshmallow just jump straight into it! -Do you: \ No newline at end of file +Do you: +(Ponder the hole?)[ponder/ponder-the-hole.md] diff --git a/english/interact/fork/follow/ponder/ponder-the-hole.md b/english/interact/fork/follow/ponder/ponder-the-hole.md new file mode 100644 index 0000000000..8f9ec9551c --- /dev/null +++ b/english/interact/fork/follow/ponder/ponder-the-hole.md @@ -0,0 +1,2 @@ +You ponder the hole. It is holish, but neither holy nor holistic. +Wholesome? Not that neither. What is a hole, but what it is not? From df593409df3c7064eb169d4eb7abc7ca9b4ddd28 Mon Sep 17 00:00:00 2001 From: the-fool Date: Wed, 22 Jul 2015 12:39:14 -0500 Subject: [PATCH 0298/5486] update follow.md --- english/interact/fork/follow/follow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/interact/fork/follow/follow.md b/english/interact/fork/follow/follow.md index 4ab594244f..6fc58a81e7 100644 --- a/english/interact/fork/follow/follow.md +++ b/english/interact/fork/follow/follow.md @@ -5,4 +5,4 @@ With the fork still in hand, you pace yourself towards the hopping Mr marshmallo At one corner of the marshmallow room, you notice a large dark hole and marshmallow just jump straight into it! Do you: -(Ponder the hole?)[ponder/ponder-the-hole.md] +[Ponder the hole?](ponder/ponder-the-hole.md) From 27325cfd966f9f1ca3d9a5497fc6511da82f0ec9 Mon Sep 17 00:00:00 2001 From: Mani Date: Wed, 22 Jul 2015 20:14:30 +0200 Subject: [PATCH 0299/5486] Add Urdu language story --- language.md | 2 ++ urdu/urdu-news.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 urdu/urdu-news.md diff --git a/language.md b/language.md index da7504c42b..b3ce2f3598 100644 --- a/language.md +++ b/language.md @@ -102,3 +102,5 @@ Po flisni shqip, [shkoni ketu](albanian/hyrje.md) [ئەگەر کوردی ئەزانیت کلیک بکە](kurdish/kurdi.md) Ako govorite srpski [klikni ovde](serbian/start.md) + +If you speak Urdu [click here](urdu/urdu-news.md) \ No newline at end of file diff --git a/urdu/urdu-news.md b/urdu/urdu-news.md new file mode 100644 index 0000000000..f0028d9110 --- /dev/null +++ b/urdu/urdu-news.md @@ -0,0 +1 @@ +if you like to see urdu news [click here](www.bbc.com/urdu) \ No newline at end of file From f610f6ca56074cd58bb94a3e89cfd8ab5e3b66a3 Mon Sep 17 00:00:00 2001 From: Mani Date: Wed, 22 Jul 2015 20:26:59 +0200 Subject: [PATCH 0300/5486] fixed the broken news link --- urdu/urdu-news.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/urdu/urdu-news.md b/urdu/urdu-news.md index f0028d9110..87703d6b33 100644 --- a/urdu/urdu-news.md +++ b/urdu/urdu-news.md @@ -1 +1 @@ -if you like to see urdu news [click here](www.bbc.com/urdu) \ No newline at end of file +if you like to see urdu news [click here](http://www.bbc.com/urdu/) \ No newline at end of file From 05c43bc1fb472d6c3fc30b4310837fa6784b8d59 Mon Sep 17 00:00:00 2001 From: "Pablo A-V. R" Date: Wed, 22 Jul 2015 21:22:37 +0200 Subject: [PATCH 0301/5486] Aniadir ordenes al hijo --- espanol/hijo/hijo.md | 8 +++++++- espanol/hijo/mazmorra/mazmorra.md | 2 ++ espanol/hijo/preparar/preparar.md | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 espanol/hijo/mazmorra/mazmorra.md create mode 100644 espanol/hijo/preparar/preparar.md diff --git a/espanol/hijo/hijo.md b/espanol/hijo/hijo.md index 291f34b65e..9747388bfd 100644 --- a/espanol/hijo/hijo.md +++ b/espanol/hijo/hijo.md @@ -1,3 +1,9 @@ Reflexionaba sobre si los consejos que había dado llevarían a su hijo a morir en esta guerra. ¿Será que sus convicciones llevarían a una guerra que destruiria a su familia? -Quizás, pero de seguro no traería el mejor resultado. \ No newline at end of file +Quizás, pero de seguro no traería el mejor resultado. + +Casualmente apareció el hijo en aquel mismo momento. + +[Ordena al hijo ocultarse en las mazmorras](mazmorra/mazmorra.md) + +[Ordena al hijo preparse para el combate](preparar/preparar.md) \ No newline at end of file diff --git a/espanol/hijo/mazmorra/mazmorra.md b/espanol/hijo/mazmorra/mazmorra.md new file mode 100644 index 0000000000..62cbe4e0ac --- /dev/null +++ b/espanol/hijo/mazmorra/mazmorra.md @@ -0,0 +1,2 @@ +El hijo baja a las mazmorras, en lo ms profundo del castillo. Un autntico laberinto de pasadizos +donde nadie podra hacer nada sin un gua que los conozca. Pareca un lugar seguro para ocultarse. diff --git a/espanol/hijo/preparar/preparar.md b/espanol/hijo/preparar/preparar.md new file mode 100644 index 0000000000..d6726b50d9 --- /dev/null +++ b/espanol/hijo/preparar/preparar.md @@ -0,0 +1 @@ +El hijo baj rpidamente a la armera, se equip y qued all a la espera de ms instrucciones \ No newline at end of file From dddfdc78f25e0c0053658741d031cdddccef81fe Mon Sep 17 00:00:00 2001 From: Russ Date: Wed, 22 Jul 2015 21:45:50 +0100 Subject: [PATCH 0302/5486] Add plummet options --- english/plummet/plummet.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/plummet/plummet.md b/english/plummet/plummet.md index d50e014aba..6253eef34f 100644 --- a/english/plummet/plummet.md +++ b/english/plummet/plummet.md @@ -1,4 +1,8 @@ Instead of flying like Superman, you plummet to earth like a rock! The air roars in your ears as you realize you made a horrible mistake. -Do you: \ No newline at end of file +Do you: + +A. Panic. +B. Call 911. +C. Teleport up to a passing Vogon constructor ship. From 89ef5cdfc2a4ad302e76d37e11053dfdc737a0be Mon Sep 17 00:00:00 2001 From: manuel Date: Wed, 22 Jul 2015 19:25:04 -0500 Subject: [PATCH 0303/5486] Add an option with link that leads rogando.md --- espanol/canudos.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 65ecfeb22d..9b732968bb 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -44,4 +44,7 @@ el Consejero: [Termina el baile y piden calcetines para la cena](calcetines/calcetines.md) -[Acaban tan llenos, que ruedan por las escaleras.](rodar/rodar.md) \ No newline at end of file +[Acaban tan llenos, que ruedan por las escaleras.](rodar/rodar.md) + +[Se arrodilla y...](rogando/rogando.md) + From 7386ce5582647f82413fa19fef7eb2734697f81f Mon Sep 17 00:00:00 2001 From: Christina Gaitan Date: Wed, 22 Jul 2015 20:54:43 -0500 Subject: [PATCH 0304/5486] Add line to perro --- espanol/perro/perro.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/perro/perro.md b/espanol/perro/perro.md index ab2917409b..37ff759fd7 100644 --- a/espanol/perro/perro.md +++ b/espanol/perro/perro.md @@ -1,2 +1,3 @@ Un perro se puso a bailar con un muchacho mientras tocaba la guitarra El perro se llama Dago. +A Dago le gustaba bailar porque al bailar recordaba a su antiguo dueño From 3eddc754e4b1ba3fd7b3bc7f8b7a32cd67215b22 Mon Sep 17 00:00:00 2001 From: michelle0927 Date: Wed, 22 Jul 2015 19:56:45 -0600 Subject: [PATCH 0305/5486] Add sentence to bob barker story --- english/bob-barker/barker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bob-barker/barker.md b/english/bob-barker/barker.md index a13e4ef3a1..44f223fda8 100644 --- a/english/bob-barker/barker.md +++ b/english/bob-barker/barker.md @@ -2,7 +2,7 @@ The door thuds open and the light coming from within the room in front of you bl When your vision clears, standing before you is Bob Barker in all his glory. -He doesn't look a day past 50. Like all of the greats he doesn't age in your mind. +You stare at him in awe. He doesn't look a day past 50. Like all of the greats he doesn't age in your mind. He is flanked by two of the hottest...marshmallows that you have ever seen. From bc9fa4557da0dd48a103c3ecfcd932ef78d69d95 Mon Sep 17 00:00:00 2001 From: michelle0927 Date: Wed, 22 Jul 2015 20:02:08 -0600 Subject: [PATCH 0306/5486] Add line to bob barker story --- english/bob-barker/barker.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/english/bob-barker/barker.md b/english/bob-barker/barker.md index 44f223fda8..416cbaa12f 100644 --- a/english/bob-barker/barker.md +++ b/english/bob-barker/barker.md @@ -1,8 +1,10 @@ The door thuds open and the light coming from within the room in front of you blinds you momentarily. -When your vision clears, standing before you is Bob Barker in all his glory. +When your vision clears, standing before you is Bob Barker in all his glory. -You stare at him in awe. He doesn't look a day past 50. Like all of the greats he doesn't age in your mind. +You stare at him in awe. + +He doesn't look a day past 50. Like all of the greats he doesn't age in your mind. He is flanked by two of the hottest...marshmallows that you have ever seen. From 09a5229bb79d828d4eb342fa8e6d8bd4f0d571c8 Mon Sep 17 00:00:00 2001 From: ignacio-berenguer Date: Thu, 23 Jul 2015 12:10:19 +0200 Subject: [PATCH 0307/5486] Break poseso story to 2 ines --- espanol/poseso/poseso.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/poseso/poseso.md b/espanol/poseso/poseso.md index 4c7261a618..ae100cd634 100644 --- a/espanol/poseso/poseso.md +++ b/espanol/poseso/poseso.md @@ -1 +1,2 @@ -Con los ojos muy abiertos y haciendo aspavientos con las manos, el Consejero gritaba ante la atónica mirada de la multitud... \ No newline at end of file +Con los ojos muy abiertos y haciendo aspavientos con las manos, +el Consejero gritaba ante la atónica mirada de la multitud... From 512a2da6c2ddd08ea30092fb1986a02894e0efa1 Mon Sep 17 00:00:00 2001 From: Maurice Pittet Date: Thu, 23 Jul 2015 15:43:02 +0200 Subject: [PATCH 0308/5486] Added a continuation to the story --- french/panique/sentir/fleurs.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/french/panique/sentir/fleurs.md b/french/panique/sentir/fleurs.md index 2c2b1d0128..1b263e4a3d 100644 --- a/french/panique/sentir/fleurs.md +++ b/french/panique/sentir/fleurs.md @@ -1 +1,3 @@ -Quel parfum, ces fleurs sentent si bonnes. \ No newline at end of file +Quel parfum, ces fleurs sentent si bonnes. + +[Elles me font m'vader et penser ...](https://www.youtube.com/watch?v=etvsYTx-WCw) From 8ca2e564fb1ede70b2eaf8f02a206dd1278e6797 Mon Sep 17 00:00:00 2001 From: vascode Date: Thu, 23 Jul 2015 11:49:01 -0400 Subject: [PATCH 0309/5486] add google link in modified branch --- english/batman/batman.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index 230c2c0d15..6151e680cb 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -1,3 +1,5 @@ wanna know a secret bruce wayne is the BAT -click [here](https://en.wikipedia.org/wiki/Batman) and see it for yourself. \ No newline at end of file +click [here](https://en.wikipedia.org/wiki/Batman) and see it for yourself. + +Click [here](http://www.google.com) to visit Google. \ No newline at end of file From 9ca07f07eb826defbde562eb7065f7be42d43a26 Mon Sep 17 00:00:00 2001 From: Vinny Martinez Date: Thu, 23 Jul 2015 13:32:00 -0400 Subject: [PATCH 0310/5486] add 2spooky storyline --- english/2spooky/2spooky.md | 5 +++++ english/marshmallow.md | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/2spooky/2spooky.md diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md new file mode 100644 index 0000000000..68f0c39757 --- /dev/null +++ b/english/2spooky/2spooky.md @@ -0,0 +1,5 @@ ++"doot doot!" - mr. skeltal ++ ++plz updoot ++ ++[Go back to sleep.](../sleep/marshmallow.md) diff --git a/english/marshmallow.md b/english/marshmallow.md index f27409bbfa..7097ab8f73 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -388,4 +388,6 @@ Do you: [Rinse the marshmallow under the tap then eat it](dysentry/dysentry.md) -[Wake up!](wake-up/wake-up.md) \ No newline at end of file +[Wake up!](wake-up/wake-up.md) + +[Thank Mr. Skeltal](2spooky/2spooky.md) From 96503ef15d8c9b505b41899330c519a604b2fc53 Mon Sep 17 00:00:00 2001 From: Vinny Martinez Date: Thu, 23 Jul 2015 13:33:20 -0400 Subject: [PATCH 0311/5486] make 2spooky 2spookier --- english/2spooky/2spooky.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index 68f0c39757..07d47dea3c 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -1,5 +1,5 @@ -+"doot doot!" - mr. skeltal -+ -+plz updoot -+ -+[Go back to sleep.](../sleep/marshmallow.md) +"doot doot!" - mr. skeltal + +plz updoot + +[Go back to sleep.](../sleep/marshmallow.md) From a761e8f366cf043892acaa1862bd4ed1cb434c64 Mon Sep 17 00:00:00 2001 From: Pawel Date: Thu, 23 Jul 2015 20:56:20 +0200 Subject: [PATCH 0312/5486] Add one option and corresponding page to a polish version. --- Polish/ubranie/macasz/macasz.md | 2 ++ Polish/ubranie/ubranie.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 Polish/ubranie/macasz/macasz.md diff --git a/Polish/ubranie/macasz/macasz.md b/Polish/ubranie/macasz/macasz.md new file mode 100644 index 0000000000..16051d1ba4 --- /dev/null +++ b/Polish/ubranie/macasz/macasz.md @@ -0,0 +1,2 @@ +Wyczuwasz coś dużego, nieregularnego i twardego.. Myślisz, że to niemożliwe, że to nie ma sensu... +Czy to... czy naprawdę... kalafior? diff --git a/Polish/ubranie/ubranie.md b/Polish/ubranie/ubranie.md index b7164f46aa..bef70e9e10 100644 --- a/Polish/ubranie/ubranie.md +++ b/Polish/ubranie/ubranie.md @@ -6,5 +6,7 @@ Chyba warto sprawdzić co jest w środku. [Otwierasz kieszen](kieszen/otworz-kieszen.md) +[Macasz kieszeń i próbujesz odgadnąć co jest w środku](macasz/macasz.md) + From 7d69248ddb4414ac207e014c1f46014ea88702fe Mon Sep 17 00:00:00 2001 From: Mazar Farran Date: Thu, 23 Jul 2015 14:17:01 -0700 Subject: [PATCH 0313/5486] Add more to the intro. --- english/lisp/lisp.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/lisp/lisp.md b/english/lisp/lisp.md index 3caa853d04..ab0952e7a6 100644 --- a/english/lisp/lisp.md +++ b/english/lisp/lisp.md @@ -1 +1,5 @@ The LISP interpreter starts with a flash of blue-green flame! + +It thunders, "We hold the path of the Righteous. Blessed be he who follows the s-expression. Woe to the nonbelievers!" + +The prompt pops up. From b8d68f2637fa49c456a8786dade966efd25c2885 Mon Sep 17 00:00:00 2001 From: Deborah King Date: Thu, 23 Jul 2015 21:57:52 -0400 Subject: [PATCH 0314/5486] Add new story branch to matrix --- english/matrix/matrix2inception/jonsnow/jon.md | 1 + english/matrix/matrix2inception/matrix2inception.md | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 english/matrix/matrix2inception/jonsnow/jon.md diff --git a/english/matrix/matrix2inception/jonsnow/jon.md b/english/matrix/matrix2inception/jonsnow/jon.md new file mode 100644 index 0000000000..11357d9e47 --- /dev/null +++ b/english/matrix/matrix2inception/jonsnow/jon.md @@ -0,0 +1 @@ +You know nothing Jon Snow. \ No newline at end of file diff --git a/english/matrix/matrix2inception/matrix2inception.md b/english/matrix/matrix2inception/matrix2inception.md index 3e76010aa6..0416a7532b 100644 --- a/english/matrix/matrix2inception/matrix2inception.md +++ b/english/matrix/matrix2inception/matrix2inception.md @@ -9,4 +9,9 @@ evil that the marshmallows plot, but just before leaving, out of the corner of your mind's eye, you see their weakness. Fire. And not the fire of a backyard party, but pure, white fire - that which -only the One can achieve... \ No newline at end of file +only the One can achieve... + +Wait a minute...what is this place. Is that fire or +just the sun? And is this a marshmallow or the snow? +Such a tall wall. I've never seen such a tall wall... +[You approach the wall...](jonsnow/jon.md) \ No newline at end of file From 6219f1eeae1fffd314222017776baafe4c4f9079 Mon Sep 17 00:00:00 2001 From: Darren Joy Date: Fri, 24 Jul 2015 01:59:14 -0400 Subject: [PATCH 0315/5486] Add how do you choose? --- english/light-fire/xyzzy/stand-petrified/meet-wizard.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/light-fire/xyzzy/stand-petrified/meet-wizard.md b/english/light-fire/xyzzy/stand-petrified/meet-wizard.md index b4b7a61067..1d78b340a7 100644 --- a/english/light-fire/xyzzy/stand-petrified/meet-wizard.md +++ b/english/light-fire/xyzzy/stand-petrified/meet-wizard.md @@ -13,4 +13,6 @@ She points a long finger at the spot between your eyes. "Before you choose, you must know that this will entail travel through time and space to Berlin in the year 1898. Ponder carefully your future." + +How will you choose? From 725461c2ed667bbecfbc0633946145e06b938088 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 24 Jul 2015 08:44:33 +0100 Subject: [PATCH 0316/5486] Add shelter option --- english/forest/forest.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/forest/forest.md b/english/forest/forest.md index 3a1dcfbc23..88193b9091 100644 --- a/english/forest/forest.md +++ b/english/forest/forest.md @@ -22,3 +22,5 @@ and jumped into the unknown. You're lucky to have made it alive. But now what? [Scream out for help](scream/scream.md) [Check pockets](pockets/pockets.md) + +[Make a shelter from the parachute](shelter/shelter.md) \ No newline at end of file From 72586fedaee0c1c31760e8a21870327938d1768d Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 24 Jul 2015 08:48:41 +0100 Subject: [PATCH 0317/5486] Add shelter directory and shelter.md --- english/forest/shelter/shelter.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/forest/shelter/shelter.md diff --git a/english/forest/shelter/shelter.md b/english/forest/shelter/shelter.md new file mode 100644 index 0000000000..0866d50de7 --- /dev/null +++ b/english/forest/shelter/shelter.md @@ -0,0 +1,4 @@ +You break down some branches and make a frame. You put your parachute over +the top of it, tying it down securly with palm leaves. Luckily you did it +because as you make yourself comfortable for the night the heaven's open. +There's a terrible storm brewing... \ No newline at end of file From 857f1c9f8d99c60c07ad513fadc3ab6f43d79697 Mon Sep 17 00:00:00 2001 From: JasminKreho Date: Fri, 24 Jul 2015 16:13:38 +0200 Subject: [PATCH 0318/5486] Create Bosnian_story --- Bosnian/Bosnian_story | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Bosnian/Bosnian_story diff --git a/Bosnian/Bosnian_story b/Bosnian/Bosnian_story new file mode 100644 index 0000000000..ef9346c08c --- /dev/null +++ b/Bosnian/Bosnian_story @@ -0,0 +1,45 @@ +GORČIN + +Ase ležit +Vojnik Gorčin +U zemlji svojoj +Na baštini +Tuždi + +Žih +A smrt dozivah +Noć i dan + +Mrava ne zgazih +U vojnike +Odoh + +Bil sam +U pet i pet vojni +Bez štita i oklopa +E da ednom +Prestanu +Gorčine + +Zgiboh od čudne boli + +Ne probi me kopje +Ne ustreli strijela +Ne posječe sablja + +Zgiboh od boli +Nepreboli +Volju +A djevu mi ugrabiše +U robje + +Ako Kosaru sretnete +Na putevima + +Molju + +Skažite +Za vjernost +Moju + +Click [here] (http://www.spiritofbosnia.org/volume-2-no-3-2007-july/gorcin/) for English version From e7aab9fb6a56c8921e041fa4894dbf0d691e8ca1 Mon Sep 17 00:00:00 2001 From: JasminKreho Date: Fri, 24 Jul 2015 16:14:11 +0200 Subject: [PATCH 0319/5486] Update Bosnian_story --- Bosnian/Bosnian_story | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bosnian/Bosnian_story b/Bosnian/Bosnian_story index ef9346c08c..5988225baf 100644 --- a/Bosnian/Bosnian_story +++ b/Bosnian/Bosnian_story @@ -42,4 +42,4 @@ Skažite Za vjernost Moju -Click [here] (http://www.spiritofbosnia.org/volume-2-no-3-2007-july/gorcin/) for English version +Click [here](http://www.spiritofbosnia.org/volume-2-no-3-2007-july/gorcin/) for English version From 193d4aaeb7f2fe94e6d44005ae772b09f03c5df9 Mon Sep 17 00:00:00 2001 From: moon2002 Date: Fri, 24 Jul 2015 15:54:01 -0400 Subject: [PATCH 0320/5486] Add new option: Xie Tingfeng --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 42f3b0bc65..a135acc2ae 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -37,3 +37,5 @@ [周星驰](Zhou/Zhou.md) ? [小熊维尼](xinwang/xin.md)? + +[谢霆锋](TingfengXie/TingfengXie.md)? From 54425147e05ae579ca6c6072a504234167ca722d Mon Sep 17 00:00:00 2001 From: Jae Hyuk John Han Date: Fri, 24 Jul 2015 19:12:58 -0400 Subject: [PATCH 0321/5486] Add new Korean call-mom scenario --- korean/call-mom/call-mom.md | 9 +++++++++ korean/marshmallow.md | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 korean/call-mom/call-mom.md diff --git a/korean/call-mom/call-mom.md b/korean/call-mom/call-mom.md new file mode 100644 index 0000000000..38328ef534 --- /dev/null +++ b/korean/call-mom/call-mom.md @@ -0,0 +1,9 @@ +큰소리로 "엄마!"라고 외친다. +갑자기 마시멜로 벽이 꿈틀거리기 시작한다. + +이제 어떻게 할까요? + +[다시 잔다](../sleep/marshmallow.md)? + +[이건 아니다 싶어 영어 버전으로 간다](../../english/marshmallow.md)? + diff --git a/korean/marshmallow.md b/korean/marshmallow.md index 798ea5b4b8..bdbe6ca808 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -26,4 +26,6 @@ [다시잔다](marshmallow.md) +[큰소리로 엄마를 부른다](call-mom/call-mom.md) + [책을 읽는다] (read/read.md)? \ No newline at end of file From 5e39e41846433cd159e23cc893ab7480273f7007 Mon Sep 17 00:00:00 2001 From: moon2002 Date: Fri, 24 Jul 2015 21:46:11 -0400 Subject: [PATCH 0322/5486] Add TingfengXie folder and file --- Chinese/TingfengXie/TingfengXie.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Chinese/TingfengXie/TingfengXie.md diff --git a/Chinese/TingfengXie/TingfengXie.md b/Chinese/TingfengXie/TingfengXie.md new file mode 100644 index 0000000000..88402b14c5 --- /dev/null +++ b/Chinese/TingfengXie/TingfengXie.md @@ -0,0 +1,5 @@ +500年的苦苦等待 +依然为情所困... + +哪个姐妹都不好惹啊 +如果可以重回花果山... \ No newline at end of file From baa94e2ff73e7113e3dee39b58d87b4a997ad11b Mon Sep 17 00:00:00 2001 From: PRIYANKA Date: Sat, 25 Jul 2015 00:01:05 -0700 Subject: [PATCH 0323/5486] Added few lines to hungry file --- english/call-a-doctor/hungry/hungry.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/call-a-doctor/hungry/hungry.md b/english/call-a-doctor/hungry/hungry.md index 2296ffca21..5432d3f5b6 100644 --- a/english/call-a-doctor/hungry/hungry.md +++ b/english/call-a-doctor/hungry/hungry.md @@ -10,4 +10,8 @@ rubs his eyes, radiating disappointment. "I'm sorry," the doctor says. "Dr. Sakamoto will be here later on for another round of shock treatments." +"What? More shock treatments? I can't take those.. I am scared!" you say to the doctor. + +"Well, we dont have a choice. Do we? You are seeing marshmallow walls for heavens sake" the doctor says. + [Sit and wait.](../../marshmallow.md) From 1e930c70397502463dc26e63f7a1c974b7e595bf Mon Sep 17 00:00:00 2001 From: Soeren Date: Sat, 25 Jul 2015 12:33:22 +0200 Subject: [PATCH 0324/5486] neue option beim Blauwahl --- german/Hilfeschrei/Vertrauen/Vertrauen-zum-Blauwal.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/german/Hilfeschrei/Vertrauen/Vertrauen-zum-Blauwal.md b/german/Hilfeschrei/Vertrauen/Vertrauen-zum-Blauwal.md index 0fa4578847..745ec810f1 100644 --- a/german/Hilfeschrei/Vertrauen/Vertrauen-zum-Blauwal.md +++ b/german/Hilfeschrei/Vertrauen/Vertrauen-zum-Blauwal.md @@ -3,3 +3,5 @@ Sie vertrauen dem Blauwal und laecheln ihn an. Er oeffnet einladend sein Maul. Was wollen Sie nun machen ? [In das offene Maul steigen?](insMaul/ins_maul.md) + +[Doch lieber davon schwimmen?](../../schwimmen/schwimmen.md) \ No newline at end of file From 9b2f29a4b4b1b06da8b663f4e0c857b046381c91 Mon Sep 17 00:00:00 2001 From: Enterthusiast Date: Sat, 25 Jul 2015 14:57:28 +0200 Subject: [PATCH 0325/5486] Add a new option "reveille" to "trou.md" Add the directory "reveille" with a short description of what happens in the file "surprise.md" --- french/manger/trou/reveille/surprise.md | 11 +++++++++++ french/manger/trou/trou.md | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 french/manger/trou/reveille/surprise.md diff --git a/french/manger/trou/reveille/surprise.md b/french/manger/trou/reveille/surprise.md new file mode 100644 index 0000000000..0fe27afef6 --- /dev/null +++ b/french/manger/trou/reveille/surprise.md @@ -0,0 +1,11 @@ +Et la surprise ! Tout cela n'était pas un rêve. + +En effet, vous vous réveillez bien au milieu d'un plan d'eau, la peau toujours recouverte d'une fine pellicule caramélisée. + +Cependant, à la place du crapeau se tient maintenant une sirène d'eau douce. +Et votre nénuphare est devenu un radeau doublé d'un lit de mousse. +En guise de propulsion une colonie de loutre vous rend service. + +Au loin vous entendez des voix humaines; plus proche de vous la sirène vous sourie tendrement. + +Que faites vous ? \ No newline at end of file diff --git a/french/manger/trou/trou.md b/french/manger/trou/trou.md index e0e8eb92f9..3b4a86b202 100644 --- a/french/manger/trou/trou.md +++ b/french/manger/trou/trou.md @@ -17,3 +17,5 @@ Que faites-vous? [Je m'envole sur une libellule](envol/libellule.md) [Je grimpe sur un haricot géant](grimpe/haricot.md) + +[Je me réveille](reveille/surprise.md) \ No newline at end of file From cabb40e45b781155fa38967ce9991de2770a6ce2 Mon Sep 17 00:00:00 2001 From: Enterthusiast Date: Sat, 25 Jul 2015 15:08:45 +0200 Subject: [PATCH 0326/5486] Update surprise.md --- french/manger/trou/reveille/surprise.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/french/manger/trou/reveille/surprise.md b/french/manger/trou/reveille/surprise.md index 0fe27afef6..b70b519b8e 100644 --- a/french/manger/trou/reveille/surprise.md +++ b/french/manger/trou/reveille/surprise.md @@ -1,6 +1,7 @@ Et la surprise ! Tout cela n'était pas un rêve. -En effet, vous vous réveillez bien au milieu d'un plan d'eau, la peau toujours recouverte d'une fine pellicule caramélisée. +En effet, vous vous réveillez bien au milieu d'un plan d'eau. +Et votre peau est toujours recouverte d'une fine pellicule caramélisée. Cependant, à la place du crapeau se tient maintenant une sirène d'eau douce. Et votre nénuphare est devenu un radeau doublé d'un lit de mousse. @@ -8,4 +9,4 @@ En guise de propulsion une colonie de loutre vous rend service. Au loin vous entendez des voix humaines; plus proche de vous la sirène vous sourie tendrement. -Que faites vous ? \ No newline at end of file +Que faites vous ? From 4d9685c7f67a34f7b875b3b1124bc93816d9808b Mon Sep 17 00:00:00 2001 From: Nicolas Carrasco-Stevenson Date: Sat, 25 Jul 2015 12:41:12 -0300 Subject: [PATCH 0327/5486] =?UTF-8?q?Agrega=20una=20nueva=20p=C3=A1gina=20?= =?UTF-8?q?a=20la=20historia=20del=20cocinero?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/cocinero/error/error.md | 1 + espanol/cocinero/error/salon/salon.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 espanol/cocinero/error/salon/salon.md diff --git a/espanol/cocinero/error/error.md b/espanol/cocinero/error/error.md index 9801ff8bd0..6632b36f92 100644 --- a/espanol/cocinero/error/error.md +++ b/espanol/cocinero/error/error.md @@ -1,2 +1,3 @@ El cocinero dijo que el gato del Consejero accidentalmente había caído en la olla de la sopa, y él solo se había dado cuenta de ello después de haber servido el servicio para el ejercito que llegaba. +[Beatito corrió raudo hacía el salón de banquetes](salon/salon.md) diff --git a/espanol/cocinero/error/salon/salon.md b/espanol/cocinero/error/salon/salon.md new file mode 100644 index 0000000000..bda98c34aa --- /dev/null +++ b/espanol/cocinero/error/salon/salon.md @@ -0,0 +1,2 @@ +Beatito empujó con todas sus fuerzas las enormes puertas del salón de banquetes causando un gran estruendo que provocó +que las miradas te todos los comensales se fijaran en él \ No newline at end of file From 96c39be0f93dcbe18c85bc6ecceac143a14eb017 Mon Sep 17 00:00:00 2001 From: Nicolas Carrasco-Stevenson Date: Sat, 25 Jul 2015 12:49:24 -0300 Subject: [PATCH 0328/5486] Corrige Typo en error.md --- espanol/cocinero/error/error.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/cocinero/error/error.md b/espanol/cocinero/error/error.md index 6632b36f92..e13753eec9 100644 --- a/espanol/cocinero/error/error.md +++ b/espanol/cocinero/error/error.md @@ -1,3 +1,4 @@ El cocinero dijo que el gato del Consejero accidentalmente había caído en la olla de la sopa, y él solo se había dado cuenta de ello después de haber servido el servicio para el ejercito que llegaba. + [Beatito corrió raudo hacía el salón de banquetes](salon/salon.md) From 37f8a3ee01e62bf8fbfe81f013006961642e8d6f Mon Sep 17 00:00:00 2001 From: Eugene Guzik Date: Sat, 25 Jul 2015 19:22:01 +0300 Subject: [PATCH 0329/5486] ukrainian/photo/photo.md modified one more time --- ukrainian/photo/photo.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ukrainian/photo/photo.md b/ukrainian/photo/photo.md index 3890ccb1b2..1325e5ee1b 100644 --- a/ukrainian/photo/photo.md +++ b/ukrainian/photo/photo.md @@ -1 +1,2 @@ -Телефон, замість сфотографувати стіну з зефіру, зробив моє селфі з вилкою в роті та завис. \ No newline at end of file +Телефон, замість сфотографувати стіну з зефіру, зробив моє селфі з вилкою в роті та завис. +Декілька хвилин лагів і вуаля! Телефон почав [викликати лікаря!](../call-a-doctor/doctor.md). \ No newline at end of file From ac7129c7222ca2c107dc29ec1017a7864b97bbf4 Mon Sep 17 00:00:00 2001 From: JasminKreho Date: Sat, 25 Jul 2015 18:32:04 +0200 Subject: [PATCH 0330/5486] Rename Bosnian_story to Bosnian_story.md --- Bosnian/{Bosnian_story => Bosnian_story.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Bosnian/{Bosnian_story => Bosnian_story.md} (100%) diff --git a/Bosnian/Bosnian_story b/Bosnian/Bosnian_story.md similarity index 100% rename from Bosnian/Bosnian_story rename to Bosnian/Bosnian_story.md From 89cf4461cd50312b19e835cc69e65ea86340e90b Mon Sep 17 00:00:00 2001 From: Philippe Bellanger Date: Sat, 25 Jul 2015 12:35:41 -0400 Subject: [PATCH 0331/5486] Complete story at the top of the bean --- french/manger/trou/grimpe/haricot.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/french/manger/trou/grimpe/haricot.md b/french/manger/trou/grimpe/haricot.md index cbf667467b..4096305e2b 100644 --- a/french/manger/trou/grimpe/haricot.md +++ b/french/manger/trou/grimpe/haricot.md @@ -1 +1,3 @@ -Vous arrivez en haut de l'haricot. \ No newline at end of file +Vous arrivez en haut de l'haricot, tout en haut dans les nuages. + +Contrairement au conte du haricot magique, il n'y a ni ogre et ni tresor dans les nuages. From f432c9001afc93bfdac98cc429eea36897ecbdcb Mon Sep 17 00:00:00 2001 From: JasminKreho Date: Sat, 25 Jul 2015 18:37:26 +0200 Subject: [PATCH 0332/5486] Update language.md --- language.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/language.md b/language.md index b3ce2f3598..86a58c9d8f 100644 --- a/language.md +++ b/language.md @@ -103,4 +103,6 @@ Po flisni shqip, [shkoni ketu](albanian/hyrje.md) Ako govorite srpski [klikni ovde](serbian/start.md) -If you speak Urdu [click here](urdu/urdu-news.md) \ No newline at end of file +If you speak Urdu [click here](urdu/urdu-news.md) + +Ako govorite Bosanski jezik [kliknite ovdje](Bosnian/Bosnian_story.md) From e71bf98c6b3148140506eccc2de5baac274659ca Mon Sep 17 00:00:00 2001 From: JasminKreho Date: Sat, 25 Jul 2015 18:39:02 +0200 Subject: [PATCH 0333/5486] Update language.md --- language.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language.md b/language.md index 86a58c9d8f..49f9e93972 100644 --- a/language.md +++ b/language.md @@ -105,4 +105,4 @@ Ako govorite srpski [klikni ovde](serbian/start.md) If you speak Urdu [click here](urdu/urdu-news.md) -Ako govorite Bosanski jezik [kliknite ovdje](Bosnian/Bosnian_story.md) +Ako govorite Bosanski jezik/If You speak Bosnian language [kliknite ovdje/click here](Bosnian/Bosnian_story.md) From 985962a51b2f23c2d771e90cf80bd9cadba8ad1d Mon Sep 17 00:00:00 2001 From: Eugene Guzik Date: Sat, 25 Jul 2015 19:49:11 +0300 Subject: [PATCH 0334/5486] ukrainian photo.md modified one more time --- ukrainian/photo/photo.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ukrainian/photo/photo.md b/ukrainian/photo/photo.md index 1325e5ee1b..27cc45c7a5 100644 --- a/ukrainian/photo/photo.md +++ b/ukrainian/photo/photo.md @@ -1,2 +1,2 @@ -Телефон, замість сфотографувати стіну з зефіру, зробив моє селфі з вилкою в роті та завис. -Декілька хвилин лагів і вуаля! Телефон почав [викликати лікаря!](../call-a-doctor/doctor.md). \ No newline at end of file +Декілька хвилин лагів і [вуаля!](../marshmallow.md). +Телефон, замість сфотографувати стіну з зефіру, зробив моє селфі з вилкою в роті та завис. \ No newline at end of file From 6e104d1ddffb00049899aa7cedba97751652550e Mon Sep 17 00:00:00 2001 From: DinaDaftedar Date: Sat, 25 Jul 2015 20:15:02 +0300 Subject: [PATCH 0335/5486] Added a new entry for dream link --- arabic/salamoAlikom.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index d66f43a747..6f3fde1a24 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -7,3 +7,5 @@ [انام](sleep/sleep.md) [اريد ان اتعلم المزيد](learn/learn.md) + +[اريد ان احلم](dream/dream.md) From e46e3dddd9d9fd2fd4c23cfd7f7e623c16dbf36f Mon Sep 17 00:00:00 2001 From: DinaDaftedar Date: Sat, 25 Jul 2015 20:19:09 +0300 Subject: [PATCH 0336/5486] Added a dream --- arabic/dream/dream.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 arabic/dream/dream.md diff --git a/arabic/dream/dream.md b/arabic/dream/dream.md new file mode 100644 index 0000000000..778d52819b --- /dev/null +++ b/arabic/dream/dream.md @@ -0,0 +1 @@ +احلم......الاحلام تتحقق اذا صدقة الني \ No newline at end of file From 8437e3b16e902ca25eca428b7fd1e36d00ce1ef4 Mon Sep 17 00:00:00 2001 From: DinaDaftedar Date: Sat, 25 Jul 2015 20:22:59 +0300 Subject: [PATCH 0337/5486] Fixed a typo --- arabic/dream/dream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arabic/dream/dream.md b/arabic/dream/dream.md index 778d52819b..77ddd2fca5 100644 --- a/arabic/dream/dream.md +++ b/arabic/dream/dream.md @@ -1 +1 @@ -احلم......الاحلام تتحقق اذا صدقة الني \ No newline at end of file +احلم......الاحلام تتحقق اذا صدقة النية \ No newline at end of file From 0c6a9150faeb0d0e7e7f96188efde4641aeaf8eb Mon Sep 17 00:00:00 2001 From: DinaDaftedar Date: Sat, 25 Jul 2015 21:01:05 +0300 Subject: [PATCH 0338/5486] Added a new question to mystory --- arabic/dream/dream.md | 1 + 1 file changed, 1 insertion(+) diff --git a/arabic/dream/dream.md b/arabic/dream/dream.md index 77ddd2fca5..ed1520f3fe 100644 --- a/arabic/dream/dream.md +++ b/arabic/dream/dream.md @@ -1 +1,2 @@ +هل تريد ان تحلم؟ احلم......الاحلام تتحقق اذا صدقة النية \ No newline at end of file From c6089d5e2755a3d3cf55dac97d74fd556f657ec0 Mon Sep 17 00:00:00 2001 From: Kelenth Date: Sat, 25 Jul 2015 17:57:02 -0600 Subject: [PATCH 0339/5486] Create crappy-wand-spell.md --- .../Utilize-your-wand-once-again/crappy-wand-spell.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 english/Utilize-your-wand-once-again/crappy-wand-spell.md diff --git a/english/Utilize-your-wand-once-again/crappy-wand-spell.md b/english/Utilize-your-wand-once-again/crappy-wand-spell.md new file mode 100644 index 0000000000..e10f080682 --- /dev/null +++ b/english/Utilize-your-wand-once-again/crappy-wand-spell.md @@ -0,0 +1,11 @@ +Letting out a light sigh, you once grip your makeshift wand firmly and concentrate. +Gathering your focus, you point your rope and fork wand to the door and firmly encant "Alohomora!" + + The door begins to acquire a dim yellow-green glow emanating from the lock mechanism. + Rattling sounds out from the door's keyhole as the door begins to shudder, wood + splintering and shuddering as a resounding grinding of metal and wood fill the air. + + The door jars opens with a creak + as the locking mechanism breaks. + +[The door is open! Is there something else I forgot?](../../marshmallow.md) From a86a4e70c434c87dc13a2e791fb5ac533cfc4f02 Mon Sep 17 00:00:00 2001 From: NoSinging Date: Sun, 26 Jul 2015 15:16:55 +1000 Subject: [PATCH 0340/5486] Add further advise about choosing a pill --- english/choose-pill/choose-pill.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/choose-pill/choose-pill.md b/english/choose-pill/choose-pill.md index b91f5d48ea..7bc1a4f99a 100644 --- a/english/choose-pill/choose-pill.md +++ b/english/choose-pill/choose-pill.md @@ -2,4 +2,8 @@ Do you want to learn the truth about this marshmellow world? [Choose the red pill](https://www.youtube.com/watch?v=qHkXFsK6UUg) Just get me out of this marshmellow! -[Choose the blue pill](https://www.youtube.com/watch?v=Rjn3AzOk0Bo) \ No newline at end of file +[Choose the blue pill](https://www.youtube.com/watch?v=Rjn3AzOk0Bo) + +This is your last chance. After this, there is no turning back. +You take the blue pill—the story ends, you wake up in your bed and believe whatever you want to believe. +You take the red pill—you stay in Wonderland, and I show you how deep the rabbit hole goes. \ No newline at end of file From cef95198ec93286b33a06fb5c3c69ef7b59ca30c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Mu=C3=B1oz?= Date: Sun, 26 Jul 2015 00:22:09 -0500 Subject: [PATCH 0341/5486] agregar el consejero suelta a los leones --- espanol/noticias/burla-periodista/burla-periodista.md | 4 +++- espanol/noticias/burla-periodista/leones/leones.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 espanol/noticias/burla-periodista/leones/leones.md diff --git a/espanol/noticias/burla-periodista/burla-periodista.md b/espanol/noticias/burla-periodista/burla-periodista.md index 5d3abce82a..3187d7c229 100644 --- a/espanol/noticias/burla-periodista/burla-periodista.md +++ b/espanol/noticias/burla-periodista/burla-periodista.md @@ -1 +1,3 @@ -El periodista se puso rojo, y se lanzo violentamente contra Beatito. \ No newline at end of file +El periodista se puso rojo, y se lanzo violentamente contra Beatito. + +[Inmediatamente el consejero suelta los leones](leones/leones.md) \ No newline at end of file diff --git a/espanol/noticias/burla-periodista/leones/leones.md b/espanol/noticias/burla-periodista/leones/leones.md new file mode 100644 index 0000000000..5a5428c465 --- /dev/null +++ b/espanol/noticias/burla-periodista/leones/leones.md @@ -0,0 +1 @@ +El periodista queda rodeado por 4 expectaculares fieras que podrían destrozrlo tan solo al escuchar a Beatito chasquir sus dedos. \ No newline at end of file From c5b29b99f4ebed8eddcd7f0fb2e692eb062c84ec Mon Sep 17 00:00:00 2001 From: Kelenth Date: Sat, 25 Jul 2015 23:38:24 -0600 Subject: [PATCH 0342/5486] Create fork-rope-wand.md Create new option of continuation to the story --- english/utilize-wand/fork-rope-wand.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 english/utilize-wand/fork-rope-wand.md diff --git a/english/utilize-wand/fork-rope-wand.md b/english/utilize-wand/fork-rope-wand.md new file mode 100644 index 0000000000..7c486218a0 --- /dev/null +++ b/english/utilize-wand/fork-rope-wand.md @@ -0,0 +1,9 @@ +Letting out a light sigh, you once grip your makeshift wand firmly and concentrate. Gathering your focus, you point your rope and fork wand to the door and firmly encant "Alohomora!" + + The door begins to acquire a dim yellow-green glow emanating from the lock mechanism. + Rattling sounds out from the door's keyhole as the door begins to shudder, wood + splintering and shuddering as a resounding grinding of metal and wood fill the air. + + The door jars opens with a creak + as the locking mechanism breaks. +The door is open! Is there something else I forgot? From fd70f815ebe697724f81c032436c2906d8db2d9c Mon Sep 17 00:00:00 2001 From: Kelenth Date: Sat, 25 Jul 2015 23:40:00 -0600 Subject: [PATCH 0343/5486] Update marshmallow.md Add link to new fork-rope-wand.md story path. --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 7097ab8f73..c704884d22 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -391,3 +391,5 @@ Do you: [Wake up!](wake-up/wake-up.md) [Thank Mr. Skeltal](2spooky/2spooky.md) + +[Utilize your wand once again...](utilize-wand/fork-rope-wand.md) From 561cc5f8b26b3bf6a0f8e5ea8bbb80a2476778b5 Mon Sep 17 00:00:00 2001 From: Kelenth Date: Sat, 25 Jul 2015 23:44:19 -0600 Subject: [PATCH 0344/5486] Update fork-rope-wand.md Fix grammatical errors and story flow --- english/utilize-wand/fork-rope-wand.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/english/utilize-wand/fork-rope-wand.md b/english/utilize-wand/fork-rope-wand.md index 7c486218a0..007186bd05 100644 --- a/english/utilize-wand/fork-rope-wand.md +++ b/english/utilize-wand/fork-rope-wand.md @@ -1,9 +1,8 @@ -Letting out a light sigh, you once grip your makeshift wand firmly and concentrate. Gathering your focus, you point your rope and fork wand to the door and firmly encant "Alohomora!" +Letting out a light sigh, you grip your makeshift wand firmly and concentrate. Gathering your focus, you point your rope and fork wand to the door and firmly encant "Alohomora!" The door begins to acquire a dim yellow-green glow emanating from the lock mechanism. - Rattling sounds out from the door's keyhole as the door begins to shudder, wood - splintering and shuddering as a resounding grinding of metal and wood fill the air. + Rattling sounds out from the door's keyhole as the door begins to rumble within, wood + splintering as the sounds of grinding metal and wood fill the room. - The door jars opens with a creak - as the locking mechanism breaks. -The door is open! Is there something else I forgot? + The door jars opens with a creak + as the locking mechanism breaks. From ffebb41faab107aa73c14185ba41daa7561acb6d Mon Sep 17 00:00:00 2001 From: Kelenth Date: Sat, 25 Jul 2015 23:45:50 -0600 Subject: [PATCH 0345/5486] Update fork-rope-wand.md Fixed readability --- english/utilize-wand/fork-rope-wand.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/english/utilize-wand/fork-rope-wand.md b/english/utilize-wand/fork-rope-wand.md index 007186bd05..7652248627 100644 --- a/english/utilize-wand/fork-rope-wand.md +++ b/english/utilize-wand/fork-rope-wand.md @@ -4,5 +4,4 @@ Letting out a light sigh, you grip your makeshift wand firmly and concentrate. G Rattling sounds out from the door's keyhole as the door begins to rumble within, wood splintering as the sounds of grinding metal and wood fill the room. - The door jars opens with a creak - as the locking mechanism breaks. + The door jars opens with a creak as the locking mechanism breaks. From bee3fb3488f3e32bc7d18fd02a29409000151694 Mon Sep 17 00:00:00 2001 From: Kelenth Date: Sun, 26 Jul 2015 00:19:43 -0600 Subject: [PATCH 0346/5486] Update fork-rope-wand.md Length alteration --- english/utilize-wand/fork-rope-wand.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/utilize-wand/fork-rope-wand.md b/english/utilize-wand/fork-rope-wand.md index 7652248627..077ca08fef 100644 --- a/english/utilize-wand/fork-rope-wand.md +++ b/english/utilize-wand/fork-rope-wand.md @@ -1,4 +1,5 @@ -Letting out a light sigh, you grip your makeshift wand firmly and concentrate. Gathering your focus, you point your rope and fork wand to the door and firmly encant "Alohomora!" +Letting out a light sigh, you grip your makeshift wand firmly and concentrate. Gathering your focus, you point your rope and +fork wand to the door and firmly encant "Alohomora!" The door begins to acquire a dim yellow-green glow emanating from the lock mechanism. Rattling sounds out from the door's keyhole as the door begins to rumble within, wood From e5b3fe2a97590affc9e0d3451fd73bcfa7c3b117 Mon Sep 17 00:00:00 2001 From: Kelenth Date: Sun, 26 Jul 2015 00:20:46 -0600 Subject: [PATCH 0347/5486] Delete crappy-wand-spell.md --- .../Utilize-your-wand-once-again/crappy-wand-spell.md | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 english/Utilize-your-wand-once-again/crappy-wand-spell.md diff --git a/english/Utilize-your-wand-once-again/crappy-wand-spell.md b/english/Utilize-your-wand-once-again/crappy-wand-spell.md deleted file mode 100644 index e10f080682..0000000000 --- a/english/Utilize-your-wand-once-again/crappy-wand-spell.md +++ /dev/null @@ -1,11 +0,0 @@ -Letting out a light sigh, you once grip your makeshift wand firmly and concentrate. -Gathering your focus, you point your rope and fork wand to the door and firmly encant "Alohomora!" - - The door begins to acquire a dim yellow-green glow emanating from the lock mechanism. - Rattling sounds out from the door's keyhole as the door begins to shudder, wood - splintering and shuddering as a resounding grinding of metal and wood fill the air. - - The door jars opens with a creak - as the locking mechanism breaks. - -[The door is open! Is there something else I forgot?](../../marshmallow.md) From 9c479cc27644a8f878dd8465440f87fec0ceb1c0 Mon Sep 17 00:00:00 2001 From: Kelenth Date: Sun, 26 Jul 2015 00:24:07 -0600 Subject: [PATCH 0348/5486] Update fork-rope-wand.md Length edit --- english/utilize-wand/fork-rope-wand.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/utilize-wand/fork-rope-wand.md b/english/utilize-wand/fork-rope-wand.md index 077ca08fef..fd7134f098 100644 --- a/english/utilize-wand/fork-rope-wand.md +++ b/english/utilize-wand/fork-rope-wand.md @@ -1,5 +1,5 @@ -Letting out a light sigh, you grip your makeshift wand firmly and concentrate. Gathering your focus, you point your rope and -fork wand to the door and firmly encant "Alohomora!" +Letting out a light sigh, you grip your makeshift wand firmly and concentrate. Gathering your focus, +you point your rope and fork wand to the door and firmly encant "Alohomora!" The door begins to acquire a dim yellow-green glow emanating from the lock mechanism. Rattling sounds out from the door's keyhole as the door begins to rumble within, wood From 7fb8d447dd0c749cda850065b8db1c94e4da62cb Mon Sep 17 00:00:00 2001 From: Lingaworld Date: Sun, 26 Jul 2015 16:42:37 +0530 Subject: [PATCH 0349/5486] Fix typo --- english/forest/shelter/shelter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/forest/shelter/shelter.md b/english/forest/shelter/shelter.md index 0866d50de7..f689dab3d4 100644 --- a/english/forest/shelter/shelter.md +++ b/english/forest/shelter/shelter.md @@ -1,4 +1,4 @@ You break down some branches and make a frame. You put your parachute over -the top of it, tying it down securly with palm leaves. Luckily you did it +the top of it, tying it down securely with palm leaves. Luckily you did it because as you make yourself comfortable for the night the heaven's open. There's a terrible storm brewing... \ No newline at end of file From aae790cafb8b8f32be07ec154a59745960b5dddb Mon Sep 17 00:00:00 2001 From: dzufelt Date: Sun, 26 Jul 2015 14:37:43 -0400 Subject: [PATCH 0350/5486] Add 'silent' to scream for coffee --- english/coffee/coffee.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/coffee/coffee.md b/english/coffee/coffee.md index 9d3267a38c..7bdac5eb15 100644 --- a/english/coffee/coffee.md +++ b/english/coffee/coffee.md @@ -1,5 +1,5 @@ Do not mistake my yawn. -It is a scream for coffee. +It is a silent scream for coffee. though you might wanna see wonderful dream From fed39bfed7d355ab51ffabe4673ab96c440813e4 Mon Sep 17 00:00:00 2001 From: Tim Ring Date: Sun, 26 Jul 2015 17:14:38 -0500 Subject: [PATCH 0351/5486] Let the alien escape --- english/eating-walls/find-a-toilet/door/alien/use-torch.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/eating-walls/find-a-toilet/door/alien/use-torch.md b/english/eating-walls/find-a-toilet/door/alien/use-torch.md index 34cbbd6a53..03d8f5504b 100644 --- a/english/eating-walls/find-a-toilet/door/alien/use-torch.md +++ b/english/eating-walls/find-a-toilet/door/alien/use-torch.md @@ -2,4 +2,6 @@ You realise the hand on your shoulder is covered in slime and attached to an ali The three giant pupils staring at you shrivel into pinholes as the alien backs away. +The alien raises his arm, speaks into a device on his wrist, and disappears in a swirl of light. + "Really? A torch!? Who carries a torch around nowadays? What is this, 1992?" \ No newline at end of file From 496b75fa0883432e9effb190e45cef850b18437e Mon Sep 17 00:00:00 2001 From: dm4000 Date: Mon, 27 Jul 2015 13:01:19 +1000 Subject: [PATCH 0352/5486] Add my sentence about chocolate Tim Tams --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index c704884d22..fd1420f36f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -34,6 +34,8 @@ This is because you do not like leather for ethical reasons. You begin to breakout of the jacket and find a lighter, a fork, and rope. +You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. + You are not sure who placed these objects near you or why. But you have a growing sense that these mundane objects are vital to your survival. From a44319427913578bb52ad49fe0e8adf24e223d5a Mon Sep 17 00:00:00 2001 From: dm4000 Date: Mon, 27 Jul 2015 13:48:39 +1000 Subject: [PATCH 0353/5486] Add fill sock story with endless looping link. --- english/fill-sock/fill-sock.md | 3 +++ english/marshmallow.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 english/fill-sock/fill-sock.md diff --git a/english/fill-sock/fill-sock.md b/english/fill-sock/fill-sock.md new file mode 100644 index 0000000000..1fcc2c71ec --- /dev/null +++ b/english/fill-sock/fill-sock.md @@ -0,0 +1,3 @@ +You quickly realise that marshmallows melt faster inside pink socks. + +This makes you decide to fill the sock with [more marshmallows](fill-sock.md). \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index fd1420f36f..013d5ee755 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -36,6 +36,8 @@ You begin to breakout of the jacket and find a lighter, a fork, and rope. You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. +Do you want to [try to fill the remaining space in the sock with marshmallows](./fill-sock/fill-sock.md)? + You are not sure who placed these objects near you or why. But you have a growing sense that these mundane objects are vital to your survival. From ea7770ca424b410a13131881b066c8ec28c3a61c Mon Sep 17 00:00:00 2001 From: alinr Date: Mon, 27 Jul 2015 09:01:49 +0200 Subject: [PATCH 0354/5486] Add new question to german story. --- german/Stopfen/entspannen/entspannen.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/german/Stopfen/entspannen/entspannen.md b/german/Stopfen/entspannen/entspannen.md index 3f0a233308..b95fc01ffb 100644 --- a/german/Stopfen/entspannen/entspannen.md +++ b/german/Stopfen/entspannen/entspannen.md @@ -17,3 +17,5 @@ Wo ist Ihr Kollege geblieben? Warum sind Sie allein auf dem Boot? Haben Sie schon etwas gefangen? + +Woher stammt die Brille in Ihrem Boot? From b3f8684c9140ed508f6925f00fe74b14f69f34b1 Mon Sep 17 00:00:00 2001 From: yugen sunuwar Date: Mon, 27 Jul 2015 14:02:36 +0100 Subject: [PATCH 0355/5486] =?UTF-8?q?=E0=A4=9A=E0=A4=BF=E0=A4=A4=E0=A4=B5?= =?UTF-8?q?=E0=A4=A8=20=E0=A4=B0=E0=A4=BE=E0=A4=B7=E0=A5=8D=E0=A4=9F?= =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AF=20=E0=A4=A8=E0=A4=BF?= =?UTF-8?q?=E0=A4=95=E0=A5=81=E0=A4=A8=E0=A5=8D=E0=A4=9C=20=E0=A4=95?= =?UTF-8?q?=E0=A5=8B=20=E0=A4=B2=E0=A4=BF=E0=A4=A8=E0=A5=8D=E0=A4=95=20add?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nepali/about_nepal.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nepali/about_nepal.md b/nepali/about_nepal.md index 44e53b162c..3cd90de62a 100644 --- a/nepali/about_nepal.md +++ b/nepali/about_nepal.md @@ -2,4 +2,8 @@ र पुरातातिवक समपदाहरूको बखान अनतराषिटय समुदायमा पिन ठुलो छ । -थप जानकारीको लािग [यहाँ िथचनुहोस् ।] (http://en.wikipedia.org/wiki/Nepal) \ No newline at end of file +थप जानकारीको लािग [यहाँ िथचनुहोस् ।] (http://en.wikipedia.org/wiki/Nepal) + +एक सिङे गैंडा आरक्षणमा उल्लेख्निय योग्दन दिने +चितवन राष्ट्रिय निकुन्जको बारे जान्न +[यहाँ िथचनुहोस् ।] (http://www.chitwannationalpark.gov.np) From 258b48cbab9235bb5d91a004ac0c1de2bb6016e9 Mon Sep 17 00:00:00 2001 From: yugen sunuwar Date: Mon, 27 Jul 2015 15:21:03 +0100 Subject: [PATCH 0356/5486] fixed typo --- nepali/about_nepal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nepali/about_nepal.md b/nepali/about_nepal.md index 7dffd4e917..5be7bda80d 100644 --- a/nepali/about_nepal.md +++ b/nepali/about_nepal.md @@ -2,7 +2,7 @@ र पुरातातिवक समपदाहरूको बखान अनतराषिटय समुदायमा पिन ठुलो छ । -थप जानकारीको लािग [यहाँ िथचनुहोस् ।] (http://en.wikipedia.org/wiki/Nepal) +थप जानकारीको लािग [यहाँ िथचनुहोस् ।](http://en.wikipedia.org/wiki/Nepal) एक सिङे गैंडा आरक्षणमा उल्लेख्निय योग्दन दिने चितवन राष्ट्रिय निकुन्जको बारे जान्न From 070512614ea575f6e9a518695bd1cf6831c5783e Mon Sep 17 00:00:00 2001 From: / Date: Mon, 27 Jul 2015 14:35:18 -0400 Subject: [PATCH 0357/5486] Add insist option to enter-mirror; add insist.md. --- english/mirror/enter-mirror.md | 6 ++++-- english/mirror/insist/insist.md | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 english/mirror/insist/insist.md diff --git a/english/mirror/enter-mirror.md b/english/mirror/enter-mirror.md index 6b5e7d53c5..d7cd30ff87 100644 --- a/english/mirror/enter-mirror.md +++ b/english/mirror/enter-mirror.md @@ -1,5 +1,7 @@ -It's not a mirror, it's a door to a marshmellow room that looks identical to the previous one! +It's not a mirror, it's a door to a marshmellow room that looks identical to the previous one + +[Insist that it is a mirror](/insist/insist.md) [Go back to the previous room](../marshmallow.md) -[Look for a toilet](../eating-walls/find-a-toilet/find-a-toilet.md) \ No newline at end of file +[Look for a toilet](../eating-walls/find-a-toilet/find-a-toilet.md) diff --git a/english/mirror/insist/insist.md b/english/mirror/insist/insist.md new file mode 100644 index 0000000000..fbbc3574e0 --- /dev/null +++ b/english/mirror/insist/insist.md @@ -0,0 +1,9 @@ +You insist that what seems to be a mirror must indeed be a mirror. Upon +insistence, the mirror perpetuates. Suddenly, all around you seems at once to be +comprised of mirrors. + +You hear a faint and eerie voice: "Welcome to the labyrinth". + +You feel an infinite vertigo and are slowly engulfed by a soft blindness that +slowly washes into an encompassing puffy whiteness. You find yourself +, again, in the [marshmellow](../../marshmellow.md) From 62f760bffcdb9cc29969ff8cc81d0e0ccfe9df60 Mon Sep 17 00:00:00 2001 From: / Date: Mon, 27 Jul 2015 14:42:11 -0400 Subject: [PATCH 0358/5486] Fix bug in insist link, try 1 --- english/mirror/enter-mirror.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/mirror/enter-mirror.md b/english/mirror/enter-mirror.md index d7cd30ff87..a55cb78426 100644 --- a/english/mirror/enter-mirror.md +++ b/english/mirror/enter-mirror.md @@ -1,6 +1,6 @@ It's not a mirror, it's a door to a marshmellow room that looks identical to the previous one -[Insist that it is a mirror](/insist/insist.md) +[Insist that it is a mirror](../mirror/insist/insist.md) [Go back to the previous room](../marshmallow.md) From 1dee5be3aebd3fd447d631c8058881f971348956 Mon Sep 17 00:00:00 2001 From: / Date: Mon, 27 Jul 2015 14:43:52 -0400 Subject: [PATCH 0359/5486] Fix link spelling for 'marshmallow' --- english/mirror/insist/insist.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/mirror/insist/insist.md b/english/mirror/insist/insist.md index fbbc3574e0..09f4b5063c 100644 --- a/english/mirror/insist/insist.md +++ b/english/mirror/insist/insist.md @@ -6,4 +6,4 @@ You hear a faint and eerie voice: "Welcome to the labyrinth". You feel an infinite vertigo and are slowly engulfed by a soft blindness that slowly washes into an encompassing puffy whiteness. You find yourself -, again, in the [marshmellow](../../marshmellow.md) +, again, in the [marshmellow](../../marshmallow.md) From 42488b279b6c75e9ca9b453b37a82bb16b725570 Mon Sep 17 00:00:00 2001 From: / Date: Mon, 27 Jul 2015 14:45:10 -0400 Subject: [PATCH 0360/5486] Fix text spelling of marshmallow -_- --- english/mirror/insist/insist.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/mirror/insist/insist.md b/english/mirror/insist/insist.md index 09f4b5063c..26534a399d 100644 --- a/english/mirror/insist/insist.md +++ b/english/mirror/insist/insist.md @@ -6,4 +6,4 @@ You hear a faint and eerie voice: "Welcome to the labyrinth". You feel an infinite vertigo and are slowly engulfed by a soft blindness that slowly washes into an encompassing puffy whiteness. You find yourself -, again, in the [marshmellow](../../marshmallow.md) +, again, in the [marshmallow](../../marshmallow.md) From c65fe290c4a3c88242262532f9c05bb7f4d0efdb Mon Sep 17 00:00:00 2001 From: / Date: Mon, 27 Jul 2015 14:48:35 -0400 Subject: [PATCH 0361/5486] Restore accidentally deleted '!' --- english/mirror/enter-mirror.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/mirror/enter-mirror.md b/english/mirror/enter-mirror.md index a55cb78426..5338280b59 100644 --- a/english/mirror/enter-mirror.md +++ b/english/mirror/enter-mirror.md @@ -1,4 +1,4 @@ -It's not a mirror, it's a door to a marshmellow room that looks identical to the previous one +It's not a mirror, it's a door to a marshmellow room that looks identical to the previous one! [Insist that it is a mirror](../mirror/insist/insist.md) From ef48683283081e368f588046181e77f63f125950 Mon Sep 17 00:00:00 2001 From: longShot-88 Date: Mon, 27 Jul 2015 19:11:25 -0500 Subject: [PATCH 0362/5486] break it up into multiple lines --- espanol/noticias/burla-periodista/leones/leones.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/noticias/burla-periodista/leones/leones.md b/espanol/noticias/burla-periodista/leones/leones.md index 5a5428c465..e0bbe9ba29 100644 --- a/espanol/noticias/burla-periodista/leones/leones.md +++ b/espanol/noticias/burla-periodista/leones/leones.md @@ -1 +1,3 @@ -El periodista queda rodeado por 4 expectaculares fieras que podrían destrozrlo tan solo al escuchar a Beatito chasquir sus dedos. \ No newline at end of file +El periodista queda rodeado por 4 expectaculares fieras +que podrían destrozrlo tan solo al escuchar a Beatito +chasquir sus dedos. From 99bf5620170d1003de783a98f16940a55afd9c34 Mon Sep 17 00:00:00 2001 From: miked Date: Tue, 28 Jul 2015 21:43:37 +0200 Subject: [PATCH 0363/5486] added zagwizdaj jeszcze raz --- .../kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md | 1 + Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md new file mode 100644 index 0000000000..350cd4cbe9 --- /dev/null +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md @@ -0,0 +1 @@ +Nagle pojawia się postać ze skrzydłami. Gwałtownym ruchem chwyta Cię za rękę i momentalnie przenosicie się na ogrąmną łąkę na której jest tylko jedno, samotne drzewo. \ No newline at end of file diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md index c8dad821b0..43d5bfae1f 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md @@ -1 +1,3 @@ Obracasz rożowy, plastikowy gwizdek. Jest gładki, bardzo dobrze wykonany, nie widzisz jednak w nim nic szczegolnego. + +[Postanawiasz zagwizdać jeszcze raz](zagwizdaj/zagwizdaj.md) From 3b4741bec5d539aa298c7f405bcd370efe7ed894 Mon Sep 17 00:00:00 2001 From: miked Date: Tue, 28 Jul 2015 21:45:11 +0200 Subject: [PATCH 0364/5486] added gwizdek do kieszeni --- .../gwizdek/zbadajgwizdek/gwizdekdokieszeni/gwizdekdokieszeni.md | 1 + Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/gwizdekdokieszeni/gwizdekdokieszeni.md diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/gwizdekdokieszeni/gwizdekdokieszeni.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/gwizdekdokieszeni/gwizdekdokieszeni.md new file mode 100644 index 0000000000..cd5ee23b97 --- /dev/null +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/gwizdekdokieszeni/gwizdekdokieszeni.md @@ -0,0 +1 @@ +Wrzucasz gwizdek do kieszeni i po chwili szłyszysz jakby trzasnął o beton. \ No newline at end of file diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md index 43d5bfae1f..213215880a 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md @@ -1,3 +1,4 @@ Obracasz rożowy, plastikowy gwizdek. Jest gładki, bardzo dobrze wykonany, nie widzisz jednak w nim nic szczegolnego. [Postanawiasz zagwizdać jeszcze raz](zagwizdaj/zagwizdaj.md) +[Chowasz gwizdek spowrotem do kieszeni](gwizdekdokieszeni/gwizdekdokieszeni.md) \ No newline at end of file From 98a386aa3a6230bc3dfb5991bfb86ac0be9ca90d Mon Sep 17 00:00:00 2001 From: whatsupmike Date: Tue, 28 Jul 2015 21:46:34 +0200 Subject: [PATCH 0365/5486] Update zbadajgwizdek.md --- Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md index 213215880a..2082472576 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md @@ -1,4 +1,5 @@ Obracasz rożowy, plastikowy gwizdek. Jest gładki, bardzo dobrze wykonany, nie widzisz jednak w nim nic szczegolnego. [Postanawiasz zagwizdać jeszcze raz](zagwizdaj/zagwizdaj.md) -[Chowasz gwizdek spowrotem do kieszeni](gwizdekdokieszeni/gwizdekdokieszeni.md) \ No newline at end of file + +[Chowasz gwizdek spowrotem do kieszeni](gwizdekdokieszeni/gwizdekdokieszeni.md) From 66cc806cf475c36ace600752184e691860e78350 Mon Sep 17 00:00:00 2001 From: whatsupmike Date: Tue, 28 Jul 2015 22:14:56 +0200 Subject: [PATCH 0366/5486] Update zbadajgwizdek.md --- Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md index 2082472576..903fe672fe 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zbadajgwizdek.md @@ -2,4 +2,4 @@ Obracasz rożowy, plastikowy gwizdek. Jest gładki, bardzo dobrze wykonany, nie [Postanawiasz zagwizdać jeszcze raz](zagwizdaj/zagwizdaj.md) -[Chowasz gwizdek spowrotem do kieszeni](gwizdekdokieszeni/gwizdekdokieszeni.md) +[Chowasz gwizdek z powrotem do kieszeni](gwizdekdokieszeni/gwizdekdokieszeni.md) From a1119a8b6781a64cd0a6efc7fe05dc3ed57828ce Mon Sep 17 00:00:00 2001 From: Pedro Roig Date: Tue, 28 Jul 2015 23:58:16 +0200 Subject: [PATCH 0367/5486] Add change to the story; rocas (in spanish) --- espanol/muralla/abrir/abrirsoldados/cerrad/cerrad.md | 4 +++- espanol/muralla/abrir/abrirsoldados/cerrad/rocas/rocas.md | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 espanol/muralla/abrir/abrirsoldados/cerrad/rocas/rocas.md diff --git a/espanol/muralla/abrir/abrirsoldados/cerrad/cerrad.md b/espanol/muralla/abrir/abrirsoldados/cerrad/cerrad.md index 34e38174a1..655d0c070b 100644 --- a/espanol/muralla/abrir/abrirsoldados/cerrad/cerrad.md +++ b/espanol/muralla/abrir/abrirsoldados/cerrad/cerrad.md @@ -2,4 +2,6 @@ ¡Rápido! ¿Qué hacemos ahora? ¡Tenemos que organizar la defensa! -[Colocar arqueros en la muralla](arqueros/arqueros.md) \ No newline at end of file +[Colocar arqueros en la muralla](arqueros/arqueros.md) + +[Atrancar la puerta principal con rocas y otros objetos pesados](rocas/rocas.md) diff --git a/espanol/muralla/abrir/abrirsoldados/cerrad/rocas/rocas.md b/espanol/muralla/abrir/abrirsoldados/cerrad/rocas/rocas.md new file mode 100644 index 0000000000..66231f48be --- /dev/null +++ b/espanol/muralla/abrir/abrirsoldados/cerrad/rocas/rocas.md @@ -0,0 +1,7 @@ +Los soldados enemigos eran demasiados! + +Tomaron la decisin de bloquear la puerta con rocas, troncos y todos los objetos pesados que tenan a mano. + +Al menos por el momento el ejrcito enemigo no poda entrar derribando la puerta con un ariete. + +Ahora tenan tiempo para apostar arqueros en los muros y organizar la defensa. From d6216c8a44c059bc90510fb5ab150bc72d40d5b2 Mon Sep 17 00:00:00 2001 From: Choi Date: Tue, 28 Jul 2015 20:01:17 -0400 Subject: [PATCH 0368/5486] Add english story about trapezoid --- english/marshmallow.md | 2 ++ english/trapezoid/trapezoid.md | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 english/trapezoid/trapezoid.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 013d5ee755..ef76506985 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -397,3 +397,5 @@ Do you: [Thank Mr. Skeltal](2spooky/2spooky.md) [Utilize your wand once again...](utilize-wand/fork-rope-wand.md) + +[Draw a trapezoid](trapezoid/trapezoid.md) \ No newline at end of file diff --git a/english/trapezoid/trapezoid.md b/english/trapezoid/trapezoid.md new file mode 100644 index 0000000000..fa76e6518c --- /dev/null +++ b/english/trapezoid/trapezoid.md @@ -0,0 +1,13 @@ +There is a blackboard and a chalk + +You draw a perfect trapezoid on the blackboard + +The finished trapezoid starts to glow and a hole appears + +Mystified, you enter the trapezoid + +Do you: + +[Lunge for the lighter](lunge-for-the-lighter/lunge-for-the-lighter.md) + +[Wake up!](wake-up/wake-up.md) From 62691da681e751e15bc712c616a6e476397436c7 Mon Sep 17 00:00:00 2001 From: Eugene Date: Tue, 28 Jul 2015 22:44:32 -0400 Subject: [PATCH 0369/5486] Add bizarre anthropological musings to mushroom situation --- english/mushroom/eat/eat_mushroom.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/mushroom/eat/eat_mushroom.md b/english/mushroom/eat/eat_mushroom.md index 9b8ef5bc38..2f1f66a070 100644 --- a/english/mushroom/eat/eat_mushroom.md +++ b/english/mushroom/eat/eat_mushroom.md @@ -1,5 +1,11 @@ The mushroom makes great soup. You brought them back. +You think about how, among the Koryak, a Chukotko-Kamchatkan people of +far eastern Siberia, it is said the poor would drink the urine of the +rich after they had ingested fly agaric. + +Anyways ... + Do you: [Light a fire?](../../light-fire/fire.md) From 328c9808dcab7ade1d8a7666f3a6f66e53d76d6d Mon Sep 17 00:00:00 2001 From: jordanfleuriet Date: Tue, 28 Jul 2015 22:14:05 -0600 Subject: [PATCH 0370/5486] added a dog option --- english/play-with-dog/dog.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/play-with-dog/dog.md b/english/play-with-dog/dog.md index 45aaa03860..8ef08cefeb 100644 --- a/english/play-with-dog/dog.md +++ b/english/play-with-dog/dog.md @@ -9,4 +9,6 @@ She lies on her belly. You [take a selfie](../selfie/selfie.md). You have actually followed the dog embodiment of Medusa, -and you made eye contact. [You can no longer move.](../virtualreality/oculus.md). \ No newline at end of file +and you made eye contact. [You can no longer move.](../virtualreality/oculus.md). + +You notice she is chewing on a pink sock and [check it out.](../fill-sock/fill-sock.md) \ No newline at end of file From 084037c9c3d212ce9dfe90791178352e5cf5848b Mon Sep 17 00:00:00 2001 From: jordanfleuriet Date: Tue, 28 Jul 2015 22:23:12 -0600 Subject: [PATCH 0371/5486] dropped some nba knowledge --- english/warriors-game/watch-warriors.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/english/warriors-game/watch-warriors.md b/english/warriors-game/watch-warriors.md index 81506eb5ff..d1152faecf 100644 --- a/english/warriors-game/watch-warriors.md +++ b/english/warriors-game/watch-warriors.md @@ -17,4 +17,9 @@ great if they had not traded Wiggins. That was a dumb move. Warriors win in 5. The Warriors won in 6. Lebron was great, but the Warriors prevailed! -And Dwyane Wade slept like a baby. \ No newline at end of file +And Dwyane Wade slept like a baby. + +A baby that was thinking about the boom/bust nature of the NBA draft. Why did +anyone think Anthony Bennett was deserving of the number 1 pick? But you could +argue the Cavs were geniuses to pick him because one year later it netted +LeBron. So weird. \ No newline at end of file From ca4eba92d5d3bfd3dc25637738cc9a1639a4e63d Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 14:33:20 +0200 Subject: [PATCH 0372/5486] Expand page 'insel' ('isle') and add some new options --- german/schwimmen/insel/fs_aussen/fs_aussen.md | 13 ++++++++++++ .../insel/fs_innen/ausgang/ausgang.md | 17 ++++++++++++++++ .../insel/fs_innen/ebene23/ebene23.md | 12 +++++++++++ german/schwimmen/insel/fs_innen/fs_innen.md | 15 ++++++++++++++ .../insel/fs_innen/service/service.md | 2 ++ german/schwimmen/insel/insel.md | 20 +++++++++++++++++++ german/schwimmen/insel/schlafen/schlafen.md | 1 + german/schwimmen/schwimmen.md | 6 +++--- 8 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 german/schwimmen/insel/fs_aussen/fs_aussen.md create mode 100644 german/schwimmen/insel/fs_innen/ausgang/ausgang.md create mode 100644 german/schwimmen/insel/fs_innen/ebene23/ebene23.md create mode 100644 german/schwimmen/insel/fs_innen/fs_innen.md create mode 100644 german/schwimmen/insel/fs_innen/service/service.md create mode 100644 german/schwimmen/insel/schlafen/schlafen.md diff --git a/german/schwimmen/insel/fs_aussen/fs_aussen.md b/german/schwimmen/insel/fs_aussen/fs_aussen.md new file mode 100644 index 0000000000..458c6e9d76 --- /dev/null +++ b/german/schwimmen/insel/fs_aussen/fs_aussen.md @@ -0,0 +1,13 @@ +Du gehst langsam auf den Fahrstuhl zu. Aus dem Nichts heraus wird er sich ja wohl nicht materialisiert +haben...oder doch? +Als du unmittelbar vor dem metallischen Rahmen der Fahrstuhltür stehst, fällt dir auf, daß allem Anschein nach +diese Erscheinung nur eine Vorderseite, aber keine Seitenwände hat, denn unmittelbar neben dem Rahmen kannst du +ein paar Meter in den Wald hineinschauen ohne die Seite oder gar die Rückwand des Aufzugs sehen zu können. + +Vorsichtig berührst du den Rahmen der linken Schiebetür: er ist solide und fühlt sich kühl und glattpoliert an. +Als du deine Hand wieder zurückziehst, streifst du unabsichtlich den Zweig eines mittelhohen Stauchs - genauer gesagt: +gleitet deine Hand vollkommen berührungslos durch eben diesen Zweig samt seiner Blätter hindurch... + +Offenbar ist dieser Strauch, ja ist der ganze Waldsaum nicht real, sonder eine Art Projektion. + +[Zurück](../insel.md) diff --git a/german/schwimmen/insel/fs_innen/ausgang/ausgang.md b/german/schwimmen/insel/fs_innen/ausgang/ausgang.md new file mode 100644 index 0000000000..d18a57f30b --- /dev/null +++ b/german/schwimmen/insel/fs_innen/ausgang/ausgang.md @@ -0,0 +1,17 @@ +Nichts passiert, die Tür bleibt offen. Du trittst ins Freie und stehst wieder am Strand der Insel, +vor dem Waldrand. +Als du dich umdrehst, um deinen Begleiter zu fragen worum es hier eigentlich geht, ist er mitsamt dem +Fahrstuhl verschwunden. + +Und was nun? + +Man sollte ... + +... nach etwas Eßbarem suchen, denn so allmählich macht sich [Hunger](../../../hunger/hunger.md) bemerkbar. + +... ein sicheres Lager aufbauen, denn wer weiß schon welche [Gefahren](../../../gefahr/gefahr.md) auf einer Insel lauern. + +... sich erst einmal auf der [Insel](../../../insel/insel.md) umschauen. + +... besser [zurück](../../../../ruderboot.md) zum Boot schwimmen. + diff --git a/german/schwimmen/insel/fs_innen/ebene23/ebene23.md b/german/schwimmen/insel/fs_innen/ebene23/ebene23.md new file mode 100644 index 0000000000..9170f89dea --- /dev/null +++ b/german/schwimmen/insel/fs_innen/ebene23/ebene23.md @@ -0,0 +1,12 @@ +Der Fahrstuhl hält mit einem gedämpften Ruck. + +Die Fahrstuhltür gleitet mit einem eleganten, leicht seufzenden Geräusch auf und gibt den Blick frei +auf einen hell erleuchteten Raum mit hohen Wänden. + +Die Wände, die Decke und der Boden sind von mattem Weiß, nirgends ist eine Lichtquelle zu sehen, aber +dennoch ist der saalartige Raum hell - das Licht scheint von der Decke und den Wänden selbst auszugehen. + +Die Größe des Raums ist schwer abzuschätzen, er wird vielleicht zwanzig Meter lang und breit sein, vielleicht sechs Meter hoch. +Er hat weder Fenster noch Türen und ist vollständig leer, bis auf eine etwa einen Meter hohe zylindrische Säule in der Mitte. Auf dieser Säule steht - oder besser gesagt: etwas über ihr schwebt - ein sphärisches, semitransparentes Objekt mit einem Durchmesser von vielleicht 50 Zentimetern. Diese Kugel emittiert ein changierendes, bläulich-grünes Licht, und etwas in ihrem Inneren scheint sicsh zu bewegen. + +"Nun, wir sind froh, daß Sie wirklich gekommen sind!" reißt dich der ältere Herr aus deiner Betrachtung. diff --git a/german/schwimmen/insel/fs_innen/fs_innen.md b/german/schwimmen/insel/fs_innen/fs_innen.md new file mode 100644 index 0000000000..f2ed725962 --- /dev/null +++ b/german/schwimmen/insel/fs_innen/fs_innen.md @@ -0,0 +1,15 @@ +Der freundliche Herr läßt dir den Vortritt, und nacheinander betretet ihr die Fahrstuhlkabine. + +Es ist ein unauffälliger, ganz gewöhnlicher Fahrstuhl. Die Wände sind mit polierten Aluminiumpaneelen +verkleidet, die Decke besteht aus einer schachbrettartig gekachelten Fläche von grauen und weißen Lochplatten, +und der Boden ist mit hellgrau-weiße gemustertem PVC ausgelegt. Aus einem in die Wand eingelassenen Lautsprecher +spielt leise die übliche belanglose aber beruhigende Fahrstuhlmusik. + +In Brusthöhe neben dem rechten Schiebetürflügel ist ein Bedienpaneel mit drei schwarzen +Druckknöpfen angebracht. Sie sind beschriftet mit: + +[Ausgang Insel](./ausgang/ausgang.md) + +[Ebene 23](./ebene23/ebene23.md) + +[Service](./service/service.md) diff --git a/german/schwimmen/insel/fs_innen/service/service.md b/german/schwimmen/insel/fs_innen/service/service.md new file mode 100644 index 0000000000..0e799f990b --- /dev/null +++ b/german/schwimmen/insel/fs_innen/service/service.md @@ -0,0 +1,2 @@ +Ein heller Gong ertönt, und eine freundliche Frauenstimme meldet sich aus dem Lautsprecher und fragt, was sie für dich tun kann. Du bist im ersten Moment etwas überrascht, und überlegst, was du eigentlich wollen solltest. Dann sagst du: "Ich hätte eigentlich ganz gern ein kühles Altbier!". +Im nächsten Moment öffnet sich mit einem "Pling"-Geräusch eine kleine Luke in der rückseitigen Fahrstuhlwand. Diese war dir gar noch nicht aufgefallen. Hinter der Luke befindet sich eine kleine Aussparung und dort steht auf einem Tablett tatsächlich ein schönes, kühles Bier. \ No newline at end of file diff --git a/german/schwimmen/insel/insel.md b/german/schwimmen/insel/insel.md index d1f901c220..2d67215d16 100644 --- a/german/schwimmen/insel/insel.md +++ b/german/schwimmen/insel/insel.md @@ -1,2 +1,22 @@ In der Umgebung des Strandes ist die Insel so dicht bewachsen, dass es keinen Weg durchs Unterholz zu geben scheint. + +Ratlos setzt du dich also auf einen größeren, flachen Felsen und blickst auf die glitzernde, nur leicht +gekräuselte Wasserfläche. Eine sanfte, warme Brise weht, die Wellen spielen um die kleinen Kiesel am Sandstrand +und die Natur erscheint ruhig und friedlich. +Du wirst mit einem Mal ganz schläfrig, und die Augenlieder werden schwer, als hinter dir plötzlich +jemand hüstelt: +"Ahm, Verzeihung, aber wir warten schon eine geraume Weile auf Sie!". Du springst ruckartige auf, fährst herum +und bist schlagartig hellwach. Dort, unmittelbar am Waldrand, hat sich die Tür eines Fahrstuhls geöffnet (richtig, ein Fahrstuhl!) und direkt davor steht ein distinguiert aussehender, vornehm gekleideter und schon etwas älterer Herr. +Er lächelt dich etwas verlegen an und streckt auffordernd den Arm aus: "Kommen Sie, kommen Sie nur! Sie werden +sehnsüchtig erwartet". + +Du bist verwirrt aber gleichzeitig auch neugierig und [folgst seiner Aufforderung ohne weitere Fragen.](./fs_innen/fs_innen.md) + +Du fragst dich, wo in aller Welt dieser Fahrstuhl auf einmal herkommen konnte und gehst - unhöflicherweise - +an dem Mann vorbei zum Fahrstuhl, [um diesen näher in Augenschein zu nehmen.](./fs_aussen/fs_aussen.md) + +Du hast ganz offensichtlich Halluzinationen, vermutlich aufgrund einer Kombination aus Erschöpfung, Dehydrierung und +des intensiven Sonnenlichts. Daher beschließt Du, dich erst einmal im Halbschatten des Waldsaumes für eine Weile [schlafen zu legen.](./schlafen/schlafen.md) + +Hier stimmt definitiv etwas ganz und gar nicht. Daher entscheidest du dich, besser [zum Ruderboot zurückzuschwimmen.](../schwimmen.md) diff --git a/german/schwimmen/insel/schlafen/schlafen.md b/german/schwimmen/insel/schlafen/schlafen.md new file mode 100644 index 0000000000..cf3e039df2 --- /dev/null +++ b/german/schwimmen/insel/schlafen/schlafen.md @@ -0,0 +1 @@ +Du entfernst dich eilig vom Ort des Geschehens, suchst dir einen etwas geschützteren Platz im Halbschatten zwischen zwei größeren Bäumen und ignorierst das eben erlebte trotzig. Schon bald, nachdem du dich hingelegt hast, übermannt dich die Müdigkeit und du gleitest in einen tiefen, traumlosen Schlaf. \ No newline at end of file diff --git a/german/schwimmen/schwimmen.md b/german/schwimmen/schwimmen.md index 7956be9d20..941ee900b9 100644 --- a/german/schwimmen/schwimmen.md +++ b/german/schwimmen/schwimmen.md @@ -5,13 +5,13 @@ Sie erreichen Sie mit letzter Kraft und erholen sich erst einmal am Strand. Doch Man sollte ... ... was zu Essen suchen, denn nach dem Schwimmen hat man immer Hunger -[Hunger](hunger/hunger.md) +[Hunger](./hunger/hunger.md) ... ein sicheres Lager aufbauen, denn wer weiß schon welche Gefahren auf einer Insel lauern -[Gefahr](gefahr/gefahr.md) +[Gefahr](./gefahr/gefahr.md) ... sich erst einmal auf der Insel umschauen und dann entscheiden wie es weiter geht. -[Insel](insel/insel.md) +[Insel](./insel/insel.md) [Zurück](../ruderboot.md) From 6f9b950b1694e3c194bb7de288ad53ad21fe425c Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 14:41:20 +0200 Subject: [PATCH 0373/5486] Fix typo in 'schwimmen.md' --- german/schwimmen/insel/insel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/schwimmen/insel/insel.md b/german/schwimmen/insel/insel.md index 2d67215d16..391d971178 100644 --- a/german/schwimmen/insel/insel.md +++ b/german/schwimmen/insel/insel.md @@ -6,7 +6,7 @@ gekräuselte Wasserfläche. Eine sanfte, warme Brise weht, die Wellen spielen um und die Natur erscheint ruhig und friedlich. Du wirst mit einem Mal ganz schläfrig, und die Augenlieder werden schwer, als hinter dir plötzlich jemand hüstelt: -"Ahm, Verzeihung, aber wir warten schon eine geraume Weile auf Sie!". Du springst ruckartige auf, fährst herum +"Ahm, Verzeihung, aber wir warten schon eine geraume Weile auf Sie!". Du springst ruckartig auf, fährst herum und bist schlagartig hellwach. Dort, unmittelbar am Waldrand, hat sich die Tür eines Fahrstuhls geöffnet (richtig, ein Fahrstuhl!) und direkt davor steht ein distinguiert aussehender, vornehm gekleideter und schon etwas älterer Herr. Er lächelt dich etwas verlegen an und streckt auffordernd den Arm aus: "Kommen Sie, kommen Sie nur! Sie werden sehnsüchtig erwartet". From ae8131693176bc4a3bfd68406485acdc89ebb4a2 Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 14:42:53 +0200 Subject: [PATCH 0374/5486] Fix grammar in 'schlafen.md' --- german/schwimmen/insel/schlafen/schlafen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/schwimmen/insel/schlafen/schlafen.md b/german/schwimmen/insel/schlafen/schlafen.md index cf3e039df2..134a20c685 100644 --- a/german/schwimmen/insel/schlafen/schlafen.md +++ b/german/schwimmen/insel/schlafen/schlafen.md @@ -1 +1 @@ -Du entfernst dich eilig vom Ort des Geschehens, suchst dir einen etwas geschützteren Platz im Halbschatten zwischen zwei größeren Bäumen und ignorierst das eben erlebte trotzig. Schon bald, nachdem du dich hingelegt hast, übermannt dich die Müdigkeit und du gleitest in einen tiefen, traumlosen Schlaf. \ No newline at end of file +Du entfernst dich eilig vom Ort des Geschehens, suchst dir einen etwas geschützteren Platz im Halbschatten zwischen zwei größeren Bäumen und ignorierst das eben erlebte trotzig. Schon bald nachdem du dich hingelegt hast, übermannt dich die Müdigkeit, und du gleitest in einen tiefen, traumlosen Schlaf. \ No newline at end of file From 621735470de6a5c22020994cbb6dfdf5c0b7a5e2 Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 14:45:56 +0200 Subject: [PATCH 0375/5486] Fix typo and adjust some sentences in 'fs_aussen.md' --- german/schwimmen/insel/fs_aussen/fs_aussen.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/german/schwimmen/insel/fs_aussen/fs_aussen.md b/german/schwimmen/insel/fs_aussen/fs_aussen.md index 458c6e9d76..89593d0e13 100644 --- a/german/schwimmen/insel/fs_aussen/fs_aussen.md +++ b/german/schwimmen/insel/fs_aussen/fs_aussen.md @@ -1,12 +1,11 @@ Du gehst langsam auf den Fahrstuhl zu. Aus dem Nichts heraus wird er sich ja wohl nicht materialisiert -haben...oder doch? +haben... oder etwa doch? Als du unmittelbar vor dem metallischen Rahmen der Fahrstuhltür stehst, fällt dir auf, daß allem Anschein nach diese Erscheinung nur eine Vorderseite, aber keine Seitenwände hat, denn unmittelbar neben dem Rahmen kannst du ein paar Meter in den Wald hineinschauen ohne die Seite oder gar die Rückwand des Aufzugs sehen zu können. Vorsichtig berührst du den Rahmen der linken Schiebetür: er ist solide und fühlt sich kühl und glattpoliert an. -Als du deine Hand wieder zurückziehst, streifst du unabsichtlich den Zweig eines mittelhohen Stauchs - genauer gesagt: -gleitet deine Hand vollkommen berührungslos durch eben diesen Zweig samt seiner Blätter hindurch... +Als du deine Hand wieder zurückziehst, streifst du unabsichtlich den Zweig eines mittelhohen Strauchs - oder genauer gesagt: gleitet deine Hand vollkommen berührungslos durch eben diesen Zweig samt seiner Blätter hindurch... Offenbar ist dieser Strauch, ja ist der ganze Waldsaum nicht real, sonder eine Art Projektion. From 55ac2180ba5ff89b1c845909611f25a426998ace Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 14:50:03 +0200 Subject: [PATCH 0376/5486] Fix typo in 'fs_innen.md' --- german/schwimmen/insel/fs_innen/fs_innen.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/german/schwimmen/insel/fs_innen/fs_innen.md b/german/schwimmen/insel/fs_innen/fs_innen.md index f2ed725962..ab6c6f3209 100644 --- a/german/schwimmen/insel/fs_innen/fs_innen.md +++ b/german/schwimmen/insel/fs_innen/fs_innen.md @@ -2,8 +2,8 @@ Der freundliche Herr läßt dir den Vortritt, und nacheinander betretet ihr die Es ist ein unauffälliger, ganz gewöhnlicher Fahrstuhl. Die Wände sind mit polierten Aluminiumpaneelen verkleidet, die Decke besteht aus einer schachbrettartig gekachelten Fläche von grauen und weißen Lochplatten, -und der Boden ist mit hellgrau-weiße gemustertem PVC ausgelegt. Aus einem in die Wand eingelassenen Lautsprecher -spielt leise die übliche belanglose aber beruhigende Fahrstuhlmusik. +und der Boden ist mit hellgrau-weiß gemustertem PVC ausgelegt. Aus einem in die Wand eingelassenen Lautsprecher +spielt leise die übliche belanglose, aber beruhigende Fahrstuhlmusik. In Brusthöhe neben dem rechten Schiebetürflügel ist ein Bedienpaneel mit drei schwarzen Druckknöpfen angebracht. Sie sind beschriftet mit: From 68294f2489e8dfa4a46d4e07588dade40dae413c Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 14:55:50 +0200 Subject: [PATCH 0377/5486] Fix typo and change some wording in 'ebene23.md' --- german/schwimmen/insel/fs_innen/ebene23/ebene23.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/german/schwimmen/insel/fs_innen/ebene23/ebene23.md b/german/schwimmen/insel/fs_innen/ebene23/ebene23.md index 9170f89dea..0a7c326238 100644 --- a/german/schwimmen/insel/fs_innen/ebene23/ebene23.md +++ b/german/schwimmen/insel/fs_innen/ebene23/ebene23.md @@ -1,12 +1,12 @@ Der Fahrstuhl hält mit einem gedämpften Ruck. -Die Fahrstuhltür gleitet mit einem eleganten, leicht seufzenden Geräusch auf und gibt den Blick frei +Die Fahrstuhltür gleitet mit einem eleganten, leise seufzenden Geräusch auf und gibt den Blick frei auf einen hell erleuchteten Raum mit hohen Wänden. Die Wände, die Decke und der Boden sind von mattem Weiß, nirgends ist eine Lichtquelle zu sehen, aber dennoch ist der saalartige Raum hell - das Licht scheint von der Decke und den Wänden selbst auszugehen. Die Größe des Raums ist schwer abzuschätzen, er wird vielleicht zwanzig Meter lang und breit sein, vielleicht sechs Meter hoch. -Er hat weder Fenster noch Türen und ist vollständig leer, bis auf eine etwa einen Meter hohe zylindrische Säule in der Mitte. Auf dieser Säule steht - oder besser gesagt: etwas über ihr schwebt - ein sphärisches, semitransparentes Objekt mit einem Durchmesser von vielleicht 50 Zentimetern. Diese Kugel emittiert ein changierendes, bläulich-grünes Licht, und etwas in ihrem Inneren scheint sicsh zu bewegen. +Er hat weder Fenster noch Türen und ist vollständig leer, bis auf eine etwa einen Meter hohe zylindrische Säule in der Mitte. Auf dieser Säule steht - oder besser gesagt: in geringem Abstand über ihr schwebt - ein sphärisches, semitransparentes Objekt mit einem Durchmesser von vielleicht 50 Zentimetern. Diese Kugel emittiert ein changierendes, bläulich-grünes Licht, und etwas in ihrem Inneren scheint sich zu bewegen. "Nun, wir sind froh, daß Sie wirklich gekommen sind!" reißt dich der ältere Herr aus deiner Betrachtung. From 03f5ebc1ce5f7a5c494347888ddb7b6270e54739 Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 14:59:46 +0200 Subject: [PATCH 0378/5486] Fix typo and change some wording in 'service.md' --- german/schwimmen/insel/fs_innen/service/service.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/schwimmen/insel/fs_innen/service/service.md b/german/schwimmen/insel/fs_innen/service/service.md index 0e799f990b..8b639b90fa 100644 --- a/german/schwimmen/insel/fs_innen/service/service.md +++ b/german/schwimmen/insel/fs_innen/service/service.md @@ -1,2 +1,2 @@ Ein heller Gong ertönt, und eine freundliche Frauenstimme meldet sich aus dem Lautsprecher und fragt, was sie für dich tun kann. Du bist im ersten Moment etwas überrascht, und überlegst, was du eigentlich wollen solltest. Dann sagst du: "Ich hätte eigentlich ganz gern ein kühles Altbier!". -Im nächsten Moment öffnet sich mit einem "Pling"-Geräusch eine kleine Luke in der rückseitigen Fahrstuhlwand. Diese war dir gar noch nicht aufgefallen. Hinter der Luke befindet sich eine kleine Aussparung und dort steht auf einem Tablett tatsächlich ein schönes, kühles Bier. \ No newline at end of file +Im nächsten Moment öffnet sich mit einem leisen, metallischen Knackgeräusch eine kleine Luke in der rückseitigen Fahrstuhlwand. Diese war dir noch gar nicht aufgefallen. Hinter der Luke befindet sich eine kleine Aussparung, und dort steht auf einem Tablett tatsächlich ein schönes, offensichtlich gekühltes Bier. \ No newline at end of file From e9ba4ef9cfab1d67b5f6c1479e4f8af32510850b Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 15:12:59 +0200 Subject: [PATCH 0379/5486] Shorten line length to match 120 chars limit --- german/schwimmen/insel/fs_aussen/fs_aussen.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/schwimmen/insel/fs_aussen/fs_aussen.md b/german/schwimmen/insel/fs_aussen/fs_aussen.md index 89593d0e13..715bd8298f 100644 --- a/german/schwimmen/insel/fs_aussen/fs_aussen.md +++ b/german/schwimmen/insel/fs_aussen/fs_aussen.md @@ -5,7 +5,8 @@ diese Erscheinung nur eine Vorderseite, aber keine Seitenwände hat, denn unmitt ein paar Meter in den Wald hineinschauen ohne die Seite oder gar die Rückwand des Aufzugs sehen zu können. Vorsichtig berührst du den Rahmen der linken Schiebetür: er ist solide und fühlt sich kühl und glattpoliert an. -Als du deine Hand wieder zurückziehst, streifst du unabsichtlich den Zweig eines mittelhohen Strauchs - oder genauer gesagt: gleitet deine Hand vollkommen berührungslos durch eben diesen Zweig samt seiner Blätter hindurch... +Als du deine Hand wieder zurückziehst, streifst du unabsichtlich den Zweig eines mittelhohen Strauchs - oder +genauer gesagt: gleitet deine Hand vollkommen berührungslos durch eben diesen Zweig samt seiner Blätter hindurch... Offenbar ist dieser Strauch, ja ist der ganze Waldsaum nicht real, sonder eine Art Projektion. From 4e4b3faf8893eef7384918a07c99512bfe6bde0a Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 15:14:34 +0200 Subject: [PATCH 0380/5486] Shorten line length to match 120 chars limit --- german/schwimmen/insel/fs_innen/ausgang/ausgang.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/schwimmen/insel/fs_innen/ausgang/ausgang.md b/german/schwimmen/insel/fs_innen/ausgang/ausgang.md index d18a57f30b..4a4a0aef04 100644 --- a/german/schwimmen/insel/fs_innen/ausgang/ausgang.md +++ b/german/schwimmen/insel/fs_innen/ausgang/ausgang.md @@ -9,7 +9,8 @@ Man sollte ... ... nach etwas Eßbarem suchen, denn so allmählich macht sich [Hunger](../../../hunger/hunger.md) bemerkbar. -... ein sicheres Lager aufbauen, denn wer weiß schon welche [Gefahren](../../../gefahr/gefahr.md) auf einer Insel lauern. +... ein sicheres Lager aufbauen, denn wer weiß schon welche [Gefahren](../../../gefahr/gefahr.md) auf einer + Insel lauern. ... sich erst einmal auf der [Insel](../../../insel/insel.md) umschauen. From 2ad60323915e13f02fdcb13695ac9a8621b5bf5f Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 15:16:14 +0200 Subject: [PATCH 0381/5486] Shorten line length to match 120 chars limit. --- german/schwimmen/insel/fs_innen/ebene23/ebene23.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/german/schwimmen/insel/fs_innen/ebene23/ebene23.md b/german/schwimmen/insel/fs_innen/ebene23/ebene23.md index 0a7c326238..90044687af 100644 --- a/german/schwimmen/insel/fs_innen/ebene23/ebene23.md +++ b/german/schwimmen/insel/fs_innen/ebene23/ebene23.md @@ -6,7 +6,11 @@ auf einen hell erleuchteten Raum mit hohen Wänden. Die Wände, die Decke und der Boden sind von mattem Weiß, nirgends ist eine Lichtquelle zu sehen, aber dennoch ist der saalartige Raum hell - das Licht scheint von der Decke und den Wänden selbst auszugehen. -Die Größe des Raums ist schwer abzuschätzen, er wird vielleicht zwanzig Meter lang und breit sein, vielleicht sechs Meter hoch. -Er hat weder Fenster noch Türen und ist vollständig leer, bis auf eine etwa einen Meter hohe zylindrische Säule in der Mitte. Auf dieser Säule steht - oder besser gesagt: in geringem Abstand über ihr schwebt - ein sphärisches, semitransparentes Objekt mit einem Durchmesser von vielleicht 50 Zentimetern. Diese Kugel emittiert ein changierendes, bläulich-grünes Licht, und etwas in ihrem Inneren scheint sich zu bewegen. +Die Größe des Raums ist schwer abzuschätzen, er wird vielleicht zwanzig Meter lang und breit sein, vielleicht +sechs Meter hoch. +Er hat weder Fenster noch Türen und ist vollständig leer, bis auf eine etwa einen Meter hohe zylindrische Säule +in der Mitte. Auf dieser Säule steht - oder besser gesagt: in geringem Abstand über ihr schwebt - ein sphärisches, +semitransparentes Objekt mit einem Durchmesser von vielleicht 50 Zentimetern. Diese Kugel emittiert ein +changierendes, bläulich-grünes Licht, und etwas in ihrem Inneren scheint sich zu bewegen. "Nun, wir sind froh, daß Sie wirklich gekommen sind!" reißt dich der ältere Herr aus deiner Betrachtung. From 4b1a2b6ae5551a2391934ac7cf3496ed7491eab5 Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 15:18:01 +0200 Subject: [PATCH 0382/5486] Shorten line length to match 120 chars limit. --- german/schwimmen/insel/fs_innen/service/service.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/german/schwimmen/insel/fs_innen/service/service.md b/german/schwimmen/insel/fs_innen/service/service.md index 8b639b90fa..7bca456fcb 100644 --- a/german/schwimmen/insel/fs_innen/service/service.md +++ b/german/schwimmen/insel/fs_innen/service/service.md @@ -1,2 +1,7 @@ -Ein heller Gong ertönt, und eine freundliche Frauenstimme meldet sich aus dem Lautsprecher und fragt, was sie für dich tun kann. Du bist im ersten Moment etwas überrascht, und überlegst, was du eigentlich wollen solltest. Dann sagst du: "Ich hätte eigentlich ganz gern ein kühles Altbier!". -Im nächsten Moment öffnet sich mit einem leisen, metallischen Knackgeräusch eine kleine Luke in der rückseitigen Fahrstuhlwand. Diese war dir noch gar nicht aufgefallen. Hinter der Luke befindet sich eine kleine Aussparung, und dort steht auf einem Tablett tatsächlich ein schönes, offensichtlich gekühltes Bier. \ No newline at end of file +Ein heller Gong ertönt, und eine freundliche Frauenstimme meldet sich aus dem Lautsprecher und fragt, was sie +für dich tun kann. Du bist im ersten Moment etwas überrascht, und überlegst, was du eigentlich wollen solltest. + +Dann antwortest du: "Ich hätte eigentlich ganz gern ein kühles Altbier!". +Im nächsten Moment öffnet sich mit einem leisen, metallischen Knackgeräusch eine kleine Luke in der rückseitigen +Fahrstuhlwand. Diese war dir noch gar nicht aufgefallen. Hinter der Luke befindet sich eine kleine Aussparung, +und dort steht auf einem Tablett tatsächlich ein schönes, offensichtlich gekühltes Bier. From 829e648309ce800f2c2426bc6990d12e80943706 Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 15:20:35 +0200 Subject: [PATCH 0383/5486] Shorten line length to match 120 chars limit. --- german/schwimmen/insel/insel.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/german/schwimmen/insel/insel.md b/german/schwimmen/insel/insel.md index 391d971178..1ecc633eca 100644 --- a/german/schwimmen/insel/insel.md +++ b/german/schwimmen/insel/insel.md @@ -7,16 +7,22 @@ und die Natur erscheint ruhig und friedlich. Du wirst mit einem Mal ganz schläfrig, und die Augenlieder werden schwer, als hinter dir plötzlich jemand hüstelt: "Ahm, Verzeihung, aber wir warten schon eine geraume Weile auf Sie!". Du springst ruckartig auf, fährst herum -und bist schlagartig hellwach. Dort, unmittelbar am Waldrand, hat sich die Tür eines Fahrstuhls geöffnet (richtig, ein Fahrstuhl!) und direkt davor steht ein distinguiert aussehender, vornehm gekleideter und schon etwas älterer Herr. +und bist schlagartig hellwach. Dort, unmittelbar am Waldrand, hat sich die Tür eines Fahrstuhls geöffnet +(richtig, ein Fahrstuhl!) und direkt davor steht ein distinguiert aussehender, vornehm gekleideter und schon +etwas älterer Herr. + Er lächelt dich etwas verlegen an und streckt auffordernd den Arm aus: "Kommen Sie, kommen Sie nur! Sie werden sehnsüchtig erwartet". -Du bist verwirrt aber gleichzeitig auch neugierig und [folgst seiner Aufforderung ohne weitere Fragen.](./fs_innen/fs_innen.md) +Du bist verwirrt aber gleichzeitig auch neugierig und +[folgst seiner Aufforderung ohne weitere Fragen.](./fs_innen/fs_innen.md) Du fragst dich, wo in aller Welt dieser Fahrstuhl auf einmal herkommen konnte und gehst - unhöflicherweise - an dem Mann vorbei zum Fahrstuhl, [um diesen näher in Augenschein zu nehmen.](./fs_aussen/fs_aussen.md) -Du hast ganz offensichtlich Halluzinationen, vermutlich aufgrund einer Kombination aus Erschöpfung, Dehydrierung und -des intensiven Sonnenlichts. Daher beschließt Du, dich erst einmal im Halbschatten des Waldsaumes für eine Weile [schlafen zu legen.](./schlafen/schlafen.md) +Du hast ganz offensichtlich Halluzinationen, vermutlich aufgrund einer Kombination aus Erschöpfung, Dehydrierung +und des intensiven Sonnenlichts. Daher beschließt Du, dich erst einmal im Halbschatten des Waldsaumes für eine Weile +[schlafen zu legen.](./schlafen/schlafen.md) -Hier stimmt definitiv etwas ganz und gar nicht. Daher entscheidest du dich, besser [zum Ruderboot zurückzuschwimmen.](../schwimmen.md) +Hier stimmt definitiv etwas ganz und gar nicht. Daher entscheidest du dich, +besser [zum Ruderboot zurückzuschwimmen.](../schwimmen.md) From ccdb6308cc91e068daae522b9302f9a1795b6a74 Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 15:22:33 +0200 Subject: [PATCH 0384/5486] Shorten line length to match 120 chars limit. --- german/schwimmen/insel/schlafen/schlafen.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/german/schwimmen/insel/schlafen/schlafen.md b/german/schwimmen/insel/schlafen/schlafen.md index 134a20c685..a0dfd47d84 100644 --- a/german/schwimmen/insel/schlafen/schlafen.md +++ b/german/schwimmen/insel/schlafen/schlafen.md @@ -1 +1,5 @@ -Du entfernst dich eilig vom Ort des Geschehens, suchst dir einen etwas geschützteren Platz im Halbschatten zwischen zwei größeren Bäumen und ignorierst das eben erlebte trotzig. Schon bald nachdem du dich hingelegt hast, übermannt dich die Müdigkeit, und du gleitest in einen tiefen, traumlosen Schlaf. \ No newline at end of file +Du entfernst dich eilig vom Ort des Geschehens, suchst dir einen etwas geschützteren Platz im Halbschatten +zwischen zwei größeren Bäumen und ignorierst das eben erlebte trotzig. + +Schon bald nachdem du dich hingelegt hast, übermannt dich die Müdigkeit, und du gleitest in einen tiefen, +traumlosen Schlaf. From 2cb650036328ec18eb5a0580370a2f3cefa39388 Mon Sep 17 00:00:00 2001 From: Ingo Krotzky Date: Wed, 29 Jul 2015 15:30:18 +0200 Subject: [PATCH 0385/5486] Revert inadvertent changes (typo) --- german/schwimmen/schwimmen.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/german/schwimmen/schwimmen.md b/german/schwimmen/schwimmen.md index 941ee900b9..7956be9d20 100644 --- a/german/schwimmen/schwimmen.md +++ b/german/schwimmen/schwimmen.md @@ -5,13 +5,13 @@ Sie erreichen Sie mit letzter Kraft und erholen sich erst einmal am Strand. Doch Man sollte ... ... was zu Essen suchen, denn nach dem Schwimmen hat man immer Hunger -[Hunger](./hunger/hunger.md) +[Hunger](hunger/hunger.md) ... ein sicheres Lager aufbauen, denn wer weiß schon welche Gefahren auf einer Insel lauern -[Gefahr](./gefahr/gefahr.md) +[Gefahr](gefahr/gefahr.md) ... sich erst einmal auf der Insel umschauen und dann entscheiden wie es weiter geht. -[Insel](./insel/insel.md) +[Insel](insel/insel.md) [Zurück](../ruderboot.md) From a2995f042c4bef433074c69880787795252f3bbc Mon Sep 17 00:00:00 2001 From: wkwyatt Date: Wed, 29 Jul 2015 09:59:47 -0400 Subject: [PATCH 0386/5486] added eating the marshmallow wall and hallucinating with link to funny youtube vid and link to movie ripoffs --- bite-the-marshmallow/tasty-marshmallow.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 bite-the-marshmallow/tasty-marshmallow.md diff --git a/bite-the-marshmallow/tasty-marshmallow.md b/bite-the-marshmallow/tasty-marshmallow.md new file mode 100644 index 0000000000..b08979a13e --- /dev/null +++ b/bite-the-marshmallow/tasty-marshmallow.md @@ -0,0 +1,9 @@ +"Mmmmm... these marshmallows are soooo good" + +You close your eyes. + +Wait a minute....how did you end up in this car? You must be hallucinating + +[You use the gps to get back home](https://www.youtube.com/watch?v=RvlhrgSZrfA) + +[You open the door and there is a man sitting on your couch](../movie-ripoffs/zoolander/zoolander.md) \ No newline at end of file From 9aaf849532f6b0e689cfbc4e967bfb5fb64023e1 Mon Sep 17 00:00:00 2001 From: wkwyatt Date: Wed, 29 Jul 2015 10:06:35 -0400 Subject: [PATCH 0387/5486] added bite-the-marshmallow link --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 013d5ee755..021cda5d0c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -28,6 +28,8 @@ You reach out to grab a handful of the marshmallow wall, but you can't seem to t You also seem to be wearing an uncomfortable and restrictive jacket made of leather... +[You decide to bite the marshmallow wall](./bite-the-marshmallow/tasty-marshmallow.md) + You are feeling very anxious at this point. This is because you do not like leather for ethical reasons. From eb29952f2063d044dc60f0d5d5a86cb469abe0f7 Mon Sep 17 00:00:00 2001 From: wkwyatt Date: Wed, 29 Jul 2015 10:14:29 -0400 Subject: [PATCH 0388/5486] move tasty-marshmallow file to english folder --- english/bite-the-marshmallow/tasty-marshmallow.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 english/bite-the-marshmallow/tasty-marshmallow.md diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md new file mode 100644 index 0000000000..b08979a13e --- /dev/null +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -0,0 +1,9 @@ +"Mmmmm... these marshmallows are soooo good" + +You close your eyes. + +Wait a minute....how did you end up in this car? You must be hallucinating + +[You use the gps to get back home](https://www.youtube.com/watch?v=RvlhrgSZrfA) + +[You open the door and there is a man sitting on your couch](../movie-ripoffs/zoolander/zoolander.md) \ No newline at end of file From d0214b45b4a1c2b936bc159f9bec6e9a2e6194d8 Mon Sep 17 00:00:00 2001 From: maaland Date: Wed, 29 Jul 2015 16:55:13 +0200 Subject: [PATCH 0389/5486] Create hammertime.md file --- english/hammertime/hammertime.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/hammertime/hammertime.md diff --git a/english/hammertime/hammertime.md b/english/hammertime/hammertime.md new file mode 100644 index 0000000000..97b59b986d --- /dev/null +++ b/english/hammertime/hammertime.md @@ -0,0 +1,2 @@ +You break into the hammertime-dance, but quickly realize +that this doesn't help you at all. \ No newline at end of file From d4206fe3829138f13117adcb4c302e3c66316f52 Mon Sep 17 00:00:00 2001 From: maaland Date: Wed, 29 Jul 2015 16:55:45 +0200 Subject: [PATCH 0390/5486] Add hammertime to marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 013d5ee755..6b33f8461b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -397,3 +397,5 @@ Do you: [Thank Mr. Skeltal](2spooky/2spooky.md) [Utilize your wand once again...](utilize-wand/fork-rope-wand.md) + +[Stop, hammertime!](hammertime/hammertime.md) From 44673c7cb03fc20eede85093a7397899d90f91a3 Mon Sep 17 00:00:00 2001 From: wkwyatt Date: Wed, 29 Jul 2015 11:09:31 -0400 Subject: [PATCH 0391/5486] deleted bite-the-marshmallow folder dupe --- bite-the-marshmallow/tasty-marshmallow.md | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 bite-the-marshmallow/tasty-marshmallow.md diff --git a/bite-the-marshmallow/tasty-marshmallow.md b/bite-the-marshmallow/tasty-marshmallow.md deleted file mode 100644 index b08979a13e..0000000000 --- a/bite-the-marshmallow/tasty-marshmallow.md +++ /dev/null @@ -1,9 +0,0 @@ -"Mmmmm... these marshmallows are soooo good" - -You close your eyes. - -Wait a minute....how did you end up in this car? You must be hallucinating - -[You use the gps to get back home](https://www.youtube.com/watch?v=RvlhrgSZrfA) - -[You open the door and there is a man sitting on your couch](../movie-ripoffs/zoolander/zoolander.md) \ No newline at end of file From 3cecd25e9f4037f9644891596db82e74a0cdd066 Mon Sep 17 00:00:00 2001 From: Alex Hernandez Date: Wed, 29 Jul 2015 12:03:12 -0500 Subject: [PATCH 0392/5486] Add Groundhog day context --- english/virtualreality/oculus.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/virtualreality/oculus.md b/english/virtualreality/oculus.md index 471d871b98..5cc2ec65e3 100644 --- a/english/virtualreality/oculus.md +++ b/english/virtualreality/oculus.md @@ -11,3 +11,5 @@ You have accidently entered into Kafka's world that has been redesigned by Murakami... you cannot escape it! [Life in the real world](problems/realproblems.md). + +You try to take off the oculus gear again to no avail. You faintly hear Sonny and Cher's "I Got You Babe" in the background and after scanning the room you see Hansel smoking his joint in the exact same position as he was yesterday. From 1c215f4b2905319ec288c3f6a0432efff7b8f66f Mon Sep 17 00:00:00 2001 From: Alex Hernandez Date: Wed, 29 Jul 2015 13:20:28 -0500 Subject: [PATCH 0393/5486] Break up long sentence --- english/virtualreality/oculus.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/virtualreality/oculus.md b/english/virtualreality/oculus.md index 5cc2ec65e3..11f0e75643 100644 --- a/english/virtualreality/oculus.md +++ b/english/virtualreality/oculus.md @@ -12,4 +12,4 @@ by Murakami... you cannot escape it! [Life in the real world](problems/realproblems.md). -You try to take off the oculus gear again to no avail. You faintly hear Sonny and Cher's "I Got You Babe" in the background and after scanning the room you see Hansel smoking his joint in the exact same position as he was yesterday. +You try to take off the oculus gear again to no avail. You faintly hear Sonny and Cher's "I Got You Babe" in the background. After scanning the room you see Hansel smoking his joint. He's in the exact same position as he was yesterday. From 0c43305e46ab6a85d499f7fd6bd3a692f4a8dc95 Mon Sep 17 00:00:00 2001 From: Alex Hernandez Date: Wed, 29 Jul 2015 13:27:41 -0500 Subject: [PATCH 0394/5486] Separate entry into shorter lines --- english/virtualreality/oculus.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/virtualreality/oculus.md b/english/virtualreality/oculus.md index 11f0e75643..b8380abac0 100644 --- a/english/virtualreality/oculus.md +++ b/english/virtualreality/oculus.md @@ -12,4 +12,7 @@ by Murakami... you cannot escape it! [Life in the real world](problems/realproblems.md). -You try to take off the oculus gear again to no avail. You faintly hear Sonny and Cher's "I Got You Babe" in the background. After scanning the room you see Hansel smoking his joint. He's in the exact same position as he was yesterday. +You try to take off the oculus gear again to no avail. +You faintly hear Sonny and Cher's "I Got You Babe" in the background. +After scanning the room you see Hansel smoking his joint. +He's in the exact same position as he was yesterday. From a383c6393449ce7d47d863488c85ac43f2c80cc9 Mon Sep 17 00:00:00 2001 From: whatsupmike Date: Wed, 29 Jul 2015 21:11:18 +0200 Subject: [PATCH 0395/5486] some break lines added --- .../kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md index 350cd4cbe9..4603955ddb 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md @@ -1 +1,3 @@ -Nagle pojawia się postać ze skrzydłami. Gwałtownym ruchem chwyta Cię za rękę i momentalnie przenosicie się na ogrąmną łąkę na której jest tylko jedno, samotne drzewo. \ No newline at end of file +Nagle pojawia się postać ze skrzydłami. +Gwałtownym ruchem chwyta Cię za rękę i momentalnie przenosicie się na ogrąmną łąkę +na której jest tylko jedno, samotne drzewo. From 0de4da13ca0cde55250bfbbcbe2447de071df684 Mon Sep 17 00:00:00 2001 From: fedejeanne Date: Wed, 29 Jul 2015 22:10:08 +0200 Subject: [PATCH 0396/5486] Agrega rama de confesiones en la plaza --- espanol/rezando/plaza/casamiento/casamiento.md | 1 + espanol/rezando/plaza/desagrado/desagrado.md | 1 + espanol/rezando/plaza/leche/leche.md | 1 + espanol/rezando/plaza/plaza.md | 9 ++++++++- 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 espanol/rezando/plaza/casamiento/casamiento.md create mode 100644 espanol/rezando/plaza/desagrado/desagrado.md create mode 100644 espanol/rezando/plaza/leche/leche.md diff --git a/espanol/rezando/plaza/casamiento/casamiento.md b/espanol/rezando/plaza/casamiento/casamiento.md new file mode 100644 index 0000000000..7e45183885 --- /dev/null +++ b/espanol/rezando/plaza/casamiento/casamiento.md @@ -0,0 +1 @@ +"Bueno Beatito, yo también tengo algo que confesarte", dijo Juarema. Luego ella... diff --git a/espanol/rezando/plaza/desagrado/desagrado.md b/espanol/rezando/plaza/desagrado/desagrado.md new file mode 100644 index 0000000000..5a1b54219c --- /dev/null +++ b/espanol/rezando/plaza/desagrado/desagrado.md @@ -0,0 +1 @@ +Juarema estaba desorientada y no sabía qué hacer!. Siempre creyó que ellos eran buenos amigos. Entonces ella... diff --git a/espanol/rezando/plaza/leche/leche.md b/espanol/rezando/plaza/leche/leche.md new file mode 100644 index 0000000000..041aa28fc4 --- /dev/null +++ b/espanol/rezando/plaza/leche/leche.md @@ -0,0 +1 @@ +Juarema no tenía idea de cómo reaccionar ante tal confesión!. Del nerviosismo, echó a reir, lo cual provocó que... diff --git a/espanol/rezando/plaza/plaza.md b/espanol/rezando/plaza/plaza.md index 6824e9d955..68d57eda1a 100644 --- a/espanol/rezando/plaza/plaza.md +++ b/espanol/rezando/plaza/plaza.md @@ -1 +1,8 @@ -Despues de andar apresuradamente unos 100 metros Jurema y Beatito llegaron a la plaza de Canudos +Despues de andar apresuradamente unos 100 metros Jurema y Beatito llegaron a la plaza de Canudos. +En ese momento, Beatito dice a Jurema que tiene algo muy importante para confesarle... y es que: + +[Siempre la quiso y quiere desposarla](casamiento/casamiento.md) + +[Nunca le agradó y no quiere verla más](desagrado/desagrado.md) + +[La leche le produce gases](leche/leche.md) From 1fddc2a960d68d330164f675ff64c89a59b8f42d Mon Sep 17 00:00:00 2001 From: fedejeanne Date: Wed, 29 Jul 2015 22:19:08 +0200 Subject: [PATCH 0397/5486] Corrige borrada de linea (eso espero) --- espanol/rezando/plaza/plaza.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/rezando/plaza/plaza.md b/espanol/rezando/plaza/plaza.md index 68d57eda1a..932c680a3b 100644 --- a/espanol/rezando/plaza/plaza.md +++ b/espanol/rezando/plaza/plaza.md @@ -1,4 +1,4 @@ -Despues de andar apresuradamente unos 100 metros Jurema y Beatito llegaron a la plaza de Canudos. +Despues de andar apresuradamente unos 100 metros Jurema y Beatito llegaron a la plaza de Canudos En ese momento, Beatito dice a Jurema que tiene algo muy importante para confesarle... y es que: [Siempre la quiso y quiere desposarla](casamiento/casamiento.md) From 12178123edbf4078521eafccfdeac8d850b6bd83 Mon Sep 17 00:00:00 2001 From: adenguo Date: Thu, 30 Jul 2015 12:55:39 +0800 Subject: [PATCH 0398/5486] =?UTF-8?q?Add=20the=20story=20of=20=E6=96=97?= =?UTF-8?q?=E6=88=98=E8=83=9C=E4=BD=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../\346\226\227\346\210\230\350\203\234\344\275\233.md" | 1 + 1 file changed, 1 insertion(+) create mode 100644 "Chinese/\346\226\227\346\210\230\350\203\234\344\275\233/\346\226\227\346\210\230\350\203\234\344\275\233.md" diff --git "a/Chinese/\346\226\227\346\210\230\350\203\234\344\275\233/\346\226\227\346\210\230\350\203\234\344\275\233.md" "b/Chinese/\346\226\227\346\210\230\350\203\234\344\275\233/\346\226\227\346\210\230\350\203\234\344\275\233.md" new file mode 100644 index 0000000000..21ada5b27d --- /dev/null +++ "b/Chinese/\346\226\227\346\210\230\350\203\234\344\275\233/\346\226\227\346\210\230\350\203\234\344\275\233.md" @@ -0,0 +1 @@ +孙悟空取经回来后，就变成了斗战胜佛！他从一个叛逆者，历经千辛万苦终于成了一个体制内的人，可是沿途的妖怪那么轻松就成仙成佛了，这个世界跟对人十分重要啊！ \ No newline at end of file From 17723f43b28e79cf0b3cc8c09f1c17974a06ef13 Mon Sep 17 00:00:00 2001 From: adenguo Date: Thu, 30 Jul 2015 12:59:40 +0800 Subject: [PATCH 0399/5486] =?UTF-8?q?Add=20the=20link=20to=20=E6=96=97?= =?UTF-8?q?=E6=88=98=E8=83=9C=E4=BD=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index a135acc2ae..0c66098d88 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -39,3 +39,5 @@ [小熊维尼](xinwang/xin.md)? [谢霆锋](TingfengXie/TingfengXie.md)? + +[斗战胜佛](斗战胜佛/斗战胜佛.md) From 4c5e2c914dcc3d8a1dab3df69d5554b9fe55747c Mon Sep 17 00:00:00 2001 From: Abhi Date: Thu, 30 Jul 2015 23:44:26 +0530 Subject: [PATCH 0400/5486] Add my 2 cents to the story --- english/marshmallow.md | 2 ++ english/unending-story/unending-story.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 english/unending-story/unending-story.md diff --git a/english/marshmallow.md b/english/marshmallow.md index c536cb1d8a..be285dc8f0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -401,3 +401,5 @@ Do you: [Utilize your wand once again...](utilize-wand/fork-rope-wand.md) [Stop, hammertime!](hammertime/hammertime.md) + +[Oops! this story ain't ending..](unending-story/unending-story.md) diff --git a/english/unending-story/unending-story.md b/english/unending-story/unending-story.md new file mode 100644 index 0000000000..99b052e277 --- /dev/null +++ b/english/unending-story/unending-story.md @@ -0,0 +1,5 @@ +It ain't ending.. it ain't ending.. + +Heck, it's not meant to be. + +[Go back to sleep.](../sleep/marshmallow.md) From cbc31869e63b6f1030ecbb28f615162f2c2b0349 Mon Sep 17 00:00:00 2001 From: Christopher Walterson Date: Thu, 30 Jul 2015 21:40:48 -0400 Subject: [PATCH 0401/5486] Add smell --- english/utilize-wand/fork-rope-wand.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/utilize-wand/fork-rope-wand.md b/english/utilize-wand/fork-rope-wand.md index fd7134f098..a6611ce2bb 100644 --- a/english/utilize-wand/fork-rope-wand.md +++ b/english/utilize-wand/fork-rope-wand.md @@ -3,6 +3,7 @@ you point your rope and fork wand to the door and firmly encant "Alohomora!" The door begins to acquire a dim yellow-green glow emanating from the lock mechanism. Rattling sounds out from the door's keyhole as the door begins to rumble within, wood - splintering as the sounds of grinding metal and wood fill the room. + splintering as the sounds of grinding metal and wood fill the room. A horrible smell + fills your nostrels and makes you gag. The door jars opens with a creak as the locking mechanism breaks. From 7baeeb982ffe2f2947d09bbf8072417488ae8603 Mon Sep 17 00:00:00 2001 From: Azleur Date: Fri, 31 Jul 2015 17:20:19 +0200 Subject: [PATCH 0402/5486] Afegeix opcions a tastar --- catala/cantar/tastar/tastar.md | 5 ++++- catala/cantar/tastar/tastes_sol/tastes_sol.md | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 catala/cantar/tastar/tastes_sol/tastes_sol.md diff --git a/catala/cantar/tastar/tastar.md b/catala/cantar/tastar/tastar.md index 2905ac0902..3e5374e95b 100644 --- a/catala/cantar/tastar/tastar.md +++ b/catala/cantar/tastar/tastar.md @@ -1 +1,4 @@ -Tastes una llaminadura en forma de cor, i a fora sembla que para de ploure. Obres la tenda i... tot és de sucre! +Tastes una llaminadura en forma de cor, i a fora sembla que para de ploure. Obres la tenda i... tot és de sucre! El sol regalima lentament sobre l'horitzó gotes de caramel, i et preguntes quin gust deu tindre. + +[Et pessigues el braç. Això no pot ser real!](../../pessigar-se/pessigar-se.md) +[Tastes les llàgrimes del sol.](tastes_sol/tastes_sol.md) \ No newline at end of file diff --git a/catala/cantar/tastar/tastes_sol/tastes_sol.md b/catala/cantar/tastar/tastes_sol/tastes_sol.md new file mode 100644 index 0000000000..035ca794e4 --- /dev/null +++ b/catala/cantar/tastar/tastes_sol/tastes_sol.md @@ -0,0 +1 @@ +T'acostes a l'horitzó i tastes el caramel que cau del sol. Té un gust deliciós i sorprenent, com corrents de calor pessigollant entre les teves dents. Quan te n'has fartat t'adones que rere l'horitzó no hi ha més caramel: només una llarga caiguda al buit. \ No newline at end of file From 038135e0f5f6ba8ca95519c2790101d226033d39 Mon Sep 17 00:00:00 2001 From: Azleur Date: Fri, 31 Jul 2015 17:21:42 +0200 Subject: [PATCH 0403/5486] Separa opcions a tastar --- catala/cantar/tastar/tastar.md | 1 + 1 file changed, 1 insertion(+) diff --git a/catala/cantar/tastar/tastar.md b/catala/cantar/tastar/tastar.md index 3e5374e95b..2612884bb2 100644 --- a/catala/cantar/tastar/tastar.md +++ b/catala/cantar/tastar/tastar.md @@ -1,4 +1,5 @@ Tastes una llaminadura en forma de cor, i a fora sembla que para de ploure. Obres la tenda i... tot és de sucre! El sol regalima lentament sobre l'horitzó gotes de caramel, i et preguntes quin gust deu tindre. [Et pessigues el braç. Això no pot ser real!](../../pessigar-se/pessigar-se.md) + [Tastes les llàgrimes del sol.](tastes_sol/tastes_sol.md) \ No newline at end of file From 32ed2a007f220a155c128059ec570f01a55f7b80 Mon Sep 17 00:00:00 2001 From: Azleur Date: Fri, 31 Jul 2015 17:26:14 +0200 Subject: [PATCH 0404/5486] Separa opcions a tastar --- catala/cantar/tastar/tastar.md | 3 ++- catala/cantar/tastar/tastes_sol/tastes_sol.md | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/catala/cantar/tastar/tastar.md b/catala/cantar/tastar/tastar.md index 2612884bb2..416fe7a4bc 100644 --- a/catala/cantar/tastar/tastar.md +++ b/catala/cantar/tastar/tastar.md @@ -1,4 +1,5 @@ -Tastes una llaminadura en forma de cor, i a fora sembla que para de ploure. Obres la tenda i... tot és de sucre! El sol regalima lentament sobre l'horitzó gotes de caramel, i et preguntes quin gust deu tindre. +Tastes una llaminadura en forma de cor, i a fora sembla que para de ploure. Obres la tenda i... tot és de sucre! +El sol regalima lentament sobre l'horitzó gotes de caramel, i et preguntes quin gust deu tindre. [Et pessigues el braç. Això no pot ser real!](../../pessigar-se/pessigar-se.md) diff --git a/catala/cantar/tastar/tastes_sol/tastes_sol.md b/catala/cantar/tastar/tastes_sol/tastes_sol.md index 035ca794e4..d8c7dfb96c 100644 --- a/catala/cantar/tastar/tastes_sol/tastes_sol.md +++ b/catala/cantar/tastar/tastes_sol/tastes_sol.md @@ -1 +1,3 @@ -T'acostes a l'horitzó i tastes el caramel que cau del sol. Té un gust deliciós i sorprenent, com corrents de calor pessigollant entre les teves dents. Quan te n'has fartat t'adones que rere l'horitzó no hi ha més caramel: només una llarga caiguda al buit. \ No newline at end of file +T'acostes a l'horitzó i tastes el caramel que cau del sol. +Té un gust deliciós i sorprenent, com corrents de calor pessigollant entre les teves dents. +Quan te n'has fartat t'adones que rere l'horitzó no hi ha més caramel: només una llarga caiguda al buit. \ No newline at end of file From d1f8c12d07c55a04d01fb69eaa3ed865a83f36cf Mon Sep 17 00:00:00 2001 From: Ross Date: Fri, 31 Jul 2015 09:41:43 -0700 Subject: [PATCH 0405/5486] Alter use-torch.md Added private-party-island/island.txt --- english/private-party-island/island.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/private-party-island/island.txt diff --git a/english/private-party-island/island.txt b/english/private-party-island/island.txt new file mode 100644 index 0000000000..34ae562dca --- /dev/null +++ b/english/private-party-island/island.txt @@ -0,0 +1,7 @@ +Toronto wins, the 1992 flashback payed off. + +After many nights of partying you find yourself warn out of the game and are ready to go back to work. + +[Before you leave, you should really relieve yourself](../eating-walls/find-a-toilet/find-a-toilet.md) + +[Pull out your phone to find a ride back to life](../check-your-phone/check-your-phone.md) \ No newline at end of file From 23fb10841a4fdda572bafaf5e97993455824504d Mon Sep 17 00:00:00 2001 From: Ross Date: Fri, 31 Jul 2015 09:44:49 -0700 Subject: [PATCH 0406/5486] Alter use-torch.md Add private-party-island/island.txt --- .../find-a-toilet/door/alien/use-torch.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/english/eating-walls/find-a-toilet/door/alien/use-torch.md b/english/eating-walls/find-a-toilet/door/alien/use-torch.md index 03d8f5504b..86f4659b3f 100644 --- a/english/eating-walls/find-a-toilet/door/alien/use-torch.md +++ b/english/eating-walls/find-a-toilet/door/alien/use-torch.md @@ -4,4 +4,14 @@ The three giant pupils staring at you shrivel into pinholes as the alien backs a The alien raises his arm, speaks into a device on his wrist, and disappears in a swirl of light. -"Really? A torch!? Who carries a torch around nowadays? What is this, 1992?" \ No newline at end of file +"Really? A torch!? Who carries a torch around nowadays? What is this, 1992?" + +An echo-ess voice says, "Be it 1992 then..." + +You're teleported to Atlanta-Fulton County Stadium in Atlanta, Georgia on Saturday, October 24, 1992. + +Bottom of the 11th 2 outs, Toronto is winning 2 to 1. The alien appears and offers you a choice to have a ticket with a placed bet for Toronto to win or Atlanta to win. + +[Choose the Atlanta ticket](../../find-a-toilet.md) + +[Choose the Toronto ticket](../../../../private-party-island/island.txt) \ No newline at end of file From 3c3e4499584e17a0c77bee8c8c90cecb0fa1e2d7 Mon Sep 17 00:00:00 2001 From: Cavemanross Date: Fri, 31 Jul 2015 09:48:03 -0700 Subject: [PATCH 0407/5486] Rename island.txt to island.md --- english/private-party-island/{island.txt => island.md} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename english/private-party-island/{island.txt => island.md} (92%) diff --git a/english/private-party-island/island.txt b/english/private-party-island/island.md similarity index 92% rename from english/private-party-island/island.txt rename to english/private-party-island/island.md index 34ae562dca..a1541135a1 100644 --- a/english/private-party-island/island.txt +++ b/english/private-party-island/island.md @@ -4,4 +4,4 @@ After many nights of partying you find yourself warn out of the game and are rea [Before you leave, you should really relieve yourself](../eating-walls/find-a-toilet/find-a-toilet.md) -[Pull out your phone to find a ride back to life](../check-your-phone/check-your-phone.md) \ No newline at end of file +[Pull out your phone to find a ride back to life](../check-your-phone/check-your-phone.md) From 2a19f49abc528f4af09bdc0eb8b76408443edd3d Mon Sep 17 00:00:00 2001 From: Cavemanross Date: Fri, 31 Jul 2015 09:48:30 -0700 Subject: [PATCH 0408/5486] Update use-torch.md --- english/eating-walls/find-a-toilet/door/alien/use-torch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/eating-walls/find-a-toilet/door/alien/use-torch.md b/english/eating-walls/find-a-toilet/door/alien/use-torch.md index 86f4659b3f..5a7acbd373 100644 --- a/english/eating-walls/find-a-toilet/door/alien/use-torch.md +++ b/english/eating-walls/find-a-toilet/door/alien/use-torch.md @@ -14,4 +14,4 @@ Bottom of the 11th 2 outs, Toronto is winning 2 to 1. The alien appears and off [Choose the Atlanta ticket](../../find-a-toilet.md) -[Choose the Toronto ticket](../../../../private-party-island/island.txt) \ No newline at end of file +[Choose the Toronto ticket](../../../../private-party-island/island.md) From a52dba920864ffde5c0dc967b2da6ede23f02a86 Mon Sep 17 00:00:00 2001 From: Diana Garrido Date: Fri, 31 Jul 2015 18:51:01 +0200 Subject: [PATCH 0409/5486] =?UTF-8?q?A=C3=B1adida=20la=20frase=20"No=20sab?= =?UTF-8?q?=C3=ADa=20muy=20bien=20qu=C3=A9=20hacer,=20finalmente..."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/hijo/hijo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/hijo/hijo.md b/espanol/hijo/hijo.md index 9747388bfd..057212da94 100644 --- a/espanol/hijo/hijo.md +++ b/espanol/hijo/hijo.md @@ -2,7 +2,7 @@ Reflexionaba sobre si los consejos que había dado llevarían a su hijo a morir ¿Será que sus convicciones llevarían a una guerra que destruiria a su familia? Quizás, pero de seguro no traería el mejor resultado. -Casualmente apareció el hijo en aquel mismo momento. +Casualmente apareció el hijo en aquel mismo momento. No sabía muy bien qué hacer, finalmente... [Ordena al hijo ocultarse en las mazmorras](mazmorra/mazmorra.md) From 24da121a78686ab88322ed12a4e73c21c984327f Mon Sep 17 00:00:00 2001 From: Diana Garrido Date: Fri, 31 Jul 2015 19:27:17 +0200 Subject: [PATCH 0410/5486] =?UTF-8?q?A=C3=B1adida=20la=20frase=20debajo=20?= =?UTF-8?q?de=20la=20anterior?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/hijo/hijo.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/hijo/hijo.md b/espanol/hijo/hijo.md index 057212da94..4f1c9e2b1b 100644 --- a/espanol/hijo/hijo.md +++ b/espanol/hijo/hijo.md @@ -2,7 +2,9 @@ Reflexionaba sobre si los consejos que había dado llevarían a su hijo a morir ¿Será que sus convicciones llevarían a una guerra que destruiria a su familia? Quizás, pero de seguro no traería el mejor resultado. -Casualmente apareció el hijo en aquel mismo momento. No sabía muy bien qué hacer, finalmente... +Casualmente apareció el hijo en aquel mismo momento. + +No sabía muy bien qué hacer, finalmente... [Ordena al hijo ocultarse en las mazmorras](mazmorra/mazmorra.md) From 23aad49075e0ca6786e1eb61a63327626d592ccf Mon Sep 17 00:00:00 2001 From: Alejandro Date: Fri, 31 Jul 2015 19:43:34 +0200 Subject: [PATCH 0411/5486] =?UTF-8?q?A=C3=B1adir=20estoicismo=20a=20opci?= =?UTF-8?q?=C3=B3n:=20Mir=C3=B3=20hacia=20el=20cielo=20mientras=20pensaba?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/pensamiento/estoicismo/estoicisimo.md | 3 +++ espanol/pensamiento/guerra.md | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 espanol/pensamiento/estoicismo/estoicisimo.md diff --git a/espanol/pensamiento/estoicismo/estoicisimo.md b/espanol/pensamiento/estoicismo/estoicisimo.md new file mode 100644 index 0000000000..5498b18d52 --- /dev/null +++ b/espanol/pensamiento/estoicismo/estoicisimo.md @@ -0,0 +1,3 @@ +La reflexin iba arrastrandose por los rincones de su subconciente queriendo hacerse visible. Tras hacerse paso entre +el caos provocado por sus lamentos, inund su mente. Esto es lo que, de manera simplista, pens el Consejero: +"Las cosas son como son, no como quiero que sean. Por qu sufrir?, debo aceptar la realidad y seguir adelante. \ No newline at end of file diff --git a/espanol/pensamiento/guerra.md b/espanol/pensamiento/guerra.md index 2978ed3f9a..225306958d 100644 --- a/espanol/pensamiento/guerra.md +++ b/espanol/pensamiento/guerra.md @@ -1,4 +1,8 @@ Ser que hoy es el da, aquel da en el que nos preguntamos por que? Por que no disfrute ms el da de ayer ? Por que no vi venir esta situacin ? - Por que cuando todavia estoy en mi poca de juventud ? \ No newline at end of file + Por que cuando todavia estoy en mi poca de juventud ? + +Tras terminar con sus lamentaciones: + +[Una reflexin de gran importancia le asalt](espanol/pensamiento/estoicismo/estoicismo.md) \ No newline at end of file From e4954882a8ee92415fc77c9acbad654a3c0e6c4e Mon Sep 17 00:00:00 2001 From: Alejandro Date: Fri, 31 Jul 2015 19:49:18 +0200 Subject: [PATCH 0412/5486] Corregir nombre de archivo --- espanol/pensamiento/estoicismo/estoicismo.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 espanol/pensamiento/estoicismo/estoicismo.md diff --git a/espanol/pensamiento/estoicismo/estoicismo.md b/espanol/pensamiento/estoicismo/estoicismo.md new file mode 100644 index 0000000000..5498b18d52 --- /dev/null +++ b/espanol/pensamiento/estoicismo/estoicismo.md @@ -0,0 +1,3 @@ +La reflexin iba arrastrandose por los rincones de su subconciente queriendo hacerse visible. Tras hacerse paso entre +el caos provocado por sus lamentos, inund su mente. Esto es lo que, de manera simplista, pens el Consejero: +"Las cosas son como son, no como quiero que sean. Por qu sufrir?, debo aceptar la realidad y seguir adelante. \ No newline at end of file From e798d08443f67ee2985253e00f41fbf3865e9cba Mon Sep 17 00:00:00 2001 From: Alejandro Date: Fri, 31 Jul 2015 19:53:06 +0200 Subject: [PATCH 0413/5486] =?UTF-8?q?Arreglar=20link=20est=C3=A1tico.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/pensamiento/guerra.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/pensamiento/guerra.md b/espanol/pensamiento/guerra.md index 225306958d..a145ab94fa 100644 --- a/espanol/pensamiento/guerra.md +++ b/espanol/pensamiento/guerra.md @@ -5,4 +5,4 @@ Ser Tras terminar con sus lamentaciones: -[Una reflexin de gran importancia le asalt](espanol/pensamiento/estoicismo/estoicismo.md) \ No newline at end of file +[Una reflexin de gran importancia le asalt](estoicismo/estoicismo.md) \ No newline at end of file From 5c2dc7935b27a622c808ca7eae180c67c6f8a3a5 Mon Sep 17 00:00:00 2001 From: Alejandro Date: Fri, 31 Jul 2015 19:58:26 +0200 Subject: [PATCH 0414/5486] Arreglar errata y eliminar archivo innecesario. --- espanol/pensamiento/estoicismo/estoicisimo.md | 3 --- espanol/pensamiento/estoicismo/estoicismo.md | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 espanol/pensamiento/estoicismo/estoicisimo.md diff --git a/espanol/pensamiento/estoicismo/estoicisimo.md b/espanol/pensamiento/estoicismo/estoicisimo.md deleted file mode 100644 index 5498b18d52..0000000000 --- a/espanol/pensamiento/estoicismo/estoicisimo.md +++ /dev/null @@ -1,3 +0,0 @@ -La reflexin iba arrastrandose por los rincones de su subconciente queriendo hacerse visible. Tras hacerse paso entre -el caos provocado por sus lamentos, inund su mente. Esto es lo que, de manera simplista, pens el Consejero: -"Las cosas son como son, no como quiero que sean. Por qu sufrir?, debo aceptar la realidad y seguir adelante. \ No newline at end of file diff --git a/espanol/pensamiento/estoicismo/estoicismo.md b/espanol/pensamiento/estoicismo/estoicismo.md index 5498b18d52..cb6c568249 100644 --- a/espanol/pensamiento/estoicismo/estoicismo.md +++ b/espanol/pensamiento/estoicismo/estoicismo.md @@ -1,3 +1,3 @@ La reflexin iba arrastrandose por los rincones de su subconciente queriendo hacerse visible. Tras hacerse paso entre el caos provocado por sus lamentos, inund su mente. Esto es lo que, de manera simplista, pens el Consejero: -"Las cosas son como son, no como quiero que sean. Por qu sufrir?, debo aceptar la realidad y seguir adelante. \ No newline at end of file +"Las cosas son como son, no como quiero que sean. Por qu sufrir?, debo aceptar la realidad y seguir adelante." \ No newline at end of file From e4121080630fa213057d6e69d73cf4c9b0475cc0 Mon Sep 17 00:00:00 2001 From: Pere Date: Fri, 31 Jul 2015 20:16:54 +0200 Subject: [PATCH 0415/5486] add new page to cantar called surtir_tenda --- catala/cantar/sortir_tenda/sortir_tenda.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 catala/cantar/sortir_tenda/sortir_tenda.md diff --git a/catala/cantar/sortir_tenda/sortir_tenda.md b/catala/cantar/sortir_tenda/sortir_tenda.md new file mode 100644 index 0000000000..774a52aed7 --- /dev/null +++ b/catala/cantar/sortir_tenda/sortir_tenda.md @@ -0,0 +1,2 @@ +Tot pareix normal... Els teus amics estan davant un foc +sota la pluja.. Perquè no s'apaga el foc? \ No newline at end of file From 57b5106f14101cd9105d69f7ffb545c4c9f87b68 Mon Sep 17 00:00:00 2001 From: Pere Date: Fri, 31 Jul 2015 20:19:59 +0200 Subject: [PATCH 0416/5486] add a couple of options at page aixecar --- catala/aixecar/aixecar.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/catala/aixecar/aixecar.md b/catala/aixecar/aixecar.md index 173c5409af..596ba0cc5e 100644 --- a/catala/aixecar/aixecar.md +++ b/catala/aixecar/aixecar.md @@ -1,3 +1,9 @@ T'aixeques del llit i recorres l'habitació intentant recordar on ets -quan de sobte els mobles començen a convertir-se en xocolata. \ No newline at end of file +quan de sobte els mobles començen a convertir-se en xocolata. + +Què fas? + +[agafes el mòbil per fer una foto](../pessigar-se/foto/foto.md) + +[busques una sortida](../sortir/sortir.md) \ No newline at end of file From 98c6eb6c8d35b0cb61c0077ce9b500a6108e58c9 Mon Sep 17 00:00:00 2001 From: Pere Date: Fri, 31 Jul 2015 20:43:08 +0200 Subject: [PATCH 0417/5486] fixe link in canta, I forgot. --- catala/cantar/cantar.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/catala/cantar/cantar.md b/catala/cantar/cantar.md index 554342dbbe..747a7caadf 100644 --- a/catala/cantar/cantar.md +++ b/catala/cantar/cantar.md @@ -4,4 +4,6 @@ prop del teu cap, deu ser això el que t'ha fet somniar amb les parets de sucre. I ara... què vols fer? -[Tasto una llaminadura](tastar/tastar.md) \ No newline at end of file +[Tasto una llaminadura](tastar/tastar.md) + +[Surto de la tenda](sortir_tenda/sortir_tenda.md) \ No newline at end of file From 02a4d75feb7e0adeeeb6f18c9b1c2bd3157825d5 Mon Sep 17 00:00:00 2001 From: Pere Date: Fri, 31 Jul 2015 20:48:22 +0200 Subject: [PATCH 0418/5486] add new option in pessigar-se --- catala/pessigar-se/pessigar-se.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/catala/pessigar-se/pessigar-se.md b/catala/pessigar-se/pessigar-se.md index 75c0919bc6..9c744bdd16 100644 --- a/catala/pessigar-se/pessigar-se.md +++ b/catala/pessigar-se/pessigar-se.md @@ -5,3 +5,5 @@ Qu [Et menges un canari rosa per veure si t gust de nvol](menjar/menjar.md) [treus el mbil per fer una foto als canaris i enviar-la als teus amics](foto/foto.md) + +[Et desmaies, no soportes els canaris... sobretot els roses...](dormir/dormir.md) \ No newline at end of file From 4c275d45cf5ebda6ccbb301056981f9c94912038 Mon Sep 17 00:00:00 2001 From: Pere Date: Fri, 31 Jul 2015 20:53:23 +0200 Subject: [PATCH 0419/5486] fixed link in pessigar-se --- catala/pessigar-se/pessigar-se.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catala/pessigar-se/pessigar-se.md b/catala/pessigar-se/pessigar-se.md index 9c744bdd16..523449378a 100644 --- a/catala/pessigar-se/pessigar-se.md +++ b/catala/pessigar-se/pessigar-se.md @@ -6,4 +6,4 @@ Qu [treus el mbil per fer una foto als canaris i enviar-la als teus amics](foto/foto.md) -[Et desmaies, no soportes els canaris... sobretot els roses...](dormir/dormir.md) \ No newline at end of file +[Et desmaies, no soportes els canaris... sobretot els roses...](../dormir/dormir.md) \ No newline at end of file From d9d9bcbefd97b2a41cad33c56a48c7529783b95f Mon Sep 17 00:00:00 2001 From: Pere Date: Fri, 31 Jul 2015 20:55:01 +0200 Subject: [PATCH 0420/5486] add some lines at option sortir --- catala/sortir/sortir.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/catala/sortir/sortir.md b/catala/sortir/sortir.md index c097863e3c..d9ba8a9014 100644 --- a/catala/sortir/sortir.md +++ b/catala/sortir/sortir.md @@ -1,2 +1,6 @@ Et poses dempeus i busques una sortida, no veus res. De cop i volta, el terra es torna tou i t'enfonses a poc a poc. + +Cada cop estàs més enfonsat... de sobte mires a d'alt i veus +uns peus que es belluguen amb impaciència... aquestes sabates +et sonen... Ets tu! \ No newline at end of file From 1c82fef47bce5f29b902895cb34183a68d7a04c3 Mon Sep 17 00:00:00 2001 From: Cavemanross Date: Fri, 31 Jul 2015 14:03:52 -0700 Subject: [PATCH 0421/5486] Update use-torch.md --- english/eating-walls/find-a-toilet/door/alien/use-torch.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/eating-walls/find-a-toilet/door/alien/use-torch.md b/english/eating-walls/find-a-toilet/door/alien/use-torch.md index 5a7acbd373..7eed17a537 100644 --- a/english/eating-walls/find-a-toilet/door/alien/use-torch.md +++ b/english/eating-walls/find-a-toilet/door/alien/use-torch.md @@ -10,8 +10,9 @@ An echo-ess voice says, "Be it 1992 then..." You're teleported to Atlanta-Fulton County Stadium in Atlanta, Georgia on Saturday, October 24, 1992. -Bottom of the 11th 2 outs, Toronto is winning 2 to 1. The alien appears and offers you a choice to have a ticket with a placed bet for Toronto to win or Atlanta to win. +Bottom of the 11th 2 outs, Toronto is winning 2 to 1. The alien appears and offers you a choice to +have a ticket with a placed bet for Toronto to win or Atlanta to win. [Choose the Atlanta ticket](../../find-a-toilet.md) -[Choose the Toronto ticket](../../../../private-party-island/island.md) +[Choose the Toronto ticket](../../../../private-party-island/island.txt) From c4635b601eebe25f5256c067c05572eec154e467 Mon Sep 17 00:00:00 2001 From: Cavemanross Date: Fri, 31 Jul 2015 14:10:25 -0700 Subject: [PATCH 0422/5486] Update use-torch.md --- english/eating-walls/find-a-toilet/door/alien/use-torch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/eating-walls/find-a-toilet/door/alien/use-torch.md b/english/eating-walls/find-a-toilet/door/alien/use-torch.md index 7eed17a537..8026ed7079 100644 --- a/english/eating-walls/find-a-toilet/door/alien/use-torch.md +++ b/english/eating-walls/find-a-toilet/door/alien/use-torch.md @@ -15,4 +15,4 @@ have a ticket with a placed bet for Toronto to win or Atlanta to win. [Choose the Atlanta ticket](../../find-a-toilet.md) -[Choose the Toronto ticket](../../../../private-party-island/island.txt) +[Choose the Toronto ticket](../../../../private-party-island/island.md) From 690c3a42e643808face21aa490c2972624172ec7 Mon Sep 17 00:00:00 2001 From: capca Date: Fri, 31 Jul 2015 16:20:06 -0500 Subject: [PATCH 0423/5486] Link added to lanzaronPeriodista.md --- espanol/noticias/burla-periodista/leones/leones.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/espanol/noticias/burla-periodista/leones/leones.md b/espanol/noticias/burla-periodista/leones/leones.md index e0bbe9ba29..eaf67e3daa 100644 --- a/espanol/noticias/burla-periodista/leones/leones.md +++ b/espanol/noticias/burla-periodista/leones/leones.md @@ -1,3 +1,9 @@ El periodista queda rodeado por 4 expectaculares fieras que podrían destrozrlo tan solo al escuchar a Beatito chasquir sus dedos. + + +Y después: + + +[Se abalanzó](../leones/lanzaronPeriodista.md) \ No newline at end of file From cbde3cb9437df9b6423d535fb0a0107217e5e70d Mon Sep 17 00:00:00 2001 From: capca Date: Fri, 31 Jul 2015 16:22:01 -0500 Subject: [PATCH 0424/5486] lanzaronPeriodista.md story line added --- espanol/noticias/burla-periodista/leones/lanzaronPeriodista.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/noticias/burla-periodista/leones/lanzaronPeriodista.md diff --git a/espanol/noticias/burla-periodista/leones/lanzaronPeriodista.md b/espanol/noticias/burla-periodista/leones/lanzaronPeriodista.md new file mode 100644 index 0000000000..f0f55428b5 --- /dev/null +++ b/espanol/noticias/burla-periodista/leones/lanzaronPeriodista.md @@ -0,0 +1 @@ +Y dos de los leones se lanzaron sobre el periodista. \ No newline at end of file From 2cf0aa23c5c2ecbc663cdfd8e3383bc8b989b585 Mon Sep 17 00:00:00 2001 From: Eric Waite Date: Fri, 31 Jul 2015 21:10:15 -0400 Subject: [PATCH 0425/5486] Added spay phrase for Bob Barker, he always must say that as his last line. --- english/bob-barker/barker.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/bob-barker/barker.md b/english/bob-barker/barker.md index 416cbaa12f..10109456b7 100644 --- a/english/bob-barker/barker.md +++ b/english/bob-barker/barker.md @@ -18,6 +18,8 @@ The flaming hot marshmallows are gesturing suggestively at the doors while swayi "Which door is the door for you, the blue door, or the red door?", he asks. +"Before you decide, Remember help control the pet population. Have your pet spayed or neutered.", he announced. + You hesitate just a moment before replying... [The blue door](1970s/1970s.md) From 90fed9ce5727b1706ded8295a6217346dc02ba97 Mon Sep 17 00:00:00 2001 From: Robinson Raju Date: Fri, 31 Jul 2015 18:10:59 -0700 Subject: [PATCH 0426/5486] Add dream 2 in wake-up, wake-up-again. --- english/wake-up/wake-up-again/dream2/dream2.md | 3 +++ english/wake-up/wake-up-again/wake-up-again.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/wake-up/wake-up-again/dream2/dream2.md diff --git a/english/wake-up/wake-up-again/dream2/dream2.md b/english/wake-up/wake-up-again/dream2/dream2.md new file mode 100644 index 0000000000..162ceb90f0 --- /dev/null +++ b/english/wake-up/wake-up-again/dream2/dream2.md @@ -0,0 +1,3 @@ +You look up and see beautiful blue sky. It is a bright sunny day. +You look around and you see big white cyclinders everywhere on all four sides. +Suddenly an aircraft flies by. In the shiny underbelly of the airplane you see a sea of white cyclinders stretched across the landscape and realize that you are just a marshmallow among thousands in a vast island of marshmallows. \ No newline at end of file diff --git a/english/wake-up/wake-up-again/wake-up-again.md b/english/wake-up/wake-up-again/wake-up-again.md index 559abdcd2c..058943f5b1 100644 --- a/english/wake-up/wake-up-again/wake-up-again.md +++ b/english/wake-up/wake-up-again/wake-up-again.md @@ -10,4 +10,4 @@ figured you’d be able to go back to sleep. But not back to the nightmare you just had, obviously. -As your eyes droop and you started drifting back into the other world +As your eyes droop and you started drifting back into the other world [.. into another dream](dream2/dream2.md) From 680ddaf3d73f5f9a3538ce462630fda7b65bf233 Mon Sep 17 00:00:00 2001 From: cezarywork Date: Sat, 1 Aug 2015 11:48:40 +1000 Subject: [PATCH 0427/5486] Update marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index c536cb1d8a..9db8a9d1ba 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -401,3 +401,5 @@ Do you: [Utilize your wand once again...](utilize-wand/fork-rope-wand.md) [Stop, hammertime!](hammertime/hammertime.md) + +[Analise the compisition of the marshmallow](analize/analysis.md) From 6b6ca3bc2a78193d58d8902c7d47e91f8d675a48 Mon Sep 17 00:00:00 2001 From: cezarywork Date: Sat, 1 Aug 2015 12:02:39 +1000 Subject: [PATCH 0428/5486] Update marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 9db8a9d1ba..7cec038fa0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -402,4 +402,4 @@ Do you: [Stop, hammertime!](hammertime/hammertime.md) -[Analise the compisition of the marshmallow](analize/analysis.md) +[Analyze the composition of the marshmallow](analyze/analysis.md) From 7ccd78921aade9fdbbe82de3be94ed773a10ae0c Mon Sep 17 00:00:00 2001 From: CEZARY_WISNIEWSKI Date: Sat, 1 Aug 2015 12:10:36 +1000 Subject: [PATCH 0429/5486] Feat: Add analysis of the marshmallow --- english/analyze/analysis.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/analyze/analysis.md diff --git a/english/analyze/analysis.md b/english/analyze/analysis.md new file mode 100644 index 0000000000..108ac99846 --- /dev/null +++ b/english/analyze/analysis.md @@ -0,0 +1 @@ +Surprisingly, this is not really marshmallow. It only looks like it but in reality it is made out of... \ No newline at end of file From 40792cc5f57034b0aedb1eba2aa4cd84c6da302e Mon Sep 17 00:00:00 2001 From: Siddharth Nair Date: Sat, 1 Aug 2015 15:58:29 +0530 Subject: [PATCH 0430/5486] New line added --- Malayalam/malayalam.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index 460bd8e4b0..aeaedbf8f2 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -1 +1,3 @@ -ഞാൻ ഒരു മലയാളി. ഒരു സാഹസിക യാത്രയുടെ തുടക്കം. \ No newline at end of file +ഞാൻ ഒരു മലയാളി. ഒരു സാഹസിക യാത്രയുടെ തുടക്കം. + +ഇത് ഒരു നല്ല [കുട്ടിയുടെ](Malayalam/boy/life.md) കഥയാണ് \ No newline at end of file From 50fc1f17f2a5b68c95ff798d12cc97f0d0229fa8 Mon Sep 17 00:00:00 2001 From: Siddharth Nair Date: Sat, 1 Aug 2015 15:59:32 +0530 Subject: [PATCH 0431/5486] Story of boy --- Malayalam/boy/life.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Malayalam/boy/life.md diff --git a/Malayalam/boy/life.md b/Malayalam/boy/life.md new file mode 100644 index 0000000000..13b83cad7e --- /dev/null +++ b/Malayalam/boy/life.md @@ -0,0 +1 @@ +ഈ കുട്ടിയുടെ പേര്? \ No newline at end of file From 2164155ff2bd70f23b06f4ad867c3aad9c66ec75 Mon Sep 17 00:00:00 2001 From: Siddharth Nair Date: Sat, 1 Aug 2015 16:10:02 +0530 Subject: [PATCH 0432/5486] Corrected Path --- Malayalam/malayalam.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index aeaedbf8f2..a2421d5adf 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -1,3 +1,3 @@ ഞാൻ ഒരു മലയാളി. ഒരു സാഹസിക യാത്രയുടെ തുടക്കം. -ഇത് ഒരു നല്ല [കുട്ടിയുടെ](Malayalam/boy/life.md) കഥയാണ് \ No newline at end of file +ഇത് ഒരു നല്ല [കുട്ടിയുടെ](boy/life.md) കഥയാണ് \ No newline at end of file From d465d0887f78afe068ed5cfeb6aa22926780f25e Mon Sep 17 00:00:00 2001 From: Carlos Lopes Pereira Date: Sat, 1 Aug 2015 14:13:39 +0200 Subject: [PATCH 0433/5486] Add to superman's befuddlement. --- english/plummet/plummet.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/plummet/plummet.md b/english/plummet/plummet.md index 6253eef34f..263a605874 100644 --- a/english/plummet/plummet.md +++ b/english/plummet/plummet.md @@ -1,6 +1,9 @@ Instead of flying like Superman, you plummet to earth like a rock! The air roars in your ears as you realize you made a horrible mistake. +You don't know which muscle to contract. Surely flapping your arms like the +birds won't help. Doesn't even look graceful. + Do you: A. Panic. From 4d3ac82898ce6b688f692389d95c0f081eb3a3ed Mon Sep 17 00:00:00 2001 From: An Tran Minh Date: Sun, 2 Aug 2015 03:05:05 +0700 Subject: [PATCH 0434/5486] Add vietnamese version --- language.md | 2 ++ vietnamese/kechuyen.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 vietnamese/kechuyen.md diff --git a/language.md b/language.md index 49f9e93972..205ff2d707 100644 --- a/language.md +++ b/language.md @@ -106,3 +106,5 @@ Ako govorite srpski [klikni ovde](serbian/start.md) If you speak Urdu [click here](urdu/urdu-news.md) Ako govorite Bosanski jezik/If You speak Bosnian language [kliknite ovdje/click here](Bosnian/Bosnian_story.md) + +Nếu bạn nói tiếng Việt, [nhấn vào link này](vietnamse/kechuyen.md). \ No newline at end of file diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md new file mode 100644 index 0000000000..7b1202e5e8 --- /dev/null +++ b/vietnamese/kechuyen.md @@ -0,0 +1 @@ +Bạn thích nghe [truyện ma](https://www.youtube.com/watch?v=0dfWjEKXpZk)? \ No newline at end of file From 760777b23e120d53435a0c88b2996a7c55e7f432 Mon Sep 17 00:00:00 2001 From: An Tran Minh Date: Sun, 2 Aug 2015 03:07:41 +0700 Subject: [PATCH 0435/5486] Fix link --- language.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language.md b/language.md index 205ff2d707..ed1b646fb9 100644 --- a/language.md +++ b/language.md @@ -107,4 +107,4 @@ If you speak Urdu [click here](urdu/urdu-news.md) Ako govorite Bosanski jezik/If You speak Bosnian language [kliknite ovdje/click here](Bosnian/Bosnian_story.md) -Nếu bạn nói tiếng Việt, [nhấn vào link này](vietnamse/kechuyen.md). \ No newline at end of file +Nếu bạn nói tiếng Việt, [nhấn vào link này](vietnamese/kechuyen.md). \ No newline at end of file From 70fc2a44e0902736c3a6286fd8247167f8ded562 Mon Sep 17 00:00:00 2001 From: Peter Rado Date: Sun, 2 Aug 2015 10:39:55 +0200 Subject: [PATCH 0436/5486] Update storyline alvas. --- hungarian/alvas/megnezem.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 hungarian/alvas/megnezem.md diff --git a/hungarian/alvas/megnezem.md b/hungarian/alvas/megnezem.md new file mode 100644 index 0000000000..9362a4eb14 --- /dev/null +++ b/hungarian/alvas/megnezem.md @@ -0,0 +1,2 @@ +Ezen felbuzdulva közelebb megyek megnézem. +Közben belelépek egy mályvacukor pocsolyába. \ No newline at end of file From 77dfed5a929d2c3736a707cf7c95a4ee1968f638 Mon Sep 17 00:00:00 2001 From: Peter Rado Date: Sun, 2 Aug 2015 10:52:16 +0200 Subject: [PATCH 0437/5486] Create directory megnezem, move megnezem.md to this directory. --- hungarian/alvas/megnezem.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 hungarian/alvas/megnezem.md diff --git a/hungarian/alvas/megnezem.md b/hungarian/alvas/megnezem.md deleted file mode 100644 index 9362a4eb14..0000000000 --- a/hungarian/alvas/megnezem.md +++ /dev/null @@ -1,2 +0,0 @@ -Ezen felbuzdulva közelebb megyek megnézem. -Közben belelépek egy mályvacukor pocsolyába. \ No newline at end of file From 2c29bdf6e0d181db5ca1e9de8849e6294de045ff Mon Sep 17 00:00:00 2001 From: Peter Rado Date: Sun, 2 Aug 2015 10:55:58 +0200 Subject: [PATCH 0438/5486] =?UTF-8?q?Add=20new=20option=20[Megn=C3=A9zem]?= =?UTF-8?q?=20to=20alvas/alom.md.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hungarian/alvas/alom.md | 4 ++++ hungarian/alvas/megnezem/megnezem.md | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 hungarian/alvas/megnezem/megnezem.md diff --git a/hungarian/alvas/alom.md b/hungarian/alvas/alom.md index 8a46afb960..6a6ef1aa3d 100644 --- a/hungarian/alvas/alom.md +++ b/hungarian/alvas/alom.md @@ -1,2 +1,6 @@ Alomba szenderulsz. Almaidban talalkozol a malyvacukor kiralylannyal, es eszreveszed, hogy a kiralylany is meztelen. + +Mit teszel? + +[Megnézem](megnezem/megnezem.md) diff --git a/hungarian/alvas/megnezem/megnezem.md b/hungarian/alvas/megnezem/megnezem.md new file mode 100644 index 0000000000..9362a4eb14 --- /dev/null +++ b/hungarian/alvas/megnezem/megnezem.md @@ -0,0 +1,2 @@ +Ezen felbuzdulva közelebb megyek megnézem. +Közben belelépek egy mályvacukor pocsolyába. \ No newline at end of file From d98476cd27847c663026aba12c9ce415149824e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franklin=20Lindemberg=20Guimar=C3=A3es?= Date: Sun, 2 Aug 2015 14:01:26 -0300 Subject: [PATCH 0439/5486] Change history! --- portugues_pt/mundo/inventar/inventar.md | 1 + portugues_pt/mundo/voltaaomundo.md | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 portugues_pt/mundo/inventar/inventar.md diff --git a/portugues_pt/mundo/inventar/inventar.md b/portugues_pt/mundo/inventar/inventar.md new file mode 100644 index 0000000000..460ccebd08 --- /dev/null +++ b/portugues_pt/mundo/inventar/inventar.md @@ -0,0 +1 @@ +Invetaria uma forma onde todas as pessoas pudessem ter as mesmas oportunidades de trabalho e qualidade de vida! \ No newline at end of file diff --git a/portugues_pt/mundo/voltaaomundo.md b/portugues_pt/mundo/voltaaomundo.md index c707f2d73a..b496ad9e30 100644 --- a/portugues_pt/mundo/voltaaomundo.md +++ b/portugues_pt/mundo/voltaaomundo.md @@ -2,4 +2,11 @@ Conhecer os 5 continentes Primeiro comeava por visitar todos os pases da europa. -E porque no, em seguida, fazer a Route 66 e ir de uma ponta outra dos Estados Unidos? Passando pelo Canad, claro! \ No newline at end of file +E porque no, em seguida, fazer a Route 66 e ir de uma ponta outra dos Estados Unidos? Passando pelo Canad, claro! + +Ao final desta viagem, voc sente que ainda falta algo na vida e percebe que ainda possui bastante dinheiro. + +O que seria este algo faltando? + + +[Invertar](inventar/inventar.md) algo que mudasse a vida de todos para melhor! \ No newline at end of file From 5343ec422160b013418f82e6deb3525b7a35d669 Mon Sep 17 00:00:00 2001 From: Nima Date: Mon, 3 Aug 2015 01:34:03 +0800 Subject: [PATCH 0440/5486] Little me first version --- english/little-me/Apple/Apple.md | 15 +++++++++++++++ english/little-me/Candy/Candy.md | 15 +++++++++++++++ english/little-me/little-me.md | 9 +++++++++ 3 files changed, 39 insertions(+) create mode 100644 english/little-me/Apple/Apple.md create mode 100644 english/little-me/Candy/Candy.md create mode 100644 english/little-me/little-me.md diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md new file mode 100644 index 0000000000..9233b38c97 --- /dev/null +++ b/english/little-me/Apple/Apple.md @@ -0,0 +1,15 @@ +Thank you so much. +Now that I am full I can rewinde the time. + +Do you like to see my powers? + +You Choose Say To: + + +[Yes Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english/little-me/) + +[No Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english/) + +[Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/) + +[No](https://github.com/udacity/create-your-own-adventure/tree/master/english/) \ No newline at end of file diff --git a/english/little-me/Candy/Candy.md b/english/little-me/Candy/Candy.md new file mode 100644 index 0000000000..9233b38c97 --- /dev/null +++ b/english/little-me/Candy/Candy.md @@ -0,0 +1,15 @@ +Thank you so much. +Now that I am full I can rewinde the time. + +Do you like to see my powers? + +You Choose Say To: + + +[Yes Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english/little-me/) + +[No Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english/) + +[Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/) + +[No](https://github.com/udacity/create-your-own-adventure/tree/master/english/) \ No newline at end of file diff --git a/english/little-me/little-me.md b/english/little-me/little-me.md new file mode 100644 index 0000000000..0333993784 --- /dev/null +++ b/english/little-me/little-me.md @@ -0,0 +1,9 @@ +I am little lonely alien! + +Please Feed Me! + +You Choose To: + +[Feed him Apple](../little-me/Apple) + +[Feed him Candy](../little-me/Candy) \ No newline at end of file From a8eeaa6c8e048edd19b9698bc20bdec7bc4788fc Mon Sep 17 00:00:00 2001 From: Nima Date: Mon, 3 Aug 2015 01:37:56 +0800 Subject: [PATCH 0441/5486] little me version 2 --- english/little-me/Apple/Apple.md | 4 ++-- english/little-me/Candy/Candy.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index 9233b38c97..aafe839428 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -6,9 +6,9 @@ Do you like to see my powers? You Choose Say To: -[Yes Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english/little-me/) +[Yes Local](https://github.com/Arsacues/create-your-own-adventure/tree/english/little-me/) -[No Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english/) +[No Local](https://github.com/Arsacues/create-your-own-adventure/master/english/) [Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/) diff --git a/english/little-me/Candy/Candy.md b/english/little-me/Candy/Candy.md index 9233b38c97..8305e5a9b4 100644 --- a/english/little-me/Candy/Candy.md +++ b/english/little-me/Candy/Candy.md @@ -6,9 +6,9 @@ Do you like to see my powers? You Choose Say To: -[Yes Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english/little-me/) +[Yes Local](https://github.com/Arsacues/create-your-own-adventure/english/little-me/) -[No Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english/) +[No Local](https://github.com/Arsacues/create-your-own-adventure/english/) [Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/) From dbf957bcd2130d030259be62276667968a43a5ac Mon Sep 17 00:00:00 2001 From: Nima Date: Mon, 3 Aug 2015 01:42:14 +0800 Subject: [PATCH 0442/5486] little me version 3 --- english/little-me/Apple/Apple.md | 4 ++-- english/little-me/Candy/Candy.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index aafe839428..991b5e4d13 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -6,9 +6,9 @@ Do you like to see my powers? You Choose Say To: -[Yes Local](https://github.com/Arsacues/create-your-own-adventure/tree/english/little-me/) +[Yes Local](https://github.com/Arsacues/create-your-own-adventure/blob/LittleMe/english/little-me/little-me.md) -[No Local](https://github.com/Arsacues/create-your-own-adventure/master/english/) +[No Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english) [Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/) diff --git a/english/little-me/Candy/Candy.md b/english/little-me/Candy/Candy.md index 8305e5a9b4..991b5e4d13 100644 --- a/english/little-me/Candy/Candy.md +++ b/english/little-me/Candy/Candy.md @@ -6,9 +6,9 @@ Do you like to see my powers? You Choose Say To: -[Yes Local](https://github.com/Arsacues/create-your-own-adventure/english/little-me/) +[Yes Local](https://github.com/Arsacues/create-your-own-adventure/blob/LittleMe/english/little-me/little-me.md) -[No Local](https://github.com/Arsacues/create-your-own-adventure/english/) +[No Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english) [Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/) From 28f6763045818bd10a57306f1323bbb88ffeb6b6 Mon Sep 17 00:00:00 2001 From: Nima Date: Mon, 3 Aug 2015 01:46:57 +0800 Subject: [PATCH 0443/5486] little me version 4 --- english/little-me/Apple/Apple.md | 2 +- english/little-me/Candy/Candy.md | 2 +- english/little-me/little-me.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index 991b5e4d13..a593fea09e 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -10,6 +10,6 @@ You Choose Say To: [No Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english) -[Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/) +[Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/little-me.md) [No](https://github.com/udacity/create-your-own-adventure/tree/master/english/) \ No newline at end of file diff --git a/english/little-me/Candy/Candy.md b/english/little-me/Candy/Candy.md index 991b5e4d13..a593fea09e 100644 --- a/english/little-me/Candy/Candy.md +++ b/english/little-me/Candy/Candy.md @@ -10,6 +10,6 @@ You Choose Say To: [No Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english) -[Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/) +[Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/little-me.md) [No](https://github.com/udacity/create-your-own-adventure/tree/master/english/) \ No newline at end of file diff --git a/english/little-me/little-me.md b/english/little-me/little-me.md index 0333993784..c9ac08760f 100644 --- a/english/little-me/little-me.md +++ b/english/little-me/little-me.md @@ -4,6 +4,6 @@ Please Feed Me! You Choose To: -[Feed him Apple](../little-me/Apple) +[Feed him Apple](../little-me/Apple/Apple.md) -[Feed him Candy](../little-me/Candy) \ No newline at end of file +[Feed him Candy](../little-me/Candy/Candy.md) \ No newline at end of file From fe884666ca8def19d4373e5f4f89575c5d6ebfbb Mon Sep 17 00:00:00 2001 From: Nima Date: Mon, 3 Aug 2015 01:54:27 +0800 Subject: [PATCH 0444/5486] little me version 1 --- english/little-me/Apple/Apple.md | 9 ++------- english/little-me/Candy/Candy.md | 9 ++------- english/little-me/little-me.md | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index a593fea09e..78e03a6c74 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -1,14 +1,9 @@ Thank you so much. -Now that I am full I can rewinde the time. +Now that I am full I can rewind the time. Do you like to see my powers? -You Choose Say To: - - -[Yes Local](https://github.com/Arsacues/create-your-own-adventure/blob/LittleMe/english/little-me/little-me.md) - -[No Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english) +You Choosed To Say: [Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/little-me.md) diff --git a/english/little-me/Candy/Candy.md b/english/little-me/Candy/Candy.md index a593fea09e..78e03a6c74 100644 --- a/english/little-me/Candy/Candy.md +++ b/english/little-me/Candy/Candy.md @@ -1,14 +1,9 @@ Thank you so much. -Now that I am full I can rewinde the time. +Now that I am full I can rewind the time. Do you like to see my powers? -You Choose Say To: - - -[Yes Local](https://github.com/Arsacues/create-your-own-adventure/blob/LittleMe/english/little-me/little-me.md) - -[No Local](https://github.com/Arsacues/create-your-own-adventure/tree/master/english) +You Choosed To Say: [Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/little-me.md) diff --git a/english/little-me/little-me.md b/english/little-me/little-me.md index c9ac08760f..e27c7dcf04 100644 --- a/english/little-me/little-me.md +++ b/english/little-me/little-me.md @@ -1,4 +1,4 @@ -I am little lonely alien! +I am a little lonely alien! That's why They call me LLA. Please Feed Me! From 5a670f1863ce314aedd7f5157ccc126e4a085283 Mon Sep 17 00:00:00 2001 From: Jeffrey Cunningham Date: Sun, 2 Aug 2015 14:10:10 -0400 Subject: [PATCH 0445/5486] add option to quit job --- english/quit-your-job/quit-your-job.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/quit-your-job/quit-your-job.md diff --git a/english/quit-your-job/quit-your-job.md b/english/quit-your-job/quit-your-job.md new file mode 100644 index 0000000000..8a2a4a7425 --- /dev/null +++ b/english/quit-your-job/quit-your-job.md @@ -0,0 +1,5 @@ +You suddenly decide that coding and enjoying your life are far mor important than saving money. You decide that you are going to take the leap and quit your job in December 2015. As a result you must decide to + +[Move to Brazil](../Brazil.md) + +[wait and go to the phillipines with your friend.](../Philippines) \ No newline at end of file From 3a7c6b474d570e69e13f03a761306ce2d182e66f Mon Sep 17 00:00:00 2001 From: Jeffrey Cunningham Date: Sun, 2 Aug 2015 14:38:22 -0400 Subject: [PATCH 0446/5486] make requested changes --- english/mirror/enter-mirror.md | 2 ++ english/quit-your-job/quit-your-job.md | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/english/mirror/enter-mirror.md b/english/mirror/enter-mirror.md index 5338280b59..1e4058f945 100644 --- a/english/mirror/enter-mirror.md +++ b/english/mirror/enter-mirror.md @@ -5,3 +5,5 @@ It's not a mirror, it's a door to a marshmellow room that looks identical to the [Go back to the previous room](../marshmallow.md) [Look for a toilet](../eating-walls/find-a-toilet/find-a-toilet.md) + +[quit your job](../quit-yourjob/quit-your-job.md) \ No newline at end of file diff --git a/english/quit-your-job/quit-your-job.md b/english/quit-your-job/quit-your-job.md index 8a2a4a7425..c66ebf6b69 100644 --- a/english/quit-your-job/quit-your-job.md +++ b/english/quit-your-job/quit-your-job.md @@ -1,5 +1,2 @@ -You suddenly decide that coding and enjoying your life are far mor important than saving money. You decide that you are going to take the leap and quit your job in December 2015. As a result you must decide to - -[Move to Brazil](../Brazil.md) - -[wait and go to the phillipines with your friend.](../Philippines) \ No newline at end of file +You suddenly decide that coding and enjoying your life are far mor important than saving money. +You decide that you are going to take the leap and quit your job in December 2015. From a5befcd11249dce0e2345c8c8492315bab80e31a Mon Sep 17 00:00:00 2001 From: Jeffrey Cunningham Date: Sun, 2 Aug 2015 14:50:19 -0400 Subject: [PATCH 0447/5486] fix link --- english/mirror/enter-mirror.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/mirror/enter-mirror.md b/english/mirror/enter-mirror.md index 1e4058f945..4db0b404bc 100644 --- a/english/mirror/enter-mirror.md +++ b/english/mirror/enter-mirror.md @@ -6,4 +6,4 @@ It's not a mirror, it's a door to a marshmellow room that looks identical to the [Look for a toilet](../eating-walls/find-a-toilet/find-a-toilet.md) -[quit your job](../quit-yourjob/quit-your-job.md) \ No newline at end of file +[quit your job](../quit-your-job/quit-your-job.md) \ No newline at end of file From 780556ca53db1f4198e89c0c916781800ffc4137 Mon Sep 17 00:00:00 2001 From: Rafael Tosetto Date: Sun, 2 Aug 2015 20:49:34 -0300 Subject: [PATCH 0448/5486] Adicionada continuacao da estoria do watch, e criado dois novos caminhos a serem seguidos --- .../diff/pull/reenvio/watch/divulga/divulga.md | 3 +++ .../diff/pull/reenvio/watch/emprego/emprego.md | 4 ++++ .../colabora/comdiferencas/diff/pull/reenvio/watch/watch.md | 6 +++++- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md create mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md new file mode 100644 index 0000000000..c84bc11c40 --- /dev/null +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md @@ -0,0 +1,3 @@ +Com o passar do tempo e aumento de sua reputação na comunidade open source, você foi chamado para +participar em eventos de TI para realizar treinamentos de Git e GitHub: + diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md new file mode 100644 index 0000000000..feef939120 --- /dev/null +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md @@ -0,0 +1,4 @@ +Você foi aprovado em uma entrevista de emprego na empresa cujo nome possui três letras + pelo fato de ter contribuido para a comunidade open source, através de correções de bugs +e criação de novas features em aplicações de terceiros: + diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/watch.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/watch.md index 9a7130863b..f021fafe20 100644 --- a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/watch.md +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/watch.md @@ -1,2 +1,6 @@ Dando WATCH você passa a receber notificações sobre novas alterações, como você acha que ser -contribuinte em um repositório open source pode ajudar na sua carreira ? \ No newline at end of file +contribuinte em um repositório open source pode ajudar na sua carreira ? + +[Para adicionar no currículo e mostrar como diferencial em uma entrevista de emprego] (emprego/emprego.md) + +[Divulgar o seu nome e, consequentemente, o seu trabalho para a comunidade open source] (divulga/divulga.md) From 4bcdb4baa37232b83268ba164715c894d55d86b9 Mon Sep 17 00:00:00 2001 From: Sallust Date: Sun, 2 Aug 2015 20:16:36 -0400 Subject: [PATCH 0449/5486] Add taxi-trouble file and folder; include link in paris story --- english/coffee/Paris/fly-to-paris.md | 4 +++- english/coffee/Paris/taxi-trouble/taxi-trouble.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/coffee/Paris/taxi-trouble/taxi-trouble.md diff --git a/english/coffee/Paris/fly-to-paris.md b/english/coffee/Paris/fly-to-paris.md index 6ae8d94860..648230fad3 100644 --- a/english/coffee/Paris/fly-to-paris.md +++ b/english/coffee/Paris/fly-to-paris.md @@ -10,4 +10,6 @@ You mustled up some courage, remembered the few French phrases you know, went up She walks towards a local train into the city. Do you? -[Follow her on the train?](city-train/city-train.md) \ No newline at end of file +[Follow her on the train?](city-train/city-train.md) + +[Walk toward the taxi stand, instead](taxi-trouble/taxi-trouble.md) \ No newline at end of file diff --git a/english/coffee/Paris/taxi-trouble/taxi-trouble.md b/english/coffee/Paris/taxi-trouble/taxi-trouble.md new file mode 100644 index 0000000000..8318c86b35 --- /dev/null +++ b/english/coffee/Paris/taxi-trouble/taxi-trouble.md @@ -0,0 +1 @@ +Test \ No newline at end of file From e7ea1e1d013f77ded91e069b9566cf5fbc62d5f7 Mon Sep 17 00:00:00 2001 From: Sallust Date: Sun, 2 Aug 2015 20:49:18 -0400 Subject: [PATCH 0450/5486] Add marshmallow mafia and exile endings --- english/coffee/Paris/taxi-trouble/exile/exile.md | 3 +++ .../Paris/taxi-trouble/marshmallow-mafia/mafia.md | 3 +++ english/coffee/Paris/taxi-trouble/taxi-trouble.md | 10 +++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 english/coffee/Paris/taxi-trouble/exile/exile.md create mode 100644 english/coffee/Paris/taxi-trouble/marshmallow-mafia/mafia.md diff --git a/english/coffee/Paris/taxi-trouble/exile/exile.md b/english/coffee/Paris/taxi-trouble/exile/exile.md new file mode 100644 index 0000000000..6b890874cc --- /dev/null +++ b/english/coffee/Paris/taxi-trouble/exile/exile.md @@ -0,0 +1,3 @@ +Content never to see another marshmallow again, you run for you life and never look back. + +You spend the rest of your days working for a cruel vintner who, after decades, still doesn't believe your fantastical story of escape. \ No newline at end of file diff --git a/english/coffee/Paris/taxi-trouble/marshmallow-mafia/mafia.md b/english/coffee/Paris/taxi-trouble/marshmallow-mafia/mafia.md new file mode 100644 index 0000000000..1c2d073acd --- /dev/null +++ b/english/coffee/Paris/taxi-trouble/marshmallow-mafia/mafia.md @@ -0,0 +1,3 @@ +Valiantly and boldy you turn around, the responsibility of saving your homeland on your shoulders. + +Unmoved by your self-determination, the goon shoots you instantly turning you into sugar, the food of the marshmallow people. diff --git a/english/coffee/Paris/taxi-trouble/taxi-trouble.md b/english/coffee/Paris/taxi-trouble/taxi-trouble.md index 8318c86b35..c769fdd9ef 100644 --- a/english/coffee/Paris/taxi-trouble/taxi-trouble.md +++ b/english/coffee/Paris/taxi-trouble/taxi-trouble.md @@ -1 +1,9 @@ -Test \ No newline at end of file +You start walking towards the taxi-stand and begin to formulate a plan to save your homeland from sinister marshmallow encroachment. +Surely the French will be able to assist you? +Suddenly you realize you are being followed by someone in the marshmallow mafia!!! +He must have overheard your conversation with the beautiful French woman. +[Do you confront him?](marshmallow-mafia/mafia.md) + +or + +[Run for it!](exile/exile.md) From 35d96af6f573b9d0d408749e43ccadc0e0aab39f Mon Sep 17 00:00:00 2001 From: Sallust Date: Sun, 2 Aug 2015 20:56:14 -0400 Subject: [PATCH 0451/5486] Format changes in Taxi Trouble page --- english/coffee/Paris/taxi-trouble/taxi-trouble.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/english/coffee/Paris/taxi-trouble/taxi-trouble.md b/english/coffee/Paris/taxi-trouble/taxi-trouble.md index c769fdd9ef..ec0d81d424 100644 --- a/english/coffee/Paris/taxi-trouble/taxi-trouble.md +++ b/english/coffee/Paris/taxi-trouble/taxi-trouble.md @@ -1,9 +1,11 @@ -You start walking towards the taxi-stand and begin to formulate a plan to save your homeland from sinister marshmallow encroachment. -Surely the French will be able to assist you? +You start walking towards the taxi-stand and begin formulating a plan to save your homeland from sinister marshmallow encroachment. + Suddenly you realize you are being followed by someone in the marshmallow mafia!!! + He must have overheard your conversation with the beautiful French woman. + [Do you confront him?](marshmallow-mafia/mafia.md) or -[Run for it!](exile/exile.md) +[Run for it!](exile/exile.md) \ No newline at end of file From 83b1e616b7782cb3286fa646d2e8c6bd2c8c5c88 Mon Sep 17 00:00:00 2001 From: Sallust Date: Sun, 2 Aug 2015 20:58:15 -0400 Subject: [PATCH 0452/5486] Fix typo in exile page --- english/coffee/Paris/taxi-trouble/exile/exile.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/coffee/Paris/taxi-trouble/exile/exile.md b/english/coffee/Paris/taxi-trouble/exile/exile.md index 6b890874cc..3ed446e8dc 100644 --- a/english/coffee/Paris/taxi-trouble/exile/exile.md +++ b/english/coffee/Paris/taxi-trouble/exile/exile.md @@ -1,3 +1,3 @@ -Content never to see another marshmallow again, you run for you life and never look back. +Content never to see another marshmallow again, you run for your life and never look back. -You spend the rest of your days working for a cruel vintner who, after decades, still doesn't believe your fantastical story of escape. \ No newline at end of file +You spend the rest of your days working for a cruel vintner who, after decades, still doesn't believe your fantastical story of escape. From 11a2dedcf0f3c19cca95ca951746c58bae32139d Mon Sep 17 00:00:00 2001 From: Sallust Date: Sun, 2 Aug 2015 21:25:53 -0400 Subject: [PATCH 0453/5486] Cap length of lines at 120 --- english/coffee/Paris/taxi-trouble/exile/exile.md | 3 ++- english/coffee/Paris/taxi-trouble/marshmallow-mafia/mafia.md | 3 ++- english/coffee/Paris/taxi-trouble/taxi-trouble.md | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/english/coffee/Paris/taxi-trouble/exile/exile.md b/english/coffee/Paris/taxi-trouble/exile/exile.md index 3ed446e8dc..f234ac6448 100644 --- a/english/coffee/Paris/taxi-trouble/exile/exile.md +++ b/english/coffee/Paris/taxi-trouble/exile/exile.md @@ -1,3 +1,4 @@ Content never to see another marshmallow again, you run for your life and never look back. -You spend the rest of your days working for a cruel vintner who, after decades, still doesn't believe your fantastical story of escape. +You spend the rest of your days working for a cruel vintner who, +after decades, still doesn't believe your fantastical story of escape. diff --git a/english/coffee/Paris/taxi-trouble/marshmallow-mafia/mafia.md b/english/coffee/Paris/taxi-trouble/marshmallow-mafia/mafia.md index 1c2d073acd..e30416497e 100644 --- a/english/coffee/Paris/taxi-trouble/marshmallow-mafia/mafia.md +++ b/english/coffee/Paris/taxi-trouble/marshmallow-mafia/mafia.md @@ -1,3 +1,4 @@ Valiantly and boldy you turn around, the responsibility of saving your homeland on your shoulders. -Unmoved by your self-determination, the goon shoots you instantly turning you into sugar, the food of the marshmallow people. +Unmoved by your self-determination, the goon shoots you instantly turning you into sugar, +the food of the marshmallow people. diff --git a/english/coffee/Paris/taxi-trouble/taxi-trouble.md b/english/coffee/Paris/taxi-trouble/taxi-trouble.md index ec0d81d424..4d92631e21 100644 --- a/english/coffee/Paris/taxi-trouble/taxi-trouble.md +++ b/english/coffee/Paris/taxi-trouble/taxi-trouble.md @@ -1,4 +1,5 @@ -You start walking towards the taxi-stand and begin formulating a plan to save your homeland from sinister marshmallow encroachment. +You start walking towards the taxi-stand and begin formulating a plan +to save your homeland from sinister marshmallow encroachment. Suddenly you realize you are being followed by someone in the marshmallow mafia!!! From 72cf46a69b28bfc081aad9acfaad29c481256066 Mon Sep 17 00:00:00 2001 From: Sallust Date: Sun, 2 Aug 2015 21:42:42 -0400 Subject: [PATCH 0454/5486] Make changes to initial page file without introducing a deletion --- english/coffee/Paris/fly-to-paris.md | 2 +- english/coffee/Paris/taxi-trouble/taxi-trouble.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/english/coffee/Paris/fly-to-paris.md b/english/coffee/Paris/fly-to-paris.md index 648230fad3..dd8e8d033d 100644 --- a/english/coffee/Paris/fly-to-paris.md +++ b/english/coffee/Paris/fly-to-paris.md @@ -12,4 +12,4 @@ She walks towards a local train into the city. Do you? [Follow her on the train?](city-train/city-train.md) -[Walk toward the taxi stand, instead](taxi-trouble/taxi-trouble.md) \ No newline at end of file +[Walk toward the taxi stand, instead](taxi-trouble/taxi-trouble.md) diff --git a/english/coffee/Paris/taxi-trouble/taxi-trouble.md b/english/coffee/Paris/taxi-trouble/taxi-trouble.md index 4d92631e21..e256a6ce0f 100644 --- a/english/coffee/Paris/taxi-trouble/taxi-trouble.md +++ b/english/coffee/Paris/taxi-trouble/taxi-trouble.md @@ -9,4 +9,4 @@ He must have overheard your conversation with the beautiful French woman. or -[Run for it!](exile/exile.md) \ No newline at end of file +[Run for it!](exile/exile.md) From ce1ae89d520d8015c6874790dc167fe01a4c32c9 Mon Sep 17 00:00:00 2001 From: gusmateus Date: Sun, 2 Aug 2015 22:12:56 -0700 Subject: [PATCH 0455/5486] add new line on desistir --- portugues/revisa/desiste/desistir.md | 1 + 1 file changed, 1 insertion(+) diff --git a/portugues/revisa/desiste/desistir.md b/portugues/revisa/desiste/desistir.md index f04ad53458..814356fee9 100644 --- a/portugues/revisa/desiste/desistir.md +++ b/portugues/revisa/desiste/desistir.md @@ -1,2 +1,3 @@ Voc vai ter que lidar com este bug sozinho. Se voc tiver sorte, os desenvolvedores encontraro o bug por conta prpria. +A culpa sempre do programador. From 524a3abdad34ad0187d7cdc8baca7fde6ab00f30 Mon Sep 17 00:00:00 2001 From: mikey123555 Date: Mon, 3 Aug 2015 00:47:48 -0700 Subject: [PATCH 0456/5486] Update marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index be285dc8f0..5218c6cb8f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -12,7 +12,7 @@ usually take intoxicants, what's happening...? But it's probably not worth dwelling on that right now, you could be in danger. -Grave danger. +Grave danger. Oh No! *(Is there another kind?)* From 96265881df106a553cfe5d8f6e9ca642c6bffb23 Mon Sep 17 00:00:00 2001 From: nvanhae Date: Mon, 3 Aug 2015 20:27:32 +0930 Subject: [PATCH 0457/5486] Update batman.md --- english/batman/batman.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index 6151e680cb..c8536d8d31 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -2,4 +2,8 @@ wanna know a secret bruce wayne is the BAT click [here](https://en.wikipedia.org/wiki/Batman) and see it for yourself. -Click [here](http://www.google.com) to visit Google. \ No newline at end of file +Click [here](http://www.google.com) to visit Google. + +But I know what you're wondering. If Bruch Wayne is the Bat, then who is Bruce Wayne? Well it's obvious... + +...IT'S JOHN CENA!!! From a78e943805be07f5c485fb89140e9857a8625da4 Mon Sep 17 00:00:00 2001 From: Julian Herrera Date: Mon, 3 Aug 2015 16:37:08 -0300 Subject: [PATCH 0458/5486] Adicionar exclamacion de Beatito --- espanol/muralla/abrir/abrirsoldados/abrirsoldados.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/muralla/abrir/abrirsoldados/abrirsoldados.md b/espanol/muralla/abrir/abrirsoldados/abrirsoldados.md index 42d67d420e..724792a75c 100644 --- a/espanol/muralla/abrir/abrirsoldados/abrirsoldados.md +++ b/espanol/muralla/abrir/abrirsoldados/abrirsoldados.md @@ -6,4 +6,6 @@ entrar a tiempo. El último soldado entró cuando el ejército enemigo se cernía sobre la ciudad. +Sin perder tiempo, Beatito exclamó: + [¡Cerrad el portón!](cerrad/cerrad.md) From 62adeb3f54859797ced89323da88153d537e8b26 Mon Sep 17 00:00:00 2001 From: Choi Date: Mon, 3 Aug 2015 18:41:52 -0400 Subject: [PATCH 0459/5486] Fixed broken links in trapezoid --- english/trapezoid/trapezoid.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/english/trapezoid/trapezoid.md b/english/trapezoid/trapezoid.md index fa76e6518c..27b0280c54 100644 --- a/english/trapezoid/trapezoid.md +++ b/english/trapezoid/trapezoid.md @@ -5,9 +5,3 @@ You draw a perfect trapezoid on the blackboard The finished trapezoid starts to glow and a hole appears Mystified, you enter the trapezoid - -Do you: - -[Lunge for the lighter](lunge-for-the-lighter/lunge-for-the-lighter.md) - -[Wake up!](wake-up/wake-up.md) From 6217e69b14b442fde6f28cd93b305a941c4e66f2 Mon Sep 17 00:00:00 2001 From: Carlton Joseph Date: Tue, 4 Aug 2015 02:40:33 -0700 Subject: [PATCH 0460/5486] Giant Coming --- english/pick-up-blowtorch/blowtorch.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/pick-up-blowtorch/blowtorch.md b/english/pick-up-blowtorch/blowtorch.md index 3e40f4450b..4c800a3b5a 100644 --- a/english/pick-up-blowtorch/blowtorch.md +++ b/english/pick-up-blowtorch/blowtorch.md @@ -22,3 +22,7 @@ into the room screaming. You're not sure if you've got enough graham cracker and chocolate for this, but at least you're bringing the camp fire... + +Where did that "slumber" come from? +Next thing I'll hear is "fee fi fo fum". +My God what have I done. From 23d498bb149d6d416f5016dd002bec1a6fedb506 Mon Sep 17 00:00:00 2001 From: Amer Hamdan <[amashamdan@gmail.com]> Date: Tue, 4 Aug 2015 21:17:33 +0300 Subject: [PATCH 0461/5486] Added watch Barcelona game option --- english/marshmallow.md | 2 ++ english/watch-barca/watch-barca.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/watch-barca/watch-barca.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 787efad5ed..c589d9186b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -404,4 +404,6 @@ Do you: [Analyze the composition of the marshmallow](analyze/analysis.md) +[Watch Barcelona game](watch-barca/watch-barca.md) + [Oops! this story ain't ending..](unending-story/unending-story.md) diff --git a/english/watch-barca/watch-barca.md b/english/watch-barca/watch-barca.md new file mode 100644 index 0000000000..34de2662ca --- /dev/null +++ b/english/watch-barca/watch-barca.md @@ -0,0 +1 @@ +Barcelona won the game! \ No newline at end of file From 091467b663cb219af8646522941afbe9135d2d7e Mon Sep 17 00:00:00 2001 From: capca Date: Tue, 4 Aug 2015 14:24:12 -0500 Subject: [PATCH 0462/5486] Folder added for lanzaronLeones.md --- .../leones/{ => lanzaleones}/lanzaronPeriodista.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename espanol/noticias/burla-periodista/leones/{ => lanzaleones}/lanzaronPeriodista.md (100%) diff --git a/espanol/noticias/burla-periodista/leones/lanzaronPeriodista.md b/espanol/noticias/burla-periodista/leones/lanzaleones/lanzaronPeriodista.md similarity index 100% rename from espanol/noticias/burla-periodista/leones/lanzaronPeriodista.md rename to espanol/noticias/burla-periodista/leones/lanzaleones/lanzaronPeriodista.md From fcc562e5856f0d941a12c1e3ea84ea5c515a3574 Mon Sep 17 00:00:00 2001 From: Nima Date: Wed, 5 Aug 2015 06:02:01 +0800 Subject: [PATCH 0463/5486] Changing absolute links to avoid forking problems --- english/little-me/Apple/Apple.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index 78e03a6c74..e4f63cd898 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -5,6 +5,6 @@ Do you like to see my powers? You Choosed To Say: -[Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/little-me.md) +[Yes](../little-me.md) -[No](https://github.com/udacity/create-your-own-adventure/tree/master/english/) \ No newline at end of file +[No](../pikachu_wins.md) From 43a003b51e72afe7c03c68a3a1b2bad96cef387d Mon Sep 17 00:00:00 2001 From: Nima Date: Wed, 5 Aug 2015 06:10:48 +0800 Subject: [PATCH 0464/5486] Fixing the broken link --- english/little-me/Apple/Apple.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index e4f63cd898..407153b9e2 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -7,4 +7,4 @@ You Choosed To Say: [Yes](../little-me.md) -[No](../pikachu_wins.md) +[No](../../../call-scotty/call-scotty.md) From d544766b96314e75f38b0310635b58113af13437 Mon Sep 17 00:00:00 2001 From: Nima Date: Wed, 5 Aug 2015 06:12:06 +0800 Subject: [PATCH 0465/5486] 2nd Attempt to fix the broken path --- english/little-me/Apple/Apple.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index 407153b9e2..c5f3c86ed5 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -7,4 +7,4 @@ You Choosed To Say: [Yes](../little-me.md) -[No](../../../call-scotty/call-scotty.md) +[No](./call-scotty/call-scotty.md) From 1e1b1ece829f0d57d42d1e88da1c085067a9c44c Mon Sep 17 00:00:00 2001 From: Nima Date: Wed, 5 Aug 2015 06:15:53 +0800 Subject: [PATCH 0466/5486] 3rd attempt --- english/little-me/Apple/Apple.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index c5f3c86ed5..76ac837a85 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -7,4 +7,4 @@ You Choosed To Say: [Yes](../little-me.md) -[No](./call-scotty/call-scotty.md) +[No](/call-scotty/call-scotty.md) From 7cac9b0ac7d6f4b9a5cc67aca544c47d800646fc Mon Sep 17 00:00:00 2001 From: Nima Date: Wed, 5 Aug 2015 06:16:42 +0800 Subject: [PATCH 0467/5486] 4th attempt --- english/little-me/Apple/Apple.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index 76ac837a85..44cc57d9ab 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -7,4 +7,4 @@ You Choosed To Say: [Yes](../little-me.md) -[No](/call-scotty/call-scotty.md) +[No](..\..\..\call-scotty\call-scotty.md) From 163ea54443cc19a098ff3b9ecb48df96d6eda914 Mon Sep 17 00:00:00 2001 From: Nima Date: Wed, 5 Aug 2015 06:25:45 +0800 Subject: [PATCH 0468/5486] 5th --- english/little-me/Apple/Apple.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index 44cc57d9ab..cf03a0be66 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -7,4 +7,4 @@ You Choosed To Say: [Yes](../little-me.md) -[No](..\..\..\call-scotty\call-scotty.md) +[No](../../call-scotty/call-scotty.md) From 958b66a1cf04e57caebeffdf53f9eaddd254bf00 Mon Sep 17 00:00:00 2001 From: Nima Date: Wed, 5 Aug 2015 06:27:41 +0800 Subject: [PATCH 0469/5486] 6th --- english/little-me/Apple/Apple.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index cf03a0be66..a8738c2e0f 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -7,4 +7,4 @@ You Choosed To Say: [Yes](../little-me.md) -[No](../../call-scotty/call-scotty.md) +[No](../../coffee.md) From 1a66352629be4767eca3bc153477c9094f292e59 Mon Sep 17 00:00:00 2001 From: Nima Date: Wed, 5 Aug 2015 06:28:06 +0800 Subject: [PATCH 0470/5486] 7th --- english/little-me/Apple/Apple.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index a8738c2e0f..0a3e3e96d3 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -7,4 +7,4 @@ You Choosed To Say: [Yes](../little-me.md) -[No](../../coffee.md) +[No](../../marshmallow.md) From f241ecfd74385a258b49d4e35b5b9bc77da24075 Mon Sep 17 00:00:00 2001 From: capca Date: Tue, 4 Aug 2015 17:29:59 -0500 Subject: [PATCH 0471/5486] link to reach the story added --- espanol/noticias/burla-periodista/leones/leones.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/noticias/burla-periodista/leones/leones.md b/espanol/noticias/burla-periodista/leones/leones.md index eaf67e3daa..135969f25d 100644 --- a/espanol/noticias/burla-periodista/leones/leones.md +++ b/espanol/noticias/burla-periodista/leones/leones.md @@ -6,4 +6,4 @@ chasquir sus dedos. Y después: -[Se abalanzó](../leones/lanzaronPeriodista.md) \ No newline at end of file +[Se abalanzó](../leones//lanzaleones/lanzaronPeriodista.md) \ No newline at end of file From 81c648006b80549a16ed786f43476fb6132e732a Mon Sep 17 00:00:00 2001 From: Nima Date: Wed, 5 Aug 2015 06:30:00 +0800 Subject: [PATCH 0472/5486] 8th --- english/little-me/Apple/Apple.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index 0a3e3e96d3..3e503ac21c 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -7,4 +7,4 @@ You Choosed To Say: [Yes](../little-me.md) -[No](../../marshmallow.md) +[No](../../yuha/yuha.md) From f64600b720a3661001bd3b41c444a4a4d8246f7e Mon Sep 17 00:00:00 2001 From: Nima Date: Wed, 5 Aug 2015 06:31:41 +0800 Subject: [PATCH 0473/5486] Final change --- english/little-me/Apple/Apple.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/little-me/Apple/Apple.md b/english/little-me/Apple/Apple.md index 3e503ac21c..a33fae9871 100644 --- a/english/little-me/Apple/Apple.md +++ b/english/little-me/Apple/Apple.md @@ -7,4 +7,4 @@ You Choosed To Say: [Yes](../little-me.md) -[No](../../yuha/yuha.md) +[No](../../forest/forest.md) From df8e6242e3299f811f9f7f900de61cf36801042c Mon Sep 17 00:00:00 2001 From: Nima Date: Wed, 5 Aug 2015 06:32:53 +0800 Subject: [PATCH 0474/5486] Final change (absolute links to relative links) --- english/little-me/Candy/Candy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/little-me/Candy/Candy.md b/english/little-me/Candy/Candy.md index 78e03a6c74..a33fae9871 100644 --- a/english/little-me/Candy/Candy.md +++ b/english/little-me/Candy/Candy.md @@ -5,6 +5,6 @@ Do you like to see my powers? You Choosed To Say: -[Yes](https://github.com/udacity/create-your-own-adventure/tree/master/english/little-me/little-me.md) +[Yes](../little-me.md) -[No](https://github.com/udacity/create-your-own-adventure/tree/master/english/) \ No newline at end of file +[No](../../forest/forest.md) From 6d7e957809445352862f502202a75d7269ba6a6d Mon Sep 17 00:00:00 2001 From: premiumdeluxe Date: Tue, 4 Aug 2015 18:05:58 -0500 Subject: [PATCH 0475/5486] Update fish-sanctuary.md --- english/water-dreams/fish-sanctuary/fish-sanctuary.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/english/water-dreams/fish-sanctuary/fish-sanctuary.md b/english/water-dreams/fish-sanctuary/fish-sanctuary.md index 8ec12e2700..79055e6616 100644 --- a/english/water-dreams/fish-sanctuary/fish-sanctuary.md +++ b/english/water-dreams/fish-sanctuary/fish-sanctuary.md @@ -1,2 +1,10 @@ Ploop! What a rush! hey guys! you scream out too all the other waterdrops in the sacturary, as you squeeze between an endless quantity of little beings that are just like you. + +One waterdrop says, "Lookout! A fish is coming!" + +You race to get out of the way before the fish gets to you. + +Some waterdrops didn't get out fast enough and were taken by the fish. + +Some waterdrops around you beging to cry because their friend was taken by the fish. From a3f5c925b576956f7816c7c96a085e1a60f2b5de Mon Sep 17 00:00:00 2001 From: Richard Zinar Date: Tue, 4 Aug 2015 19:46:19 -0700 Subject: [PATCH 0476/5486] Added a line --- english/breakfast/breakfast.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/breakfast/breakfast.md b/english/breakfast/breakfast.md index 67e0ad6627..a05d0d7df9 100644 --- a/english/breakfast/breakfast.md +++ b/english/breakfast/breakfast.md @@ -1,4 +1,6 @@ You see a pot of coffee near you and you realize that you are hungry. Well, you poured coffee in a mug and picked some marshmallows from the wall and added them to the coffee. While you are drinking the coffee and eating those delicious marshmallows and staring at the wall you found that you made a whole in the wall by picking marshmallows. You finished -your flavoured coffee and got out from marshmallows-walled room. It is a beautiful sunny day. \ No newline at end of file +your flavoured coffee and got out from marshmallows-walled room. It is a beautiful sunny day. + +Suddenly, you start to sing your favorite song from childhood: "It's a Beautiful Day in the Neighborhood". From e135f85925be26a2fe40da15275f82e14408b914 Mon Sep 17 00:00:00 2001 From: Wisang Date: Wed, 5 Aug 2015 16:16:15 +0900 Subject: [PATCH 0477/5486] added new sentence on the beginning --- english/forest/pockets/pockets.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/forest/pockets/pockets.md b/english/forest/pockets/pockets.md index d771d8478a..ff366cf51b 100644 --- a/english/forest/pockets/pockets.md +++ b/english/forest/pockets/pockets.md @@ -1,3 +1,5 @@ +You thought about what you can do with what you have now. + You empty your pants pockets on the grass in front of you. A pocket knife, a block of magnesium, a flare, a first aid kit and a machete. Now that's good news! From f426219a80ffff096c42525389f4140bdfee47bb Mon Sep 17 00:00:00 2001 From: cahegigithub Date: Wed, 5 Aug 2015 09:58:10 +0200 Subject: [PATCH 0478/5486] Anadir ejercito --- espanol/ejercito/ejercito.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/ejercito/ejercito.md diff --git a/espanol/ejercito/ejercito.md b/espanol/ejercito/ejercito.md new file mode 100644 index 0000000000..f11f6f92f6 --- /dev/null +++ b/espanol/ejercito/ejercito.md @@ -0,0 +1 @@ +Y vinieron un ejército de ángeles y se pusieron a tocar el violín \ No newline at end of file From 551961bfb83b5e22a35d51be20ec7d6652a03555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20T=C3=BCrk?= Date: Wed, 5 Aug 2015 13:50:13 +0300 Subject: [PATCH 0479/5486] =?UTF-8?q?Add=20new=20option:=20Metali=20=C3=87?= =?UTF-8?q?ek?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- turkce/catalla-kaz/catalla-kaz.md | 2 ++ turkce/catalla-kaz/metali-cek/metali-cek.md | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 turkce/catalla-kaz/metali-cek/metali-cek.md diff --git a/turkce/catalla-kaz/catalla-kaz.md b/turkce/catalla-kaz/catalla-kaz.md index c4d0269df6..dcd5723a75 100644 --- a/turkce/catalla-kaz/catalla-kaz.md +++ b/turkce/catalla-kaz/catalla-kaz.md @@ -3,3 +3,5 @@ Duvarları çatalla kazımaya başladın. Bir el girecek kadar bir delik kazdık Okulda en nefret ettiğin şey tahta tırnakla çizildiğinde çıkan sesti. Şimdi de onu hatırladın ve miden bulandı. Ne yapacaksın? + +[Metali Çek](metali-cek/metali-cek.md) \ No newline at end of file diff --git a/turkce/catalla-kaz/metali-cek/metali-cek.md b/turkce/catalla-kaz/metali-cek/metali-cek.md new file mode 100644 index 0000000000..7d3dadc8c0 --- /dev/null +++ b/turkce/catalla-kaz/metali-cek/metali-cek.md @@ -0,0 +1,14 @@ +Metale dokununca onun hareket ettiğini anladın ve kendine doğru çektin. + +Büyük bir gürültüyle duvar kenara çekildi ve bir koridora açıldı. + +Arkandan hatmiçiçeğinin geldiğini gördün. + +Kasvetli ve soğuk koridorda koşmaya başladın ve ilerde gördün ki +koridor iki yöne ayrılıyor. + +Bi taraf karanlık ama çakmakla ilerleyebilirsin. + +Diğer taraf ise uçurum fakat iple inebilirsin. + +Ne yapacaksın? \ No newline at end of file From cb5e95076cfac3f83969cba920a382574bb3f0fa Mon Sep 17 00:00:00 2001 From: Luke James Mitton Date: Wed, 5 Aug 2015 11:34:28 -0700 Subject: [PATCH 0480/5486] oh mother oh mother --- english/scream/mom/eatwithmom.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/scream/mom/eatwithmom.md b/english/scream/mom/eatwithmom.md index 1d6e491547..007bf578e6 100644 --- a/english/scream/mom/eatwithmom.md +++ b/english/scream/mom/eatwithmom.md @@ -6,3 +6,7 @@ Mom, however, does not like marshmallows and thinks you are going to spoil your But Mother was never to be trusted. In fact, you always thought she was hiding something. She always stared at the Michillan Man just a bit too long.. + +...remember Mom, the Michelin Man needs time to heal! All of +“time” is counting on him. I like this Michelin Man, a new +Michelin Man is a new Michelin Man--we don’t want that do we? From 5e907ab7a9217c0ded206bc09ad9df7602f02739 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 5 Aug 2015 16:08:01 -0700 Subject: [PATCH 0481/5486] Wisdom added. --- english/swami-vivekananda/swami-vivekananda.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/swami-vivekananda/swami-vivekananda.md b/english/swami-vivekananda/swami-vivekananda.md index 89a3282a6d..0b465cf2df 100644 --- a/english/swami-vivekananda/swami-vivekananda.md +++ b/english/swami-vivekananda/swami-vivekananda.md @@ -6,10 +6,12 @@ But, whatever you do, don't touch a hot stove. But, whatever you do, don't use the toaster in the bath tub ... -But, whatever you do, don't talk about your favorite type of "Bath Bomb" or +But, whatever you do, don't talk about your favorite type of "Bath Bomb" or the best "Photo Bomb" you have seen in the airport security line ... But, whatever you do, be curious... +But, whatever you do, do things that you're afraid of... + [OK, now back to the issue at hand-- I just woke up in a marshmallow house.](../marshmallow.md) From a8130cf8151982cc7f3803f57e5c45da9e4f45b0 Mon Sep 17 00:00:00 2001 From: Thomas Egas Date: Wed, 5 Aug 2015 22:05:14 -0300 Subject: [PATCH 0482/5486] add surf trip to solemar storyline --- portugues_pt/praias/solemar.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/portugues_pt/praias/solemar.md b/portugues_pt/praias/solemar.md index f335edf04f..e7118c6e50 100644 --- a/portugues_pt/praias/solemar.md +++ b/portugues_pt/praias/solemar.md @@ -1,5 +1,7 @@ -Gostava de conhecer as Seychelles +Gostaria de conhecer as Seychelles -Gostava de conhecer as Maldivas. +Gostaria de conhecer as Maldivas. -Gostave de conhecer Cabo Verde. \ No newline at end of file +Gostaria de conhecer Cabo Verde. + +Gostaria de passar um ano surfando Hawaii, Indonesia e Australia. \ No newline at end of file From 67ea64f494c57a912656f7d890883afe26bba536 Mon Sep 17 00:00:00 2001 From: Thomas Egas Date: Wed, 5 Aug 2015 22:12:30 -0300 Subject: [PATCH 0483/5486] fix changed line --- portugues_pt/colaborar.md | 2 +- portugues_pt/praias/solemar.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index f87ae333fa..0ed6000ace 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -1,4 +1,4 @@ -Olá, +Olá, Isto de criar uma história com base na partilha de ideias de multiplas pessoas não relacionadas pode ser muito interessante... Então vamos lá! diff --git a/portugues_pt/praias/solemar.md b/portugues_pt/praias/solemar.md index e7118c6e50..f4cfe98a84 100644 --- a/portugues_pt/praias/solemar.md +++ b/portugues_pt/praias/solemar.md @@ -1,7 +1,7 @@ -Gostaria de conhecer as Seychelles +Gostava de conhecer as Seychelles -Gostaria de conhecer as Maldivas. +Gostava de conhecer as Maldivas. -Gostaria de conhecer Cabo Verde. +Gostave de conhecer Cabo Verde. Gostaria de passar um ano surfando Hawaii, Indonesia e Australia. \ No newline at end of file From 4698a9ab8d98d526e41df19e0af05528f5b4bef4 Mon Sep 17 00:00:00 2001 From: Dave Figueroa Date: Wed, 5 Aug 2015 22:48:47 -0400 Subject: [PATCH 0484/5486] Add another mullet comment --- english/macgyver/macgyver.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/macgyver/macgyver.md b/english/macgyver/macgyver.md index 18af6d9a35..d7b6a5aeeb 100644 --- a/english/macgyver/macgyver.md +++ b/english/macgyver/macgyver.md @@ -20,6 +20,8 @@ For it is where your power truly lies.... Time is running out, and you need to act fast before the marshmallow explodes. The fate of the free world rests on your shoulders... +Do you know what else rests on your shoulders? That's right! Your sweet sweet mullet. + Do you: [Stick the fork in the wall?](stickfork/stickforkinwall.md) From 95720f860ff7aae03e1eb5f9a262c1808b16cd10 Mon Sep 17 00:00:00 2001 From: cahegigithub Date: Thu, 6 Aug 2015 11:03:44 +0200 Subject: [PATCH 0485/5486] Make the story reachable --- espanol/canudos.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index 890cbc155a..920b260a41 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -51,3 +51,4 @@ el Consejero: [Empieza a gritar como un poseso](poseso/poseso.md) [Se arrodilla y...](rogando/rogando.md) +[Y vino un ejercito](ejercito/ejercito.md) From cd94f0b6c7841a4b1a32c00dc7ac2442beaba41b Mon Sep 17 00:00:00 2001 From: Robinson Raju Date: Thu, 6 Aug 2015 06:58:10 -0700 Subject: [PATCH 0486/5486] Correct dream2 and wake-up-again as per comments from reviewers. dream2 : broke long sentence into smaller lines. wake-up-again : add new line instead of modifying existing. --- english/wake-up/wake-up-again/dream2/dream2.md | 4 +++- english/wake-up/wake-up-again/wake-up-again.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/english/wake-up/wake-up-again/dream2/dream2.md b/english/wake-up/wake-up-again/dream2/dream2.md index 162ceb90f0..ee3da354e6 100644 --- a/english/wake-up/wake-up-again/dream2/dream2.md +++ b/english/wake-up/wake-up-again/dream2/dream2.md @@ -1,3 +1,5 @@ You look up and see beautiful blue sky. It is a bright sunny day. You look around and you see big white cyclinders everywhere on all four sides. -Suddenly an aircraft flies by. In the shiny underbelly of the airplane you see a sea of white cyclinders stretched across the landscape and realize that you are just a marshmallow among thousands in a vast island of marshmallows. \ No newline at end of file +Suddenly an aircraft flies by. +In the shiny underbelly of the airplane you see a sea of white cyclinders stretched across the landscape. +You realize that you are just a marshmallow among thousands in a vast island of marshmallows. \ No newline at end of file diff --git a/english/wake-up/wake-up-again/wake-up-again.md b/english/wake-up/wake-up-again/wake-up-again.md index 058943f5b1..ac94563345 100644 --- a/english/wake-up/wake-up-again/wake-up-again.md +++ b/english/wake-up/wake-up-again/wake-up-again.md @@ -10,4 +10,6 @@ figured you’d be able to go back to sleep. But not back to the nightmare you just had, obviously. -As your eyes droop and you started drifting back into the other world [.. into another dream](dream2/dream2.md) +As your eyes droop and you started drifting back into the other world + +[.. into another dream](dream2/dream2.md) From 752fb035816e0cb77a788a9072f54b2e0951391a Mon Sep 17 00:00:00 2001 From: Danny Libin Date: Thu, 6 Aug 2015 17:21:53 -0500 Subject: [PATCH 0487/5486] Added a few lines to the fish sanctuary and fixed some spelling/grammar errors. --- .../fish-sanctuary/fish-sanctuary.md | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/english/water-dreams/fish-sanctuary/fish-sanctuary.md b/english/water-dreams/fish-sanctuary/fish-sanctuary.md index 79055e6616..7cab1b5010 100644 --- a/english/water-dreams/fish-sanctuary/fish-sanctuary.md +++ b/english/water-dreams/fish-sanctuary/fish-sanctuary.md @@ -1,10 +1,19 @@ -Ploop! What a rush! hey guys! you scream out too all the other waterdrops in the sacturary, -as you squeeze between an endless quantity of little beings that are just like you. +*Ploop* -One waterdrop says, "Lookout! A fish is coming!" +What a rush! + +"Hey guys!" you scream out to all the other droplets in the sanctuary. +You squeeze between an endless stream of little beings just like you. + +One droplet says, "Look out! A fish is coming!" + +You feel yourself being pulled into a vortex created by the gaping maw of a fish, +and try to will yourself in another direction. You race to get out of the way before the fish gets to you. -Some waterdrops didn't get out fast enough and were taken by the fish. +Some droplets didn't get out of the way fast enough and were taken by the fish. + +Some droplets around you begin to cry because their friends were taken by the fish. -Some waterdrops around you beging to cry because their friend was taken by the fish. +"It's ok!" you console them. "They'll come out the other end!" \ No newline at end of file From 9e76d2effc2e736f4bfab11b1288129662b531c6 Mon Sep 17 00:00:00 2001 From: Enmanuel Medina Date: Thu, 6 Aug 2015 21:42:46 -0400 Subject: [PATCH 0488/5486] ciudadanos asustados --- espanol/torre/alarma/alarma.md | 2 ++ espanol/torre/alarma/asustado/asustado.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 espanol/torre/alarma/asustado/asustado.md diff --git a/espanol/torre/alarma/alarma.md b/espanol/torre/alarma/alarma.md index 4632afb41f..896b918fe2 100644 --- a/espanol/torre/alarma/alarma.md +++ b/espanol/torre/alarma/alarma.md @@ -1 +1,3 @@ Sin perder tiempo el consejero ordenó que se diera el toque de alarma. + +[Los ciudadanos inmediatamente se asustaron.](asustado/asustado.md) \ No newline at end of file diff --git a/espanol/torre/alarma/asustado/asustado.md b/espanol/torre/alarma/asustado/asustado.md new file mode 100644 index 0000000000..34a0496cea --- /dev/null +++ b/espanol/torre/alarma/asustado/asustado.md @@ -0,0 +1 @@ +Empezando un escándalo, y entonces el consejero fue corriendo hacia donde estaba el alcalde del pueblo. \ No newline at end of file From 3d16918a6c0862710818a417f27026b6e5aab894 Mon Sep 17 00:00:00 2001 From: Enmanuel Medina Date: Thu, 6 Aug 2015 21:48:31 -0400 Subject: [PATCH 0489/5486] ciudadanos asustados --- espanol/torre/alarma/alarma.md | 2 +- espanol/torre/alarma/asustado/asustado.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/espanol/torre/alarma/alarma.md b/espanol/torre/alarma/alarma.md index 896b918fe2..acaccf0dfe 100644 --- a/espanol/torre/alarma/alarma.md +++ b/espanol/torre/alarma/alarma.md @@ -1,3 +1,3 @@ Sin perder tiempo el consejero ordenó que se diera el toque de alarma. -[Los ciudadanos inmediatamente se asustaron.](asustado/asustado.md) \ No newline at end of file +[Los ciudadanos inmediatamente se asustaron,](asustado/asustado.md) \ No newline at end of file diff --git a/espanol/torre/alarma/asustado/asustado.md b/espanol/torre/alarma/asustado/asustado.md index 34a0496cea..4e33bc5289 100644 --- a/espanol/torre/alarma/asustado/asustado.md +++ b/espanol/torre/alarma/asustado/asustado.md @@ -1 +1 @@ -Empezando un escándalo, y entonces el consejero fue corriendo hacia donde estaba el alcalde del pueblo. \ No newline at end of file +Empezando un escándalo, entonces el consejero fue corriendo hacia donde estaba el alcalde del pueblo. \ No newline at end of file From 5c7827893ef96fce5858850141b80920e31a42ea Mon Sep 17 00:00:00 2001 From: jeromecholewa Date: Fri, 7 Aug 2015 14:54:37 +0900 Subject: [PATCH 0490/5486] Create approcher.md --- french/dessine/miel/forest/approcher.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 french/dessine/miel/forest/approcher.md diff --git a/french/dessine/miel/forest/approcher.md b/french/dessine/miel/forest/approcher.md new file mode 100644 index 0000000000..c05fe244dd --- /dev/null +++ b/french/dessine/miel/forest/approcher.md @@ -0,0 +1,2 @@ +C'est malheureusement bien ce que j'avais pressenti: un ours me regarde goulument! +Si seulement je pouvais lui parler et lui demander pitie...! From 82eb26a18b4921a4304326a3471486667cf33ee5 Mon Sep 17 00:00:00 2001 From: jeromecholewa Date: Fri, 7 Aug 2015 14:56:24 +0900 Subject: [PATCH 0491/5486] Update manger-du-miel.md --- french/dessine/miel/manger-du-miel.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/french/dessine/miel/manger-du-miel.md b/french/dessine/miel/manger-du-miel.md index abea078d50..87f31c555d 100644 --- a/french/dessine/miel/manger-du-miel.md +++ b/french/dessine/miel/manger-du-miel.md @@ -1 +1,12 @@ -Yami, yami, que c'est bon ce miel! Mais pourquoi est - il si chaud? \ No newline at end of file +Yami, yami, que c'est bon ce miel! Mais pourquoi est - il si chaud? + +Je me rends rapidement compte que ce miel coule sans interruption, comme une fontaine, +par une grande fente dans le montant superieur de la porte. +Si proche de cette cascade de miel, je distingue par transparence l'autre cote de la porte. +Il semble qu'il y ait une foret a l'exterieur. Je decide de traverser cette paroi de nectar +d'abeille) et me lance a la decouverte de la foret. +De nombreux insectes se regalent sur moi. Soudain j'entends un grognement a quelques pas derriere +les arbres. C'est assez inquietant. + +Devrais-je prendre mes jambes a mon coup? +ou bien [m'approcher pour savoir ce qui m'attend dans la futaie?] (https://github.com/jeromecholewa/create-your-own-adventure/blob/jerome/french/dessine/miel/forest/approcher.md) From beca0a7ad86d0cef164f5ec375e4b9ff3d5a6126 Mon Sep 17 00:00:00 2001 From: jeromecholewa Date: Fri, 7 Aug 2015 14:56:39 +0900 Subject: [PATCH 0492/5486] Update manger-du-miel.md --- french/dessine/miel/manger-du-miel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/french/dessine/miel/manger-du-miel.md b/french/dessine/miel/manger-du-miel.md index 87f31c555d..516793985a 100644 --- a/french/dessine/miel/manger-du-miel.md +++ b/french/dessine/miel/manger-du-miel.md @@ -8,5 +8,5 @@ d'abeille) et me lance a la decouverte de la foret. De nombreux insectes se regalent sur moi. Soudain j'entends un grognement a quelques pas derriere les arbres. C'est assez inquietant. -Devrais-je prendre mes jambes a mon coup? +Devrais-je prendre mes jambes a mon cou? ou bien [m'approcher pour savoir ce qui m'attend dans la futaie?] (https://github.com/jeromecholewa/create-your-own-adventure/blob/jerome/french/dessine/miel/forest/approcher.md) From cfe412c16211965b92fce19f991c9cadb4365007 Mon Sep 17 00:00:00 2001 From: jeromecholewa Date: Fri, 7 Aug 2015 15:06:20 +0900 Subject: [PATCH 0493/5486] Update manger-du-miel.md --- french/dessine/miel/manger-du-miel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/french/dessine/miel/manger-du-miel.md b/french/dessine/miel/manger-du-miel.md index 516793985a..dda5ca9fe8 100644 --- a/french/dessine/miel/manger-du-miel.md +++ b/french/dessine/miel/manger-du-miel.md @@ -6,7 +6,7 @@ Si proche de cette cascade de miel, je distingue par transparence l'autre cote d Il semble qu'il y ait une foret a l'exterieur. Je decide de traverser cette paroi de nectar d'abeille) et me lance a la decouverte de la foret. De nombreux insectes se regalent sur moi. Soudain j'entends un grognement a quelques pas derriere -les arbres. C'est assez inquietant. +les arbres. C'est assez inquietant. Que faire? Devrais-je prendre mes jambes a mon cou? ou bien [m'approcher pour savoir ce qui m'attend dans la futaie?] (https://github.com/jeromecholewa/create-your-own-adventure/blob/jerome/french/dessine/miel/forest/approcher.md) From 540fd36160b860e4fed2483b3b5bee31ec8d81ba Mon Sep 17 00:00:00 2001 From: jeromecholewa Date: Fri, 7 Aug 2015 15:11:29 +0900 Subject: [PATCH 0494/5486] Update approcher.md --- french/dessine/miel/forest/approcher.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/french/dessine/miel/forest/approcher.md b/french/dessine/miel/forest/approcher.md index c05fe244dd..08b03e1912 100644 --- a/french/dessine/miel/forest/approcher.md +++ b/french/dessine/miel/forest/approcher.md @@ -1,2 +1,3 @@ -C'est malheureusement bien ce que j'avais pressenti: un ours me regarde goulument! +C'est malheureusement bien ce que j'avais pressenti: un ours me +regarde goulument! Si seulement je pouvais lui parler et lui demander pitie...! From 0174c9bee277b7b6c5aa16d9af298ef028db7382 Mon Sep 17 00:00:00 2001 From: jeromecholewa Date: Fri, 7 Aug 2015 15:12:14 +0900 Subject: [PATCH 0495/5486] Update manger-du-miel.md --- french/dessine/miel/manger-du-miel.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/french/dessine/miel/manger-du-miel.md b/french/dessine/miel/manger-du-miel.md index dda5ca9fe8..41202d2a98 100644 --- a/french/dessine/miel/manger-du-miel.md +++ b/french/dessine/miel/manger-du-miel.md @@ -5,8 +5,9 @@ par une grande fente dans le montant superieur de la porte. Si proche de cette cascade de miel, je distingue par transparence l'autre cote de la porte. Il semble qu'il y ait une foret a l'exterieur. Je decide de traverser cette paroi de nectar d'abeille) et me lance a la decouverte de la foret. -De nombreux insectes se regalent sur moi. Soudain j'entends un grognement a quelques pas derriere -les arbres. C'est assez inquietant. Que faire? +De nombreux insectes se regalent sur moi. Soudain j'entends un grognement +a quelques pas derriere les arbres. C'est assez inquietant. Que faire? Devrais-je prendre mes jambes a mon cou? -ou bien [m'approcher pour savoir ce qui m'attend dans la futaie?] (https://github.com/jeromecholewa/create-your-own-adventure/blob/jerome/french/dessine/miel/forest/approcher.md) +ou bien [m'approcher pour savoir ce qui m'attend dans la futaie?] +(https://github.com/jeromecholewa/create-your-own-adventure/blob/jerome/french/dessine/miel/forest/approcher.md) From 90443a18882b5f728def4c8f885a26cdf98c2e4e Mon Sep 17 00:00:00 2001 From: jeromecholewa Date: Fri, 7 Aug 2015 15:15:51 +0900 Subject: [PATCH 0496/5486] Update manger-du-miel.md --- french/dessine/miel/manger-du-miel.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/french/dessine/miel/manger-du-miel.md b/french/dessine/miel/manger-du-miel.md index 41202d2a98..decf084b31 100644 --- a/french/dessine/miel/manger-du-miel.md +++ b/french/dessine/miel/manger-du-miel.md @@ -9,5 +9,4 @@ De nombreux insectes se regalent sur moi. Soudain j'entends un grognement a quelques pas derriere les arbres. C'est assez inquietant. Que faire? Devrais-je prendre mes jambes a mon cou? -ou bien [m'approcher pour savoir ce qui m'attend dans la futaie?] -(https://github.com/jeromecholewa/create-your-own-adventure/blob/jerome/french/dessine/miel/forest/approcher.md) +ou bien [m'approcher pour savoir ce qui m'attend dans la futaie?] (forest/approcher.md) From 1d40961cb6e55e7f84492e833ff10570a5925ebe Mon Sep 17 00:00:00 2001 From: 3illy Date: Fri, 7 Aug 2015 09:35:37 -0400 Subject: [PATCH 0497/5486] Update amnesia.md to link to batman.md --- english/amnesia/amnesia.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/amnesia/amnesia.md b/english/amnesia/amnesia.md index 95d1012fa9..8abc12006f 100644 --- a/english/amnesia/amnesia.md +++ b/english/amnesia/amnesia.md @@ -10,4 +10,6 @@ But where am I? I do not know. [Sit back down, to get no sleep?](../sleep/marshmallow.md) +[Wait, something's coming back to me!](../I'm-batman/batman.md) + Amnesia can be freaking awesome sometimes :) From 02f1e6f10ddf14734b986cfec4b79648be19294b Mon Sep 17 00:00:00 2001 From: Anthony Quinn Date: Fri, 7 Aug 2015 12:01:05 -0600 Subject: [PATCH 0498/5486] Add result of extinguishing fire with potential for a twist --- english/light-fire/extinguish-fire/extinguish-fire.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/light-fire/extinguish-fire/extinguish-fire.md b/english/light-fire/extinguish-fire/extinguish-fire.md index c8188f256a..6bbe8b4974 100644 --- a/english/light-fire/extinguish-fire/extinguish-fire.md +++ b/english/light-fire/extinguish-fire/extinguish-fire.md @@ -1,3 +1,7 @@ You grab the conveniently placed fire extinguisher to your side. -You spray the extinguisher over the roaring flames and put them out quickly. \ No newline at end of file +You spray the extinguisher over the roaring flames and put them out quickly. + +To your amazement and horror the chemicals from the extinguisher cause a terrible reaction. + +The marshmallow hardens around your feet leaving you with limited movement. From 242783ff0b54856ef91ac009bc488978a6a40082 Mon Sep 17 00:00:00 2001 From: John Erwin Date: Fri, 7 Aug 2015 14:07:46 -0400 Subject: [PATCH 0499/5486] Add stinky garlic fingers to guitar storyline --- english/guitar/guitar.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/guitar/guitar.md b/english/guitar/guitar.md index 6ca382884e..83629bc461 100644 --- a/english/guitar/guitar.md +++ b/english/guitar/guitar.md @@ -1,4 +1,6 @@ You get out a guitar and play it until the sun goes down. After a long day of rocking out, you +realize that your fingers stink of garlic, as does your guitar. +After thoroughly washing your hands and guitar strings you decide to go to sleep and start to have a crazy dream. [Start dreaming](../dream/dream.md) \ No newline at end of file From 9c72c977bc3c4b75881984e5ea2afa583a027d70 Mon Sep 17 00:00:00 2001 From: cahegigithub Date: Fri, 7 Aug 2015 20:40:20 +0200 Subject: [PATCH 0500/5486] Insert blank line --- espanol/canudos.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index 920b260a41..993ad1231f 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -51,4 +51,5 @@ el Consejero: [Empieza a gritar como un poseso](poseso/poseso.md) [Se arrodilla y...](rogando/rogando.md) + [Y vino un ejercito](ejercito/ejercito.md) From fde7d575d0e2327dedb6cc54a54bcb9da96027ba Mon Sep 17 00:00:00 2001 From: Gunars Grundstoks Date: Fri, 7 Aug 2015 21:45:34 +0300 Subject: [PATCH 0501/5486] Add new story peldet.md and skriet.md --- latvian/peldeties/peldet.md | 3 +++ latvian/skriet/skriet.md | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 latvian/peldeties/peldet.md create mode 100644 latvian/skriet/skriet.md diff --git a/latvian/peldeties/peldet.md b/latvian/peldeties/peldet.md new file mode 100644 index 0000000000..0b615c9619 --- /dev/null +++ b/latvian/peldeties/peldet.md @@ -0,0 +1,3 @@ +Man ir neizteikts prieks, ka zefīrs izvēlējās doties peldēties, jo + +tagad mēs jūru varēsim pārpeldēt jautrā kompānijā. \ No newline at end of file diff --git a/latvian/skriet/skriet.md b/latvian/skriet/skriet.md new file mode 100644 index 0000000000..5489af951b --- /dev/null +++ b/latvian/skriet/skriet.md @@ -0,0 +1,3 @@ +Lai arī zefīram skriet nav mīļākā nodarbe, + +zefīrs vēlējās iemēģināt laimi skriešanā. \ No newline at end of file From 0b42157004ee14dc64dc6e51269348a987b85180 Mon Sep 17 00:00:00 2001 From: Gunars Grundstoks Date: Fri, 7 Aug 2015 21:48:56 +0300 Subject: [PATCH 0502/5486] Add story options at sniegt_roku.md --- latvian/sniegt_roku/sniegt_roku.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/latvian/sniegt_roku/sniegt_roku.md b/latvian/sniegt_roku/sniegt_roku.md index 6fb3d63e5f..bfcffa1f12 100644 --- a/latvian/sniegt_roku/sniegt_roku.md +++ b/latvian/sniegt_roku/sniegt_roku.md @@ -1,3 +1,7 @@ Kamēr zefīra roka mēģina sagrābt šķiltavu, -Tu izliec savu roku un saki "Čau!" \ No newline at end of file +Tu izliec savu roku un saki "Čau!" un piedāvā zefīram: + +[Vai tu vēlies pelēties?](./peldeties/peldeties.md) vai + +[Varbūt ejam peldēties?](./skriet/skriet.md) \ No newline at end of file From 18f11291630a1b1653922bb4ca296ba5a7426e8e Mon Sep 17 00:00:00 2001 From: Gunars Grundstoks Date: Fri, 7 Aug 2015 21:51:58 +0300 Subject: [PATCH 0503/5486] Fix path in story option --- latvian/sniegt_roku/sniegt_roku.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/latvian/sniegt_roku/sniegt_roku.md b/latvian/sniegt_roku/sniegt_roku.md index bfcffa1f12..c974afb61f 100644 --- a/latvian/sniegt_roku/sniegt_roku.md +++ b/latvian/sniegt_roku/sniegt_roku.md @@ -2,6 +2,6 @@ Kamēr zefīra roka mēģina sagrābt šķiltavu, Tu izliec savu roku un saki "Čau!" un piedāvā zefīram: -[Vai tu vēlies pelēties?](./peldeties/peldeties.md) vai +[Vai tu vēlies pelēties?](././peldeties/peldeties.md) vai -[Varbūt ejam peldēties?](./skriet/skriet.md) \ No newline at end of file +[Varbūt ejam peldēties?](././skriet/skriet.md) \ No newline at end of file From 658d6f25eb1e0197af55155f540233bca413725e Mon Sep 17 00:00:00 2001 From: Gunars Grundstoks Date: Fri, 7 Aug 2015 22:02:34 +0300 Subject: [PATCH 0504/5486] fix path --- latvian/sniegt_roku/sniegt_roku.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/latvian/sniegt_roku/sniegt_roku.md b/latvian/sniegt_roku/sniegt_roku.md index bfcffa1f12..20d89acb8b 100644 --- a/latvian/sniegt_roku/sniegt_roku.md +++ b/latvian/sniegt_roku/sniegt_roku.md @@ -2,6 +2,6 @@ Kamēr zefīra roka mēģina sagrābt šķiltavu, Tu izliec savu roku un saki "Čau!" un piedāvā zefīram: -[Vai tu vēlies pelēties?](./peldeties/peldeties.md) vai +[Vai tu vēlies pelēties?](../peldeties/peldeties.md) vai -[Varbūt ejam peldēties?](./skriet/skriet.md) \ No newline at end of file +[Varbūt ejam peldēties?](../skriet/skriet.md) \ No newline at end of file From 378f0a5a2fc17e14482187464f39b07348354905 Mon Sep 17 00:00:00 2001 From: Gunars Grundstoks Date: Fri, 7 Aug 2015 22:07:31 +0300 Subject: [PATCH 0505/5486] fix peldet.md file name in path --- latvian/sniegt_roku/sniegt_roku.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latvian/sniegt_roku/sniegt_roku.md b/latvian/sniegt_roku/sniegt_roku.md index 4e1b8ac0d9..aa38bd2e88 100644 --- a/latvian/sniegt_roku/sniegt_roku.md +++ b/latvian/sniegt_roku/sniegt_roku.md @@ -3,7 +3,7 @@ Kamēr zefīra roka mēģina sagrābt šķiltavu, Tu izliec savu roku un saki "Čau!" un piedāvā zefīram: -[Vai tu vēlies pelēties?](../peldeties/peldeties.md) vai +[Vai tu vēlies pelēties?](../peldeties/peldet.md) vai [Varbūt ejam peldēties?](../skriet/skriet.md) From 4c00ed63068f2ee6b6e0f58c7d9f24bde5248641 Mon Sep 17 00:00:00 2001 From: Gunars Grundstoks Date: Fri, 7 Aug 2015 22:26:30 +0300 Subject: [PATCH 0506/5486] Revert "New story peldet or skriet" --- latvian/peldeties/peldet.md | 3 --- latvian/skriet/skriet.md | 3 --- latvian/sniegt_roku/sniegt_roku.md | 8 +------- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 latvian/peldeties/peldet.md delete mode 100644 latvian/skriet/skriet.md diff --git a/latvian/peldeties/peldet.md b/latvian/peldeties/peldet.md deleted file mode 100644 index 0b615c9619..0000000000 --- a/latvian/peldeties/peldet.md +++ /dev/null @@ -1,3 +0,0 @@ -Man ir neizteikts prieks, ka zefīrs izvēlējās doties peldēties, jo - -tagad mēs jūru varēsim pārpeldēt jautrā kompānijā. \ No newline at end of file diff --git a/latvian/skriet/skriet.md b/latvian/skriet/skriet.md deleted file mode 100644 index 5489af951b..0000000000 --- a/latvian/skriet/skriet.md +++ /dev/null @@ -1,3 +0,0 @@ -Lai arī zefīram skriet nav mīļākā nodarbe, - -zefīrs vēlējās iemēģināt laimi skriešanā. \ No newline at end of file diff --git a/latvian/sniegt_roku/sniegt_roku.md b/latvian/sniegt_roku/sniegt_roku.md index aa38bd2e88..6fb3d63e5f 100644 --- a/latvian/sniegt_roku/sniegt_roku.md +++ b/latvian/sniegt_roku/sniegt_roku.md @@ -1,9 +1,3 @@ Kamēr zefīra roka mēģina sagrābt šķiltavu, -Tu izliec savu roku un saki "Čau!" un piedāvā zefīram: - - -[Vai tu vēlies pelēties?](../peldeties/peldet.md) vai - -[Varbūt ejam peldēties?](../skriet/skriet.md) - +Tu izliec savu roku un saki "Čau!" \ No newline at end of file From 6320afc5e6c658e9185e85ed76ecb3b43f9209df Mon Sep 17 00:00:00 2001 From: ZZZZeran Date: Fri, 7 Aug 2015 13:23:16 -0700 Subject: [PATCH 0507/5486] Add one sentence at the end with a link to another existing page called coffee --- english/analyze/analysis.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/analyze/analysis.md b/english/analyze/analysis.md index 108ac99846..d530f9b361 100644 --- a/english/analyze/analysis.md +++ b/english/analyze/analysis.md @@ -1 +1,2 @@ -Surprisingly, this is not really marshmallow. It only looks like it but in reality it is made out of... \ No newline at end of file +Surprisingly, this is not really marshmallow. It only looks like it but in reality it is made out of... +Let me guess, your favorite flavor of marshmallow is avocado; mixed with some [coffee](../coffee/coffee.md) \ No newline at end of file From ee5252868f688259a64c8048314ae9a668dde312 Mon Sep 17 00:00:00 2001 From: Jeffrey Kalmanek Date: Fri, 7 Aug 2015 22:52:19 -0700 Subject: [PATCH 0508/5486] added some lines to the meditate page --- english/meditate/meditate.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/meditate/meditate.md b/english/meditate/meditate.md index 33aa1de44d..39671069c0 100644 --- a/english/meditate/meditate.md +++ b/english/meditate/meditate.md @@ -4,6 +4,10 @@ So you begin to meditate for 30 minutes and when you finish, you feel more refre The vision of dancing women flying from cloud to cloud are magical. +You decide to meditate more. You meditate for 60 minutes and when you finish you feel agitated. + +Now the dancing women have been replaced by clowns. + Clearing your mind and observing your thought, now your are more focused and ready to take on the day. Meditation also develops positive emotion and helps to see the world in different perspective. From 046cad0e6bb6f668e01f26adc126424e377365da Mon Sep 17 00:00:00 2001 From: Peter P Date: Sat, 8 Aug 2015 18:25:59 +1000 Subject: [PATCH 0509/5486] Pull the pin from your hand grenade. --- english/polar-bear/polar-bear.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/polar-bear/polar-bear.md b/english/polar-bear/polar-bear.md index c5a1da07fb..4824d4079d 100644 --- a/english/polar-bear/polar-bear.md +++ b/english/polar-bear/polar-bear.md @@ -25,6 +25,7 @@ the walruses quickly help the situation by using their tusks to pierce any marshmellows and create a rip in the fabric of reality.. you jump on the walruses back.. +While riding the walrus you quickly pull the pin from the hand grenade you’ve been clenching and toss it in the general direct of the polar bear. The grenade explodes and causes the bear to lose a layer of skin. Now you decide to: From b87e9e79af0b9f35fc217051f73999c996767258 Mon Sep 17 00:00:00 2001 From: Peter P Date: Sat, 8 Aug 2015 18:29:21 +1000 Subject: [PATCH 0510/5486] Pull pin from hand grenade. --- english/polar-bear/polar-bear.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/polar-bear/polar-bear.md b/english/polar-bear/polar-bear.md index 4824d4079d..dc4fde0f2a 100644 --- a/english/polar-bear/polar-bear.md +++ b/english/polar-bear/polar-bear.md @@ -25,7 +25,9 @@ the walruses quickly help the situation by using their tusks to pierce any marshmellows and create a rip in the fabric of reality.. you jump on the walruses back.. -While riding the walrus you quickly pull the pin from the hand grenade you’ve been clenching and toss it in the general direct of the polar bear. The grenade explodes and causes the bear to lose a layer of skin. +While riding the walrus you quickly pull the pin from the hand grenade you’ve been clenching and toss it in the general direct of the polar bear. + +The grenade explodes and causes the bear to lose a layer of skin. Now you decide to: From 74ea70113d41aebe30fafa30ded019f85521a778 Mon Sep 17 00:00:00 2001 From: Peter P Date: Sat, 8 Aug 2015 18:31:18 +1000 Subject: [PATCH 0511/5486] Pull the pin from your hand grenade. --- english/polar-bear/polar-bear.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/polar-bear/polar-bear.md b/english/polar-bear/polar-bear.md index dc4fde0f2a..1346e00cbc 100644 --- a/english/polar-bear/polar-bear.md +++ b/english/polar-bear/polar-bear.md @@ -25,7 +25,9 @@ the walruses quickly help the situation by using their tusks to pierce any marshmellows and create a rip in the fabric of reality.. you jump on the walruses back.. -While riding the walrus you quickly pull the pin from the hand grenade you’ve been clenching and toss it in the general direct of the polar bear. +While riding the walrus you quickly pull the pin from the hand grenade you’ve been clenching. + +You then toss the grenade in the general direction of the polar bear. The grenade explodes and causes the bear to lose a layer of skin. From edbb46009785c0a1369dfb360aee635d8a1e701a Mon Sep 17 00:00:00 2001 From: Hai_Nguyen Date: Sat, 8 Aug 2015 21:24:17 +0700 Subject: [PATCH 0512/5486] add I speak vietnamese --- english/call-a-doctor/doctor.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/call-a-doctor/doctor.md b/english/call-a-doctor/doctor.md index 62131c3e42..dc08c90928 100644 --- a/english/call-a-doctor/doctor.md +++ b/english/call-a-doctor/doctor.md @@ -16,3 +16,6 @@ color, not like the institutionalized white you remember from movies. ["Eh, what's up Doc"](bugs-bunny/bugs-bunny.md) ["I'm the Doctor"](timelord/timelord.md) + +["I speak Vietnamese"](VN/vn.md) + From c85903ead343e231013c2c19f8f49d07c254f489 Mon Sep 17 00:00:00 2001 From: Hai_Nguyen Date: Sat, 8 Aug 2015 21:30:14 +0700 Subject: [PATCH 0513/5486] add vn.md --- english/call-a-doctor/VN/vn.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/call-a-doctor/VN/vn.md diff --git a/english/call-a-doctor/VN/vn.md b/english/call-a-doctor/VN/vn.md new file mode 100644 index 0000000000..1b9b08dea3 --- /dev/null +++ b/english/call-a-doctor/VN/vn.md @@ -0,0 +1,2 @@ +toi viet bang tieng viet va lai la tieng viet khong dau, toi dinh chui the ai vao day nhung ma thoi. +chao tam biet. \ No newline at end of file From dda18fecfc838823cccd193243a86d350b3c34ba Mon Sep 17 00:00:00 2001 From: kels Date: Sat, 8 Aug 2015 16:55:42 -0400 Subject: [PATCH 0514/5486] adding 'go gather more wood' option to minecraft --- english/you-are-in-minecraft/dig_down/dig_down.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/you-are-in-minecraft/dig_down/dig_down.md b/english/you-are-in-minecraft/dig_down/dig_down.md index 1559a7c47d..f61a6a4e68 100644 --- a/english/you-are-in-minecraft/dig_down/dig_down.md +++ b/english/you-are-in-minecraft/dig_down/dig_down.md @@ -22,4 +22,6 @@ Behind you a single path... Do you go [left?](goleft/goleft.md) -Or maybe go [right?](goright/goright.md) \ No newline at end of file +Or maybe go [right?](goright/goright.md) + +Or [dig yourself out and return to collecting wood?](../gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md]] \ No newline at end of file From 8d5602f1469924559bbd430a45baea142d5a8b9a Mon Sep 17 00:00:00 2001 From: kels Date: Sat, 8 Aug 2015 16:58:13 -0400 Subject: [PATCH 0515/5486] new option in minecraft --- english/you-are-in-minecraft/dig_down/dig_down.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/you-are-in-minecraft/dig_down/dig_down.md b/english/you-are-in-minecraft/dig_down/dig_down.md index f61a6a4e68..ed479295ed 100644 --- a/english/you-are-in-minecraft/dig_down/dig_down.md +++ b/english/you-are-in-minecraft/dig_down/dig_down.md @@ -24,4 +24,4 @@ Do you go [left?](goleft/goleft.md) Or maybe go [right?](goright/goright.md) -Or [dig yourself out and return to collecting wood?](../gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md]] \ No newline at end of file +Or [dig yourself out and return to collecting wood?](../gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md) \ No newline at end of file From ac0d141d248b7c1ef16ed069a3979d1b8e706b7f Mon Sep 17 00:00:00 2001 From: author Date: Sat, 8 Aug 2015 16:19:03 -0700 Subject: [PATCH 0516/5486] add line to swami*md --- english/swami-vivekananda/swami-vivekananda.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/swami-vivekananda/swami-vivekananda.md b/english/swami-vivekananda/swami-vivekananda.md index 0b465cf2df..075ba8a509 100644 --- a/english/swami-vivekananda/swami-vivekananda.md +++ b/english/swami-vivekananda/swami-vivekananda.md @@ -13,5 +13,7 @@ But, whatever you do, be curious... But, whatever you do, do things that you're afraid of... +Do what you love. + [OK, now back to the issue at hand-- I just woke up in a marshmallow house.](../marshmallow.md) From 361c23e581d00a9ea6e54210c3fe17d9266f17f5 Mon Sep 17 00:00:00 2001 From: author Date: Sat, 8 Aug 2015 16:32:06 -0700 Subject: [PATCH 0517/5486] add line to main story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index fe22b2efe1..36aa9f85d2 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -60,6 +60,8 @@ You hear a small bird sound in the distance. But it sounds like it might be coming out of speakers. +Something lightly brushes the back of your neck, sending a chill down your spine! Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. + When you look away, a marshmallow hand attempts to grab the lighter. But you are too quick for the marshmallow! From 2302fcfad0c77b4f89b2f1419f10e3328f1cc163 Mon Sep 17 00:00:00 2001 From: author Date: Sat, 8 Aug 2015 16:38:11 -0700 Subject: [PATCH 0518/5486] shorten the newly added lines in main story --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 36aa9f85d2..27336e34d4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -60,7 +60,8 @@ You hear a small bird sound in the distance. But it sounds like it might be coming out of speakers. -Something lightly brushes the back of your neck, sending a chill down your spine! Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. +Something lightly brushes the back of your neck, sending a chill down your spine! +Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. When you look away, a marshmallow hand attempts to grab the lighter. From 821b0d5aceff8f5cc986a8e8374ddd7f858b1672 Mon Sep 17 00:00:00 2001 From: author Date: Sat, 8 Aug 2015 16:41:23 -0700 Subject: [PATCH 0519/5486] add empty line between newly added text --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 27336e34d4..df50c5d636 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -61,6 +61,7 @@ You hear a small bird sound in the distance. But it sounds like it might be coming out of speakers. Something lightly brushes the back of your neck, sending a chill down your spine! + Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. When you look away, a marshmallow hand attempts to grab the lighter. From 3f6d7f91654f56476011a631016dade81bfc576f Mon Sep 17 00:00:00 2001 From: Mayank Verma Date: Sun, 9 Aug 2015 12:16:00 +0530 Subject: [PATCH 0520/5486] A brief about myStory. --- english/myStory/mayank.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/myStory/mayank.md diff --git a/english/myStory/mayank.md b/english/myStory/mayank.md new file mode 100644 index 0000000000..4c3308973f --- /dev/null +++ b/english/myStory/mayank.md @@ -0,0 +1,5 @@ +Here I want to tell some of my life incidents which transformed me as a person. +Be it childhood, school, college , job life everything had a very huge impact on my +behaviour and my mindstate. + +[Want Coffee](../coffee/coffee.md) From 53640c74567d87670b7fa33e612af2fc8dff1447 Mon Sep 17 00:00:00 2001 From: Mayank Verma Date: Sun, 9 Aug 2015 12:37:41 +0530 Subject: [PATCH 0521/5486] Added a reference link to my story in dance page. --- english/dance/dance.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/dance/dance.md b/english/dance/dance.md index 184e511fe4..b6493f6d14 100644 --- a/english/dance/dance.md +++ b/english/dance/dance.md @@ -36,4 +36,6 @@ it is a dancing cat [Want coffee?](../coffee/coffee.md) +[Want to read a story](../myStory/mayank.md) + From 87ed1972c95905b107636be57f256ad322ea5645 Mon Sep 17 00:00:00 2001 From: Min-Seung Kim Date: Sun, 9 Aug 2015 07:37:31 -0400 Subject: [PATCH 0522/5486] Add eat wall --- korean/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/korean/marshmallow.md b/korean/marshmallow.md index bdbe6ca808..2bfdf787c7 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -2,6 +2,8 @@ 어떻게 할까요? +벽을 먹는다. + [벽을 먹는다](eating-walls/eating-marshmallows.md)? [불을 지핀다](light-fire/fire.md)? From 17d08c83c04995d5e815beb08d0ed940c559ca30 Mon Sep 17 00:00:00 2001 From: simonov-p Date: Sun, 9 Aug 2015 21:58:39 +0300 Subject: [PATCH 0523/5486] Update close-eyes.md --- russian/close-eyes/close-eyes.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/russian/close-eyes/close-eyes.md b/russian/close-eyes/close-eyes.md index d3616dac22..6992fee94f 100644 --- a/russian/close-eyes/close-eyes.md +++ b/russian/close-eyes/close-eyes.md @@ -4,6 +4,4 @@ Через несколько часов вы зашли на кухню и обнаружили зефиринку на столе, а затем в ванне и на балконе... - -Через несколько часов вы зашли на кухню и обнаружили зефиринку на столе, -а затем в ванне и на балконе... \ No newline at end of file +На кухне рядом со столом сидел зефирный человек! From 43597b56cb7c00a61b2750e6b488d6ce37d6e9ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romel=20P=C3=A9rez?= Date: Sun, 9 Aug 2015 16:15:23 -0500 Subject: [PATCH 0524/5486] add: enlace de angeles ayudan guerreros --- espanol/canudos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index 993ad1231f..c95356b191 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -53,3 +53,5 @@ el Consejero: [Se arrodilla y...](rogando/rogando.md) [Y vino un ejercito](ejercito/ejercito.md) + +[Un ejercito de angeles para ayudar a los guerreros.](angeles/angeles.md) From e083f6a55f250fa999c4ccb541a00fa3ed7eb4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romel=20P=C3=A9rez?= Date: Sun, 9 Aug 2015 16:15:49 -0500 Subject: [PATCH 0525/5486] add: angeles ayudan guerreros --- espanol/angeles/angeles.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 espanol/angeles/angeles.md diff --git a/espanol/angeles/angeles.md b/espanol/angeles/angeles.md new file mode 100644 index 0000000000..00c20e5c44 --- /dev/null +++ b/espanol/angeles/angeles.md @@ -0,0 +1,5 @@ +Los guerreros al escuchar a los ángeles escuchar el violín tan angelicalmente, +se arrodillaron para orar y pedir por fuerzas para la batalla! + +En eso el Consejero se levanta y agradece a los ángeles por toda la ayuda que +han brindado. Betito se llenó de fuerzas también y animó a todos los guerreros. From 6eda359d1f4f6cfee31f6cd321583e7ec507029d Mon Sep 17 00:00:00 2001 From: Steven Thon Date: Sun, 9 Aug 2015 17:43:58 -0700 Subject: [PATCH 0526/5486] Add story branch "code" --- english/code/code.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/code/code.md diff --git a/english/code/code.md b/english/code/code.md new file mode 100644 index 0000000000..b7f56bb0b1 --- /dev/null +++ b/english/code/code.md @@ -0,0 +1 @@ +It seems like the only thing to do is code. From fcf68426c68f6ec0e8263701d607347e8a60190d Mon Sep 17 00:00:00 2001 From: Steven Thon Date: Sun, 9 Aug 2015 17:49:15 -0700 Subject: [PATCH 0527/5486] Add link to story "code" in "marshmallow.md" --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index df50c5d636..25e1cf38ce 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -413,3 +413,5 @@ Do you: [Watch Barcelona game](watch-barca/watch-barca.md) [Oops! this story ain't ending..](unending-story/unending-story.md) + +[Code](code/code.md) \ No newline at end of file From ffc5329b4a91e6972d3baf6153e804a1a302f22e Mon Sep 17 00:00:00 2001 From: Anthony Sampeck Date: Mon, 10 Aug 2015 08:59:58 -0500 Subject: [PATCH 0528/5486] Add hyphen to vacant eyed --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 25e1cf38ce..c7e25c27dd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -18,7 +18,7 @@ Grave danger. Oh No! The type of extreme mortal danger that so often accompanies confectionary inspired interior design. Quickly surveying your immediate surrounds, you notice a garishly dressed, -vacant eyed young man lounging on a nearby sofa. +vacant-eyed young man lounging on a nearby sofa. [Interrogate the man for clues](./movie-ripoffs/zoolander/zoolander.md) From a29c363fae2d06200bb7ddcfc3160c8d8ee8ae23 Mon Sep 17 00:00:00 2001 From: Marc Edwards Date: Mon, 10 Aug 2015 10:24:44 -0400 Subject: [PATCH 0529/5486] Added phone a friend option --- english/bob-barker/barker.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/bob-barker/barker.md b/english/bob-barker/barker.md index 10109456b7..5866457bf7 100644 --- a/english/bob-barker/barker.md +++ b/english/bob-barker/barker.md @@ -26,4 +26,6 @@ You hesitate just a moment before replying... [The red door](2050s/2050s.md) -[Grab some coffee?](../coffee/coffee.md) \ No newline at end of file +[Grab some coffee?](../coffee/coffee.md) + +[Can a phone a friend?](phone-a-friend/phone-a-friend.md) \ No newline at end of file From e7348c5af29953d1dc5d60b2458d3cbcad7b3b37 Mon Sep 17 00:00:00 2001 From: Marc Edwards Date: Mon, 10 Aug 2015 10:25:32 -0400 Subject: [PATCH 0530/5486] New story arc: phone-a-friend --- english/bob-barker/phone-a-friend/phone-a-friend.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/bob-barker/phone-a-friend/phone-a-friend.md diff --git a/english/bob-barker/phone-a-friend/phone-a-friend.md b/english/bob-barker/phone-a-friend/phone-a-friend.md new file mode 100644 index 0000000000..5445840581 --- /dev/null +++ b/english/bob-barker/phone-a-friend/phone-a-friend.md @@ -0,0 +1,3 @@ +"Sorry bud, wrong show.," replies Bob sarcastically. + +Your ears are full of gooey marshmallow, so you ignore Bob's turgid response and reach for your flip-phone and begin to phone the first person that comes to mind.... From 7e51bc677dd5145de2d119869c754ae1f827097a Mon Sep 17 00:00:00 2001 From: Marc Edwards Date: Mon, 10 Aug 2015 10:29:28 -0400 Subject: [PATCH 0531/5486] Fixed spelling mistake --- english/bob-barker/barker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bob-barker/barker.md b/english/bob-barker/barker.md index 5866457bf7..d3db646b12 100644 --- a/english/bob-barker/barker.md +++ b/english/bob-barker/barker.md @@ -28,4 +28,4 @@ You hesitate just a moment before replying... [Grab some coffee?](../coffee/coffee.md) -[Can a phone a friend?](phone-a-friend/phone-a-friend.md) \ No newline at end of file +[Can I phone a friend?](phone-a-friend/phone-a-friend.md) \ No newline at end of file From bd9e811fd48c4abcd05c40f4db764f41124295a4 Mon Sep 17 00:00:00 2001 From: Marc Edwards Date: Mon, 10 Aug 2015 10:37:28 -0400 Subject: [PATCH 0532/5486] Truncated longer lines --- english/bob-barker/phone-a-friend/phone-a-friend.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/bob-barker/phone-a-friend/phone-a-friend.md b/english/bob-barker/phone-a-friend/phone-a-friend.md index 5445840581..f856f5d561 100644 --- a/english/bob-barker/phone-a-friend/phone-a-friend.md +++ b/english/bob-barker/phone-a-friend/phone-a-friend.md @@ -1,3 +1,4 @@ "Sorry bud, wrong show.," replies Bob sarcastically. -Your ears are full of gooey marshmallow, so you ignore Bob's turgid response and reach for your flip-phone and begin to phone the first person that comes to mind.... +Your ears are full of gooey marshmallow, so you ignore Bob's turgid response and reach for your +flip-phone and begin to phone the first person that comes to mind.... \ No newline at end of file From 91a9a300e7f82f0fe3e9876aa650ffacac205f32 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Mon, 10 Aug 2015 16:01:25 +0100 Subject: [PATCH 0533/5486] Add a couple lines about some mysterious liquid --- english/watch-alien/watch-alien.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/watch-alien/watch-alien.md b/english/watch-alien/watch-alien.md index 1f7ebaafdf..db856dd2b6 100644 --- a/english/watch-alien/watch-alien.md +++ b/english/watch-alien/watch-alien.md @@ -5,3 +5,5 @@ With no idea what's going on, and your heart rate already slightly elevated, you to panic. You begin to smell a faint odor that you don't recognize. This time, it's not the dog. + +A viscous, dark green liquid starts crawling out from beneath the door. You quickly tuck your knees up and crouch on your sofa. The green fluid starts to glow, an unerving regular beat - almost like - no, it couldn't be - you realise it is your heartbeat and start to panic. Why is it the same? \ No newline at end of file From 1cc5d0949ab1bc4200380931af1abe5bd166790b Mon Sep 17 00:00:00 2001 From: theourea Date: Mon, 10 Aug 2015 09:51:21 -0600 Subject: [PATCH 0534/5486] Add lyrics for when it is hammer time --- english/hammertime/hammertime.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/hammertime/hammertime.md b/english/hammertime/hammertime.md index 97b59b986d..e8c3044d25 100644 --- a/english/hammertime/hammertime.md +++ b/english/hammertime/hammertime.md @@ -1,2 +1,4 @@ You break into the hammertime-dance, but quickly realize -that this doesn't help you at all. \ No newline at end of file +that this doesn't help you at all. + +Stop......IT'S HAMMERTIME - WHOOA-O, WHOOA-O! WHOOA-O, WHOOA-O! From df2ab5333907c7acd249cb2d9842419b004ec2a0 Mon Sep 17 00:00:00 2001 From: Gordon Date: Mon, 10 Aug 2015 13:07:06 -0400 Subject: [PATCH 0535/5486] minor marshmallow paranoia --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index fe22b2efe1..9cbd167179 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -22,7 +22,7 @@ vacant eyed young man lounging on a nearby sofa. [Interrogate the man for clues](./movie-ripoffs/zoolander/zoolander.md) -These marshmallows are numerous and they look so delicious. +These marshmallows are numerous and they look so delicious, despite the feeling they're somehow judging you for only wearing one sock. You reach out to grab a handful of the marshmallow wall, but you can't seem to take the handful away from the wall. @@ -44,7 +44,7 @@ You are not sure who placed these objects near you or why. But you have a growing sense that these mundane objects are vital to your survival. -You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. +You decide to try to light a fire to melt some of the more judgmental marshmallows so you look for some kindling. You have the suspicion that you are being closely watched. From ad82bd2f29af26f2d6b63c2cc9d984aff2de01da Mon Sep 17 00:00:00 2001 From: Gordon Date: Mon, 10 Aug 2015 13:22:43 -0400 Subject: [PATCH 0536/5486] formatting changes as per cassey-collab --- english/marshmallow.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 9cbd167179..fbb5e478a4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -22,7 +22,8 @@ vacant eyed young man lounging on a nearby sofa. [Interrogate the man for clues](./movie-ripoffs/zoolander/zoolander.md) -These marshmallows are numerous and they look so delicious, despite the feeling they're somehow judging you for only wearing one sock. +These marshmallows are numerous and they look so delicious. +... despite the feeling they're somehow judging you for only wearing one sock. You reach out to grab a handful of the marshmallow wall, but you can't seem to take the handful away from the wall. @@ -44,7 +45,7 @@ You are not sure who placed these objects near you or why. But you have a growing sense that these mundane objects are vital to your survival. -You decide to try to light a fire to melt some of the more judgmental marshmallows so you look for some kindling. +You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. You have the suspicion that you are being closely watched. From 1ab2cee328cf5a8ce16d9534f0848d20826a9243 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Mon, 10 Aug 2015 22:08:05 +0100 Subject: [PATCH 0537/5486] Update watch-alien.md Shortened lines to make it easier to read the raw files or view diffs on the command line, as suggested by @casey-collab --- english/watch-alien/watch-alien.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/watch-alien/watch-alien.md b/english/watch-alien/watch-alien.md index db856dd2b6..f3b120c29c 100644 --- a/english/watch-alien/watch-alien.md +++ b/english/watch-alien/watch-alien.md @@ -6,4 +6,7 @@ to panic. You begin to smell a faint odor that you don't recognize. This time, it's not the dog. -A viscous, dark green liquid starts crawling out from beneath the door. You quickly tuck your knees up and crouch on your sofa. The green fluid starts to glow, an unerving regular beat - almost like - no, it couldn't be - you realise it is your heartbeat and start to panic. Why is it the same? \ No newline at end of file +A viscous, dark green liquid starts crawling out from beneath the door. +You quickly tuck your knees up and crouch on your sofa. The green fluid starts to glow, +an unerving regular beat - almost like - no, it couldn't be - you realise it is your +heartbeat and start to panic. Why is it the same? From e54d00e917acd4bef98e1e672bccecf6d454b7e0 Mon Sep 17 00:00:00 2001 From: Chris King Date: Mon, 10 Aug 2015 17:27:55 -0700 Subject: [PATCH 0538/5486] Added new option to 'appear-on-falcors-back' --- english/appear-on-falkors-back/falkor.md | 2 ++ english/yearg/yearg.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/yearg/yearg.md diff --git a/english/appear-on-falkors-back/falkor.md b/english/appear-on-falkors-back/falkor.md index 2677f766e6..aae2234304 100644 --- a/english/appear-on-falkors-back/falkor.md +++ b/english/appear-on-falkors-back/falkor.md @@ -7,4 +7,6 @@ Just click on the link. [Pinch yourself](../pinch/pinch.md) +[Yell of exhilaration](../yearg/yearg.md) + [Make a Marshmallow Cake](https://www.youtube.com/watch?v=3l1SY3QREv4) diff --git a/english/yearg/yearg.md b/english/yearg/yearg.md new file mode 100644 index 0000000000..501a4baf67 --- /dev/null +++ b/english/yearg/yearg.md @@ -0,0 +1 @@ +You yell out "YEEEARGGHH!!" at the top of your lungs to indicate your sense of overwhelming freedom. \ No newline at end of file From f014c573bb1b9051100e31dda4a3baba2d072d15 Mon Sep 17 00:00:00 2001 From: eyadsalama Date: Tue, 11 Aug 2015 04:25:59 +0200 Subject: [PATCH 0539/5486] Update dream.md --- arabic/dream/dream.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arabic/dream/dream.md b/arabic/dream/dream.md index ed1520f3fe..5892266551 100644 --- a/arabic/dream/dream.md +++ b/arabic/dream/dream.md @@ -1,2 +1,3 @@ هل تريد ان تحلم؟ -احلم......الاحلام تتحقق اذا صدقة النية \ No newline at end of file +احلم......الاحلام تتحقق اذا صدقة النية +ولكن الاحلام لا تتحقق الا بالتوكل على الله والاخذ بالاسباب From 42c792c2c2fc354d8707c067eac374542da8b283 Mon Sep 17 00:00:00 2001 From: HNA Date: Tue, 11 Aug 2015 10:03:18 +0700 Subject: [PATCH 0540/5486] Add a funny story --- vietnamese/kechuyen.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index 7b1202e5e8..c943cdae57 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -1 +1,2 @@ -Bạn thích nghe [truyện ma](https://www.youtube.com/watch?v=0dfWjEKXpZk)? \ No newline at end of file +Bạn thích nghe [truyện ma](https://www.youtube.com/watch?v=0dfWjEKXpZk)? +Thế còn [truyện cười](https://www.youtube.com/watch?v=3r_-ZLZCxQs)? \ No newline at end of file From 6aa18369c338b9e55bd5dd853ab9151d3e8fb3de Mon Sep 17 00:00:00 2001 From: HNA Date: Tue, 11 Aug 2015 10:08:01 +0700 Subject: [PATCH 0541/5486] Add a blank line between links --- vietnamese/kechuyen.md | 1 + 1 file changed, 1 insertion(+) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index c943cdae57..71ec84fc71 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -1,2 +1,3 @@ Bạn thích nghe [truyện ma](https://www.youtube.com/watch?v=0dfWjEKXpZk)? + Thế còn [truyện cười](https://www.youtube.com/watch?v=3r_-ZLZCxQs)? \ No newline at end of file From fb0239daa11beb655c87e7c15a7d255d95f8d0cd Mon Sep 17 00:00:00 2001 From: eyadsalama Date: Tue, 11 Aug 2015 05:14:44 +0200 Subject: [PATCH 0542/5486] Update learn.md --- arabic/learn/learn.md | 1 + 1 file changed, 1 insertion(+) diff --git a/arabic/learn/learn.md b/arabic/learn/learn.md index 7d298c283a..5b33475d15 100644 --- a/arabic/learn/learn.md +++ b/arabic/learn/learn.md @@ -1,2 +1,3 @@ اذا قررت ان تكمل الالتعلم فانه عليك ان تبحث عن موضوع مكمل لموضوع السياق الماضي، هل تعرف لماذا؟ لانه يجب عليك الاستفاده من السياق الماضي وتطوير قدراتك فيه لذا ماذا تتوقع ان تفعل الان؟ +قال صلى الله عليه وسلم من سلك طريقاً يلتمس فيه علماً سهل الله له طريقاً الى الجنة From f8f0156ce8867d58e761e65629b415b080f81f02 Mon Sep 17 00:00:00 2001 From: eyadsalama Date: Tue, 11 Aug 2015 05:27:23 +0200 Subject: [PATCH 0543/5486] Update dream.md --- arabic/dream/dream.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arabic/dream/dream.md b/arabic/dream/dream.md index 5892266551..413da6c42d 100644 --- a/arabic/dream/dream.md +++ b/arabic/dream/dream.md @@ -1,3 +1,5 @@ هل تريد ان تحلم؟ احلم......الاحلام تتحقق اذا صدقة النية ولكن الاحلام لا تتحقق الا بالتوكل على الله والاخذ بالاسباب +الان انت فى بداية الطريق ماذا ستفعل +1- [ستبدأ فى التعلم] (https://github.com/udacity/create-your-own-adventure/blob/master/arabic/learn/learn.md From bca8e9d309239c9b34757d04699f40d55db62869 Mon Sep 17 00:00:00 2001 From: eyadsalama Date: Tue, 11 Aug 2015 05:51:13 +0200 Subject: [PATCH 0544/5486] Update dream.md --- arabic/dream/dream.md | 1 + 1 file changed, 1 insertion(+) diff --git a/arabic/dream/dream.md b/arabic/dream/dream.md index 413da6c42d..9b9aa3a768 100644 --- a/arabic/dream/dream.md +++ b/arabic/dream/dream.md @@ -3,3 +3,4 @@ ولكن الاحلام لا تتحقق الا بالتوكل على الله والاخذ بالاسباب الان انت فى بداية الطريق ماذا ستفعل 1- [ستبدأ فى التعلم] (https://github.com/udacity/create-your-own-adventure/blob/master/arabic/learn/learn.md +1-[ستبدأ فى التعلم](../learn/learn.md) From 2f662699e3f547016ccd60ef33a5180aa239238b Mon Sep 17 00:00:00 2001 From: Danilo Fiorenzano Date: Tue, 11 Aug 2015 06:45:49 -0400 Subject: [PATCH 0545/5486] See what's behind the secret door --- .../libri-francesi/prendere-il-libro/porta/porta.md | 9 +++++++++ .../prendere-il-libro/prendere-il-libro.md | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md diff --git a/Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md b/Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md new file mode 100644 index 0000000000..a548f724d6 --- /dev/null +++ b/Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md @@ -0,0 +1,9 @@ +Con cautela apri lentamente la porta, e restando sulla soglia cerchi di vedere +qualcosa nell'oscurita'. La luce proveniente dalla stanza e' appena sufficiente +ad illuminare degli scalini di pietra che discendono chissa' dove. Un lontano +rumore di macchinari di qualche tipo si sente in distanza. + +Decidi sia meglio trovare una torcia elettrica o una candela prima +d'avventurarsi. + +[Chiudi la porta e torni ad osservare la stanza](../../libri-francesi.md) diff --git a/Italian/guardare/libri-francesi/prendere-il-libro/prendere-il-libro.md b/Italian/guardare/libri-francesi/prendere-il-libro/prendere-il-libro.md index 989498ae4b..eeeb21d826 100644 --- a/Italian/guardare/libri-francesi/prendere-il-libro/prendere-il-libro.md +++ b/Italian/guardare/libri-francesi/prendere-il-libro/prendere-il-libro.md @@ -9,3 +9,5 @@ che non lascia intravedere niente se non una fitta oscurità. [Torno a dormire](../../../domire/sogno-strano.md) [Apro la finestra](../../../finestra/apri.md) + +[Apro la porta](porta/porta.md) From a4861da0b805d11df7594b5de6350ed739f05544 Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 11 Aug 2015 16:23:13 +0200 Subject: [PATCH 0546/5486] add option gloeckchen to kobold arc --- .../Hilfeschrei/Vertrauen/insMaul/gloeckchen/gloeckchen.md | 5 +++++ german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/gloeckchen.md diff --git a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/gloeckchen.md b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/gloeckchen.md new file mode 100644 index 0000000000..be61f599bc --- /dev/null +++ b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/gloeckchen.md @@ -0,0 +1,5 @@ +Mistrauisch betrachtest du das Glöckchen. Es sieht gar nicht magisch aus, eher ganz +gewöhnlich. Du läutest trozdem. Der Kobold lacht verschlagen und verschwindet indem +er sich unsichtbar macht. + +Unbehaglich kommt dir der Gedanke das der Kobold Schabernack mit dir treibt. \ No newline at end of file diff --git a/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md b/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md index 23f814601a..f413d02978 100644 --- a/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md +++ b/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md @@ -11,3 +11,5 @@ einen grünen Kobold mit einem Glöckchen um den Hals. Der Kobold sagt: Du entgegnest: ["N'Scheiss kriegst du mein Handy" und haust ihm eine rein](reinhauen/reinhauen.md) + +[Du tauschst dein Handy gegen das Glöckchen](gloeckchen/gloeckchen.md) \ No newline at end of file From e4bac77376710e3651a3104198ecd1c460a33e06 Mon Sep 17 00:00:00 2001 From: Neil Thomas Date: Tue, 11 Aug 2015 15:17:27 -0700 Subject: [PATCH 0547/5486] Add music to landing scene --- russian/zefir.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/zefir.md b/russian/zefir.md index 8029eea05d..199f7d3692 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -2,6 +2,8 @@ Солнце светит, и вы видете в окне цветы цветущие в саду. +Тихая музыка в джазовом стиле слышна, наверно она знакомая? + Ваши действия: [Начнёте есть стены.](eating-walls/eating-marshmallows.md) From f5d13991e26e89602b3e8f4e71641ae7cfb9d7ae Mon Sep 17 00:00:00 2001 From: Neil Thomas Date: Tue, 11 Aug 2015 15:30:22 -0700 Subject: [PATCH 0548/5486] Add option to dance --- russian/dance/dance.md | 1 + russian/zefir.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 russian/dance/dance.md diff --git a/russian/dance/dance.md b/russian/dance/dance.md new file mode 100644 index 0000000000..3cd0c93e54 --- /dev/null +++ b/russian/dance/dance.md @@ -0,0 +1 @@ +Вы сразу понимаете, что танцевать на зефире очень трудно - ваши ноги не двигаются! diff --git a/russian/zefir.md b/russian/zefir.md index 199f7d3692..c56782762c 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -30,4 +30,5 @@ [Поставите запятую после "цветы".] (comma/comma.md) +[Начинайте танцевать от радости.](dance/dance.md) From f10defe6174dde4709163b1e6bb4a7bb6107d984 Mon Sep 17 00:00:00 2001 From: Nikhil Date: Tue, 11 Aug 2015 21:02:19 -0400 Subject: [PATCH 0549/5486] Add custom message to story --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index a66d726783..08ab2cff65 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -415,4 +415,6 @@ Do you: [Oops! this story ain't ending..](unending-story/unending-story.md) -[Code](code/code.md) \ No newline at end of file +[Code](code/code.md) + +[Screaming goat is screaming](https://youtu.be/kh6c0SOfkH4) \ No newline at end of file From efe278e5a130bdfb16e6082004cdd5b5024b5913 Mon Sep 17 00:00:00 2001 From: Phoenix Date: Tue, 11 Aug 2015 22:11:30 -0400 Subject: [PATCH 0550/5486] Add tooth ache to tasty-marshmallow file --- english/bite-the-marshmallow/tasty-marshmallow.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index b08979a13e..87f2a8374e 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -2,6 +2,11 @@ You close your eyes. +Suddenly there is a horrible pain in your mouth! Who would have thought marshmallows, so white, so innocent, could cause such excruciating +pain! But come to think of it, you've never gone to the dentist about +that root canal he recommended almost a year ago, and perhaps you +should have gone back instead of trying to save a few bucks... + Wait a minute....how did you end up in this car? You must be hallucinating [You use the gps to get back home](https://www.youtube.com/watch?v=RvlhrgSZrfA) From d8f53f9b5825a8ab1366fc53ea57f18288ba8a2f Mon Sep 17 00:00:00 2001 From: Phoenix Date: Tue, 11 Aug 2015 22:20:55 -0400 Subject: [PATCH 0551/5486] Fix line length for tasty-marshmallow --- english/bite-the-marshmallow/tasty-marshmallow.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index 87f2a8374e..78543a12b6 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -2,10 +2,11 @@ You close your eyes. -Suddenly there is a horrible pain in your mouth! Who would have thought marshmallows, so white, so innocent, could cause such excruciating -pain! But come to think of it, you've never gone to the dentist about -that root canal he recommended almost a year ago, and perhaps you -should have gone back instead of trying to save a few bucks... +Suddenly there is a horrible pain in your mouth! Who would have +thought marshmallows, so white, so innocent, could cause such excruciating pain! But come to think of it, you've never gone +to the dentist about that root canal he recommended almost a +year ago, and perhaps you should have gone back instead of +trying to save a few bucks... Wait a minute....how did you end up in this car? You must be hallucinating From 4857eb8067de575147688e941c7c190031b0696e Mon Sep 17 00:00:00 2001 From: Phoenix Date: Tue, 11 Aug 2015 22:30:48 -0400 Subject: [PATCH 0552/5486] Fix line length of tasty marshmallow --- english/bite-the-marshmallow/tasty-marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index 78543a12b6..f039849d03 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -3,7 +3,8 @@ You close your eyes. Suddenly there is a horrible pain in your mouth! Who would have -thought marshmallows, so white, so innocent, could cause such excruciating pain! But come to think of it, you've never gone +thought marshmallows, so white, so innocent, could cause such +excruciating pain! But come to think of it, you've never gone to the dentist about that root canal he recommended almost a year ago, and perhaps you should have gone back instead of trying to save a few bucks... From 8020c95634f8cd1dc7769caed3f7d6811bf28365 Mon Sep 17 00:00:00 2001 From: huiyuandiknow Date: Tue, 11 Aug 2015 23:55:42 -0700 Subject: [PATCH 0553/5486] Update xin.md --- Chinese/xinwang/xin.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/xinwang/xin.md b/Chinese/xinwang/xin.md index bd92a6a1f6..e2d050808c 100644 --- a/Chinese/xinwang/xin.md +++ b/Chinese/xinwang/xin.md @@ -5,4 +5,6 @@ 现在怎么办？？？？ -它想去走走。 \ No newline at end of file +它想去走走。 + +吃得太飽撐得動也動不了, 只好用滾的. From 582091b4a269bdad71fbc97c7c8e3516aebb0b4b Mon Sep 17 00:00:00 2001 From: Iaroslav Zhbankov Date: Wed, 12 Aug 2015 14:07:49 +0300 Subject: [PATCH 0554/5486] add option open-the-door --- russian/light-fire/fire.md | 2 ++ russian/light-fire/open-the-door/open-the-door.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 russian/light-fire/open-the-door/open-the-door.md diff --git a/russian/light-fire/fire.md b/russian/light-fire/fire.md index 5b50d42054..a6ccf3db08 100644 --- a/russian/light-fire/fire.md +++ b/russian/light-fire/fire.md @@ -9,4 +9,6 @@ [Медитировать.](meditate/meditate.md) +[Вы решаете открыть дверь в комнате и выйти на улицу.] (open-the-door/open-the-door.md) + [Двигаться вперед в уверенности, что ничего не сможет нас остановить!] diff --git a/russian/light-fire/open-the-door/open-the-door.md b/russian/light-fire/open-the-door/open-the-door.md new file mode 100644 index 0000000000..eea9da29d0 --- /dev/null +++ b/russian/light-fire/open-the-door/open-the-door.md @@ -0,0 +1,3 @@ +Вы решаете открыть дверь в комнате и выйти на улицу. + +На улице чудесная погода и множество людей спещащих по своим делам. From 6c30f04490441e5bc1ebda69bb4536c41de7f8a3 Mon Sep 17 00:00:00 2001 From: Iaroslav Zhbankov Date: Wed, 12 Aug 2015 14:43:59 +0300 Subject: [PATCH 0555/5486] add conversation in the street --- russian/light-fire/open-the-door/ask/ask.md | 1 + russian/light-fire/open-the-door/open-the-door.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 russian/light-fire/open-the-door/ask/ask.md diff --git a/russian/light-fire/open-the-door/ask/ask.md b/russian/light-fire/open-the-door/ask/ask.md new file mode 100644 index 0000000000..4711130c25 --- /dev/null +++ b/russian/light-fire/open-the-door/ask/ask.md @@ -0,0 +1 @@ +Вы останавливаете прохожего и спрашиваете где вы находитесь. diff --git a/russian/light-fire/open-the-door/open-the-door.md b/russian/light-fire/open-the-door/open-the-door.md index eea9da29d0..b4ab38335b 100644 --- a/russian/light-fire/open-the-door/open-the-door.md +++ b/russian/light-fire/open-the-door/open-the-door.md @@ -1,3 +1,5 @@ Вы решаете открыть дверь в комнате и выйти на улицу. На улице чудесная погода и множество людей спещащих по своим делам. + +[Остановить прохожего и спросить где вы находитесь.](ask/ask.md) From aac50d8c52c5e0c4ed599ace64bc03807386b072 Mon Sep 17 00:00:00 2001 From: Jitendar Mandali Date: Wed, 12 Aug 2015 18:36:02 +0530 Subject: [PATCH 0556/5486] Hunger story --- english/hungry/hungry.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/hungry/hungry.md diff --git a/english/hungry/hungry.md b/english/hungry/hungry.md new file mode 100644 index 0000000000..4e50359d07 --- /dev/null +++ b/english/hungry/hungry.md @@ -0,0 +1,2 @@ +When ur hungry, wat do you eat ? +Maggi is outdated, so i would eat potato chips From c011e355d970f9d307e73446e2f0b53e46fa7b80 Mon Sep 17 00:00:00 2001 From: Jitendar Mandali Date: Wed, 12 Aug 2015 18:36:02 +0530 Subject: [PATCH 0557/5486] Hunger story - updated --- english/hungry/hungry.md | 2 ++ english/marshmallow.md | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 english/hungry/hungry.md diff --git a/english/hungry/hungry.md b/english/hungry/hungry.md new file mode 100644 index 0000000000..4e50359d07 --- /dev/null +++ b/english/hungry/hungry.md @@ -0,0 +1,2 @@ +When ur hungry, wat do you eat ? +Maggi is outdated, so i would eat potato chips diff --git a/english/marshmallow.md b/english/marshmallow.md index a66d726783..8a003a8955 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -169,6 +169,8 @@ Do you: [Light a fire?](light-fire/fire.md) +[Hungry Kya?](hungry/hungry.md) + [Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) [dig a hole with your bare hands?](hands/hands.md) @@ -415,4 +417,4 @@ Do you: [Oops! this story ain't ending..](unending-story/unending-story.md) -[Code](code/code.md) \ No newline at end of file +[Code](code/code.md) From 36d873c0716611624b8a5958c80e04c6cc1cf7d0 Mon Sep 17 00:00:00 2001 From: howeroc Date: Wed, 12 Aug 2015 22:28:43 +0800 Subject: [PATCH 0558/5486] Add a new story --- .../\350\245\277\346\270\270\345\220\216\350\256\260.md" | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 "Chinese/howeroc/\350\245\277\346\270\270\345\220\216\350\256\260.md" diff --git "a/Chinese/howeroc/\350\245\277\346\270\270\345\220\216\350\256\260.md" "b/Chinese/howeroc/\350\245\277\346\270\270\345\220\216\350\256\260.md" new file mode 100644 index 0000000000..aecb64cf28 --- /dev/null +++ "b/Chinese/howeroc/\350\245\277\346\270\270\345\220\216\350\256\260.md" @@ -0,0 +1 @@ +孙悟空被封为“斗战胜佛”后并没有安下心来去理佛事，人神佛三界也没有就此归于太平。一场暴风雨正在酝酿，于是就有了《西游后记》。 diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 0c66098d88..cb64fbbbe3 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -41,3 +41,5 @@ [谢霆锋](TingfengXie/TingfengXie.md)? [斗战胜佛](斗战胜佛/斗战胜佛.md) + +[等死朕了](howeroc/西游后记.md) From aa0fd6e3add762db597e219257b6c603d2e6c028 Mon Sep 17 00:00:00 2001 From: Donald Miller Date: Wed, 12 Aug 2015 16:19:55 -0400 Subject: [PATCH 0559/5486] Add my Thai food experience --- Thai/Cuisine/TomYumKung.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Thai/Cuisine/TomYumKung.md b/Thai/Cuisine/TomYumKung.md index 9a82814006..0563bbf877 100644 --- a/Thai/Cuisine/TomYumKung.md +++ b/Thai/Cuisine/TomYumKung.md @@ -2,6 +2,8 @@ If you want to have the taste of Thai food, you must try Tom Yum Kung. It is chilli paste mixed with soup. The word Kung meant shrimp!!! +I had Thai food once and it was hot! + Please try to taste Tom Yum Kung when you found Thai restaurant around you. Do you: From 10e996c42a86c2ee494c127040a45e3bd446b969 Mon Sep 17 00:00:00 2001 From: Ghassan Knayzeh Date: Thu, 13 Aug 2015 00:37:37 -0400 Subject: [PATCH 0560/5486] Add loop to movie ripoffs --- english/batman/batman.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index c8536d8d31..e6f8c04f71 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -1,4 +1,4 @@ -wanna know a secret bruce wayne is the BAT +wanna know a secret bruce wayne is the BAT click [here](https://en.wikipedia.org/wiki/Batman) and see it for yourself. @@ -7,3 +7,5 @@ Click [here](http://www.google.com) to visit Google. But I know what you're wondering. If Bruch Wayne is the Bat, then who is Bruce Wayne? Well it's obvious... ...IT'S JOHN CENA!!! + +but you wonder does it end [here?](../../movie-ripoffs/selfaware/selfaware.md) From baef27c02fecbe63791e72aeb452253f726a99d1 Mon Sep 17 00:00:00 2001 From: Ghassan Knayzeh Date: Thu, 13 Aug 2015 00:38:57 -0400 Subject: [PATCH 0561/5486] fix path --- english/batman/batman.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index e6f8c04f71..91ddcc8fd3 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -8,4 +8,4 @@ But I know what you're wondering. If Bruch Wayne is the Bat, then who is Bruce W ...IT'S JOHN CENA!!! -but you wonder does it end [here?](../../movie-ripoffs/selfaware/selfaware.md) +but you wonder does it end [here?](../movie-ripoffs/selfaware/selfaware.md) From 48c2ef4a00fb2d38039170a9b166c32e8b37e0ba Mon Sep 17 00:00:00 2001 From: Ghassan Knayzeh Date: Thu, 13 Aug 2015 00:47:35 -0400 Subject: [PATCH 0562/5486] Added the missing space again --- english/batman/batman.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index 91ddcc8fd3..3116d106f1 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -1,4 +1,4 @@ -wanna know a secret bruce wayne is the BAT +wanna know a secret bruce wayne is the BAT click [here](https://en.wikipedia.org/wiki/Batman) and see it for yourself. From 5d63d8b8b2d6a11759e83f1edaa4bb3941e92d14 Mon Sep 17 00:00:00 2001 From: bhavyata9 Date: Thu, 13 Aug 2015 11:46:14 -0400 Subject: [PATCH 0563/5486] Add a page to play papa-louie! --- english/papa-louie/papa-louie.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/papa-louie/papa-louie.md diff --git a/english/papa-louie/papa-louie.md b/english/papa-louie/papa-louie.md new file mode 100644 index 0000000000..4acda1da27 --- /dev/null +++ b/english/papa-louie/papa-louie.md @@ -0,0 +1,3 @@ +To play the best game of your life, click [here] (http://www.miniclip.com/games/papa-louie/en/) + +Quote of the day: You gotta risk it to get the biscuit! \ No newline at end of file From 71166dbea9afc497f9109b207d4a2c06bcacbbe2 Mon Sep 17 00:00:00 2001 From: bhavyata9 Date: Thu, 13 Aug 2015 11:56:01 -0400 Subject: [PATCH 0564/5486] Add a reachable page --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 8a003a8955..83b29b00cd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -418,3 +418,5 @@ Do you: [Oops! this story ain't ending..](unending-story/unending-story.md) [Code](code/code.md) + +[Play on miniclip!] (papa-louie/papa-louie.md) From 93c9c4995a8d64d354bd24688ece6b0b83e91d77 Mon Sep 17 00:00:00 2001 From: Rick Bird Date: Thu, 13 Aug 2015 12:41:11 -0700 Subject: [PATCH 0565/5486] Add Sturgis 2015 part of adventure --- english/marshmallow.md | 3 +++ english/sturgis2015/sturgis.md | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 english/sturgis2015/sturgis.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 83b29b00cd..b66cfb7b57 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -420,3 +420,6 @@ Do you: [Code](code/code.md) [Play on miniclip!] (papa-louie/papa-louie.md) + +[Visit Sturgis 2015!](sturgis2015/sturgis.md) + diff --git a/english/sturgis2015/sturgis.md b/english/sturgis2015/sturgis.md new file mode 100644 index 0000000000..008aa15b63 --- /dev/null +++ b/english/sturgis2015/sturgis.md @@ -0,0 +1,20 @@ +You jump on your motorcycle and head out for Sturgis, SD! + +You know it is the 75th anniversary so it is going to be a + +a madhouse! The Sturgis mayor is predicting 1 million + +bikers! The town has a population of 6,887 so how can it + +handle ONE MILLION bikers???? Let's find out! + +[Bikes Everywhere!](https://www.youtube.com/watch?v=hcWR7wQxsDo) + +[Highway into Sturgis -- NUTS!](https://www.youtube.com/watch?v=ToB2LPqLbPk) + +[Sexy Girls and Body Paint!](https://www.youtube.com/watch?v=b2C3o6uC3Ho) + +[Bike Shows](https://www.youtube.com/watch?v=BCHi9_hrtJI) + +[People Downtown](www.rickbird.com/downloads/SturgisPhoto.jpg) + From 673bdc74b632a284eaac908ab6adfa583587b91b Mon Sep 17 00:00:00 2001 From: Rick Bird Date: Thu, 13 Aug 2015 12:49:47 -0700 Subject: [PATCH 0566/5486] Fix photo reference --- english/sturgis2015/SturgisPhoto.jpg | Bin 0 -> 370965 bytes english/sturgis2015/sturgis.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 english/sturgis2015/SturgisPhoto.jpg diff --git a/english/sturgis2015/SturgisPhoto.jpg b/english/sturgis2015/SturgisPhoto.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6fb3ffae0b0717674e60c4b4cc5dc2a08419c143 GIT binary patch literal 370965 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
gb(HcjdT_TwSHX`Q#vj@^;9s%HB7Py5 z7M7BEj|8#iG{cbd07&mpCc7MQq;f!|Ji`8BC(j_q1LzG^mr%MsUCpN#8QCIsBiL6z zD|!sOaUP#%Bgb#nT##~IBNZ;6bq1T2)U9T5FU@TvNDAY>TIam^1+4Hx8|?e<=@`#{ zt!i4IvrXp3c|Vp$0=i_HsX<%b23AcS3Cx!}D#B>?h)8)I`=JJ#d8o-7;y4`DMAR;w z0P-A$sr+}%$IDI9`tUjPC@{k~d^&vO?uaZ6Cp ze411OMA+m4ITT50V-gba{W+-q(IMw%GBOQSxsr3p-#`%{QEPL7m&Q<^;Hr^NB6=E- z$2bp>o#T^Lz#@x*uW2MV9U}q9QCHAH;RC>ckI2_OZzIPtNPyO_+B?%E-jB(Q1rf$7 zYm`ZBigA%xQC=9%_i%kEd&e?lzdpi(jiGX2w~T@SBY{w)xR947v7Y8f!1JF2*ie@w ze-wv4rjQ%r;8T9mQ80f00BXTAm+t=ni_ii3Uz1M%rpQr{!@RVX6Qai`|2o6q8MJJYV_xPjB{{U#z zlrYHSfm!#L7k_HBVR`PP@kgxvEk;0_YczbnBY28(Ig3wM+Q?@9kBK*~V(d zv!-2W*C_?W!bB;)IY&cK*?5NQPC*^MBtcvDA8zq{X?1Y~e`T|fp&*PCT4>RhshqFL z9l?x7V?!E9L-D+xq$j6B022Q7*5j{Q5 zY8(qvEk}tU9P$lc{?VGw-Zb++gQaG`{#bB(5l^|j#l5-&NfQU2{cE0QZ4J>3lbOqz zr1zZP8!!E+N?)%2@!;FeGO!ycDcn5Ht>|jDapVC(yN>Ja(|g3o%YB- z=ei2fQ+MvC%FU@bOxBoIL#g=*-YDby}3f3iQd zE@v_%iE3jfpOE@`5G$Ry@vXFz$2@vENh~=K$vg6yqSN9QtEXH?KA&r+*_dc_!wRYnzxJL8aeZ`TkEQIVlXl;FIeauE)bRV$Z}LC9t+YVz!7rmvgLY*Z%K?+-XRITrPt-gb;rkzDw#uowO=m>T%ndpUZdIC-thDj=0)< zagl5v%sgb(k1Ezvb@s?4ko}?h91aanB$khZ{g-U`>E?5aiyB5n6x8lygiMHo%&jdD z&v~ub$9i5pJj_1PAWUpZfi7nk(#aV}{y+dhz!d3jCy;#ex%SN*fpgSk8U%K;+UXJf zrqU!SCC&hFexz3|0xpH9-F>;szITZvkYH#1zK>jFT7-Ibw>Y^+lHN;Fk^uPpYOIfY zCXF0%>GSzlI55ZsO-S@Kp*~4m^dYI~_bwxjXxzEr3B?*_zXW=0uN91P-dw+z4*t2*oA?Cw1Pb%X-aDNyN|VWSeUq64kH06bMQ;o1p~pT%wBF>fT-dCSZF?aZ z=6QV(_pJRdU6aH5iCEXow7HKLR{f+;UuPXbs14n;`fQQli9Eiq{B=%3CBL^s>QM*y z)mTuQ=DF8vcZl~BT-x0;pDjOlQwImGMPO-{H@ElUE`QaIT>!zssqW{UigB-TirSZcAGStP)8CFJT4Q;Io3&hF!)k?h`V{_sRx5NZii&A0nd9K4bo_oscP zIq#&O&U8;P-W<~;Hzgy2>E1GPlspsPCaT2Uy;zq1c@QLd0Y7*n&jgP6^{e_3l1+0l zMr4xZ3Yh!jz6t43Y2HLybb?{~*x#Uj917Rcq|Da;K)#0ppr}vUhZmpEmFf>lK%it)O2}#+f3YA%?=};7|&$IC(kEtfqM{Y zu<6=mj<5D_65UC8sQG?;az;>)ADlgM&jpc^{y#C}w|sC9Tvun|d(RPDK6O~&lfz)S zk}2aya)YTJ^?ysY(zP8!S<aV z1df8JU)zzPS;32|+3e4lZ6Hh_fDRt6_t?{x+B8iq{*j~~F7r%|+wCuhO-naIH1$sL zk?C3*#PD3&-w`|9T8)O^4hPSUPvkLN#dU8ARP~9_cuT|4YBpN_xvAY;jV{s#f={!NzI5xdnRRy2 zU0>csX}&9qbdE_kl+0t4>EGU~X%BOwX5_1tE7(V-f_pC2MJBoEH3QZPY~U5 zZ$a}Lra<8jVx6g^V^jB4p>HGl(b5FPN9j=dicW-fQm-g^Z zj|5T3e|G3|ko~|lc3ZNWwutC_Cx58wnwFw3UpBV?03b;dljujV6#aHv-wRpYYZpId zo;#Oak=v&>{;wr-@_3eQDoeZFHczzqgt|c{0g$=KIHq{h>@(_7-AQY82D2rvnR_2T zPfmY2&Tt$ibQk_9fcRp~FK&L>bV-ilJAaZlJ{?1ROXmif)Ug@3SjZ^*+?Lu2#VAHO1 zh>|nZcLes&TF>!jkErS%9D;E?cP8rOxRdz<>P>IWb){;M+f4eB+(o6u^9K9Lyski~ zZuHw=lKcLG11=V3z02x-h^Xiq!;R^Ttp2%`MJ` z@%V}Za%9xt>2W2r{M+}CXYvHr4za1~I)=AuWU>a{+GB|z!`D}BZF6s>PvzZ7rd?^U z3#~rf@f>hCQfaJ@RBvu!11Y6RmQ-7Fjh96KVD~ z+{kB1F#K`{HPHB<#WQPW&e}_11Y#KA0#2p~zOKI(~9%7U4$JH`Npsupw^6EbZcv9$J8++$B z4;{}^AIuNncm&Yz`QO$*!Emk?XY!3ori z)ZXmQcRgOp-xfCU&E?M~Igp?`-1q!z4nH1vio#E@#w_s<$Pm>CtnP)ZKIsJ$Sb6{ zyqi_hv2cawF~;&nIsy;e0=$Of#QKJps=catau~=+(2DgdEh|$nL}qwnzRouYAa=#TgC4PrkM z=~q#k>y!3*j04QcPcT#$x_#BPm4q?IXS9q+^Sm6L}w7j!HSpr>`~c-UOaIe<~y_7m!Taw@HAL{zLdXq^Wg=MMTOKWo>1{d;e{{ZQrtlOu`O{aSt2(usQ5yAm< zjAWiMQO9I_!6nP@gYEziIqmp+*1n-=k?J$a5RoGfgg}|d9;UKpy^=KhR~#XRKR`VN zVdzrxxf z`1giG7>*&2PCflmqA>X-uCDBka>j18Q~wLRMZ^F5W->N$DOe8SEHUe zC6WmWd4rAhnR!2z2E|qqNtY5H;)pMNV3(eE@8ge%&I6xXwdTP96N#QT1cEV~RXr}x zHgZVLJDeZaijGS=tHTmTt_JfTwt9j2R@|$Y3(?=7u*i~NiAG~R>oz-tx1K~ zB!Qe&twPP?jc$<;M>Jq#tzD8Nr3cRLWSqwl>+e>ejxiY*EwW7S_DZM|(mZVY)oxp4 z5WorK^zW1DRcnDDxBDH{sSmx}jHjv3N}fbO^P7%5$(#t&jfc{yn535cqqxp2d?xr5en)Rc|9QyUmm2NJEcY;;m_x$Ls|>!UOtts~Uho z1*~X*V}n}LfHN8?B!GvN&mSfYUk+Y8f&n!YvH7u)N}JY9DJd762Tc_V)YsN3jQv)p+Qx_P8;Pe&fc zv@Hg|Cda?hwHa){+42#+(0V6RN_8O(TP`qc(YLU%)ik)^wjNaRr&2ne^+x{yMASvP zIko~po&$sqD^@)&0c#$sqw2n1ohK(h^32j->v7v@+wMdX&WDTS`;I=IwT)>mOR!Ne zEG{Fk1q2dic=k^hnZ!VLlh;19USGx`o*AGs$#6jtm%>|Pp$4f*s6%@JDQ5(B_YnDy zBl6)hf=l)MDSpIcjyay%>I+-~hC}j5J7Ajer`;RGuXU(4oqG348W9)~`H?d*0Q`WW|sQ&pDRxw{{U9- z4gO#Ic@?J>#A$yf0$WICz?XuAe|(OE*NVBwLQj7nl3Ur27Z2u0HgQu&dM;#wcx=48 ze0gZ-eoSMX{*Rhp?UNnQn$*T+kqj_f2=~Vr^-pSo49WYAfJq_}o>?R3^sGiRQPeH& z3Q5QAQxJp0m(M5Iiim0x>Jmw)TnC&WA~z=?J8U%39kh>U4A$AVjG4rPgDC0A_BA9H zR`ThuvS}jB!RC}6UB}!QtssDHm7m(b z(a9W>^^?>JTWf=FZeA(K#&H-;+`%mvOE1 zl1B^0Hh*|$JM->yP7u6+(U$&s7BH?%56t+&9QPjdl0_`?NAsJA6)_&qZ`dwV4K$CZ31M(?ODAhcZ9h z1HYwZO1_q3v6-jXL5U>tUNf5q_-*di?`>@N5DbZ{WDp6A22T@ zmg!-zNcl(o;2itl`_nw@C-SC>Kx8K%m%$`@RC_M(JiCO{Bejtsz>fetzfnzs*7n#v z_5IXlI8YuRU$w*w$r@*+o#{;oT>O!_KFDiO>XQ--c2?2s=}tZ+)m^~M5&a{j zbUsOyAhWucm~Cfq>Jq0qKBnV~LMfly8j55MK%hNB0Z_@PT*>~kP@VJW=8kBGvzd7` z4M&eMIAiyBr^%s7Z~nVbvmZySV<3K}XZJZYnN0rxtLBb$9?6@-OVbnmcD)DEG^6a^ z9gK6S-AVLH#NKycLX|XD*S9(HVJ=5xLTUR?A^R@u)e?AZ5Bz%S6OVVrJYVQB{{XAd zOrG*dS=Rbit8p}@g=pqezCv@6~$g$pSRq3#z|!o5b^}#PkP>YA&(9XvS0z2Ni;V!^lW~Uiqx6y$vX6Y)ZBGXDboCX^ zTapxl2NjfdHEUAzy6x14IOGYkEPyI#uQKU?LU+e%q?TTJ-VB|4N02`n+48ji0I_*6 z!*rJfb0Gwb)hm$fXFcrY&cpI%odw+G{{VR-yncYW$#s+5$44V! z&aQEHDDYfhlZ;liy|9wi9{}$auXEw6d9NUiq`SwcL0U({k8Tn>aXgTq#v~yPU$dQw zQ-#bFfEad3k;cQ5P)VZ0_FX<;^J3&kBpK--uFefQIJ-x0CI{S2@A;acsl@isT>?y= zUBq{Y=h6O0q0?|z7dmkyS$8(^Beu8Wf&+kNmfj{`)l)pCB#?-aC_3&Dh5Roh8&}M+Q8CMR#(< zNSg=FI#tuIfR|OM*CK2{rVO!0H8a z*4m7A))(-9%S(`m93FrgzZSb=92#bAn9pQ?)_I%}-n3#m8%W^u_nT;cl_7F!6x1ANFhcY0+egH36gT)r9bY44V5avCJ=5|cbo+z|4J6zhdf#cXy%*XNX zsbG2sgsv@4u??xUj3B?7gA|{WJcaN#D0HtIjMZlV=h#>9KVkwX*I22ym7++0BGhox>gCd zjtkv^&zAiA;ML7{P>)lSP`WNR+{k6wpHrMwO;aX28J~y26tR1&b}t39zj9wL5Jq?K zNUFlz-d)RW2t;y#{zjyd;XHvL?s`*fE^Vx?i`?-!JIO!X^shb}o%7hSE`@qyIJm(a z`I#dlIXS34&W;BA=v^@2bsfe@t$*!%SB>)E#zrcVN2W#zl49=YP&|YAdy42e$YRqT z=1Jg+^&RCzAu@hU5NiAAT7;4Z`%wP?Sdw?`O|V-_YqhzGS!9qy<&%%#tu)qcy7m+k zsa{u0ZGY`s5=2P}F-S5F2SO{D@m=Tkj-r=B*4o(1(koGj$I`k>xWt!mT*h*4cj7<7 zxqU{;=*a{Y@Hvt&Ut)8L&6*-9KHYB?=}c<)0c8FYrDnHYx%{W3FL9+nyI?LhA0yUPgttyw)hvVarMTG9qnC_fY25BhHOa!|iy>sk8c z?A9XW#k6^oxIAW|)MSuaz*Ec-d0@Yn&>qCpjJ+koTN!4Q;9z8$uX(BqdpM^F#N9Da z>rzK?V>=`KgdxpS)N=kG(`Xp|Z~=5&fsp{gsI>iJ>rPv1yM039JBwam=OGW!@l$J% zeWLaP4+1pap4FRir|r0LZvJEd_UZ)%9<8PL=4{Ky zT?>SWeaSKd_Bb_fQ_})!uO*aZTE?05`h)6fU0%xPPt;A7=a(haBlm{K1aImQ>swWl z(@?dKPty`Ra$|(NiF9|!Q@euNgc=f96pCVe=4h~=~5k5 z+QvxsT$uj=dmw%Bz6E-=iQ#P%Qt+mis_MycANFLK5J!fLgl>d)C#kCc01`%*B$|EJ zogKBdaXB&ko_KMLfn7fH+`~n&=QnoGrahh0$sCI$Wh0z*L+&d=;{MW0i&^x@=913X zfL`&z1`SME!t_pNUg3q#Jzt*`pt}m?c(%l&+{``l`5_%yAx21Gq811ypHKdyA%XEg> zB)80RF8=`F2!Dc!rr^>h8|qjZeT}`P=9O>usrwRy` z(eY*tv&mv^VI_lke^&;!^*wTbBG*ie+}ImvGqZn~ha3`pYnd_qw@pKFB!YXHfd?hz zpWkOdD%H`RmNacHF75@qH`cklGa1t1$uAh|&%eEBYVsK_ZDeS|2|zH(A4dbOM{`kG z+g(W{mcr%;<9P>`P-aNLAL{p>!_ud)x$+~wjx9cSJw_wmglCcmp!TgcMrzEC+6(A4 zC)cht&6Wl?fPXfd#Bq^Z>U)5_CICwxwk34JduyN)YXK5c$W~R&Tk%Z z4al>%2wof~VL!=rbtC@($Fc*HfNGzKL&0%rYpGdVTU|pYJjkST z7|%P%tn0mE>C#JUYqM!+U;*Qi$TC0ipT?bt=hnxo+g#`;PJ3jzj(ZC?5xPcB#D76i z9cJ2C^)q24mzPLE*?EGHcGxRB!*=?7pAO=CYbfF#T!hE}08Iz+*9U#AJ&u_iR@N_X zXENeQ-SZ^x&`I>H`7f!m_>yO*cna8Rx~`!nB2O~XH*o_J5ai)Gti5L1^}GvneYQCs zYvQW~)M4h24}hiW&%!N3QIk*9wGB$@I1tMny3Zy6kczY7n>&q0?(0sER56>E0m;HY zy(GJpep4St@HV00`-{z1Jv@l+3R?*7IUpWg@lZS3>3UGThfKAwyp_x%4osN!a!-1> z{jhDk6{cBD_L*KuBmv&*Ewu^&*lp62G??5uS-b0(DxgUm-i#U)zMG;Z?PmJKco z+f=%@j@m1zPnqVBc6rx=XWTsA;o}I^^7ooP6>}$>)svnsq6uS(($VDs7y8nH~0^_8P>n zM<e-KMVZC$x;pi*Ob&D-a!q7vlYIaE@PMbC$AT?!6 zsiv!^UEN9~BIXkq5rRa0HdMG@QTsySy|jYHF!Dw(EVT)WS%~um!6$)^!mU}}FNc04 z9cKE>MjFke+7KatHvpeZRVd)n{@daEnF1T443~akJQVF&z9YGxT)H~^aDAFNN0x0& zobm14R#H}WG)*}C&gS0gU4Ghs5no2PdR%ffy__>;_ekgF;Ck0MnxxVAgvWDg_Ezv_ z39WL7k&*WgzrAR93t5ue!&jqIwSq*syu@kiARJX&jaN^W{yVFUF3Ikd-s1T#qsWsy zV`ppuk&3}pbE@HDy_!&0W-J~T)Gjqhs+7g{y+aG2oL5F?k8Gvr7>IIbsM z)#U!dw|fMh($q-#mN^JXT=BemR(`Lq!Kz6lk99nbEMvEVSC0pH`}87PvFoQ>hfB6g z+x=Cb65afse<*||c&vCej|STzSoOq=NOw9V!}3jema(s0Yp`0S^eE|XzBqicWBg5I zTwBNFTipo6W^?xwp!BM4+YDb`*tSd7F5y>2}yoDwy7$^N$9-j3qcO1#)Oz4sfNJmWiSD#XHxQYJ&wk;%2u_x~p z{&#l-QNG7>!z3vsyQcFRAi;m>QONpyao@=dWZdjPk&%!GsHi^8WGu{WJoDZ^?+2DU zW15t&ssg3?g7!3$6fwMMv&#p5V;v9Hvw*~$L78!%pRlQIz(;czGC$lY*w)F@ZEh|0 zhm9}JMqSRs{sy&kuo%`8piQn{VLiH&TQ-x)Bq9l(J9rTeP)CyI-`cskB%azsZ?_j2 z!6LMD`DeV5+DLbZNAC}8`_WPwTvjBwF~M|$hm-i|w~;60px+lvcJ;vTRe#n==VWt{ z_|$P9B10lKIOmENXj2 zjV?=(9C62lBcUI2(xX9d=7iKE-?Jmo52asSTGr(g%65)SV$|>s_Ra zq1oJv@u&z<;J3t*7a0JKYK`PlT*Ec-hdyM-@X5_}T2$?(XuzZ8?i}GU+=|MS$etgA zFaH1^7ZN!hq;O4VV#Zs>5-=2CReeu`2jf-{5g5TWM*Z_}gRmWIXc@9EuS(s}JT<6m zqkXrR9l9Q6k^caY>S~sk9iWppyl3t_of53+-`MxM)zlYOvPL)NH-baLeKIR%%o(K^Mk>x3!Odm`-v?pSJ2E z;|ab9u77r!?3o!Nx>&Ae(DdyqPK-!ki()0jq!T20tTPFFN^6(7t{X|%&GB7__C3^k zjgUCKlV!?wG7jhKSR+H!HJf<_o}S_fPtO?XpK9r6)+F&Bov3M_Wft;B`{-Oh&wzL% zwra9{w@XPNk6703XY&9Nz+*n-jw?(iBGh>*ZWyW#6%I5DueKdAHB^EtakKkAamG8~ z({&i&vQI83=frWJkV%q1+rh4m^509g(__?eJhvC6(7}9w`EULHJDR||7ykg+#_DTr zK07$@pCQDB&m5lQR#iReXk=kUC8W1TYnQo5$4TRS4>KJz*ww;5&*Xolqublb&$0DB zrn5Co*5mAj*D_;dmi$GJpsM!K6nQ2w$#ZIi88Ol8UQGbqv9|uvj65$OxGqv}DC{x= z{rZ-32);;K)(eQle90dUnCcI>s+1y%3;vsFWWfJN+%vcl1B1LIz8%nepXCo zL9iDcPCE*dOdH>RHb*CzN1FQqILN^Ds-JI@GD$O&CPoK&N3MNp&zWf)QOzc8B#e~# zB=ay1bBfOP0V9Q?(Gm#bPb|%s%$+mXj^Nd6E6E^^KeJlHJdYvsBM2Xla(Wt)>Fs5W z!@(kbqaJ139!H_$psF^O_V)9J=aCX=64u=$j0_H?0rgIDII6SUU0>+J+Cc!dkAMNo zhwVi>r??!~nK(p`c11odHc2?%qm2F)VmKy5dxC?BJhJXMjMmJ$KbT~i8>E)pz9W8y zPhL9#TgrA32AywsQ*2U0guy{uw)$MqKK}rxbPoPgvdb?$3CB?j^OILaS0E6f6^sZTRZc;#RZ@$qi+kVi9H_yN!mSxazm5Qfz(rV2~tZ^WERmF-=w@54^NZWRyD=kntZZd zNvKH$*+7W);~U3(({&w2=Hu+~%!p9|c+&vqJxy!u)zbp5MYEVhizZHT4?|iyV6~Fr z3MA6MA;FL2BDwznEToa7U}i&(dRI)>vS{(77S~>Un+SOk0Rm5BT2xBf5;sx%CA4wF za*ZX|Uouy~Po^r?ojli85y^3D9-|a)M0Vc)08`enVAO6Tc;WNNw=z70JYax*iRQKR zyUS@KKWLJ39ApUX@xTV9`-m=IxQ|i0x{f$>t3UQ+FsJVE+M=INx*~tG-pOw&eC9iB z;Js%bGiAf9`z}M1u(=?|+k-)lNGFZl$nm(w_@5qQ{eK?SpEKIvUbz#EIztQ+1nE5T zK2P92wL;D9V)BHf$su4Qz~GPQY6&jyY~U$y585Mqd5-7IjQ;>$Dy)*B)1wIMnF+|j z5AV%aAR9WxpW7{F`xG$wHsgLV^Pg}{X4vV!WR^K#XztcT%#jdqtySauT(hEccwYh# z{E$6|wRBHu1-mq@Bv+Y#yXN^}c=R1=wWkYQ4kIJXaw9kfktA?NA*o1F8`NC@uSn=5 z^CUeHDUx}eaz843RM{UdfOr%E7GyuiN}IvvN3E?Z!qhm@T8qMrxEUX6htzgm6hRel*R2Cye{opm_n z7d~2KjC3NV`W4G|ZE57U#7o<0or)|TWFoo)X{AALBoYWbv>ABcn&ou8Qr7e%+nB)rDyAzF8;^rG;CSfBUryNy9ktmuG{fL<3wb|bR6Qy!G&9uW@x)H$d z(ALGY7ja2%A%|y|Ap7rv613;o_fn8I?*odb4s;4!jNlEW>zqYxB#-EVlGDR8TOpq6 z%3wRl@?#%`cm8B?8100C2?U}O$rYPv%2DzQiQ@CVQHvt=Xl8t(~Yl_<0_j2VcJ_BR*PG3>!cd0?6@3A&Z^9Ac*6L2rAQjUfttslRWl>soGBtf(%TB$4CNdd1 zl#Fv)T4u2Zuw?RMl0Pr6nOQoghoQgJzST994?Np5JiWO{qupI=D3T!QSM#M(rkpmG-F(#Sto=U1>rlG#VKJZsGEXN75_fk#mC<;+P_onREcBfkSnjl|Xu*rBE&l+tgC&oLP0KaFE-kiz1Y^6_KB0DFw~Snmv_^#N-^<2(kEJG^ zt1sGbCclDtKGAMt4{s(4A77O7afIx~+Gi!7Es^1*NUba!Cv? zDn>v!gl8wG6p?s*+({t`G6d_sFe+U-OYIdTSFw2vvJ7DI3U#e0wQK1tWw?(@%yFNX znY}TdD^5gZ%*;cg44@I-_W+1TBvjV=L@#M}*_}*G1c@L(;MR(3x1mZVjV4nvbvy%_ zspskv4NmCkr)9)xB$@vJmSG6wdeG^isWPAT7)Lp_)Nq3`e2I}-7J5dU9#8En9cTc6 zkFuD@=bF8Fd8$hsZ~c`FiE;;&Bbc6ggH3}|)+f7+u8$sfc^|wdXPA9ydpL(Yh@+Fi zTZ6)$C@wwi={31Dc`fY5iggEo48Qh)Oo#LVDmyJ3Q8rgPtaf|tZDeTWpRzqiEShk# zj6)oP_e;V>+9G+H`N;NMnphe7J-B z=1dO0)XxvZeCZHW~P={W@*ne3GTpiiXnWMX=Q;xRE8eF{(yq z`P>ZltNNRXG-xCr$0lnfql!&7K-&bpP?L_7F+_(;jsDeccARgn!oveujlli`kIuO5 zE>HA}ae>ygX4c-)Oxlnqk16xf83fZ~wcbtCezzv3M&04t^)J1QKz&YX7$W}Hx0ZRG z5zFTlp7X4`Am6eu;D^RI^uDbtYMRPo9g6xlU+Wup}}*dKiQJj z@MtrjbWT3m8H^g@ZDZ4Q4-i{gO$_$d21gPI*vR4VNG7A%>vB?x)oy6t>l3~7{{Ucy zZ6!Sa06%KWnATE1))80=B)E>+Xs5P-qwMo1>%TeU(zmq~fQcZonr%VuArYDUvlx)} z7VY;#=LhmK3KOlRAN9@I^8rOGuwXza_{kBR(YplL%&hDhwRhELr=AdJf* z8o|52n&S9>XpxI_*pMWd^2fGocl$p}@jjPzbv5jkpJO97Y0J73>UwihOX0`8xJ#ip z6WmCG8+k2xBc@;Q^rudDL#Yl{E}yPwQRz@#-)M&Z`!66aNfD9v3yPv+)bAwI=eV_= zQF-QlmRHJTzd7`+%?iWpcUMPIwI5(II%3jqFOYo>c=k2e_=mt+q#BKt&XI5@rI zao}(Vy?Q>2HI|&3-KL{GjFS1$O=~sunA|bj+*bu7_mTG-oa7dA4_B$uK%$C2g;FfvX*zH{}%U5GO82Y*x32b+h7swP{w-y|f8#Zz8-W%r4`(L5x={)}Cp>zq^j|!cbc7 z+HScu7r#*G^r_^xnMRuAsrnO_@D{EKq)ve46GRY>R z#9}@<2)@;<9f+J9^*pb{1~cO9YE#byUuk!cNSg-3A9qNyr9-kfj`c{uQw79=N zVw`Uvz`wvhsipBPa%1_+^f~mdM#{oXPI)bb%=fnz@&qy-Vt#lB&;i!1)YqAUroI@G zXQ>Jr1Ue*k>2D^$szF{fbSOZObdu{l3erz_BGq;zYXrKtn~YB zCi2_Jk1}1!dC*Dy>f}ON_;19|CZNXl+}i>sg5zRbzIk(+k7&)6I8CK;2@lz{S#=8w z*48zxLoV=LuICBU@#3*`==6Jt;D^sl{{X9!ORSKR956^6pB3h%BkAzpS!rsi zaE0Xs@?Rg%(xQ_{ji$KNWxn$SXkJ4sb>ZDITU%c;ONj2=MPO4STxOpowx8iE zdF*X&W4C*Pk_e=8l1RoQ9{8*rlZ%gX`8BzlBb&_wO|_9D8jZ1%WVb`g0g^~H9;F@r zpW)TLgI<(sx4*lQbdqsd%7jNTd34m_IYJT;1!2i~=x^;UPhRCe7-*I@ zMC!LXywW(fjM-Y4{z*k_cw*Yr-CR$u=}5Yr%v&vQ58v6dA0X{melfPwbsb1)`fbsk zLNOXn{{Xyz07*=GR~4aaZ*6rXX?J@S)YiUUFkR9>K^V`iX~}kF&eA<&#tGreYYRUM z+}KDhY@v=%?HMFNi1G;=y-j(HuxK|vB{FF?w^tqDQl1!8JB2J^|D;k$`GPZ+7%y!oCkpMD3eENFUwcHPTrrV2A8InK< zc%#9N5I6+;oSNlc?=Z(7{PXGWUcK=D0K~c)Xm*-q&Gc|z#~Z7xk?b73IMXEai)%~S z#ll<}BDb=)d4}}H{hb9}`y4;(B$y?e#ya)RJx5CREl*36QMER0Qo=$zj3_H zA`o%u&3R?~aofjmt0EZfwq^i5dk)o=MbIvCdS;&`&xxV8?dEPR+hDGa;6W9w<<*s_ zfbS{S=W=^ux$A42Rn=|GuOwCyI2R6_ksfkD6`}TNUjFv#3Bp@>j`r@7V4)|2RZ(8o zWnbMh+kzaS0f;1bq|_%tBxN5mW9K!0QBOQUm?w_w%O-gwlX#W=hiag@b;ZuuC!QGM zh;JmGP#RH4lH?cTkKD#*BxfV7YQb{?SzO2=F-R20hdd7aR2CXdjlY*6nn~OqANpdg z$#-fu$K+-)&+kts+PUgAeE}ICX}M^{=Pw?@b`kf^agkbfdWq9*Bak$6$U&3K?H+rd zTFASZC6V4I0J*|!;~vCzsGz$7WRe&_2jud>&+As6+1M$^?o)21u%x5D__=H<~#J##00wdm5|aa!^`Jf34}3k9(=yq!z)V zMJoPjmw)#~b$%ng)I7@<@|NJ+LM_h;^QUqLuN`ZiwPv(TISY55B$G<9kpywYaU_{R z5)m9)O>@J{@?Vd=aNsf7dLay44E=pi7*NQ_W`B7iW&a^ev%`|5eK369DVay&GWL2 z9WPY6BVmywkvRd!5k`LHYo*Sg8Mu<*$1JxFU_>0-q`-0IzXT6z;q2tOjys6n1eRFx z5R<^qILA}%TTp5OF&o=R3~@*Ml2gnZ`{6q0JY9s(R)j|xIw1JaUYiia!vcP zIU}A=*R@9!als_-a`VL*k0Ln_9%rY>at10Rd8l9KRK0NIfFm*BZ*#%?fE5@bOL;uG znp7@4$xMBS$3C@~>P^kvl)l?0qT(}XBZ@>Zkse4M_$M_=T}JB8LYB!IMQLvIcx^8ptTxy*yOtCNc>KO*YTi1sP-r;zUsPY9T;BQrCSlS`8F>f&U* zj2MRh05Sgnc0GcBg+--E9!dVwa3c=qdLiLG@mq!{Zd@db<=ZdsBq_)b(7E)$&IMDs z(d;GF`$$ALZ#zoBE`L%>Q}}QeKe86o9320Ml=5TsnYt^*(XWk zhUXFln0Dv>T4Z|D!U7(5@xflxyb zeLE1D0!KDanI<-R3WTmRN?G3WLmS5=R;~x{B-r9d0~rGyDl>j!hs?JKVvqM`;1AwO zpXNR4c%!@7B=TkmP+$kgUfdqWp#|r)NOFP)j|gMnW3L0L!KiH%W8B=ev6;yzY7-@{o8`P&mH9y_9Y?V3Ri`jXZet!?4;%jToR{OM zt#>5ohN){k)V<*n5avI*&!s-v-qQW=q`HU8o^Rs-fe`cnde=8^EyVB$cPqgdA~?Vs z!1c#}#!b`~cNJ)I}_9CIv<@iG8R-<5Gc{}0uVn^hA){U@%?4!Mu9L9K! z9|Zc;8pY+xI82G�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

E?N}CF}q$KpjpqO3vdTgMG$ik^5j8uHz4b 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 Date: Thu, 13 Aug 2015 13:02:30 -0700 Subject: [PATCH 0567/5486] Remove the file from git's structure --- english/sturgis2015/SturgisPhoto.jpg | Bin 370965 -> 0 bytes english/sturgis2015/sturgis.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 english/sturgis2015/SturgisPhoto.jpg diff --git a/english/sturgis2015/SturgisPhoto.jpg b/english/sturgis2015/SturgisPhoto.jpg deleted file mode 100644 index 6fb3ffae0b0717674e60c4b4cc5dc2a08419c143..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370965 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

gb(HcjdT_TwSHX`Q#vj@^;9s%HB7Py5 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�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

E?N}CF}q$KpjpqO3vdTgMG$ik^5j8uHz4b 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 Date: Fri, 14 Aug 2015 01:29:02 +0400 Subject: [PATCH 0568/5486] docs: Added 'take meds' option --- english/backinstraitjacket/takemeds/takemeds.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/backinstraitjacket/takemeds/takemeds.md diff --git a/english/backinstraitjacket/takemeds/takemeds.md b/english/backinstraitjacket/takemeds/takemeds.md new file mode 100644 index 0000000000..c51d2aed51 --- /dev/null +++ b/english/backinstraitjacket/takemeds/takemeds.md @@ -0,0 +1,2 @@ +Are you craze? +You can't take your meds. You're in a straightjacket. \ No newline at end of file From 30214b1d204ff4be5a72d0f42160b38629a193f5 Mon Sep 17 00:00:00 2001 From: John McKeever Date: Thu, 13 Aug 2015 18:16:53 -0400 Subject: [PATCH 0569/5486] adding some stuff to create your own adventure game --- english/eating-walls/eating-marshmallows.md | 2 ++ english/madness/boil.md | 3 +++ english/madness/cthulhu.md | 11 +++++++++++ english/madness/writhe.md | 4 ++++ english/madness/yog-sothoth.md | 4 ++++ 5 files changed, 24 insertions(+) create mode 100644 english/madness/boil.md create mode 100644 english/madness/cthulhu.md create mode 100644 english/madness/writhe.md create mode 100644 english/madness/yog-sothoth.md diff --git a/english/eating-walls/eating-marshmallows.md b/english/eating-walls/eating-marshmallows.md index e532adaba4..2c50c67747 100644 --- a/english/eating-walls/eating-marshmallows.md +++ b/english/eating-walls/eating-marshmallows.md @@ -45,3 +45,5 @@ Do you: [checkout Susans website](http://www.susanjustin.com/wpsj) [Remember the advice your mother gave you:](../advice_from_mother/advice_from_mother.md) + +[Succumb] (../madness/cthulhu.md) to the madness. \ No newline at end of file diff --git a/english/madness/boil.md b/english/madness/boil.md new file mode 100644 index 0000000000..f2bb98ccd7 --- /dev/null +++ b/english/madness/boil.md @@ -0,0 +1,3 @@ +Mercifully, your flesh melts instantaneously and sweet death descends upon you. + +WEEP MORTAL! \ No newline at end of file diff --git a/english/madness/cthulhu.md b/english/madness/cthulhu.md new file mode 100644 index 0000000000..39e91bfa55 --- /dev/null +++ b/english/madness/cthulhu.md @@ -0,0 +1,11 @@ +The heavy yellow mist that envelops your entire person begins to dissipate. +In the distance, you recognize the looming towers of Nyarlathotep piercing +the heavens. They promised they would never lure you back to this place, +but the old ones have never been known to keep their promises. +Cthulhu, the eldritch terror, emerges through the haze. +Your brain spasms in abject horror. He says nothing, but your +choice is clear. Do you: + +[Writhe] (writhe.md) in agony for ten thousand millenia +Accept instant death at the hands of the [Yog-Sothoth] (yog-sothoth.md) +[Boil] your own flesh with the heat of one million suns (boil.md) \ No newline at end of file diff --git a/english/madness/writhe.md b/english/madness/writhe.md new file mode 100644 index 0000000000..1e0542377d --- /dev/null +++ b/english/madness/writhe.md @@ -0,0 +1,4 @@ +You writhe in agony for ten thousand millenia until +sweet death descends upon you. + +WEEP MORTAL! \ No newline at end of file diff --git a/english/madness/yog-sothoth.md b/english/madness/yog-sothoth.md new file mode 100644 index 0000000000..1a8d610a62 --- /dev/null +++ b/english/madness/yog-sothoth.md @@ -0,0 +1,4 @@ +Mercifully, the Yog-Sothoth uses only a tiny fraction of his epic power +and sweet death descends upon you. + +WEEP MORTAL! \ No newline at end of file From 978bd142eaf807715c4e269a3e7e7f89898fea3e Mon Sep 17 00:00:00 2001 From: John McKeever Date: Thu, 13 Aug 2015 18:22:00 -0400 Subject: [PATCH 0570/5486] add newlines --- english/madness/cthulhu.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/madness/cthulhu.md b/english/madness/cthulhu.md index 39e91bfa55..dadf5ec3cc 100644 --- a/english/madness/cthulhu.md +++ b/english/madness/cthulhu.md @@ -6,6 +6,6 @@ Cthulhu, the eldritch terror, emerges through the haze. Your brain spasms in abject horror. He says nothing, but your choice is clear. Do you: -[Writhe] (writhe.md) in agony for ten thousand millenia -Accept instant death at the hands of the [Yog-Sothoth] (yog-sothoth.md) -[Boil] your own flesh with the heat of one million suns (boil.md) \ No newline at end of file +[Writhe] (writhe.md) in agony for ten thousand millenia\n +Accept instant death at the hands of the [Yog-Sothoth] (yog-sothoth.md)\n +[Boil] (boil.md) your own flesh with the heat of one million suns\n \ No newline at end of file From 4e10a489f0d282f03cf98e6db0456ecbf71ed740 Mon Sep 17 00:00:00 2001 From: John McKeever Date: Thu, 13 Aug 2015 18:25:25 -0400 Subject: [PATCH 0571/5486] removing newlines --- english/madness/cthulhu.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/english/madness/cthulhu.md b/english/madness/cthulhu.md index dadf5ec3cc..698aa6734d 100644 --- a/english/madness/cthulhu.md +++ b/english/madness/cthulhu.md @@ -6,6 +6,8 @@ Cthulhu, the eldritch terror, emerges through the haze. Your brain spasms in abject horror. He says nothing, but your choice is clear. Do you: -[Writhe] (writhe.md) in agony for ten thousand millenia\n -Accept instant death at the hands of the [Yog-Sothoth] (yog-sothoth.md)\n -[Boil] (boil.md) your own flesh with the heat of one million suns\n \ No newline at end of file +[Writhe] (writhe.md) in agony for ten thousand millenia + +Accept instant death at the hands of the [Yog-Sothoth] (yog-sothoth.md) + +[Boil] (boil.md) your own flesh with the heat of one million suns \ No newline at end of file From da894a9175fa6165000fb52c5f1d01db614964d0 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 13 Aug 2015 20:27:20 -0400 Subject: [PATCH 0572/5486] Add Tamil two line proverb Thirukural --- Tamil/Thirukural.md | Bin 0 -> 1112 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Tamil/Thirukural.md diff --git a/Tamil/Thirukural.md b/Tamil/Thirukural.md new file mode 100644 index 0000000000000000000000000000000000000000..301ed80fa8a61db2914cd85b30d6423364cb1451 GIT binary patch literal 1112 zcmb7@zi!h|6vofotGytaBkN?9-tP|>sM_^U5ns}D$cvU@nhb~fS!TTF!rtUk6Nr4+D zbs`gf<^H&D*k|s8_xyz|b*8oGPfPD>{BMZ=;btCLDPLErY5Pll>dHEXkyozZM4B%3 zxunmPLej24hj7M+3MFLBP;bb-;`_uk>5sA~E&-9cLHU5Ml-Imynj@-7^_-QomR>m- zWWVyg)&z}e9oN(a4@HEUU91dLRU@BS-@@lPW-bDU)qOdz7gR}MeMpREM&6p)>fCMH zVs%2sFymvg=v<*nWb1C^OHMx^Tj_6SY%! Date: Thu, 13 Aug 2015 20:46:57 -0400 Subject: [PATCH 0573/5486] Add formatting --- Tamil/Thirukural.md | Bin 1112 -> 1166 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Tamil/Thirukural.md b/Tamil/Thirukural.md index 301ed80fa8a61db2914cd85b30d6423364cb1451..2d2cabd2493abcb64520d58bb906c46a2683ed17 100644 GIT binary patch delta 83 zcmcb?(Z@MKf!&Znk3oTfbE3Q}Bj?0qT|r-lRE9)`JcdjlPG_)UP}taS%E)R2RK+>@ UFrz&q=VV4EOH5UpEt%w*0M+6UjQ{`u delta 36 scmeC Date: Thu, 13 Aug 2015 21:19:06 -0400 Subject: [PATCH 0574/5486] Add Tamil page --- Tamil/Thirukural.md | Bin 1166 -> 246 bytes language.md | 2 ++ 2 files changed, 2 insertions(+) diff --git a/Tamil/Thirukural.md b/Tamil/Thirukural.md index 2d2cabd2493abcb64520d58bb906c46a2683ed17..6743e64c443cb683f83cd8cba6af66bcfcd6f445 100644 GIT binary patch delta 146 zcmeC<{Km-o|KB?9gA?=RCwj?E%u}-EW#D3PV@PC3W=LgFXDDV+0ODMROokjFUx6Wo zAs%q#-(vw%7? J!S*1`1po;PA2$F1 literal 1166 zcmb7@y>1gh6opS~M!dr|kxb*oQ~|1ppN@_WQEcMf#7bgEUYm#qfQSd6fC36ALW)TI zq(w>tNXV}Qd}qdHm&gL4)$ZOobAQgvx%cOfyP9aIQX>siYX|#4H*{H-;@ekGnL0WR z=izxc=FM~*UWa)&32(ug)jP2F3*<|9#p)#<^M#l5b@b#PInG1xcjbF-qd?`f<@(VBu3nt}~<2(rghv+8P})g&U1bp^y(GCWg;n*AZZW%M4aYVB2I++xQu z&NZT%D^x4)=_Ytro0{R_Dh;2*c#~UvFLE1@yX21lhm%*yJZS-&~&H#9p6pU~3UoCWKa$@oe59zI|{4KJeSSL~$QQ7itZ)1H>~9_O?9(xc z!*a?V=oVE Date: Thu, 13 Aug 2015 21:24:11 -0400 Subject: [PATCH 0575/5486] updated --- Tamil/Thirukural.md | Bin 246 -> 214 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Tamil/Thirukural.md b/Tamil/Thirukural.md index 6743e64c443cb683f83cd8cba6af66bcfcd6f445..e6f3605991e0e44265761bc1a01d380fedd4c8d2 100644 GIT binary patch literal 214 zcmaFAd;f!V>mICce6VingLNx_qym_l|6qOZgLSJOtXl$M2Ui%Fj%O=+fim0sxxSdE@{9 literal 246 zcmezWZyonR?y1}>fLMWH1^0aJv)rq=mjJ~Oyp=$)jZl$e-1C6ESwIzMp{iO5=sw8J z%fQ9p#*oO6%#g~U&QQ#t0K~ZrnG88Vz5+uELq3o$X2=7|m4M|kfFk8!btMcLU^QtB vML_kbKs6~q@eCllfI$bSHi@AWtOuqJq&g9(wghTV5s;q+G%XWsH^MFeiV!=b From d6defe5b707baf1a845b5b1898a15786cbe75e2d Mon Sep 17 00:00:00 2001 From: spraveenit Date: Thu, 13 Aug 2015 21:31:20 -0400 Subject: [PATCH 0576/5486] Add link with english description --- language.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/language.md b/language.md index d4563f1a49..2bce0be317 100644 --- a/language.md +++ b/language.md @@ -4,6 +4,8 @@ Jei kalbi lietuviškai [spausk čia](lithuanian/startas.md) If you understand Tamil, தமிழ் வணக்கம் [இங்கே அழுத்தவும்](Tamil/Thirukural.md) +தமிழ் வணக்கம்! To view Tamil Proverb about Friendship [Click Here](Tamil/Thirukural.md) + If you speak Punjabi, [go here](punjabi/punjabi.md). यिद तपाई नेपाली बोलनुहुनछ भने, [यहाँ िथचनुहोस ।](nepali/about_nepal.md) @@ -109,4 +111,4 @@ If you speak Urdu [click here](urdu/urdu-news.md) Ako govorite Bosanski jezik/If You speak Bosnian language [kliknite ovdje/click here](Bosnian/Bosnian_story.md) -Nếu bạn nói tiếng Việt, [nhấn vào link này](vietnamese/kechuyen.md). \ No newline at end of file +Nếu bạn nói tiếng Việt, [nhấn vào link này](vietnamese/kechuyen.md). From 8a1114c3126a32c314e473392b908bd3461e4074 Mon Sep 17 00:00:00 2001 From: spraveenit Date: Thu, 13 Aug 2015 21:36:07 -0400 Subject: [PATCH 0577/5486] Add one more Kural --- Tamil/Thirukural.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Tamil/Thirukural.md b/Tamil/Thirukural.md index e6f3605991..9609b54e8d 100644 --- a/Tamil/Thirukural.md +++ b/Tamil/Thirukural.md @@ -1,2 +1,6 @@ முகநக நட்பது நட்பன்று நெஞ்சத்து அகநக நட்பது நட்பு Face's smile doesn't shows the friendship, but the heart's rejoice does. + +உடுக்கை இழந்தவன் கைபோல ஆங்கே +இடுக்கண் களைவதாம் நட்பு +Friendship hastens to rescue as fast as hand’s reflex to catch slipping cloth From f0de33b39740a31c2d56d2b31ee5cecf69c00edf Mon Sep 17 00:00:00 2001 From: Angad Singh Date: Fri, 14 Aug 2015 12:57:32 +0530 Subject: [PATCH 0578/5486] Added the option of Man-Bear-Pig and hippy in mirror which leads to VR --- english/use-the-fork-luke/use-the-fork.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/english/use-the-fork-luke/use-the-fork.md b/english/use-the-fork-luke/use-the-fork.md index 1baeff6911..ec6f45eabf 100644 --- a/english/use-the-fork-luke/use-the-fork.md +++ b/english/use-the-fork-luke/use-the-fork.md @@ -42,9 +42,18 @@ Just before you step through the door, you think to yourself... WHO APPROVED THIS MERGE?!?! - - - +Suddenly the door creeks open to a bright blinding light, from which the silhouette +of a tall figure appears to be approaching. As the figure approaches, you start to +realize the being is unlike any other, it walks in a strange jittery waddle. All +this freaks you out, but you feel paralyzed, unable to move, a force grips you as +the figure inches closer to you. You begin to realize that the the being is none +other than Man-Bear-Pig! + +You scream out of fright, and notice the reflection of the hippy holding a large +a blue fork in the mirror next to you, even though there is no one else in the room! +He gestures for you to reach towards the mirror! + +[Reach towards the mirror...](../virtualreality/oculus.md) [Step through the door...](../marshmallow.md) From 52662fa3d2b28e45b8e57582e017ed442cf73238 Mon Sep 17 00:00:00 2001 From: Angad Singh Date: Fri, 14 Aug 2015 13:42:29 +0530 Subject: [PATCH 0579/5486] Added the man-bear-pig story without deletions --- english/use-the-fork-luke/use-the-fork.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/english/use-the-fork-luke/use-the-fork.md b/english/use-the-fork-luke/use-the-fork.md index 1baeff6911..0897c7da7d 100644 --- a/english/use-the-fork-luke/use-the-fork.md +++ b/english/use-the-fork-luke/use-the-fork.md @@ -50,3 +50,16 @@ WHO APPROVED THIS MERGE?!?! [Look in the mirror...](../it-was-me/it-was-me.md) + +Suddenly the door creeks open to a bright blinding light, from which the silhouette +of a tall figure appears to be approaching. As the figure approaches, you start to +realize the being is unlike any other, it walks in a strange jittery waddle. All +this freaks you out, but you feel paralyzed, unable to move, a force grips you as +the figure inches closer to you. You begin to realize that the the being is none +other than Man-Bear-Pig! + +You scream out of fright, and notice the reflection of the hippy holding a large a +blue fork in the mirror next to you, even though there is no one else in the room! +He gestures for you to reach towards the mirror! + +[Reach towards the mirror...](../virtualreality/oculus.md) \ No newline at end of file From 6a5c4b1c82fea563dc8619ebcd9f9fa76bedc24e Mon Sep 17 00:00:00 2001 From: Fredrick-Tam Date: Fri, 14 Aug 2015 01:26:34 -0700 Subject: [PATCH 0580/5486] pikachu attack --- english/marshmallow.md | 2 ++ english/pikachu/pokeball.md | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 english/pikachu/pokeball.md diff --git a/english/marshmallow.md b/english/marshmallow.md index d77df054f4..974c268626 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -425,3 +425,5 @@ Do you: [Visit Sturgis 2015!](sturgis2015/sturgis.md) +[Attack marshmallow pikachu!](pikachu/pokeball.md) + diff --git a/english/pikachu/pokeball.md b/english/pikachu/pokeball.md new file mode 100644 index 0000000000..ae49a0088a --- /dev/null +++ b/english/pikachu/pokeball.md @@ -0,0 +1,24 @@ +Suddenly one marshmallow turns into pikachu! + +And another turns into a pokeball! + +You decide to try to catch pikachu by throwing ball at it. + +Pikachu is trapped in ball but only lasts 2 seconds in it and pops out!! + +Pikachu is now angry and throws ball at you and apparently you are now trapped inside!! + +Its so dark and hot in the ball and you realize this is the end! + +But wait! this has to be a dream right? + +I cant be in a pokeball. + +They dont exist!! + +Its time to get up! + +I must resolve this marshmallow dream. +I must get revenge from pikachu as well but maybe later.... + +[Wake Up](awake/awake.md) \ No newline at end of file From 20efa59e4d0d492ef491d8344fea4163824c88dc Mon Sep 17 00:00:00 2001 From: Fredrick Kofi Tam Date: Fri, 14 Aug 2015 01:46:50 -0700 Subject: [PATCH 0581/5486] Update pokeball.md --- english/pikachu/pokeball.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/pikachu/pokeball.md b/english/pikachu/pokeball.md index ae49a0088a..c6b6b51ceb 100644 --- a/english/pikachu/pokeball.md +++ b/english/pikachu/pokeball.md @@ -20,5 +20,6 @@ Its time to get up! I must resolve this marshmallow dream. I must get revenge from pikachu as well but maybe later.... +I am going to continue this battle in the real world, buying a gameboy! -[Wake Up](awake/awake.md) \ No newline at end of file +[buy a gameboy] (../buy-gameboy/buy-gameboy.md) From bc7f87cdad779d99fb83a17b3423d3f626e74670 Mon Sep 17 00:00:00 2001 From: Fredrick-Tam Date: Fri, 14 Aug 2015 01:48:55 -0700 Subject: [PATCH 0582/5486] fight pikachu on gameboy --- english/pikachu/pokeball.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/pikachu/pokeball.md b/english/pikachu/pokeball.md index ae49a0088a..777fd7b333 100644 --- a/english/pikachu/pokeball.md +++ b/english/pikachu/pokeball.md @@ -18,7 +18,8 @@ They dont exist!! Its time to get up! -I must resolve this marshmallow dream. +I must resolve this marshmallow dream.... i'm sweating!! I must get revenge from pikachu as well but maybe later.... +I am going to continue this battle in the real world, buying a gameboy! -[Wake Up](awake/awake.md) \ No newline at end of file +[buy a gameboy] (../buy-gameboy/buy-gameboy.md) \ No newline at end of file From c60c143191027d6e8d1ab88874a158fbf672dc8d Mon Sep 17 00:00:00 2001 From: DynamiteMonkey Date: Fri, 14 Aug 2015 12:14:49 -0400 Subject: [PATCH 0583/5486] Add hotline information link --- english/commit-suicide/suicide.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/commit-suicide/suicide.md b/english/commit-suicide/suicide.md index 6a53ca646c..30ea415075 100644 --- a/english/commit-suicide/suicide.md +++ b/english/commit-suicide/suicide.md @@ -1,2 +1,4 @@ Click [here](http://www.addictdepression.com/suicide-methods/) for some ideas. -However, you must consider [these](http://lostallhope.com/things-consider) matters first. \ No newline at end of file +However, you must consider [these](http://lostallhope.com/things-consider) matters first. + +If you would like someone to talk to about your suicidal inclinations, [here are some hotlines you can call.](https://www.reddit.com/r/SuicideWatch/wiki/hotlines) \ No newline at end of file From e0c03d2737ba3d01be534d91e98a48a4bf8fc84d Mon Sep 17 00:00:00 2001 From: DynamiteMonkey Date: Fri, 14 Aug 2015 14:08:01 -0400 Subject: [PATCH 0584/5486] Break up line longer than 120 characters --- english/commit-suicide/suicide.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/commit-suicide/suicide.md b/english/commit-suicide/suicide.md index 30ea415075..ab62f34408 100644 --- a/english/commit-suicide/suicide.md +++ b/english/commit-suicide/suicide.md @@ -1,4 +1,5 @@ Click [here](http://www.addictdepression.com/suicide-methods/) for some ideas. However, you must consider [these](http://lostallhope.com/things-consider) matters first. -If you would like someone to talk to about your suicidal inclinations, [here are some hotlines you can call.](https://www.reddit.com/r/SuicideWatch/wiki/hotlines) \ No newline at end of file +If you would like someone to talk to about your suicidal inclinations, +[here are some hotlines you can call.](https://www.reddit.com/r/SuicideWatch/wiki/hotlines) \ No newline at end of file From d89931a0ebf65c4af79c81722c9b2bc44c482465 Mon Sep 17 00:00:00 2001 From: Narges Fallahi Date: Fri, 14 Aug 2015 14:22:02 -0400 Subject: [PATCH 0585/5486] modified persian text --- persian/otagheh-basteh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persian/otagheh-basteh.md b/persian/otagheh-basteh.md index c72b200bd5..ac1f11b377 100644 --- a/persian/otagheh-basteh.md +++ b/persian/otagheh-basteh.md @@ -1,2 +1,2 @@ چشم‌هایم را در یک اتاق کوچک و بسته باز کردم. نگاهی به اطراف انداختم. نمی‌دانستم کجا هستم و چگونه وارد این اتاق شده‌ام. -هیچ در و پنجره‌ای در این اتاق کوچک ندیدم و هیچ صدایی نمی‌شنیدم. +هیچ در و پنجره‌ای در این اتاق کوچک ندیدم و هیچ صدایی نمی‌شنیدم. ترسیده بودم و نمی دانستم چکار کنم \ No newline at end of file From 6d36b843cf0840f9d3e7bd9700180bd42b10085a Mon Sep 17 00:00:00 2001 From: Chad Gibson Date: Sat, 15 Aug 2015 01:02:41 -0400 Subject: [PATCH 0586/5486] Add new "ask driver" option --- english/bite-the-marshmallow/tasty-marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index f039849d03..9eb95586b2 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -13,4 +13,6 @@ Wait a minute....how did you end up in this car? You must be hallucinating [You use the gps to get back home](https://www.youtube.com/watch?v=RvlhrgSZrfA) -[You open the door and there is a man sitting on your couch](../movie-ripoffs/zoolander/zoolander.md) \ No newline at end of file +[You open the door and there is a man sitting on your couch](../movie-ripoffs/zoolander/zoolander.md) + +[Ask the driver "Where are we going?!"](ricky/ricky.md) \ No newline at end of file From d6b419d99c4481f7c84f3c3f45bcc967c52cc0d6 Mon Sep 17 00:00:00 2001 From: Chad Gibson Date: Sat, 15 Aug 2015 01:03:17 -0400 Subject: [PATCH 0587/5486] Add new driver story --- english/bite-the-marshmallow/ricky/ricky.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 english/bite-the-marshmallow/ricky/ricky.md diff --git a/english/bite-the-marshmallow/ricky/ricky.md b/english/bite-the-marshmallow/ricky/ricky.md new file mode 100644 index 0000000000..bcc293a110 --- /dev/null +++ b/english/bite-the-marshmallow/ricky/ricky.md @@ -0,0 +1,8 @@ +You see a suave young man driving the car in no discernable direction. +He peers into the rear view mirror, head tilt down, +his eyes rising above his cool-cat sunglasses. + +"You don't need to know where we are going. +All you need to know is that I'm ..." + +[Finish the drivers mysterious answer](https://youtu.be/dQw4w9WgXcQ?t=42s) \ No newline at end of file From c1d9f9fb9b2f9bbfb312b3ba44c726ede1e3e14c Mon Sep 17 00:00:00 2001 From: gerasy1987 Date: Sat, 15 Aug 2015 14:37:51 +0300 Subject: [PATCH 0588/5486] Add call to station swan option to call back. --- russian/call-mom/call-back/call-back.md | 6 ++++-- russian/call-mom/call-back/call-swan/call-swan.md | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 russian/call-mom/call-back/call-swan/call-swan.md diff --git a/russian/call-mom/call-back/call-back.md b/russian/call-mom/call-back/call-back.md index e95abea30c..d406db1cee 100644 --- a/russian/call-mom/call-back/call-back.md +++ b/russian/call-mom/call-back/call-back.md @@ -1,2 +1,4 @@ -Вы снова набираете номер, однако механический голос сообщает - "4815162342 Данный номер не обслуживается. -Авто-система связи станции Лебедь" +Вы снова набираете номер, однако механический голос сообщает - "4815162342 Данный номер не обслуживается. +Авто-система связи станции Лебедь" + +[Найти номер станции Лебедь и позвонить](call-swan/call-swan.md). diff --git a/russian/call-mom/call-back/call-swan/call-swan.md b/russian/call-mom/call-back/call-swan/call-swan.md new file mode 100644 index 0000000000..a0e30c5fb5 --- /dev/null +++ b/russian/call-mom/call-back/call-swan/call-swan.md @@ -0,0 +1 @@ +Вы ищете в справочнике номер станции Лебедь и звоните по нему. Линия занята. \ No newline at end of file From 69aa7643124b648d79116e8a5f1a95bba748122a Mon Sep 17 00:00:00 2001 From: brandjamie Date: Sat, 15 Aug 2015 19:05:56 +0400 Subject: [PATCH 0589/5486] Added option to takemeds --- english/backinstraitjacket/backinstraitjacket.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/backinstraitjacket/backinstraitjacket.md b/english/backinstraitjacket/backinstraitjacket.md index 9417bd59ed..f4652bcfe5 100644 --- a/english/backinstraitjacket/backinstraitjacket.md +++ b/english/backinstraitjacket/backinstraitjacket.md @@ -4,4 +4,6 @@ that this is simply a figment of your deeply delusional imagination. Ten minutes later, you hear but do not see someone reminding -you to take all of our medication. \ No newline at end of file +you to take all of our medication. + +[Do you take your meds?](takemeds/takemeds.md) \ No newline at end of file From bcc1f616173fb1f6ed93c4e4c6597dde8212f4c4 Mon Sep 17 00:00:00 2001 From: Kate Retout Date: Sat, 15 Aug 2015 16:08:06 +0100 Subject: [PATCH 0590/5486] Edit to existing text --- english/world-war-marshmallows/world-war-marshmallows.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/english/world-war-marshmallows/world-war-marshmallows.md b/english/world-war-marshmallows/world-war-marshmallows.md index 077ca6154a..91eceb7dfd 100644 --- a/english/world-war-marshmallows/world-war-marshmallows.md +++ b/english/world-war-marshmallows/world-war-marshmallows.md @@ -1,9 +1,9 @@ You get close to the door and look through the keyhole, and see daylight and people in huge numbers running, -then you see why they're running, its from hoards of marshmallow -creatures chasing them, as one person gets taken down by this +then you see why they're running... Hoards of marshmallow +creatures are chasing them. As one person gets taken down by this marshmallow monster, you look on in horror as about -twelve seconds pass, the man gets up however he is no longer human, +twelve seconds pass. The man gets up however he is no longer human, he's turned into a marshmallow man, you are scared then realize you need to make a choice. @@ -11,4 +11,4 @@ scared then realize you need to make a choice. or -[Wait and hope someone comes to save you?](hope-help-comes/hope-help-comes.md) \ No newline at end of file +[Wait and hope someone comes to save you?](hope-help-comes/hope-help-comes.md) From 8265f7223291a9292a41f887a72b32cfeee4b55e Mon Sep 17 00:00:00 2001 From: Gaurav Kaushik Date: Sun, 16 Aug 2015 17:51:51 +0530 Subject: [PATCH 0591/5486] new choicepoint to summon dragons --- english/dragons/fire-everywhere.md | 38 ++++++++++++++++++++++++++++++ english/marshmallow.md | 1 + 2 files changed, 39 insertions(+) create mode 100644 english/dragons/fire-everywhere.md diff --git a/english/dragons/fire-everywhere.md b/english/dragons/fire-everywhere.md new file mode 100644 index 0000000000..e39cf942ac --- /dev/null +++ b/english/dragons/fire-everywhere.md @@ -0,0 +1,38 @@ +Three massive dragons appear. +You know you have seen them somewhere. You try to recall where.. +Where did I see these dragons ? +Where... Where....Where + +The mushroom walls have a smirk on their face.. +They know the answer and they also know that you don't have much time to think... + +The walls are getting closer... + +Suddenly you remember... These are the [dragons](http://gameofthrones.wikia.com/wiki/Dragons) of the Khaleesi from the Game Of Thrones + +You feel fortunate that you had taken time out and learned a few Valyrian words... + +Who knew that one day you will have to use Valyrian tongue for survival... + +'Dracarys' - you shout out as loud as you probably can... + +The biggest of the dragon - [Drogon](http://gameofthrones.wikia.com/wiki/Drogon) - stares at you with his big eyes... + +You wonder if he understood the situation... + +He comes closer and bends....You realize that he is asking you to ride on him...You hop on without any delay... + +He looks around his siblings Viserion and Rhaegal...they all understand the need of the hour.......all three take a deep breath.... + +And then there is fire everywhere... A fire the likes of which you have never seen before in your entire life... + +The mushroom walls start melting rapidly... they are cursing you as they know their death is close... + +The wall on your left melts completely and you now see a way out of this mushroom jungle... + +You signal Drogon to fly..... + + + + + diff --git a/english/marshmallow.md b/english/marshmallow.md index 974c268626..edfe2f5543 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -427,3 +427,4 @@ Do you: [Attack marshmallow pikachu!](pikachu/pokeball.md) +[Summon Dragons of the Khaleesi](dragons/fire-everywhere.md) From ce06906a00cdf49d9ea201848db5802aeec1716a Mon Sep 17 00:00:00 2001 From: Gaurav Kaushik Date: Sun, 16 Aug 2015 18:00:36 +0530 Subject: [PATCH 0592/5486] Just a Dream --- english/dragons/fire-everywhere.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/english/dragons/fire-everywhere.md b/english/dragons/fire-everywhere.md index e39cf942ac..0c3ebbf125 100644 --- a/english/dragons/fire-everywhere.md +++ b/english/dragons/fire-everywhere.md @@ -10,7 +10,7 @@ The walls are getting closer... Suddenly you remember... These are the [dragons](http://gameofthrones.wikia.com/wiki/Dragons) of the Khaleesi from the Game Of Thrones -You feel fortunate that you had taken time out and learned a few Valyrian words... +You feel fortunate that you had taken time out and learned a few [Valyrian](http://gameofthrones.wikia.com/wiki/High_Valyrian) words... Who knew that one day you will have to use Valyrian tongue for survival... @@ -28,9 +28,12 @@ And then there is fire everywhere... A fire the likes of which you have never se The mushroom walls start melting rapidly... they are cursing you as they know their death is close... -The wall on your left melts completely and you now see a way out of this mushroom jungle... +The wall on your left melts completely and you now see a way out of this mushroom jungle...and signal Drogon to fly... + +You do not much energy left in you...You are extremely tired...You don't even realize when you fell asleep... + +When you wake up its noon and you come to know that it was all a dream ! -You signal Drogon to fly..... From 7b3d25cbecc752376286544ff6bc982fafc45dab Mon Sep 17 00:00:00 2001 From: Gaurav Kaushik Date: Sun, 16 Aug 2015 18:10:12 +0530 Subject: [PATCH 0593/5486] Split lines longer than 120 characters --- english/dragons/fire-everywhere.md | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/english/dragons/fire-everywhere.md b/english/dragons/fire-everywhere.md index 0c3ebbf125..05d0be4fbb 100644 --- a/english/dragons/fire-everywhere.md +++ b/english/dragons/fire-everywhere.md @@ -8,29 +8,37 @@ They know the answer and they also know that you don't have much time to think.. The walls are getting closer... -Suddenly you remember... These are the [dragons](http://gameofthrones.wikia.com/wiki/Dragons) of the Khaleesi from the Game Of Thrones +Suddenly you remember... These are the [dragons](http://gameofthrones.wikia.com/wiki/Dragons) of the +Khaleesi from the Game Of Thrones -You feel fortunate that you had taken time out and learned a few [Valyrian](http://gameofthrones.wikia.com/wiki/High_Valyrian) words... +You feel fortunate that you had taken time out and learned a few +[Valyrian](http://gameofthrones.wikia.com/wiki/High_Valyrian) words... Who knew that one day you will have to use Valyrian tongue for survival... 'Dracarys' - you shout out as loud as you probably can... -The biggest of the dragon - [Drogon](http://gameofthrones.wikia.com/wiki/Drogon) - stares at you with his big eyes... +The biggest of the dragon - [Drogon](http://gameofthrones.wikia.com/wiki/Drogon) - stares at you with his +big eyes... You wonder if he understood the situation... -He comes closer and bends....You realize that he is asking you to ride on him...You hop on without any delay... +He comes closer and bends....You realize that he is asking you to ride on him...You hop on without any +delay... -He looks around his siblings Viserion and Rhaegal...they all understand the need of the hour.......all three take a deep breath.... +He looks around his siblings Viserion and Rhaegal...they all understand the need of the hour.......all +three take a deep breath.... -And then there is fire everywhere... A fire the likes of which you have never seen before in your entire life... +And then there is fire everywhere... A fire the likes of which you have never seen before in your entire +life... The mushroom walls start melting rapidly... they are cursing you as they know their death is close... -The wall on your left melts completely and you now see a way out of this mushroom jungle...and signal Drogon to fly... +The wall on your left melts completely and you now see a way out of this mushroom jungle...and signal +Drogon to fly... -You do not much energy left in you...You are extremely tired...You don't even realize when you fell asleep... +You do not much energy left in you...You are extremely tired...You don't even realize when you +fell asleep... When you wake up its noon and you come to know that it was all a dream ! From 2bdcef55167cc9bae67cf79091bd32c91e2b728d Mon Sep 17 00:00:00 2001 From: fcastelijns Date: Sun, 16 Aug 2015 15:22:51 +0200 Subject: [PATCH 0594/5486] added new story branch to main story --- dutch/check-mail/mail.md | 1 + dutch/welkom.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 dutch/check-mail/mail.md diff --git a/dutch/check-mail/mail.md b/dutch/check-mail/mail.md new file mode 100644 index 0000000000..4bd9cc5033 --- /dev/null +++ b/dutch/check-mail/mail.md @@ -0,0 +1 @@ +nope, je hebt geen mail \ No newline at end of file diff --git a/dutch/welkom.md b/dutch/welkom.md index a2a7f2d737..d364a44c0b 100644 --- a/dutch/welkom.md +++ b/dutch/welkom.md @@ -12,6 +12,8 @@ U denkt ... niet naar het bos! U heeft het gevoel dat daar iets niet pluis is... u keert uw rug naar het bos en nu ziet u een hek. Daar [klimt u overheen](over-het-hek/hek.md). + of u kijkt even op uw iphone of u een [mailtje heeft](kijk-mail/mail.md) + [Google translate NL](https://translate.google.com/#nl/en/) From dc5a9173e513c3ae93d286531d2fb83f40902e3b Mon Sep 17 00:00:00 2001 From: fcastelijns Date: Sun, 16 Aug 2015 15:24:22 +0200 Subject: [PATCH 0595/5486] fixed typo in welkom.md --- dutch/welkom.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dutch/welkom.md b/dutch/welkom.md index d364a44c0b..a2e36b8cf6 100644 --- a/dutch/welkom.md +++ b/dutch/welkom.md @@ -12,7 +12,7 @@ U denkt ... niet naar het bos! U heeft het gevoel dat daar iets niet pluis is... u keert uw rug naar het bos en nu ziet u een hek. Daar [klimt u overheen](over-het-hek/hek.md). - of u kijkt even op uw iphone of u een [mailtje heeft](kijk-mail/mail.md) + of u kijkt even op uw iphone of u een [mailtje heeft](check-mail/mail.md) [Google translate NL](https://translate.google.com/#nl/en/) From 01e23e7821fcb269cdc9657e8199ad1051081c8c Mon Sep 17 00:00:00 2001 From: FrankCastelijns Date: Sun, 16 Aug 2015 15:26:18 +0200 Subject: [PATCH 0596/5486] Update welkom.md --- dutch/welkom.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dutch/welkom.md b/dutch/welkom.md index a2e36b8cf6..e572310796 100644 --- a/dutch/welkom.md +++ b/dutch/welkom.md @@ -12,7 +12,7 @@ U denkt ... niet naar het bos! U heeft het gevoel dat daar iets niet pluis is... u keert uw rug naar het bos en nu ziet u een hek. Daar [klimt u overheen](over-het-hek/hek.md). - of u kijkt even op uw iphone of u een [mailtje heeft](check-mail/mail.md) +... of u kijkt even op uw iphone of u een [mailtje heeft](check-mail/mail.md) [Google translate NL](https://translate.google.com/#nl/en/) From d7b7c29e2f0046bdd7980d4d74b58d2e138d1da0 Mon Sep 17 00:00:00 2001 From: Katalune Date: Sun, 16 Aug 2015 17:18:26 +0300 Subject: [PATCH 0597/5486] Add checkpoint to the eat-wall story-line --- ukrainian/eat-wall/obese/diabetes.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ukrainian/eat-wall/obese/diabetes.md b/ukrainian/eat-wall/obese/diabetes.md index 5b2686a595..dd910b3366 100644 --- a/ukrainian/eat-wall/obese/diabetes.md +++ b/ukrainian/eat-wall/obese/diabetes.md @@ -1 +1,5 @@ -Наївся досхочу, дивлюсь на своє пузце і думаю, що це страшний сон. Та це був не сон... \ No newline at end of file +Ви наїлися досхочу, дивитесь на своє пузце і думаєте, що це страшний +сон. Та це був не сон... + +Потім думаю "Пузце мене лише красить" та [продовжую смачно куштувати +стіну](continue/continue_eat.md). \ No newline at end of file From 1ce45051d651325ce5d184ac2cb1ecf7b50c7fd5 Mon Sep 17 00:00:00 2001 From: Katalune Date: Sun, 16 Aug 2015 17:20:31 +0300 Subject: [PATCH 0598/5486] Create dead-end page --- ukrainian/eat-wall/obese/continue/continue_eat.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 ukrainian/eat-wall/obese/continue/continue_eat.md diff --git a/ukrainian/eat-wall/obese/continue/continue_eat.md b/ukrainian/eat-wall/obese/continue/continue_eat.md new file mode 100644 index 0000000000..7653b54a91 --- /dev/null +++ b/ukrainian/eat-wall/obese/continue/continue_eat.md @@ -0,0 +1,2 @@ + , ii i, + i i. From 3faccd9fdb26ad0f7561f84741abda9aef3b4541 Mon Sep 17 00:00:00 2001 From: Ali Kayhan Date: Sun, 16 Aug 2015 17:41:55 +0300 Subject: [PATCH 0599/5486] Add new option for vomitting --- turkce/catalla-kaz/catalla-kaz.md | 4 +++- turkce/catalla-kaz/kus/kus.md | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 turkce/catalla-kaz/kus/kus.md diff --git a/turkce/catalla-kaz/catalla-kaz.md b/turkce/catalla-kaz/catalla-kaz.md index dcd5723a75..2e453c4d31 100644 --- a/turkce/catalla-kaz/catalla-kaz.md +++ b/turkce/catalla-kaz/catalla-kaz.md @@ -4,4 +4,6 @@ Okulda en nefret ettiğin şey tahta tırnakla çizildiğinde çıkan sesti. Şi Ne yapacaksın? -[Metali Çek](metali-cek/metali-cek.md) \ No newline at end of file +[Metali Çek](metali-cek/metali-cek.md) + +[Kus](kus/kus.md) \ No newline at end of file diff --git a/turkce/catalla-kaz/kus/kus.md b/turkce/catalla-kaz/kus/kus.md new file mode 100644 index 0000000000..64485ba48e --- /dev/null +++ b/turkce/catalla-kaz/kus/kus.md @@ -0,0 +1,13 @@ +Kusmaya başladın. + +O ses kulaklarından hiç gitmediği için sürekli kusmaya devam ediyordun. + +Biraz duvarları yesem geçer diye düşündün. + +Ama ya geçmezse? + +Bir yol bulup ilerlemek de bir seçenekti. + +Ne yapacaksın? + +[Duvarları yeme başla?](../turkce/duvarlari-ye/duvarlari-ye.md) \ No newline at end of file From 7263eb1f1fd644bb65bc4913c7ba93cd64157b26 Mon Sep 17 00:00:00 2001 From: Ali Kayhan Date: Sun, 16 Aug 2015 17:47:46 +0300 Subject: [PATCH 0600/5486] Fix broken link --- turkce/catalla-kaz/kus/kus.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/turkce/catalla-kaz/kus/kus.md b/turkce/catalla-kaz/kus/kus.md index 64485ba48e..334f04afa0 100644 --- a/turkce/catalla-kaz/kus/kus.md +++ b/turkce/catalla-kaz/kus/kus.md @@ -10,4 +10,4 @@ Bir yol bulup ilerlemek de bir seçenekti. Ne yapacaksın? -[Duvarları yeme başla?](../turkce/duvarlari-ye/duvarlari-ye.md) \ No newline at end of file +[Duvarları yeme başla?](https://github.com/udacity/create-your-own-adventure/blob/master/turkce/duvarlari-ye/duvarlari-ye.md) \ No newline at end of file From eed2f7e473066533fbb8a64f93cd1b833aba246b Mon Sep 17 00:00:00 2001 From: Ali Kayhan Date: Sun, 16 Aug 2015 17:55:41 +0300 Subject: [PATCH 0601/5486] Remove the link --- turkce/catalla-kaz/kus/kus.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/turkce/catalla-kaz/kus/kus.md b/turkce/catalla-kaz/kus/kus.md index 334f04afa0..1589e806d0 100644 --- a/turkce/catalla-kaz/kus/kus.md +++ b/turkce/catalla-kaz/kus/kus.md @@ -9,5 +9,3 @@ Ama ya geçmezse? Bir yol bulup ilerlemek de bir seçenekti. Ne yapacaksın? - -[Duvarları yeme başla?](https://github.com/udacity/create-your-own-adventure/blob/master/turkce/duvarlari-ye/duvarlari-ye.md) \ No newline at end of file From e201ecea42c25e0f817a7afbe09a772e1c2e816f Mon Sep 17 00:00:00 2001 From: Sylvain Autran Date: Sun, 16 Aug 2015 17:49:39 +0200 Subject: [PATCH 0602/5486] Added line --- french/sortie/tirer-porte/tirer-porte.md | 1 + 1 file changed, 1 insertion(+) diff --git a/french/sortie/tirer-porte/tirer-porte.md b/french/sortie/tirer-porte/tirer-porte.md index 35962205c8..db2a0dcc09 100644 --- a/french/sortie/tirer-porte/tirer-porte.md +++ b/french/sortie/tirer-porte/tirer-porte.md @@ -1 +1,2 @@ La porte s'ouvre et vous arrivez dans un jardin. +Dans ce jardin les herbes sont très hautes, elles vous chatouillent le menton. From 71aef310f57d7429f291a6998f6e6f95c655db42 Mon Sep 17 00:00:00 2001 From: jakobjaderbo Date: Sun, 16 Aug 2015 19:06:41 +0200 Subject: [PATCH 0603/5486] add a line to the oh_daddy storyline --- english/cry-out-for-daddy/oh_daddy.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/cry-out-for-daddy/oh_daddy.md b/english/cry-out-for-daddy/oh_daddy.md index 171334c93c..91f98b6d69 100644 --- a/english/cry-out-for-daddy/oh_daddy.md +++ b/english/cry-out-for-daddy/oh_daddy.md @@ -1 +1,3 @@ -oh dad!!Save me!! \ No newline at end of file +oh dad!!Save me!! + +As you cry out, you notice that the room's acoustics are unlike anything you ever experienced before. From 12aef835fbaa263f693336d21c5ddf4a99c44507 Mon Sep 17 00:00:00 2001 From: Chris Kaschner Date: Sun, 16 Aug 2015 13:02:37 -0500 Subject: [PATCH 0604/5486] Add option for fill-sock.md --- english/fill-sock/fill-sock.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/fill-sock/fill-sock.md b/english/fill-sock/fill-sock.md index 1fcc2c71ec..f39afd4511 100644 --- a/english/fill-sock/fill-sock.md +++ b/english/fill-sock/fill-sock.md @@ -1,3 +1,5 @@ You quickly realise that marshmallows melt faster inside pink socks. -This makes you decide to fill the sock with [more marshmallows](fill-sock.md). \ No newline at end of file +This makes you decide to fill the sock with [more marshmallows](fill-sock.md). + +You decide [there's enough marshmallows for now](english/marshmallow.md) \ No newline at end of file From a9b469460f28ce9c498cee17b7143c28a46dadcb Mon Sep 17 00:00:00 2001 From: Chris Kaschner Date: Sun, 16 Aug 2015 13:52:35 -0500 Subject: [PATCH 0605/5486] Fix relative link --- english/fill-sock/fill-sock.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/fill-sock/fill-sock.md b/english/fill-sock/fill-sock.md index f39afd4511..27175887aa 100644 --- a/english/fill-sock/fill-sock.md +++ b/english/fill-sock/fill-sock.md @@ -2,4 +2,4 @@ You quickly realise that marshmallows melt faster inside pink socks. This makes you decide to fill the sock with [more marshmallows](fill-sock.md). -You decide [there's enough marshmallows for now](english/marshmallow.md) \ No newline at end of file +You decide [there's enough marshmallows for now](../../marshmallow.md) \ No newline at end of file From d019e0f3591325219360718d7b9398ca77377245 Mon Sep 17 00:00:00 2001 From: Chris Kaschner Date: Sun, 16 Aug 2015 13:58:01 -0500 Subject: [PATCH 0606/5486] Fix relative link --- english/fill-sock/fill-sock.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/fill-sock/fill-sock.md b/english/fill-sock/fill-sock.md index 27175887aa..70decca49d 100644 --- a/english/fill-sock/fill-sock.md +++ b/english/fill-sock/fill-sock.md @@ -2,4 +2,4 @@ You quickly realise that marshmallows melt faster inside pink socks. This makes you decide to fill the sock with [more marshmallows](fill-sock.md). -You decide [there's enough marshmallows for now](../../marshmallow.md) \ No newline at end of file +You decide [there's enough marshmallows for now](../marshmallow.md) \ No newline at end of file From de2248f9be8b69f7ea206bc41bc2b02298ebbe70 Mon Sep 17 00:00:00 2001 From: Doron-Behar Date: Sun, 16 Aug 2015 23:49:30 +0300 Subject: [PATCH 0607/5486] fix link to marshmallow.md; --- hebrew/sister/your-sister.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hebrew/sister/your-sister.md b/hebrew/sister/your-sister.md index 631d6d0262..f2e71c46f0 100644 --- a/hebrew/sister/your-sister.md +++ b/hebrew/sister/your-sister.md @@ -2,4 +2,4 @@ לך בפינה ותחשוב על מה שעשית. -[חזור להתחלה ותקווה שהכל היה חלום רע](../מרשמלו.md) \ No newline at end of file +[חזור להתחלה ותקווה שהכל היה חלום רע](../marshmallow.md) From 76728148f58f40da82160baec8d3a7b7c67ec34d Mon Sep 17 00:00:00 2001 From: Doron-Behar Date: Sun, 16 Aug 2015 23:56:56 +0300 Subject: [PATCH 0608/5486] Add option and links; --- hebrew/bar/bar.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hebrew/bar/bar.md b/hebrew/bar/bar.md index cfc6b07963..53fc5312a4 100644 --- a/hebrew/bar/bar.md +++ b/hebrew/bar/bar.md @@ -7,4 +7,10 @@ עישנת לעצמך איזה ג'וינט טוב. -מה עכשיו? \ No newline at end of file +מה עכשיו? + +[יורד למטה לאכול פלאפל?](falafel/falafel.md) + +[יורד למטה לשתות בירה טובה בבר למטה?](beer/beer.md) + +[מזמין פיצה?](pizza/pizza.md) From 582e234873e26438a50a79aa1b2f28f4f3c8882a Mon Sep 17 00:00:00 2001 From: Doron-Behar Date: Mon, 17 Aug 2015 00:18:08 +0300 Subject: [PATCH 0609/5486] Create falafel.md --- hebrew/bar/falafel/falafel.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 hebrew/bar/falafel/falafel.md diff --git a/hebrew/bar/falafel/falafel.md b/hebrew/bar/falafel/falafel.md new file mode 100644 index 0000000000..3f82281253 --- /dev/null +++ b/hebrew/bar/falafel/falafel.md @@ -0,0 +1,32 @@ +אתה מזמין את הפלאפל שלך ואתה רואה שהורידו את המחיר ל-15 שקלים במקום 20 ובעל הבית זיהה אותך אז הוא נתן לך עוד הנחת חבר של 5 שקלים. + +אתה מתיישב לאכול, אוכל יחד עם בעל הבית כשהוא מעשן פייסל ונותן לך שאכטות תוך כדי האוכל בשביל שתישאר במאנצ'. + +אתה מתחיל להיות בשלבי סיום ומגיעה לאכול פלאפל במקרה ידידה שלך מהתיכון שלא ראית מלא זמן. +היא הייתה נראית טוב אז אבל היא הראית יותר טוב עכשיו כי היא עשתה ניתוח להגדלת חזה. +תמיד רצית אבל אף פעם היא לא ידעה את זה. היא מזהה אותך ומצטרפת אליך לשולחן. + +בעל הבית עזב את השולחן בשביל להשאיר אתכם לבד ואתם מדברים ואוכלים, אתה כבר במנה השנייה. + +אתה מזמין אותה אליך לדירה לכוס יין טוב ואולי להפיל ראש נחמד מפוצץ אבקנים. + +כבר בחדר מדרגות היא לא יכולה להוציא לך את היד מהמכנסיים אפילו שאתה מפציר בה שכל השכנים יראו. + +מקומה 2 יוצאת בדיוק אחת השכנות שהיא גרושה בת 35 עם ציצי ענק וכוס רחב - בקיצור milf. + +אתה מזמין את השכנה אליך גם בשביל כוס יין טוב והיא מצטרפת. + +אתם נכנסים לדירה ואיזה יין ואיזה בטיח.. +הידידה מהתיכון כבר מוצצת את הזין שלך כמו סוכריה כשהשכנה עוזרת לה ונותנת לה עצות תוך כדי. +הן היו מצוינות אבל לא הצליחו לגרום לך לגמור כי כבר היה לך חוויה דומה עם בר רפאלי. + +אתם עושים הפסקה להפיל ראש והשכנה מעשנת פייסל בפעם הראשונה בחיים. + - איזו גאווה זו לשכנע מישהו שבחיים לא עישן לעשן ירוק בפעם הראשונה? + +הידידה שלך הפילה ראש מפוצץ אבקנים והיא לא יכולה לזוז בכלל. + +מה אתה עושה? + +מפיל עוד ראש וחושב מה לעשות? + +מזיין אותה יחד עם השכנה וישן עם שתיהן במיטה? From cde58cfd7f45c8ca4ce5bb6e4853de751823e381 Mon Sep 17 00:00:00 2001 From: Doron-Behar Date: Mon, 17 Aug 2015 00:52:11 +0300 Subject: [PATCH 0610/5486] Create beer.md --- hebrew/bar/beer/beer.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 hebrew/bar/beer/beer.md diff --git a/hebrew/bar/beer/beer.md b/hebrew/bar/beer/beer.md new file mode 100644 index 0000000000..76c58898d0 --- /dev/null +++ b/hebrew/bar/beer/beer.md @@ -0,0 +1,23 @@ +אתה הולך בדרכך לבר ועוברת לידך חבורה של 3 בנות חמודות שמצחקקות להן בהנאה ומחפשות איפה לבלות. הן פונות אליך ושואלות אם אתה מכיר בר טוב בסביבה. +אתה עונה להן שכן ואתה בדרך לשם אז הן מבקשות להצטרף אליך. + +מסתבר שיש בבר האהוב עליך מסיבת השקה לבר ולכן יש מבצעים רבים כמו צ'ייסרים חינם על כל בירה וכו'. + +בגלל העומס באנשים לא היה מקום לשבת אבל בגלל שהמארחת מתה עליך היא סידרה לך לעקוף את התור ולשבת איפה שהתפנה בדיוק כשהגעתם. + +אחרי שהמארחת נתנה לכם את השולחן היא השאירה לך מספר טלפון שלה על השולחן עם לב. +הפתק של המארחת הלהיב את הבנות שאיתך מה שגרם להן רק לרצות אותך יותר. + +בינתיים הזמנתם, הבירה והצ'ייסרים הגיעו והבנות עשו תחרות שתייה ביניהן כשאתה שופט. + +גם אתה לא היית מרוכז ב-100% אז לא הצלחת לעקוב אחרי הכמויות והבנות החליטו שאתה ניצחת כי אתה כל-כך סקסי. + +לאט לאט כולכם נהנים לכם על השולחן כמו מלכים. +אבל הבנות בלי ששמת לב כבר לא מצליחות לדבר אחת עם השניה מרב אלכוהול. +הבר מתחיל להיסגר והמארחת כבר השתחררה. + +אתה מזמין אותה לשבת איתך לשתות משהו ולהירגע? + +לוקח את הבנות אליך לדירה להשכיב אותן לישון? + +מתקשר להורים של הבנות מהטלפון שלהן?(phone/parents.md) From bb4319c8a99bd83082eb3aacb9716f75a7db8047 Mon Sep 17 00:00:00 2001 From: Doron-Behar Date: Mon, 17 Aug 2015 00:53:25 +0300 Subject: [PATCH 0611/5486] Update link to phone/parents.md --- hebrew/bar/beer/beer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hebrew/bar/beer/beer.md b/hebrew/bar/beer/beer.md index 76c58898d0..07c3147c48 100644 --- a/hebrew/bar/beer/beer.md +++ b/hebrew/bar/beer/beer.md @@ -20,4 +20,4 @@ לוקח את הבנות אליך לדירה להשכיב אותן לישון? -מתקשר להורים של הבנות מהטלפון שלהן?(phone/parents.md) +[מתקשר להורים של הבנות מהטלפון שלהן?](phone/parents.md) From 3c29e2d26a51ad72ba7a2b31b4e2f44c31bf4cfd Mon Sep 17 00:00:00 2001 From: Doron-Behar Date: Mon, 17 Aug 2015 00:56:29 +0300 Subject: [PATCH 0612/5486] Create parents.md --- hebrew/bar/beer/phone/parents.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 hebrew/bar/beer/phone/parents.md diff --git a/hebrew/bar/beer/phone/parents.md b/hebrew/bar/beer/phone/parents.md new file mode 100644 index 0000000000..677d57ad4f --- /dev/null +++ b/hebrew/bar/beer/phone/parents.md @@ -0,0 +1,3 @@ +בוא'נה אחי אתה סחי מת! + +לך תעשן כמה שאכטות זה יסדר לך את הראש ותחזור ל[עמוד הקודם](../beer.md) תחשוב על מה שעשית כאן. From c084c5403fcdc40011e7c9b58fe9391e2a646b88 Mon Sep 17 00:00:00 2001 From: Doron-Behar Date: Mon, 17 Aug 2015 01:06:52 +0300 Subject: [PATCH 0613/5486] Create pizza.md --- hebrew/bar/pizza/pizza.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 hebrew/bar/pizza/pizza.md diff --git a/hebrew/bar/pizza/pizza.md b/hebrew/bar/pizza/pizza.md new file mode 100644 index 0000000000..343c9f544c --- /dev/null +++ b/hebrew/bar/pizza/pizza.md @@ -0,0 +1,13 @@ +אתה מרים את הטלפון ועונה לך הפקידת קבלה. +אתה אומר לה מה אתה רוצה והיא אומרת לך שזה יגיע תוך חצי שעה. +אז בינתיים היא אומרת שהיא מסיימת את המשמרת ואתה נשמע לה בחור מאוד מעניין ושרמנטי אז היא תשמח לפגוש אותך. +קבעתם אצלך בדירה כשהיא תבוא עם הפיצה בעוד שלושת-רבעי שעה. + +אתה מגלה שהפקידה ושמה דנה היא תלמידת תיכון בת 15 וחצי. + +מה אתה עושה? +יש בינכם פער גילים גדול למדי וביא קטינה אז זה לא חוקי זה עלול לסבך אותך + +אתה מסביר לה בכובד ראש שזה לא בסדר ושתמצא מישהו בגילה? + +או שאתה מזיין אותה בכל זאת? From ba2adb69c824e368b5ece692bdb78f80e87479a6 Mon Sep 17 00:00:00 2001 From: Doron-Behar Date: Mon, 17 Aug 2015 01:09:47 +0300 Subject: [PATCH 0614/5486] fix typo --- hebrew/bar/pizza/pizza.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hebrew/bar/pizza/pizza.md b/hebrew/bar/pizza/pizza.md index 343c9f544c..6b3636c294 100644 --- a/hebrew/bar/pizza/pizza.md +++ b/hebrew/bar/pizza/pizza.md @@ -6,7 +6,7 @@ אתה מגלה שהפקידה ושמה דנה היא תלמידת תיכון בת 15 וחצי. מה אתה עושה? -יש בינכם פער גילים גדול למדי וביא קטינה אז זה לא חוקי זה עלול לסבך אותך +יש בינכם פער גילים גדול למדי והיא קטינה אז זה לא חוקי זה עלול לסבך אותך. אתה מסביר לה בכובד ראש שזה לא בסדר ושתמצא מישהו בגילה? From 4eb6cabff0fecb723a20a4c5fc124d565f249561 Mon Sep 17 00:00:00 2001 From: Doron-Behar Date: Mon, 17 Aug 2015 01:36:13 +0300 Subject: [PATCH 0615/5486] Break line 1 --- hebrew/bar/beer/beer.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hebrew/bar/beer/beer.md b/hebrew/bar/beer/beer.md index 07c3147c48..2c0e7027b9 100644 --- a/hebrew/bar/beer/beer.md +++ b/hebrew/bar/beer/beer.md @@ -1,4 +1,5 @@ -אתה הולך בדרכך לבר ועוברת לידך חבורה של 3 בנות חמודות שמצחקקות להן בהנאה ומחפשות איפה לבלות. הן פונות אליך ושואלות אם אתה מכיר בר טוב בסביבה. +אתה הולך בדרכך לבר ועוברת לידך חבורה של 3 בנות חמודות שמצחקקות להן בהנאה ומחפשות איפה לבלות. +הן פונות אליך ושואלות אם אתה מכיר בר טוב בסביבה. אתה עונה להן שכן ואתה בדרך לשם אז הן מבקשות להצטרף אליך. מסתבר שיש בבר האהוב עליך מסיבת השקה לבר ולכן יש מבצעים רבים כמו צ'ייסרים חינם על כל בירה וכו'. From 7f232349f1be4665c91f9a91a76ffcceebc75e46 Mon Sep 17 00:00:00 2001 From: Doron-Behar Date: Mon, 17 Aug 2015 01:37:47 +0300 Subject: [PATCH 0616/5486] Break lin 1 --- hebrew/bar/falafel/falafel.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hebrew/bar/falafel/falafel.md b/hebrew/bar/falafel/falafel.md index 3f82281253..1e22ea77c1 100644 --- a/hebrew/bar/falafel/falafel.md +++ b/hebrew/bar/falafel/falafel.md @@ -1,4 +1,5 @@ -אתה מזמין את הפלאפל שלך ואתה רואה שהורידו את המחיר ל-15 שקלים במקום 20 ובעל הבית זיהה אותך אז הוא נתן לך עוד הנחת חבר של 5 שקלים. +אתה מזמין את הפלאפל שלך ואתה רואה שהורידו את המחיר ל-15 שקלים במקום 20. +בעל הבית זיהה אותך אז הוא נתן לך עוד הנחת חבר של 5 שקלים. אתה מתיישב לאכול, אוכל יחד עם בעל הבית כשהוא מעשן פייסל ונותן לך שאכטות תוך כדי האוכל בשביל שתישאר במאנצ'. From 07a70f80fb6ad94a1ea4c1dd779461c168802a60 Mon Sep 17 00:00:00 2001 From: pinky Date: Sun, 16 Aug 2015 22:37:52 -0400 Subject: [PATCH 0617/5486] Add marshmallow peep. --- english/find-bird/bird.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/find-bird/bird.md b/english/find-bird/bird.md index 7a4ef373c6..d6d0c0e840 100644 --- a/english/find-bird/bird.md +++ b/english/find-bird/bird.md @@ -1,5 +1,7 @@ Upon closer inspection, one of the marshmallows is making bird sounds. +A Marshmallow Peep! + The twittering sounds like a muffled, frantic, "Help me, help me!" You chuckle to yourself thinking, "Wizards always try to play god". From 5a2e85322cb77d84a7b8c51529a0cede567802ec Mon Sep 17 00:00:00 2001 From: Yavor Date: Mon, 17 Aug 2015 16:29:45 +0300 Subject: [PATCH 0618/5486] Add two options to the save_the_day option in the bulgarian version --- bulgarian/save_the_day/let_her_die/let_her_die.md | 2 ++ bulgarian/save_the_day/save_her/save_her.md | 2 ++ bulgarian/save_the_day/save_the_day.md | 6 ++++++ 3 files changed, 10 insertions(+) create mode 100644 bulgarian/save_the_day/let_her_die/let_her_die.md create mode 100644 bulgarian/save_the_day/save_her/save_her.md diff --git a/bulgarian/save_the_day/let_her_die/let_her_die.md b/bulgarian/save_the_day/let_her_die/let_her_die.md new file mode 100644 index 0000000000..b57ae1f0b3 --- /dev/null +++ b/bulgarian/save_the_day/let_her_die/let_her_die.md @@ -0,0 +1,2 @@ +Гледаш как бавно изгаря в ужасни болки и накрая сте строполява +на земята. \ No newline at end of file diff --git a/bulgarian/save_the_day/save_her/save_her.md b/bulgarian/save_the_day/save_her/save_her.md new file mode 100644 index 0000000000..66f5772acd --- /dev/null +++ b/bulgarian/save_the_day/save_her/save_her.md @@ -0,0 +1,2 @@ +Преминаваш бързо със скок през пламъците и стигаш до жената, но +вече всичко започва да се срутва от огъня и няма на къде да отидеш. \ No newline at end of file diff --git a/bulgarian/save_the_day/save_the_day.md b/bulgarian/save_the_day/save_the_day.md index f33868d450..5de1bd84b8 100644 --- a/bulgarian/save_the_day/save_the_day.md +++ b/bulgarian/save_the_day/save_the_day.md @@ -1 +1,7 @@ Влизаш в съседната стая и чуваш уплашен женски глас. Цялата стая е в пламaци. +Виждаш млада руса жена застанала в ъгъла на стаята и обградена от пламъци. +Имаш да направиш избор: + +[Опитай да я спасиш !](save_her/save_her.md) + +[Остави я, защото е прекалено опасно!](let_her_die/let_her_die.md) \ No newline at end of file From a60a2f270a081bd62761b8b7db962174268b28b6 Mon Sep 17 00:00:00 2001 From: razvan Date: Mon, 17 Aug 2015 19:15:13 +0300 Subject: [PATCH 0619/5486] Add option to drink or not "To drink or not to drink": this is the option. --- romanian/nalba.md | 12 +++++++++++- romanian/potiune_fermecata/beau/beau.md | 3 +++ romanian/potiune_fermecata/nu_beau/nu_beau.md | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 romanian/potiune_fermecata/beau/beau.md create mode 100644 romanian/potiune_fermecata/nu_beau/nu_beau.md diff --git a/romanian/nalba.md b/romanian/nalba.md index f2976ae781..25a87a5d5f 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -37,4 +37,14 @@ Se pusera ei pe baut ceai de nalba cand deodata... Aparu, [Zana Albastra](zana_albastra/cum_arata_zana.md): - Dragii mei, nu mai beti ceai de nalbe! Am nevoie de toate nalbele de -aici pentru o [potiune fermecata](potiune_fermecata/potiune.md). \ No newline at end of file +aici pentru o [potiune fermecata](potiune_fermecata/potiune.md). + +- Sigur, Zana albastra, spuse Ginel. +Si ii dadu zanei nalbele, iar zana se puse pe treaba, sa faca potiunea cea fermecata... +Plictisita, Gina pleca sa-si cumpere Orbit. Ginel continua sa se holbeze la zana cand, +dintr-odata, puhhh! Un nor rosu cuprinse zana de la genunchi pana peste cap, asa incat inca +i se mai vedeau pantofi albastrii... +- Bun, bun, buuun! zise zana. Stiam eu ca ma pricep la "d-astea" :-D +- Ihi, mormai Ginel, cu gura cascata si cu ochii fixati undeva, adanc. +- Haide, ia si tu o gura, ca imi esti simpatic. +Pai, se gandi Ginel, [sa beau](potiune_fermecata/beau/beau.md) sau... [sa nu beau](potiune_fermecata/nu_beau/nu_beau.md)? diff --git a/romanian/potiune_fermecata/beau/beau.md b/romanian/potiune_fermecata/beau/beau.md new file mode 100644 index 0000000000..3c7a96f5cf --- /dev/null +++ b/romanian/potiune_fermecata/beau/beau.md @@ -0,0 +1,3 @@ +- Sa beau, zic, de ce nu! Ha ha ha + +Si nici nu bau Ginel bine potiunea, ca si vazu o frunza mare si verde (sau ceva asemanator) in fata ochilor, [apoi](../../nalba.md) diff --git a/romanian/potiune_fermecata/nu_beau/nu_beau.md b/romanian/potiune_fermecata/nu_beau/nu_beau.md new file mode 100644 index 0000000000..08d68758e8 --- /dev/null +++ b/romanian/potiune_fermecata/nu_beau/nu_beau.md @@ -0,0 +1,5 @@ +- Zana, as bea, ca ma ajuta sa uit in ce hal fara de hal am ajuns, dar adevarul +este ca nu ar trebui sa beau, ci sa ma intorc la... + +Si nici nu zise bine Ginel ce avea im minte, ca se si trezi in fata unui calculator, cu ganduri +marete sa invete git si alte chestii folositoare, sa isi puna lumea la picioare. From e5b52568a67adef49beee2f57745fb53da5a8636 Mon Sep 17 00:00:00 2001 From: razvan Date: Mon, 17 Aug 2015 19:30:28 +0300 Subject: [PATCH 0620/5486] refactor: Remove dashes Remove dashes, as it looks like they're being interpreted by github's viewer. --- romanian/nalba.md | 13 ++++++++----- romanian/potiune_fermecata/beau/beau.md | 5 +++-- romanian/potiune_fermecata/nu_beau/nu_beau.md | 7 ++++--- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/romanian/nalba.md b/romanian/nalba.md index 25a87a5d5f..c6e5aa8a2a 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -39,12 +39,15 @@ Aparu, [Zana Albastra](zana_albastra/cum_arata_zana.md): - Dragii mei, nu mai beti ceai de nalbe! Am nevoie de toate nalbele de aici pentru o [potiune fermecata](potiune_fermecata/potiune.md). -- Sigur, Zana albastra, spuse Ginel. +Sigur, Zana albastra, spuse Ginel. Si ii dadu zanei nalbele, iar zana se puse pe treaba, sa faca potiunea cea fermecata... Plictisita, Gina pleca sa-si cumpere Orbit. Ginel continua sa se holbeze la zana cand, dintr-odata, puhhh! Un nor rosu cuprinse zana de la genunchi pana peste cap, asa incat inca i se mai vedeau pantofi albastrii... -- Bun, bun, buuun! zise zana. Stiam eu ca ma pricep la "d-astea" :-D -- Ihi, mormai Ginel, cu gura cascata si cu ochii fixati undeva, adanc. -- Haide, ia si tu o gura, ca imi esti simpatic. -Pai, se gandi Ginel, [sa beau](potiune_fermecata/beau/beau.md) sau... [sa nu beau](potiune_fermecata/nu_beau/nu_beau.md)? + +Bun, bun, buuun! zise zana. Stiam eu ca ma pricep la "d-astea" :-D +Ihi, mormai Ginel, cu gura cascata si cu ochii fixati undeva, adanc. +Haide, ia si tu o gura, ca imi esti simpatic. + +Pai, se puse pe ganduri Ginel, [sa beau](potiune_fermecata/beau/beau.md) sau... +[sa nu beau](potiune_fermecata/nu_beau/nu_beau.md)? diff --git a/romanian/potiune_fermecata/beau/beau.md b/romanian/potiune_fermecata/beau/beau.md index 3c7a96f5cf..68aedaee70 100644 --- a/romanian/potiune_fermecata/beau/beau.md +++ b/romanian/potiune_fermecata/beau/beau.md @@ -1,3 +1,4 @@ -- Sa beau, zic, de ce nu! Ha ha ha +Sa beau, zic, de ce nu! Ha ha ha -Si nici nu bau Ginel bine potiunea, ca si vazu o frunza mare si verde (sau ceva asemanator) in fata ochilor, [apoi](../../nalba.md) +Si nici nu bau Ginel bine potiunea, ca si vazu o frunza mare si verde (sau ceva +asemanator) in fata ochilor, [apoi...](../../nalba.md) diff --git a/romanian/potiune_fermecata/nu_beau/nu_beau.md b/romanian/potiune_fermecata/nu_beau/nu_beau.md index 08d68758e8..686801ac6a 100644 --- a/romanian/potiune_fermecata/nu_beau/nu_beau.md +++ b/romanian/potiune_fermecata/nu_beau/nu_beau.md @@ -1,5 +1,6 @@ -- Zana, as bea, ca ma ajuta sa uit in ce hal fara de hal am ajuns, dar adevarul +Zana, as bea, ca ma ajuta sa uit in ce hal fara de hal am ajuns, dar adevarul este ca nu ar trebui sa beau, ci sa ma intorc la... -Si nici nu zise bine Ginel ce avea im minte, ca se si trezi in fata unui calculator, cu ganduri -marete sa invete git si alte chestii folositoare, sa isi puna lumea la picioare. +Si nici nu zise bine Ginel ce avea im minte, ca se si trezi in fata unui +calculator, cu ganduri marete sa invete git si alte chestii folositoare, sa isi +puna lumea la picioare. From 7af667f6b886133fdf1786140ad86117e6f699ff Mon Sep 17 00:00:00 2001 From: razvan Date: Mon, 17 Aug 2015 20:02:48 +0300 Subject: [PATCH 0621/5486] refactor: Space-out paragraphs GitHub's Markdown viewer compresses adjacent lines, so add new lines to separate paragraphs. --- romanian/nalba.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/romanian/nalba.md b/romanian/nalba.md index c6e5aa8a2a..86ac456f25 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -41,12 +41,17 @@ aici pentru o [potiune fermecata](potiune_fermecata/potiune.md). Sigur, Zana albastra, spuse Ginel. Si ii dadu zanei nalbele, iar zana se puse pe treaba, sa faca potiunea cea fermecata... -Plictisita, Gina pleca sa-si cumpere Orbit. Ginel continua sa se holbeze la zana cand, -dintr-odata, puhhh! Un nor rosu cuprinse zana de la genunchi pana peste cap, asa incat inca -i se mai vedeau pantofi albastrii... + +Plictisita, Gina pleca sa-si cumpere Orbit. + +Ginel continua sa se holbeze la zana cand, dintr-odata, puhhh! Un nor rosu +cuprinse zana de la genunchi pana peste cap, asa incat inca i se mai vedeau +pantofi albastrii... Bun, bun, buuun! zise zana. Stiam eu ca ma pricep la "d-astea" :-D + Ihi, mormai Ginel, cu gura cascata si cu ochii fixati undeva, adanc. + Haide, ia si tu o gura, ca imi esti simpatic. Pai, se puse pe ganduri Ginel, [sa beau](potiune_fermecata/beau/beau.md) sau... From 04cd03e27e9f8669d80994fdedd92b57bcc90cd4 Mon Sep 17 00:00:00 2001 From: razvan Date: Mon, 17 Aug 2015 20:20:56 +0300 Subject: [PATCH 0622/5486] fix: Add new line at end of file If the last line in a file is not empty, adding content at the end of the file makes git condsider that line changed, hence forcing the committer to break bot Casey' rule of not changing lines. --- romanian/nalba.md | 1 + 1 file changed, 1 insertion(+) diff --git a/romanian/nalba.md b/romanian/nalba.md index 86ac456f25..06110d29b2 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -56,3 +56,4 @@ Haide, ia si tu o gura, ca imi esti simpatic. Pai, se puse pe ganduri Ginel, [sa beau](potiune_fermecata/beau/beau.md) sau... [sa nu beau](potiune_fermecata/nu_beau/nu_beau.md)? + From 8c1bf3eeb5cb93c4589c97960dd2f28038e055fe Mon Sep 17 00:00:00 2001 From: razvan Date: Mon, 17 Aug 2015 20:34:38 +0300 Subject: [PATCH 0623/5486] fix: Separate options with new line --- romanian/nalba.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/romanian/nalba.md b/romanian/nalba.md index 06110d29b2..269f342cf0 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -54,6 +54,9 @@ Ihi, mormai Ginel, cu gura cascata si cu ochii fixati undeva, adanc. Haide, ia si tu o gura, ca imi esti simpatic. -Pai, se puse pe ganduri Ginel, [sa beau](potiune_fermecata/beau/beau.md) sau... +Pai, se puse pe ganduri Ginel, [sa beau](potiune_fermecata/beau/beau.md) + +sau... + [sa nu beau](potiune_fermecata/nu_beau/nu_beau.md)? From 64d0927215b2f1472c531f1a16691bfaf92c2715 Mon Sep 17 00:00:00 2001 From: cbuckey Date: Mon, 17 Aug 2015 11:39:39 -0700 Subject: [PATCH 0624/5486] Remove broken link --- arabic/dream/dream.md | 1 - 1 file changed, 1 deletion(-) diff --git a/arabic/dream/dream.md b/arabic/dream/dream.md index 9b9aa3a768..c347d2ec34 100644 --- a/arabic/dream/dream.md +++ b/arabic/dream/dream.md @@ -2,5 +2,4 @@ احلم......الاحلام تتحقق اذا صدقة النية ولكن الاحلام لا تتحقق الا بالتوكل على الله والاخذ بالاسباب الان انت فى بداية الطريق ماذا ستفعل -1- [ستبدأ فى التعلم] (https://github.com/udacity/create-your-own-adventure/blob/master/arabic/learn/learn.md 1-[ستبدأ فى التعلم](../learn/learn.md) From 9a6a34cd4824ae52ad2b6eea4838c7a44218319a Mon Sep 17 00:00:00 2001 From: John McKeever Date: Mon, 17 Aug 2015 18:19:38 -0400 Subject: [PATCH 0625/5486] dir reorg --- english/madness/{ => boil}/boil.md | 0 english/madness/cthulhu.md | 6 +++--- english/madness/{ => writhe}/writhe.md | 0 english/madness/{ => yogsothoth}/yog-sothoth.md | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename english/madness/{ => boil}/boil.md (100%) rename english/madness/{ => writhe}/writhe.md (100%) rename english/madness/{ => yogsothoth}/yog-sothoth.md (100%) diff --git a/english/madness/boil.md b/english/madness/boil/boil.md similarity index 100% rename from english/madness/boil.md rename to english/madness/boil/boil.md diff --git a/english/madness/cthulhu.md b/english/madness/cthulhu.md index 698aa6734d..8141702741 100644 --- a/english/madness/cthulhu.md +++ b/english/madness/cthulhu.md @@ -6,8 +6,8 @@ Cthulhu, the eldritch terror, emerges through the haze. Your brain spasms in abject horror. He says nothing, but your choice is clear. Do you: -[Writhe] (writhe.md) in agony for ten thousand millenia +[Writhe] (writhe/writhe.md) in agony for ten thousand millenia -Accept instant death at the hands of the [Yog-Sothoth] (yog-sothoth.md) +Accept instant death at the hands of the [Yog-Sothoth] (yogsothoth/yog-sothoth.md) -[Boil] (boil.md) your own flesh with the heat of one million suns \ No newline at end of file +[Boil] (boil/boil.md) your own flesh with the heat of one million suns \ No newline at end of file diff --git a/english/madness/writhe.md b/english/madness/writhe/writhe.md similarity index 100% rename from english/madness/writhe.md rename to english/madness/writhe/writhe.md diff --git a/english/madness/yog-sothoth.md b/english/madness/yogsothoth/yog-sothoth.md similarity index 100% rename from english/madness/yog-sothoth.md rename to english/madness/yogsothoth/yog-sothoth.md From b30d390141989bac9fd4a42045e95d44ab3e1445 Mon Sep 17 00:00:00 2001 From: dmullings Date: Tue, 18 Aug 2015 08:42:14 +0900 Subject: [PATCH 0626/5486] add line to watch-barca page --- english/watch-barca/watch-barca.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/watch-barca/watch-barca.md b/english/watch-barca/watch-barca.md index 34de2662ca..8435253083 100644 --- a/english/watch-barca/watch-barca.md +++ b/english/watch-barca/watch-barca.md @@ -1 +1,3 @@ +80th minute... Messi, Messi, Messi, Messi goooooooooooooooooooooooooooooooooool Messi! + Barcelona won the game! \ No newline at end of file From f41cdd8e0448b05d33e509be2b9686dfa992c43e Mon Sep 17 00:00:00 2001 From: Martin Watson Date: Mon, 17 Aug 2015 22:20:02 -0500 Subject: [PATCH 0627/5486] Add code to make pants stop glowing --- english/code/code.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/code/code.md b/english/code/code.md index b7f56bb0b1..abe77c7681 100644 --- a/english/code/code.md +++ b/english/code/code.md @@ -1 +1,5 @@ It seems like the only thing to do is code. + +You create a program that is designed to make your pants stop glowing. It works. +Your pants stop glowing, but then the marshmallow-walled room starts glowing, +slowly getting brighter and brighter. From e80bcb0b6405265a445f73324a31c87fec3f9f49 Mon Sep 17 00:00:00 2001 From: Bryan Fulton Date: Mon, 17 Aug 2015 23:51:17 -0400 Subject: [PATCH 0628/5486] Add option to investigate glowing pants --- english/glowing-pants/glowing-pants.md | 2 ++ .../investigate-glowing-pants/investigate-glowing-pants.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 english/investigate-glowing-pants/investigate-glowing-pants.md diff --git a/english/glowing-pants/glowing-pants.md b/english/glowing-pants/glowing-pants.md index 6556524186..fbc27135b8 100644 --- a/english/glowing-pants/glowing-pants.md +++ b/english/glowing-pants/glowing-pants.md @@ -1,3 +1,5 @@ You hear the faint melodies of angels singing emanating from your pants. +[Investigate your glowing pants](../investigate-glowing-pants/investigate-glowing-pants.md) + [Go back to worrying about the marshmallow room](../marshmallow.md) \ No newline at end of file diff --git a/english/investigate-glowing-pants/investigate-glowing-pants.md b/english/investigate-glowing-pants/investigate-glowing-pants.md new file mode 100644 index 0000000000..0441670f84 --- /dev/null +++ b/english/investigate-glowing-pants/investigate-glowing-pants.md @@ -0,0 +1,5 @@ +You take your pants off, turn them upside down, and shake them vigorously. + +A small pixie falls out and angrily bites you on the nose before flying off to hide in a corner of the room. + +[Ignore the pixie for now](../marshmallow.md) \ No newline at end of file From 1eea43492251b642e12c6e7b2e527e687a1f8046 Mon Sep 17 00:00:00 2001 From: 1985michelfr Date: Tue, 18 Aug 2015 13:50:56 -0300 Subject: [PATCH 0629/5486] Add a new feature at emprego.md --- .../diff/pull/reenvio/watch/emprego/emprego.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md index feef939120..2c8be6c257 100644 --- a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md @@ -1,4 +1,13 @@ Você foi aprovado em uma entrevista de emprego na empresa cujo nome possui três letras pelo fato de ter contribuido para a comunidade open source, através de correções de bugs -e criação de novas features em aplicações de terceiros: +e criação de novas features em aplicações de terceiros. + +Você então é convidado para criar um curso que ensina programadores a utilizar o Git. +Uma empresa parceira é necessária para criação desse curso. Qual empresa você convida: + +[Udacity] (udacity/udacity.md) + +[Google] (google/google.md) + +[FaceBook] (facebook/facebook.md) From af8d5e3f564fab98a2c12c810e4dddbe167dcfde Mon Sep 17 00:00:00 2001 From: 1985michelfr Date: Tue, 18 Aug 2015 13:53:13 -0300 Subject: [PATCH 0630/5486] Add udacity/udacity.md --- .../diff/pull/reenvio/watch/emprego/udacity/udacity.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/udacity/udacity.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/udacity/udacity.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/udacity/udacity.md new file mode 100644 index 0000000000..146d798ad2 --- /dev/null +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/udacity/udacity.md @@ -0,0 +1 @@ +A Udacity aceita o convite e juntos vocês disponibilizam um excelente curso sobre Git/GitHub! \ No newline at end of file From 8a20e5d8d3e10bba19402229bd8cf4a50f283b0a Mon Sep 17 00:00:00 2001 From: 1985michelfr Date: Tue, 18 Aug 2015 13:56:07 -0300 Subject: [PATCH 0631/5486] Add google/google.md --- .../diff/pull/reenvio/watch/emprego/google/google.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md new file mode 100644 index 0000000000..fd0e537d23 --- /dev/null +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md @@ -0,0 +1 @@ +A Google aceita o convite e também inclui e Udacity no projeto e juntos vocês disponibilizam um excelente curso sobre Git/GitHub! \ No newline at end of file From 53a6e5aabcd0ab544e8a4631d0ff7ab5e019aad1 Mon Sep 17 00:00:00 2001 From: 1985michelfr Date: Tue, 18 Aug 2015 13:57:13 -0300 Subject: [PATCH 0632/5486] Add facebook/facebook.md --- .../diff/pull/reenvio/watch/emprego/facebook/facebook.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md new file mode 100644 index 0000000000..c3ff4ad42a --- /dev/null +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md @@ -0,0 +1 @@ +O Facebook aceita o convite e também inclui e Udacity no projeto e juntos vocês disponibilizam um excelente curso sobre Git/GitHub! \ No newline at end of file From 1a815535f8e487f3eeaefdbb60c115e31344fd5a Mon Sep 17 00:00:00 2001 From: 1985michelfr Date: Tue, 18 Aug 2015 16:15:11 -0300 Subject: [PATCH 0633/5486] Text split into multiple lines --- .../diff/pull/reenvio/watch/emprego/facebook/facebook.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md index c3ff4ad42a..c6e9f497be 100644 --- a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md @@ -1 +1,2 @@ -O Facebook aceita o convite e também inclui e Udacity no projeto e juntos vocês disponibilizam um excelente curso sobre Git/GitHub! \ No newline at end of file +O Facebook aceita o convite e também inclui a Udacity no projeto. +Juntos vocês disponibilizam um excelente curso sobre Git/GitHub! \ No newline at end of file From a1bfab2d4759e9f8ee08343752ca1918eb10a17d Mon Sep 17 00:00:00 2001 From: 1985michelfr Date: Tue, 18 Aug 2015 16:16:38 -0300 Subject: [PATCH 0634/5486] Text split into multiple lines --- .../diff/pull/reenvio/watch/emprego/google/google.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md index fd0e537d23..14075b65b7 100644 --- a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md @@ -1 +1,2 @@ -A Google aceita o convite e também inclui e Udacity no projeto e juntos vocês disponibilizam um excelente curso sobre Git/GitHub! \ No newline at end of file +A Google aceita o convite e também inclui e Udacity no projeto. +Juntos vocês disponibilizam um excelente curso sobre Git/GitHub! \ No newline at end of file From d8d9b870c151ca079b0f46e8199b31fdbc413719 Mon Sep 17 00:00:00 2001 From: SolomonAlma Date: Wed, 19 Aug 2015 00:33:07 +0300 Subject: [PATCH 0635/5486] add is-this-a-dream option to story --- english/is-this-a-dream/is-this-a-dream.md | 6 ++++++ .../remember-you-are-superman/remember-you-are-superman.md | 7 +++++++ 2 files changed, 13 insertions(+) create mode 100644 english/is-this-a-dream/is-this-a-dream.md create mode 100644 english/remember-you-are-superman/remember-you-are-superman.md diff --git a/english/is-this-a-dream/is-this-a-dream.md b/english/is-this-a-dream/is-this-a-dream.md new file mode 100644 index 0000000000..6adebb0cb3 --- /dev/null +++ b/english/is-this-a-dream/is-this-a-dream.md @@ -0,0 +1,6 @@ +as the sharp pain moves through your nervous system and reaches your brain, the marshmallow walls begin +to tremble stronger and stronet and brighten up until they blow up around you in a shimmering white light +that engulfs you...you close your eyes from the strong light and when you open them up...the beautiful +view from your 20th floor in central park NY and the sexy ass of the current babe you conquered last night +welcomes you :) +No more eating at that strange ass pizzaria you promise your self... \ No newline at end of file diff --git a/english/remember-you-are-superman/remember-you-are-superman.md b/english/remember-you-are-superman/remember-you-are-superman.md new file mode 100644 index 0000000000..66f7b4a3fb --- /dev/null +++ b/english/remember-you-are-superman/remember-you-are-superman.md @@ -0,0 +1,7 @@ +Oh...right. + +and i hate marshmallows. + +heat vision on....marshmallows on fire everywhere ;) + +*flys away home to lois* \ No newline at end of file From c65cd7c38bdd0599f97725a979050306ff21fe64 Mon Sep 17 00:00:00 2001 From: SolomonAlma Date: Wed, 19 Aug 2015 00:35:04 +0300 Subject: [PATCH 0636/5486] add dream and superman options to stroy --- english/marshmallow.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 974c268626..718bb540fb 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -20,6 +20,9 @@ The type of extreme mortal danger that so often accompanies confectionary inspir Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. +[pinch yourself to see if this is a dream](./is-this-a-dream/is-this-a-dream.md) +[remember that you are kal-el, also known as super man, and fly the hell out of this stupid ass candy house](./remember-you-are-superman/remember-you-are-superman.md) + [Interrogate the man for clues](./movie-ripoffs/zoolander/zoolander.md) These marshmallows are numerous and they look so delicious. From 0c2d3cb018c649085625dd9d5b3a2ebacd5abb47 Mon Sep 17 00:00:00 2001 From: SolomonAlma Date: Wed, 19 Aug 2015 00:40:29 +0300 Subject: [PATCH 0637/5486] shorten length of superman option --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 718bb540fb..756f0878c2 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -21,7 +21,7 @@ Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. [pinch yourself to see if this is a dream](./is-this-a-dream/is-this-a-dream.md) -[remember that you are kal-el, also known as super man, and fly the hell out of this stupid ass candy house](./remember-you-are-superman/remember-you-are-superman.md) +[remember that you are superman](./remember-you-are-superman/remember-you-are-superman.md) [Interrogate the man for clues](./movie-ripoffs/zoolander/zoolander.md) From 10b4a7fb3beda76421fdb2257b93a121afb464f6 Mon Sep 17 00:00:00 2001 From: SolomonAlma Date: Wed, 19 Aug 2015 00:43:00 +0300 Subject: [PATCH 0638/5486] make marshmallows file pretty for casey --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 756f0878c2..d3e7f6e84e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -21,6 +21,7 @@ Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. [pinch yourself to see if this is a dream](./is-this-a-dream/is-this-a-dream.md) + [remember that you are superman](./remember-you-are-superman/remember-you-are-superman.md) [Interrogate the man for clues](./movie-ripoffs/zoolander/zoolander.md) From 47fec34b4128884f09b7184cdb9aa31f027a25cd Mon Sep 17 00:00:00 2001 From: rachd Date: Tue, 18 Aug 2015 20:27:48 -0400 Subject: [PATCH 0639/5486] Update language.md --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index 2bce0be317..37dde22ae1 100644 --- a/language.md +++ b/language.md @@ -112,3 +112,5 @@ If you speak Urdu [click here](urdu/urdu-news.md) Ako govorite Bosanski jezik/If You speak Bosnian language [kliknite ovdje/click here](Bosnian/Bosnian_story.md) Nếu bạn nói tiếng Việt, [nhấn vào link này](vietnamese/kechuyen.md). + +Se vi parolas esperanton, alkliki [tie] (esperanto/komenci.md). From 759f84a7203b15a930f7a140336d2749be79cdaf Mon Sep 17 00:00:00 2001 From: rachd Date: Tue, 18 Aug 2015 20:28:29 -0400 Subject: [PATCH 0640/5486] fix type --- language.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language.md b/language.md index 37dde22ae1..0a74f4e45d 100644 --- a/language.md +++ b/language.md @@ -113,4 +113,4 @@ Ako govorite Bosanski jezik/If You speak Bosnian language [kliknite ovdje/click Nếu bạn nói tiếng Việt, [nhấn vào link này](vietnamese/kechuyen.md). -Se vi parolas esperanton, alkliki [tie] (esperanto/komenci.md). +Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). From 28f8c8e5ae009e3b6296a0457829218936ffbd0f Mon Sep 17 00:00:00 2001 From: rachd Date: Tue, 18 Aug 2015 20:29:31 -0400 Subject: [PATCH 0641/5486] create esperanto folder and add first story --- esperanto/komenci.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 esperanto/komenci.md diff --git a/esperanto/komenci.md b/esperanto/komenci.md new file mode 100644 index 0000000000..ac3cfa5190 --- /dev/null +++ b/esperanto/komenci.md @@ -0,0 +1 @@ +Vi vidas ke vi estas en marsxmala cxambro. From 6adcf9435f277bea29ae231399bce2690117f5d1 Mon Sep 17 00:00:00 2001 From: jtpdowns Date: Tue, 18 Aug 2015 22:33:11 -0400 Subject: [PATCH 0642/5486] feat: Add a fantasia/narnia-esque adventure Include an extension of the Matrix story in which you seduce witches, fight fires, and reign for many years (actually hours). --- english/movie-ripoffs/fantasia/fantasia.md | 30 ++++++++++++++++++++++ english/movie-ripoffs/matrix/matrix.md | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 english/movie-ripoffs/fantasia/fantasia.md diff --git a/english/movie-ripoffs/fantasia/fantasia.md b/english/movie-ripoffs/fantasia/fantasia.md new file mode 100644 index 0000000000..3efc600f37 --- /dev/null +++ b/english/movie-ripoffs/fantasia/fantasia.md @@ -0,0 +1,30 @@ +Morpheus reels back as the symphony begins to sound. He +understands the consequences of your actions even if you +do not yet. One by one, the brooms march on, carrying +their buckets of water. Alone, each one would be a laughable +sight. Combined, however, their mass rocks the dojo and alarms +the nearby wildlife. + +You dash out of the dojo to the relative safety of the +mountains in the distance. Slowly but surely, the brooms +follow, hauling the great sloshing payload. Realizing that +you need a better strategy, you bother the local coven of +witches at their mountaintop oasis. Word travels swiftly +in this virtual world, and you have heard much about their +magic-suppressing ring. You intend to use the ring to immobilize +the brooms and prevent more from spawning. Meanwhile, you spill +some dust in your path to temporarily distract the brooms. + +Though initially reluctant to part with their ring, the witches +are shameless flirts. Using your most potent wiles, you effectively +seduce them. Despite a struggle, you manage to pry the ring +from their pleasure-clenched fingers. With one triumphant motion, +you secure the ring about the wand. As the music softly dies, you +feel the mountain shake as 10000 inanimate brooms collapse under +weight of their buckets of water. + +Conveniently, your bucket-supplied deluge puts out a massive +forest fire. You are lauded as a virtual hero, and you enjoy +many virtual years (actual hours) of escapades before you emerge +an experienced king, an accomplished scholar, and a weathered +warrior. The real world has no idea what it's in for. diff --git a/english/movie-ripoffs/matrix/matrix.md b/english/movie-ripoffs/matrix/matrix.md index 553a786202..4cdf80a12a 100644 --- a/english/movie-ripoffs/matrix/matrix.md +++ b/english/movie-ripoffs/matrix/matrix.md @@ -35,3 +35,5 @@ gooey liquid smashes Morpheus across the room. Choose the next spell: ["Woah" just to see what happens](../selfaware/selfaware.md) ["Valar Morghulis"](../../valarmorghulis/valarmorghulis.md) + +["Mop the floor with him" to summon your bristly army](../fantasia/fantasia.md) From bfa20bd7f6894a1ec8bfc69d76f07f8a62f5eeed Mon Sep 17 00:00:00 2001 From: Alexander Dibb Date: Tue, 18 Aug 2015 20:53:32 -0700 Subject: [PATCH 0643/5486] Added 'tuesday' line to base english story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index edfe2f5543..f970d83351 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -2,6 +2,8 @@ One morning, you wake up in a strange room with marshmallows for walls. +*(Must be a Tuesday.)* + A sound from a Hitchcock movie fills the room, then quickly fades away. Thinking back, there are no memories to suggest that this should have been From 3e500371405a28373a2ba1749a93e68cefffadb4 Mon Sep 17 00:00:00 2001 From: Thomas Korrison Date: Wed, 19 Aug 2015 16:19:54 +0100 Subject: [PATCH 0644/5486] added to the tickle story --- english/tickle/tickle.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/tickle/tickle.md b/english/tickle/tickle.md index 5f1ec52842..3d98549d65 100644 --- a/english/tickle/tickle.md +++ b/english/tickle/tickle.md @@ -1,3 +1,4 @@ You begin to tickle the marshmallow and the marshmallow begins to laugh. You continue tickling and the marshmallow laughs harder and everything begins to shake. -Suddenly, all the marshmallow explodes and you are covered in gooey goodness. \ No newline at end of file +Suddenly, all the marshmallow explodes and you are covered in gooey goodness. +You begin to lick the gooey goodness and begin to laugh. \ No newline at end of file From ce4d432290d997bfb132fa38e9bfc239ea5300f0 Mon Sep 17 00:00:00 2001 From: Helen Chen Date: Wed, 19 Aug 2015 11:33:04 -0700 Subject: [PATCH 0645/5486] Add storyline with visiting the dentist after eating marshmallow --- english/bite-the-marshmallow/dentist/dentist-office.md | 10 ++++++++++ english/bite-the-marshmallow/tasty-marshmallow.md | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 english/bite-the-marshmallow/dentist/dentist-office.md diff --git a/english/bite-the-marshmallow/dentist/dentist-office.md b/english/bite-the-marshmallow/dentist/dentist-office.md new file mode 100644 index 0000000000..9157e7ec98 --- /dev/null +++ b/english/bite-the-marshmallow/dentist/dentist-office.md @@ -0,0 +1,10 @@ +As you walk into the dental office, the pain in your mouth subsides. +Just as you start feeling happy that your mouth doesn't hurt anymore, +you look around and realize you're back in that weird room with the marshmallow walls. +The garishly dressed, vacant-eyed young man is still lounging on the sofa. + +[Interrogate the man for clues](./movie-ripoffs/zoolander/zoolander.md) + +You hesitate talking to this man, thinking, "Eh, he's probably crazy and won't say anything helpful," +then, all of a sudden, this mirror-like thing came crashing down from the ceiling right in front of your face. +You swear it is whispering: ["Come on in!!!"](./mirror/enter-mirror.md) \ No newline at end of file diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index 9eb95586b2..9c884807de 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -15,4 +15,7 @@ Wait a minute....how did you end up in this car? You must be hallucinating [You open the door and there is a man sitting on your couch](../movie-ripoffs/zoolander/zoolander.md) -[Ask the driver "Where are we going?!"](ricky/ricky.md) \ No newline at end of file +[Ask the driver "Where are we going?!"](ricky/ricky.md) + +Magically, the car pulls up in front of your dentist's office. +[You get out and go into the office.](dentist/dentist-office.md) From f348d5277ffa39cf439da110eada5eedd758a65d Mon Sep 17 00:00:00 2001 From: Dattatreya Date: Thu, 20 Aug 2015 03:08:40 +0530 Subject: [PATCH 0646/5486] Add APJ Kalam Quote --- english/apj/quotes/quotes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/apj/quotes/quotes.md b/english/apj/quotes/quotes.md index b28c8f5c19..c2c2a7a802 100644 --- a/english/apj/quotes/quotes.md +++ b/english/apj/quotes/quotes.md @@ -4,4 +4,6 @@ 3) "There is no illusion greater than fear." -Lao Tzu +4) "Man needs his difficulties because they are necessary to enjoy success." -APJ Kalam + Click [hear](https://www.goodreads.com/quotes/tag/overcoming-fear) to find more quotes. \ No newline at end of file From 736dd04fe52c11934bda1aa53b4dd2107001ba8c Mon Sep 17 00:00:00 2001 From: tguthmann Date: Wed, 19 Aug 2015 18:23:16 -0400 Subject: [PATCH 0647/5486] changes to jumpsuit --- english/jumpsuit/jumpsuit-review.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/jumpsuit/jumpsuit-review.md b/english/jumpsuit/jumpsuit-review.md index 993bae2cb3..fe2feae72c 100644 --- a/english/jumpsuit/jumpsuit-review.md +++ b/english/jumpsuit/jumpsuit-review.md @@ -1,2 +1,3 @@ That jumpsuit you're wearing looks stupid. It's right here in your [file](jumpsuit-review.md) Hi, Tim here. Yes, that jumpsuit is awful. Please see the link above. +Jumpsuits are underrated. I love a jumpsuit. From 97c390ffd7e2e2b11cfafd98b8242970e10f31ab Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Thu, 20 Aug 2015 01:45:18 -0400 Subject: [PATCH 0648/5486] Update tasty-marshmallow.md to add ending procrastinate with social media, pointing to lamping.md --- english/bite-the-marshmallow/tasty-marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index 9eb95586b2..7b6fe53706 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -15,4 +15,6 @@ Wait a minute....how did you end up in this car? You must be hallucinating [You open the door and there is a man sitting on your couch](../movie-ripoffs/zoolander/zoolander.md) -[Ask the driver "Where are we going?!"](ricky/ricky.md) \ No newline at end of file +[Ask the driver "Where are we going?!"](ricky/ricky.md) + +[Procrastinate with social media](lamping.md) From a776db90ec455c2239e72e665d446e18845a9f12 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Thu, 20 Aug 2015 01:48:07 -0400 Subject: [PATCH 0649/5486] Create lamping.md lamping.md follows the protagonist's social media procrastination with clinical psychological rigor --- lamping.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 lamping.md diff --git a/lamping.md b/lamping.md new file mode 100644 index 0000000000..40254c944a --- /dev/null +++ b/lamping.md @@ -0,0 +1,2 @@ +As you begin to scroll through your feed on IG and using your +super-retweeting abilities, the realities of the universe fade... From 8b5e740d5530ed19f10bd26c968a3c4b51f5e5c4 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Thu, 20 Aug 2015 02:00:32 -0400 Subject: [PATCH 0650/5486] Fixed directory structure per README.md and @casey_collab --- english/bite-the-marshmallow/lamping/lamping.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/bite-the-marshmallow/lamping/lamping.md diff --git a/english/bite-the-marshmallow/lamping/lamping.md b/english/bite-the-marshmallow/lamping/lamping.md new file mode 100644 index 0000000000..40254c944a --- /dev/null +++ b/english/bite-the-marshmallow/lamping/lamping.md @@ -0,0 +1,2 @@ +As you begin to scroll through your feed on IG and using your +super-retweeting abilities, the realities of the universe fade... From e6364487e4d7b99f496532826c8dd6b5dea357d7 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Thu, 20 Aug 2015 02:05:45 -0400 Subject: [PATCH 0651/5486] Not sure what I'm adding... --- english/.DS_Store | Bin 0 -> 6148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 english/.DS_Store diff --git a/english/.DS_Store b/english/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..71f0db88209835cb64339554e723e769bc22e48c GIT binary patch literal 6148 zcmeHKUu)Yi5I?2a>a;H&YoV|gy$(`HNlIS5ta}^;JX*#&G8>yk;99|UYDx(Bc^_l{ zKgM8e-(eqRZ@ZI}ZY3M+X)WVUoPMX1PO^VzBntq1>+I5w;$xN8 z6MyHS&Z|h}Y4J50k{U61rUPs-EK&Ud1cYC7?E$3=RMq2nk|k5#E+m8t5&>rk2a zdyB7sFw%D+m4Ia_N8aynFW#A3T0KTfTbz=Iy)pA3lEmVzVUhgEn&4 z;R?Q@@z;c%hee+0{3XV$=3C9f$P6$8%)m7=;I<@h`x>8tmu3c-ft$$y?GF-_FmTvd zG+PH&^!rHtZ9)>X=`KMi9R>~?i`auAY$&1)74C{5Y&iO*8y7fiEZT4oW@Vhmtt{LP zMVQsmFU@cefkm#F0cPMT0~@yK)A|4C&-eeULEK^nn1TO_0nt7Rk4E@P?rdFqIXY`4 t>I+m78rN973_-&j#W Date: Thu, 20 Aug 2015 17:42:49 +0100 Subject: [PATCH 0652/5486] Added meanings story line. --- english/marshmallow.md | 2 ++ english/meaning/meaning.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 english/meaning/meaning.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 96b30913da..d3834b581a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -405,6 +405,8 @@ Do you: [Play Guitar](guitar/guitar.md) +[Contemplate the meaning of life](meaning/meaning.md) + [Rinse the marshmallow under the tap then eat it](dysentry/dysentry.md) [Wake up!](wake-up/wake-up.md) diff --git a/english/meaning/meaning.md b/english/meaning/meaning.md new file mode 100644 index 0000000000..a95459617c --- /dev/null +++ b/english/meaning/meaning.md @@ -0,0 +1,5 @@ +You pause for a moment and stare up at the sky, ignoring the marshmallows or whatever junk is going on below you. Your moment of reflection ends suddenly when you realise you are in fact sitting at your computer reading this story. However, you are still confused as to what you just read and you go on to wonder where this story will take you next. + +It turns out this particular author is lazy and the story ends. + +Sorry. \ No newline at end of file From f1d44ff23580c5ec4d246eeaab4cc0e4f6f7d3d6 Mon Sep 17 00:00:00 2001 From: randiwest Date: Thu, 20 Aug 2015 11:52:15 -0700 Subject: [PATCH 0653/5486] Added additional commentary about marshmallows and android. --- english/turing-test/siri/ask_siri.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/turing-test/siri/ask_siri.md b/english/turing-test/siri/ask_siri.md index 878acd551f..d261e6b70c 100644 --- a/english/turing-test/siri/ask_siri.md +++ b/english/turing-test/siri/ask_siri.md @@ -6,6 +6,10 @@ Repeat You launch Siri Siri: Here is a list of recipes using giant marshmallows. +You: Hmmm....marshashmallows sound delicious. Are there any Android themed ones. + +Siri: Here is list of recipes in honour of the new Android release. Is that all? + You: No! I need help! Siri: Ok. How can I help you? From 7c6fa52d49f0c03f2986bb3c4a803c81f000d664 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Thu, 20 Aug 2015 22:32:29 -0400 Subject: [PATCH 0654/5486] Update tasty-marshmallow to contain working link to lamping.md --- english/bite-the-marshmallow/tasty-marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index 7b6fe53706..8949a547ad 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -17,4 +17,4 @@ Wait a minute....how did you end up in this car? You must be hallucinating [Ask the driver "Where are we going?!"](ricky/ricky.md) -[Procrastinate with social media](lamping.md) +[Procrastinate with social media](lamping/lamping.md) From 5487de16155c6699c0da61edb10bc69fe3265b0c Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Thu, 20 Aug 2015 22:35:33 -0400 Subject: [PATCH 0655/5486] Update lamping.md --- english/bite-the-marshmallow/lamping/lamping.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/lamping/lamping.md b/english/bite-the-marshmallow/lamping/lamping.md index 40254c944a..4b9fd051c6 100644 --- a/english/bite-the-marshmallow/lamping/lamping.md +++ b/english/bite-the-marshmallow/lamping/lamping.md @@ -1,2 +1,2 @@ -As you begin to scroll through your feed on IG and using your +As you begin scrolling through your feed on IG and using your super-retweeting abilities, the realities of the universe fade... From 5a2d055d602cbb4a720ef1878dc69126b6031d92 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Thu, 20 Aug 2015 22:40:45 -0400 Subject: [PATCH 0656/5486] Remove .DS_Store file (not sure how it got here) --- english/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 english/.DS_Store diff --git a/english/.DS_Store b/english/.DS_Store deleted file mode 100644 index 71f0db88209835cb64339554e723e769bc22e48c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKUu)Yi5I?2a>a;H&YoV|gy$(`HNlIS5ta}^;JX*#&G8>yk;99|UYDx(Bc^_l{ zKgM8e-(eqRZ@ZI}ZY3M+X)WVUoPMX1PO^VzBntq1>+I5w;$xN8 z6MyHS&Z|h}Y4J50k{U61rUPs-EK&Ud1cYC7?E$3=RMq2nk|k5#E+m8t5&>rk2a zdyB7sFw%D+m4Ia_N8aynFW#A3T0KTfTbz=Iy)pA3lEmVzVUhgEn&4 z;R?Q@@z;c%hee+0{3XV$=3C9f$P6$8%)m7=;I<@h`x>8tmu3c-ft$$y?GF-_FmTvd zG+PH&^!rHtZ9)>X=`KMi9R>~?i`auAY$&1)74C{5Y&iO*8y7fiEZT4oW@Vhmtt{LP zMVQsmFU@cefkm#F0cPMT0~@yK)A|4C&-eeULEK^nn1TO_0nt7Rk4E@P?rdFqIXY`4 t>I+m78rN973_-&j#W Date: Thu, 20 Aug 2015 23:03:52 -0400 Subject: [PATCH 0657/5486] Attempt to fix the directory structure ` --- english/lamping/lamping.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/lamping/lamping.md diff --git a/english/lamping/lamping.md b/english/lamping/lamping.md new file mode 100644 index 0000000000..4b9fd051c6 --- /dev/null +++ b/english/lamping/lamping.md @@ -0,0 +1,2 @@ +As you begin scrolling through your feed on IG and using your +super-retweeting abilities, the realities of the universe fade... From 18826adeab06b86c77f561c6640f6a7610aa5fac Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Thu, 20 Aug 2015 23:16:34 -0400 Subject: [PATCH 0658/5486] Still trying --- english/bite-the-marshmallow/lamping/lamping.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 english/bite-the-marshmallow/lamping/lamping.md diff --git a/english/bite-the-marshmallow/lamping/lamping.md b/english/bite-the-marshmallow/lamping/lamping.md deleted file mode 100644 index 4b9fd051c6..0000000000 --- a/english/bite-the-marshmallow/lamping/lamping.md +++ /dev/null @@ -1,2 +0,0 @@ -As you begin scrolling through your feed on IG and using your -super-retweeting abilities, the realities of the universe fade... From b16eff50a0196bae4035eae90b00ec0d4ca54668 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Thu, 20 Aug 2015 23:18:17 -0400 Subject: [PATCH 0659/5486] Update tasty-marshmallow.md --- english/bite-the-marshmallow/tasty-marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index 8949a547ad..2ede95a9a5 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -17,4 +17,4 @@ Wait a minute....how did you end up in this car? You must be hallucinating [Ask the driver "Where are we going?!"](ricky/ricky.md) -[Procrastinate with social media](lamping/lamping.md) +[Procrastinate with social media](../lamping/lamping.md) From 65abf72897afd177d5411acdc429fd13ef8b03d7 Mon Sep 17 00:00:00 2001 From: karnoq Date: Thu, 20 Aug 2015 22:14:55 -0600 Subject: [PATCH 0660/5486] Add bounce to story --- english/bounce/bounce.md | 10 ++++++++++ english/marshmallow.md | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 english/bounce/bounce.md diff --git a/english/bounce/bounce.md b/english/bounce/bounce.md new file mode 100644 index 0000000000..7d4774678e --- /dev/null +++ b/english/bounce/bounce.md @@ -0,0 +1,10 @@ +You run as fast as you can at one of the marshmallow walls slamming in to it at full speed and + +BOUNCE! + +straight across the room to bounce off the far marshmallow wall. You continue to bounce from +wall, to floor, to ceiling, and back again. Finally, before you become sick from all the +bouncing around you bounce right through one of the marshmallow walls to find yourself right +back at the beginning. + +[Beginning] (../english/marshmallow.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 96b30913da..45e967dc38 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -434,3 +434,5 @@ Do you: [Attack marshmallow pikachu!](pikachu/pokeball.md) [Summon Dragons of the Khaleesi](dragons/fire-everywhere.md) + +[Bounce](bounce/bounce.md) From 453c594a6d6c0d69e8ff547de01f03cbb984f2c9 Mon Sep 17 00:00:00 2001 From: karnoq Date: Thu, 20 Aug 2015 22:28:00 -0600 Subject: [PATCH 0661/5486] Fixed link --- english/bounce/bounce.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bounce/bounce.md b/english/bounce/bounce.md index 7d4774678e..e27d937733 100644 --- a/english/bounce/bounce.md +++ b/english/bounce/bounce.md @@ -7,4 +7,4 @@ wall, to floor, to ceiling, and back again. Finally, before you become sick from bouncing around you bounce right through one of the marshmallow walls to find yourself right back at the beginning. -[Beginning] (../english/marshmallow.md) \ No newline at end of file +[Beginning] (../../marshmallow.md) \ No newline at end of file From 3d345a758002e333bd2dc7c9330fbbbae0f91029 Mon Sep 17 00:00:00 2001 From: karnoq Date: Thu, 20 Aug 2015 22:41:22 -0600 Subject: [PATCH 0662/5486] Fixed the link (again) --- english/bounce/bounce.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bounce/bounce.md b/english/bounce/bounce.md index e27d937733..5e50448e1b 100644 --- a/english/bounce/bounce.md +++ b/english/bounce/bounce.md @@ -7,4 +7,4 @@ wall, to floor, to ceiling, and back again. Finally, before you become sick from bouncing around you bounce right through one of the marshmallow walls to find yourself right back at the beginning. -[Beginning] (../../marshmallow.md) \ No newline at end of file +[Beginning] (../marshmallow.md) \ No newline at end of file From 333630855ffeed1e204504b6773d2ce661235e9f Mon Sep 17 00:00:00 2001 From: Alexandra Polubiec Date: Thu, 20 Aug 2015 21:46:08 -0700 Subject: [PATCH 0663/5486] added new options after realizing you still love bacon --- .../water-dreams/pig-farm/love-bacon/love-bacon.md | 11 +++++++++-- .../pig-farm/love-bacon/pig-friend/pig-friend.md | 11 +++++++++++ .../pig-farm/love-bacon/pig-therapy/pig-therapy.md | 13 +++++++++++++ .../love-bacon/spirit-quest/spirit-quest.md | 9 +++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 english/water-dreams/pig-farm/love-bacon/pig-friend/pig-friend.md create mode 100644 english/water-dreams/pig-farm/love-bacon/pig-therapy/pig-therapy.md create mode 100644 english/water-dreams/pig-farm/love-bacon/spirit-quest/spirit-quest.md diff --git a/english/water-dreams/pig-farm/love-bacon/love-bacon.md b/english/water-dreams/pig-farm/love-bacon/love-bacon.md index 83a78d9c6d..b2dfca1846 100644 --- a/english/water-dreams/pig-farm/love-bacon/love-bacon.md +++ b/english/water-dreams/pig-farm/love-bacon/love-bacon.md @@ -1,3 +1,10 @@ You take a moment to reflect and realize your psychological state is -more fragile than you thought possible for a pig. You decide to search -for a fellow pig that you can commiserate with... \ No newline at end of file +more fragile than you thought possible for a pig. + +What do you do next? + +[Search for a fellow pig that you can commiserate with](pig-friend/pig-friend.md) + +[Search for a pig therapist](pig-therapist/pig-therapist.md) + +[Go on a spirit quest](spirit-quest/spirit-quest.md) \ No newline at end of file diff --git a/english/water-dreams/pig-farm/love-bacon/pig-friend/pig-friend.md b/english/water-dreams/pig-farm/love-bacon/pig-friend/pig-friend.md new file mode 100644 index 0000000000..c5d43830cd --- /dev/null +++ b/english/water-dreams/pig-farm/love-bacon/pig-friend/pig-friend.md @@ -0,0 +1,11 @@ +You search for another pig, and find one rather swiftly. + +"Hello," you say (in Pig Latin, of course). "Do you like bacon?" + +"Yes, I do," says the other pig, sounding reluctant and full of life regrets. + +"Me too! But we're pigs, so that makes me feel horrible!" you exclaim. + +"Me too!" + +And so, you found a pig friend to commiserate, and were thereby able to slightly lessen the burden of your guilt. \ No newline at end of file diff --git a/english/water-dreams/pig-farm/love-bacon/pig-therapy/pig-therapy.md b/english/water-dreams/pig-farm/love-bacon/pig-therapy/pig-therapy.md new file mode 100644 index 0000000000..b1bdcfdbe4 --- /dev/null +++ b/english/water-dreams/pig-farm/love-bacon/pig-therapy/pig-therapy.md @@ -0,0 +1,13 @@ +You find a pig phonebook, and look for a nearby therapist. + +You are lucky enough to someone nearby who takes your insurance! + +Score! + +You set up your first appointment with Dr. Oinkums, and attend. + +She listens to you speak of your feelings of guilt, particularly + +regarding your love for bacon, now that you are a pig. + +She helps you feel a little bit better about yourself. \ No newline at end of file diff --git a/english/water-dreams/pig-farm/love-bacon/spirit-quest/spirit-quest.md b/english/water-dreams/pig-farm/love-bacon/spirit-quest/spirit-quest.md new file mode 100644 index 0000000000..efe718a1ff --- /dev/null +++ b/english/water-dreams/pig-farm/love-bacon/spirit-quest/spirit-quest.md @@ -0,0 +1,9 @@ +You decide to leave on a grand spirit quest in the desert. + +Wandering for hours, you soon become drunk with thirst and collapse in the sand. + +You hallucinate that you are made of strips of glorious bacon. + +And it horrifies you. + +When you wake up, you realize that you no longer like bacon. \ No newline at end of file From 763f1bbb411c8bdc047717a8b2990662f287c224 Mon Sep 17 00:00:00 2001 From: Alexandra Polubiec Date: Thu, 20 Aug 2015 21:50:51 -0700 Subject: [PATCH 0664/5486] removed deleted lines and fixed broken link --- english/water-dreams/pig-farm/love-bacon/love-bacon.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/water-dreams/pig-farm/love-bacon/love-bacon.md b/english/water-dreams/pig-farm/love-bacon/love-bacon.md index b2dfca1846..f189dbf217 100644 --- a/english/water-dreams/pig-farm/love-bacon/love-bacon.md +++ b/english/water-dreams/pig-farm/love-bacon/love-bacon.md @@ -1,10 +1,11 @@ You take a moment to reflect and realize your psychological state is -more fragile than you thought possible for a pig. +more fragile than you thought possible for a pig. You decide to search +for a fellow pig that you can commiserate with... What do you do next? [Search for a fellow pig that you can commiserate with](pig-friend/pig-friend.md) -[Search for a pig therapist](pig-therapist/pig-therapist.md) +[Search for a pig therapist](pig-therapy/pig-therapy.md) [Go on a spirit quest](spirit-quest/spirit-quest.md) \ No newline at end of file From 53c5b43f0d11bee21d15930b7dafe76c65be8e81 Mon Sep 17 00:00:00 2001 From: kolya154000 Date: Fri, 21 Aug 2015 14:27:31 +0300 Subject: [PATCH 0665/5486] Add option eat-wall in fire.md --- ukrainian/fire/fire.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/fire/fire.md b/ukrainian/fire/fire.md index ae28ae3c52..cc1e2e1518 100644 --- a/ukrainian/fire/fire.md +++ b/ukrainian/fire/fire.md @@ -1,2 +1,2 @@ Смажений зефір чудово пахне, але чи варто його пробувати? Може він не їстівний? -Варто спробувати, мабуть. \ No newline at end of file +[Варто спробувати, мабуть.](../eat-wall/eat-wall.md) \ No newline at end of file From 3cd8dcc0458126c9a60adb9baf59d8c575db13a7 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 21 Aug 2015 14:39:31 +0200 Subject: [PATCH 0666/5486] Add fly away home to lois ending --- .../fly-away-home-to-lois/fly-away-home-to-lois.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/remember-you-are-superman/fly-away-home-to-lois/fly-away-home-to-lois.md diff --git a/english/remember-you-are-superman/fly-away-home-to-lois/fly-away-home-to-lois.md b/english/remember-you-are-superman/fly-away-home-to-lois/fly-away-home-to-lois.md new file mode 100644 index 0000000000..1fcbf4d439 --- /dev/null +++ b/english/remember-you-are-superman/fly-away-home-to-lois/fly-away-home-to-lois.md @@ -0,0 +1,3 @@ +You arrive home covered in molten marshmallow, and a disapproving look from Lois. + +No nookie for superman tonight... \ No newline at end of file From 3477dce2fb556e26156b2ecc7f4c036535ae1d21 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 21 Aug 2015 14:45:20 +0200 Subject: [PATCH 0667/5486] Add link for fly away home to Lois --- english/remember-you-are-superman/remember-you-are-superman.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/remember-you-are-superman/remember-you-are-superman.md b/english/remember-you-are-superman/remember-you-are-superman.md index 66f7b4a3fb..68ca3bc180 100644 --- a/english/remember-you-are-superman/remember-you-are-superman.md +++ b/english/remember-you-are-superman/remember-you-are-superman.md @@ -4,4 +4,4 @@ and i hate marshmallows. heat vision on....marshmallows on fire everywhere ;) -*flys away home to lois* \ No newline at end of file +[fly away home to lois](./fly-away-home-to-lois/fly-away-home-to-lois.md) \ No newline at end of file From ff8ff96e6e1c78cabcdbbe8be3aa4ae96b9d5307 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 21 Aug 2015 14:48:00 +0200 Subject: [PATCH 0668/5486] Re-add line that was deleted. --- english/remember-you-are-superman/remember-you-are-superman.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/remember-you-are-superman/remember-you-are-superman.md b/english/remember-you-are-superman/remember-you-are-superman.md index 68ca3bc180..0060e2830a 100644 --- a/english/remember-you-are-superman/remember-you-are-superman.md +++ b/english/remember-you-are-superman/remember-you-are-superman.md @@ -4,4 +4,5 @@ and i hate marshmallows. heat vision on....marshmallows on fire everywhere ;) +-*flys away home to lois* [fly away home to lois](./fly-away-home-to-lois/fly-away-home-to-lois.md) \ No newline at end of file From e12d7d60a15a84fe6a61f719654f959d8bc0adfb Mon Sep 17 00:00:00 2001 From: David Date: Fri, 21 Aug 2015 14:51:13 +0200 Subject: [PATCH 0669/5486] Edit removed text --- english/remember-you-are-superman/remember-you-are-superman.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/remember-you-are-superman/remember-you-are-superman.md b/english/remember-you-are-superman/remember-you-are-superman.md index 0060e2830a..d524f1c2b7 100644 --- a/english/remember-you-are-superman/remember-you-are-superman.md +++ b/english/remember-you-are-superman/remember-you-are-superman.md @@ -4,5 +4,5 @@ and i hate marshmallows. heat vision on....marshmallows on fire everywhere ;) --*flys away home to lois* +*flys away home to lois* [fly away home to lois](./fly-away-home-to-lois/fly-away-home-to-lois.md) \ No newline at end of file From bed97c6031b8abbea5d54ed9ad7960ec9461dcd4 Mon Sep 17 00:00:00 2001 From: emozart Date: Fri, 21 Aug 2015 15:00:26 -0300 Subject: [PATCH 0670/5486] =?UTF-8?q?Minha=20parte=20da=20hist=C3=B3ria?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../diff/pull/reenvio/watch/divulga/colaborador/colaborador.md | 2 ++ .../pull/reenvio/watch/divulga/colaborador/colaborador.md~ | 0 .../comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md | 3 +++ .../diff/pull/reenvio/watch/divulga/instrutor/instrutor.md | 2 ++ .../diff/pull/reenvio/watch/divulga/instrutor/instrutor.md~ | 0 5 files changed, 7 insertions(+) create mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md create mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md~ create mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md create mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md~ diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md new file mode 100644 index 0000000000..88b6b25487 --- /dev/null +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md @@ -0,0 +1,2 @@ +Você continua atuando apenas como colaborador no projeto. Por causa da sua boa contribuição +aparecem convites para ajudar em outros projetos: diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md~ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md~ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md index c84bc11c40..c340427771 100644 --- a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md @@ -1,3 +1,6 @@ Com o passar do tempo e aumento de sua reputação na comunidade open source, você foi chamado para participar em eventos de TI para realizar treinamentos de Git e GitHub: +[Você aceita atuar como instrutor em treinamentos Git e GitHub](instrutor/instrutor.md) + +[Você recusa a proposta e segue apenas como colaborador](colaborador/colaborador.md) diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md new file mode 100644 index 0000000000..f571726e25 --- /dev/null +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md @@ -0,0 +1,2 @@ +Você desenvolve um curso de Git e GitHub a passa a ganhar uma boa grana com +o novo trabalho: diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md~ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md~ new file mode 100644 index 0000000000..e69de29bb2 From 320479c7cfe9399ccda61d4f6b80b349de736f56 Mon Sep 17 00:00:00 2001 From: emozart Date: Fri, 21 Aug 2015 15:53:53 -0300 Subject: [PATCH 0671/5486] =?UTF-8?q?remove=20diret=C3=B3rio=20(../divulga?= =?UTF-8?q?/colaborador/)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../diff/pull/reenvio/watch/divulga/colaborador/colaborador.md | 2 -- .../diff/pull/reenvio/watch/divulga/colaborador/colaborador.md~ | 0 2 files changed, 2 deletions(-) delete mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md delete mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md~ diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md deleted file mode 100644 index 88b6b25487..0000000000 --- a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md +++ /dev/null @@ -1,2 +0,0 @@ -Você continua atuando apenas como colaborador no projeto. Por causa da sua boa contribuição -aparecem convites para ajudar em outros projetos: diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md~ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md~ deleted file mode 100644 index e69de29bb2..0000000000 From 09788829a11e400fa02641a646603448b888a17d Mon Sep 17 00:00:00 2001 From: emozart Date: Fri, 21 Aug 2015 16:14:57 -0300 Subject: [PATCH 0672/5486] =?UTF-8?q?Cria=20novamente=20o=20diret=C3=B3rio?= =?UTF-8?q?=20(..divulga/colaborador/)=20e=20remove=20arquivos=20.md~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../diff/pull/reenvio/watch/divulga/colaborador/colaborador.md | 2 ++ .../diff/pull/reenvio/watch/divulga/instrutor/instrutor.md~ | 0 2 files changed, 2 insertions(+) create mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md delete mode 100644 portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md~ diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md new file mode 100644 index 0000000000..3398773916 --- /dev/null +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md @@ -0,0 +1,2 @@ +Você segue apenas como colaborador. Como sua ajuda passa a ser de grande valor +você recebe convites para atuar em outros projetos: diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md~ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md~ deleted file mode 100644 index e69de29bb2..0000000000 From bb78425c231f49a76febe50d5b968dba8a7b3863 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Fri, 21 Aug 2015 16:18:51 -0400 Subject: [PATCH 0673/5486] Attempt to remove .DS_Store files and top-level lamping.md file --- lamping.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 lamping.md diff --git a/lamping.md b/lamping.md deleted file mode 100644 index 40254c944a..0000000000 --- a/lamping.md +++ /dev/null @@ -1,2 +0,0 @@ -As you begin to scroll through your feed on IG and using your -super-retweeting abilities, the realities of the universe fade... From d0335f40d772190b1370f296236fce6702a284ad Mon Sep 17 00:00:00 2001 From: Jennifer VB Date: Fri, 21 Aug 2015 19:24:55 -0400 Subject: [PATCH 0674/5486] Fix typos and line breaks --- english/marshmallow.md | 45 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 45e967dc38..dd11947b20 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -7,9 +7,7 @@ One morning, you wake up in a strange room with marshmallows for walls. A sound from a Hitchcock movie fills the room, then quickly fades away. Thinking back, there are no memories to suggest that this should have been - anything but an ordinary morning. You didn't go out last night, you don't - usually take intoxicants, what's happening...? But it's probably not worth dwelling on that right now, you could be in danger. @@ -22,11 +20,11 @@ The type of extreme mortal danger that so often accompanies confectionary inspir Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. -[pinch yourself to see if this is a dream](./is-this-a-dream/is-this-a-dream.md) +[Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) -[remember that you are superman](./remember-you-are-superman/remember-you-are-superman.md) +[Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) -[Interrogate the man for clues](./movie-ripoffs/zoolander/zoolander.md) +[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) These marshmallows are numerous and they look so delicious. ... despite the feeling they're somehow judging you for only wearing one sock. @@ -35,13 +33,13 @@ You reach out to grab a handful of the marshmallow wall, but you can't seem to t You also seem to be wearing an uncomfortable and restrictive jacket made of leather... -[You decide to bite the marshmallow wall](./bite-the-marshmallow/tasty-marshmallow.md) +[You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) You are feeling very anxious at this point. This is because you do not like leather for ethical reasons. -You begin to breakout of the jacket and find a lighter, a fork, and rope. +You begin to break out of the jacket and find a lighter, a fork, and rope. You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. @@ -55,13 +53,13 @@ You decide to try to light a fire to melt some of the marshmallows so you look f You have the suspicion that you are being closely watched. -[Of course, it's that man on the sofa, go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) +[Of course, it's that man on the sofa; go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) [Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) You see a polar bear searching for food. -"Well- OK" you admit to yourself, "Perhaps I do indulge in the occasional intoxicant!" +"Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" You hear a small bird sound in the distance. @@ -83,7 +81,7 @@ Marshmallows are going to rule the world! Long live marshmallows! -Hold the image of the marshmallow and.. +Hold the image of the marshmallow and... Sing softly the song of it's people as you... @@ -105,7 +103,7 @@ Nothing seems to be happening. Sheepishly you look down on the crappy wand in your hand. -You must be doing something wrong, you drink a beer and think about it, then Ah-ha! +You must be doing something wrong. You drink a beer and think about it, then Ah-ha! You notice your pants are now glowing, so you must have been holding the wand upside down. @@ -161,13 +159,13 @@ Do you: [Grab the lighter first?](lighter/grab-lighter.md) -[make a swing with rope and jacket](enjoy-DreamRide/ride.md) +[Make a swing with rope and jacket](enjoy-DreamRide/ride.md) [Start eating the walls?](eating-walls/eating-marshmallows.md) -[give the marshmallow to the polar bear?](polar-bear/polar-bear.md) +[Give the marshmallow to the polar bear?](polar-bear/polar-bear.md) -[realize you are in Minecraft](you-are-in-minecraft/minecraft.md) +[Realize you are in Minecraft](you-are-in-minecraft/minecraft.md) [Try to pull a MacGyver with the lighter, fork and rope?](macgyver/macgyver.md) @@ -179,7 +177,7 @@ Do you: [Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) -[dig a hole with your bare hands?](hands/hands.md) +[Dig a hole with your bare hands?](hands/hands.md) [Go back to sleep?](sleep/marshmallow.md) @@ -213,7 +211,7 @@ Do you: [Go meditate and ponder about your next step?](meditate/meditate.md) -[U will scream out of fear?](scream/scream.md) +[Scream out of fear?](scream/scream.md) [Get to work on the best batch of cookies ever made?](bake-cookies/cookies.md) @@ -239,13 +237,13 @@ Do you: [Remember that pill you took](adipose/adipose.md) -[light up the wall](light-up/light-up.md) +[Light up the wall](light-up/light-up.md) -[hide the lighter fork and rope in your pocket](hide/hide-chk.md) +[Hide the lighter fork and rope in your pocket](hide/hide-chk.md) -[make a necklace out of the marshmallows](necklace/necklace.md) +[Make a necklace out of the marshmallows](necklace/necklace.md) -[light up the wall 2](light-up2/light-up2.md) +[Light up the wall 2](light-up2/light-up2.md) [Switch on your laptop and..](netflix/netflix.md) @@ -321,7 +319,7 @@ Do you: [Make a Marshmallow cake](https://www.youtube.com/watch?v=3l1SY3QREv4) -[I'm batman](I'm-batman/batman.md) +[I'm Batman](I'm-batman/batman.md) [You realize you are in NeverLand and you are never going come... so you sing the Tinker Bell song](https://youtu.be/Sopngy6uucw) @@ -350,7 +348,7 @@ Do you: [Twas the Night Before Christmas](night-night/tale.md) -[heck Reddit for any useful information.](reddit/ask-reddit.md) +[Check Reddit for any useful information.](reddit/ask-reddit.md) [Watch Up](watch-movie/Up.md) @@ -378,7 +376,7 @@ Do you: [Ask a question on Quora?](ask-on-quora/ask-on-quora.md) -[go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) +[Go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) [Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) @@ -391,6 +389,7 @@ Do you: [You Google what to do](https://www.google.co.in/) [Abdul kalam quotes on overcoming fear](apj/apj.md) + [If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) [There's no such thing as a free lunch.](free-lunch/free-lunch.md) From 206408195191f061f78d43e34a5275e845a597c7 Mon Sep 17 00:00:00 2001 From: Jennifer VB Date: Fri, 21 Aug 2015 19:30:04 -0400 Subject: [PATCH 0675/5486] Fix line breaks --- english/pick-up-blowtorch/blowtorch.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/pick-up-blowtorch/blowtorch.md b/english/pick-up-blowtorch/blowtorch.md index 4c800a3b5a..453add3ec5 100644 --- a/english/pick-up-blowtorch/blowtorch.md +++ b/english/pick-up-blowtorch/blowtorch.md @@ -5,14 +5,12 @@ You also notice that there is a giant graham cracker and Hershey's chocolate bar "Let's do this thing," you say to yourself as you turn on the blowtorch. As you carve though the walls like a hot knife through butter, - you throw an enormous slab of marshmallow on a graham cracker. You're actually enjoying this, you think to yourself. Eventually, you're supporting (and eating) a 25 lbs smores in one hand, burning your way to freedom with the other when - you break into the next cavern only to see a 200 ft Stay Puft Marmallow Man turn who rumbles: "Who disturbs my slumber?" From 5c888f0076adf2d2d034c6d6e5225b660514a05f Mon Sep 17 00:00:00 2001 From: Jennifer VB Date: Fri, 21 Aug 2015 19:36:45 -0400 Subject: [PATCH 0676/5486] Add shoulder-check link --- .../journey-to-flaming-tower/start-running/start-running.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/explore-outside/journey-to-flaming-tower/start-running/start-running.md b/english/explore-outside/journey-to-flaming-tower/start-running/start-running.md index e83c9784df..e94059cb97 100644 --- a/english/explore-outside/journey-to-flaming-tower/start-running/start-running.md +++ b/english/explore-outside/journey-to-flaming-tower/start-running/start-running.md @@ -6,4 +6,7 @@ Do you: [Keep running toward the tower](keep-running/keep-running.md) -[Turn and confront the presence chasing after you](confront/confront.md) \ No newline at end of file +[Turn and confront the presence chasing after you](confront/confront.md) + +[Throw yourself backward to check your pursuer with your +shoulder](shoulder-check/shoulder-check.md) From 3185ae1be0e90cb93bb2623b4957efc9a66d009e Mon Sep 17 00:00:00 2001 From: Jennifer VB Date: Fri, 21 Aug 2015 19:40:08 -0400 Subject: [PATCH 0677/5486] Add shoulder-check.md --- .../journey-to-flaming-tower/shoulder-check/shoulder-check.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/explore-outside/journey-to-flaming-tower/shoulder-check/shoulder-check.md diff --git a/english/explore-outside/journey-to-flaming-tower/shoulder-check/shoulder-check.md b/english/explore-outside/journey-to-flaming-tower/shoulder-check/shoulder-check.md new file mode 100644 index 0000000000..ca75bf9110 --- /dev/null +++ b/english/explore-outside/journey-to-flaming-tower/shoulder-check/shoulder-check.md @@ -0,0 +1,4 @@ +Bracing yourself for the impact, you quickly reverse your momentum, throwing +your right shoulder back towards whatever is pursuing you. As you collide with +the pursuer, you find yourself suddenly grateful for all those times your older +sister did this to you when hiking just ahead of you on a trail. From deb6661fefddfc038989e3e32ddf4be7cd53c83d Mon Sep 17 00:00:00 2001 From: Jennifer VB Date: Fri, 21 Aug 2015 19:42:59 -0400 Subject: [PATCH 0678/5486] Add punchline --- .../shoulder-check/shoulder-check.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/english/explore-outside/journey-to-flaming-tower/shoulder-check/shoulder-check.md b/english/explore-outside/journey-to-flaming-tower/shoulder-check/shoulder-check.md index ca75bf9110..60582cbb86 100644 --- a/english/explore-outside/journey-to-flaming-tower/shoulder-check/shoulder-check.md +++ b/english/explore-outside/journey-to-flaming-tower/shoulder-check/shoulder-check.md @@ -1,4 +1,9 @@ Bracing yourself for the impact, you quickly reverse your momentum, throwing your right shoulder back towards whatever is pursuing you. As you collide with the pursuer, you find yourself suddenly grateful for all those times your older -sister did this to you when hiking just ahead of you on a trail. +sister did this to you when hiking just ahead of you on a trail. Shards of +gingerbread fly past you as your shoulder shatters the cookie creature. Its head +whirls through the air, a frown on its face. + +Its last words before it breaks upon the rock-candy ground are, "I can't catch +you, I'm the Gingerbread Man. From cf7d039fd5f80d77d715577177074d4696cc5825 Mon Sep 17 00:00:00 2001 From: Ryan Quanz Date: Fri, 21 Aug 2015 19:54:07 -0400 Subject: [PATCH 0679/5486] Add udacity option and file --- english/marshmallow.md | 2 ++ english/udacity/udacity.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/udacity/udacity.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 45e967dc38..59b1aaf7c6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -436,3 +436,5 @@ Do you: [Summon Dragons of the Khaleesi](dragons/fire-everywhere.md) [Bounce](bounce/bounce.md) + +[See if there is a Udacity course on the subject](udacity/udacity.md) diff --git a/english/udacity/udacity.md b/english/udacity/udacity.md new file mode 100644 index 0000000000..a923e47a32 --- /dev/null +++ b/english/udacity/udacity.md @@ -0,0 +1 @@ +Alas, there is not, you're stuck. Get Caroline on it! \ No newline at end of file From e6d5209c9da8c60ec222a4e6101fb29789f841de Mon Sep 17 00:00:00 2001 From: Marius Date: Sat, 22 Aug 2015 01:34:22 +0100 Subject: [PATCH 0680/5486] Add "asta inseamna sa fii mafiot" meme into the story --- romanian/nalba.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/romanian/nalba.md b/romanian/nalba.md index 269f342cf0..1775edc080 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -60,3 +60,5 @@ sau... [sa nu beau](potiune_fermecata/nu_beau/nu_beau.md)? +Bineinteles ca o sa bea. Ginel stia ca asta inseamna sa fii mafiot la urma urmei (bautura si femei). + From 071a2ec1855bfe6f4e1024380e432b9fe5ff5a75 Mon Sep 17 00:00:00 2001 From: Volant360 Date: Fri, 21 Aug 2015 19:48:18 -0600 Subject: [PATCH 0681/5486] =?UTF-8?q?Peque=C3=B1as=20modificaciones=20en?= =?UTF-8?q?=20espanol/noticias/noticias.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/noticias/noticias.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/espanol/noticias/noticias.md b/espanol/noticias/noticias.md index 06b56c3b7e..0d14e791d0 100644 --- a/espanol/noticias/noticias.md +++ b/espanol/noticias/noticias.md @@ -1,5 +1,5 @@ -El periodista miope entró, se tropezó y estornudó. Al Consejero le dieron ganas de rezar por esa -alma que tenia al frente. +El periodista miope entró tropezando y estornudando estruendosamente. Al Consejero le dieron ganas de rezar por +esa pobre alma que tenia frente a sus ojos. Enseguida, Beatito: [Pregunta al periodista ¿que noticias nos traes?](pregunta-periodista/pregunta-periodista.md) From 3060c518b195faf3b0206b102befae5a8ecdb499 Mon Sep 17 00:00:00 2001 From: Volant360 Date: Fri, 21 Aug 2015 19:50:08 -0600 Subject: [PATCH 0682/5486] =?UTF-8?q?Peque=C3=B1o=20error=20de=20ortografi?= =?UTF-8?q?a=20arreglado.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/noticias/noticias.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/noticias/noticias.md b/espanol/noticias/noticias.md index 0d14e791d0..0b84acde8a 100644 --- a/espanol/noticias/noticias.md +++ b/espanol/noticias/noticias.md @@ -8,4 +8,4 @@ Enseguida, Beatito: [Se burla del periodista](burla-periodista/burla-periodista.md) -[le comenta al periodista que necessita anteojos](anteojos/anteojos.md) \ No newline at end of file +[le comenta al periodista que necesita anteojos](anteojos/anteojos.md) \ No newline at end of file From 31e70290d4cd6a0ca8cc85d707e57cee9334e2b5 Mon Sep 17 00:00:00 2001 From: Volant360 Date: Fri, 21 Aug 2015 19:51:41 -0600 Subject: [PATCH 0683/5486] Modificaciones textuales a espanol/noticias/anteojos/anteojos.md --- espanol/noticias/anteojos/anteojos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/noticias/anteojos/anteojos.md b/espanol/noticias/anteojos/anteojos.md index 76fbb0eddd..796351838c 100644 --- a/espanol/noticias/anteojos/anteojos.md +++ b/espanol/noticias/anteojos/anteojos.md @@ -1,4 +1,4 @@ -Una vez que mencione que necessita anteojos el periodista dice que nunca ha tenido problema sin ellos. +Una vez que mencione que necesita anteojos, el periodista, indignado, replica que ha tenido problema para ver sin ellos. ensequida: From 13db04af3726b81e96daa6446844b681cca0cbd2 Mon Sep 17 00:00:00 2001 From: Volant360 Date: Fri, 21 Aug 2015 20:00:59 -0600 Subject: [PATCH 0684/5486] Reset to original format --- espanol/noticias/anteojos/anteojos.md | 2 +- espanol/noticias/noticias.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/espanol/noticias/anteojos/anteojos.md b/espanol/noticias/anteojos/anteojos.md index 796351838c..76fbb0eddd 100644 --- a/espanol/noticias/anteojos/anteojos.md +++ b/espanol/noticias/anteojos/anteojos.md @@ -1,4 +1,4 @@ -Una vez que mencione que necesita anteojos, el periodista, indignado, replica que ha tenido problema para ver sin ellos. +Una vez que mencione que necessita anteojos el periodista dice que nunca ha tenido problema sin ellos. ensequida: diff --git a/espanol/noticias/noticias.md b/espanol/noticias/noticias.md index 0b84acde8a..06b56c3b7e 100644 --- a/espanol/noticias/noticias.md +++ b/espanol/noticias/noticias.md @@ -1,5 +1,5 @@ -El periodista miope entró tropezando y estornudando estruendosamente. Al Consejero le dieron ganas de rezar por -esa pobre alma que tenia frente a sus ojos. +El periodista miope entró, se tropezó y estornudó. Al Consejero le dieron ganas de rezar por esa +alma que tenia al frente. Enseguida, Beatito: [Pregunta al periodista ¿que noticias nos traes?](pregunta-periodista/pregunta-periodista.md) @@ -8,4 +8,4 @@ Enseguida, Beatito: [Se burla del periodista](burla-periodista/burla-periodista.md) -[le comenta al periodista que necesita anteojos](anteojos/anteojos.md) \ No newline at end of file +[le comenta al periodista que necessita anteojos](anteojos/anteojos.md) \ No newline at end of file From e7a34cc2b6249313bb1c05772aa40d54d8f6e348 Mon Sep 17 00:00:00 2001 From: Volant360 Date: Fri, 21 Aug 2015 20:02:37 -0600 Subject: [PATCH 0685/5486] Unas cuantas lineas agregadas a espanol/noticias/anteojos/anteojos.md --- espanol/noticias/anteojos/anteojos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/noticias/anteojos/anteojos.md b/espanol/noticias/anteojos/anteojos.md index 76fbb0eddd..309605e5dd 100644 --- a/espanol/noticias/anteojos/anteojos.md +++ b/espanol/noticias/anteojos/anteojos.md @@ -1,4 +1,6 @@ -Una vez que mencione que necessita anteojos el periodista dice que nunca ha tenido problema sin ellos. +Una vez que mencione que necessita anteojos el periodista dice que nunca ha tenido problema sin ellos. +Sin embargo, inmediatamente despues se tropieza con un cubito de hielo que claramente no vio, asi que +Beatito ensequida: From 09bc283bf3d5a50cb0bd9487d6f79d78ea5c5140 Mon Sep 17 00:00:00 2001 From: Volant360 Date: Fri, 21 Aug 2015 20:06:22 -0600 Subject: [PATCH 0686/5486] Fixed line issue --- espanol/noticias/anteojos/anteojos.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/espanol/noticias/anteojos/anteojos.md b/espanol/noticias/anteojos/anteojos.md index 309605e5dd..47ec8e18d3 100644 --- a/espanol/noticias/anteojos/anteojos.md +++ b/espanol/noticias/anteojos/anteojos.md @@ -1,7 +1,6 @@ -Una vez que mencione que necessita anteojos el periodista dice que nunca ha tenido problema sin ellos. +Una vez que mencione que necessita anteojos el periodista dice que nunca ha tenido problema sin ellos. Sin embargo, inmediatamente despues se tropieza con un cubito de hielo que claramente no vio, asi que Beatito - ensequida: [Se burla del periodista](../burla-periodista/burla-periodista.md) \ No newline at end of file From 27422281e403e568bc1545dc59b55cf829fd4754 Mon Sep 17 00:00:00 2001 From: Volant360 Date: Fri, 21 Aug 2015 20:07:33 -0600 Subject: [PATCH 0687/5486] Space added --- espanol/noticias/anteojos/anteojos.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/noticias/anteojos/anteojos.md b/espanol/noticias/anteojos/anteojos.md index 47ec8e18d3..23c4641826 100644 --- a/espanol/noticias/anteojos/anteojos.md +++ b/espanol/noticias/anteojos/anteojos.md @@ -1,4 +1,5 @@ Una vez que mencione que necessita anteojos el periodista dice que nunca ha tenido problema sin ellos. + Sin embargo, inmediatamente despues se tropieza con un cubito de hielo que claramente no vio, asi que Beatito ensequida: From 0e4ebf890cd6c8c94abc185e4df348a8a6669b0b Mon Sep 17 00:00:00 2001 From: Mikhail Date: Sat, 22 Aug 2015 13:37:17 +0300 Subject: [PATCH 0688/5486] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D1=85=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- russian/awaken/awaken.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/awaken/awaken.md b/russian/awaken/awaken.md index cf2e83bd80..56bb9ece53 100644 --- a/russian/awaken/awaken.md +++ b/russian/awaken/awaken.md @@ -1,5 +1,5 @@ Проснувшись вы осознали, что это не более чем сон. [Подняться с кровати?](stand-up/stand-up.md) - +[Понять, что реальность гораздо скучнее, и вернуться ко сну](../sleep/zefir.md) [Why am I speaking russian?](../../english/marshmallow.md) \ No newline at end of file From 11a8b291673c0557d2ef60d912e6dd7f0caf1c61 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Sat, 22 Aug 2015 13:39:23 +0300 Subject: [PATCH 0689/5486] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D1=85=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- russian/awaken/awaken.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/awaken/awaken.md b/russian/awaken/awaken.md index 56bb9ece53..88f0085bf7 100644 --- a/russian/awaken/awaken.md +++ b/russian/awaken/awaken.md @@ -1,5 +1,7 @@ Проснувшись вы осознали, что это не более чем сон. [Подняться с кровати?](stand-up/stand-up.md) + [Понять, что реальность гораздо скучнее, и вернуться ко сну](../sleep/zefir.md) + [Why am I speaking russian?](../../english/marshmallow.md) \ No newline at end of file From 654744342822e49ad43c16d4626a8517112540ab Mon Sep 17 00:00:00 2001 From: Andrea Bosco Date: Sat, 22 Aug 2015 14:34:41 +0200 Subject: [PATCH 0690/5486] Aggiunta ricerca torcia --- .../prendere-il-libro/porta/cerchi-torcia/cerchi-torcia.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Italian/guardare/libri-francesi/prendere-il-libro/porta/cerchi-torcia/cerchi-torcia.md diff --git a/Italian/guardare/libri-francesi/prendere-il-libro/porta/cerchi-torcia/cerchi-torcia.md b/Italian/guardare/libri-francesi/prendere-il-libro/porta/cerchi-torcia/cerchi-torcia.md new file mode 100644 index 0000000000..5b67d8930b --- /dev/null +++ b/Italian/guardare/libri-francesi/prendere-il-libro/porta/cerchi-torcia/cerchi-torcia.md @@ -0,0 +1 @@ +Non trovi di meglio che una vecchia candela in un cassetto, ma niente con cui accenderla. From 9d27f20c151f304d2c0f569c843a2a3eaa12417b Mon Sep 17 00:00:00 2001 From: Andrea Bosco Date: Sat, 22 Aug 2015 14:36:56 +0200 Subject: [PATCH 0691/5486] aggiunta opzione cerchi-torcia a porta.md --- .../prendere-il-libro/porta/.DS_Store | Bin 0 -> 6148 bytes .../prendere-il-libro/porta/porta.md | 1 + 2 files changed, 1 insertion(+) create mode 100644 Italian/guardare/libri-francesi/prendere-il-libro/porta/.DS_Store diff --git a/Italian/guardare/libri-francesi/prendere-il-libro/porta/.DS_Store b/Italian/guardare/libri-francesi/prendere-il-libro/porta/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d828214fcff1f47ca40a1fd26f89e8527312c62a GIT binary patch literal 6148 zcmeHKyGjH>5Ukb<4n(-naDKqRKNybl3;Y3fPf$2mP%q!e@AA{Eek99kb|yzP^wdmG zS1((^_BH_99`|>^2Edx`h%aB3=J)OkyQqi}>8$aJH{9YABi%?xo*W zfE1W3aGA%A_y2qPAM^j5q>~ho0%xUwt#%K)Enlg6>*D3S*Eaei-E+R_ZrlfjOSEHR jv|}E;9p6M!<~85*z86l3L1#SZMEwl7E;1?b-wONyVIvk^ literal 0 HcmV?d00001 diff --git a/Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md b/Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md index a548f724d6..18eb28069b 100644 --- a/Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md +++ b/Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md @@ -7,3 +7,4 @@ Decidi sia meglio trovare una torcia elettrica o una candela prima d'avventurarsi. [Chiudi la porta e torni ad osservare la stanza](../../libri-francesi.md) +[Cerchi una torcia elettrica] (cerchi-torcia/cerchi-torcia.md) From 6d3419642b5ea38fbd5a987e7e21b7281abfe319 Mon Sep 17 00:00:00 2001 From: Andrea Bosco Date: Sat, 22 Aug 2015 14:42:13 +0200 Subject: [PATCH 0692/5486] Sistemato link a capo --- Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md b/Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md index 18eb28069b..3012b3c42c 100644 --- a/Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md +++ b/Italian/guardare/libri-francesi/prendere-il-libro/porta/porta.md @@ -7,4 +7,5 @@ Decidi sia meglio trovare una torcia elettrica o una candela prima d'avventurarsi. [Chiudi la porta e torni ad osservare la stanza](../../libri-francesi.md) + [Cerchi una torcia elettrica] (cerchi-torcia/cerchi-torcia.md) From 1f92e12eca7fd8c4021a7c378ad5e418c6690aa6 Mon Sep 17 00:00:00 2001 From: Guillermo Veneranda Date: Sat, 22 Aug 2015 17:28:38 -0300 Subject: [PATCH 0693/5486] El periodista se tropieza otra vez --- espanol/noticias/burla-periodista/burla-periodista.md | 4 +++- espanol/noticias/burla-periodista/tropezar/tropezar.md | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 espanol/noticias/burla-periodista/tropezar/tropezar.md diff --git a/espanol/noticias/burla-periodista/burla-periodista.md b/espanol/noticias/burla-periodista/burla-periodista.md index 3187d7c229..6965aa0c37 100644 --- a/espanol/noticias/burla-periodista/burla-periodista.md +++ b/espanol/noticias/burla-periodista/burla-periodista.md @@ -1,3 +1,5 @@ El periodista se puso rojo, y se lanzo violentamente contra Beatito. -[Inmediatamente el consejero suelta los leones](leones/leones.md) \ No newline at end of file +[Inmediatamente el consejero suelta los leones](leones/leones.md) + +[Pero volvió a tropezar](tropezar/tropezar.md) \ No newline at end of file diff --git a/espanol/noticias/burla-periodista/tropezar/tropezar.md b/espanol/noticias/burla-periodista/tropezar/tropezar.md new file mode 100644 index 0000000000..4362369f3c --- /dev/null +++ b/espanol/noticias/burla-periodista/tropezar/tropezar.md @@ -0,0 +1,2 @@ +Y con mas envión que antes y sin estornudo que lo detenga, esta vez el periodista +dio dos tumbos en el piso para luego aterrizar de pera a los pies de Beatito. From 64125eca69eb94bc3cf3a2a92d673df7b0594451 Mon Sep 17 00:00:00 2001 From: Sandeep Mallareddy Date: Sun, 23 Aug 2015 04:03:55 +0530 Subject: [PATCH 0694/5486] add bake cookies story --- english/bake-cookies/cookies.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/bake-cookies/cookies.md b/english/bake-cookies/cookies.md index 233e925086..146eea0d93 100644 --- a/english/bake-cookies/cookies.md +++ b/english/bake-cookies/cookies.md @@ -15,4 +15,6 @@ Do you: [Make coffee first?](../coffee/coffee.md) -[Breathe?](../yoga/breathe/breathe.md) \ No newline at end of file +[Breathe?](../yoga/breathe/breathe.md) + +[Want to get high?](../weed/weed.md) \ No newline at end of file From ade22cdcc7efa270988e093ac8bf71032e1f4d1f Mon Sep 17 00:00:00 2001 From: Sandeep Mallareddy Date: Sun, 23 Aug 2015 04:04:38 +0530 Subject: [PATCH 0695/5486] add weed story --- english/weed/weed.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/weed/weed.md diff --git a/english/weed/weed.md b/english/weed/weed.md new file mode 100644 index 0000000000..6091d48d7f --- /dev/null +++ b/english/weed/weed.md @@ -0,0 +1,2 @@ +well weed contains THC which will make you high. To get it out and add to your cookies, use a fat to extract it. +Butter, Milk, cream can be used. But the weed in the fat in a pan and add weed. Heat it for 30 minutes. Add it to your cookie dough and bake them. See you - Love Pink Unicorn \ No newline at end of file From 2ca9f1bc09515021dd32dc5de049b7b660ded9f4 Mon Sep 17 00:00:00 2001 From: Joshua Date: Sun, 23 Aug 2015 12:47:47 +0800 Subject: [PATCH 0696/5486] Include link to Caroline's page --- english/udacity/udacity.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/udacity/udacity.md b/english/udacity/udacity.md index a923e47a32..d6b2248fdb 100644 --- a/english/udacity/udacity.md +++ b/english/udacity/udacity.md @@ -1 +1,3 @@ -Alas, there is not, you're stuck. Get Caroline on it! \ No newline at end of file +Alas, there is not, you're stuck. Get Caroline on it! + +Click [here](https://github.com/cbuckey-uda) to visit Caroline's github page! \ No newline at end of file From 21b347b847a12ea1657c84cab2c5f8ad377af651 Mon Sep 17 00:00:00 2001 From: damoscal Date: Sun, 23 Aug 2015 01:10:56 -0700 Subject: [PATCH 0697/5486] Change Story: Leak --- english/marshmallow.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 59b1aaf7c6..11d30da620 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -109,6 +109,11 @@ You must be doing something wrong, you drink a beer and think about it, then Ah- You notice your pants are now glowing, so you must have been holding the wand upside down. +Suddenly, you become aware of the need to take a leak. You look around for a restroom. + +You can't hold it. You wonder, Are glowing pants waterproof? You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) + + Do you: [Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) From 039378cb15e25569e9508995c76695604bb62856 Mon Sep 17 00:00:00 2001 From: damoscal Date: Sun, 23 Aug 2015 01:22:28 -0700 Subject: [PATCH 0698/5486] Make shorter lines --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 11d30da620..62ae469800 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -111,7 +111,8 @@ You notice your pants are now glowing, so you must have been holding the wand up Suddenly, you become aware of the need to take a leak. You look around for a restroom. -You can't hold it. You wonder, Are glowing pants waterproof? You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) +You can't hold it. You wonder, Are glowing pants waterproof? +You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: From 5f409d8813d9766582b8906079c56314664f5160 Mon Sep 17 00:00:00 2001 From: damoscal Date: Sun, 23 Aug 2015 01:31:05 -0700 Subject: [PATCH 0699/5486] Remove redundant reference to restroom --- english/marshmallow.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 62ae469800..c638ec1bfe 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -109,8 +109,7 @@ You must be doing something wrong, you drink a beer and think about it, then Ah- You notice your pants are now glowing, so you must have been holding the wand upside down. -Suddenly, you become aware of the need to take a leak. You look around for a restroom. - +Suddenly, you become aware of the need to take a leak. You can't hold it. You wonder, Are glowing pants waterproof? You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) From dc12bf1a3878b451fe9a45563c7baf9043888c15 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 23 Aug 2015 18:35:50 +0100 Subject: [PATCH 0700/5486] Fixed line char limits for meaning route. --- english/meaning/meaning.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/english/meaning/meaning.md b/english/meaning/meaning.md index a95459617c..2db278b9e7 100644 --- a/english/meaning/meaning.md +++ b/english/meaning/meaning.md @@ -1,4 +1,11 @@ -You pause for a moment and stare up at the sky, ignoring the marshmallows or whatever junk is going on below you. Your moment of reflection ends suddenly when you realise you are in fact sitting at your computer reading this story. However, you are still confused as to what you just read and you go on to wonder where this story will take you next. +You pause for a moment and stare up at the sky, +ignoring the marshmallows or whatever junk is going on below you. + +Your moment of reflection ends suddenly when you realise you +are in fact sitting at your computer reading this story. + +However, you are still confused as to what you just read +and you go on to wonder where this story will take you next. It turns out this particular author is lazy and the story ends. From 78fb613dcca9a09778f01f0c8aad257b3d112230 Mon Sep 17 00:00:00 2001 From: Salas Saraiya Date: Sun, 23 Aug 2015 14:18:53 -0400 Subject: [PATCH 0701/5486] Add hammertime to flying choices --- english/super-powers/practice-flying.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/super-powers/practice-flying.md b/english/super-powers/practice-flying.md index 73cdbc950f..32ea0bc23d 100644 --- a/english/super-powers/practice-flying.md +++ b/english/super-powers/practice-flying.md @@ -15,5 +15,5 @@ You've just made the leap... Do you: [Soar through the air?](../soar/soar.md) - +[Dance, dance for elevation?](../hammertime/hammertime.md) [Plummet like a rock?](../plummet/plummet.md) \ No newline at end of file From a1acb9fdd3850fafda5da8c1b22a99226b4d43dc Mon Sep 17 00:00:00 2001 From: Salas Saraiya Date: Sun, 23 Aug 2015 14:20:35 -0400 Subject: [PATCH 0702/5486] Space choices out --- english/super-powers/practice-flying.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/super-powers/practice-flying.md b/english/super-powers/practice-flying.md index 32ea0bc23d..830b3f5cdc 100644 --- a/english/super-powers/practice-flying.md +++ b/english/super-powers/practice-flying.md @@ -15,5 +15,7 @@ You've just made the leap... Do you: [Soar through the air?](../soar/soar.md) + +[Plummet like a rock?](../plummet/plummet.md) + [Dance, dance for elevation?](../hammertime/hammertime.md) -[Plummet like a rock?](../plummet/plummet.md) \ No newline at end of file From edb320c1b3aa5c56d5c38caa1f08b186a10fab89 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 23 Aug 2015 13:48:44 -0500 Subject: [PATCH 0703/5486] Add new entry about going back to sleep --- english/go-back-to-sleep/go-back-to-sleep.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/go-back-to-sleep/go-back-to-sleep.md diff --git a/english/go-back-to-sleep/go-back-to-sleep.md b/english/go-back-to-sleep/go-back-to-sleep.md new file mode 100644 index 0000000000..687c928a36 --- /dev/null +++ b/english/go-back-to-sleep/go-back-to-sleep.md @@ -0,0 +1 @@ +You roll over, let your eyes close shut, and drift off into [dreamland](../dream/dream.md) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5716006780..9d68355ff2 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -4,6 +4,8 @@ One morning, you wake up in a strange room with marshmallows for walls. *(Must be a Tuesday.)* +For a second, you decide whether or not to just [go back to sleep](go-back-to-sleep/go-back-to-sleep.md) + A sound from a Hitchcock movie fills the room, then quickly fades away. Thinking back, there are no memories to suggest that this should have been From 8713e70d63dbc30b8b346faa6f191b0bf7082d4b Mon Sep 17 00:00:00 2001 From: Greg Bullmer Date: Mon, 24 Aug 2015 00:46:28 -0500 Subject: [PATCH 0704/5486] feat: Add grue page and linked references --- .../continue-forward/Forward_Stay/forwardStay.md | 6 ++++-- .../start-running/confront/confront.md | 6 ++++-- english/grue/grue.md | 4 ++++ .../chocolate/make-chocolate/make-chocolate.md | 3 ++- 4 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 english/grue/grue.md diff --git a/english/Enter-a-dim-reality/continue-forward/Forward_Stay/forwardStay.md b/english/Enter-a-dim-reality/continue-forward/Forward_Stay/forwardStay.md index e165b17627..11424aafde 100644 --- a/english/Enter-a-dim-reality/continue-forward/Forward_Stay/forwardStay.md +++ b/english/Enter-a-dim-reality/continue-forward/Forward_Stay/forwardStay.md @@ -1,4 +1,6 @@ You stay on the bank, unsure of what trouble might await you in the water. You sit down, mesmerized by the light. It begins to fade - you begin to panic. -The light is gone, you scan the horizon frantically, desperately hoping to see -the another beacon somewhere in the darkness. Nothing... +The light is gone, you scan the horizon frantically, desperately hoping to see +the another beacon somewhere in the darkness. Nothing... + +It is pitch black. You are likely to be eaten by a [grue](../../../grue/grue.md). diff --git a/english/explore-outside/journey-to-flaming-tower/start-running/confront/confront.md b/english/explore-outside/journey-to-flaming-tower/start-running/confront/confront.md index 5a359da506..ad1451f912 100644 --- a/english/explore-outside/journey-to-flaming-tower/start-running/confront/confront.md +++ b/english/explore-outside/journey-to-flaming-tower/start-running/confront/confront.md @@ -1,7 +1,9 @@ You muster up all of your courage and turn to face your pursuer. Behind you in the grass is a small, adorable kitten. It's big, brown almost cartoonish eyes stare up at you, drawing you closer. The dread you felt running from this presence is still there, but the eyes beckon you ever closer. -You are powerless to resist. You have been eaten by a Grue. But luckily for you, Grues do not like +You are powerless to resist. You have been eaten by a Grue. But luckily for you, Grues do not like marshmallows so he spits you out. -[You decide to go back to the marshmallow room and do some yoga](../../../../yoga/yoga.md) \ No newline at end of file +[You decide to go back to the marshmallow room and do some yoga](../../../../yoga/yoga.md) + +[What is a grue?](../../../../grue/grue.md) diff --git a/english/grue/grue.md b/english/grue/grue.md new file mode 100644 index 0000000000..78b22ebf1d --- /dev/null +++ b/english/grue/grue.md @@ -0,0 +1,4 @@ +The grue is a sinister, lurking presence in the dark places of the earth. Its +favorite diet is adventurers, but its insatiable appetite is tempered by its +fear of light. No grue has ever been seen by the light of day, and few have +survived its fearsome jaws to tell the tale. diff --git a/english/light-fire/graham-crackers/chocolate/make-chocolate/make-chocolate.md b/english/light-fire/graham-crackers/chocolate/make-chocolate/make-chocolate.md index 51101f5068..d1ce9451dc 100644 --- a/english/light-fire/graham-crackers/chocolate/make-chocolate/make-chocolate.md +++ b/english/light-fire/graham-crackers/chocolate/make-chocolate/make-chocolate.md @@ -7,7 +7,7 @@ and marshmallow. You take a bite... of the greatest s'mores the world has ever seen! -It tastes like happiness. You devour it and start heading home, when you hear +It tastes like happiness. You devour it and start heading home, when you hear a low growl. The aroma of the s'mores must have attracted someone... or something... to your location! @@ -18,3 +18,4 @@ You are eaten by a grue. You die... +[What is a grue?](../../../grue/grue.md) From e1931b3b4f2728446c6a8e4284f9b5660c2f3543 Mon Sep 17 00:00:00 2001 From: biran dror Date: Mon, 24 Aug 2015 10:40:27 +0300 Subject: [PATCH 0705/5486] add gal option --- hebrew/bar/bar.md | 3 +++ hebrew/bar/gal/gal.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 hebrew/bar/gal/gal.md diff --git a/hebrew/bar/bar.md b/hebrew/bar/bar.md index 53fc5312a4..52eddaaea4 100644 --- a/hebrew/bar/bar.md +++ b/hebrew/bar/bar.md @@ -14,3 +14,6 @@ [יורד למטה לשתות בירה טובה בבר למטה?](beer/beer.md) [מזמין פיצה?](pizza/pizza.md) + +[ממשיך לדירה של גל גדות](gal/gal.md) + diff --git a/hebrew/bar/gal/gal.md b/hebrew/bar/gal/gal.md new file mode 100644 index 0000000000..7e4fab2a59 --- /dev/null +++ b/hebrew/bar/gal/gal.md @@ -0,0 +1,2 @@ +אתה מגיע לדירה של גל פותח את הדלת +ורואה שסופרמן הקדים אותך והוא כבר שם \ No newline at end of file From db690400423ca291fd92f0446b71399199a1ef4b Mon Sep 17 00:00:00 2001 From: watsang Date: Mon, 24 Aug 2015 12:30:18 +0200 Subject: [PATCH 0706/5486] doc: added options after reading mail --- dutch/check-mail/mail.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dutch/check-mail/mail.md b/dutch/check-mail/mail.md index 4bd9cc5033..ed0d8ca436 100644 --- a/dutch/check-mail/mail.md +++ b/dutch/check-mail/mail.md @@ -1 +1,7 @@ -nope, je hebt geen mail \ No newline at end of file +nope, je hebt geen mail + +Je leest nostalgisch een mail van je ex, nog een dringende mail van je baas, maar voor de rest, nope, geen mail... + +[Het bos](../bos/donker-bos.md) dan maar? + +... of [klimmen over het hek](../over-het-hek/hek.md)? \ No newline at end of file From e202701249a8fcf6a2ab5b776e8399252776ae33 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 24 Aug 2015 11:47:21 -0500 Subject: [PATCH 0707/5486] autores --- espanol/maquina/maquina.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/maquina/maquina.md b/espanol/maquina/maquina.md index 866a80be9a..0875e69bd1 100644 --- a/espanol/maquina/maquina.md +++ b/espanol/maquina/maquina.md @@ -3,4 +3,4 @@ Se fijará en 1977 para evitar la continuidad del régimen tras la muerte del ú Así, millones de vidas serán salvadas al evitar la más grande guerra en la historia de Epsilon. Dante ha encargado a Garth, su principal guerrero, defender la máquina tiempo mientras es reconfigurada. Justo antes de ser reconfigurada el ejercito derrumba la puerta e inicia un tiroteo que termina con la muerte de Garth -y la captura de Dante. +y la captura de Dante. Auto Pablo Ferrer y muchos otros. From f818671afd47eb6d45cdde0d413018f5da91924b Mon Sep 17 00:00:00 2001 From: dionney Date: Mon, 24 Aug 2015 13:00:41 -0400 Subject: [PATCH 0708/5486] Add call for help in french --- french/appel-au-secours/appeler-au-secours.md | 3 +++ french/feu-de-camp.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 french/appel-au-secours/appeler-au-secours.md diff --git a/french/appel-au-secours/appeler-au-secours.md b/french/appel-au-secours/appeler-au-secours.md new file mode 100644 index 0000000000..0ee9d8c333 --- /dev/null +++ b/french/appel-au-secours/appeler-au-secours.md @@ -0,0 +1,3 @@ +Vous appelez à l'aide, mais personne ne vous entends... + +[Je revois mes autres options](../feu-de-camp.md) diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 2fbf5d0f31..8c15a782b8 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -20,4 +20,6 @@ Que faites-vous ? [Je ne parle pas francais](../english/marshmallow.md) -[J'appelle ma mre immdiatement](appel-maman/appeler-maman.md) \ No newline at end of file +[J'appelle ma mre immdiatement](appel-maman/appeler-maman.md) + +[J'appel au secours](appel-au-secours/appeler-au-secours.md) From d15a030a8e75d6631c6b0af5e2dbdf2987c5a978 Mon Sep 17 00:00:00 2001 From: dionney Date: Mon, 24 Aug 2015 13:07:18 -0400 Subject: [PATCH 0709/5486] Update feu-de-camp.md --- french/feu-de-camp.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 8c15a782b8..fabafb68b0 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -1,6 +1,6 @@ -Par un beau matin, vous vous rveillez dans une pice trange aux murs en pain d'pice. +Par un beau matin, vous vous réveillez dans une pièce étrange aux murs en pain d'épice. -On aurait p faire que les murs soient fait en pte de guimave, mais ce sont des murs franais. ;) +On aurait pû faire que les murs soient fait en pâte de guimave, mais ce sont des murs français. ;) Que faites-vous ? @@ -16,10 +16,10 @@ Que faites-vous ? [J'appelle mon prof de musique](telephone/prof_musique.md) -[Je dessine une porte avec un syphon de crme chantilly qui traine](dessine/porte.md) +[Je dessine une porte avec un syphon de crème chantilly qui traine](dessine/porte.md) [Je ne parle pas francais](../english/marshmallow.md) -[J'appelle ma mre immdiatement](appel-maman/appeler-maman.md) - [J'appel au secours](appel-au-secours/appeler-au-secours.md) + +[J'appelle ma mère immédiatement](appel-maman/appeler-maman.md) From 59b4b982d1f914103caaccbec41951e0f4524024 Mon Sep 17 00:00:00 2001 From: dionney Date: Mon, 24 Aug 2015 13:16:52 -0400 Subject: [PATCH 0710/5486] Update feu-de-comp.md, so as not to change any lines --- french/feu-de-camp.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index fabafb68b0..ba6087ba42 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -1,9 +1,11 @@ -Par un beau matin, vous vous réveillez dans une pièce étrange aux murs en pain d'épice. +Par un beau matin, vous vous rveillez dans une pice trange aux murs en pain d'pice. -On aurait pû faire que les murs soient fait en pâte de guimave, mais ce sont des murs français. ;) +On aurait p faire que les murs soient fait en pte de guimave, mais ce sont des murs franais. ;) Que faites-vous ? +[J'appel au secours](appel-au-secours/appeler-au-secours.md) + [Je me rendors](dormir/reve-etrange.md) [Je cherche une sortie](sortie/chercher-la-sortie.md) @@ -16,10 +18,8 @@ Que faites-vous ? [J'appelle mon prof de musique](telephone/prof_musique.md) -[Je dessine une porte avec un syphon de crème chantilly qui traine](dessine/porte.md) +[Je dessine une porte avec un syphon de crme chantilly qui traine](dessine/porte.md) [Je ne parle pas francais](../english/marshmallow.md) -[J'appel au secours](appel-au-secours/appeler-au-secours.md) - -[J'appelle ma mère immédiatement](appel-maman/appeler-maman.md) +[J'appelle ma mre immdiatement](appel-maman/appeler-maman.md) \ No newline at end of file From 77b0a4fa7d5851a967cafd70920861673a7b236d Mon Sep 17 00:00:00 2001 From: Greg Bullmer Date: Mon, 24 Aug 2015 13:50:17 -0500 Subject: [PATCH 0711/5486] feat: Fix broken link --- .../graham-crackers/chocolate/make-chocolate/make-chocolate.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/light-fire/graham-crackers/chocolate/make-chocolate/make-chocolate.md b/english/light-fire/graham-crackers/chocolate/make-chocolate/make-chocolate.md index d1ce9451dc..e89efe1164 100644 --- a/english/light-fire/graham-crackers/chocolate/make-chocolate/make-chocolate.md +++ b/english/light-fire/graham-crackers/chocolate/make-chocolate/make-chocolate.md @@ -18,4 +18,4 @@ You are eaten by a grue. You die... -[What is a grue?](../../../grue/grue.md) +[What is a grue?](../../../../grue/grue.md) From 4808e5050758c90d7d1e1b5de2d1923d8ba52677 Mon Sep 17 00:00:00 2001 From: abdohossam5 Date: Tue, 25 Aug 2015 01:48:20 +0200 Subject: [PATCH 0712/5486] Try#1 Add Job to AR --- arabic/Job/Job.md | 1 + arabic/salamoAlikom.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 arabic/Job/Job.md diff --git a/arabic/Job/Job.md b/arabic/Job/Job.md new file mode 100644 index 0000000000..5c8db1d549 --- /dev/null +++ b/arabic/Job/Job.md @@ -0,0 +1 @@ +عليك مواصلة العمل الجاد وستحصل على الذي [تحلم به] (https://www.google.com.eg/search?q=%D9%88%D8%B8%D8%A7%D8%A6%D9%81&oq=%D9%88%D8%B8%D8%A7%D8%A6%D9%81&aqs=chrome..69i57j69i65l2j69i61&sourceid=chrome&es_sm=122&ie=UTF-8#q=%D9%88%D8%B8%D8%A7%D8%A6%D9%81&start=10) \ No newline at end of file diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 6f3fde1a24..3b0d804a86 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -9,3 +9,5 @@ [اريد ان اتعلم المزيد](learn/learn.md) [اريد ان احلم](dream/dream.md) + +[وظيفة](Job/Job.md) \ No newline at end of file From 0e3636c44d16eeeeaf86c5e4f51aa1a5ae0aa941 Mon Sep 17 00:00:00 2001 From: abdohossam5 Date: Tue, 25 Aug 2015 01:51:58 +0200 Subject: [PATCH 0713/5486] Try#2 adding job to AR --- arabic/Job/Job.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arabic/Job/Job.md b/arabic/Job/Job.md index 5c8db1d549..acee7f37fa 100644 --- a/arabic/Job/Job.md +++ b/arabic/Job/Job.md @@ -1 +1 @@ -عليك مواصلة العمل الجاد وستحصل على الذي [تحلم به] (https://www.google.com.eg/search?q=%D9%88%D8%B8%D8%A7%D8%A6%D9%81&oq=%D9%88%D8%B8%D8%A7%D8%A6%D9%81&aqs=chrome..69i57j69i65l2j69i61&sourceid=chrome&es_sm=122&ie=UTF-8#q=%D9%88%D8%B8%D8%A7%D8%A6%D9%81&start=10) \ No newline at end of file +عليك مواصلة العمل الجاد وستحصل على الذي [تحلم به] (http://www.misr5.com/category/jobs/) \ No newline at end of file From b4233320ce868be757cec396d59515f332f0ac04 Mon Sep 17 00:00:00 2001 From: Beth Pearson Date: Mon, 24 Aug 2015 20:11:04 -0500 Subject: [PATCH 0714/5486] Add reactions to Stay Puft Marshmallow Man --- english/pick-up-blowtorch/blowtorch.md | 6 ++++++ english/pick-up-blowtorch/stop-running/apologize.md | 5 +++++ 2 files changed, 11 insertions(+) create mode 100644 english/pick-up-blowtorch/stop-running/apologize.md diff --git a/english/pick-up-blowtorch/blowtorch.md b/english/pick-up-blowtorch/blowtorch.md index 4c800a3b5a..e03f66a850 100644 --- a/english/pick-up-blowtorch/blowtorch.md +++ b/english/pick-up-blowtorch/blowtorch.md @@ -26,3 +26,9 @@ bringing the camp fire... Where did that "slumber" come from? Next thing I'll hear is "fee fi fo fum". My God what have I done. + +Do you: + +[Suddenly stop running](stop-running/apologize.md) + +[Change your mind and run back the other way](../marshmallow.md) \ No newline at end of file diff --git a/english/pick-up-blowtorch/stop-running/apologize.md b/english/pick-up-blowtorch/stop-running/apologize.md new file mode 100644 index 0000000000..5cb8dffa81 --- /dev/null +++ b/english/pick-up-blowtorch/stop-running/apologize.md @@ -0,0 +1,5 @@ +As you come to a stop, you declare: + +"My apologies, Mr. Stay Puft Marmallow Man. I don't know why I just did that." + +He stares at you for a moment, then asks if you are willing to share your chocolate. From c1627340d7a76e9fbc7b7494697206496d9b6853 Mon Sep 17 00:00:00 2001 From: Sandeep Mallareddy Date: Tue, 25 Aug 2015 08:09:46 +0530 Subject: [PATCH 0715/5486] add line breaks.fix minor typo --- english/weed/weed.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/english/weed/weed.md b/english/weed/weed.md index 6091d48d7f..1f2cff1439 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -1,2 +1,7 @@ -well weed contains THC which will make you high. To get it out and add to your cookies, use a fat to extract it. -Butter, Milk, cream can be used. But the weed in the fat in a pan and add weed. Heat it for 30 minutes. Add it to your cookie dough and bake them. See you - Love Pink Unicorn \ No newline at end of file +well weed contains THC which will make you high. +To get it out and add to your cookies, use a fat to extract it. +Butter, Milk, cream can be used. +Put the weed in the fat in a pan and add weed. +Heat it for 30 minutes. +Add it to your cookie dough and bake them. +See you - Love Pink Unicorn \ No newline at end of file From 533b4f5fb352ab95a49aee2772a6443cb3b5e05c Mon Sep 17 00:00:00 2001 From: Sylvestre Date: Tue, 25 Aug 2015 15:19:27 -0400 Subject: [PATCH 0716/5486] Add ask google options to feu-de-camp --- french/feu-de-camp.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index ba6087ba42..5e909609c1 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -22,4 +22,6 @@ Que faites-vous ? [Je ne parle pas francais](../english/marshmallow.md) -[J'appelle ma mre immdiatement](appel-maman/appeler-maman.md) \ No newline at end of file +[J'appelle ma mre immdiatement](appel-maman/appeler-maman.md) + +[Je demande de l'aide a Google](google/google.md) \ No newline at end of file From 050de943403da249757a12aabd988fa8131ac79a Mon Sep 17 00:00:00 2001 From: Sylvestre Date: Tue, 25 Aug 2015 15:23:13 -0400 Subject: [PATCH 0717/5486] Add the google file and story options --- french/google/google.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 french/google/google.md diff --git a/french/google/google.md b/french/google/google.md new file mode 100644 index 0000000000..04b2d78f92 --- /dev/null +++ b/french/google/google.md @@ -0,0 +1,6 @@ +Vous sortez votre telephone de votre poche. +"Ok google, tu m'expliques ?" + +Malheureuseument, le pain d'epice semble bloquer toutes communications. + +[Je dois trouver autre chose](../feu-de-camp.md) \ No newline at end of file From b69965ae5857d0ec99ff429e484c072017343b12 Mon Sep 17 00:00:00 2001 From: GeorgePanos Date: Tue, 25 Aug 2015 23:02:46 +0300 Subject: [PATCH 0718/5486] Add an option to offer marshmallow a cigar. --- greek/marshmallow.md | 2 ++ greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md diff --git a/greek/marshmallow.md b/greek/marshmallow.md index 15f6fa80fa..302c033681 100644 --- a/greek/marshmallow.md +++ b/greek/marshmallow.md @@ -19,3 +19,5 @@ [Βγάζεις την κάλτσα σου](put_socks_off/put-socks-off.md) [Παίρνεις το πιρούνι](take_the_fork/take-the-fork.md) + +[Προσφέρεις στο ζαχαρωτό τσιγάρο](offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md) \ No newline at end of file diff --git a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md new file mode 100644 index 0000000000..5537f477ec --- /dev/null +++ b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md @@ -0,0 +1,4 @@ +Βγάζεις το πακέτο σου και προσφέρεις στο σαστισμένο χέρι τσιγάρο. +Τεντώνει όλα τα δάχτυλα του και καταλαβαίνεις ότι έχει εκπλαγεί. Γελάς +δυνατά και του λες περιπαικτικά ότι ακόμη και σ'ένα δωμάτιο από ζαχαρωτά, +υπάρχει ένας αγενής Έλληνας καπνιστής.' \ No newline at end of file From d7a16f1f13c9397a8682c25003505f1a6bbaebd1 Mon Sep 17 00:00:00 2001 From: Jennifer VB Date: Tue, 25 Aug 2015 18:53:12 -0400 Subject: [PATCH 0719/5486] Organize directory for shoulder-check --- .../start-running/shoulder-check/shoulder-check.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md diff --git a/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md b/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md new file mode 100644 index 0000000000..60582cbb86 --- /dev/null +++ b/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md @@ -0,0 +1,9 @@ +Bracing yourself for the impact, you quickly reverse your momentum, throwing +your right shoulder back towards whatever is pursuing you. As you collide with +the pursuer, you find yourself suddenly grateful for all those times your older +sister did this to you when hiking just ahead of you on a trail. Shards of +gingerbread fly past you as your shoulder shatters the cookie creature. Its head +whirls through the air, a frown on its face. + +Its last words before it breaks upon the rock-candy ground are, "I can't catch +you, I'm the Gingerbread Man. From 4f2b44d59a79a861e2f4d23dd00e53daea4fdceb Mon Sep 17 00:00:00 2001 From: Jennifer VB Date: Tue, 25 Aug 2015 19:00:25 -0400 Subject: [PATCH 0720/5486] Add quotation mark to end --- .../start-running/shoulder-check/shoulder-check.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md b/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md index 60582cbb86..fba0bafa77 100644 --- a/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md +++ b/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md @@ -6,4 +6,4 @@ gingerbread fly past you as your shoulder shatters the cookie creature. Its head whirls through the air, a frown on its face. Its last words before it breaks upon the rock-candy ground are, "I can't catch -you, I'm the Gingerbread Man. +you, I'm the Gingerbread Man." From eaeada1b25b4370fdd02ab9b8f49cb1630e8f756 Mon Sep 17 00:00:00 2001 From: Jennifer VB Date: Tue, 25 Aug 2015 19:50:51 -0400 Subject: [PATCH 0721/5486] Remove shoulder-check in wrong place --- .../shoulder-check/shoulder-check.md | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 english/explore-outside/journey-to-flaming-tower/shoulder-check/shoulder-check.md diff --git a/english/explore-outside/journey-to-flaming-tower/shoulder-check/shoulder-check.md b/english/explore-outside/journey-to-flaming-tower/shoulder-check/shoulder-check.md deleted file mode 100644 index 60582cbb86..0000000000 --- a/english/explore-outside/journey-to-flaming-tower/shoulder-check/shoulder-check.md +++ /dev/null @@ -1,9 +0,0 @@ -Bracing yourself for the impact, you quickly reverse your momentum, throwing -your right shoulder back towards whatever is pursuing you. As you collide with -the pursuer, you find yourself suddenly grateful for all those times your older -sister did this to you when hiking just ahead of you on a trail. Shards of -gingerbread fly past you as your shoulder shatters the cookie creature. Its head -whirls through the air, a frown on its face. - -Its last words before it breaks upon the rock-candy ground are, "I can't catch -you, I'm the Gingerbread Man. From 91b7bd7d2190516207c4c3d31652533d24097a59 Mon Sep 17 00:00:00 2001 From: Jaime Rios Date: Tue, 25 Aug 2015 18:55:21 -0700 Subject: [PATCH 0722/5486] Add content to meditate.md file --- english/meditate/meditate.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/meditate/meditate.md b/english/meditate/meditate.md index 39671069c0..cfa7eed3b5 100644 --- a/english/meditate/meditate.md +++ b/english/meditate/meditate.md @@ -1,5 +1,7 @@ You recently read that meditation helps you feel more awake, relieves stress, and helps you prepare for the day ahead. +You then whip out your iPhone to open up the Headspace meditation app. + So you begin to meditate for 30 minutes and when you finish, you feel more refreshed than ever. The vision of dancing women flying from cloud to cloud are magical. @@ -20,6 +22,8 @@ Answer: sit, stare, fill your consciousness with Git Afterwards, you decide to: +[go to a warriors game](../warriors-game/watch-warriors.md) + [dance with joy](../dance/dance.md) [invite friends to party with you](../invite-friends/friends.md) From 27215b8c5ee1f745170f5b464aeabab005bbc010 Mon Sep 17 00:00:00 2001 From: siorin Date: Wed, 26 Aug 2015 00:34:07 -0500 Subject: [PATCH 0723/5486] Add watched option to english/marshmallow.md --- english/marshmallow.md | 2 +- english/watched/watched.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 english/watched/watched.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 4a6a9aebad..6202e97834 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -53,7 +53,7 @@ But you have a growing sense that these mundane objects are vital to your surviv You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. -You have the suspicion that you are being closely watched. +[You have the suspicion that you are being closely watched.](./watched/watched.md) [Of course, it's that man on the sofa; go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) diff --git a/english/watched/watched.md b/english/watched/watched.md new file mode 100644 index 0000000000..5600d8d209 --- /dev/null +++ b/english/watched/watched.md @@ -0,0 +1 @@ +You gaze into the abyss, and the abyss gazes into you. \ No newline at end of file From 9d17a38ac21f195e18530861c0947f103434fefb Mon Sep 17 00:00:00 2001 From: jonathanlie94 Date: Wed, 26 Aug 2015 18:34:37 +0800 Subject: [PATCH 0724/5486] Add 'Play some DotA 2' option in marshmallow.md --- english/marshmallow.md | 2 ++ english/play-dota2/play-dota2.md | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 english/play-dota2/play-dota2.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 4a6a9aebad..569f96af64 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -445,4 +445,6 @@ Do you: [Bounce](bounce/bounce.md) +[Play some DotA 2](play-dota2/play-dota2.md) + [See if there is a Udacity course on the subject](udacity/udacity.md) diff --git a/english/play-dota2/play-dota2.md b/english/play-dota2/play-dota2.md new file mode 100644 index 0000000000..a0fa1bbb6d --- /dev/null +++ b/english/play-dota2/play-dota2.md @@ -0,0 +1,7 @@ +You start queueing for a ranked All Pick match. + +You wonder what hero to pick, then you picked Techies in the end. + +You dominated so hard that the enemy started flaming you. + +You won the game and didn't care in the end though. \ No newline at end of file From 62510e641b17b4353de1eae18cbf9e2ccbc46fa4 Mon Sep 17 00:00:00 2001 From: Renato Henrique Sica de Camilo Date: Wed, 26 Aug 2015 16:18:17 +0100 Subject: [PATCH 0725/5486] feat: Fix typo in colabora.md --- portugues/colabora/colaborar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/colabora/colaborar.md b/portugues/colabora/colaborar.md index cdb0a609c1..174d22fe0b 100644 --- a/portugues/colabora/colaborar.md +++ b/portugues/colabora/colaborar.md @@ -1,6 +1,6 @@ Muito bem, a comunidade open source fica feliz em ter você ajudando. (obs.: continuar) -Ao encontrar o repositiorio do GitHub o que você faz? +Ao encontrar o repositório do GitHub o que você faz? [Faz um fork para o seu repositório do GitHub.](fork/fork.md) From b6a97f6e6950bb1c169cc1d37fbd1e3355605928 Mon Sep 17 00:00:00 2001 From: Bextiyar Date: Wed, 26 Aug 2015 21:48:07 +0600 Subject: [PATCH 0726/5486] The story about a King. --- language.md | 2 ++ uyghurish/uyghurish-story.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 uyghurish/uyghurish-story.md diff --git a/language.md b/language.md index 0a74f4e45d..137ad7fb5a 100644 --- a/language.md +++ b/language.md @@ -114,3 +114,5 @@ Ako govorite Bosanski jezik/If You speak Bosnian language [kliknite ovdje/click Nếu bạn nói tiếng Việt, [nhấn vào link này](vietnamese/kechuyen.md). Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). + +ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) \ No newline at end of file diff --git a/uyghurish/uyghurish-story.md b/uyghurish/uyghurish-story.md new file mode 100644 index 0000000000..3e16a5f96a --- /dev/null +++ b/uyghurish/uyghurish-story.md @@ -0,0 +1,4 @@ +بۇرۇننىڭ بۇرۇنىسىدا، بىر پادىشاھ بولغان ئىكەن، پادىشاھ ناھايىتى ئىلىم سۆيەر بولۇپ، +قايسى بىر يازغۇچى كىتاب يازسا، يازغان كىتابنىڭ ئېغىرلىقىدا ئالتۇن بېرىدىكەن. +پادىشاھنىڭ بۇ ئامالىمۇ كارغا كېلىپتۇ، ئۇلارنىڭ ھۆكۈمرانلىقىدا دۇنيا بويىچە ئەڭ چوڭ +كۈتۈپخانا قۇرۇلۇپتۇ... (ئاخىرىنى داۋاملاشتۇرۇڭ) \ No newline at end of file From 0ab221b9f11742041a9a85a58a03745af44a7af5 Mon Sep 17 00:00:00 2001 From: Helen Chen Date: Wed, 26 Aug 2015 11:31:27 -0700 Subject: [PATCH 0727/5486] Update broken links in dentist-office.md --- english/bite-the-marshmallow/dentist/dentist-office.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/bite-the-marshmallow/dentist/dentist-office.md b/english/bite-the-marshmallow/dentist/dentist-office.md index 9157e7ec98..31dbae9fc6 100644 --- a/english/bite-the-marshmallow/dentist/dentist-office.md +++ b/english/bite-the-marshmallow/dentist/dentist-office.md @@ -3,8 +3,8 @@ Just as you start feeling happy that your mouth doesn't hurt anymore, you look around and realize you're back in that weird room with the marshmallow walls. The garishly dressed, vacant-eyed young man is still lounging on the sofa. -[Interrogate the man for clues](./movie-ripoffs/zoolander/zoolander.md) +[Interrogate the man for clues](../../movie-ripoffs/zoolander/zoolander.md) You hesitate talking to this man, thinking, "Eh, he's probably crazy and won't say anything helpful," then, all of a sudden, this mirror-like thing came crashing down from the ceiling right in front of your face. -You swear it is whispering: ["Come on in!!!"](./mirror/enter-mirror.md) \ No newline at end of file +You swear it is whispering: ["Come on in!!!"](../../mirror/enter-mirror.md) \ No newline at end of file From 5302369801328ee55c97bad0e0d36ceb61a2e60c Mon Sep 17 00:00:00 2001 From: Aliaksandr Zdrachak Date: Wed, 26 Aug 2015 21:51:02 +0300 Subject: [PATCH 0728/5486] Fix typo and add missed comma --- russian/zefir.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/zefir.md b/russian/zefir.md index c56782762c..d62641d749 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -1,6 +1,6 @@ Вы просыпаетесь в комнате со стенами из зефира. -Солнце светит, и вы видете в окне цветы цветущие в саду. +Солнце светит и вы видите в окне цветы, цветущие в саду. Тихая музыка в джазовом стиле слышна, наверно она знакомая? From d01d59ebb47fac82444da474f9886de6bd6ad0b7 Mon Sep 17 00:00:00 2001 From: hervemuneza Date: Wed, 26 Aug 2015 21:41:12 +0200 Subject: [PATCH 0729/5486] add new story to portugues amigo --- portugues/amigo/tecnologia.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/amigo/tecnologia.md b/portugues/amigo/tecnologia.md index 0010b16a2f..9cfca263ad 100644 --- a/portugues/amigo/tecnologia.md +++ b/portugues/amigo/tecnologia.md @@ -3,3 +3,5 @@ Você falou com seu amigo e... [Ele pediu para parar de incomodar toda vez que tem um problema no celular.](incomodar/aplicativo.md) [Gostou muito da aplicação e decidiu lhe ensinar como colaborar com o desenvolvedor.](../colabora/colaborar.md) + +Percebeu que a tecnologia não é o seu ramo voltar a estudar [filosofia](filosofia/estudar.md) From 4f5868d23cd824786395bfa983738b255a54c6f4 Mon Sep 17 00:00:00 2001 From: hervemuneza Date: Wed, 26 Aug 2015 21:41:52 +0200 Subject: [PATCH 0730/5486] add new folder filosofia to portugues amigo --- portugues/amigo/filosofia/estudar.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 portugues/amigo/filosofia/estudar.md diff --git a/portugues/amigo/filosofia/estudar.md b/portugues/amigo/filosofia/estudar.md new file mode 100644 index 0000000000..e09f6dcece --- /dev/null +++ b/portugues/amigo/filosofia/estudar.md @@ -0,0 +1,2 @@ +E comecei por ler este livro : + From f6eafe7c72431d31be205696c6a49cf0f2e47576 Mon Sep 17 00:00:00 2001 From: Richard Gieg Date: Wed, 26 Aug 2015 13:58:13 -0700 Subject: [PATCH 0731/5486] Mention a fellow named Dave Granger --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index aacf5a25b0..03f5f94a77 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -18,6 +18,8 @@ Grave danger. Oh No! *(Is there another kind?)* +I actually used to know a guy named Dave Granger. We sure had some good times! Anyway, the possibility of danger lurks. + The type of extreme mortal danger that so often accompanies confectionary inspired interior design. Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. From 857e30de86e50394aa8809b46e869501c7bb65b0 Mon Sep 17 00:00:00 2001 From: Sarah Ehab Mostafa Date: Thu, 27 Aug 2015 00:28:18 +0200 Subject: [PATCH 0732/5486] Add Nanodegree option to arabic story --- arabic/salamoAlikom.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 3b0d804a86..cc3ca1142f 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -10,4 +10,6 @@ [اريد ان احلم](dream/dream.md) -[وظيفة](Job/Job.md) \ No newline at end of file +[وظيفة](Job/Job.md) + +[أريد أن أحصل على Nanodegree](https://www.udacity.com/nanodegree) \ No newline at end of file From 4b2c387f724ec13c515a8cdc397376b0773e13b4 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 16:12:37 -0700 Subject: [PATCH 0733/5486] Add "make changes to GitHub" branch to the story --- english/make_changes_GitHub/clone_source/stuck.md | 5 +++++ .../make_changes_GitHub/create_fork/clone_repo.md | 8 ++++++++ .../create_fork/pull_request/success.md | 12 ++++++++++++ .../create_fork/wait/forever_alone.md | 5 +++++ english/make_changes_GitHub/google/die.md | 3 +++ english/make_changes_GitHub/make_changes_GitHub.md | 11 +++++++++++ english/marshmallow.md | 14 ++++++++------ 7 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 english/make_changes_GitHub/clone_source/stuck.md create mode 100644 english/make_changes_GitHub/create_fork/clone_repo.md create mode 100644 english/make_changes_GitHub/create_fork/pull_request/success.md create mode 100644 english/make_changes_GitHub/create_fork/wait/forever_alone.md create mode 100644 english/make_changes_GitHub/google/die.md create mode 100644 english/make_changes_GitHub/make_changes_GitHub.md diff --git a/english/make_changes_GitHub/clone_source/stuck.md b/english/make_changes_GitHub/clone_source/stuck.md new file mode 100644 index 0000000000..3b7f59e65b --- /dev/null +++ b/english/make_changes_GitHub/clone_source/stuck.md @@ -0,0 +1,5 @@ +You open up the command line and use Git to clone the repo to your computer. You begin making changes to the story to get yourself out of this awful world. When you finish your changes, nothing happened. + +Then a horrible realization came upon you: cloning the upstream repo doesn't allow you to make any contributions or changes to it. You should have forked it first! Panicked, you try to go back onto the GitHub page to fork the repo, but the WiFi is out!! + +You are forever stuck in this place... diff --git a/english/make_changes_GitHub/create_fork/clone_repo.md b/english/make_changes_GitHub/create_fork/clone_repo.md new file mode 100644 index 0000000000..48ab2b0430 --- /dev/null +++ b/english/make_changes_GitHub/create_fork/clone_repo.md @@ -0,0 +1,8 @@ +You successfully create a fork of the upstream repo. You then clone the repo to your local directory and open up the files through the command line. + +You begin making your changes to get out of this awful place. You change the text to create a wormhole that can instantly take you home into the normal world again. You save the changes on your computer and push it to your fork on GitHub. +Nothing's changing yet. What do you do next? + +[Wait](wait/forever_alone.md) + +[Create a pull request](pull_request/success.md) diff --git a/english/make_changes_GitHub/create_fork/pull_request/success.md b/english/make_changes_GitHub/create_fork/pull_request/success.md new file mode 100644 index 0000000000..d7998fca6c --- /dev/null +++ b/english/make_changes_GitHub/create_fork/pull_request/success.md @@ -0,0 +1,12 @@ +You create a pull request on GitHub and hope that someone can quickly review your changes and agree to merge your branch into the upstream master branch. You cross your fingers that it works... and quick. Your bladder can only contain so much pee. + +Seconds later, a wormhole appears!! + +You step into it and hope for the best. You close your eyes and within a split second, you open your eyes to see that you are back in your room. + +You immediately run into your bathroom and had the greatest pee session ever. Everything was alright in the world. + + + + +Thank goodness for GitHub! diff --git a/english/make_changes_GitHub/create_fork/wait/forever_alone.md b/english/make_changes_GitHub/create_fork/wait/forever_alone.md new file mode 100644 index 0000000000..eb093c6e81 --- /dev/null +++ b/english/make_changes_GitHub/create_fork/wait/forever_alone.md @@ -0,0 +1,5 @@ +You wait for something to happen. Maybe it just takes a little while for the changes to happen. Maybe the WiFi here is just a little slow. So you wait... and wait... and wait... + +35 years pass, and suddenly you realize... + +You are forever alone. diff --git a/english/make_changes_GitHub/google/die.md b/english/make_changes_GitHub/google/die.md new file mode 100644 index 0000000000..fce8cdeceb --- /dev/null +++ b/english/make_changes_GitHub/google/die.md @@ -0,0 +1,3 @@ +As you start typing into Google to search how to make changes to the GitHub repo, you notice the marshmallow walls start to close in upon you. You hurriedly try to look up tutorials on how to use Git and GitHub, but the walls were closing in too fast. Your efforts were futile. + +The white marshmallow walls were stained with your blood... diff --git a/english/make_changes_GitHub/make_changes_GitHub.md b/english/make_changes_GitHub/make_changes_GitHub.md new file mode 100644 index 0000000000..1ca4bd1bfe --- /dev/null +++ b/english/make_changes_GitHub/make_changes_GitHub.md @@ -0,0 +1,11 @@ +You suddenly realize that you are actually living in a bizarre, made up world created by the genius students of Udacity's GitHub course. Since you are a well-respected software engineer in real life, you know Git and GitHub like the back of your hand. + +You take the wand and shouted a spell. "Huzzah!" Suddenly, your trusty MacBook Pro appeared on the floor. You open it up and turn it on. For some reason, there's WiFi! Despite all of its horror, this marshmallow nightmare is pretty well-equipped! + +You open up Chrome and found Udacity's create-your-own-adventure GitHub page. You notice that you don't have a local copy of the repository. Do you: + +[Create a fork of the repository](create_fork/clone_repo.md) + +[Clone the source repository](clone_source/stuck.md) + +[Google what to do because you have no idea](google/die.md) diff --git a/english/marshmallow.md b/english/marshmallow.md index 9d68355ff2..736a0d348a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -21,7 +21,7 @@ Grave danger. Oh No! *(Is there another kind?)* The type of extreme mortal danger that so often accompanies confectionary inspired interior design. -Quickly surveying your immediate surrounds, you notice a garishly dressed, +Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. [pinch yourself to see if this is a dream](./is-this-a-dream/is-this-a-dream.md) @@ -69,7 +69,7 @@ You hear a small bird sound in the distance. But it sounds like it might be coming out of speakers. -Something lightly brushes the back of your neck, sending a chill down your spine! +Something lightly brushes the back of your neck, sending a chill down your spine! Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. @@ -106,18 +106,20 @@ Pointing it at the door, eyes closed, "Alohomora..." Nothing seems to be happening. Sheepishly you look down on the crappy wand in your hand. - + You must be doing something wrong, you drink a beer and think about it, then Ah-ha! You notice your pants are now glowing, so you must have been holding the wand upside down. Suddenly, you become aware of the need to take a leak. -You can't hold it. You wonder, Are glowing pants waterproof? +You can't hold it. You wonder, Are glowing pants waterproof? You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: +[Make changes on GitHub to revise this crazy story](make_changes_GitHub/make_changes_GitHub.md) + [Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) [Go eat some rainbows](eat-rainbows/rainbows.md) @@ -354,7 +356,7 @@ Do you: [Pull out your proton pack!](ghost-buster/ghost-busted.md) [You take the red pill](red-pill/red-pill.md) - + [Twas the Night Before Christmas](night-night/tale.md) [heck Reddit for any useful information.](reddit/ask-reddit.md) @@ -428,7 +430,7 @@ Do you: [Analyze the composition of the marshmallow](analyze/analysis.md) -[Watch Barcelona game](watch-barca/watch-barca.md) +[Watch Barcelona game](watch-barca/watch-barca.md) [Oops! this story ain't ending..](unending-story/unending-story.md) From ebc05dbb8c69f1dab983f498aaaa01e001889682 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 16:59:54 -0700 Subject: [PATCH 0734/5486] Fix accidental space deletions of existing text --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 736a0d348a..9314539502 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -428,7 +428,7 @@ Do you: [Stop, hammertime!](hammertime/hammertime.md) -[Analyze the composition of the marshmallow](analyze/analysis.md) +[Analyze the composition of the marshmallow](analyze/analysis.md) [Watch Barcelona game](watch-barca/watch-barca.md) From 06b4dd61c473cbe3f1d39d74c25b53b26d65d016 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 17:17:19 -0700 Subject: [PATCH 0735/5486] Update text to decrease character length to under 120 --- english/make_changes_GitHub/clone_source/stuck.md | 7 +++++-- english/make_changes_GitHub/create_fork/clone_repo.md | 7 +++++-- .../create_fork/pull_request/success.md | 10 +++++++--- .../create_fork/wait/forever_alone.md | 5 +++-- english/make_changes_GitHub/google/die.md | 4 +++- english/make_changes_GitHub/make_changes_GitHub.md | 11 ++++++++--- english/marshmallow.md | 2 +- 7 files changed, 32 insertions(+), 14 deletions(-) diff --git a/english/make_changes_GitHub/clone_source/stuck.md b/english/make_changes_GitHub/clone_source/stuck.md index 3b7f59e65b..4cd6a4fdb9 100644 --- a/english/make_changes_GitHub/clone_source/stuck.md +++ b/english/make_changes_GitHub/clone_source/stuck.md @@ -1,5 +1,8 @@ -You open up the command line and use Git to clone the repo to your computer. You begin making changes to the story to get yourself out of this awful world. When you finish your changes, nothing happened. +You open up the command line and use Git to clone the repo to your computer. You begin making changes to the story +to get yourself out of this awful world. When you finish your changes, nothing happened. -Then a horrible realization came upon you: cloning the upstream repo doesn't allow you to make any contributions or changes to it. You should have forked it first! Panicked, you try to go back onto the GitHub page to fork the repo, but the WiFi is out!! +Then a horrible realization came upon you: cloning the upstream repo doesn't allow you to make any +contributions or changes to it. You should have forked it first! Panicked, you try to go back onto +the GitHub page to fork the repo, but the WiFi is out!! You are forever stuck in this place... diff --git a/english/make_changes_GitHub/create_fork/clone_repo.md b/english/make_changes_GitHub/create_fork/clone_repo.md index 48ab2b0430..d4cc9b3c60 100644 --- a/english/make_changes_GitHub/create_fork/clone_repo.md +++ b/english/make_changes_GitHub/create_fork/clone_repo.md @@ -1,6 +1,9 @@ -You successfully create a fork of the upstream repo. You then clone the repo to your local directory and open up the files through the command line. +You successfully create a fork of the upstream repo. You then clone the repo to your local directory and +open up the files through the command line. -You begin making your changes to get out of this awful place. You change the text to create a wormhole that can instantly take you home into the normal world again. You save the changes on your computer and push it to your fork on GitHub. +You begin making your changes to get out of this awful place. You change the text to create a wormhole +that can instantly take you home into the normal world again. You save the changes on your computer and push +it to your fork on GitHub. Nothing's changing yet. What do you do next? [Wait](wait/forever_alone.md) diff --git a/english/make_changes_GitHub/create_fork/pull_request/success.md b/english/make_changes_GitHub/create_fork/pull_request/success.md index d7998fca6c..be66524bc4 100644 --- a/english/make_changes_GitHub/create_fork/pull_request/success.md +++ b/english/make_changes_GitHub/create_fork/pull_request/success.md @@ -1,10 +1,14 @@ -You create a pull request on GitHub and hope that someone can quickly review your changes and agree to merge your branch into the upstream master branch. You cross your fingers that it works... and quick. Your bladder can only contain so much pee. +You create a pull request on GitHub and hope that someone can quickly review your changes and agree to merge +your branch into the upstream master branch. You cross your fingers that it works... and quick. Your bladder can +only contain so much pee. Seconds later, a wormhole appears!! -You step into it and hope for the best. You close your eyes and within a split second, you open your eyes to see that you are back in your room. +You step into it and hope for the best. You close your eyes and within a split second, you open your +eyes to see that you are back in your room. -You immediately run into your bathroom and had the greatest pee session ever. Everything was alright in the world. +You immediately run into your bathroom and had the greatest pee session ever. +Everything was alright in the world. diff --git a/english/make_changes_GitHub/create_fork/wait/forever_alone.md b/english/make_changes_GitHub/create_fork/wait/forever_alone.md index eb093c6e81..c4aaa791b4 100644 --- a/english/make_changes_GitHub/create_fork/wait/forever_alone.md +++ b/english/make_changes_GitHub/create_fork/wait/forever_alone.md @@ -1,5 +1,6 @@ -You wait for something to happen. Maybe it just takes a little while for the changes to happen. Maybe the WiFi here is just a little slow. So you wait... and wait... and wait... +You wait for something to happen. Maybe it just takes a little while for the changes to happen. Maybe the WiFi +here is just a little slow. So you wait... and wait... and wait... 35 years pass, and suddenly you realize... -You are forever alone. +You are forever alone. diff --git a/english/make_changes_GitHub/google/die.md b/english/make_changes_GitHub/google/die.md index fce8cdeceb..a04d7faab2 100644 --- a/english/make_changes_GitHub/google/die.md +++ b/english/make_changes_GitHub/google/die.md @@ -1,3 +1,5 @@ -As you start typing into Google to search how to make changes to the GitHub repo, you notice the marshmallow walls start to close in upon you. You hurriedly try to look up tutorials on how to use Git and GitHub, but the walls were closing in too fast. Your efforts were futile. +As you start typing into Google to search how to make changes to the GitHub repo, you notice the marshmallow +walls start to close in upon you. You hurriedly try to look up tutorials on how to use Git and GitHub, but +the walls were closing in too fast. Your efforts were futile. The white marshmallow walls were stained with your blood... diff --git a/english/make_changes_GitHub/make_changes_GitHub.md b/english/make_changes_GitHub/make_changes_GitHub.md index 1ca4bd1bfe..92860597c0 100644 --- a/english/make_changes_GitHub/make_changes_GitHub.md +++ b/english/make_changes_GitHub/make_changes_GitHub.md @@ -1,8 +1,13 @@ -You suddenly realize that you are actually living in a bizarre, made up world created by the genius students of Udacity's GitHub course. Since you are a well-respected software engineer in real life, you know Git and GitHub like the back of your hand. +You suddenly realize that you are actually living in a bizarre, made up world created by the genius students +of Udacity's GitHub course. Since you are a well-respected software engineer in real life, you know Git and +GitHub like the back of your hand. -You take the wand and shouted a spell. "Huzzah!" Suddenly, your trusty MacBook Pro appeared on the floor. You open it up and turn it on. For some reason, there's WiFi! Despite all of its horror, this marshmallow nightmare is pretty well-equipped! +You take the wand and shouted a spell. "Huzzah!" Suddenly, your trusty MacBook Pro appeared on the floor. +You open it up and turn it on. For some reason, there's WiFi! Despite all of its horror, this marshmallow +nightmare is pretty well-equipped! -You open up Chrome and found Udacity's create-your-own-adventure GitHub page. You notice that you don't have a local copy of the repository. Do you: +You open up Chrome and found Udacity's create-your-own-adventure GitHub page. You notice that you don't have a +local copy of the repository. Do you: [Create a fork of the repository](create_fork/clone_repo.md) diff --git a/english/marshmallow.md b/english/marshmallow.md index 9314539502..736a0d348a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -428,7 +428,7 @@ Do you: [Stop, hammertime!](hammertime/hammertime.md) -[Analyze the composition of the marshmallow](analyze/analysis.md) +[Analyze the composition of the marshmallow](analyze/analysis.md) [Watch Barcelona game](watch-barca/watch-barca.md) From 7347e561e369d14fb9c0f07ae81ca870e2f5dcdc Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 17:23:26 -0700 Subject: [PATCH 0736/5486] Fix deleted whitespaces --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 736a0d348a..5879305c46 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -430,7 +430,7 @@ Do you: [Analyze the composition of the marshmallow](analyze/analysis.md) -[Watch Barcelona game](watch-barca/watch-barca.md) +[Watch Barcelona game](watch-barca/watch-barca.md) [Oops! this story ain't ending..](unending-story/unending-story.md) From b2ae26dde2c39d98f6c2662e7b68f797aee65228 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 17:32:42 -0700 Subject: [PATCH 0737/5486] Fix removed whitespaces due to package in Atom editor --- english/marshmallow.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5879305c46..be7c95d517 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -21,7 +21,7 @@ Grave danger. Oh No! *(Is there another kind?)* The type of extreme mortal danger that so often accompanies confectionary inspired interior design. -Quickly surveying your immediate surrounds, you notice a garishly dressed, +Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. [pinch yourself to see if this is a dream](./is-this-a-dream/is-this-a-dream.md) @@ -69,7 +69,7 @@ You hear a small bird sound in the distance. But it sounds like it might be coming out of speakers. -Something lightly brushes the back of your neck, sending a chill down your spine! +Something lightly brushes the back of your neck, sending a chill down your spine! Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. @@ -106,13 +106,13 @@ Pointing it at the door, eyes closed, "Alohomora..." Nothing seems to be happening. Sheepishly you look down on the crappy wand in your hand. - + You must be doing something wrong, you drink a beer and think about it, then Ah-ha! You notice your pants are now glowing, so you must have been holding the wand upside down. Suddenly, you become aware of the need to take a leak. -You can't hold it. You wonder, Are glowing pants waterproof? +You can't hold it. You wonder, Are glowing pants waterproof? You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) @@ -354,7 +354,7 @@ Do you: [Choose the blue pill or the red pill?](choose-pill/choose-pill.md) [Pull out your proton pack!](ghost-buster/ghost-busted.md) - + [You take the red pill](red-pill/red-pill.md) [Twas the Night Before Christmas](night-night/tale.md) @@ -430,7 +430,7 @@ Do you: [Analyze the composition of the marshmallow](analyze/analysis.md) -[Watch Barcelona game](watch-barca/watch-barca.md) +[Watch Barcelona game](watch-barca/watch-barca.md) [Oops! this story ain't ending..](unending-story/unending-story.md) From 851a218d2c5d4aa717406bd08317c18d7747bd32 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 17:38:07 -0700 Subject: [PATCH 0738/5486] Fix deleted whitespaces again --- english/marshmallow.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index be7c95d517..8afe35ebe9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -352,7 +352,7 @@ Do you: [The inception protocol](dream_in_dream/inception.md) [Choose the blue pill or the red pill?](choose-pill/choose-pill.md) - + [Pull out your proton pack!](ghost-buster/ghost-busted.md) [You take the red pill](red-pill/red-pill.md) @@ -428,9 +428,9 @@ Do you: [Stop, hammertime!](hammertime/hammertime.md) -[Analyze the composition of the marshmallow](analyze/analysis.md) +[Analyze the composition of the marshmallow](analyze/analysis.md) -[Watch Barcelona game](watch-barca/watch-barca.md) +[Watch Barcelona game](watch-barca/watch-barca.md) [Oops! this story ain't ending..](unending-story/unending-story.md) From d5b5767bb67c9036c137aab4c50ae1e4e04ff1fb Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 18:02:57 -0700 Subject: [PATCH 0739/5486] Fix whitespaces issue once again --- english/marshmallow.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 8afe35ebe9..b28f89f1c4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -352,9 +352,9 @@ Do you: [The inception protocol](dream_in_dream/inception.md) [Choose the blue pill or the red pill?](choose-pill/choose-pill.md) - + [Pull out your proton pack!](ghost-buster/ghost-busted.md) - + [You take the red pill](red-pill/red-pill.md) [Twas the Night Before Christmas](night-night/tale.md) @@ -428,7 +428,7 @@ Do you: [Stop, hammertime!](hammertime/hammertime.md) -[Analyze the composition of the marshmallow](analyze/analysis.md) +[Analyze the composition of the marshmallow](analyze/analysis.md) [Watch Barcelona game](watch-barca/watch-barca.md) From 93c779ff9e60a7ce26c28f3f249b109623b01f82 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 18:04:37 -0700 Subject: [PATCH 0740/5486] Add final fix to whitespaces issue --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b28f89f1c4..f8d83ed292 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -354,7 +354,7 @@ Do you: [Choose the blue pill or the red pill?](choose-pill/choose-pill.md) [Pull out your proton pack!](ghost-buster/ghost-busted.md) - + [You take the red pill](red-pill/red-pill.md) [Twas the Night Before Christmas](night-night/tale.md) From 9381a6233c7c34ec96408eb3080389789f9c3303 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 18:08:04 -0700 Subject: [PATCH 0741/5486] Fix whitespace issue --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index f8d83ed292..a2da09ce35 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -352,8 +352,8 @@ Do you: [The inception protocol](dream_in_dream/inception.md) [Choose the blue pill or the red pill?](choose-pill/choose-pill.md) - -[Pull out your proton pack!](ghost-buster/ghost-busted.md) + +[Pull out your proton pack!](ghost-buster/ghost-busted.md) [You take the red pill](red-pill/red-pill.md) From e09c98ccee6cca593abf53c2e95a0ed56595983a Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 18:10:40 -0700 Subject: [PATCH 0742/5486] Fix whitespace issue --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index a2da09ce35..9b5d568fc4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -350,8 +350,8 @@ Do you: [After breakfast you lookup triathlon](triathlon/triathlon.md) [The inception protocol](dream_in_dream/inception.md) - -[Choose the blue pill or the red pill?](choose-pill/choose-pill.md) + +[Choose the blue pill or the red pill?](choose-pill/choose-pill.md) [Pull out your proton pack!](ghost-buster/ghost-busted.md) From d6243bb988000061a43d6bbedf8bba8768585fa4 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 18:13:17 -0700 Subject: [PATCH 0743/5486] Fix whitespaces issue --- english/marshmallow.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 9b5d568fc4..b28f89f1c4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -350,11 +350,11 @@ Do you: [After breakfast you lookup triathlon](triathlon/triathlon.md) [The inception protocol](dream_in_dream/inception.md) - -[Choose the blue pill or the red pill?](choose-pill/choose-pill.md) - -[Pull out your proton pack!](ghost-buster/ghost-busted.md) - + +[Choose the blue pill or the red pill?](choose-pill/choose-pill.md) + +[Pull out your proton pack!](ghost-buster/ghost-busted.md) + [You take the red pill](red-pill/red-pill.md) [Twas the Night Before Christmas](night-night/tale.md) From 7070ab1ce19e64e27d79f855cc8fc68d4c1fde43 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 18:14:42 -0700 Subject: [PATCH 0744/5486] Add whitespace to empty line 357 --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b28f89f1c4..f8d83ed292 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -354,7 +354,7 @@ Do you: [Choose the blue pill or the red pill?](choose-pill/choose-pill.md) [Pull out your proton pack!](ghost-buster/ghost-busted.md) - + [You take the red pill](red-pill/red-pill.md) [Twas the Night Before Christmas](night-night/tale.md) From 161800aaa5aeb950b9fbd333e2eb512092904e55 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 18:17:16 -0700 Subject: [PATCH 0745/5486] Fix whitespace issue --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index f8d83ed292..fead086761 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -354,7 +354,7 @@ Do you: [Choose the blue pill or the red pill?](choose-pill/choose-pill.md) [Pull out your proton pack!](ghost-buster/ghost-busted.md) - + [You take the red pill](red-pill/red-pill.md) [Twas the Night Before Christmas](night-night/tale.md) @@ -430,7 +430,7 @@ Do you: [Analyze the composition of the marshmallow](analyze/analysis.md) -[Watch Barcelona game](watch-barca/watch-barca.md) +[Watch Barcelona game](watch-barca/watch-barca.md) [Oops! this story ain't ending..](unending-story/unending-story.md) From 306b407b837740d7c63f9c840912e4cd88e6196a Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 18:19:51 -0700 Subject: [PATCH 0746/5486] Fix whitespace issue --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index fead086761..b28f89f1c4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -430,7 +430,7 @@ Do you: [Analyze the composition of the marshmallow](analyze/analysis.md) -[Watch Barcelona game](watch-barca/watch-barca.md) +[Watch Barcelona game](watch-barca/watch-barca.md) [Oops! this story ain't ending..](unending-story/unending-story.md) From b3275ab5dbdc40cf90eeea80da6fb07f3daf4186 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 18:22:07 -0700 Subject: [PATCH 0747/5486] Fix whitespace issue --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b28f89f1c4..f8d83ed292 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -354,7 +354,7 @@ Do you: [Choose the blue pill or the red pill?](choose-pill/choose-pill.md) [Pull out your proton pack!](ghost-buster/ghost-busted.md) - + [You take the red pill](red-pill/red-pill.md) [Twas the Night Before Christmas](night-night/tale.md) From b465ae3e9f15dae393bffa81f981800dbd96204c Mon Sep 17 00:00:00 2001 From: Greg Quinlan Date: Wed, 26 Aug 2015 21:22:48 -0400 Subject: [PATCH 0748/5486] feat: Add superman text --- english/marshmallow.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 03f5f94a77..04bb189577 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -26,6 +26,12 @@ vacant-eyed young man lounging on a nearby sofa. [Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) +You recall what a man said to you once: "Live as one of them, Kal-El, to discover +where your strength and your power are needed. Always hold in your heart the +pride of your special heritage. They can be a great people, Kal-El; they wish to +be. They only lack the light to show the way. For this reason above all, their +capacity for good, I have sent them you... my only son." + [Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) [Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) From 98e1028ce0546ec69fa1f3fcdda34c86e4e9db17 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 18:23:55 -0700 Subject: [PATCH 0749/5486] Fix whitespace issue --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index f8d83ed292..97d9fd6d53 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -355,8 +355,8 @@ Do you: [Pull out your proton pack!](ghost-buster/ghost-busted.md) -[You take the red pill](red-pill/red-pill.md) - +[You take the red pill](red-pill/red-pill.md) + [Twas the Night Before Christmas](night-night/tale.md) [heck Reddit for any useful information.](reddit/ask-reddit.md) From fee01297fd24c984849fc60b5f8108f87f7e0737 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 18:25:52 -0700 Subject: [PATCH 0750/5486] Fix whitespace issue --- english/marshmallow.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 97d9fd6d53..b28f89f1c4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -354,9 +354,9 @@ Do you: [Choose the blue pill or the red pill?](choose-pill/choose-pill.md) [Pull out your proton pack!](ghost-buster/ghost-busted.md) - -[You take the red pill](red-pill/red-pill.md) - + +[You take the red pill](red-pill/red-pill.md) + [Twas the Night Before Christmas](night-night/tale.md) [heck Reddit for any useful information.](reddit/ask-reddit.md) From 8ff9454df719b8cf14f7a829b051311bad8a06a9 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 18:27:08 -0700 Subject: [PATCH 0751/5486] Fix whitespace issue --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b28f89f1c4..43adaea18e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -356,7 +356,7 @@ Do you: [Pull out your proton pack!](ghost-buster/ghost-busted.md) [You take the red pill](red-pill/red-pill.md) - + [Twas the Night Before Christmas](night-night/tale.md) [heck Reddit for any useful information.](reddit/ask-reddit.md) From df8183292fbf9a3c269803578ce21ff4eae6d964 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 19:20:14 -0700 Subject: [PATCH 0752/5486] Add files for storyline 'make changes to GitHub' --- .../make_changes_GitHub/clone_source/stuck.md | 8 +++ .../create_fork/clone_repo.md | 11 ++++ .../create_fork/pull_request/success.md | 16 +++++ .../create_fork/wait/forever_alone.md | 6 ++ english/make_changes_GitHub/google/die.md | 5 ++ .../make_changes_GitHub.md | 16 +++++ english/marshmallow.md | 59 ++++++++----------- 7 files changed, 88 insertions(+), 33 deletions(-) create mode 100644 english/make_changes_GitHub/clone_source/stuck.md create mode 100644 english/make_changes_GitHub/create_fork/clone_repo.md create mode 100644 english/make_changes_GitHub/create_fork/pull_request/success.md create mode 100644 english/make_changes_GitHub/create_fork/wait/forever_alone.md create mode 100644 english/make_changes_GitHub/google/die.md create mode 100644 english/make_changes_GitHub/make_changes_GitHub.md diff --git a/english/make_changes_GitHub/clone_source/stuck.md b/english/make_changes_GitHub/clone_source/stuck.md new file mode 100644 index 0000000000..4cd6a4fdb9 --- /dev/null +++ b/english/make_changes_GitHub/clone_source/stuck.md @@ -0,0 +1,8 @@ +You open up the command line and use Git to clone the repo to your computer. You begin making changes to the story +to get yourself out of this awful world. When you finish your changes, nothing happened. + +Then a horrible realization came upon you: cloning the upstream repo doesn't allow you to make any +contributions or changes to it. You should have forked it first! Panicked, you try to go back onto +the GitHub page to fork the repo, but the WiFi is out!! + +You are forever stuck in this place... diff --git a/english/make_changes_GitHub/create_fork/clone_repo.md b/english/make_changes_GitHub/create_fork/clone_repo.md new file mode 100644 index 0000000000..d4cc9b3c60 --- /dev/null +++ b/english/make_changes_GitHub/create_fork/clone_repo.md @@ -0,0 +1,11 @@ +You successfully create a fork of the upstream repo. You then clone the repo to your local directory and +open up the files through the command line. + +You begin making your changes to get out of this awful place. You change the text to create a wormhole +that can instantly take you home into the normal world again. You save the changes on your computer and push +it to your fork on GitHub. +Nothing's changing yet. What do you do next? + +[Wait](wait/forever_alone.md) + +[Create a pull request](pull_request/success.md) diff --git a/english/make_changes_GitHub/create_fork/pull_request/success.md b/english/make_changes_GitHub/create_fork/pull_request/success.md new file mode 100644 index 0000000000..be66524bc4 --- /dev/null +++ b/english/make_changes_GitHub/create_fork/pull_request/success.md @@ -0,0 +1,16 @@ +You create a pull request on GitHub and hope that someone can quickly review your changes and agree to merge +your branch into the upstream master branch. You cross your fingers that it works... and quick. Your bladder can +only contain so much pee. + +Seconds later, a wormhole appears!! + +You step into it and hope for the best. You close your eyes and within a split second, you open your +eyes to see that you are back in your room. + +You immediately run into your bathroom and had the greatest pee session ever. +Everything was alright in the world. + + + + +Thank goodness for GitHub! diff --git a/english/make_changes_GitHub/create_fork/wait/forever_alone.md b/english/make_changes_GitHub/create_fork/wait/forever_alone.md new file mode 100644 index 0000000000..c4aaa791b4 --- /dev/null +++ b/english/make_changes_GitHub/create_fork/wait/forever_alone.md @@ -0,0 +1,6 @@ +You wait for something to happen. Maybe it just takes a little while for the changes to happen. Maybe the WiFi +here is just a little slow. So you wait... and wait... and wait... + +35 years pass, and suddenly you realize... + +You are forever alone. diff --git a/english/make_changes_GitHub/google/die.md b/english/make_changes_GitHub/google/die.md new file mode 100644 index 0000000000..a04d7faab2 --- /dev/null +++ b/english/make_changes_GitHub/google/die.md @@ -0,0 +1,5 @@ +As you start typing into Google to search how to make changes to the GitHub repo, you notice the marshmallow +walls start to close in upon you. You hurriedly try to look up tutorials on how to use Git and GitHub, but +the walls were closing in too fast. Your efforts were futile. + +The white marshmallow walls were stained with your blood... diff --git a/english/make_changes_GitHub/make_changes_GitHub.md b/english/make_changes_GitHub/make_changes_GitHub.md new file mode 100644 index 0000000000..92860597c0 --- /dev/null +++ b/english/make_changes_GitHub/make_changes_GitHub.md @@ -0,0 +1,16 @@ +You suddenly realize that you are actually living in a bizarre, made up world created by the genius students +of Udacity's GitHub course. Since you are a well-respected software engineer in real life, you know Git and +GitHub like the back of your hand. + +You take the wand and shouted a spell. "Huzzah!" Suddenly, your trusty MacBook Pro appeared on the floor. +You open it up and turn it on. For some reason, there's WiFi! Despite all of its horror, this marshmallow +nightmare is pretty well-equipped! + +You open up Chrome and found Udacity's create-your-own-adventure GitHub page. You notice that you don't have a +local copy of the repository. Do you: + +[Create a fork of the repository](create_fork/clone_repo.md) + +[Clone the source repository](clone_source/stuck.md) + +[Google what to do because you have no idea](google/die.md) diff --git a/english/marshmallow.md b/english/marshmallow.md index 04bb189577..43adaea18e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -9,7 +9,9 @@ For a second, you decide whether or not to just [go back to sleep](go-back-to-sl A sound from a Hitchcock movie fills the room, then quickly fades away. Thinking back, there are no memories to suggest that this should have been + anything but an ordinary morning. You didn't go out last night, you don't + usually take intoxicants, what's happening...? But it's probably not worth dwelling on that right now, you could be in danger. @@ -18,23 +20,15 @@ Grave danger. Oh No! *(Is there another kind?)* -I actually used to know a guy named Dave Granger. We sure had some good times! Anyway, the possibility of danger lurks. - The type of extreme mortal danger that so often accompanies confectionary inspired interior design. Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. -[Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) - -You recall what a man said to you once: "Live as one of them, Kal-El, to discover -where your strength and your power are needed. Always hold in your heart the -pride of your special heritage. They can be a great people, Kal-El; they wish to -be. They only lack the light to show the way. For this reason above all, their -capacity for good, I have sent them you... my only son." +[pinch yourself to see if this is a dream](./is-this-a-dream/is-this-a-dream.md) -[Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) +[remember that you are superman](./remember-you-are-superman/remember-you-are-superman.md) -[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) +[Interrogate the man for clues](./movie-ripoffs/zoolander/zoolander.md) These marshmallows are numerous and they look so delicious. ... despite the feeling they're somehow judging you for only wearing one sock. @@ -43,13 +37,13 @@ You reach out to grab a handful of the marshmallow wall, but you can't seem to t You also seem to be wearing an uncomfortable and restrictive jacket made of leather... -[You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) +[You decide to bite the marshmallow wall](./bite-the-marshmallow/tasty-marshmallow.md) You are feeling very anxious at this point. This is because you do not like leather for ethical reasons. -You begin to break out of the jacket and find a lighter, a fork, and rope. +You begin to breakout of the jacket and find a lighter, a fork, and rope. You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. @@ -61,15 +55,15 @@ But you have a growing sense that these mundane objects are vital to your surviv You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. -[You have the suspicion that you are being closely watched.](./watched/watched.md) +You have the suspicion that you are being closely watched. -[Of course, it's that man on the sofa; go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) +[Of course, it's that man on the sofa, go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) [Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) You see a polar bear searching for food. -"Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" +"Well- OK" you admit to yourself, "Perhaps I do indulge in the occasional intoxicant!" You hear a small bird sound in the distance. @@ -91,7 +85,7 @@ Marshmallows are going to rule the world! Long live marshmallows! -Hold the image of the marshmallow and... +Hold the image of the marshmallow and.. Sing softly the song of it's people as you... @@ -113,7 +107,7 @@ Nothing seems to be happening. Sheepishly you look down on the crappy wand in your hand. -You must be doing something wrong. You drink a beer and think about it, then Ah-ha! +You must be doing something wrong, you drink a beer and think about it, then Ah-ha! You notice your pants are now glowing, so you must have been holding the wand upside down. @@ -124,6 +118,8 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: +[Make changes on GitHub to revise this crazy story](make_changes_GitHub/make_changes_GitHub.md) + [Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) [Go eat some rainbows](eat-rainbows/rainbows.md) @@ -174,13 +170,13 @@ Do you: [Grab the lighter first?](lighter/grab-lighter.md) -[Make a swing with rope and jacket](enjoy-DreamRide/ride.md) +[make a swing with rope and jacket](enjoy-DreamRide/ride.md) [Start eating the walls?](eating-walls/eating-marshmallows.md) -[Give the marshmallow to the polar bear?](polar-bear/polar-bear.md) +[give the marshmallow to the polar bear?](polar-bear/polar-bear.md) -[Realize you are in Minecraft](you-are-in-minecraft/minecraft.md) +[realize you are in Minecraft](you-are-in-minecraft/minecraft.md) [Try to pull a MacGyver with the lighter, fork and rope?](macgyver/macgyver.md) @@ -192,7 +188,7 @@ Do you: [Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) -[Dig a hole with your bare hands?](hands/hands.md) +[dig a hole with your bare hands?](hands/hands.md) [Go back to sleep?](sleep/marshmallow.md) @@ -226,7 +222,7 @@ Do you: [Go meditate and ponder about your next step?](meditate/meditate.md) -[Scream out of fear?](scream/scream.md) +[U will scream out of fear?](scream/scream.md) [Get to work on the best batch of cookies ever made?](bake-cookies/cookies.md) @@ -252,13 +248,13 @@ Do you: [Remember that pill you took](adipose/adipose.md) -[Light up the wall](light-up/light-up.md) +[light up the wall](light-up/light-up.md) -[Hide the lighter fork and rope in your pocket](hide/hide-chk.md) +[hide the lighter fork and rope in your pocket](hide/hide-chk.md) -[Make a necklace out of the marshmallows](necklace/necklace.md) +[make a necklace out of the marshmallows](necklace/necklace.md) -[Light up the wall 2](light-up2/light-up2.md) +[light up the wall 2](light-up2/light-up2.md) [Switch on your laptop and..](netflix/netflix.md) @@ -334,7 +330,7 @@ Do you: [Make a Marshmallow cake](https://www.youtube.com/watch?v=3l1SY3QREv4) -[I'm Batman](I'm-batman/batman.md) +[I'm batman](I'm-batman/batman.md) [You realize you are in NeverLand and you are never going come... so you sing the Tinker Bell song](https://youtu.be/Sopngy6uucw) @@ -363,7 +359,7 @@ Do you: [Twas the Night Before Christmas](night-night/tale.md) -[Check Reddit for any useful information.](reddit/ask-reddit.md) +[heck Reddit for any useful information.](reddit/ask-reddit.md) [Watch Up](watch-movie/Up.md) @@ -391,7 +387,7 @@ Do you: [Ask a question on Quora?](ask-on-quora/ask-on-quora.md) -[Go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) +[go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) [Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) @@ -404,7 +400,6 @@ Do you: [You Google what to do](https://www.google.co.in/) [Abdul kalam quotes on overcoming fear](apj/apj.md) - [If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) [There's no such thing as a free lunch.](free-lunch/free-lunch.md) @@ -453,6 +448,4 @@ Do you: [Bounce](bounce/bounce.md) -[Play some DotA 2](play-dota2/play-dota2.md) - [See if there is a Udacity course on the subject](udacity/udacity.md) From fc70292a0ad06c22824dbe4cacefd512c22f6a87 Mon Sep 17 00:00:00 2001 From: kvo180 Date: Wed, 26 Aug 2015 19:36:05 -0700 Subject: [PATCH 0753/5486] Fix issues with marshmallo.md file --- english/marshmallow.md | 57 ++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 43adaea18e..1bf4281d6d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -9,9 +9,7 @@ For a second, you decide whether or not to just [go back to sleep](go-back-to-sl A sound from a Hitchcock movie fills the room, then quickly fades away. Thinking back, there are no memories to suggest that this should have been - anything but an ordinary morning. You didn't go out last night, you don't - usually take intoxicants, what's happening...? But it's probably not worth dwelling on that right now, you could be in danger. @@ -20,15 +18,23 @@ Grave danger. Oh No! *(Is there another kind?)* +I actually used to know a guy named Dave Granger. We sure had some good times! Anyway, the possibility of danger lurks. + The type of extreme mortal danger that so often accompanies confectionary inspired interior design. Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. -[pinch yourself to see if this is a dream](./is-this-a-dream/is-this-a-dream.md) +[Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) -[remember that you are superman](./remember-you-are-superman/remember-you-are-superman.md) +You recall what a man said to you once: "Live as one of them, Kal-El, to discover +where your strength and your power are needed. Always hold in your heart the +pride of your special heritage. They can be a great people, Kal-El; they wish to +be. They only lack the light to show the way. For this reason above all, their +capacity for good, I have sent them you... my only son." -[Interrogate the man for clues](./movie-ripoffs/zoolander/zoolander.md) +[Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) + +[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) These marshmallows are numerous and they look so delicious. ... despite the feeling they're somehow judging you for only wearing one sock. @@ -37,13 +43,13 @@ You reach out to grab a handful of the marshmallow wall, but you can't seem to t You also seem to be wearing an uncomfortable and restrictive jacket made of leather... -[You decide to bite the marshmallow wall](./bite-the-marshmallow/tasty-marshmallow.md) +[You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) You are feeling very anxious at this point. This is because you do not like leather for ethical reasons. -You begin to breakout of the jacket and find a lighter, a fork, and rope. +You begin to break out of the jacket and find a lighter, a fork, and rope. You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. @@ -55,15 +61,15 @@ But you have a growing sense that these mundane objects are vital to your surviv You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. -You have the suspicion that you are being closely watched. +[You have the suspicion that you are being closely watched.](./watched/watched.md) -[Of course, it's that man on the sofa, go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) +[Of course, it's that man on the sofa; go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) [Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) You see a polar bear searching for food. -"Well- OK" you admit to yourself, "Perhaps I do indulge in the occasional intoxicant!" +"Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" You hear a small bird sound in the distance. @@ -85,7 +91,7 @@ Marshmallows are going to rule the world! Long live marshmallows! -Hold the image of the marshmallow and.. +Hold the image of the marshmallow and... Sing softly the song of it's people as you... @@ -107,7 +113,7 @@ Nothing seems to be happening. Sheepishly you look down on the crappy wand in your hand. -You must be doing something wrong, you drink a beer and think about it, then Ah-ha! +You must be doing something wrong. You drink a beer and think about it, then Ah-ha! You notice your pants are now glowing, so you must have been holding the wand upside down. @@ -170,13 +176,13 @@ Do you: [Grab the lighter first?](lighter/grab-lighter.md) -[make a swing with rope and jacket](enjoy-DreamRide/ride.md) +[Make a swing with rope and jacket](enjoy-DreamRide/ride.md) [Start eating the walls?](eating-walls/eating-marshmallows.md) -[give the marshmallow to the polar bear?](polar-bear/polar-bear.md) +[Give the marshmallow to the polar bear?](polar-bear/polar-bear.md) -[realize you are in Minecraft](you-are-in-minecraft/minecraft.md) +[Realize you are in Minecraft](you-are-in-minecraft/minecraft.md) [Try to pull a MacGyver with the lighter, fork and rope?](macgyver/macgyver.md) @@ -188,7 +194,7 @@ Do you: [Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) -[dig a hole with your bare hands?](hands/hands.md) +[Dig a hole with your bare hands?](hands/hands.md) [Go back to sleep?](sleep/marshmallow.md) @@ -222,7 +228,7 @@ Do you: [Go meditate and ponder about your next step?](meditate/meditate.md) -[U will scream out of fear?](scream/scream.md) +[Scream out of fear?](scream/scream.md) [Get to work on the best batch of cookies ever made?](bake-cookies/cookies.md) @@ -248,13 +254,13 @@ Do you: [Remember that pill you took](adipose/adipose.md) -[light up the wall](light-up/light-up.md) +[Light up the wall](light-up/light-up.md) -[hide the lighter fork and rope in your pocket](hide/hide-chk.md) +[Hide the lighter fork and rope in your pocket](hide/hide-chk.md) -[make a necklace out of the marshmallows](necklace/necklace.md) +[Make a necklace out of the marshmallows](necklace/necklace.md) -[light up the wall 2](light-up2/light-up2.md) +[Light up the wall 2](light-up2/light-up2.md) [Switch on your laptop and..](netflix/netflix.md) @@ -330,7 +336,7 @@ Do you: [Make a Marshmallow cake](https://www.youtube.com/watch?v=3l1SY3QREv4) -[I'm batman](I'm-batman/batman.md) +[I'm Batman](I'm-batman/batman.md) [You realize you are in NeverLand and you are never going come... so you sing the Tinker Bell song](https://youtu.be/Sopngy6uucw) @@ -359,7 +365,7 @@ Do you: [Twas the Night Before Christmas](night-night/tale.md) -[heck Reddit for any useful information.](reddit/ask-reddit.md) +[Check Reddit for any useful information.](reddit/ask-reddit.md) [Watch Up](watch-movie/Up.md) @@ -387,7 +393,7 @@ Do you: [Ask a question on Quora?](ask-on-quora/ask-on-quora.md) -[go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) +[Go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) [Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) @@ -400,6 +406,7 @@ Do you: [You Google what to do](https://www.google.co.in/) [Abdul kalam quotes on overcoming fear](apj/apj.md) + [If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) [There's no such thing as a free lunch.](free-lunch/free-lunch.md) @@ -448,4 +455,6 @@ Do you: [Bounce](bounce/bounce.md) +[Play some DotA 2](play-dota2/play-dota2.md) + [See if there is a Udacity course on the subject](udacity/udacity.md) From e6af9ba73586c8919a4da733cad3f109429a03ba Mon Sep 17 00:00:00 2001 From: James Underwood Date: Wed, 26 Aug 2015 21:11:41 -0700 Subject: [PATCH 0754/5486] Add the 'grab for the highest branch' to wait.md link --- english/macgyver/light-rope-on-fire/wait/wait.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/macgyver/light-rope-on-fire/wait/wait.md b/english/macgyver/light-rope-on-fire/wait/wait.md index 9d7f190b3a..72aa42c9db 100644 --- a/english/macgyver/light-rope-on-fire/wait/wait.md +++ b/english/macgyver/light-rope-on-fire/wait/wait.md @@ -17,4 +17,6 @@ Do you: [Close your eyes and hope for the best](../../../experience/experience.md) -[Aim for a soft landing on the forest floor](../../../find-exit/into-forest/forest.md) \ No newline at end of file +[Aim for a soft landing on the forest floor](../../../find-exit/into-forest/forest.md) + +[place the fork in your teeth and grab for the highest branches!](../../../forest-canopy.md) \ No newline at end of file From f6e839a9ca57af8558fc433eaabfdd255016cb40 Mon Sep 17 00:00:00 2001 From: James Underwood Date: Wed, 26 Aug 2015 21:25:55 -0700 Subject: [PATCH 0755/5486] Add english/forest-canopy/forest-canopy.md story page --- english/forest-canopy/forest-canopy.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/forest-canopy/forest-canopy.md diff --git a/english/forest-canopy/forest-canopy.md b/english/forest-canopy/forest-canopy.md new file mode 100644 index 0000000000..bd6b7d9607 --- /dev/null +++ b/english/forest-canopy/forest-canopy.md @@ -0,0 +1,5 @@ +With your fork placed firmly between your clenched jaws you grab for the highest branch. + +You smash through the canopy, but are able to grab for something soft and swing from it like a vine. + +Looking at the vine, the vine looks back at you! It's a snake! Oh noes! \ No newline at end of file From a5f5a27cac8cf4c92a46e1684e257b185e81883c Mon Sep 17 00:00:00 2001 From: James Underwood Date: Wed, 26 Aug 2015 21:32:33 -0700 Subject: [PATCH 0756/5486] Fix capitalization at forest-canopy option --- english/macgyver/light-rope-on-fire/wait/wait.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/macgyver/light-rope-on-fire/wait/wait.md b/english/macgyver/light-rope-on-fire/wait/wait.md index 72aa42c9db..c9bc3e2183 100644 --- a/english/macgyver/light-rope-on-fire/wait/wait.md +++ b/english/macgyver/light-rope-on-fire/wait/wait.md @@ -19,4 +19,4 @@ Do you: [Aim for a soft landing on the forest floor](../../../find-exit/into-forest/forest.md) -[place the fork in your teeth and grab for the highest branches!](../../../forest-canopy.md) \ No newline at end of file +[Place the fork in your teeth and grab for the highest branches!](../../../forest-canopy.md) \ No newline at end of file From cd751026804dba1dac4819715cba0bdbc67e7a06 Mon Sep 17 00:00:00 2001 From: James Underwood Date: Wed, 26 Aug 2015 21:34:42 -0700 Subject: [PATCH 0757/5486] Fix forest-canopy link to point at correct file --- english/macgyver/light-rope-on-fire/wait/wait.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/macgyver/light-rope-on-fire/wait/wait.md b/english/macgyver/light-rope-on-fire/wait/wait.md index c9bc3e2183..716a24e2b6 100644 --- a/english/macgyver/light-rope-on-fire/wait/wait.md +++ b/english/macgyver/light-rope-on-fire/wait/wait.md @@ -19,4 +19,4 @@ Do you: [Aim for a soft landing on the forest floor](../../../find-exit/into-forest/forest.md) -[Place the fork in your teeth and grab for the highest branches!](../../../forest-canopy.md) \ No newline at end of file +[Place the fork in your teeth and grab for the highest branches!](../../../forest-canopy/forest-canopy.md) \ No newline at end of file From 35c40afbb1b08e4cd4043b6ba7d9d9fecf5885ec Mon Sep 17 00:00:00 2001 From: mariap Date: Thu, 27 Aug 2015 11:47:37 +0300 Subject: [PATCH 0758/5486] Add option set marshmallow on fire for greek story version --- .../offer_marshmallow_a_cigar.md | 8 +++++++- .../set_it_on_fire/set_it_on_fire.md | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md diff --git a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md index 5537f477ec..d332cf1544 100644 --- a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md +++ b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md @@ -1,4 +1,10 @@ Βγάζεις το πακέτο σου και προσφέρεις στο σαστισμένο χέρι τσιγάρο. Τεντώνει όλα τα δάχτυλα του και καταλαβαίνεις ότι έχει εκπλαγεί. Γελάς δυνατά και του λες περιπαικτικά ότι ακόμη και σ'ένα δωμάτιο από ζαχαρωτά, -υπάρχει ένας αγενής Έλληνας καπνιστής.' \ No newline at end of file +υπάρχει ένας αγενής Έλληνας καπνιστής.' + +Αφου καπνίσεις το τσιγάρο που το ζαχαρωτό χέρι αρνήθηκε σκέφτεσαι +πως είναι ώρα να βγεις από εκεί. Πόρτα δεν υπάρχει οπότε πρέπει +να χρησιμοποιήσεις κάτι από αυτά που έχεις. Τι κάνεις; + +[Ανάβεις τον αναπτήρα](set_it_on_fire/set-it-on-fire.md) \ No newline at end of file diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md new file mode 100644 index 0000000000..b28f1c1f84 --- /dev/null +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md @@ -0,0 +1,3 @@ +Ανάβεις τον αναπτήρα, ψήνεις το χέρι και το τρως. +Συνεχίζεις με τους τοίχους μέχρι που δημιουργείς ένα άνοιγμα +που σε χωράει. \ No newline at end of file From 193c742bb39c87bd216684128df02608d1d7fdbb Mon Sep 17 00:00:00 2001 From: mariap Date: Thu, 27 Aug 2015 12:11:34 +0300 Subject: [PATCH 0759/5486] Fix typo, replace - with _ in set-it-on-fire.md option --- greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md index d332cf1544..5910a2b6e4 100644 --- a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md +++ b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md @@ -7,4 +7,5 @@ πως είναι ώρα να βγεις από εκεί. Πόρτα δεν υπάρχει οπότε πρέπει να χρησιμοποιήσεις κάτι από αυτά που έχεις. Τι κάνεις; -[Ανάβεις τον αναπτήρα](set_it_on_fire/set-it-on-fire.md) \ No newline at end of file +[Ανάβεις τον αναπτήρα](set_it_on_fire/set_it_on_fire.md) +[Βγάζεις την κάλτσα σου](put_socks_off/put-socks-off.md) \ No newline at end of file From b65a1f1fd2c91947b8d84bd06df9fd1c76011a1c Mon Sep 17 00:00:00 2001 From: mariap Date: Thu, 27 Aug 2015 12:13:14 +0300 Subject: [PATCH 0760/5486] Fix invalid paste, remove invalid link option --- greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md index 5910a2b6e4..913e93353a 100644 --- a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md +++ b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md @@ -7,5 +7,4 @@ πως είναι ώρα να βγεις από εκεί. Πόρτα δεν υπάρχει οπότε πρέπει να χρησιμοποιήσεις κάτι από αυτά που έχεις. Τι κάνεις; -[Ανάβεις τον αναπτήρα](set_it_on_fire/set_it_on_fire.md) -[Βγάζεις την κάλτσα σου](put_socks_off/put-socks-off.md) \ No newline at end of file +[Ανάβεις τον αναπτήρα](set_it_on_fire/set_it_on_fire.md) \ No newline at end of file From f7e461c4d7f88f3040aef445952acb5f110a8154 Mon Sep 17 00:00:00 2001 From: theoyoung Date: Thu, 27 Aug 2015 18:29:07 +0900 Subject: [PATCH 0761/5486] Add my story(?) --- english/marshmallow.md | 2 ++ english/young/young.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/young/young.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 1bf4281d6d..e97e9e0a6c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -458,3 +458,5 @@ Do you: [Play some DotA 2](play-dota2/play-dota2.md) [See if there is a Udacity course on the subject](udacity/udacity.md) + +Click [here](young/young.md) to listen to music. diff --git a/english/young/young.md b/english/young/young.md new file mode 100644 index 0000000000..6d51726587 --- /dev/null +++ b/english/young/young.md @@ -0,0 +1 @@ +Clikc Chopin Waltz (https://www.youtube.com/watch?v=VyBxps3BgYc) to listen. From 60ec60526a8a9e34be67926aa81c845e13260d2e Mon Sep 17 00:00:00 2001 From: Galyna Kriukova Date: Thu, 27 Aug 2015 23:35:01 +0200 Subject: [PATCH 0762/5486] Ask what was that? --- ukrainian/dream/stranger/carroll.md | 1 + ukrainian/dream/stranger/talk-to/talk-to.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 ukrainian/dream/stranger/talk-to/talk-to.md diff --git a/ukrainian/dream/stranger/carroll.md b/ukrainian/dream/stranger/carroll.md index b7fa1f27f9..9c097630c4 100644 --- a/ukrainian/dream/stranger/carroll.md +++ b/ukrainian/dream/stranger/carroll.md @@ -1 +1,2 @@ Ви впізнаєте цього чоловіка: звісно, це Льюїс Керролл. Він хитро всміхається, підморгує Вам і жує зефір. +Ви дуже здивовані та [talk-to/talk-to.md](хочете запитати в нього що то було?) \ No newline at end of file diff --git a/ukrainian/dream/stranger/talk-to/talk-to.md b/ukrainian/dream/stranger/talk-to/talk-to.md new file mode 100644 index 0000000000..c79eba3818 --- /dev/null +++ b/ukrainian/dream/stranger/talk-to/talk-to.md @@ -0,0 +1,2 @@ +Ви звертаєтеся до нього, але він посміхається і раптово зникає... +А Ви знову [../../../marshmallow.md](опиняєтеся в дивній кімнаті). \ No newline at end of file From 1cf34bfd6830ce318ee152ff9f8a23e397a3d548 Mon Sep 17 00:00:00 2001 From: Galyna Kriukova Date: Thu, 27 Aug 2015 23:38:40 +0200 Subject: [PATCH 0763/5486] Fixed links --- ukrainian/dream/stranger/carroll.md | 2 +- ukrainian/dream/stranger/talk-to/talk-to.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ukrainian/dream/stranger/carroll.md b/ukrainian/dream/stranger/carroll.md index 9c097630c4..ccbbff280b 100644 --- a/ukrainian/dream/stranger/carroll.md +++ b/ukrainian/dream/stranger/carroll.md @@ -1,2 +1,2 @@ Ви впізнаєте цього чоловіка: звісно, це Льюїс Керролл. Він хитро всміхається, підморгує Вам і жує зефір. -Ви дуже здивовані та [talk-to/talk-to.md](хочете запитати в нього що то було?) \ No newline at end of file +Ви дуже здивовані та [хочете запитати в нього що то було?](talk-to/talk-to.md) \ No newline at end of file diff --git a/ukrainian/dream/stranger/talk-to/talk-to.md b/ukrainian/dream/stranger/talk-to/talk-to.md index c79eba3818..44dcaa8678 100644 --- a/ukrainian/dream/stranger/talk-to/talk-to.md +++ b/ukrainian/dream/stranger/talk-to/talk-to.md @@ -1,2 +1,2 @@ Ви звертаєтеся до нього, але він посміхається і раптово зникає... -А Ви знову [../../../marshmallow.md](опиняєтеся в дивній кімнаті). \ No newline at end of file +А Ви знову [опиняєтеся в дивній кімнаті](../../../marshmallow.md). \ No newline at end of file From aa6a4911dd1853659724e2422d527dcc24a80097 Mon Sep 17 00:00:00 2001 From: Oleksandr Lukash Date: Fri, 28 Aug 2015 00:46:43 +0300 Subject: [PATCH 0764/5486] Add option about dwarf --- .../break-through-wall-again/break-through-wall-again.md | 1 + .../continue-eating/wait/go-with-dwarf/go-with-dwarf.md | 4 ++++ .../try-the-taste/continue-eating/wait/wait.md | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 ukrainian/break-through-wall/try-the-taste/continue-eating/wait/break-through-wall-again/break-through-wall-again.md create mode 100644 ukrainian/break-through-wall/try-the-taste/continue-eating/wait/go-with-dwarf/go-with-dwarf.md diff --git a/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/break-through-wall-again/break-through-wall-again.md b/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/break-through-wall-again/break-through-wall-again.md new file mode 100644 index 0000000000..ac73cdcf56 --- /dev/null +++ b/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/break-through-wall-again/break-through-wall-again.md @@ -0,0 +1 @@ + [ ](../../../../../marshmallow.md) \ No newline at end of file diff --git a/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/go-with-dwarf/go-with-dwarf.md b/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/go-with-dwarf/go-with-dwarf.md new file mode 100644 index 0000000000..4b0dbcafbe --- /dev/null +++ b/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/go-with-dwarf/go-with-dwarf.md @@ -0,0 +1,4 @@ + , , + . + - ! - . + - ! - 쳺, . \ No newline at end of file diff --git a/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/wait.md b/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/wait.md index b5db0cb336..ad579dbe64 100644 --- a/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/wait.md +++ b/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/wait.md @@ -1,2 +1,6 @@ Ви чекаєте. І тут раптом чуєте гуркіт, обертаєтесь і бачите, що стіна пробита. -Через отвір видно постать гнома. Він запрошує вас зайти до себе. \ No newline at end of file +Через отвір видно постать гнома. Він запрошує вас зайти до себе. + +Приймаєте запрошення гнома і [заходите](go-with-dwarf/go-with-dwarf.md) у діру... + +З диким ревом б'єте гнома по голові і знову намагаєтеся [пробити стіну](break-through-wall-again/break-through-wall-again.md)... \ No newline at end of file From ec6c204d20e50ebe9a1a541e7caf383704d2d5b4 Mon Sep 17 00:00:00 2001 From: Oleksandr Lukash Date: Fri, 28 Aug 2015 00:59:39 +0300 Subject: [PATCH 0765/5486] Fix option about dwarf --- .../try-the-taste/continue-eating/wait/wait.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/wait.md b/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/wait.md index ad579dbe64..53b64972e3 100644 --- a/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/wait.md +++ b/ukrainian/break-through-wall/try-the-taste/continue-eating/wait/wait.md @@ -3,4 +3,5 @@ Приймаєте запрошення гнома і [заходите](go-with-dwarf/go-with-dwarf.md) у діру... -З диким ревом б'єте гнома по голові і знову намагаєтеся [пробити стіну](break-through-wall-again/break-through-wall-again.md)... \ No newline at end of file +З диким ревом б'єте гнома по голові і знову намагаєтеся +[пробити стіну](break-through-wall-again/break-through-wall-again.md)... From 830ca58f40db96050c9d045c353152994e4d757b Mon Sep 17 00:00:00 2001 From: Joe Korbel Date: Thu, 27 Aug 2015 18:54:23 -0400 Subject: [PATCH 0766/5486] Add a sentence to the marshmallow's life. --- english/wake-up/wake-up-again/dream2/dream2.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/wake-up/wake-up-again/dream2/dream2.md b/english/wake-up/wake-up-again/dream2/dream2.md index ee3da354e6..efb7702a97 100644 --- a/english/wake-up/wake-up-again/dream2/dream2.md +++ b/english/wake-up/wake-up-again/dream2/dream2.md @@ -2,4 +2,6 @@ You look up and see beautiful blue sky. It is a bright sunny day. You look around and you see big white cyclinders everywhere on all four sides. Suddenly an aircraft flies by. In the shiny underbelly of the airplane you see a sea of white cyclinders stretched across the landscape. -You realize that you are just a marshmallow among thousands in a vast island of marshmallows. \ No newline at end of file +You realize that you are just a marshmallow among thousands in a vast island of marshmallows. +The another marshmallow takes you to the marshmallow chief, who explains to you that +the dangers of sticks. \ No newline at end of file From d0f99a54947fc67c79981dc64bb96f8a4249f874 Mon Sep 17 00:00:00 2001 From: Joe Korbel Date: Thu, 27 Aug 2015 18:57:18 -0400 Subject: [PATCH 0767/5486] Fix typo in marshmallow story --- english/wake-up/wake-up-again/dream2/dream2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/wake-up/wake-up-again/dream2/dream2.md b/english/wake-up/wake-up-again/dream2/dream2.md index efb7702a97..d25ca90b59 100644 --- a/english/wake-up/wake-up-again/dream2/dream2.md +++ b/english/wake-up/wake-up-again/dream2/dream2.md @@ -3,5 +3,5 @@ You look around and you see big white cyclinders everywhere on all four sides. Suddenly an aircraft flies by. In the shiny underbelly of the airplane you see a sea of white cyclinders stretched across the landscape. You realize that you are just a marshmallow among thousands in a vast island of marshmallows. -The another marshmallow takes you to the marshmallow chief, who explains to you that +Another marshmallow takes you to the marshmallow chief, who explains to you that the dangers of sticks. \ No newline at end of file From a55698d107c2aa8848cdece85af6f39e5b729bdf Mon Sep 17 00:00:00 2001 From: Martin Laskowski Date: Thu, 27 Aug 2015 21:47:50 -0700 Subject: [PATCH 0768/5486] Extent 'zagwizdaj' story stub and add two new choices --- .../gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md | 10 ++++++++++ .../zbadajgwizdek/zagwizdaj/zmarkerem/zgumka/zgumka.md | 1 + .../zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md | 1 + 3 files changed, 12 insertions(+) create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zgumka/zgumka.md create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md index 4603955ddb..9a2949b9e0 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md @@ -1,3 +1,13 @@ Nagle pojawia się postać ze skrzydłami. Gwałtownym ruchem chwyta Cię za rękę i momentalnie przenosicie się na ogrąmną łąkę na której jest tylko jedno, samotne drzewo. + + +Skrzydlata postać podchodzi do małej tablicy przymocowanej do drzewa i robi zaznaczenie +obok rysunku gwizdka. Postać uśmiecha się życzliwie i znika w wiatr. Gwizdek w dłoni +staje się ciepły i zmienia się w duży marker do tablicy. + + +[Myśląc że zaczynasz rozumieć jak się gra, zbliżasz się do tablicy zdejmujac pokrywke z markera](zmarkerem/zmarkerem.md) + +[Przestraszony przez tych dziwnych wydarzeń, sięgasz po gumke do tablicy](zgumka/zgumka.md) \ No newline at end of file diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zgumka/zgumka.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zgumka/zgumka.md new file mode 100644 index 0000000000..2abe2f8a49 --- /dev/null +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zgumka/zgumka.md @@ -0,0 +1 @@ +Gumka jest zimny jak podnosisz ją do tablicy. \ No newline at end of file diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md new file mode 100644 index 0000000000..2e24c04f11 --- /dev/null +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md @@ -0,0 +1 @@ +Marker wydaje się chętni do wykorzystania jak twoja ręka zbliża się do tablicy. \ No newline at end of file From bedc0ae8cab6861d4ffaa857174eefd05fd534a0 Mon Sep 17 00:00:00 2001 From: Martin Laskowski Date: Thu, 27 Aug 2015 21:53:49 -0700 Subject: [PATCH 0769/5486] Move 'zgumka' folder out of its sibling and into its parent --- .../zbadajgwizdek/zagwizdaj/{zmarkerem => }/zgumka/zgumka.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/{zmarkerem => }/zgumka/zgumka.md (100%) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zgumka/zgumka.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zgumka/zgumka.md similarity index 100% rename from Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zgumka/zgumka.md rename to Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zgumka/zgumka.md From 128228b00c83172b87a75b069f73ff33d79ffaaf Mon Sep 17 00:00:00 2001 From: Thanawat Hanthog Date: Fri, 28 Aug 2015 15:42:40 +0700 Subject: [PATCH 0770/5486] Add an options on callher --- Thai/Songs/callher/callher.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Thai/Songs/callher/callher.md b/Thai/Songs/callher/callher.md index 33ec5fc083..2ad2a00e2f 100644 --- a/Thai/Songs/callher/callher.md +++ b/Thai/Songs/callher/callher.md @@ -21,3 +21,6 @@ ที่ระยองนี่แล้วล่ะ" "สงสัยฟ้าจะลิขิตให้รับงานนี้แล้วล่ะ" คุณตอบเธอและนัดวันที่จะไปฟังรายละเอียด งานในสัปดาห์หน้า + +คุณจะ: +[ไปตามนัด](./callher/callher.md) From 83b0ea7a2e6a35c14b16dce488f5a02abf65424d Mon Sep 17 00:00:00 2001 From: Thanawat Hanthog Date: Fri, 28 Aug 2015 15:47:13 +0700 Subject: [PATCH 0771/5486] Change a link in option on callhere and add a sentence on job file --- Thai/Songs/callher/callher.md | 2 +- Thai/Songs/callher/job.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Thai/Songs/callher/job.md diff --git a/Thai/Songs/callher/callher.md b/Thai/Songs/callher/callher.md index 2ad2a00e2f..92b329c1ca 100644 --- a/Thai/Songs/callher/callher.md +++ b/Thai/Songs/callher/callher.md @@ -23,4 +23,4 @@ งานในสัปดาห์หน้า คุณจะ: -[ไปตามนัด](./callher/callher.md) +[ไปตามนัด](./callher/job.md) diff --git a/Thai/Songs/callher/job.md b/Thai/Songs/callher/job.md new file mode 100644 index 0000000000..c37892960c --- /dev/null +++ b/Thai/Songs/callher/job.md @@ -0,0 +1 @@ +เมื่อถึงวันนัดคุณก็ออกเดินทางไปหาที่สวน From d6230c4fb7d3c776160f7e73c710db44ec083a69 Mon Sep 17 00:00:00 2001 From: Thanawat Hanthog Date: Fri, 28 Aug 2015 15:54:55 +0700 Subject: [PATCH 0772/5486] Fix the link in callhere --- Thai/Songs/callher/callher.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thai/Songs/callher/callher.md b/Thai/Songs/callher/callher.md index 92b329c1ca..4e022d7986 100644 --- a/Thai/Songs/callher/callher.md +++ b/Thai/Songs/callher/callher.md @@ -23,4 +23,4 @@ งานในสัปดาห์หน้า คุณจะ: -[ไปตามนัด](./callher/job.md) +[ไปตามนัด](./job.md) From c4aae8a8d6376dae542191fa3c03080ab72a3687 Mon Sep 17 00:00:00 2001 From: Thanawat Hanthog Date: Fri, 28 Aug 2015 15:58:10 +0700 Subject: [PATCH 0773/5486] Fix dir --- Thai/Songs/callher/job.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Thai/Songs/callher/job.md diff --git a/Thai/Songs/callher/job.md b/Thai/Songs/callher/job.md deleted file mode 100644 index c37892960c..0000000000 --- a/Thai/Songs/callher/job.md +++ /dev/null @@ -1 +0,0 @@ -เมื่อถึงวันนัดคุณก็ออกเดินทางไปหาที่สวน From a32b494829270d6b0f8b4c5ea21364f4a1c05ec3 Mon Sep 17 00:00:00 2001 From: Thanawat Hanthog Date: Fri, 28 Aug 2015 16:00:07 +0700 Subject: [PATCH 0774/5486] Fix the option in callher --- Thai/Songs/callher/callher.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thai/Songs/callher/callher.md b/Thai/Songs/callher/callher.md index 4e022d7986..6b9470c498 100644 --- a/Thai/Songs/callher/callher.md +++ b/Thai/Songs/callher/callher.md @@ -23,4 +23,4 @@ งานในสัปดาห์หน้า คุณจะ: -[ไปตามนัด](./job.md) +[ไปตามนัด](./../job/job.md) From 7db30a9b26a5c6a78be2391d08da6f7b2baa6209 Mon Sep 17 00:00:00 2001 From: Thanawat Hanthog Date: Fri, 28 Aug 2015 16:02:51 +0700 Subject: [PATCH 0775/5486] move job to job folder --- Thai/Songs/callher/job.md | 1 + Thai/Songs/job/job.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 Thai/Songs/callher/job.md create mode 100644 Thai/Songs/job/job.md diff --git a/Thai/Songs/callher/job.md b/Thai/Songs/callher/job.md new file mode 100644 index 0000000000..c37892960c --- /dev/null +++ b/Thai/Songs/callher/job.md @@ -0,0 +1 @@ +เมื่อถึงวันนัดคุณก็ออกเดินทางไปหาที่สวน diff --git a/Thai/Songs/job/job.md b/Thai/Songs/job/job.md new file mode 100644 index 0000000000..c37892960c --- /dev/null +++ b/Thai/Songs/job/job.md @@ -0,0 +1 @@ +เมื่อถึงวันนัดคุณก็ออกเดินทางไปหาที่สวน From c6f9c77125cca8450ce85cf9d4a3b4e5f284c037 Mon Sep 17 00:00:00 2001 From: Thanawat Hanthog Date: Fri, 28 Aug 2015 16:03:58 +0700 Subject: [PATCH 0776/5486] Delete job in callher folder --- Thai/Songs/callher/job.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Thai/Songs/callher/job.md diff --git a/Thai/Songs/callher/job.md b/Thai/Songs/callher/job.md deleted file mode 100644 index c37892960c..0000000000 --- a/Thai/Songs/callher/job.md +++ /dev/null @@ -1 +0,0 @@ -เมื่อถึงวันนัดคุณก็ออกเดินทางไปหาที่สวน From 8d0c1b0b55f8231291ee1cd20d1595042f61bf24 Mon Sep 17 00:00:00 2001 From: splane Date: Fri, 28 Aug 2015 11:54:20 +0100 Subject: [PATCH 0777/5486] Add option to eat walls after having coffee --- english/coffee/coffee.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/coffee/coffee.md b/english/coffee/coffee.md index 7bdac5eb15..ba867beab6 100644 --- a/english/coffee/coffee.md +++ b/english/coffee/coffee.md @@ -33,6 +33,7 @@ After having your coffee do you want to: [Bake yourself something sweet to go with this delicious brew?](cookie/bake-cookies.md) +[Start eating the walls?](../eating-walls/eating-marshmallows.md) [Eat a Bagel?](bagel/eat-a-bagel.md) From b8f741dc8df1f546baa918a811ba58393065122f Mon Sep 17 00:00:00 2001 From: escolmebartlebooth Date: Fri, 28 Aug 2015 14:40:11 +0100 Subject: [PATCH 0778/5486] add cycle_backwards segway --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index e97e9e0a6c..502b1e3d39 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -69,6 +69,8 @@ You decide to try to light a fire to melt some of the marshmallows so you look f You see a polar bear searching for food. +[Whilst cycling backwards.](./cycling-backwards/cycling-backwards.md) + "Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" You hear a small bird sound in the distance. From ba48ccb4f31b101991239a563447de6e6b49130d Mon Sep 17 00:00:00 2001 From: escolmebartlebooth Date: Fri, 28 Aug 2015 14:41:05 +0100 Subject: [PATCH 0779/5486] add new file for cycle backwards --- english/cycling-backwards/cycling-backwards.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/cycling-backwards/cycling-backwards.md diff --git a/english/cycling-backwards/cycling-backwards.md b/english/cycling-backwards/cycling-backwards.md new file mode 100644 index 0000000000..9a01de658e --- /dev/null +++ b/english/cycling-backwards/cycling-backwards.md @@ -0,0 +1,4 @@ +It has long been rumoured that Polar Bears can cycle and moreover, cycle backwards. In reverse. + +[That's got to be horse...note to self.](../marshmallow.md) + From 7fdef2358ec8e448af3efbf8a71080ed6804c58e Mon Sep 17 00:00:00 2001 From: softtek Date: Fri, 28 Aug 2015 11:22:38 -0500 Subject: [PATCH 0780/5486] =?UTF-8?q?Agrega=20nueva=20l=C3=ADnea=20a=20la?= =?UTF-8?q?=20historia.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/muralla/abrir/abrir.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/muralla/abrir/abrir.md b/espanol/muralla/abrir/abrir.md index fa4b3d5623..7124d8c948 100644 --- a/espanol/muralla/abrir/abrir.md +++ b/espanol/muralla/abrir/abrir.md @@ -4,6 +4,8 @@ En ese momento sintió que la piernas le temblaban y apresuradamente gritó: "¡Corred todo lo rápido que podáis!" +En su interior aún esperaba oír las buenas noticias y que todo volviera a estar en paz. + Sin embargo, estaba claro que el ejército enemigo llegaría a la ciudad antes de los soldados. Beatito decidió: From 250d61178509f05ea513b0d6a23a5b2bd041bcca Mon Sep 17 00:00:00 2001 From: Thomas Yancy Date: Fri, 28 Aug 2015 13:20:02 -0400 Subject: [PATCH 0781/5486] update batman --- english/I'm-batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index 188242fb0a..04e36016f8 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -1,3 +1,5 @@ Did you know that your parents died and you are left with Wayne Manor? Golly Gosh Batman! +Be careful of the Joker! + [Realize that you are Batman and have the Utility Belt on you. Yeah!!!](https://youtu.be/YpIQQeL2ZYk?t=22s) From 407d3589d382b7b60d5ef3f6614693c0ebe7616e Mon Sep 17 00:00:00 2001 From: Lance Kindle Date: Fri, 28 Aug 2015 10:32:09 -0700 Subject: [PATCH 0782/5486] apparate to hogwarts --- english/pinch/magic/harry-potter.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/pinch/magic/harry-potter.md b/english/pinch/magic/harry-potter.md index 37f01a24b4..0a53a4a695 100644 --- a/english/pinch/magic/harry-potter.md +++ b/english/pinch/magic/harry-potter.md @@ -3,3 +3,5 @@ Hogwarts School of Witchcraft and Wizadry. You try to remember some magic from the harry potter books that you have read so many times by now. + +[try apparating](../../movie-ripoffs/hogwarts/hogwarts.md) From 39781590a330438fec65ccc75269232b6d830365 Mon Sep 17 00:00:00 2001 From: Rashed Doha Date: Fri, 28 Aug 2015 23:55:21 +0600 Subject: [PATCH 0783/5486] Added Zack Snyder story --- .../remember-you-are-superman.md | 3 ++- .../zack-snyder-movie/do-you-bleed/do-you-bleed.md | 5 +++++ .../zack-snyder-movie/zack-snyder-movie.md | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/do-you-bleed.md create mode 100644 english/remember-you-are-superman/zack-snyder-movie/zack-snyder-movie.md diff --git a/english/remember-you-are-superman/remember-you-are-superman.md b/english/remember-you-are-superman/remember-you-are-superman.md index d524f1c2b7..b1613fb033 100644 --- a/english/remember-you-are-superman/remember-you-are-superman.md +++ b/english/remember-you-are-superman/remember-you-are-superman.md @@ -5,4 +5,5 @@ and i hate marshmallows. heat vision on....marshmallows on fire everywhere ;) *flys away home to lois* -[fly away home to lois](./fly-away-home-to-lois/fly-away-home-to-lois.md) \ No newline at end of file +[fly away home to lois](./fly-away-home-to-lois/fly-away-home-to-lois.md) +[suddenly run into batman and realize you're in a Zack Snyder movie](./zack-snyder-movie/zack-snyder-movie.md) \ No newline at end of file diff --git a/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/do-you-bleed.md b/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/do-you-bleed.md new file mode 100644 index 0000000000..841279fb67 --- /dev/null +++ b/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/do-you-bleed.md @@ -0,0 +1,5 @@ +You say no lol I'm Superman. + +Batman comes at you. Punches you right in the face. + +Turns out you don't bleed after all. \ No newline at end of file diff --git a/english/remember-you-are-superman/zack-snyder-movie/zack-snyder-movie.md b/english/remember-you-are-superman/zack-snyder-movie/zack-snyder-movie.md new file mode 100644 index 0000000000..f37cd47f51 --- /dev/null +++ b/english/remember-you-are-superman/zack-snyder-movie/zack-snyder-movie.md @@ -0,0 +1,9 @@ +Batman is staring at you. + +You suddenly remember those marshmallows were actually kryptonite. + +Your start weakening. Batman in a voice that sounds like he needs + +cough syrup asks you + +[Do you bleed?](./do-you-bleed/do-you-bleed.md) \ No newline at end of file From 507b55d2f7d8af1f1397e6301ec535164b7e15e0 Mon Sep 17 00:00:00 2001 From: Rashed Doha Date: Fri, 28 Aug 2015 23:59:39 +0600 Subject: [PATCH 0784/5486] Fixed deletion issue --- english/remember-you-are-superman/remember-you-are-superman.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/remember-you-are-superman/remember-you-are-superman.md b/english/remember-you-are-superman/remember-you-are-superman.md index b1613fb033..839316d829 100644 --- a/english/remember-you-are-superman/remember-you-are-superman.md +++ b/english/remember-you-are-superman/remember-you-are-superman.md @@ -6,4 +6,5 @@ heat vision on....marshmallows on fire everywhere ;) *flys away home to lois* [fly away home to lois](./fly-away-home-to-lois/fly-away-home-to-lois.md) + [suddenly run into batman and realize you're in a Zack Snyder movie](./zack-snyder-movie/zack-snyder-movie.md) \ No newline at end of file From 4af4b1411e2374e0639a8ab11af72be84a70be48 Mon Sep 17 00:00:00 2001 From: Rashed Doha Date: Sat, 29 Aug 2015 00:03:29 +0600 Subject: [PATCH 0785/5486] Now he does bleed --- .../zack-snyder-movie/do-you-bleed/do-you-bleed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/do-you-bleed.md b/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/do-you-bleed.md index 841279fb67..da215d55be 100644 --- a/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/do-you-bleed.md +++ b/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/do-you-bleed.md @@ -2,4 +2,4 @@ You say no lol I'm Superman. Batman comes at you. Punches you right in the face. -Turns out you don't bleed after all. \ No newline at end of file +Turns out you do bleed after all. From 82bd25e23bafec7e81e54e1650d4293831929fb7 Mon Sep 17 00:00:00 2001 From: Mark Diez Date: Fri, 28 Aug 2015 15:02:09 -0700 Subject: [PATCH 0786/5486] Add advise in english/love/love.md --- english/love/love.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/love/love.md b/english/love/love.md index 4743822950..33edd19a53 100644 --- a/english/love/love.md +++ b/english/love/love.md @@ -4,4 +4,8 @@ Just as high as one might feel at the tip of that love, the lows can be devastat when it is time to let go of that loved one. Whether needing to let go because they have passed on, or because it is time to move on from the relationship, grief is a component. You should grieve what was lost and accept the healing hands of time. Recognize your emotional limits, -but don’t isolate yourself as you let someone go and heal from the loss. \ No newline at end of file +but don’t isolate yourself as you let someone go and heal from the loss. + +There is no use moping around wondering the ifs, buts, could've, would've, +and should'ves. Time goes on and drags you with it. Whether you are in or +out of love, make the best of now while being aware of the worst of before. From fe43b5fe4ccab3e153cf09a5cae81b71ecc18310 Mon Sep 17 00:00:00 2001 From: Andrea Catalucci Date: Sat, 29 Aug 2015 00:08:12 +0200 Subject: [PATCH 0787/5486] Awesome classy move inserted in the Italian experience --- Italian/scappare/barba/barba.md | 1 + Italian/scappare/cercare-uscita.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Italian/scappare/barba/barba.md diff --git a/Italian/scappare/barba/barba.md b/Italian/scappare/barba/barba.md new file mode 100644 index 0000000000..d99a60edc5 --- /dev/null +++ b/Italian/scappare/barba/barba.md @@ -0,0 +1 @@ +Non importano le circostanze, per te rimanere impeccabile anche nelle situazioni più avverse è fondamentale. \ No newline at end of file diff --git a/Italian/scappare/cercare-uscita.md b/Italian/scappare/cercare-uscita.md index 8e2e4aaae9..d385992621 100644 --- a/Italian/scappare/cercare-uscita.md +++ b/Italian/scappare/cercare-uscita.md @@ -5,4 +5,6 @@ Inciampi in una bottiglia rotta a metà, e ci sono vetri ovunque. [Cerchi una scopa](cerca/cerca-scopa.md) -[Ti arrabbi perchè il tappeto è sporco](arrabbi/arrabbi.md) \ No newline at end of file +[Ti arrabbi perchè il tappeto è sporco](arrabbi/arrabbi.md) + +[Approfitti del vetro più tagliente per farti la barba](barba/barba.md) \ No newline at end of file From 8b2816136fe463484a7db106fbb107770ee1bca8 Mon Sep 17 00:00:00 2001 From: MianNaveedAhmad Date: Sat, 29 Aug 2015 06:16:11 +0500 Subject: [PATCH 0788/5486] First two Urdu lines to an Urdu story --- urdu/urdu-news.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/urdu/urdu-news.md b/urdu/urdu-news.md index 87703d6b33..b0f09554f5 100644 --- a/urdu/urdu-news.md +++ b/urdu/urdu-news.md @@ -1 +1,5 @@ -if you like to see urdu news [click here](http://www.bbc.com/urdu/) \ No newline at end of file +if you like to see urdu news [click here](http://www.bbc.com/urdu/) + +جن کو اردو آتی ہے آیے آپ کو اردو میں کہانی سناتے ہیں: + +خوشی کا عالم تھا کہ اچانک پلک جھپکتے ہی، نہ جانے کیوں، سب لوگوں کو سانپ سونگھ گیا- \ No newline at end of file From 445b7b271680a7b6efe0683cb7d1f117e4578314 Mon Sep 17 00:00:00 2001 From: Mark Ayzenshtadt Date: Sat, 29 Aug 2015 11:42:27 +0300 Subject: [PATCH 0789/5486] Linked 'dance' event to existing events --- russian/dance/dance.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/russian/dance/dance.md b/russian/dance/dance.md index 3cd0c93e54..3033d5c369 100644 --- a/russian/dance/dance.md +++ b/russian/dance/dance.md @@ -1 +1,10 @@ Вы сразу понимаете, что танцевать на зефире очень трудно - ваши ноги не двигаются! + +Что дальше? + +[Попытаетесь проснуться.](awaken/awaken.md) + +[Закроете глаза.](close-eyes/close-eyes.md) + +[Когда вам страшно, вы всегда поете.](sing/sing.md) + From 01f9700b3d198a9c8c0bc5b6c7ce17e5ac3ec354 Mon Sep 17 00:00:00 2001 From: Mark Ayzenshtadt Date: Sat, 29 Aug 2015 11:58:07 +0300 Subject: [PATCH 0790/5486] fixed links --- russian/dance/dance.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/russian/dance/dance.md b/russian/dance/dance.md index 3033d5c369..f2594a7bb0 100644 --- a/russian/dance/dance.md +++ b/russian/dance/dance.md @@ -2,9 +2,9 @@ Что дальше? -[Попытаетесь проснуться.](awaken/awaken.md) +[Попытаетесь проснуться.](../awaken/awaken.md) -[Закроете глаза.](close-eyes/close-eyes.md) +[Закроете глаза.](../close-eyes/close-eyes.md) -[Когда вам страшно, вы всегда поете.](sing/sing.md) +[Когда вам страшно, вы всегда поете.](../sing/sing.md) From ba39af40a18b6a70689ac58d0568809bf74d0ff5 Mon Sep 17 00:00:00 2001 From: Mark Ayzenshtadt Date: Sat, 29 Aug 2015 12:01:19 +0300 Subject: [PATCH 0791/5486] fixed another link --- russian/dance/dance.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/dance/dance.md b/russian/dance/dance.md index f2594a7bb0..c29375dc90 100644 --- a/russian/dance/dance.md +++ b/russian/dance/dance.md @@ -6,5 +6,5 @@ [Закроете глаза.](../close-eyes/close-eyes.md) -[Когда вам страшно, вы всегда поете.](../sing/sing.md) +[Когда вам страшно, вы всегда поете.](../light-fire/sing/sing.md) From 2db3c9274b37b3e217dafe81cf8c6330d2fcb236 Mon Sep 17 00:00:00 2001 From: Integer64 Date: Sun, 30 Aug 2015 21:10:40 +0800 Subject: [PATCH 0792/5486] Add story for red-toothbrush --- russian/sleep/brushing/redbrush/red-toothbrush.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/russian/sleep/brushing/redbrush/red-toothbrush.md b/russian/sleep/brushing/redbrush/red-toothbrush.md index 83d2a8a0db..5c5d760c66 100644 --- a/russian/sleep/brushing/redbrush/red-toothbrush.md +++ b/russian/sleep/brushing/redbrush/red-toothbrush.md @@ -1 +1,4 @@ -Вариант для красной щетки. \ No newline at end of file +Вариант для красной щетки. +Как только вы дотронулись до красной щетки, свет в ванной комнате погас. +"Что вы будете делать дальше?" +[Попытаться найти выключатель](switch/switch.md) From a18ca9ff08ab6f2fbe2d613e5e7082f28a90e1ac Mon Sep 17 00:00:00 2001 From: Integer64 Date: Sun, 30 Aug 2015 21:11:11 +0800 Subject: [PATCH 0793/5486] Find switch --- russian/sleep/brushing/redbrush/switch/switch.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 russian/sleep/brushing/redbrush/switch/switch.md diff --git a/russian/sleep/brushing/redbrush/switch/switch.md b/russian/sleep/brushing/redbrush/switch/switch.md new file mode 100644 index 0000000000..7253bccd64 --- /dev/null +++ b/russian/sleep/brushing/redbrush/switch/switch.md @@ -0,0 +1 @@ +Вы попытались нащупать выключатель. From 7d178c8c5c3512a292d88330c75afdcca434efe8 Mon Sep 17 00:00:00 2001 From: Philip Schwander Date: Sun, 30 Aug 2015 18:38:02 +0200 Subject: [PATCH 0794/5486] fix: fixed several typos --- german/Leichen/Leichen.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 63df8ad4e5..90bdea0a63 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -1,5 +1,6 @@ -Sie schauen ängstig um sich, kein andere Menschenseele außer den beiden völlig durchlöcherten Leichnamen neben -ihnen, deren Blut sie mittlerweile bedürftig an die Lebewesen im See gespendet haben. Ihr Boot ist bereits -in leichter Schieflage und hastig ziehen die beiden Leichen aus dem Boot. +Sie schauen ängstlich um sich, sehen aber keine andere Menschenseele außer den beiden +völlig durchlöcherten Leichnamen neben sich, deren Blut sie mittlerweile grosszügig an die +Lebewesen im See gespendet haben. Ihr Boot ist bereits in leichter Schieflage und hastig +werfen die beiden Leichen aus dem Boot. -Sie schnaufen einmal kräftig durch und ihnen gehen 1000 Gedanken durch den Kopf... \ No newline at end of file +Sie schnaufen einmal kräftig durch während ihnen tausend Gedanken durch den Kopf gehen... \ No newline at end of file From ea79c3e326c8ef2d428d1c36e9a02adf026ecc87 Mon Sep 17 00:00:00 2001 From: Joey Bernsen Date: Sun, 30 Aug 2015 13:22:14 -0500 Subject: [PATCH 0795/5486] Add the ape happy dance --- english/dance/dance.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dance/dance.md b/english/dance/dance.md index b6493f6d14..61113389eb 100644 --- a/english/dance/dance.md +++ b/english/dance/dance.md @@ -38,4 +38,4 @@ it is a dancing cat [Want to read a story](../myStory/mayank.md) - +[Dance like it's 1999](https://www.youtube.com/watch?v=xWiUvn2KBu4) From f36ba60c4c195edd0495b4614ff5cd73e27020f2 Mon Sep 17 00:00:00 2001 From: Joey Bernsen Date: Sun, 30 Aug 2015 13:34:40 -0500 Subject: [PATCH 0796/5486] Undelete the white space --- english/dance/dance.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/dance/dance.md b/english/dance/dance.md index 61113389eb..9325e5de88 100644 --- a/english/dance/dance.md +++ b/english/dance/dance.md @@ -39,3 +39,5 @@ it is a dancing cat [Want to read a story](../myStory/mayank.md) [Dance like it's 1999](https://www.youtube.com/watch?v=xWiUvn2KBu4) + + From 013dca509020df8a2fe873afa5182b3b18ad686b Mon Sep 17 00:00:00 2001 From: Quiw Date: Sun, 30 Aug 2015 20:45:17 +0200 Subject: [PATCH 0797/5486] update: Menjar added under subdirectory catala/menjar --- catala/catala.md | 2 ++ catala/menjar/menjar.md | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 catala/menjar/menjar.md diff --git a/catala/catala.md b/catala/catala.md index d2b8001d88..5b67cc6ed0 100644 --- a/catala/catala.md +++ b/catala/catala.md @@ -16,3 +16,5 @@ Què fas? [Et pessigues el braç](pessigar-se/pessigar-se.md) [T'aixeques del llit](aixecar/aixecar.md) + +[Comences a menjar sucre desesperadament](menjar/menjar.md) diff --git a/catala/menjar/menjar.md b/catala/menjar/menjar.md new file mode 100644 index 0000000000..a1c71da0e2 --- /dev/null +++ b/catala/menjar/menjar.md @@ -0,0 +1,11 @@ +Endrapes i endrapes sense parar, devores voraçment un suau sucre sense saber +el perquè. A poc a poc vas notant que aquest et produeix un rar efecte, +el teu cap comença a sumir-se dolçament en un estat quasi anastèsic de +felicitat i harmonia. És inevitable.. + +Et deixes anar i caus estès al terra. + +Què fas? + +No res, has mort. +I els metges no saben trobar una explicació, però de sucre no n'has menjat pas. \ No newline at end of file From f808ab7d4bb042d5b955d5b0d0d723b1cea38353 Mon Sep 17 00:00:00 2001 From: squarecircles Date: Sun, 30 Aug 2015 15:19:03 -0400 Subject: [PATCH 0798/5486] Add story link --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 502b1e3d39..226da788c2 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -126,6 +126,8 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: +[Feel a sudden urge to dance](https://youtu.be/dQw4w9WgXcQ) + [Make changes on GitHub to revise this crazy story](make_changes_GitHub/make_changes_GitHub.md) [Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) From d123d9cc30aa10d958bc1057403156f1af1bd61e Mon Sep 17 00:00:00 2001 From: vldobr Date: Sun, 30 Aug 2015 17:44:03 -0700 Subject: [PATCH 0799/5486] Add Holms-Watson --- russian/Holms-Watson/Holmes-Watson.md | 3 +++ russian/Holms-Watson/who_is_interested.md | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 russian/Holms-Watson/Holmes-Watson.md create mode 100644 russian/Holms-Watson/who_is_interested.md diff --git a/russian/Holms-Watson/Holmes-Watson.md b/russian/Holms-Watson/Holmes-Watson.md new file mode 100644 index 0000000000..cf61e4b129 --- /dev/null +++ b/russian/Holms-Watson/Holmes-Watson.md @@ -0,0 +1,3 @@ +А скажите Холмс: + +[Kак раскрыть преступление](Holms-Watson/who_is_interested.md) \ No newline at end of file diff --git a/russian/Holms-Watson/who_is_interested.md b/russian/Holms-Watson/who_is_interested.md new file mode 100644 index 0000000000..22d66e1d49 --- /dev/null +++ b/russian/Holms-Watson/who_is_interested.md @@ -0,0 +1,4 @@ +— Скажите, Холмс, как раскрыть преступление? +— Определить, кому выгодно. +— А если выгодно всем? +— Тогда это как бы и не преступление. \ No newline at end of file From 6f55be2583cecff7b9e06de40c75dee3742c441a Mon Sep 17 00:00:00 2001 From: vldobr Date: Sun, 30 Aug 2015 17:57:04 -0700 Subject: [PATCH 0800/5486] corrected path --- russian/Holms-Watson/Holmes-Watson.md | 2 +- .../{who_is_interested.md => whoisinterested/crime.md} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename russian/Holms-Watson/{who_is_interested.md => whoisinterested/crime.md} (100%) diff --git a/russian/Holms-Watson/Holmes-Watson.md b/russian/Holms-Watson/Holmes-Watson.md index cf61e4b129..b55d9ef42a 100644 --- a/russian/Holms-Watson/Holmes-Watson.md +++ b/russian/Holms-Watson/Holmes-Watson.md @@ -1,3 +1,3 @@ А скажите Холмс: -[Kак раскрыть преступление](Holms-Watson/who_is_interested.md) \ No newline at end of file +[Kак раскрыть преступление](whoisinterested/crime.md) \ No newline at end of file diff --git a/russian/Holms-Watson/who_is_interested.md b/russian/Holms-Watson/whoisinterested/crime.md similarity index 100% rename from russian/Holms-Watson/who_is_interested.md rename to russian/Holms-Watson/whoisinterested/crime.md From 1ad1854cad6e01c4ff83c60bcca4a118d076c125 Mon Sep 17 00:00:00 2001 From: vldobr Date: Sun, 30 Aug 2015 18:44:10 -0700 Subject: [PATCH 0801/5486] Linked to the root of /russian --- russian/zefir.md | 1 + 1 file changed, 1 insertion(+) diff --git a/russian/zefir.md b/russian/zefir.md index d62641d749..b9ad28719e 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -32,3 +32,4 @@ [Начинайте танцевать от радости.](dance/dance.md) +[Вспомните интересную шутку](Holms-Watson/Holmes-Watson.md) \ No newline at end of file From c84f31998a442de0aea16f15e4e9943389faa562 Mon Sep 17 00:00:00 2001 From: Pratibha Date: Sun, 30 Aug 2015 20:06:02 -0700 Subject: [PATCH 0802/5486] Add one line to Batman.md --- english/batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index 3116d106f1..d340e38a9f 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -1,5 +1,7 @@ wanna know a secret bruce wayne is the BAT +Batman is awesome! + click [here](https://en.wikipedia.org/wiki/Batman) and see it for yourself. Click [here](http://www.google.com) to visit Google. From 2b9503e470fe96434f9dbde72214c80177587784 Mon Sep 17 00:00:00 2001 From: futlik Date: Mon, 31 Aug 2015 06:59:16 +0300 Subject: [PATCH 0803/5486] Update buildings-dep.md --- russian/buildings-dep/buildings-dep.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/russian/buildings-dep/buildings-dep.md b/russian/buildings-dep/buildings-dep.md index 26f2ae6589..f63941a15f 100644 --- a/russian/buildings-dep/buildings-dep.md +++ b/russian/buildings-dep/buildings-dep.md @@ -1,8 +1,8 @@ Вы дозвонились в ЖЭК, хотя и боялись, что вас не поймут. Объяснили -ситуацию и попросили помочь. Вас внимательно выслушали, нос казали +ситуацию и попросили помочь. Вас внимательно выслушали, но сказали что все сейчас заняты, так как Ваш звонок такой не первый за день и продеться подождать. Что вы будете делать? [Вы чуете неладное и решаете включить телевизор.](tv/tv.md) -[Вас одолевает паника и вы спешите позвонить маме.](callmum/callmum.md) \ No newline at end of file +[Вас одолевает паника и вы спешите позвонить маме.](callmum/callmum.md) From d2bdfba085616a8f89f8e48772d074e575856b35 Mon Sep 17 00:00:00 2001 From: Peter Wages Date: Mon, 31 Aug 2015 00:35:57 -0400 Subject: [PATCH 0804/5486] Addition to the "remember you're superman" storyline --- .DS_Store | Bin 0 -> 6148 bytes english/.DS_Store | Bin 0 -> 6148 bytes english/remember-you-are-superman/.DS_Store | Bin 0 -> 6148 bytes .../zack-snyder-movie/.DS_Store | Bin 0 -> 6148 bytes .../zack-snyder-movie/do-you-bleed/.DS_Store | Bin 0 -> 6148 bytes .../Batman-vs-superman/Batman-vs-superman.md | 3 +++ .../do-you-bleed/do-you-bleed.md | 2 ++ 7 files changed, 5 insertions(+) create mode 100644 .DS_Store create mode 100644 english/.DS_Store create mode 100644 english/remember-you-are-superman/.DS_Store create mode 100644 english/remember-you-are-superman/zack-snyder-movie/.DS_Store create mode 100644 english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/.DS_Store create mode 100644 english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/Batman-vs-superman/Batman-vs-superman.md diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5f4b57ea0bacaa96aec86457643417466fcbf85c GIT binary patch literal 6148 zcmeHK%TLrm82>&%>9Q*2;R6*@-HQeeAP~J6m-QV(SY5(H!L{8TmIz_ z;2+?{_sxqpuSWeBJQ(j@^lW0{H`A#g=+%hnm(2XWey{2L+Rk(U0CV%@UH}sS3~CY^ znyCAYNWW~Gq)uDv2~pMH5WtMH7*rj1Q*>fT7)TiS*BFrBZX+=8paL$e`+kK(o^MXo zv=nziS-d7+@HGb zjB>VEG~3SzFSNPG{B^05W85o?#hjS;%E4qIsyD{V;Y`uoo%h)SrRHsqjq-py+~wht zkxHeERMG5MS?TTV>+809drqu&TPr6{9`CjW`Uh55&HILN;Ml<6&_s3h-lNA)o<4j2 z;?3LWK_IPLO4>BW@Q#!XyztTjt!t7O{2cT0$u!q7vt#G3X0xTWt$p{Nz56=$A2`@~ zsM9K%ZH`@YVO|0`yOa}DaE`@CFk~b}AL`mszRfYwl z%nt}R<&RIfw!_?EFDJrK%uU$7Z+jJ%TauBoT1j~N;f!*kYLYQ%{X}_8d!PvU%+_pbG|J2u5KRmf-L1eCJZDD{51yT`e0F$nAKQ|P%RzQsUrYk1DTbOF3%D&$I_V9Sc{N6 zBp9UMX?4%|=s&0BL7*rBUQyeK0^@6N5k{n} zbXSxj7MZAKj_bOPJMh=%^G;`LtHnF*?L~{vx1Vgbc=vI4vGCtJ&cjFDr!QWO7wZ|kr z`JeCq7n7()1c<J%*OajXM%6hA=MhJ9QG WsDahmD7K){hk(XF1rhkC1bzWhAj+Wt literal 0 HcmV?d00001 diff --git a/english/remember-you-are-superman/.DS_Store b/english/remember-you-are-superman/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..122ec73fc8fc920a6bafb12b14d91aadd027af4a GIT binary patch literal 6148 zcmeHK&2G~`5S~o~*zv^`Ac45-6)8vwB`QY~%CS-;SFI35!NwL@VZ4#;Bq~uPpZgf4 z{JcbORe1(pg%dNoo2pen;)Ei!Bh7xZvopK)x7Lmq09b#LbOC$-a8L;wE;hdr8Yf+m zhVc+GHOC_;A%`PKAYF;Jj&)>!_HGkCLIiK&JzU+t0(&1o!W0Cg@vI!jnT#>|XFSeC zS#>%;SYxAku@AzVHH)AvL6+%R8J&nZ0tc)jh6PFl-Z>n#rq+v}DDJ%n)fi+@)&IgW4 z7#OTIs-puN`hBGFCLsyhbeACH1_Oh&MjSz5Iu%i;GIPaXIvxGo#03UxjXE8eS{dgt zD>HLLVQO{sa}^FO&}duBfMwu10~@;QQ~iJO=llQlB-^tLSO)$p23T_^-09;hncBMY xa#U+M>KjxNimNqVrl6rpF~(9UzK5y={hSQMz+kNrJt+1^K+#|u%fLTn;1@AdY768O>p7jAj0Ps)=TRt{_5E>`lke2fh z3Nwd>IoyL33dlF2*|Cib(B55z3^eZBDYn1%FNZ8$RMWK3DaQOrr-iEOUhlhT?X)jl zzT)|vAP71^c&+myp6EqfC-uAh+tq@7{m-`02}6yDb90U?bNZuHhRR z7cz7b&&ooVuP|nvzs_T12ABb6V0#&GCzcm%?<4Y)F$2uNKVpE+2Z>4;IczMNqXQfI zeWdX=Aqm=ammri5BZrMe96=E_715>&cf}Ak9sSb9MGhN_HXVdn8Ru~;3wJ{iW_9#S z6AmJ>$SpI#44h|R$96-i|Bo-e|DR9d9y7oU{8tQ!_Cb6w#8+~)b>roz)=Jcus3a8E nSUgKX!<1r-rBZwg)d>0}8Hka?#v*!9_(#Cdzzs9-R~h&TXjfBFg{0|DKdv^swh@pm8=zre73Z^iD3`(>9FqbcqTqc;W9+o4t zkKZ-2{Ioric{Q;;z9o}fRCTZSm9^H|7cO3M+>YmY9nZhqc@~Z3JgVb*T7_}>RR0ob zme_b0*W*?ESjzl3j*}gc%}4&V`?9EGQDo&WrF*-gNaZ|~(;}_*BGYeIr1f~@Umup) z3`>V`k?n{|BqA5}YsYn6#~t}M7K?s=W24Laz0GBpFE+RCbot=!V7c^<9Ove(!M#UM zCd)Vb2X7DGz5np(Gpd1L_>a)IYI#LpFgTUsv#2a`S-iyjRj*YKVp4z Date: Mon, 31 Aug 2015 00:46:51 -0400 Subject: [PATCH 0805/5486] Remove .DS_Store files --- .DS_Store | Bin 6148 -> 0 bytes english/.DS_Store | Bin 6148 -> 0 bytes english/remember-you-are-superman/.DS_Store | Bin 6148 -> 0 bytes .../zack-snyder-movie/.DS_Store | Bin 6148 -> 0 bytes .../zack-snyder-movie/do-you-bleed/.DS_Store | Bin 6148 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 english/.DS_Store delete mode 100644 english/remember-you-are-superman/.DS_Store delete mode 100644 english/remember-you-are-superman/zack-snyder-movie/.DS_Store delete mode 100644 english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 5f4b57ea0bacaa96aec86457643417466fcbf85c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%TLrm82>&%>9Q*2;R6*@-HQeeAP~J6m-QV(SY5(H!L{8TmIz_ z;2+?{_sxqpuSWeBJQ(j@^lW0{H`A#g=+%hnm(2XWey{2L+Rk(U0CV%@UH}sS3~CY^ znyCAYNWW~Gq)uDv2~pMH5WtMH7*rj1Q*>fT7)TiS*BFrBZX+=8paL$e`+kK(o^MXo zv=nziS-d7+@HGb zjB>VEG~3SzFSNPG{B^05W85o?#hjS;%E4qIsyD{V;Y`uoo%h)SrRHsqjq-py+~wht zkxHeERMG5MS?TTV>+809drqu&TPr6{9`CjW`Uh55&HILN;Ml<6&_s3h-lNA)o<4j2 z;?3LWK_IPLO4>BW@Q#!XyztTjt!t7O{2cT0$u!q7vt#G3X0xTWt$p{Nz56=$A2`@~ zsM9K%ZH`@YVO|0`yOa}DaE`@CFk~b}AL`mszRfYwl z%nt}R<&RIfw!_?EFDJrK%uU$7Z+jJ%TauBoT1j~N;f!*kYLYQ%{X}_8d!PvU%+_pbG|J2u5KRmf-L1eCJZDD{51yT`e0F$nAKQ|P%RzQsUrYk1DTbOF3%D&$I_V9Sc{N6 zBp9UMX?4%|=s&0BL7*rBUQyeK0^@6N5k{n} zbXSxj7MZAKj_bOPJMh=%^G;`LtHnF*?L~{vx1Vgbc=vI4vGCtJ&cjFDr!QWO7wZ|kr z`JeCq7n7()1c<J%*OajXM%6hA=MhJ9QG WsDahmD7K){hk(XF1rhkC1bzWhAj+Wt diff --git a/english/remember-you-are-superman/.DS_Store b/english/remember-you-are-superman/.DS_Store deleted file mode 100644 index 122ec73fc8fc920a6bafb12b14d91aadd027af4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK&2G~`5S~o~*zv^`Ac45-6)8vwB`QY~%CS-;SFI35!NwL@VZ4#;Bq~uPpZgf4 z{JcbORe1(pg%dNoo2pen;)Ei!Bh7xZvopK)x7Lmq09b#LbOC$-a8L;wE;hdr8Yf+m zhVc+GHOC_;A%`PKAYF;Jj&)>!_HGkCLIiK&JzU+t0(&1o!W0Cg@vI!jnT#>|XFSeC zS#>%;SYxAku@AzVHH)AvL6+%R8J&nZ0tc)jh6PFl-Z>n#rq+v}DDJ%n)fi+@)&IgW4 z7#OTIs-puN`hBGFCLsyhbeACH1_Oh&MjSz5Iu%i;GIPaXIvxGo#03UxjXE8eS{dgt zD>HLLVQO{sa}^FO&}duBfMwu10~@;QQ~iJO=llQlB-^tLSO)$p23T_^-09;hncBMY xa#U+M>KjxNimNqVrl6rpF~(9UzK5y={hSQMz+kNrJt+1^K+#|u%fLTn;1@AdY768O>p7jAj0Ps)=TRt{_5E>`lke2fh z3Nwd>IoyL33dlF2*|Cib(B55z3^eZBDYn1%FNZ8$RMWK3DaQOrr-iEOUhlhT?X)jl zzT)|vAP71^c&+myp6EqfC-uAh+tq@7{m-`02}6yDb90U?bNZuHhRR z7cz7b&&ooVuP|nvzs_T12ABb6V0#&GCzcm%?<4Y)F$2uNKVpE+2Z>4;IczMNqXQfI zeWdX=Aqm=ammri5BZrMe96=E_715>&cf}Ak9sSb9MGhN_HXVdn8Ru~;3wJ{iW_9#S z6AmJ>$SpI#44h|R$96-i|Bo-e|DR9d9y7oU{8tQ!_Cb6w#8+~)b>roz)=Jcus3a8E nSUgKX!<1r-rBZwg)d>0}8Hka?#v*!9_(#Cdzzs9-R~h&TXjfBFg{0|DKdv^swh@pm8=zre73Z^iD3`(>9FqbcqTqc;W9+o4t zkKZ-2{Ioric{Q;;z9o}fRCTZSm9^H|7cO3M+>YmY9nZhqc@~Z3JgVb*T7_}>RR0ob zme_b0*W*?ESjzl3j*}gc%}4&V`?9EGQDo&WrF*-gNaZ|~(;}_*BGYeIr1f~@Umup) z3`>V`k?n{|BqA5}YsYn6#~t}M7K?s=W24Laz0GBpFE+RCbot=!V7c^<9Ove(!M#UM zCd)Vb2X7DGz5np(Gpd1L_>a)IYI#LpFgTUsv#2a`S-iyjRj*YKVp4z Date: Mon, 31 Aug 2015 12:29:09 +0300 Subject: [PATCH 0806/5486] start swahili version --- swahili/marshmallow.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 swahili/marshmallow.md diff --git a/swahili/marshmallow.md b/swahili/marshmallow.md new file mode 100644 index 0000000000..24bb39d1c4 --- /dev/null +++ b/swahili/marshmallow.md @@ -0,0 +1,3 @@ +Asubuhi moja, nimeamka ndani ya chumba cha ajabu kikiwa na marshmallow kwenye kuta zake. + +(lazima ilikuwa Jumanne.) \ No newline at end of file From dc5f3f86df2d986845d14759901d77316be4ef4b Mon Sep 17 00:00:00 2001 From: davidfabian Date: Mon, 31 Aug 2015 17:57:03 +0200 Subject: [PATCH 0807/5486] added a link back to a previous level of the story. --- hungarian/zokni/zokni.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hungarian/zokni/zokni.md b/hungarian/zokni/zokni.md index 8acd9e59f2..b97e402cde 100644 --- a/hungarian/zokni/zokni.md +++ b/hungarian/zokni/zokni.md @@ -1 +1,2 @@ -Felveszed a par malyva zoknit. Hu de jo puha belul! \ No newline at end of file +Felveszed a par malyva zoknit. Hu de jo puha belul! +De rajossz, hogy este elfelejtettel zuhanyozni. Le a zoknival es [irany a zuhany!](../zuhanyzas/zuhanyzas.md) \ No newline at end of file From 1a330fe0e64ea92432828a4a73ab8cb77e624132 Mon Sep 17 00:00:00 2001 From: Wen Huang Lin Date: Mon, 31 Aug 2015 22:10:17 +0200 Subject: [PATCH 0808/5486] plan their next target --- english/avatar/air.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/avatar/air.md b/english/avatar/air.md index 3df1aecaf9..f325e3d511 100644 --- a/english/avatar/air.md +++ b/english/avatar/air.md @@ -1,3 +1,5 @@ [But everything changed when the firenation attacked...](https://www.youtube.com/watch?v=pJUgCzEdx9k) -[Fire Lord Ozai](http://avatar.wikia.com/wiki/Ozai) wanted to conquer the other nations and rule the world. \ No newline at end of file +[Fire Lord Ozai](http://avatar.wikia.com/wiki/Ozai) wanted to conquer the other nations and rule the world. + +The next step is other planets. From 8e47b401b31fcfb68ffe14ddefc5e2c44aee74c3 Mon Sep 17 00:00:00 2001 From: Tony Baulos Date: Mon, 31 Aug 2015 17:28:01 -0400 Subject: [PATCH 0809/5486] Update island.md --- english/private-party-island/island.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/private-party-island/island.md b/english/private-party-island/island.md index a1541135a1..8038119086 100644 --- a/english/private-party-island/island.md +++ b/english/private-party-island/island.md @@ -1,6 +1,6 @@ Toronto wins, the 1992 flashback payed off. -After many nights of partying you find yourself warn out of the game and are ready to go back to work. +After many nights of partying you find yourself worn out by the game and are ready to go back to work. [Before you leave, you should really relieve yourself](../eating-walls/find-a-toilet/find-a-toilet.md) From d0356a77498ea7fd6a254ef208f4c494aa7bab4c Mon Sep 17 00:00:00 2001 From: MoHimedan Date: Mon, 31 Aug 2015 17:46:31 -0400 Subject: [PATCH 0810/5486] Add thoughts about leather jacket --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 226da788c2..0899608172 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -43,6 +43,8 @@ You reach out to grab a handful of the marshmallow wall, but you can't seem to t You also seem to be wearing an uncomfortable and restrictive jacket made of leather... +You don't own any uncomfortable and restrictive leather jackets... How did you end up sleeping in one? + [You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) You are feeling very anxious at this point. From a5fbb19f5b6c8ed80215d48a2beebb2007ff0562 Mon Sep 17 00:00:00 2001 From: Hernando Delgado Date: Mon, 31 Aug 2015 18:14:52 -0400 Subject: [PATCH 0811/5486] add text lines about the beatito --- espanol/beatito/beatito.md | 1 + espanol/canudos.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 espanol/beatito/beatito.md diff --git a/espanol/beatito/beatito.md b/espanol/beatito/beatito.md new file mode 100644 index 0000000000..981929cf68 --- /dev/null +++ b/espanol/beatito/beatito.md @@ -0,0 +1 @@ +En el rincón donde dormía el beatito fue construyendo un altar, con estampas que le regalaron en la misión y una cruz de xique-xique que el mismo talló y pintó. \ No newline at end of file diff --git a/espanol/canudos.md b/espanol/canudos.md index c95356b191..46ec1dc38b 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -55,3 +55,5 @@ el Consejero: [Y vino un ejercito](ejercito/ejercito.md) [Un ejercito de angeles para ayudar a los guerreros.](angeles/angeles.md) + +[En el rincón donde dormía, el beatito...](beatito/beatito.md) From 3b5aed64662403225a4e138dd3157e20a93f6e62 Mon Sep 17 00:00:00 2001 From: nandoDev Date: Mon, 31 Aug 2015 18:32:57 -0400 Subject: [PATCH 0812/5486] Update beatito.md separate lines --- espanol/beatito/beatito.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/beatito/beatito.md b/espanol/beatito/beatito.md index 981929cf68..2d71bbff70 100644 --- a/espanol/beatito/beatito.md +++ b/espanol/beatito/beatito.md @@ -1 +1,3 @@ -En el rincón donde dormía el beatito fue construyendo un altar, con estampas que le regalaron en la misión y una cruz de xique-xique que el mismo talló y pintó. \ No newline at end of file +En el rincón donde dormía el beatito fue construyendo un altar, +con estampas que le regalaron en la misión y una cruz de xique-xique +que el mismo talló y pintó. From 57055a7b20d24ac7c866af825a7d1bbad7faffb6 Mon Sep 17 00:00:00 2001 From: Ricy <970029520@qq.com> Date: Mon, 31 Aug 2015 20:23:13 -0700 Subject: [PATCH 0813/5486] =?UTF-8?q?=E6=9C=95=E6=94=B9=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/school-idols/school-idols.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Chinese/school-idols/school-idols.md b/Chinese/school-idols/school-idols.md index d6cc224cd7..aedca646c2 100644 --- a/Chinese/school-idols/school-idols.md +++ b/Chinese/school-idols/school-idols.md @@ -1 +1,2 @@ -为了拯救即将废弃的学校，他们选择了成为偶像。 \ No newline at end of file +为了拯救即将废弃的学校，他们选择了成为偶像。 +我来啦！ \ No newline at end of file From 98455bd3d62ac90a5e749fa739f5cda40e0a96ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Sim=C3=A3o?= Date: Tue, 1 Sep 2015 04:31:37 +0100 Subject: [PATCH 0814/5486] Add a new option to the storyline volta ao mundo --- portugues_pt/mundo/startup/startup.mdown | 1 + portugues_pt/mundo/voltaaomundo.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 portugues_pt/mundo/startup/startup.mdown diff --git a/portugues_pt/mundo/startup/startup.mdown b/portugues_pt/mundo/startup/startup.mdown new file mode 100644 index 0000000000..456d1be237 --- /dev/null +++ b/portugues_pt/mundo/startup/startup.mdown @@ -0,0 +1 @@ +Começava uma nova empresa com o novo produto revolucionário do mercado \ No newline at end of file diff --git a/portugues_pt/mundo/voltaaomundo.md b/portugues_pt/mundo/voltaaomundo.md index b496ad9e30..74b42110a8 100644 --- a/portugues_pt/mundo/voltaaomundo.md +++ b/portugues_pt/mundo/voltaaomundo.md @@ -9,4 +9,6 @@ Ao final desta viagem, voc O que seria este algo faltando? -[Invertar](inventar/inventar.md) algo que mudasse a vida de todos para melhor! \ No newline at end of file +[Invertar](inventar/inventar.md) algo que mudasse a vida de todos para melhor! + +[Fundava uma nova Startup](startup/startup.md) \ No newline at end of file From 30e4892543744f180a23195ac11cf6d31f5aa91f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Sim=C3=A3o?= Date: Tue, 1 Sep 2015 04:35:08 +0100 Subject: [PATCH 0815/5486] Fix the link --- portugues_pt/mundo/voltaaomundo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues_pt/mundo/voltaaomundo.md b/portugues_pt/mundo/voltaaomundo.md index 74b42110a8..50674b9a0d 100644 --- a/portugues_pt/mundo/voltaaomundo.md +++ b/portugues_pt/mundo/voltaaomundo.md @@ -11,4 +11,4 @@ O que seria este algo faltando? [Invertar](inventar/inventar.md) algo que mudasse a vida de todos para melhor! -[Fundava uma nova Startup](startup/startup.md) \ No newline at end of file +[Fundava uma nova Startup](startup/startup.mdown) \ No newline at end of file From 076aa9f60d35bec2256ee6bb5471327b9b40c8a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Sim=C3=A3o?= Date: Tue, 1 Sep 2015 04:40:48 +0100 Subject: [PATCH 0816/5486] Fix the extension --- portugues_pt/mundo/startup/{startup.mdown => startup.md} | 0 portugues_pt/mundo/voltaaomundo.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename portugues_pt/mundo/startup/{startup.mdown => startup.md} (100%) diff --git a/portugues_pt/mundo/startup/startup.mdown b/portugues_pt/mundo/startup/startup.md similarity index 100% rename from portugues_pt/mundo/startup/startup.mdown rename to portugues_pt/mundo/startup/startup.md diff --git a/portugues_pt/mundo/voltaaomundo.md b/portugues_pt/mundo/voltaaomundo.md index 50674b9a0d..74b42110a8 100644 --- a/portugues_pt/mundo/voltaaomundo.md +++ b/portugues_pt/mundo/voltaaomundo.md @@ -11,4 +11,4 @@ O que seria este algo faltando? [Invertar](inventar/inventar.md) algo que mudasse a vida de todos para melhor! -[Fundava uma nova Startup](startup/startup.mdown) \ No newline at end of file +[Fundava uma nova Startup](startup/startup.md) \ No newline at end of file From 7a993a4918b47152b1d36b4ca4b1c6f3d923f755 Mon Sep 17 00:00:00 2001 From: Arun Singh Date: Tue, 1 Sep 2015 13:01:39 +0530 Subject: [PATCH 0817/5486] Vivekanand Golden rules added to Quotes --- .../teachings-of-swami-vivekananda/quotes.md | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md b/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md index 043b9be92d..59c80939d2 100644 --- a/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md +++ b/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md @@ -38,6 +38,38 @@ Infinite faith and strength are the only conditions of success. + + GOLDEN RULES from Swami Vivekananda + +1.Who is Helping You, Don’t Forget them. + Who is Loving you, Don’t Hate them . + Who is Believing you, Don’t Cheat them. + +2. Anything that makes you weak physically, intellectually and spiritually, reject as poison. Swami Vivekananda Motivational quote + +3. Talk to yourself at least once in a Day.. Otherwise you may miss a meeting with an EXCELLENT person in this World… + +4. Relationships are more important than life , but it is important for those relationships to have life in them…. ~ + + +5. You have to grow from the inside out. None can teach you, none can make you spiritual. There is no other teacher but your own soul. Swami-Vivekananda + +6. Like me or Hate me, +both are in my favor, +If you like me I am in your Heart, +If you hate me I am in your mind. – + +7. BY the study of different religions we find that in essence they are one. - + +8. Where can we go to find God if we cannot see Him in our own hearts and in every living being.~ + + +9..Fill the brain with high thoughts, highest ideals place them day and night before you and out of that will come great work. + +10. Where can we go to find God if we cannot see Him in our own hearts and in every living being. + + + [Read More](http://www.awakeningindia.org/life/Teachings.aspx) [OK, this was interesting, but something's weird about this place... is that marshmallow?](../../marshmallow.md) From 28a50a75dc7c897f94195086650ea511ce303820 Mon Sep 17 00:00:00 2001 From: Abel Olivar Date: Tue, 1 Sep 2015 18:46:58 +0200 Subject: [PATCH 0818/5486] Add new option in espanol/huida/pagar --- espanol/huida/pagar/camino/camino.md | 1 + espanol/huida/pagar/pagar.md | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 espanol/huida/pagar/camino/camino.md diff --git a/espanol/huida/pagar/camino/camino.md b/espanol/huida/pagar/camino/camino.md new file mode 100644 index 0000000000..af6f012bda --- /dev/null +++ b/espanol/huida/pagar/camino/camino.md @@ -0,0 +1 @@ +Andas por el camino durante horas pero parece no acabar nunca. diff --git a/espanol/huida/pagar/pagar.md b/espanol/huida/pagar/pagar.md index f8bfc8dd34..5611c5b35b 100644 --- a/espanol/huida/pagar/pagar.md +++ b/espanol/huida/pagar/pagar.md @@ -1 +1,5 @@ Tras aceptar tus dos monedas de oro, el hombre te guia a través de un túnel hasta las afueras de la ciudad. +Despues te deja salir y cierra la puerta tras de si. +Estas solo. Ves un camino que se pierde en la distancia hacia el oeste. +[Decides tomar el camino.](/camino/camino.md) + From 689ca1545e0db2e4002a9ff65728ac7a4229fc36 Mon Sep 17 00:00:00 2001 From: jayashreejain Date: Tue, 1 Sep 2015 22:21:00 +0530 Subject: [PATCH 0819/5486] Add ponmozhi in tamil --- Tamil/Vivekanandha/ponmozhigal.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Tamil/Vivekanandha/ponmozhigal.md diff --git a/Tamil/Vivekanandha/ponmozhigal.md b/Tamil/Vivekanandha/ponmozhigal.md new file mode 100644 index 0000000000..c75f068de2 --- /dev/null +++ b/Tamil/Vivekanandha/ponmozhigal.md @@ -0,0 +1,8 @@ + +"?? ??? ???????????? ?????? ??????? ????? ????? ??????? ????? ?????????? ????? ????????? ?????!" + +"??????? ??????? ????? ??????? ????? ??????? ????????? ????????? ??????????!" + +"???? ??????? ??????? ???????" ????? ????. ?? ?????????? ????????? ???????? ???????? ??????????? ?????????." + +"???? ??????; ??????? ?????!" \ No newline at end of file From e12647af3865557da70c1ddc5ae7d7e2d76a147f Mon Sep 17 00:00:00 2001 From: Abel Olivar Date: Tue, 1 Sep 2015 18:55:51 +0200 Subject: [PATCH 0820/5486] Fix link in pagar.md --- espanol/huida/pagar/pagar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/huida/pagar/pagar.md b/espanol/huida/pagar/pagar.md index 5611c5b35b..d4b3d7cac7 100644 --- a/espanol/huida/pagar/pagar.md +++ b/espanol/huida/pagar/pagar.md @@ -1,5 +1,5 @@ Tras aceptar tus dos monedas de oro, el hombre te guia a través de un túnel hasta las afueras de la ciudad. Despues te deja salir y cierra la puerta tras de si. Estas solo. Ves un camino que se pierde en la distancia hacia el oeste. -[Decides tomar el camino.](/camino/camino.md) +[Decides tomar el camino.](camino/camino.md) From 0230d91da12e37b9d53b10f62926eb7f00c96ac5 Mon Sep 17 00:00:00 2001 From: jayashreejain Date: Tue, 1 Sep 2015 22:28:23 +0530 Subject: [PATCH 0821/5486] add link in language for ponmozhigal --- language.md | 1 + 1 file changed, 1 insertion(+) diff --git a/language.md b/language.md index 137ad7fb5a..d5b5aa5e4c 100644 --- a/language.md +++ b/language.md @@ -6,6 +6,7 @@ If you understand Tamil, தமிழ் வணக்கம் [இங்கே தமிழ் வணக்கம்! To view Tamil Proverb about Friendship [Click Here](Tamil/Thirukural.md) +தமிழ் வணக்கம்!To view ponmozhigal [Click Here](Tamil/Vivekanandha/ponmozhigal.md) If you speak Punjabi, [go here](punjabi/punjabi.md). यिद तपाई नेपाली बोलनुहुनछ भने, [यहाँ िथचनुहोस ।](nepali/about_nepal.md) From a82b384ddb76c3c187c351f5dad95f5731a5b50f Mon Sep 17 00:00:00 2001 From: jayashreejain Date: Tue, 1 Sep 2015 22:32:26 +0530 Subject: [PATCH 0822/5486] added a space between link --- language.md | 1 + 1 file changed, 1 insertion(+) diff --git a/language.md b/language.md index d5b5aa5e4c..04c43edd40 100644 --- a/language.md +++ b/language.md @@ -7,6 +7,7 @@ If you understand Tamil, தமிழ் வணக்கம் [இங்கே தமிழ் வணக்கம்! To view Tamil Proverb about Friendship [Click Here](Tamil/Thirukural.md) தமிழ் வணக்கம்!To view ponmozhigal [Click Here](Tamil/Vivekanandha/ponmozhigal.md) + If you speak Punjabi, [go here](punjabi/punjabi.md). यिद तपाई नेपाली बोलनुहुनछ भने, [यहाँ िथचनुहोस ।](nepali/about_nepal.md) From 5c3d1eba4f38db42c4c4a2dedd71224104fcd7e8 Mon Sep 17 00:00:00 2001 From: shubham Date: Tue, 1 Sep 2015 23:39:27 +0530 Subject: [PATCH 0823/5486] added a sentence --- english/2spooky/2spooky.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index 07d47dea3c..5dc26ce873 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -2,4 +2,6 @@ plz updoot +mr. skeltal is nice! + [Go back to sleep.](../sleep/marshmallow.md) From 4a6eee8fc1b714df1c15acef88423aae7d0c07f3 Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 1 Sep 2015 22:12:41 +0200 Subject: [PATCH 0824/5486] Add Line for the story - Trying to get back. --- german/Leichen/Leichen.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 90bdea0a63..36dba87c9c 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -3,4 +3,6 @@ völlig durchlöcherten Leichnamen neben sich, deren Blut sie mittlerweile gross Lebewesen im See gespendet haben. Ihr Boot ist bereits in leichter Schieflage und hastig werfen die beiden Leichen aus dem Boot. -Sie schnaufen einmal kräftig durch während ihnen tausend Gedanken durch den Kopf gehen... \ No newline at end of file +Sie schnaufen einmal kräftig durch während ihnen tausend Gedanken durch den Kopf gehen. + +Schnell, aber unbemerkt versuchen Sie an Land zu kommen, aber es scheint nicht näher zu kommen... \ No newline at end of file From cf0962cfc52e6ea0e387c1c7fd5db272579f4eb3 Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 1 Sep 2015 22:16:49 +0200 Subject: [PATCH 0825/5486] Corrected error - removed two points of the original version. --- german/Leichen/Leichen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 36dba87c9c..c0673f912b 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -3,6 +3,6 @@ völlig durchlöcherten Leichnamen neben sich, deren Blut sie mittlerweile gross Lebewesen im See gespendet haben. Ihr Boot ist bereits in leichter Schieflage und hastig werfen die beiden Leichen aus dem Boot. -Sie schnaufen einmal kräftig durch während ihnen tausend Gedanken durch den Kopf gehen. +Sie schnaufen einmal kräftig durch während ihnen tausend Gedanken durch den Kopf gehen... Schnell, aber unbemerkt versuchen Sie an Land zu kommen, aber es scheint nicht näher zu kommen... \ No newline at end of file From defaff50c17c62302321db130cfbe9e822d66c3e Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 1 Sep 2015 22:31:06 +0200 Subject: [PATCH 0826/5486] Add Line for 'Leichen' --- german/Leichen/Leichen.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 90bdea0a63..c0673f912b 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -3,4 +3,6 @@ völlig durchlöcherten Leichnamen neben sich, deren Blut sie mittlerweile gross Lebewesen im See gespendet haben. Ihr Boot ist bereits in leichter Schieflage und hastig werfen die beiden Leichen aus dem Boot. -Sie schnaufen einmal kräftig durch während ihnen tausend Gedanken durch den Kopf gehen... \ No newline at end of file +Sie schnaufen einmal kräftig durch während ihnen tausend Gedanken durch den Kopf gehen... + +Schnell, aber unbemerkt versuchen Sie an Land zu kommen, aber es scheint nicht näher zu kommen... \ No newline at end of file From b7e86a2abb96d10f0e2eaaeee5069ce0ece2bbaa Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 1 Sep 2015 22:32:07 +0200 Subject: [PATCH 0827/5486] Add another point. --- german/Leichen/Leichen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index c0673f912b..7585e2d95d 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -5,4 +5,4 @@ werfen die beiden Leichen aus dem Boot. Sie schnaufen einmal kräftig durch während ihnen tausend Gedanken durch den Kopf gehen... -Schnell, aber unbemerkt versuchen Sie an Land zu kommen, aber es scheint nicht näher zu kommen... \ No newline at end of file +Schnell, aber unbemerkt versuchen Sie an Land zu kommen, aber es scheint nicht näher zu kommen.... \ No newline at end of file From e49e62d87968f559763188ad7c69f27d2e53cb11 Mon Sep 17 00:00:00 2001 From: Jonathan Hunter Date: Tue, 1 Sep 2015 22:34:33 -0600 Subject: [PATCH 0828/5486] Continue space story and add option to tell mother --- english/dream/fly/space/space.md | 13 ++++++++++++- english/tell-mother/tell-mother.md | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 english/tell-mother/tell-mother.md diff --git a/english/dream/fly/space/space.md b/english/dream/fly/space/space.md index 058fc9673a..0f2c3f1f50 100644 --- a/english/dream/fly/space/space.md +++ b/english/dream/fly/space/space.md @@ -6,6 +6,17 @@ So you head off to galaxy far, far away.... You eventually reach a solar system with a planet that has intelligent life. -While you are there, they explain that dreams are actually the real Universe +While you are there, they explain that dreams are actually the real Universe and our reality is a delusion we've created to give ourselves a way to escape to a more consistent existence. + +You almost buy this malarkey when you notice the small one trying to sneak +your wallet on the sly. Of all the...! + +Do you: + +[Show these aliens who they're messing with](english/appear-on-falkors-back/falkor.md) + +[Remember that you're Batman](english/I'm-batman/batman.md) + +[Tell your mother](english/tell-mother/tell-mother.md) diff --git a/english/tell-mother/tell-mother.md b/english/tell-mother/tell-mother.md new file mode 100644 index 0000000000..bd28673a1a --- /dev/null +++ b/english/tell-mother/tell-mother.md @@ -0,0 +1,2 @@ +You pull out your cell phone to call your mother. It has seven extra antennas. +Turning it on, you notice a new option you've never seen before. From a553b674925fad1a015cb769851b0eb47a0cd5a9 Mon Sep 17 00:00:00 2001 From: Jonathan Hunter Date: Tue, 1 Sep 2015 22:54:36 -0600 Subject: [PATCH 0829/5486] Fix option links --- english/dream/fly/space/space.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/dream/fly/space/space.md b/english/dream/fly/space/space.md index 0f2c3f1f50..a09979e7cd 100644 --- a/english/dream/fly/space/space.md +++ b/english/dream/fly/space/space.md @@ -15,8 +15,8 @@ your wallet on the sly. Of all the...! Do you: -[Show these aliens who they're messing with](english/appear-on-falkors-back/falkor.md) +[Show these aliens who they're messing with](../../../../appear-on-falkors-back/falkor.md) -[Remember that you're Batman](english/I'm-batman/batman.md) +[Remember that you're Batman](../../../../I'm-batman/batman.md) -[Tell your mother](english/tell-mother/tell-mother.md) +[Tell your mother](../../../../tell-mother/tell-mother.md) From c684ff9309447c37884b5f5c2df79f3525825340 Mon Sep 17 00:00:00 2001 From: Lexei Volkov Date: Wed, 2 Sep 2015 12:59:01 +0300 Subject: [PATCH 0830/5486] add sentence --- russian/light-fire/fire.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/light-fire/fire.md b/russian/light-fire/fire.md index a6ccf3db08..7afcacb62e 100644 --- a/russian/light-fire/fire.md +++ b/russian/light-fire/fire.md @@ -12,3 +12,5 @@ [Вы решаете открыть дверь в комнате и выйти на улицу.] (open-the-door/open-the-door.md) [Двигаться вперед в уверенности, что ничего не сможет нас остановить!] + +[Ничего не делать.] From d3603f1681b4a5c58d44e4499e971421276e4f99 Mon Sep 17 00:00:00 2001 From: jubeater Date: Wed, 2 Sep 2015 18:05:52 +0800 Subject: [PATCH 0831/5486] add some new lines --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index cb64fbbbe3..1477d4e9bb 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -43,3 +43,5 @@ [斗战胜佛](斗战胜佛/斗战胜佛.md) [等死朕了](howeroc/西游后记.md) + +[jubeater](ZTL/无天.md) \ No newline at end of file From 1b6a9af360f80ccd01564d7aa7a4ecbeb0fface6 Mon Sep 17 00:00:00 2001 From: jubeater Date: Wed, 2 Sep 2015 18:09:06 +0800 Subject: [PATCH 0832/5486] add my dir(forget to add it at the begining) --- "Chinese/ZTL/\346\227\240\345\244\251.md" | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 "Chinese/ZTL/\346\227\240\345\244\251.md" diff --git "a/Chinese/ZTL/\346\227\240\345\244\251.md" "b/Chinese/ZTL/\346\227\240\345\244\251.md" new file mode 100644 index 0000000000..20c670f84e --- /dev/null +++ "b/Chinese/ZTL/\346\227\240\345\244\251.md" @@ -0,0 +1,2 @@ +而在西游记后传中，虽然孙悟空已经被封为斗战胜佛，但随着无天的势力染指天界，悟空不得不重新 +站出来与无天战斗，同时佛祖也转世成为了乔灵儿。 \ No newline at end of file From ddc276a971aefc5e1e2b623f43c433a6e402010a Mon Sep 17 00:00:00 2001 From: Jonathan Hunter Date: Wed, 2 Sep 2015 06:08:53 -0600 Subject: [PATCH 0833/5486] Add space to end of line 9 to match original --- english/dream/fly/space/space.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/fly/space/space.md b/english/dream/fly/space/space.md index a09979e7cd..fe77bdc34e 100644 --- a/english/dream/fly/space/space.md +++ b/english/dream/fly/space/space.md @@ -6,7 +6,7 @@ So you head off to galaxy far, far away.... You eventually reach a solar system with a planet that has intelligent life. -While you are there, they explain that dreams are actually the real Universe +While you are there, they explain that dreams are actually the real Universe and our reality is a delusion we've created to give ourselves a way to escape to a more consistent existence. From f66834623847f6e150156e2eb2f2abdf9bee15c0 Mon Sep 17 00:00:00 2001 From: Jonathan Hunter Date: Wed, 2 Sep 2015 06:22:14 -0600 Subject: [PATCH 0834/5486] Fix commit links --- english/dream/fly/space/space.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/english/dream/fly/space/space.md b/english/dream/fly/space/space.md index fe77bdc34e..d53e6e8cfc 100644 --- a/english/dream/fly/space/space.md +++ b/english/dream/fly/space/space.md @@ -6,7 +6,7 @@ So you head off to galaxy far, far away.... You eventually reach a solar system with a planet that has intelligent life. -While you are there, they explain that dreams are actually the real Universe +While you are there, they explain that dreams are actually the real Universe and our reality is a delusion we've created to give ourselves a way to escape to a more consistent existence. @@ -15,8 +15,8 @@ your wallet on the sly. Of all the...! Do you: -[Show these aliens who they're messing with](../../../../appear-on-falkors-back/falkor.md) +[Show these aliens who they're messing with](../../../appear-on-falkors-back/falkor.md) -[Remember that you're Batman](../../../../I'm-batman/batman.md) +[Remember that you're Batman](../../../I'm-batman/batman.md) -[Tell your mother](../../../../tell-mother/tell-mother.md) +[Tell your mother](../../../tell-mother/tell-mother.md) From 63d133f4966fd008c9ab96292582e36a647d83b0 Mon Sep 17 00:00:00 2001 From: Jonathan Hunter Date: Wed, 2 Sep 2015 06:25:07 -0600 Subject: [PATCH 0835/5486] Add that line 9 space back in --- english/dream/fly/space/space.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/fly/space/space.md b/english/dream/fly/space/space.md index d53e6e8cfc..03158cecfe 100644 --- a/english/dream/fly/space/space.md +++ b/english/dream/fly/space/space.md @@ -6,7 +6,7 @@ So you head off to galaxy far, far away.... You eventually reach a solar system with a planet that has intelligent life. -While you are there, they explain that dreams are actually the real Universe +While you are there, they explain that dreams are actually the real Universe and our reality is a delusion we've created to give ourselves a way to escape to a more consistent existence. From 0d9d76922d009554f2d5d2631798715805d3d653 Mon Sep 17 00:00:00 2001 From: Arun Singh Date: Wed, 2 Sep 2015 18:16:54 +0530 Subject: [PATCH 0836/5486] Caroline suggestions inculcated, merge modified. --- .../teachings-of-swami-vivekananda/quotes.md | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md b/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md index 59c80939d2..a70d84bfe5 100644 --- a/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md +++ b/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md @@ -24,52 +24,55 @@ Try to be moral, try to be brave, try to be sympathising. 3. Have faith that you are all, my brave lads, born to do great things! - Let not the barks of puppies frighten you -- no, - not even the thunderbolts of heaven -- but stand up and work! 4. Know that every time you feel weak, you not only hurt yourself but also the Cause. - -Infinite faith and strength are the only conditions of success. - + Infinite faith and strength are the only conditions of success. - GOLDEN RULES from Swami Vivekananda -1.Who is Helping You, Don’t Forget them. - Who is Loving you, Don’t Hate them . - Who is Believing you, Don’t Cheat them. +5. Who is Helping You, Don’t Forget them. + Who is Loving you, Don’t Hate them . + Who is Believing you, Don’t Cheat them. -2. Anything that makes you weak physically, intellectually and spiritually, reject as poison. Swami Vivekananda Motivational quote +6. Anything that makes you weak physically, intellectually + and spiritually,reject as poison. -3. Talk to yourself at least once in a Day.. Otherwise you may miss a meeting with an EXCELLENT person in this World… +7. Talk to yourself at least once in a Day, Otherwise you may, + miss a meeting with an EXCELLENT person in this World. -4. Relationships are more important than life , but it is important for those relationships to have life in them…. ~ +8. Relationships are more important than life, + but it is important for those relationships to have life in them. -5. You have to grow from the inside out. None can teach you, none can make you spiritual. There is no other teacher but your own soul. Swami-Vivekananda +9. You have to grow from the inside out. + None can teach you, none can make you spiritual. + There is no other teacher but your own soul. -6. Like me or Hate me, -both are in my favor, -If you like me I am in your Heart, -If you hate me I am in your mind. – +10. Like me or Hate me,both are in my favor, + If you like me I am in your Heart, + If you hate me I am in your mind. -7. BY the study of different religions we find that in essence they are one. - +11. BY the study of different religions we find that in essence they are one. -8. Where can we go to find God if we cannot see Him in our own hearts and in every living being.~ +12. Where can we go to find God if we cannot see Him. + In our own hearts and in every living being. -9..Fill the brain with high thoughts, highest ideals place them day and night before you and out of that will come great work. +13. Fill the brain with high thoughts, highest ideals place them + day and night before you and out of that will come great work. -10. Where can we go to find God if we cannot see Him in our own hearts and in every living being. +14. Where can we go to find God if we cannot see Him , + In our own hearts and in every living being. [Read More](http://www.awakeningindia.org/life/Teachings.aspx) +[Read More](http://rishikajain.com/2014/01/11/top-ten-famous-quotes-of-swami-vivekananda/) [OK, this was interesting, but something's weird about this place... is that marshmallow?](../../marshmallow.md) From ffb6536611fa496bc310982161f989902bfe6686 Mon Sep 17 00:00:00 2001 From: Vered Bauer Date: Wed, 2 Sep 2015 09:11:00 -0500 Subject: [PATCH 0837/5486] change to yoga_mind.md --- english/yoga/mind/yoga_mind.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/yoga/mind/yoga_mind.md b/english/yoga/mind/yoga_mind.md index 84a3373af8..3fe362c1b3 100644 --- a/english/yoga/mind/yoga_mind.md +++ b/english/yoga/mind/yoga_mind.md @@ -3,3 +3,5 @@ a feeling of oneness with the universe... you are one with the mushroom! Oops! I mean your soul. Want to know about Yoga lifestyle? Click [here](../lifestyle/yoga_lifestyle.md) + +Most people have discovered that exercising, whether it’s going for a walk or doing a vigorous yoga class, can lift their mood. From df2847f2188b8352b6bd2838655b3f44185092dc Mon Sep 17 00:00:00 2001 From: SinisterBlade Date: Wed, 2 Sep 2015 20:14:11 +0530 Subject: [PATCH 0838/5486] Add John Cena theme --- english/batman/batman.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index d340e38a9f..6dd0aa41f9 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -8,6 +8,10 @@ Click [here](http://www.google.com) to visit Google. But I know what you're wondering. If Bruch Wayne is the Bat, then who is Bruce Wayne? Well it's obvious... -...IT'S JOHN CENA!!! +...IT'S [JOHN CENA](https://www.youtube.com/watch?v=5LitDGyxFh4)!!! + +And that's why both Batman and John Cena's theme songs always seem familiar even if you've never heard them before! + + but you wonder does it end [here?](../movie-ripoffs/selfaware/selfaware.md) From 1200f4139997b035e786f0d4d98c3ff19f8430f8 Mon Sep 17 00:00:00 2001 From: SinisterBlade Date: Wed, 2 Sep 2015 20:18:53 +0530 Subject: [PATCH 0839/5486] Add Batman and John Cena theme --- english/batman/batman.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index 6dd0aa41f9..7178dfcea3 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -8,9 +8,9 @@ Click [here](http://www.google.com) to visit Google. But I know what you're wondering. If Bruch Wayne is the Bat, then who is Bruce Wayne? Well it's obvious... -...IT'S [JOHN CENA](https://www.youtube.com/watch?v=5LitDGyxFh4)!!! +...IT'S JOHN CENA!!! -And that's why both Batman and John Cena's theme songs always seem familiar even if you've never heard them before! +And that's why both [Batman](https://www.youtube.com/watch?v=VSaDPc1Cs5U) and [John Cena]((https://www.youtube.com/watch?v=5LitDGyxFh4))'s theme songs always seem familiar even if you've never heard them before! From 2232fdbcc46be86106db393c67e5422ad987c1f6 Mon Sep 17 00:00:00 2001 From: SinisterBlade Date: Wed, 2 Sep 2015 20:22:58 +0530 Subject: [PATCH 0840/5486] Remove youtube links --- english/batman/batman.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index 7178dfcea3..d07299657b 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -10,8 +10,6 @@ But I know what you're wondering. If Bruch Wayne is the Bat, then who is Bruce W ...IT'S JOHN CENA!!! -And that's why both [Batman](https://www.youtube.com/watch?v=VSaDPc1Cs5U) and [John Cena]((https://www.youtube.com/watch?v=5LitDGyxFh4))'s theme songs always seem familiar even if you've never heard them before! - - +And that's why both Batman and John Cena's theme songs always seem familiar even if you've never heard them before! but you wonder does it end [here?](../movie-ripoffs/selfaware/selfaware.md) From 15c78685b65fb2bb5756349c995af45f89428b3c Mon Sep 17 00:00:00 2001 From: Andy Date: Wed, 2 Sep 2015 16:53:50 +0200 Subject: [PATCH 0841/5486] add flann o'brien option to marshmallow.md and create flann-o-brien/truth-is-odd.md --- english/flann-o-brien/truth-is-odd.md | 3 +++ english/marshmallow.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 english/flann-o-brien/truth-is-odd.md diff --git a/english/flann-o-brien/truth-is-odd.md b/english/flann-o-brien/truth-is-odd.md new file mode 100644 index 0000000000..207da68d66 --- /dev/null +++ b/english/flann-o-brien/truth-is-odd.md @@ -0,0 +1,3 @@ +Becoming increasingly aware that the situation is more odd than even, you consult the legendary Irish writer Flann O'Brien, and his novel at-swim-two-birds, where you find the following: "there is safety in a triad, chastity is truth and truth is an odd +number. And your statement that kangaroos are not human is highly +debatable." \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 0899608172..920d442a80 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -466,3 +466,5 @@ Do you: [See if there is a Udacity course on the subject](udacity/udacity.md) Click [here](young/young.md) to listen to music. + +[Consult Flann O'Brien](flann-o-brien/truth-is-odd.md) From 734e58de454fd367cefa85661ff38ddb0fc9159d Mon Sep 17 00:00:00 2001 From: Vered Bauer Date: Wed, 2 Sep 2015 10:02:05 -0500 Subject: [PATCH 0842/5486] added line brakes --- english/yoga/mind/yoga_mind.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/yoga/mind/yoga_mind.md b/english/yoga/mind/yoga_mind.md index 3fe362c1b3..99e87c72ae 100644 --- a/english/yoga/mind/yoga_mind.md +++ b/english/yoga/mind/yoga_mind.md @@ -4,4 +4,6 @@ Oops! I mean your soul. Want to know about Yoga lifestyle? Click [here](../lifestyle/yoga_lifestyle.md) -Most people have discovered that exercising, whether it’s going for a walk or doing a vigorous yoga class, can lift their mood. +Most people have discovered that exercising, +whether it’s going for a walk or doing a vigorous yoga class, +can lift their mood. From 9700764fea10058a867df9f9e2b296c467437bc4 Mon Sep 17 00:00:00 2001 From: Andy Date: Wed, 2 Sep 2015 17:05:49 +0200 Subject: [PATCH 0843/5486] add line returns for legibility as requested --- english/flann-o-brien/truth-is-odd.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/flann-o-brien/truth-is-odd.md b/english/flann-o-brien/truth-is-odd.md index 207da68d66..389fdeeff1 100644 --- a/english/flann-o-brien/truth-is-odd.md +++ b/english/flann-o-brien/truth-is-odd.md @@ -1,3 +1,7 @@ -Becoming increasingly aware that the situation is more odd than even, you consult the legendary Irish writer Flann O'Brien, and his novel at-swim-two-birds, where you find the following: "there is safety in a triad, chastity is truth and truth is an odd +Becoming increasingly aware that the situation + is more odd than even, you consult the legendary + Irish writer Flann O'Brien, and his novel at-swim-two-birds, + where you find the following: "there + is safety in a triad, chastity is truth and truth is an odd number. And your statement that kangaroos are not human is highly debatable." \ No newline at end of file From 968dac4c2aef285add90c74d4ea60f823525fcc6 Mon Sep 17 00:00:00 2001 From: Vered Bauer Date: Wed, 2 Sep 2015 10:14:44 -0500 Subject: [PATCH 0844/5486] second version --- english/yoga/mind/yoga_mind.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/yoga/mind/yoga_mind.md b/english/yoga/mind/yoga_mind.md index 99e87c72ae..996555547d 100644 --- a/english/yoga/mind/yoga_mind.md +++ b/english/yoga/mind/yoga_mind.md @@ -4,6 +4,4 @@ Oops! I mean your soul. Want to know about Yoga lifestyle? Click [here](../lifestyle/yoga_lifestyle.md) -Most people have discovered that exercising, -whether it’s going for a walk or doing a vigorous yoga class, -can lift their mood. +Most people have discovered that exercising can lift their mood. From e709e74f6e56e8bcc51ea9d9c0561b0d3c1e8092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Fangeux?= Date: Wed, 2 Sep 2015 19:55:37 +0200 Subject: [PATCH 0845/5486] Add next choices when getting outside modified: tirer-porte.md new file: traverser-hautes-herbes/traverser-hautes-herbes.md --- french/sortie/tirer-porte/tirer-porte.md | 9 +++++++++ .../traverser-hautes-herbes/traverser-hautes-herbes.md | 3 +++ 2 files changed, 12 insertions(+) create mode 100644 french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md diff --git a/french/sortie/tirer-porte/tirer-porte.md b/french/sortie/tirer-porte/tirer-porte.md index db2a0dcc09..5d3895de6f 100644 --- a/french/sortie/tirer-porte/tirer-porte.md +++ b/french/sortie/tirer-porte/tirer-porte.md @@ -1,2 +1,11 @@ La porte s'ouvre et vous arrivez dans un jardin. Dans ce jardin les herbes sont très hautes, elles vous chatouillent le menton. +Embarrassé, vous décidez de : + +[Continuer malgré tout](traverser-hautes-herbes/traverser-hautes-herbes.md) + +[Faire demi-tour. Vous tenterez autre chose demain, après un bon somme…](../feu-de-camp.md) + +[Appeler au secours](../../appel-au-secours/appel-au-secours.md) + +[Sentir les fleurs des champs](../../panique/sentir/fleurs.md) diff --git a/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md b/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md new file mode 100644 index 0000000000..b9142d8fc6 --- /dev/null +++ b/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md @@ -0,0 +1,3 @@ +Vous prenez une pleine respiration et vous vous engagez dans les hautes-herbes. +La végétation est dense et sa traversée plus compliquée que prévue. Soudain, +quelque chose saisit votre cheville… From d8bd83992f7fe66d774fcc79d0784eaa10fe6666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Fangeux?= Date: Wed, 2 Sep 2015 20:02:19 +0200 Subject: [PATCH 0846/5486] Fix path mistakes --- french/sortie/tirer-porte/tirer-porte.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/french/sortie/tirer-porte/tirer-porte.md b/french/sortie/tirer-porte/tirer-porte.md index 5d3895de6f..0e6c98d3ba 100644 --- a/french/sortie/tirer-porte/tirer-porte.md +++ b/french/sortie/tirer-porte/tirer-porte.md @@ -4,8 +4,8 @@ Embarrassé, vous décidez de : [Continuer malgré tout](traverser-hautes-herbes/traverser-hautes-herbes.md) -[Faire demi-tour. Vous tenterez autre chose demain, après un bon somme…](../feu-de-camp.md) +[Faire demi-tour. Vous tenterez autre chose demain, après un bon somme…](../../feu-de-camp.md) -[Appeler au secours](../../appel-au-secours/appel-au-secours.md) +[Appeler au secours](../../appel-au-secours/appeler-au-secours.md) [Sentir les fleurs des champs](../../panique/sentir/fleurs.md) From b271cfb71f5e6914fcf23de7d04578b6504b4f66 Mon Sep 17 00:00:00 2001 From: Jeff Mew Date: Wed, 2 Sep 2015 11:02:54 -0700 Subject: [PATCH 0847/5486] Added line --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 920d442a80..765d51fe97 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -95,6 +95,8 @@ Marshmallows are going to rule the world! Long live marshmallows! +For a few moments you think to yourself, with all these marshmallows, you have some rice krispy squres. + Hold the image of the marshmallow and... Sing softly the song of it's people as you... From 3de3fcbc6c4b44aa6727f83fd3bc86df51faa23d Mon Sep 17 00:00:00 2001 From: Arun Singh Date: Wed, 2 Sep 2015 23:57:05 +0530 Subject: [PATCH 0848/5486] caroline suggestions 2 tiers done. --- .../teachings-of-swami-vivekananda/quotes.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md b/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md index a70d84bfe5..eb3f5f29ef 100644 --- a/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md +++ b/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md @@ -55,8 +55,8 @@ not even the thunderbolts of heaven -- but stand up and work! There is no other teacher but your own soul. 10. Like me or Hate me,both are in my favor, - If you like me I am in your Heart, - If you hate me I am in your mind. + If you like me I am in your Heart, + If you hate me I am in your mind. 11. BY the study of different religions we find that in essence they are one. @@ -73,6 +73,7 @@ not even the thunderbolts of heaven -- but stand up and work! [Read More](http://www.awakeningindia.org/life/Teachings.aspx) + [Read More](http://rishikajain.com/2014/01/11/top-ten-famous-quotes-of-swami-vivekananda/) [OK, this was interesting, but something's weird about this place... is that marshmallow?](../../marshmallow.md) From 20c9f2935c8c42439cf27fff3192c4e74307ab39 Mon Sep 17 00:00:00 2001 From: ekstasis Date: Wed, 2 Sep 2015 23:44:12 -0400 Subject: [PATCH 0849/5486] Add an option to bake cookies after staring into the Abyss. --- english/watched/watched.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/watched/watched.md b/english/watched/watched.md index 5600d8d209..5b86649de2 100644 --- a/english/watched/watched.md +++ b/english/watched/watched.md @@ -1 +1,3 @@ -You gaze into the abyss, and the abyss gazes into you. \ No newline at end of file +You gaze into the abyss, and the abyss gazes into you. + +Perhaps you'd like to lighten up and [Bake some cookies.](../bake-cookies/bake-cookies.md) From e0a9396e2ed752f0b103029587c7acbeef73efb9 Mon Sep 17 00:00:00 2001 From: ekstasis Date: Wed, 2 Sep 2015 23:49:40 -0400 Subject: [PATCH 0850/5486] Change "bake-cookies.md" to "cookies.md" --- english/watched/watched.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/watched/watched.md b/english/watched/watched.md index 5b86649de2..06942cd822 100644 --- a/english/watched/watched.md +++ b/english/watched/watched.md @@ -1,3 +1,3 @@ You gaze into the abyss, and the abyss gazes into you. -Perhaps you'd like to lighten up and [Bake some cookies.](../bake-cookies/bake-cookies.md) +Perhaps you'd like to lighten up and [Bake some cookies.](../bake-cookies/cookies.md) From f950accbed65d6ea332cb35edd95bd9e1162d8f6 Mon Sep 17 00:00:00 2001 From: alessandrocalu Date: Thu, 3 Sep 2015 01:02:51 -0300 Subject: [PATCH 0851/5486] Add options for instrutor.md --- .../diff/pull/reenvio/watch/divulga/instrutor/instrutor.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md index f571726e25..8090cc976a 100644 --- a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md +++ b/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md @@ -1,2 +1,6 @@ Você desenvolve um curso de Git e GitHub a passa a ganhar uma boa grana com -o novo trabalho: +o novo trabalho, agora você deseja criar um grande projeto colaborativo no GitHub: + +[Você procura por amigos conhecidos para ajudar] + +[Você procura por desenvolvedores de renome no GitHub para ajudar] From 7a504301557fc686609c16ec30b2067fe88f23b9 Mon Sep 17 00:00:00 2001 From: ekstasis Date: Thu, 3 Sep 2015 00:53:33 -0400 Subject: [PATCH 0852/5486] Uncapitalize Bake --- english/watched/watched.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/watched/watched.md b/english/watched/watched.md index 06942cd822..5867f49f6a 100644 --- a/english/watched/watched.md +++ b/english/watched/watched.md @@ -1,3 +1,4 @@ You gaze into the abyss, and the abyss gazes into you. -Perhaps you'd like to lighten up and [Bake some cookies.](../bake-cookies/cookies.md) +Perhaps you'd like to lighten up and [bake some cookies.](../bake-cookies/cookies.md) + From 1ab4a444c8fcbb5f443127939a57f094ef851298 Mon Sep 17 00:00:00 2001 From: Rik Nieuwoudt Date: Thu, 3 Sep 2015 13:27:25 +0200 Subject: [PATCH 0853/5486] Ninja added --- english/ninja/ninja.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 english/ninja/ninja.md diff --git a/english/ninja/ninja.md b/english/ninja/ninja.md new file mode 100644 index 0000000000..ac107964d1 --- /dev/null +++ b/english/ninja/ninja.md @@ -0,0 +1,21 @@ +[../buy-gameboy/buy-gameboy.md](gameboy) + +my game +Boy or I'll hoes you +Life is tough +When I get stuck +When my time is up +I push through +Till I break-break-break +on through to the other side +Fantastically poor with patience like a stalker + +Ninja is hardcore +Been cut so deep, feel no pain +It's not sore +Don't ask for kak or +You'll get what you ask for +I'm like a wild animal in the corner +Waiting for the break of dawn +Trying to get through the night +Just a man with the will to survive \ No newline at end of file From 09a1a192b10f079130512e1476e3c377220b6f57 Mon Sep 17 00:00:00 2001 From: Rik Nieuwoudt Date: Thu, 3 Sep 2015 13:37:10 +0200 Subject: [PATCH 0854/5486] fixed casey-collabs issues --- english/buy-gameboy/buy-gameboy.md | 4 +++- english/ninja/ninja.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/english/buy-gameboy/buy-gameboy.md b/english/buy-gameboy/buy-gameboy.md index 03c25884a6..6d37da1837 100644 --- a/english/buy-gameboy/buy-gameboy.md +++ b/english/buy-gameboy/buy-gameboy.md @@ -1,3 +1,5 @@ you realize that Pokemon is great and can still help you with your troubles, you find a man at a flea market selling Pokemon Red, -Blue, and Yellow all for 20 dollars along with a Gameboy. You buy it. \ No newline at end of file +Blue, and Yellow all for 20 dollars along with a Gameboy. You buy it. + +[english/ninja/ninja.md](but this isn't a game, boy.) \ No newline at end of file diff --git a/english/ninja/ninja.md b/english/ninja/ninja.md index ac107964d1..1347a80d07 100644 --- a/english/ninja/ninja.md +++ b/english/ninja/ninja.md @@ -1,4 +1,4 @@ -[../buy-gameboy/buy-gameboy.md](gameboy) +[english/buy-gameboy/buy-gameboy.md](gameboy) my game Boy or I'll hoes you From ab6caaae24f6fc56fb0810abd529624c1c30e72e Mon Sep 17 00:00:00 2001 From: Rik Nieuwoudt Date: Thu, 3 Sep 2015 13:43:54 +0200 Subject: [PATCH 0855/5486] try fixing links again --- english/buy-gameboy/buy-gameboy.md | 2 +- english/ninja/ninja.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/english/buy-gameboy/buy-gameboy.md b/english/buy-gameboy/buy-gameboy.md index 6d37da1837..6a07e02fa3 100644 --- a/english/buy-gameboy/buy-gameboy.md +++ b/english/buy-gameboy/buy-gameboy.md @@ -2,4 +2,4 @@ you realize that Pokemon is great and can still help you with your troubles, you find a man at a flea market selling Pokemon Red, Blue, and Yellow all for 20 dollars along with a Gameboy. You buy it. -[english/ninja/ninja.md](but this isn't a game, boy.) \ No newline at end of file +[But it's not a game, boy](./english/ninja/ninja.md) \ No newline at end of file diff --git a/english/ninja/ninja.md b/english/ninja/ninja.md index 1347a80d07..f0e6db9ab1 100644 --- a/english/ninja/ninja.md +++ b/english/ninja/ninja.md @@ -1,4 +1,4 @@ -[english/buy-gameboy/buy-gameboy.md](gameboy) +[from buy-gameboy](./english/buy-gameboy/buy-gameboy.md) my game Boy or I'll hoes you From 682667eda5b3b0b32fe0ad2d1aaf26b1eb5419cb Mon Sep 17 00:00:00 2001 From: RikNieuwoudt Date: Thu, 3 Sep 2015 13:48:17 +0200 Subject: [PATCH 0856/5486] Update buy-gameboy.md --- english/buy-gameboy/buy-gameboy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/buy-gameboy/buy-gameboy.md b/english/buy-gameboy/buy-gameboy.md index 6a07e02fa3..58f2179931 100644 --- a/english/buy-gameboy/buy-gameboy.md +++ b/english/buy-gameboy/buy-gameboy.md @@ -2,4 +2,4 @@ you realize that Pokemon is great and can still help you with your troubles, you find a man at a flea market selling Pokemon Red, Blue, and Yellow all for 20 dollars along with a Gameboy. You buy it. -[But it's not a game, boy](./english/ninja/ninja.md) \ No newline at end of file +[But it's not a game, boy](/english/ninja/ninja.md) From 4e287f80f12a60cf67692d45e3d75fa789285a4f Mon Sep 17 00:00:00 2001 From: RikNieuwoudt Date: Thu, 3 Sep 2015 13:48:38 +0200 Subject: [PATCH 0857/5486] Update ninja.md --- english/ninja/ninja.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/ninja/ninja.md b/english/ninja/ninja.md index f0e6db9ab1..df43a8d6b9 100644 --- a/english/ninja/ninja.md +++ b/english/ninja/ninja.md @@ -1,5 +1,3 @@ -[from buy-gameboy](./english/buy-gameboy/buy-gameboy.md) - my game Boy or I'll hoes you Life is tough @@ -18,4 +16,4 @@ You'll get what you ask for I'm like a wild animal in the corner Waiting for the break of dawn Trying to get through the night -Just a man with the will to survive \ No newline at end of file +Just a man with the will to survive From e76b8f3e7a05f5ce2363e3d7abc1db2574dffc0d Mon Sep 17 00:00:00 2001 From: Andy Chu Date: Thu, 3 Sep 2015 08:59:17 -0700 Subject: [PATCH 0858/5486] Add a line to the strange voice in virtual reality --- english/virtualreality/voice/strangeVoice.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/virtualreality/voice/strangeVoice.md b/english/virtualreality/voice/strangeVoice.md index e86c328e02..d6bbc63c25 100644 --- a/english/virtualreality/voice/strangeVoice.md +++ b/english/virtualreality/voice/strangeVoice.md @@ -18,6 +18,9 @@ Just before falling asleep, you wonder where you'll wake up... You dream that you are a drop of water, falling through the air, warping and shedding small pieces of yourself as you are buffeted by the air currents. +Your mind reaches out to try and affect your shape. The water responds giving you hope +but as you exert more and more effort, it seems harder to try and do anything. + The other droplets around you seem content to fall as preordained by physical forces of the world. Perhaps they once fought to control their destiny as well, but today they were firmly entrenched in the water cycle. Falling from tens of thousands of feet to the ground was an ordinary Saturday Morning. From af543f3dcf20fcc765398c371efafc6b34e04f0d Mon Sep 17 00:00:00 2001 From: lickedcat Date: Thu, 3 Sep 2015 12:02:17 -0400 Subject: [PATCH 0859/5486] Added the folder licked-cat with file vacation.md. Added link in marshmallow.md to link to vacation.md. --- english/licked-cat/vacation.md | 1 + english/marshmallow.md | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 english/licked-cat/vacation.md diff --git a/english/licked-cat/vacation.md b/english/licked-cat/vacation.md new file mode 100644 index 0000000000..36ecd8b6a1 --- /dev/null +++ b/english/licked-cat/vacation.md @@ -0,0 +1 @@ +It's time to take a vacation [here] (http://freguesiariofrio.pt/) diff --git a/english/marshmallow.md b/english/marshmallow.md index 765d51fe97..0ab66b674c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -470,3 +470,7 @@ Do you: Click [here](young/young.md) to listen to music. [Consult Flann O'Brien](flann-o-brien/truth-is-odd.md) + +[It's time to take a vacation] (licked-cat/vacation.md) + + From 1ec3e9ac6b17587c7c61c8a194bbe85c99605d62 Mon Sep 17 00:00:00 2001 From: jkrula Date: Thu, 3 Sep 2015 22:17:22 +0300 Subject: [PATCH 0860/5486] include swahili link in language.md --- language.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/language.md b/language.md index 137ad7fb5a..7edf4c9946 100644 --- a/language.md +++ b/language.md @@ -115,4 +115,6 @@ Nếu bạn nói tiếng Việt, [nhấn vào link này](vietnamese/kechuyen.md) Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). -ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) \ No newline at end of file +ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) + +Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) \ No newline at end of file From 7e21ba52bef7f5c15128599dc70aaa734d0e382e Mon Sep 17 00:00:00 2001 From: Anthony Fumagalli Date: Thu, 3 Sep 2015 14:53:00 -0700 Subject: [PATCH 0861/5486] Add lines and edits to coffee.md --- english/coffee/coffee.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/english/coffee/coffee.md b/english/coffee/coffee.md index ba867beab6..f03b945a51 100644 --- a/english/coffee/coffee.md +++ b/english/coffee/coffee.md @@ -1,21 +1,13 @@ Do not mistake my yawn. It is a silent scream for coffee. -though -you might wanna see wonderful dream -that's why i don't fully agree -but if you are out of bed then -Drink some coffee and relax yourself a little bit. - -or have just few sips and get energy - The bitter-sweet flavor of roasted coffee beans invigorates your soul. -You feel like a new person after a cup of coffee. +You feel like a new person. Like you have been reborn. Nothing like a cup of coffee to start your day when you wake up. -Can you feel the caffeine rush inside of you? +Can you feel the caffeine rush inside of you? It's taking hold, controlling you. You're so high. After having your coffee do you want to: From 72eff2fa0c96201b9b1fe3f6d8660ba152f2464f Mon Sep 17 00:00:00 2001 From: justRishi Date: Fri, 4 Sep 2015 01:24:14 +0200 Subject: [PATCH 0862/5486] added subfolder wereld aan sleutel en andereWereld.md --- dutch/over-het-hek/sleutel/sleutel.md | 2 ++ dutch/over-het-hek/sleutel/wereld/welkeWereld.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 dutch/over-het-hek/sleutel/wereld/welkeWereld.md diff --git a/dutch/over-het-hek/sleutel/sleutel.md b/dutch/over-het-hek/sleutel/sleutel.md index 47a1b2bf6e..1e93a54e4a 100644 --- a/dutch/over-het-hek/sleutel/sleutel.md +++ b/dutch/over-het-hek/sleutel/sleutel.md @@ -4,3 +4,5 @@ toch het kledingstuk waaraan je hangt langzaam kapot te schuren met de sleutel. Geheel verdiept in het schuren en scheuren merk je pas langzaam op dat... ...dit helemaal jouw sleutels niet zijn. Wat was er toch gebeurd deze [nacht]?(nacht/deze-nacht.md) + +...dit magische sleutels zijn, niet van deze [wereld](wereld/welkeWereld.md) diff --git a/dutch/over-het-hek/sleutel/wereld/welkeWereld.md b/dutch/over-het-hek/sleutel/wereld/welkeWereld.md new file mode 100644 index 0000000000..5b8f1d0a51 --- /dev/null +++ b/dutch/over-het-hek/sleutel/wereld/welkeWereld.md @@ -0,0 +1 @@ +Asjemenou, terwijl je dit gebeuren overdenkt vergaat de wereld onder je voeten en wat verschijnt daar? \ No newline at end of file From 534840520235438ca38910282c76b7ffd911b472 Mon Sep 17 00:00:00 2001 From: Terry Date: Fri, 4 Sep 2015 10:47:56 +0800 Subject: [PATCH 0863/5486] =?UTF-8?q?Modify=20=E5=A4=A7=E8=AF=9D=E8=A5=BF?= =?UTF-8?q?=E6=B8=B8.md=20and=20add=20a=20new=20story=20option?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/heishanlaoyao/heishanlaoyao.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Chinese/heishanlaoyao/heishanlaoyao.md diff --git a/Chinese/heishanlaoyao/heishanlaoyao.md b/Chinese/heishanlaoyao/heishanlaoyao.md new file mode 100644 index 0000000000..557203ae34 --- /dev/null +++ b/Chinese/heishanlaoyao/heishanlaoyao.md @@ -0,0 +1 @@ +𱦣ô˺ɽĶ? diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 1477d4e9bb..ce9bae150a 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -44,4 +44,6 @@ [等死朕了](howeroc/西游后记.md) -[jubeater](ZTL/无天.md) \ No newline at end of file +[jubeater](ZTL/无天.md) + +[ɽ](heishanlaoyao/heishanlaoyao.md)? From d812cb7da8113cf3ca0db8b201b6504fa5e00244 Mon Sep 17 00:00:00 2001 From: Terry Date: Fri, 4 Sep 2015 12:36:30 +0800 Subject: [PATCH 0864/5486] Change to English name --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index ce9bae150a..23e4cde185 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -46,4 +46,4 @@ [jubeater](ZTL/无天.md) -[ɽ](heishanlaoyao/heishanlaoyao.md)? +[heishanlaoyao](heishanlaoyao/heishanlaoyao.md)? From 1e2a542284e7166538b6d1df595152c632c4527a Mon Sep 17 00:00:00 2001 From: roby Date: Fri, 4 Sep 2015 13:58:27 +0530 Subject: [PATCH 0865/5486] Add A Line to Marathi.md --- Marathi/marathi.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marathi/marathi.md b/Marathi/marathi.md index ce8f325d59..e2544ae6f9 100644 --- a/Marathi/marathi.md +++ b/Marathi/marathi.md @@ -1,2 +1,3 @@ मराठी विश्वात आपले स्वागत आहे -चार प्राइवेट ड्राइव पत्त्यावर राहणार्‍या श्री. आणि सौ. डर्सलीना आपण सामान्य असल्याचा अतिशय अभिमान होता. \ No newline at end of file +चार प्राइवेट ड्राइव पत्त्यावर राहणार्‍या श्री. आणि सौ. डर्सलीना आपण सामान्य असल्याचा अतिशय अभिमान होता. +गणपती उत्सवात आपले हार्दिक स्वागत. \ No newline at end of file From 20a48d3141d319de8ded312cf6bedb1160804f0d Mon Sep 17 00:00:00 2001 From: Aamir Khan Date: Fri, 4 Sep 2015 11:58:21 +0100 Subject: [PATCH 0866/5486] Add geo news link for urdu reader --- urdu/urdu-news.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/urdu/urdu-news.md b/urdu/urdu-news.md index b0f09554f5..ba1173cc7c 100644 --- a/urdu/urdu-news.md +++ b/urdu/urdu-news.md @@ -2,4 +2,6 @@ if you like to see urdu news [click here](http://www.bbc.com/urdu/) جن کو اردو آتی ہے آیے آپ کو اردو میں کہانی سناتے ہیں: -خوشی کا عالم تھا کہ اچانک پلک جھپکتے ہی، نہ جانے کیوں، سب لوگوں کو سانپ سونگھ گیا- \ No newline at end of file +خوشی کا عالم تھا کہ اچانک پلک جھپکتے ہی، نہ جانے کیوں، سب لوگوں کو سانپ سونگھ گیا- + +[سنسنی خبریں صرف اور صرف جیو نیوز پر ](http://www.geo.tv/urdu/) \ No newline at end of file From 0259113fdf1cbc716804406d1d7b382c4ddf3485 Mon Sep 17 00:00:00 2001 From: kike mendez Date: Fri, 4 Sep 2015 10:50:20 -0300 Subject: [PATCH 0867/5486] new story, oso. --- espanol/oso/grito/grito.md | 1 + espanol/oso/madre/madre.md | 2 ++ espanol/oso/oso.md | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 espanol/oso/grito/grito.md create mode 100644 espanol/oso/madre/madre.md create mode 100644 espanol/oso/oso.md diff --git a/espanol/oso/grito/grito.md b/espanol/oso/grito/grito.md new file mode 100644 index 0000000000..09705d632b --- /dev/null +++ b/espanol/oso/grito/grito.md @@ -0,0 +1 @@ +Edgardo!! Edgardo!! gritaban de la tribuna del estadio centenario en el partido de Penarol, Edgardo era el numero 9. diff --git a/espanol/oso/madre/madre.md b/espanol/oso/madre/madre.md new file mode 100644 index 0000000000..14293faa68 --- /dev/null +++ b/espanol/oso/madre/madre.md @@ -0,0 +1,2 @@ +Edgardo vos sos retrazado o que? no te dije que te dejes de jugar al play? +haceme el favor y ponete a juntar bayas como hacen los osos gummys \ No newline at end of file diff --git a/espanol/oso/oso.md b/espanol/oso/oso.md new file mode 100644 index 0000000000..1733b760f7 --- /dev/null +++ b/espanol/oso/oso.md @@ -0,0 +1,5 @@ +El oso edgardo estaba tranquilo en su cueva cuando de pronto: + +[Se oyo un grito desaforado](grito/grito.md) + +[la madre de edgardo lo cago a putiadas](madre/madre.md) \ No newline at end of file From cdfd41f60102a3211bd9e99e095a2c9dcf8491e7 Mon Sep 17 00:00:00 2001 From: DesireeWilson Date: Fri, 4 Sep 2015 15:22:59 -0500 Subject: [PATCH 0868/5486] added the line '[Follow the Doctor as he opens the door to the Tardis] (../insideTheTardis/insideTheTardis.md)' at the end of the 'timelord.md' file --- english/call-a-doctor/timelord/timelord.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/call-a-doctor/timelord/timelord.md b/english/call-a-doctor/timelord/timelord.md index d8ac0b1d44..5d28329ed4 100644 --- a/english/call-a-doctor/timelord/timelord.md +++ b/english/call-a-doctor/timelord/timelord.md @@ -20,3 +20,5 @@ Doctor: "I'm the Doctor. [Call for another doctor](../doctor.md) [Put the jacket back on](../../backinstraitjacket/backinstraitjacket.md) + +[Follow the Doctor as he opens the door to the Tardis] (../insideTheTardis/insideTheTardis.md) From 9dc91c76ea0bac910a79fc90874169b69efab34b Mon Sep 17 00:00:00 2001 From: DesireeWilson Date: Fri, 4 Sep 2015 15:29:10 -0500 Subject: [PATCH 0869/5486] added the file ./english/call-a-doctor/insideTheTardis/insideTheTardis.md' to the story --- english/call-a-doctor/insideTheTardis/insideTheTardis.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/call-a-doctor/insideTheTardis/insideTheTardis.md diff --git a/english/call-a-doctor/insideTheTardis/insideTheTardis.md b/english/call-a-doctor/insideTheTardis/insideTheTardis.md new file mode 100644 index 0000000000..90565664c3 --- /dev/null +++ b/english/call-a-doctor/insideTheTardis/insideTheTardis.md @@ -0,0 +1,7 @@ +You: it's bigger on the inside.... + +The Doctor: Yes, yes! They all say that! + +You: Who's 'they'? + + From fcea3ef76775cb985ea35c55186709790634e875 Mon Sep 17 00:00:00 2001 From: shadowstrafe Date: Sat, 5 Sep 2015 17:30:05 +0800 Subject: [PATCH 0870/5486] add lines to the go to singapore story --- english/singapore/singapore.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/singapore/singapore.md b/english/singapore/singapore.md index 287f8efa08..b45866ddee 100644 --- a/english/singapore/singapore.md +++ b/english/singapore/singapore.md @@ -8,4 +8,7 @@ to the south. Singapore's territory consists of the diamond-shaped main island, commonly referred to as Singapore Island in English and Pulau Ujong in Malay, and more than 60 significantly smaller islets; also, land reclamation has been used -to expand Singapore's land area, which is highly urbanised. \ No newline at end of file +to expand Singapore's land area, which is highly urbanised. + +As the plane doors open, you are hit by a wave of hot air. +It is 31 degrees outside right now. A typical day in Singapore. \ No newline at end of file From 7d9a86f742b502e40089c6bc73a1dfa90bcf6629 Mon Sep 17 00:00:00 2001 From: shlomitArgov Date: Sat, 5 Sep 2015 13:25:54 +0300 Subject: [PATCH 0871/5486] Added reassuring comment to awake.md --- english/adipose/awake/awake.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/adipose/awake/awake.md b/english/adipose/awake/awake.md index 492be82fee..2c87c291f1 100644 --- a/english/adipose/awake/awake.md +++ b/english/adipose/awake/awake.md @@ -9,4 +9,6 @@ retna. Unfortunitely there is no way to tell if it will be a pleasent dream or a hellish nightmare, but anything is better then your eternal loneliness, so you move on to the white dwarf two parsecs over. Then, -you died in your dreams. \ No newline at end of file +you died in your dreams. + +Relax, it's not the end of the world now... or... hmm.. \ No newline at end of file From 47fd62b898e65327b22a5222f8106a2c88e497d5 Mon Sep 17 00:00:00 2001 From: shlomitArgov Date: Sat, 5 Sep 2015 13:27:39 +0300 Subject: [PATCH 0872/5486] Revert "Added reassuring comment to awake.md" Contained delete This reverts commit 7d9a86f742b502e40089c6bc73a1dfa90bcf6629. --- english/adipose/awake/awake.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/adipose/awake/awake.md b/english/adipose/awake/awake.md index 2c87c291f1..492be82fee 100644 --- a/english/adipose/awake/awake.md +++ b/english/adipose/awake/awake.md @@ -9,6 +9,4 @@ retna. Unfortunitely there is no way to tell if it will be a pleasent dream or a hellish nightmare, but anything is better then your eternal loneliness, so you move on to the white dwarf two parsecs over. Then, -you died in your dreams. - -Relax, it's not the end of the world now... or... hmm.. \ No newline at end of file +you died in your dreams. \ No newline at end of file From 41b35991c8f881dab0a32e844d650d1753e6f163 Mon Sep 17 00:00:00 2001 From: shlomitArgov Date: Sat, 5 Sep 2015 13:28:30 +0300 Subject: [PATCH 0873/5486] Added reassuring comment to awame.md --- english/adipose/awake/awake.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/adipose/awake/awake.md b/english/adipose/awake/awake.md index 492be82fee..11e1a10186 100644 --- a/english/adipose/awake/awake.md +++ b/english/adipose/awake/awake.md @@ -9,4 +9,6 @@ retna. Unfortunitely there is no way to tell if it will be a pleasent dream or a hellish nightmare, but anything is better then your eternal loneliness, so you move on to the white dwarf two parsecs over. Then, -you died in your dreams. \ No newline at end of file +you died in your dreams. + +Just adding a line this time. \ No newline at end of file From 8156081b2fe72d340f687daea66a9583844b7b5d Mon Sep 17 00:00:00 2001 From: randolphwong Date: Sat, 5 Sep 2015 21:02:25 +0800 Subject: [PATCH 0874/5486] Girl is real --- english/karaoke/karaoke/sing.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/karaoke/karaoke/sing.md b/english/karaoke/karaoke/sing.md index 671becdf48..133ab67e7b 100644 --- a/english/karaoke/karaoke/sing.md +++ b/english/karaoke/karaoke/sing.md @@ -10,3 +10,5 @@ Do you: [propose to her](propose-to-her/propose-to-her.md) [puke on the mike](puke-on-the-mike/puke-on-the-mike.md) + +[check if she is real](girl-is-real/girl-is-real.md) From 058ee50430e199081a176941f985c6616d83d7a1 Mon Sep 17 00:00:00 2001 From: randolphwong Date: Sat, 5 Sep 2015 21:03:16 +0800 Subject: [PATCH 0875/5486] Girl is real --- english/karaoke/karaoke/girl-is-real/girl-is-real.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/karaoke/karaoke/girl-is-real/girl-is-real.md diff --git a/english/karaoke/karaoke/girl-is-real/girl-is-real.md b/english/karaoke/karaoke/girl-is-real/girl-is-real.md new file mode 100644 index 0000000000..829b97ea47 --- /dev/null +++ b/english/karaoke/karaoke/girl-is-real/girl-is-real.md @@ -0,0 +1 @@ +You walk up to her and reached out for her arms. Just then, you have a sudden urge to pee. From 20fb65530930de2974225c537c56c6ba162a5d37 Mon Sep 17 00:00:00 2001 From: none Date: Sat, 5 Sep 2015 19:34:42 +0200 Subject: [PATCH 0876/5486] Add new subdirectory tour and tour.md --- Italian/finestra/tour/tour.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Italian/finestra/tour/tour.md diff --git a/Italian/finestra/tour/tour.md b/Italian/finestra/tour/tour.md new file mode 100644 index 0000000000..bbce389c0d --- /dev/null +++ b/Italian/finestra/tour/tour.md @@ -0,0 +1,4 @@ +Con le tue tecniche di manipolazione mentale e la bambola voodoo riesci a domare il T-Rex, lo fai venire verso di te + +Ci salti su e vai alla scoperta di questo mondo fiabesco in cui sei capitato + \ No newline at end of file From 25dbe734f95cd9411a9945c524367c950291827a Mon Sep 17 00:00:00 2001 From: none Date: Sat, 5 Sep 2015 19:37:06 +0200 Subject: [PATCH 0877/5486] Change apri.md and add new story option --- Italian/finestra/apri.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Italian/finestra/apri.md b/Italian/finestra/apri.md index 1b206c4a6b..48c2a90bac 100644 --- a/Italian/finestra/apri.md +++ b/Italian/finestra/apri.md @@ -11,3 +11,4 @@ Come reagisci? [Torni a dormire](../caramelle.md) +[Crei una bambola voodoo per addomesticarlo] (tour/tour.md) From 877f5912f0afa0ad0c5f20629e2cb1cb8369af7f Mon Sep 17 00:00:00 2001 From: Amr Rady Date: Sat, 5 Sep 2015 22:36:38 +0200 Subject: [PATCH 0878/5486] my story --- arabic/dream/dream.md | 1 + 1 file changed, 1 insertion(+) diff --git a/arabic/dream/dream.md b/arabic/dream/dream.md index c347d2ec34..bcac1d2b8a 100644 --- a/arabic/dream/dream.md +++ b/arabic/dream/dream.md @@ -3,3 +3,4 @@ ولكن الاحلام لا تتحقق الا بالتوكل على الله والاخذ بالاسباب الان انت فى بداية الطريق ماذا ستفعل 1-[ستبدأ فى التعلم](../learn/learn.md) +لكل مخلوق حاجة ولكل حاجة غاية \ No newline at end of file From 97b8d2ae4f601f68aca752f8818d24e33ebf74e4 Mon Sep 17 00:00:00 2001 From: fedecassi Date: Sun, 6 Sep 2015 11:59:39 +0200 Subject: [PATCH 0879/5486] Added options to "raccogli" --- Italian/scappare/raccogli/raccogli.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Italian/scappare/raccogli/raccogli.md b/Italian/scappare/raccogli/raccogli.md index b1fb8ea394..a99e0ce37b 100644 --- a/Italian/scappare/raccogli/raccogli.md +++ b/Italian/scappare/raccogli/raccogli.md @@ -1 +1,7 @@ Raccogli i pezzi di vetro, ma ti ferisci una mano. + +[Cerchi un cerotto] (cerotto/cerotto.md) + +[Stringi i denti: sei un uomo forte] (resisti/resisti.md) + +[Ti butti sul pavimento piangendo dal dolore] (piangi/piangi.md) From 7c72288d18449f80f8322fbd8cbe7dbc24e6d44c Mon Sep 17 00:00:00 2001 From: fedecassi Date: Sun, 6 Sep 2015 12:02:21 +0200 Subject: [PATCH 0880/5486] Added end of the story to the option "piangi" --- Italian/scappare/raccogli/piangi/piangi.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Italian/scappare/raccogli/piangi/piangi.md diff --git a/Italian/scappare/raccogli/piangi/piangi.md b/Italian/scappare/raccogli/piangi/piangi.md new file mode 100644 index 0000000000..e991c28ec3 --- /dev/null +++ b/Italian/scappare/raccogli/piangi/piangi.md @@ -0,0 +1,3 @@ +Ti butti sul pavimento e inizi a piangere in preda agli spasmi per il dolore. +Purtroppo nel farlo ti dimentichi che il pavimento è pieno di vetri rotti, +che ti provocano una serie di ferite gravi. Anzi, mortali. From 3a0702674d913256392e772bab70950e46206280 Mon Sep 17 00:00:00 2001 From: fedecassi Date: Sun, 6 Sep 2015 12:04:29 +0200 Subject: [PATCH 0881/5486] Add option to go back when choosing "cerotto" --- Italian/scappare/raccogli/cerotto/cerotto.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Italian/scappare/raccogli/cerotto/cerotto.md diff --git a/Italian/scappare/raccogli/cerotto/cerotto.md b/Italian/scappare/raccogli/cerotto/cerotto.md new file mode 100644 index 0000000000..52b93c37c5 --- /dev/null +++ b/Italian/scappare/raccogli/cerotto/cerotto.md @@ -0,0 +1,4 @@ +Ti guardi in giro per cercare un cerotto, dovrebbe essercene uno nel cassetto. +Poi ti ricordi che non sei nella tua stanza. + +[Scegli un'altra opzione] (../raccogli.md) From f6d6397ce4591e4c41e631f0ba81d2f03e07aa83 Mon Sep 17 00:00:00 2001 From: fedecassi Date: Sun, 6 Sep 2015 12:07:55 +0200 Subject: [PATCH 0882/5486] Add options to "resisti" --- Italian/scappare/raccogli/resisti/resisti.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Italian/scappare/raccogli/resisti/resisti.md diff --git a/Italian/scappare/raccogli/resisti/resisti.md b/Italian/scappare/raccogli/resisti/resisti.md new file mode 100644 index 0000000000..47c61170ee --- /dev/null +++ b/Italian/scappare/raccogli/resisti/resisti.md @@ -0,0 +1,7 @@ +Stringi i denti e cerchi di resistere al dolore. Tu sei forte. Puoi farcela. +Cosa vuoi che sia una piccola ferita? Hai passato di peggio. Ehi, sanguina +sempre di più. Non si ferma. Aiuto. Panico. + +[Inizi ad andare nel panico e ti butti a terra piangendo.] (../piangi/piangi.md) + +[Resisti ancora.] (resisti-ancora/resisti-ancora.md) From a9c7aa555c65bb699ff168df8d3adeccbcf022ea Mon Sep 17 00:00:00 2001 From: fedecassi Date: Sun, 6 Sep 2015 12:08:46 +0200 Subject: [PATCH 0883/5486] Made option "resisti" gender-neutral --- Italian/scappare/raccogli/raccogli.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Italian/scappare/raccogli/raccogli.md b/Italian/scappare/raccogli/raccogli.md index a99e0ce37b..7fce4b099a 100644 --- a/Italian/scappare/raccogli/raccogli.md +++ b/Italian/scappare/raccogli/raccogli.md @@ -2,6 +2,6 @@ Raccogli i pezzi di vetro, ma ti ferisci una mano. [Cerchi un cerotto] (cerotto/cerotto.md) -[Stringi i denti: sei un uomo forte] (resisti/resisti.md) +[Stringi i denti e resisti al dolore] (resisti/resisti.md) [Ti butti sul pavimento piangendo dal dolore] (piangi/piangi.md) From 49cf2425165190cfe4ae06292b128d7c48c3749e Mon Sep 17 00:00:00 2001 From: fedecassi Date: Sun, 6 Sep 2015 12:09:30 +0200 Subject: [PATCH 0884/5486] Correct a typo --- Italian/scappare/raccogli/resisti/resisti.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Italian/scappare/raccogli/resisti/resisti.md b/Italian/scappare/raccogli/resisti/resisti.md index 47c61170ee..e9a2b70d84 100644 --- a/Italian/scappare/raccogli/resisti/resisti.md +++ b/Italian/scappare/raccogli/resisti/resisti.md @@ -2,6 +2,6 @@ Stringi i denti e cerchi di resistere al dolore. Tu sei forte. Puoi farcela. Cosa vuoi che sia una piccola ferita? Hai passato di peggio. Ehi, sanguina sempre di più. Non si ferma. Aiuto. Panico. -[Inizi ad andare nel panico e ti butti a terra piangendo.] (../piangi/piangi.md) +[Inizi ad andare nel panico e ti butti a terra piangendo] (../piangi/piangi.md) -[Resisti ancora.] (resisti-ancora/resisti-ancora.md) +[Resisti ancora] (resisti-ancora/resisti-ancora.md) From 36da64eaed041904aee63cb8074091318ba677b6 Mon Sep 17 00:00:00 2001 From: fedecassi Date: Sun, 6 Sep 2015 12:10:54 +0200 Subject: [PATCH 0885/5486] Add end of the story to the option "resisti-ancora" --- .../scappare/raccogli/resisti/resisti-ancora/resisti-ancora.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Italian/scappare/raccogli/resisti/resisti-ancora/resisti-ancora.md diff --git a/Italian/scappare/raccogli/resisti/resisti-ancora/resisti-ancora.md b/Italian/scappare/raccogli/resisti/resisti-ancora/resisti-ancora.md new file mode 100644 index 0000000000..53fb36c9e5 --- /dev/null +++ b/Italian/scappare/raccogli/resisti/resisti-ancora/resisti-ancora.md @@ -0,0 +1,2 @@ +Continui a resistere, mentre il sangue continua a scorrere. Senti che i sensi ti stanno +abbandonando, la vista si offusca. Cadi a terra e muori dissanguato. From 4c0a567326d31199d9f0c73bd03bad2216c043db Mon Sep 17 00:00:00 2001 From: Sai Manoj Kadiyala Date: Sun, 6 Sep 2015 16:02:38 +0530 Subject: [PATCH 0886/5486] Add history of tyres in english/jacket/complete-jacket/ad.md --- english/jacket/complete-jacket/ad.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/english/jacket/complete-jacket/ad.md b/english/jacket/complete-jacket/ad.md index 673cf04cb2..28a4571cf4 100644 --- a/english/jacket/complete-jacket/ad.md +++ b/english/jacket/complete-jacket/ad.md @@ -3,4 +3,14 @@ excited to show your family and friends this life changing achivement. You step outside and a little boy runs up to you and asks "Michelin Man, can I have your autograph?" -You spend the rest of your life selling tires. \ No newline at end of file +You spend the rest of your life selling tires. +Thinking back on the history of tires let me tell you an intersting story. +There was a cycle race the next day as was the tradition. +Little John never won a race but came back all bruised and tired after every race. +His father Dunlop couldn't tolerate this. But that was how the cycles were in those days. +They had wooden wheels which caused a lot of trouble for the children. +So one evening, a day before the race, Dunlop took the garden hose and +filled it with air and fixed it around the tire of his son's cycle. +The next day not only did John win the race but did it in half the time +of the others and the best part was he wasn't bruised. The father then +started a company and today we know it as Dunlop Tyres. \ No newline at end of file From 19c40c5bb4dc94b9ec19d464d51a439f2e487f14 Mon Sep 17 00:00:00 2001 From: Andrei Borissenko Date: Sun, 6 Sep 2015 14:22:22 -0400 Subject: [PATCH 0887/5486] Add ghostbusters to ponder-some-more --- english/ponder/ponder-some-more/ponder-some-more.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/ponder/ponder-some-more/ponder-some-more.md b/english/ponder/ponder-some-more/ponder-some-more.md index df3d4bebb0..229fc608ae 100644 --- a/english/ponder/ponder-some-more/ponder-some-more.md +++ b/english/ponder/ponder-some-more/ponder-some-more.md @@ -3,3 +3,4 @@ really GitHub? No. Why would there be a lighter then?! Come on, think! Do you: +[Get distracted with thoughts of pleasant childhood memories.](../../ghostbusters/ghostbusters.md) From a788c573232c35159450b4f68c7cccdff6ac083b Mon Sep 17 00:00:00 2001 From: Andrei Borissenko Date: Sun, 6 Sep 2015 14:23:36 -0400 Subject: [PATCH 0888/5486] Add "What is most important?" text to ponder --- english/ponder/ponder-some-more/ponder-some-more.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/ponder/ponder-some-more/ponder-some-more.md b/english/ponder/ponder-some-more/ponder-some-more.md index 229fc608ae..30f43881f4 100644 --- a/english/ponder/ponder-some-more/ponder-some-more.md +++ b/english/ponder/ponder-some-more/ponder-some-more.md @@ -1,6 +1,8 @@ Is this about a Repository I cloned without forking? Is the marshmallow man really GitHub? No. Why would there be a lighter then?! Come on, think! +I am in this dream... what is most important?! + Do you: [Get distracted with thoughts of pleasant childhood memories.](../../ghostbusters/ghostbusters.md) From 5b6ae120471973511ee78bc6e0cdc939da04e42d Mon Sep 17 00:00:00 2001 From: Andrei Borissenko Date: Sun, 6 Sep 2015 14:27:51 -0400 Subject: [PATCH 0889/5486] Add yoga option to clear mind --- english/ponder/ponder-some-more/ponder-some-more.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/ponder/ponder-some-more/ponder-some-more.md b/english/ponder/ponder-some-more/ponder-some-more.md index 30f43881f4..e0904ad6cc 100644 --- a/english/ponder/ponder-some-more/ponder-some-more.md +++ b/english/ponder/ponder-some-more/ponder-some-more.md @@ -6,3 +6,5 @@ I am in this dream... what is most important?! Do you: [Get distracted with thoughts of pleasant childhood memories.](../../ghostbusters/ghostbusters.md) + +[Return to a yoga practice to center yourself.](../../yoga/yoga.md) From b6919fa4a308ac728dd4a645314a7d5690a9c3f7 Mon Sep 17 00:00:00 2001 From: Andrei Borissenko Date: Sun, 6 Sep 2015 14:32:58 -0400 Subject: [PATCH 0890/5486] Add question marks to two options --- english/ponder/ponder-some-more/ponder-some-more.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/ponder/ponder-some-more/ponder-some-more.md b/english/ponder/ponder-some-more/ponder-some-more.md index e0904ad6cc..bea4a3f2c5 100644 --- a/english/ponder/ponder-some-more/ponder-some-more.md +++ b/english/ponder/ponder-some-more/ponder-some-more.md @@ -5,6 +5,6 @@ I am in this dream... what is most important?! Do you: -[Get distracted with thoughts of pleasant childhood memories.](../../ghostbusters/ghostbusters.md) +[Get distracted with thoughts of pleasant childhood memories?](../../ghostbusters/ghostbusters.md) -[Return to a yoga practice to center yourself.](../../yoga/yoga.md) +[Return to a yoga practice to center yourself?](../../yoga/yoga.md) From 422ba3245fa4d34aaa50f89a3601b92037067fa8 Mon Sep 17 00:00:00 2001 From: Yaz Khoury Date: Sun, 6 Sep 2015 18:47:28 -0400 Subject: [PATCH 0891/5486] Add Burning Man line --- english/marshmallow.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0ab66b674c..2ee0b49a01 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -21,7 +21,7 @@ Grave danger. Oh No! I actually used to know a guy named Dave Granger. We sure had some good times! Anyway, the possibility of danger lurks. The type of extreme mortal danger that so often accompanies confectionary inspired interior design. -Quickly surveying your immediate surrounds, you notice a garishly dressed, +Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. [Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) @@ -34,7 +34,7 @@ capacity for good, I have sent them you... my only son." [Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) -[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) +[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) These marshmallows are numerous and they look so delicious. ... despite the feeling they're somehow judging you for only wearing one sock. @@ -79,7 +79,7 @@ You hear a small bird sound in the distance. But it sounds like it might be coming out of speakers. -Something lightly brushes the back of your neck, sending a chill down your spine! +Something lightly brushes the back of your neck, sending a chill down your spine! Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. @@ -118,14 +118,14 @@ Pointing it at the door, eyes closed, "Alohomora..." Nothing seems to be happening. Sheepishly you look down on the crappy wand in your hand. - + You must be doing something wrong. You drink a beer and think about it, then Ah-ha! You notice your pants are now glowing, so you must have been holding the wand upside down. Suddenly, you become aware of the need to take a leak. -You can't hold it. You wonder, Are glowing pants waterproof? -You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) +You can't hold it. You wonder, Are glowing pants waterproof? +You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: @@ -370,7 +370,7 @@ Do you: [Pull out your proton pack!](ghost-buster/ghost-busted.md) [You take the red pill](red-pill/red-pill.md) - + [Twas the Night Before Christmas](night-night/tale.md) [Check Reddit for any useful information.](reddit/ask-reddit.md) @@ -445,7 +445,7 @@ Do you: [Analyze the composition of the marshmallow](analyze/analysis.md) -[Watch Barcelona game](watch-barca/watch-barca.md) +[Watch Barcelona game](watch-barca/watch-barca.md) [Oops! this story ain't ending..](unending-story/unending-story.md) @@ -473,4 +473,5 @@ Click [here](young/young.md) to listen to music. [It's time to take a vacation] (licked-cat/vacation.md) +And then you realize that Burning Man is over, so no real vacations :( From 2c765b44b0e33d5d0df9a0d169f5d756c9bec2a3 Mon Sep 17 00:00:00 2001 From: Krishna Kasibhatta Date: Mon, 7 Sep 2015 12:36:09 +0530 Subject: [PATCH 0892/5486] Added Telugu lines --- telugu/telugu.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/telugu/telugu.md b/telugu/telugu.md index c908f2607d..6aad17f93c 100644 --- a/telugu/telugu.md +++ b/telugu/telugu.md @@ -2,4 +2,6 @@ జనాభాతో [1] ప్రాంతీయ భాషలలో మొదటి స్థానంలో ఉంది. ప్రపంచంలోని ప్రజలు అత్యధికముగా మాట్లాడే భాషలలో పదమూడవ స్థానములోనూ, భారత దేశములో హిందీ, బెంగాలీ తర్వాత మూడవ స్థానములోను నిలుస్తుంది. పాతవైన ప్రపంచ భాష గణాంకాల (ఎథ్నోలాగ్) ప్రకారం ప్రపంచవ్యాప్తంగా 7.4 కోట్లు మందికి మాతృభాషగా ఉంది.[2] మొదటి భాషగా మాట్లాడతారు. అతి ప్రాచీన దేశ భాషలలో సంస్కృతము, - తమిళములతో బాటు తెలుగు భాషను అక్టోబరు 31, 2008న భారత ప్రభుత్వము చేర్చింది. \ No newline at end of file + తమిళములతో బాటు తెలుగు భాషను అక్టోబరు 31, 2008న భారత ప్రభుత్వము చేర్చింది. + అసలు కథ ఏంటంటే ఇది కేవలం మనకు గిట్ మరియు గిట్ హబ్ గురించి నేర్చుకునేందుకు ఏర్పాటు చేసిన కథ మాత్రమే. +అందుచేత ఇందులో ఏ అర్థాలూ వెతకొద్దు ప్లీజ్. చేతనయితే మీరు కూడా కొన్ని లైన్లు వ్రాసి బాగా నేర్చుకోండి. \ No newline at end of file From 66a7dd968cf1d4a5460a448c493ebb69ab9db2f7 Mon Sep 17 00:00:00 2001 From: dhyey35 Date: Mon, 7 Sep 2015 14:01:48 +0530 Subject: [PATCH 0893/5486] Add my story of present-tense --- english/present-tense/present-tense.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/present-tense/present-tense.md diff --git a/english/present-tense/present-tense.md b/english/present-tense/present-tense.md new file mode 100644 index 0000000000..52275b3dab --- /dev/null +++ b/english/present-tense/present-tense.md @@ -0,0 +1,6 @@ +Boy : I upload a new selfie on facebook. +Girl : Hey , it should be "uploaded" . You know past tense. +Boy : after learning git and github i only speak in present tense . side effect of commit messages . +Girl : What's github ? Is it a social networking site ? +Boy : ( facepalm ) +:) From aea832dc5fcecf8657bcee13944564874bf82fcd Mon Sep 17 00:00:00 2001 From: dhyey35 Date: Mon, 7 Sep 2015 14:10:23 +0530 Subject: [PATCH 0894/5486] Add link in marshmallow.md --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0ab66b674c..c69c036fe8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -474,3 +474,4 @@ Click [here](young/young.md) to listen to music. [It's time to take a vacation] (licked-cat/vacation.md) +[present-tense](present-tense/present-tense.md) \ No newline at end of file From 847919170d1d8bc4ded6d04b71dc280c659627f9 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Sep 2015 11:49:35 +0200 Subject: [PATCH 0895/5486] Add a new Slovak option and modify marsmelaci.md file --- slovak/marsmelaci.md | 3 ++- slovak/zachrana/zachrana-rybky.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 slovak/zachrana/zachrana-rybky.md diff --git a/slovak/marsmelaci.md b/slovak/marsmelaci.md index 67a1399b95..05b1f78630 100644 --- a/slovak/marsmelaci.md +++ b/slovak/marsmelaci.md @@ -2,4 +2,5 @@ Jedno nevšedné ráno sa zobudíš v divnej miestnosti, ktorá má steny z mars Čo urobíš? -[Raňajky](ranajky/koniec-rybky.md) \ No newline at end of file +[Raňajky](ranajky/koniec-rybky.md) +[Pokúsiš sa zachrániť rybku](zachrana/zachrana-rybky.md) \ No newline at end of file diff --git a/slovak/zachrana/zachrana-rybky.md b/slovak/zachrana/zachrana-rybky.md new file mode 100644 index 0000000000..d1acc926ea --- /dev/null +++ b/slovak/zachrana/zachrana-rybky.md @@ -0,0 +1 @@ +Rybku sa rýchlo pokúsiš vytiahnuť z nosa. Po chvíli sa ti to podarí a hneď na to hľadáš spôsob ako ju zachrániť. \ No newline at end of file From f376e332ef92a492fbbef7acf6fa21274c605025 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 7 Sep 2015 11:59:57 +0200 Subject: [PATCH 0896/5486] Add new line between options in slovak/marsmelaci.md file --- slovak/marsmelaci.md | 1 + 1 file changed, 1 insertion(+) diff --git a/slovak/marsmelaci.md b/slovak/marsmelaci.md index 05b1f78630..befefcf45f 100644 --- a/slovak/marsmelaci.md +++ b/slovak/marsmelaci.md @@ -3,4 +3,5 @@ Jedno nevšedné ráno sa zobudíš v divnej miestnosti, ktorá má steny z mars Čo urobíš? [Raňajky](ranajky/koniec-rybky.md) + [Pokúsiš sa zachrániť rybku](zachrana/zachrana-rybky.md) \ No newline at end of file From 0ce83592ab1c8d731af9d19c11b2c9552056e13e Mon Sep 17 00:00:00 2001 From: Rjblaauboer Date: Mon, 7 Sep 2015 15:14:15 +0100 Subject: [PATCH 0897/5486] Added few dutch options --- dutch/over-het-hek/flippo/eet/eet.md | 1 + dutch/over-het-hek/flippo/flippo.md | 7 +++++++ dutch/over-het-hek/flippo/scheer/scheer.md | 1 + dutch/over-het-hek/hek.md | 2 ++ 4 files changed, 11 insertions(+) create mode 100644 dutch/over-het-hek/flippo/eet/eet.md create mode 100644 dutch/over-het-hek/flippo/flippo.md create mode 100644 dutch/over-het-hek/flippo/scheer/scheer.md diff --git a/dutch/over-het-hek/flippo/eet/eet.md b/dutch/over-het-hek/flippo/eet/eet.md new file mode 100644 index 0000000000..5bf3d14d7a --- /dev/null +++ b/dutch/over-het-hek/flippo/eet/eet.md @@ -0,0 +1 @@ +En toch blijft het niet te pruimen. \ No newline at end of file diff --git a/dutch/over-het-hek/flippo/flippo.md b/dutch/over-het-hek/flippo/flippo.md new file mode 100644 index 0000000000..67a45b68db --- /dev/null +++ b/dutch/over-het-hek/flippo/flippo.md @@ -0,0 +1,7 @@ +Je denk terug aan je jeugd, de hoeveelheid zakken chips die nodig waren om je dorst voor flippo's te verzadigen. + +Langzaam neem je één van de flippo's tussen je vingers en... + +[Je scheert hem een rot eind weg](scheer/scheer.md) + +[Je eet hem op](eet/eet.md) Je had in de cosmo gelezen dat droog karton het beste helpt tegen een kater. \ No newline at end of file diff --git a/dutch/over-het-hek/flippo/scheer/scheer.md b/dutch/over-het-hek/flippo/scheer/scheer.md new file mode 100644 index 0000000000..ae5444da6e --- /dev/null +++ b/dutch/over-het-hek/flippo/scheer/scheer.md @@ -0,0 +1 @@ +De flippo gaat best hard, even waan je jezelf een olympisch atleet, maar snel bezef je dat het hier maar om een stuk karton half zo groot als een bierviltje gaat. Even was het leuk. \ No newline at end of file diff --git a/dutch/over-het-hek/hek.md b/dutch/over-het-hek/hek.md index a8ed6e46a7..54c6473694 100644 --- a/dutch/over-het-hek/hek.md +++ b/dutch/over-het-hek/hek.md @@ -13,3 +13,5 @@ Je zoekt naar hulpmiddelen om los te komen in je zakken en ... wat vind je? [Wat onbekende paddestoelen; terwijl je verder droomt eet je ze op](hek.md) [Je autosleutel](sleutel/sleutel.md) + +[Een paar flippo's uit de jaren '90](flippo/flippo.md) From 5f267c7c141fddfa2b1214074d0aa3361b2a72cd Mon Sep 17 00:00:00 2001 From: Rjblaauboer Date: Mon, 7 Sep 2015 15:21:10 +0100 Subject: [PATCH 0898/5486] Changed line size --- dutch/over-het-hek/flippo/scheer/scheer.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dutch/over-het-hek/flippo/scheer/scheer.md b/dutch/over-het-hek/flippo/scheer/scheer.md index ae5444da6e..790863f11f 100644 --- a/dutch/over-het-hek/flippo/scheer/scheer.md +++ b/dutch/over-het-hek/flippo/scheer/scheer.md @@ -1 +1,3 @@ -De flippo gaat best hard, even waan je jezelf een olympisch atleet, maar snel bezef je dat het hier maar om een stuk karton half zo groot als een bierviltje gaat. Even was het leuk. \ No newline at end of file +De flippo gaat best hard, even waan je jezelf een olympisch atleet, +maar snel bezef je dat het hier maar om een stuk karton half +zo groot als een bierviltje gaat. Even was het leuk. \ No newline at end of file From b550a3a4a4f35c4af006d1234a4de5c0786e62bb Mon Sep 17 00:00:00 2001 From: Anna Patalakha Date: Mon, 7 Sep 2015 18:23:46 +0200 Subject: [PATCH 0899/5486] Add eating option --- russian/light-fire/fire.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/light-fire/fire.md b/russian/light-fire/fire.md index 7afcacb62e..da38c26e15 100644 --- a/russian/light-fire/fire.md +++ b/russian/light-fire/fire.md @@ -1,6 +1,8 @@ Вы развели костер. Зефир вокруг начал таять. Вдруг вам стало страшно. Что вы будете делать? +[Теперь-то я съем этот зефир - так он гораздо вкуснее!](../eating-walls/eating-marshmallows.md) + [Когда вам страшно, вы всегда поете.](sing/sing.md) [Вы решаете проломить проход в стене и двинуться вперед.](brake-the-wall/brake-the-wall.md) From 5720b6a22c33e537c0eb12438adfda0361126fd8 Mon Sep 17 00:00:00 2001 From: stubie Date: Mon, 7 Sep 2015 19:28:13 +0100 Subject: [PATCH 0900/5486] Add option to listen to White Stripes --- english/listen_white_stripes/listen_white_stripes.md | 1 + english/marshmallow.md | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 english/listen_white_stripes/listen_white_stripes.md diff --git a/english/listen_white_stripes/listen_white_stripes.md b/english/listen_white_stripes/listen_white_stripes.md new file mode 100644 index 0000000000..2393a30e20 --- /dev/null +++ b/english/listen_white_stripes/listen_white_stripes.md @@ -0,0 +1 @@ +You scroll to album Get Behind Me Satan and click play on [Little Ghost](https://www.youtube.com/watch?v=j0_IH6SKU-k) diff --git a/english/marshmallow.md b/english/marshmallow.md index c69c036fe8..b45628a7ba 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -117,6 +117,8 @@ Pointing it at the door, eyes closed, "Alohomora..." Nothing seems to be happening. +You pause for a second, awaiting a spectacular sight. + Sheepishly you look down on the crappy wand in your hand. You must be doing something wrong. You drink a beer and think about it, then Ah-ha! @@ -129,6 +131,7 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: +[Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) [Feel a sudden urge to dance](https://youtu.be/dQw4w9WgXcQ) @@ -474,4 +477,4 @@ Click [here](young/young.md) to listen to music. [It's time to take a vacation] (licked-cat/vacation.md) -[present-tense](present-tense/present-tense.md) \ No newline at end of file +[present-tense](present-tense/present-tense.md) From 30e207dd826de198dffdb24367363886b6706105 Mon Sep 17 00:00:00 2001 From: stubie Date: Mon, 7 Sep 2015 19:32:46 +0100 Subject: [PATCH 0901/5486] Add line break before option --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index b45628a7ba..a2a76c51a8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -131,6 +131,8 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: + + [Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) [Feel a sudden urge to dance](https://youtu.be/dQw4w9WgXcQ) From 10092ef87665f674d84ea6de37dd5eef560c5b09 Mon Sep 17 00:00:00 2001 From: Joao Pereira Date: Mon, 7 Sep 2015 18:17:32 -0400 Subject: [PATCH 0902/5486] Add Turks and Caicos. --- portugues_pt/praias/solemar.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues_pt/praias/solemar.md b/portugues_pt/praias/solemar.md index f4cfe98a84..b40e30c023 100644 --- a/portugues_pt/praias/solemar.md +++ b/portugues_pt/praias/solemar.md @@ -4,4 +4,6 @@ Gostava de conhecer as Maldivas. Gostave de conhecer Cabo Verde. -Gostaria de passar um ano surfando Hawaii, Indonesia e Australia. \ No newline at end of file +Gostaria de passar um ano surfando Hawaii, Indonesia e Australia. + +Gostaria de conhecer Turks and Caicos. \ No newline at end of file From 6d8ec2d1a62eb1b1f5908c0e651f4ca8149b17e5 Mon Sep 17 00:00:00 2001 From: kostja Date: Tue, 8 Sep 2015 11:55:56 +0200 Subject: [PATCH 0903/5486] feat: Add a note about brown bears. --- english/cycling-backwards/cycling-backwards.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/cycling-backwards/cycling-backwards.md b/english/cycling-backwards/cycling-backwards.md index 9a01de658e..6b74b8b0c9 100644 --- a/english/cycling-backwards/cycling-backwards.md +++ b/english/cycling-backwards/cycling-backwards.md @@ -1,4 +1,5 @@ It has long been rumoured that Polar Bears can cycle and moreover, cycle backwards. In reverse. +Unlike brown bears, who can only play balalaika, and only in Russia. [That's got to be horse...note to self.](../marshmallow.md) From 16c45ae0cf1ce607a15f38736ef38d6abaceb30d Mon Sep 17 00:00:00 2001 From: akarshseggemu-fyber Date: Tue, 8 Sep 2015 13:07:26 +0200 Subject: [PATCH 0904/5486] Add telangana-telugu --- language.md | 2 ++ telugu/Telanganatelugu.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 telugu/Telanganatelugu.md diff --git a/language.md b/language.md index 04c43edd40..10a173540d 100644 --- a/language.md +++ b/language.md @@ -2,6 +2,8 @@ Jei kalbi lietuviškai [spausk čia](lithuanian/startas.md) +If you speak Telugu, మీరు తెలుగులొ మాట్లాడుతార [ఇక్కడ నొక్కండి](Telugu/Telanganatelugu.md). + If you understand Tamil, தமிழ் வணக்கம் [இங்கே அழுத்தவும்](Tamil/Thirukural.md) தமிழ் வணக்கம்! To view Tamil Proverb about Friendship [Click Here](Tamil/Thirukural.md) diff --git a/telugu/Telanganatelugu.md b/telugu/Telanganatelugu.md new file mode 100644 index 0000000000..2f35f961b7 --- /dev/null +++ b/telugu/Telanganatelugu.md @@ -0,0 +1 @@ +బతుకమ్మ - తెలంగాణ నేల పూల కవాతు అలికి ముగ్గులు పెట్టిన లోగిళ్ళు సింగారించుకున్న చెల్లెల్ల చేతి నైపుణ్యం వెలిసిన పూల పిరమిడ్ల ఇంధ్ర ధనువులు'' (నేల మీది చందమామలు, కాసుల లింగారెడ్డి) అని బతుకమ్మను తెలంగాణ సాంస్కృతిక చిహ్నంగా చేసుకుని నెత్తిన ఎత్తుకోవడంలో మిగతా ప్రాంతాల నుంచి వేరుపడి తన ప్రత్యేక అస్తిత్వాన్ని చాటుకోవడమే. ఇదంతా కవి అంతర్గత, బాహ్య వలసాధిపత్యాలను వ్యతిరేకించే క్రమంలో చేసే కవితా గానమే. \ No newline at end of file From 01879fec75fe1a1c904ca31d3af20af80744c813 Mon Sep 17 00:00:00 2001 From: akarshseggemu-fyber Date: Tue, 8 Sep 2015 13:14:17 +0200 Subject: [PATCH 0905/5486] Typo fix for language.md toward page link telugu/telanagatelugu --- language.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language.md b/language.md index 10a173540d..9aeff40bb1 100644 --- a/language.md +++ b/language.md @@ -2,7 +2,7 @@ Jei kalbi lietuviškai [spausk čia](lithuanian/startas.md) -If you speak Telugu, మీరు తెలుగులొ మాట్లాడుతార [ఇక్కడ నొక్కండి](Telugu/Telanganatelugu.md). +If you speak Telugu, మీరు తెలుగులొ మాట్లాడుతార [ఇక్కడ నొక్కండి](telugu/Telanganatelugu.md). If you understand Tamil, தமிழ் வணக்கம் [இங்கே அழுத்தவும்](Tamil/Thirukural.md) From 5b0c7733edcf1e30043129b25ceee4d85eb8f5ce Mon Sep 17 00:00:00 2001 From: akarshseggemu-fyber Date: Tue, 8 Sep 2015 14:40:02 +0200 Subject: [PATCH 0906/5486] Add folder for telangana-telugu --- telugu/telangana-telugu/Telanganatelugu.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 telugu/telangana-telugu/Telanganatelugu.md diff --git a/telugu/telangana-telugu/Telanganatelugu.md b/telugu/telangana-telugu/Telanganatelugu.md new file mode 100644 index 0000000000..8b07f07a76 --- /dev/null +++ b/telugu/telangana-telugu/Telanganatelugu.md @@ -0,0 +1,14 @@ +బతుకమ్మ - తెలంగాణ నేల పూల కవాతు + అలికి ముగ్గులు పెట్టిన లోగిళ్ళు + సింగారించుకున్న చెల్లెల్ల చేతి + నైపుణ్యం వెలిసిన పూల పిరమిడ్ల + ఇంధ్ర ధనువులు'' (నేల మీది చందమామలు, + కాసుల లింగారెడ్డి) అని + బతుకమ్మను తెలంగాణ సాంస్కృతిక + చిహ్నంగా చేసుకుని నెత్తిన + ఎత్తుకోవడంలో మిగతా ప్రాంతాల + నుంచి వేరుపడి తన ప్రత్యేక + అస్తిత్వాన్ని చాటుకోవడమే. + ఇదంతా కవి అంతర్గత, బాహ్య + వలసాధిపత్యాలను వ్యతిరేకించే + క్రమంలో చేసే కవితా గానమే. \ No newline at end of file From bf7fb3536bd567f64e826862af5dfe15f7e47a46 Mon Sep 17 00:00:00 2001 From: akarshseggemu-fyber Date: Tue, 8 Sep 2015 14:42:33 +0200 Subject: [PATCH 0907/5486] Update the folders --- language.md | 2 +- telugu/Telanganatelugu.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 telugu/Telanganatelugu.md diff --git a/language.md b/language.md index 9aeff40bb1..4fb935c3c8 100644 --- a/language.md +++ b/language.md @@ -2,7 +2,7 @@ Jei kalbi lietuviškai [spausk čia](lithuanian/startas.md) -If you speak Telugu, మీరు తెలుగులొ మాట్లాడుతార [ఇక్కడ నొక్కండి](telugu/Telanganatelugu.md). +If you speak Telugu, మీరు తెలుగులొ మాట్లాడుతార [ఇక్కడ నొక్కండి](telugu/telangana-telugu/Telanganatelugu.md). If you understand Tamil, தமிழ் வணக்கம் [இங்கே அழுத்தவும்](Tamil/Thirukural.md) diff --git a/telugu/Telanganatelugu.md b/telugu/Telanganatelugu.md deleted file mode 100644 index 2f35f961b7..0000000000 --- a/telugu/Telanganatelugu.md +++ /dev/null @@ -1 +0,0 @@ -బతుకమ్మ - తెలంగాణ నేల పూల కవాతు అలికి ముగ్గులు పెట్టిన లోగిళ్ళు సింగారించుకున్న చెల్లెల్ల చేతి నైపుణ్యం వెలిసిన పూల పిరమిడ్ల ఇంధ్ర ధనువులు'' (నేల మీది చందమామలు, కాసుల లింగారెడ్డి) అని బతుకమ్మను తెలంగాణ సాంస్కృతిక చిహ్నంగా చేసుకుని నెత్తిన ఎత్తుకోవడంలో మిగతా ప్రాంతాల నుంచి వేరుపడి తన ప్రత్యేక అస్తిత్వాన్ని చాటుకోవడమే. ఇదంతా కవి అంతర్గత, బాహ్య వలసాధిపత్యాలను వ్యతిరేకించే క్రమంలో చేసే కవితా గానమే. \ No newline at end of file From ac12edf283e95cd1e3ae14d9555d4f552cebad0f Mon Sep 17 00:00:00 2001 From: qwertz92 Date: Tue, 8 Sep 2015 19:51:33 +0200 Subject: [PATCH 0908/5486] Added a new Storyline --- german/ruderboot.md | 4 +++- german/wegschneiden/ausziehen/ausziehen.md | 10 ++++++++++ german/wegschneiden/ausziehen/schwimmen/schwimmen.md | 7 +++++++ german/wegschneiden/wegschneiden.md | 5 +++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 german/wegschneiden/ausziehen/ausziehen.md create mode 100644 german/wegschneiden/ausziehen/schwimmen/schwimmen.md create mode 100644 german/wegschneiden/wegschneiden.md diff --git a/german/ruderboot.md b/german/ruderboot.md index e0163400d8..f50e376f29 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -20,4 +20,6 @@ Werden Sie: [Sie beschliessen fortan keinen Alkohol mehr zu trinken.](Alkohol/alkohol.md) -[Versuchen, mit Ihrer Kleidung das Loch zu stopfen](Stopfen/stopfen.md) \ No newline at end of file +[Versuchen, mit Ihrer Kleidung das Loch zu stopfen](Stopfen/stopfen.md) + +[Durchlcherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) \ No newline at end of file diff --git a/german/wegschneiden/ausziehen/ausziehen.md b/german/wegschneiden/ausziehen/ausziehen.md new file mode 100644 index 0000000000..e202ffd4bf --- /dev/null +++ b/german/wegschneiden/ausziehen/ausziehen.md @@ -0,0 +1,10 @@ +Sie stehen nun nackt vor ihren durchnssten Sachen und ihren gefunden Utensilien. +Pltzlich wissen Sie was zu tun ist! +Sie nehmen die Kleider und versuchen damit das Bootsloch mit dem Hammer und den Ngeln zu flicken.... +Doch da Sie WebDeveloper sind, glnzen Sie nur so vor Unfhigkeit im Umgang mit allem was keine Tastatur ist und Sie zerstren das komplette Boot. + +[Ein runde gemtlich Schwimmen](schwimmen/schwimmen.md) + +[Aus dem Traum aufwachen und Oktoberfest besuchen](../../Oktoberfest/oktoberfest.md) + +[Aus dem Boot springen und nach Norden schwimmen?](../../schwimmen/schwimmen.md) \ No newline at end of file diff --git a/german/wegschneiden/ausziehen/schwimmen/schwimmen.md b/german/wegschneiden/ausziehen/schwimmen/schwimmen.md new file mode 100644 index 0000000000..1f06292806 --- /dev/null +++ b/german/wegschneiden/ausziehen/schwimmen/schwimmen.md @@ -0,0 +1,7 @@ +Sie schwimmen eine gemtliche Runde im Wasser, bis sie Feststellen, dass ihre WebDeveloper Hnde zu nichts zu gebrauchen sind. +Nach ca. 5,2 Sekunden sinken Sie langsam aber sicher unter die Wasseroberflche zu Boden. +Instiktiv und mit letzter Kraft, strecken Sie Ihre Beine nach unten und begreifen das Sie hier auch stehen knnen. +Doch Sie sind komplett dehydriert und fallen in Ohnmacht. +Das letzte was Sie noch wahrnehmen, ist ihr selbst programmierter Handwerker-Roboter der auf sie zuschwimmt und hohe Pieptne von sich gibt. + +[101011100101110](../../../ruderboot.md) \ No newline at end of file diff --git a/german/wegschneiden/wegschneiden.md b/german/wegschneiden/wegschneiden.md new file mode 100644 index 0000000000..e65b187381 --- /dev/null +++ b/german/wegschneiden/wegschneiden.md @@ -0,0 +1,5 @@ +Sie suchen nach einer Sge im Boot und tatschlich finden sie auch etwas... +Doch es ist keine Sge sondern ein Hammer mit einer Schachtel voll Ngel. +Da kommt ihnen eine Idee. + +[Ausziehen, denn nackt kann man besser denken!](ausziehen/ausziehen.md) \ No newline at end of file From 3dd88d75f400572c28a14a894f36a084d526bef9 Mon Sep 17 00:00:00 2001 From: qwertz92 Date: Tue, 8 Sep 2015 20:14:06 +0200 Subject: [PATCH 0909/5486] Cut the lines to max 120 characters. --- german/wegschneiden/ausziehen/ausziehen.md | 6 +++++- german/wegschneiden/ausziehen/schwimmen/schwimmen.md | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/german/wegschneiden/ausziehen/ausziehen.md b/german/wegschneiden/ausziehen/ausziehen.md index e202ffd4bf..166051f34f 100644 --- a/german/wegschneiden/ausziehen/ausziehen.md +++ b/german/wegschneiden/ausziehen/ausziehen.md @@ -1,7 +1,11 @@ Sie stehen nun nackt vor ihren durchnssten Sachen und ihren gefunden Utensilien. + Pltzlich wissen Sie was zu tun ist! Sie nehmen die Kleider und versuchen damit das Bootsloch mit dem Hammer und den Ngeln zu flicken.... -Doch da Sie WebDeveloper sind, glnzen Sie nur so vor Unfhigkeit im Umgang mit allem was keine Tastatur ist und Sie zerstren das komplette Boot. +Doch da Sie WebDeveloper sind, glnzen Sie nur so vor Unfhigkeit im Umgang mit allem was keine Tastatur ist +und Sie zerstren das komplette Boot. + +Was tun Sie? [Ein runde gemtlich Schwimmen](schwimmen/schwimmen.md) diff --git a/german/wegschneiden/ausziehen/schwimmen/schwimmen.md b/german/wegschneiden/ausziehen/schwimmen/schwimmen.md index 1f06292806..fbca6c96a5 100644 --- a/german/wegschneiden/ausziehen/schwimmen/schwimmen.md +++ b/german/wegschneiden/ausziehen/schwimmen/schwimmen.md @@ -1,7 +1,12 @@ -Sie schwimmen eine gemtliche Runde im Wasser, bis sie Feststellen, dass ihre WebDeveloper Hnde zu nichts zu gebrauchen sind. +Sie schwimmen eine gemtliche Runde im Wasser, bis sie Feststellen, +dass ihre WebDeveloper Hnde zu nichts zu gebrauchen sind. + Nach ca. 5,2 Sekunden sinken Sie langsam aber sicher unter die Wasseroberflche zu Boden. + Instiktiv und mit letzter Kraft, strecken Sie Ihre Beine nach unten und begreifen das Sie hier auch stehen knnen. Doch Sie sind komplett dehydriert und fallen in Ohnmacht. -Das letzte was Sie noch wahrnehmen, ist ihr selbst programmierter Handwerker-Roboter der auf sie zuschwimmt und hohe Pieptne von sich gibt. + +Das letzte was Sie noch wahrnehmen, ist ihr selbst programmierter Handwerker-Roboter der auf sie zuschwimmt +und hohe Pieptne von sich gibt. [101011100101110](../../../ruderboot.md) \ No newline at end of file From c8242a94088ac096315cb4cb574389e3513fe6ff Mon Sep 17 00:00:00 2001 From: pizzofinto Date: Tue, 8 Sep 2015 22:48:22 +0200 Subject: [PATCH 0910/5486] Delete .DS_Store --- .../prendere-il-libro/porta/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Italian/guardare/libri-francesi/prendere-il-libro/porta/.DS_Store diff --git a/Italian/guardare/libri-francesi/prendere-il-libro/porta/.DS_Store b/Italian/guardare/libri-francesi/prendere-il-libro/porta/.DS_Store deleted file mode 100644 index d828214fcff1f47ca40a1fd26f89e8527312c62a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyGjH>5Ukb<4n(-naDKqRKNybl3;Y3fPf$2mP%q!e@AA{Eek99kb|yzP^wdmG zS1((^_BH_99`|>^2Edx`h%aB3=J)OkyQqi}>8$aJH{9YABi%?xo*W zfE1W3aGA%A_y2qPAM^j5q>~ho0%xUwt#%K)Enlg6>*D3S*Eaei-E+R_ZrlfjOSEHR jv|}E;9p6M!<~85*z86l3L1#SZMEwl7E;1?b-wONyVIvk^ From 1e8343118bf3a5e65f753d43629c1871b42cf619 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 9 Sep 2015 13:19:41 +0600 Subject: [PATCH 0911/5486] Add some next thoughts about zephyr --- russian/light-fire/sing/oblaka/oblaka.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/russian/light-fire/sing/oblaka/oblaka.md b/russian/light-fire/sing/oblaka/oblaka.md index 1d12592162..4a46f55d4c 100644 --- a/russian/light-fire/sing/oblaka/oblaka.md +++ b/russian/light-fire/sing/oblaka/oblaka.md @@ -1,4 +1,9 @@ Летели облака, Летели далеко, Как мамина рука -Как папино трико \ No newline at end of file +Как папино трико + + +Что же, ты делаешь со мной дочь преисподней, подумалось вам. +И почему вдруг в ваших мыслях появился этот странный прибалтийский акцент... +Вы твёрдо решили, с зефиром нужно завязывать. From f3dbb7243c8b87e84de650fd026c20172bc5e8e6 Mon Sep 17 00:00:00 2001 From: SergiBaldo Date: Wed, 9 Sep 2015 09:50:37 +0200 Subject: [PATCH 0912/5486] Add a few lines on catala/sortir/sortir.md --- catala/sortir/sortir.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/catala/sortir/sortir.md b/catala/sortir/sortir.md index d9ba8a9014..84955ecad4 100644 --- a/catala/sortir/sortir.md +++ b/catala/sortir/sortir.md @@ -3,4 +3,6 @@ De cop i volta, el terra es torna tou i t'enfonses a poc a poc. Cada cop estàs més enfonsat... de sobte mires a d'alt i veus uns peus que es belluguen amb impaciència... aquestes sabates -et sonen... Ets tu! \ No newline at end of file +et sonen... Ets tu! +Tanques els ulls de nou, amb força, i dessitges que tot el que +has vist sigui fruit de la teva imaginació. From 5180a4f1d41f767891a6a0bcb63ce3b822cd7071 Mon Sep 17 00:00:00 2001 From: Jordanka Date: Wed, 9 Sep 2015 11:11:09 -0300 Subject: [PATCH 0913/5486] Add Recibimiento to the story --- espanol/canudos.md | 2 ++ espanol/recibimiento/recibimiento.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 espanol/recibimiento/recibimiento.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 46ec1dc38b..6279d7dbf0 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -57,3 +57,5 @@ el Consejero: [Un ejercito de angeles para ayudar a los guerreros.](angeles/angeles.md) [En el rincón donde dormía, el beatito...](beatito/beatito.md) + +[Se disculpó con Beatito y abandonó la sala para ocupar su lugar junto al emperador en el recibimiento](recibimiento/recibimiento.md) diff --git a/espanol/recibimiento/recibimiento.md b/espanol/recibimiento/recibimiento.md new file mode 100644 index 0000000000..33e8ec36c4 --- /dev/null +++ b/espanol/recibimiento/recibimiento.md @@ -0,0 +1 @@ +Con paso ascelerado, cruzó los grandes salones imperiales mientras, a su alrededor, medio centenar de sirvientes preparaban la alfombra que daría entrada a los gloriosos generales que volvían con novedades sobre las recientes campañas en la frontera norte. Se terminaba de acomodar en su sitio el Consejero, alisando la dorada capa que lucía para la ocasión, cuando los firmes pasos se escucharon con un fuerte eco desde el pasillo abovedado. Se abrieron las gigantescas puertas y aparecieron los cinco generales, portadores de las tan esperadas noticias... \ No newline at end of file From d9408ebe83cd26d5a15d0f109b332af4a22960be Mon Sep 17 00:00:00 2001 From: sinod1984 Date: Wed, 9 Sep 2015 23:18:20 +0900 Subject: [PATCH 0914/5486] Update monk.md --- Chinese/monk/monk.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Chinese/monk/monk.md b/Chinese/monk/monk.md index f3e78614b4..670c15e604 100644 --- a/Chinese/monk/monk.md +++ b/Chinese/monk/monk.md @@ -22,3 +22,6 @@ + +Good story +I like it From 613784e0bc5bc1a8ba71fffdc39eb7fc0358882d Mon Sep 17 00:00:00 2001 From: Jordanka Date: Wed, 9 Sep 2015 11:24:48 -0300 Subject: [PATCH 0915/5486] Break lines in two parts --- espanol/recibimiento/recibimiento.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/recibimiento/recibimiento.md b/espanol/recibimiento/recibimiento.md index 33e8ec36c4..8bef08cf3a 100644 --- a/espanol/recibimiento/recibimiento.md +++ b/espanol/recibimiento/recibimiento.md @@ -1 +1,2 @@ -Con paso ascelerado, cruzó los grandes salones imperiales mientras, a su alrededor, medio centenar de sirvientes preparaban la alfombra que daría entrada a los gloriosos generales que volvían con novedades sobre las recientes campañas en la frontera norte. Se terminaba de acomodar en su sitio el Consejero, alisando la dorada capa que lucía para la ocasión, cuando los firmes pasos se escucharon con un fuerte eco desde el pasillo abovedado. Se abrieron las gigantescas puertas y aparecieron los cinco generales, portadores de las tan esperadas noticias... \ No newline at end of file +Con paso ascelerado, cruzó los grandes salones imperiales mientras, a su alrededor, medio centenar de sirvientes preparaban la alfombra que daría entrada a los gloriosos generales que volvían con novedades sobre las recientes campañas en la frontera norte. +Se terminaba de acomodar en su sitio el Consejero, alisando la dorada capa que lucía para la ocasión, cuando los firmes pasos se escucharon con un fuerte eco desde el pasillo abovedado. Se abrieron las gigantescas puertas y aparecieron los cinco generales, portadores de las tan esperadas noticias... \ No newline at end of file From 9d263a9496821a0725f98b074a91f05ac298e61d Mon Sep 17 00:00:00 2001 From: Jordanka Date: Wed, 9 Sep 2015 11:29:44 -0300 Subject: [PATCH 0916/5486] Reduce the link size --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 6279d7dbf0..656871963b 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -58,4 +58,4 @@ el Consejero: [En el rincón donde dormía, el beatito...](beatito/beatito.md) -[Se disculpó con Beatito y abandonó la sala para ocupar su lugar junto al emperador en el recibimiento](recibimiento/recibimiento.md) +[Ocupó su lugar junto al emperador en el recibimiento](recibimiento/recibimiento.md) From dd494343e000fc12c786be6076086589c645f777 Mon Sep 17 00:00:00 2001 From: Jordanka Date: Wed, 9 Sep 2015 11:31:35 -0300 Subject: [PATCH 0917/5486] Break the story in several lines --- espanol/recibimiento/recibimiento.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/espanol/recibimiento/recibimiento.md b/espanol/recibimiento/recibimiento.md index 8bef08cf3a..ccef470f94 100644 --- a/espanol/recibimiento/recibimiento.md +++ b/espanol/recibimiento/recibimiento.md @@ -1,2 +1,8 @@ -Con paso ascelerado, cruzó los grandes salones imperiales mientras, a su alrededor, medio centenar de sirvientes preparaban la alfombra que daría entrada a los gloriosos generales que volvían con novedades sobre las recientes campañas en la frontera norte. -Se terminaba de acomodar en su sitio el Consejero, alisando la dorada capa que lucía para la ocasión, cuando los firmes pasos se escucharon con un fuerte eco desde el pasillo abovedado. Se abrieron las gigantescas puertas y aparecieron los cinco generales, portadores de las tan esperadas noticias... \ No newline at end of file +Con paso ascelerado, cruzó los grandes salones imperiales mientras, a su alrededor, +medio centenar de sirvientes preparaban la alfombra que daría entrada a los gloriosos +generales que volvían con novedades sobre las recientes campañas en la frontera norte. + +Se terminaba de acomodar en su sitio el Consejero, alisando la dorada capa que lucía +para la ocasión, cuando los firmes pasos se escucharon con un fuerte eco desde el +pasillo abovedado. Se abrieron las gigantescas puertas y aparecieron los cinco +generales, portadores de las tan esperadas noticias... \ No newline at end of file From c7a86f0d10e30e956f08af1e80681000265f50c2 Mon Sep 17 00:00:00 2001 From: Adam McCandliss Date: Wed, 9 Sep 2015 09:43:27 -0500 Subject: [PATCH 0918/5486] added option for Vivaldi --- english/young/young.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/young/young.md b/english/young/young.md index 6d51726587..6e15334f52 100644 --- a/english/young/young.md +++ b/english/young/young.md @@ -1 +1,3 @@ Clikc Chopin Waltz (https://www.youtube.com/watch?v=VyBxps3BgYc) to listen. + +Click [8 hours of Vivaldi] (https://www.youtube.com/watch?v=gEibRc-oJKs) to listen. \ No newline at end of file From 9c3f156b875f4cbfd2e531cb23882c27e33c34f2 Mon Sep 17 00:00:00 2001 From: Markus Date: Wed, 9 Sep 2015 10:58:29 -0400 Subject: [PATCH 0919/5486] Add back to sleep preamble --- english/go-back-to-sleep/go-back-to-sleep.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/go-back-to-sleep/go-back-to-sleep.md b/english/go-back-to-sleep/go-back-to-sleep.md index 687c928a36..3a214f2046 100644 --- a/english/go-back-to-sleep/go-back-to-sleep.md +++ b/english/go-back-to-sleep/go-back-to-sleep.md @@ -1 +1,3 @@ +The marshmallow floor is soft, and thankfully not very sticky. + You roll over, let your eyes close shut, and drift off into [dreamland](../dream/dream.md) From 4a5c806f52a2dc86066a7a734e859c1eb8f67207 Mon Sep 17 00:00:00 2001 From: Markus Date: Wed, 9 Sep 2015 11:20:45 -0400 Subject: [PATCH 0920/5486] Add link to dream-ception with short landing --- english/go-back-to-sleep/dream-ception/dream-ception.md | 3 +++ english/go-back-to-sleep/go-back-to-sleep.md | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 english/go-back-to-sleep/dream-ception/dream-ception.md diff --git a/english/go-back-to-sleep/dream-ception/dream-ception.md b/english/go-back-to-sleep/dream-ception/dream-ception.md new file mode 100644 index 0000000000..170032763a --- /dev/null +++ b/english/go-back-to-sleep/dream-ception/dream-ception.md @@ -0,0 +1,3 @@ +His hair is disarrayed, and he smells vaguely like motor oil. + +"You are not safe here," he says. \ No newline at end of file diff --git a/english/go-back-to-sleep/go-back-to-sleep.md b/english/go-back-to-sleep/go-back-to-sleep.md index 3a214f2046..e777861ca6 100644 --- a/english/go-back-to-sleep/go-back-to-sleep.md +++ b/english/go-back-to-sleep/go-back-to-sleep.md @@ -1,3 +1,7 @@ The marshmallow floor is soft, and thankfully not very sticky. You roll over, let your eyes close shut, and drift off into [dreamland](../dream/dream.md) + +You wonder, idly, what happens if you start dreaming from within a dream.. + +When suddenly you are face to face with [Leonardo DiCaprio](./dream-ception/dream-ception.md) \ No newline at end of file From efaeaf25b576df08dd6e44a85e59f14318f7e1b1 Mon Sep 17 00:00:00 2001 From: gsganden Date: Wed, 9 Sep 2015 20:43:29 -0500 Subject: [PATCH 0921/5486] Add option of using Harry Potter spell to light a fire --- english/movie-ripoffs/hogwarts/burn-marshmallows | 5 +++++ english/pinch/magic/harry-potter.md | 1 + 2 files changed, 6 insertions(+) create mode 100644 english/movie-ripoffs/hogwarts/burn-marshmallows diff --git a/english/movie-ripoffs/hogwarts/burn-marshmallows b/english/movie-ripoffs/hogwarts/burn-marshmallows new file mode 100644 index 0000000000..22654f60ef --- /dev/null +++ b/english/movie-ripoffs/hogwarts/burn-marshmallows @@ -0,0 +1,5 @@ +It works! It actually works! You are a wizard! + +This thought is a great comfort to you as the burning, melting marshmallow-structure collapses around you. So is the taste of roasted marshmallow. Until you suffocate and die. + +The end! \ No newline at end of file diff --git a/english/pinch/magic/harry-potter.md b/english/pinch/magic/harry-potter.md index 0a53a4a695..ae5abef041 100644 --- a/english/pinch/magic/harry-potter.md +++ b/english/pinch/magic/harry-potter.md @@ -5,3 +5,4 @@ You try to remember some magic from the harry potter books that you have read so many times by now. [try apparating](../../movie-ripoffs/hogwarts/hogwarts.md) +[try to escape by burning down the marshmallow walls](../../movie-ripoffs/hogwarts/burn-walls.md) \ No newline at end of file From 9a60f78e013194653d767fb26d43c08598445d26 Mon Sep 17 00:00:00 2001 From: gsganden Date: Wed, 9 Sep 2015 20:58:02 -0500 Subject: [PATCH 0922/5486] Correct errors point out by casey-bot --- .../magic/harry-potter-burn-marshmallows/burn-walls.md} | 4 +++- english/pinch/magic/harry-potter.md | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) rename english/{movie-ripoffs/hogwarts/burn-marshmallows => pinch/magic/harry-potter-burn-marshmallows/burn-walls.md} (51%) diff --git a/english/movie-ripoffs/hogwarts/burn-marshmallows b/english/pinch/magic/harry-potter-burn-marshmallows/burn-walls.md similarity index 51% rename from english/movie-ripoffs/hogwarts/burn-marshmallows rename to english/pinch/magic/harry-potter-burn-marshmallows/burn-walls.md index 22654f60ef..a1dacda85c 100644 --- a/english/movie-ripoffs/hogwarts/burn-marshmallows +++ b/english/pinch/magic/harry-potter-burn-marshmallows/burn-walls.md @@ -1,5 +1,7 @@ It works! It actually works! You are a wizard! -This thought is a great comfort to you as the burning, melting marshmallow-structure collapses around you. So is the taste of roasted marshmallow. Until you suffocate and die. +This thought is a great comfort to you as the burning, melting marshmallow-structure collapses around you. + +So is the taste of roasted marshmallow. Until you suffocate and die. The end! \ No newline at end of file diff --git a/english/pinch/magic/harry-potter.md b/english/pinch/magic/harry-potter.md index ae5abef041..86464b5b5c 100644 --- a/english/pinch/magic/harry-potter.md +++ b/english/pinch/magic/harry-potter.md @@ -5,4 +5,5 @@ You try to remember some magic from the harry potter books that you have read so many times by now. [try apparating](../../movie-ripoffs/hogwarts/hogwarts.md) -[try to escape by burning down the marshmallow walls](../../movie-ripoffs/hogwarts/burn-walls.md) \ No newline at end of file + +[try to escape by burning down the marshmallow walls](/harry-potter-burn-marshmallows/burn-walls.md) \ No newline at end of file From dc79af577c1de23d2c41d9abbb76459d16197ec2 Mon Sep 17 00:00:00 2001 From: Greg Gandenberger Date: Wed, 9 Sep 2015 21:05:15 -0500 Subject: [PATCH 0923/5486] Update harry-potter.md --- english/pinch/magic/harry-potter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/pinch/magic/harry-potter.md b/english/pinch/magic/harry-potter.md index 86464b5b5c..0f7f5f29d5 100644 --- a/english/pinch/magic/harry-potter.md +++ b/english/pinch/magic/harry-potter.md @@ -6,4 +6,4 @@ that you have read so many times by now. [try apparating](../../movie-ripoffs/hogwarts/hogwarts.md) -[try to escape by burning down the marshmallow walls](/harry-potter-burn-marshmallows/burn-walls.md) \ No newline at end of file +[try to escape by burning down the marshmallow walls](harry-potter-burn-marshmallows/burn-walls.md) From e766f0e1b6a4c822ebff6d904df91a17bdfd262e Mon Sep 17 00:00:00 2001 From: Brian Quach <13rianquach@gmail.com> Date: Wed, 9 Sep 2015 21:22:58 -0700 Subject: [PATCH 0924/5486] feat: added my own story and modified others --- english/batman/batman.md | 5 +++++ english/marshmallow.md | 3 ++- english/my-story/my-story.md | 2 ++ english/pipboy/lockpick/lockpick_100.md | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 english/my-story/my-story.md diff --git a/english/batman/batman.md b/english/batman/batman.md index d07299657b..62ce159f4f 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -13,3 +13,8 @@ But I know what you're wondering. If Bruch Wayne is the Bat, then who is Bruce W And that's why both Batman and John Cena's theme songs always seem familiar even if you've never heard them before! but you wonder does it end [here?](../movie-ripoffs/selfaware/selfaware.md) + +But then you realized that Bruce Wayne is really John Travolta from Face Off! Holy toledo! You jump up and down at +this realization, then you go: + +[tell papa-louie and he says...](../papa-louie/papa-louie.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index a2a76c51a8..2858ecc576 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -478,5 +478,6 @@ Click [here](young/young.md) to listen to music. [It's time to take a vacation] (licked-cat/vacation.md) - [present-tense](present-tense/present-tense.md) + +[Think about happy thoughts while spinning around in circles](my-story/my-story.md) diff --git a/english/my-story/my-story.md b/english/my-story/my-story.md new file mode 100644 index 0000000000..53559db0df --- /dev/null +++ b/english/my-story/my-story.md @@ -0,0 +1,2 @@ +*BOOM* You've been transported to Imagination Land. You're surrounded by all your favorite cartoon characters. +One of them comes up to you and asks... \ No newline at end of file diff --git a/english/pipboy/lockpick/lockpick_100.md b/english/pipboy/lockpick/lockpick_100.md index 033209bffd..d384fd953f 100644 --- a/english/pipboy/lockpick/lockpick_100.md +++ b/english/pipboy/lockpick/lockpick_100.md @@ -4,5 +4,7 @@ Mo' problem. Door's open. You head into the vast wasteland. +[go straight until...](../love/love.md) +[spin around in circles and think of a happy place](../../my-story/my-story.md) From 293fa73e58b5576f37e7ac5341257b53d49a1a80 Mon Sep 17 00:00:00 2001 From: Brian Quach <13rianquach@gmail.com> Date: Wed, 9 Sep 2015 21:31:21 -0700 Subject: [PATCH 0925/5486] fix: undo line deletion for sake of caseybot --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 2858ecc576..cab363c007 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -478,6 +478,7 @@ Click [here](young/young.md) to listen to music. [It's time to take a vacation] (licked-cat/vacation.md) + [present-tense](present-tense/present-tense.md) [Think about happy thoughts while spinning around in circles](my-story/my-story.md) From 733e328597db13e22035b38649c4203e5ccbe1c5 Mon Sep 17 00:00:00 2001 From: Brian Quach <13rianquach@gmail.com> Date: Wed, 9 Sep 2015 21:37:10 -0700 Subject: [PATCH 0926/5486] fix: broken link --- english/pipboy/lockpick/lockpick_100.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/pipboy/lockpick/lockpick_100.md b/english/pipboy/lockpick/lockpick_100.md index d384fd953f..f99b7e3e01 100644 --- a/english/pipboy/lockpick/lockpick_100.md +++ b/english/pipboy/lockpick/lockpick_100.md @@ -4,7 +4,7 @@ Mo' problem. Door's open. You head into the vast wasteland. -[go straight until...](../love/love.md) +[go straight until...](../../love/love.md) [spin around in circles and think of a happy place](../../my-story/my-story.md) From f65544c7176cc132545e195c98c2ef0fd0233ee0 Mon Sep 17 00:00:00 2001 From: Shane Oston Stowe Date: Wed, 9 Sep 2015 22:01:37 -0700 Subject: [PATCH 0927/5486] add kicktheman --- english/kicktheman/kicktheman.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/kicktheman/kicktheman.md diff --git a/english/kicktheman/kicktheman.md b/english/kicktheman/kicktheman.md new file mode 100644 index 0000000000..0cdafc44e2 --- /dev/null +++ b/english/kicktheman/kicktheman.md @@ -0,0 +1 @@ +You get arrested by Rumplestiltskin. Game over. \ No newline at end of file From 5a9ad0a354714e93c02222b45a3f5b605acd836d Mon Sep 17 00:00:00 2001 From: Shane Oston Stowe Date: Wed, 9 Sep 2015 22:07:07 -0700 Subject: [PATCH 0928/5486] change lego --- english/lego/lego.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/english/lego/lego.md b/english/lego/lego.md index 29643c7067..ffcd89bd50 100644 --- a/english/lego/lego.md +++ b/english/lego/lego.md @@ -1,6 +1,6 @@ The mallow man seems nice so you chat to him after walking up to him. -He decides he likes you too, so he gets out his Lego's. +He decides he likes you too, so he gets out his Lego's. He's got Star Wars, Lego Movie, space, technics, oh so much lego and you play with it all! @@ -22,10 +22,12 @@ or [Bake a cake?](../dance/bake-a-cake/bake-a-cake.md) -or +or [Look for a way out?](../find-exit/leave.md) or [Ponder](../ponder/ponder-about-life.md) + +or [Kick the man](../kicktheman/kick-the-man.md) From f57aff2c5e55047f68ae189c652e8f654a4d7f84 Mon Sep 17 00:00:00 2001 From: Shane Oston Stowe Date: Wed, 9 Sep 2015 22:10:51 -0700 Subject: [PATCH 0929/5486] fix my change --- english/lego/lego.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/lego/lego.md b/english/lego/lego.md index ffcd89bd50..0d55c36c5f 100644 --- a/english/lego/lego.md +++ b/english/lego/lego.md @@ -30,4 +30,6 @@ or [Ponder](../ponder/ponder-about-life.md) -or [Kick the man](../kicktheman/kick-the-man.md) +or + +[Kick the man](../kicktheman/kicktheman.md) From 66b2f5e9142d69e31b5dba56cdcfccb2b243c759 Mon Sep 17 00:00:00 2001 From: Tiglas Date: Thu, 10 Sep 2015 13:52:02 +0200 Subject: [PATCH 0930/5486] Add Swahili page --- language.md | 4 +++- swahili/swahili.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 swahili/swahili.md diff --git a/language.md b/language.md index 4fb935c3c8..71b6fd3928 100644 --- a/language.md +++ b/language.md @@ -119,4 +119,6 @@ Nếu bạn nói tiếng Việt, [nhấn vào link này](vietnamese/kechuyen.md) Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). -ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) \ No newline at end of file +ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) + +Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) diff --git a/swahili/swahili.md b/swahili/swahili.md new file mode 100644 index 0000000000..4d37981a23 --- /dev/null +++ b/swahili/swahili.md @@ -0,0 +1 @@ +Mambo ndiyo hayo basi. Swahili lipo wavutini. Jiskia huru kuongezea stori... From 2f6602b58a2a6ce43dbe3161f52a63c9976ab931 Mon Sep 17 00:00:00 2001 From: Josiah Uma Date: Thu, 10 Sep 2015 15:28:14 +0100 Subject: [PATCH 0931/5486] Added a new story containing burn down the house --- english/burn-down-the-house/house-burn.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 english/burn-down-the-house/house-burn.md diff --git a/english/burn-down-the-house/house-burn.md b/english/burn-down-the-house/house-burn.md new file mode 100644 index 0000000000..ea395fed35 --- /dev/null +++ b/english/burn-down-the-house/house-burn.md @@ -0,0 +1,9 @@ +As you continue sleeping and enter into a slumber, you don't realise when the entire +house begins to collapse. First the roof, then the walls, the entire space is filled +with fumes that continue to raise while choking you in your sleep. + +Suddenly, your whole beautiful dream of your crush now turns into nightmare as you +slip into the abyss of eternity. Just before that happens, you hear a loud noise as +of a bang coming from downstairs. This may be the firemen or more destruction as +a result of the flames, as you continue to wonder the cause of the noise, you slip +into a coma and wake up only to realise it was just a dream. \ No newline at end of file From 0a99c20e594e282fdd4c1bceeebab1a413dc93b9 Mon Sep 17 00:00:00 2001 From: Josiah Uma Date: Thu, 10 Sep 2015 15:29:14 +0100 Subject: [PATCH 0932/5486] Modified lamping story to include link to burn down the house --- english/lamping/lamping.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/english/lamping/lamping.md b/english/lamping/lamping.md index 4b9fd051c6..0ee03eeedb 100644 --- a/english/lamping/lamping.md +++ b/english/lamping/lamping.md @@ -1,2 +1,10 @@ As you begin scrolling through your feed on IG and using your super-retweeting abilities, the realities of the universe fade... +However, you do not notice that there is a small spark of fire burning +right beside you. As the fire increases, you begin to smell the burn +from deep in your sleep, + +Do you: + +wake up hurriedly and run out of the house or +[continue to enjoy the dream you were having of your crush](burn-down-the-house/house-burn.md) From 9c8934fc9430ed69995bbfcb9c023f7fcbb4d76c Mon Sep 17 00:00:00 2001 From: Josiah Uma Date: Thu, 10 Sep 2015 15:41:08 +0100 Subject: [PATCH 0933/5486] corrected wrong url --- english/lamping/lamping.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/lamping/lamping.md b/english/lamping/lamping.md index 0ee03eeedb..62d86b8129 100644 --- a/english/lamping/lamping.md +++ b/english/lamping/lamping.md @@ -7,4 +7,4 @@ from deep in your sleep, Do you: wake up hurriedly and run out of the house or -[continue to enjoy the dream you were having of your crush](burn-down-the-house/house-burn.md) +[continue to enjoy the dream you were having of your crush](english/burn-down-the-house/house-burn.md) From 8180a2303c677dae1e303864ecd8810822b864b0 Mon Sep 17 00:00:00 2001 From: umajosiah Date: Thu, 10 Sep 2015 15:58:33 +0100 Subject: [PATCH 0934/5486] Update lamping.md --- english/lamping/lamping.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/lamping/lamping.md b/english/lamping/lamping.md index 62d86b8129..5be8d05a58 100644 --- a/english/lamping/lamping.md +++ b/english/lamping/lamping.md @@ -7,4 +7,4 @@ from deep in your sleep, Do you: wake up hurriedly and run out of the house or -[continue to enjoy the dream you were having of your crush](english/burn-down-the-house/house-burn.md) +[continue to enjoy the dream you were having of your crush](/burn-down-the-house/house-burn.md) From 11732f927fdce3bc7d61cd3db91bbf47107cebf5 Mon Sep 17 00:00:00 2001 From: umajosiah Date: Thu, 10 Sep 2015 15:59:23 +0100 Subject: [PATCH 0935/5486] Update lamping.md --- english/lamping/lamping.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/lamping/lamping.md b/english/lamping/lamping.md index 5be8d05a58..0ee03eeedb 100644 --- a/english/lamping/lamping.md +++ b/english/lamping/lamping.md @@ -7,4 +7,4 @@ from deep in your sleep, Do you: wake up hurriedly and run out of the house or -[continue to enjoy the dream you were having of your crush](/burn-down-the-house/house-burn.md) +[continue to enjoy the dream you were having of your crush](burn-down-the-house/house-burn.md) From e04d621b9e2fca8222fe3519b7c48e9ee7dd4c99 Mon Sep 17 00:00:00 2001 From: umajosiah Date: Thu, 10 Sep 2015 16:03:45 +0100 Subject: [PATCH 0936/5486] update url in lamping.md --- english/lamping/lamping.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/lamping/lamping.md b/english/lamping/lamping.md index 0ee03eeedb..f8531cadd7 100644 --- a/english/lamping/lamping.md +++ b/english/lamping/lamping.md @@ -7,4 +7,4 @@ from deep in your sleep, Do you: wake up hurriedly and run out of the house or -[continue to enjoy the dream you were having of your crush](burn-down-the-house/house-burn.md) +[continue to enjoy the dream you were having of your crush](../burn-down-the-house/house-burn.md) From 833dabd6bf0c59dfdb1052ad1dce607de2dcc3fb Mon Sep 17 00:00:00 2001 From: mike-doino Date: Thu, 10 Sep 2015 12:02:47 -0400 Subject: [PATCH 0937/5486] Added new scenario to air.md --- english/avatar/air.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/english/avatar/air.md b/english/avatar/air.md index f325e3d511..e91936fcee 100644 --- a/english/avatar/air.md +++ b/english/avatar/air.md @@ -3,3 +3,10 @@ [Fire Lord Ozai](http://avatar.wikia.com/wiki/Ozai) wanted to conquer the other nations and rule the world. The next step is other planets. + + + +You feel stranded. +How can I get off of this planet? +You are desperate and scream, "Oh God!" +Suddenly - [you wake up!](../wake-up/wake-up.md) From 1aa52ffebafc7b29da5512789dad51c3241499b5 Mon Sep 17 00:00:00 2001 From: Karan Date: Thu, 10 Sep 2015 11:23:02 -0700 Subject: [PATCH 0938/5486] added DKER to the story --- english/DKER/DKER.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/DKER/DKER.md diff --git a/english/DKER/DKER.md b/english/DKER/DKER.md new file mode 100644 index 0000000000..c905893a75 --- /dev/null +++ b/english/DKER/DKER.md @@ -0,0 +1 @@ +There is a very successful story called DKER ! diff --git a/english/marshmallow.md b/english/marshmallow.md index cab363c007..e6d7132bef 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -482,3 +482,5 @@ Click [here](young/young.md) to listen to music. [present-tense](present-tense/present-tense.md) [Think about happy thoughts while spinning around in circles](my-story/my-story.md) + +[Story of DKER](DKER/DKER.md) From 2b6c869d12074f256140e284126e4518244b646a Mon Sep 17 00:00:00 2001 From: CreativeA Date: Thu, 10 Sep 2015 19:50:06 +0100 Subject: [PATCH 0939/5486] added a new line to lego-world --- english/lego-world/lego-world.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/lego-world/lego-world.md b/english/lego-world/lego-world.md index aa1f18158a..1de28e9e8f 100644 --- a/english/lego-world/lego-world.md +++ b/english/lego-world/lego-world.md @@ -1,5 +1,5 @@ You step through the enchanted door and into Lego World! But this world is a Lego version of Willy Wonka and the Chocolate Factory. You are actually skiing down the slope of a marshmallow mountain made out of Legos! -You are surrounded by lollipop trees and gingerbread houses. +You are surrounded by lollipop trees and gingerbread houses. You can't help but burst into song! [Everything is awesome!](https://youtu.be/etzMjoH0rJw) From be6d8c40097f5c46cfc24051ef927c9a3fe16f46 Mon Sep 17 00:00:00 2001 From: CreativeA Date: Thu, 10 Sep 2015 20:22:29 +0100 Subject: [PATCH 0940/5486] added a new line to lego-world and undid previous change --- english/lego-world/lego-world.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/lego-world/lego-world.md b/english/lego-world/lego-world.md index 1de28e9e8f..4558ff54fb 100644 --- a/english/lego-world/lego-world.md +++ b/english/lego-world/lego-world.md @@ -1,5 +1,6 @@ You step through the enchanted door and into Lego World! But this world is a Lego version of Willy Wonka and the Chocolate Factory. You are actually skiing down the slope of a marshmallow mountain made out of Legos! -You are surrounded by lollipop trees and gingerbread houses. You can't help but burst into song! +You are surrounded by lollipop trees and gingerbread houses. [Everything is awesome!](https://youtu.be/etzMjoH0rJw) +And you just can't help but bust out some dance moves \ No newline at end of file From f48ab2ab142f3b88fca3c39d4199b4a9f142e593 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Sep 2015 14:14:54 -0700 Subject: [PATCH 0941/5486] Change 2spooky.md --- english/2spooky/2spooky.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index 5dc26ce873..bf44055e79 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -4,4 +4,6 @@ plz updoot mr. skeltal is nice! +hahahaha + [Go back to sleep.](../sleep/marshmallow.md) From 5d1cc8e15507a3a51b554ed2de91bd08dac38f3d Mon Sep 17 00:00:00 2001 From: Miles Erickson Date: Thu, 10 Sep 2015 14:33:35 -0700 Subject: [PATCH 0942/5486] Add link to alchemy. --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0ab66b674c..92b83ba3c3 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -39,6 +39,8 @@ capacity for good, I have sent them you... my only son." These marshmallows are numerous and they look so delicious. ... despite the feeling they're somehow judging you for only wearing one sock. +[Turn one of the marshmallows into gold.](./alchemy/alchemy.md) + You reach out to grab a handful of the marshmallow wall, but you can't seem to take the handful away from the wall. You also seem to be wearing an uncomfortable and restrictive jacket made of leather... From 1fe98f5104b8078c4ada3a05390205e9d8a1239d Mon Sep 17 00:00:00 2001 From: Miles Erickson Date: Thu, 10 Sep 2015 14:34:01 -0700 Subject: [PATCH 0943/5486] Turn a marshmallow into gold. --- english/alchemy/alchemy.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/alchemy/alchemy.md diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md new file mode 100644 index 0000000000..1716cdff39 --- /dev/null +++ b/english/alchemy/alchemy.md @@ -0,0 +1,7 @@ +You take off your backpack and pull out your trusty acetylene torch. You place the first marshmallow in a crucible and apply the flame. Chanting an incantation that has been passed down through generations of alchemists, you stare into the glowing crucible as the marshmallow melts into a cauldron of orange flame. As the fiery light coalesces into the shape of a coin at the bottom of the crucible, you turn off the flame. You remove a mysterious small wooden box from your backpack, open it, and remove a ceramic coin mold from inside. After placing the mold in front of your feet, you carefully pour the molten metal into the mold. + +Time passes, and the coin cools. + +You gain 1 gold coin. + +[Congratulations!](../marshmallow.md) \ No newline at end of file From 27f6b8c577e567c00bb8260104abb5405aa25226 Mon Sep 17 00:00:00 2001 From: Miles Erickson Date: Thu, 10 Sep 2015 14:35:12 -0700 Subject: [PATCH 0944/5486] Add flowery language. --- english/alchemy/alchemy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index 1716cdff39..03c92943bc 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -1,6 +1,6 @@ You take off your backpack and pull out your trusty acetylene torch. You place the first marshmallow in a crucible and apply the flame. Chanting an incantation that has been passed down through generations of alchemists, you stare into the glowing crucible as the marshmallow melts into a cauldron of orange flame. As the fiery light coalesces into the shape of a coin at the bottom of the crucible, you turn off the flame. You remove a mysterious small wooden box from your backpack, open it, and remove a ceramic coin mold from inside. After placing the mold in front of your feet, you carefully pour the molten metal into the mold. -Time passes, and the coin cools. +Time passes, and the coin solidifies as it cools. You gain 1 gold coin. From b12919b9e7a97caa9832e4216434ebbf803a21c9 Mon Sep 17 00:00:00 2001 From: Miles Erickson Date: Thu, 10 Sep 2015 14:38:55 -0700 Subject: [PATCH 0945/5486] Shorten lines to <120 characters. --- english/alchemy/alchemy.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index 03c92943bc..6759589a59 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -1,4 +1,11 @@ -You take off your backpack and pull out your trusty acetylene torch. You place the first marshmallow in a crucible and apply the flame. Chanting an incantation that has been passed down through generations of alchemists, you stare into the glowing crucible as the marshmallow melts into a cauldron of orange flame. As the fiery light coalesces into the shape of a coin at the bottom of the crucible, you turn off the flame. You remove a mysterious small wooden box from your backpack, open it, and remove a ceramic coin mold from inside. After placing the mold in front of your feet, you carefully pour the molten metal into the mold. +You take off your backpack and pull out your trusty acetylene torch. You place the first +marshmallow in a crucible and apply the flame. Chanting an incantation that has been +passed down through generations of alchemists, you stare into the glowing crucible as the +marshmallow melts into a cauldron of orange flame. As the fiery light coalesces into the +shape of a coin at the bottom of the crucible, you turn off the flame. You remove a +mysterious small wooden box from your backpack, open it, and remove a ceramic coin mold +from inside. After placing the mold in front of your feet, you carefully pour the molten +metal into the mold. Time passes, and the coin solidifies as it cools. From 55ecc8263f590e03ae4ed4ea14568f7c8b406d9a Mon Sep 17 00:00:00 2001 From: Count Newb Date: Thu, 10 Sep 2015 18:28:10 -0700 Subject: [PATCH 0946/5486] Add lights off option --- english/lightsoff/lightsoff.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/lightsoff/lightsoff.md diff --git a/english/lightsoff/lightsoff.md b/english/lightsoff/lightsoff.md new file mode 100644 index 0000000000..dcc63a69d6 --- /dev/null +++ b/english/lightsoff/lightsoff.md @@ -0,0 +1 @@ +It is pitch black. You are likely to be eaten by a grue. \ No newline at end of file From 5243c6d4a3413c3a2a0c418eef303d4d1e7649c8 Mon Sep 17 00:00:00 2001 From: Count Newb Date: Thu, 10 Sep 2015 18:32:12 -0700 Subject: [PATCH 0947/5486] Add lights off option --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index a2a76c51a8..e1ee65da1d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -132,6 +132,7 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: +[Turn off all the lights](lightsoff/lightsoff.md) [Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) From 4a9ddae44b140353aa9970c6efab147bf12354a7 Mon Sep 17 00:00:00 2001 From: Roger Woodroofe Date: Fri, 11 Sep 2015 21:54:16 +1200 Subject: [PATCH 0948/5486] feat: add creation of multiple coins --- english/alchemy/alchemy.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index 6759589a59..5eb4423e4e 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -2,7 +2,7 @@ You take off your backpack and pull out your trusty acetylene torch. You place t marshmallow in a crucible and apply the flame. Chanting an incantation that has been passed down through generations of alchemists, you stare into the glowing crucible as the marshmallow melts into a cauldron of orange flame. As the fiery light coalesces into the -shape of a coin at the bottom of the crucible, you turn off the flame. You remove a +shape of a coin at the bottom of the crucible, you turn off the flame. You remove a mysterious small wooden box from your backpack, open it, and remove a ceramic coin mold from inside. After placing the mold in front of your feet, you carefully pour the molten metal into the mold. @@ -11,4 +11,21 @@ Time passes, and the coin solidifies as it cools. You gain 1 gold coin. -[Congratulations!](../marshmallow.md) \ No newline at end of file +You decide to play it safe and repeat the process a few times. Who knows how many coins +the high-score currently is or how many you will need on your adventure? + +The creation process gets quicker and quicker each time you practice the ancient art of +alchemy. Your skills improve. However, on the fifth run, the coin has an air anomaly +in its centre. + +You hold the malformed coin up to to light and study it moving backwards and +forwards - studying its imperfection - a ring like shape. + +You slip the ring over your finger and ... + +[A polar bear suddenly appears and charges towards you](../polar-bear-attack/polar-bear-attack.md) + +[you close you eyes and recite Buzz Lightyear's "To infinity and beyond!"](my-story/my-story.md) + +[Congratulations!](../marshmallow.md) + From 8be8813f1db19fb21a8bb8c3ae750d42a2254f08 Mon Sep 17 00:00:00 2001 From: Roger Woodroofe Date: Fri, 11 Sep 2015 22:24:53 +1200 Subject: [PATCH 0949/5486] fix: repair line changes --- english/alchemy/alchemy.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index 5eb4423e4e..8f624e8a7f 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -11,6 +11,8 @@ Time passes, and the coin solidifies as it cools. You gain 1 gold coin. +[Congratulations!](../marshmallow.md) + You decide to play it safe and repeat the process a few times. Who knows how many coins the high-score currently is or how many you will need on your adventure? @@ -25,7 +27,4 @@ You slip the ring over your finger and ... [A polar bear suddenly appears and charges towards you](../polar-bear-attack/polar-bear-attack.md) -[you close you eyes and recite Buzz Lightyear's "To infinity and beyond!"](my-story/my-story.md) - -[Congratulations!](../marshmallow.md) - +[you close you eyes and recite Buzz Lightyear's "To infinity and beyond!"](../my-story/my-story.md) From d2652b130a5e9af80984630cc38e3b649ffae4ae Mon Sep 17 00:00:00 2001 From: Roger Woodroofe Date: Fri, 11 Sep 2015 22:42:31 +1200 Subject: [PATCH 0950/5486] fix: add back space on end of line and no end of line at end of file --- english/alchemy/alchemy.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index 8f624e8a7f..ca382d50f5 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -2,7 +2,7 @@ You take off your backpack and pull out your trusty acetylene torch. You place t marshmallow in a crucible and apply the flame. Chanting an incantation that has been passed down through generations of alchemists, you stare into the glowing crucible as the marshmallow melts into a cauldron of orange flame. As the fiery light coalesces into the -shape of a coin at the bottom of the crucible, you turn off the flame. You remove a +shape of a coin at the bottom of the crucible, you turn off the flame. You remove a mysterious small wooden box from your backpack, open it, and remove a ceramic coin mold from inside. After placing the mold in front of your feet, you carefully pour the molten metal into the mold. @@ -11,8 +11,6 @@ Time passes, and the coin solidifies as it cools. You gain 1 gold coin. -[Congratulations!](../marshmallow.md) - You decide to play it safe and repeat the process a few times. Who knows how many coins the high-score currently is or how many you will need on your adventure? @@ -28,3 +26,5 @@ You slip the ring over your finger and ... [A polar bear suddenly appears and charges towards you](../polar-bear-attack/polar-bear-attack.md) [you close you eyes and recite Buzz Lightyear's "To infinity and beyond!"](../my-story/my-story.md) + +[Congratulations!](../marshmallow.md) \ No newline at end of file From 1eb7bbc52bb281cd1c4f3a6cf97a71535028cfbe Mon Sep 17 00:00:00 2001 From: Zhuangye Chen Date: Fri, 11 Sep 2015 12:28:23 -0500 Subject: [PATCH 0951/5486] Add Michael's version --- Chinese/Michael/signal.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Chinese/Michael/signal.md diff --git a/Chinese/Michael/signal.md b/Chinese/Michael/signal.md new file mode 100644 index 0000000000..a2afaa3f62 --- /dev/null +++ b/Chinese/Michael/signal.md @@ -0,0 +1 @@ +他成了你电脑芯片里电流信号，穿梭在显示屏上，告诉你当年人们在这里相聚，像在满天大雪里步行时，发现了身边别人留下的一串脚印。 \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index ce9bae150a..4e5fd6068a 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -47,3 +47,5 @@ [jubeater](ZTL/无天.md) [ɽ](heishanlaoyao/heishanlaoyao.md)? + +[Michael](Michael/signal.md) From ab9d14903d616011f6ef6d0381baf9834834ca40 Mon Sep 17 00:00:00 2001 From: Anne Coufal Date: Fri, 11 Sep 2015 15:21:35 -0500 Subject: [PATCH 0952/5486] Added options to teleport.md --- .../walk/portal/wishes/teleport/scream/scream.md | 4 ++++ .../walk/portal/wishes/teleport/teleport.md | 6 ++++++ .../wishes/teleport/wish-hangglider/wish-hangglider.md | 3 +++ .../portal/wishes/teleport/wish-parachute/wish-parachute.md | 5 +++++ 4 files changed, 18 insertions(+) create mode 100644 english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/scream/scream.md create mode 100644 english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/wish-hangglider/wish-hangglider.md create mode 100644 english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/wish-parachute/wish-parachute.md diff --git a/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/scream/scream.md b/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/scream/scream.md new file mode 100644 index 0000000000..acfb458b31 --- /dev/null +++ b/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/scream/scream.md @@ -0,0 +1,4 @@ +You manage to scream for the entire 11 seconds it takes to +fall to the ground. The little red fellow seems to be muttering +something, but you can't hear anything over the sound of your +own screaming. You don't notice when he disappears. Your broken body is soon burnt to a crisp beside the flaming tower. Better use your wits next time. diff --git a/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/teleport.md b/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/teleport.md index 95ac36b11a..dcf7a98f28 100644 --- a/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/teleport.md +++ b/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/teleport.md @@ -4,3 +4,9 @@ except that you're 500 ft above it. As you fall, the flaming tower beneath you grows alarmingly fast. You: + +[Wish for a parachute](./wish-parachute/wish-parachute.md) + +[Wish for a hangglider](./wish-hangglider/wish-hangglider.md) + +[Scream at the top of your lungs](./scream/scream.md) diff --git a/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/wish-hangglider/wish-hangglider.md b/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/wish-hangglider/wish-hangglider.md new file mode 100644 index 0000000000..90597cb96c --- /dev/null +++ b/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/wish-hangglider/wish-hangglider.md @@ -0,0 +1,3 @@ +A bright red hangglider appears 20 feet above your heads. You need to catch it before it stalls and crashes to the ground without you. + +You: diff --git a/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/wish-parachute/wish-parachute.md b/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/wish-parachute/wish-parachute.md new file mode 100644 index 0000000000..7e96507f0a --- /dev/null +++ b/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/wish-parachute/wish-parachute.md @@ -0,0 +1,5 @@ +You wish for a parachute. A bright yellow one appears, but +within a few seconds a small rip forms, and the rushing wind +quickly rips the parachute in half. + +You: From a1768bf51310eccbe092106e3bb348a0724ccbea Mon Sep 17 00:00:00 2001 From: Javinovix Date: Fri, 11 Sep 2015 18:18:10 -0400 Subject: [PATCH 0953/5486] Agrego a chuky y lala. --- espanol/heroe/chuky/chuky.md | 4 ++++ espanol/heroe/heroe.md | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 espanol/heroe/chuky/chuky.md diff --git a/espanol/heroe/chuky/chuky.md b/espanol/heroe/chuky/chuky.md new file mode 100644 index 0000000000..9a26afaa6b --- /dev/null +++ b/espanol/heroe/chuky/chuky.md @@ -0,0 +1,4 @@ +Chuky se acercó peligrosamente, con un algodón +de azucar en una mano y un muñeco de bob esponja +en la otra, colocó sus manos en sus caderas +y dijo: "Yo los salvaré". \ No newline at end of file diff --git a/espanol/heroe/heroe.md b/espanol/heroe/heroe.md index c92759f262..9a9fcd3f22 100644 --- a/espanol/heroe/heroe.md +++ b/espanol/heroe/heroe.md @@ -15,3 +15,5 @@ El capitan miró hacia el cielo y encontró: [Un Hipogrifo](hipogrifo/hipogrifo.md) [Una Impresionante Carrera](../carrera/carrera.md) + +[Chuky el muñeco diabólico](chuky/chuky.md) From 3669cc2f2a5cd775d69da2bd49335b4727b9a42c Mon Sep 17 00:00:00 2001 From: Roger Woodroofe Date: Sat, 12 Sep 2015 11:54:57 +1200 Subject: [PATCH 0954/5486] feat: add glass droid --- english/alchemy/alchemy.md | 6 ++++-- english/android-v6/use-android-v6.md | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 english/android-v6/use-android-v6.md diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index ca382d50f5..d172394bb4 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -2,7 +2,7 @@ You take off your backpack and pull out your trusty acetylene torch. You place t marshmallow in a crucible and apply the flame. Chanting an incantation that has been passed down through generations of alchemists, you stare into the glowing crucible as the marshmallow melts into a cauldron of orange flame. As the fiery light coalesces into the -shape of a coin at the bottom of the crucible, you turn off the flame. You remove a +shape of a coin at the bottom of the crucible, you turn off the flame. You remove a mysterious small wooden box from your backpack, open it, and remove a ceramic coin mold from inside. After placing the mold in front of your feet, you carefully pour the molten metal into the mold. @@ -27,4 +27,6 @@ You slip the ring over your finger and ... [you close you eyes and recite Buzz Lightyear's "To infinity and beyond!"](../my-story/my-story.md) -[Congratulations!](../marshmallow.md) \ No newline at end of file +[quickly decide to take the ring off and try using its unknown powers later](../android-v6/use-android-v6.md) + +[Congratulations!](../marshmallow.md) diff --git a/english/android-v6/use-android-v6.md b/english/android-v6/use-android-v6.md new file mode 100644 index 0000000000..fe2c08fb39 --- /dev/null +++ b/english/android-v6/use-android-v6.md @@ -0,0 +1,18 @@ +You look around the walls and study them in detail. Marshmallows of various +sizes and delicious pastel colours cover the surface. You start to methodically +inspect them in sequence, running your fingers over the soft cushiony powdered +surface. + +While recalling campfire's of past, you suddenly realize you have sensed an area +that is completely flat! It's glass - covered with an image full of marshmallows. +The detail and quality of the image is amazing. It would have been so easy to +miss. You step back, preparing yourself for what this could mean. + +Could this be the link to the outside of the room you seek? + +Tentatively, you slide you fingers across the glass - looking for the edges. + +The image changes and a border is now clear. + +A 3D green droid figure displays with V6.0 stamped on its metallic chest. In its +arms is a single marshmallow. From a35e6d16e19948a6510ef3b84d262d8db686635e Mon Sep 17 00:00:00 2001 From: Roger Woodroofe Date: Sat, 12 Sep 2015 12:08:59 +1200 Subject: [PATCH 0955/5486] fix: add auto-merge repairs --- english/alchemy/alchemy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index d172394bb4..a676402d38 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -2,7 +2,7 @@ You take off your backpack and pull out your trusty acetylene torch. You place t marshmallow in a crucible and apply the flame. Chanting an incantation that has been passed down through generations of alchemists, you stare into the glowing crucible as the marshmallow melts into a cauldron of orange flame. As the fiery light coalesces into the -shape of a coin at the bottom of the crucible, you turn off the flame. You remove a +shape of a coin at the bottom of the crucible, you turn off the flame. You remove a mysterious small wooden box from your backpack, open it, and remove a ceramic coin mold from inside. After placing the mold in front of your feet, you carefully pour the molten metal into the mold. @@ -29,4 +29,4 @@ You slip the ring over your finger and ... [quickly decide to take the ring off and try using its unknown powers later](../android-v6/use-android-v6.md) -[Congratulations!](../marshmallow.md) +[Congratulations!](../marshmallow.md) \ No newline at end of file From 2beb7c5c77c4a7b6613240700c7cc013a40e7e97 Mon Sep 17 00:00:00 2001 From: apikey Date: Sat, 12 Sep 2015 01:56:28 -0700 Subject: [PATCH 0956/5486] Added my own line to Batman.md --- english/batman/batman.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index 62ce159f4f..a0149e445a 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -17,4 +17,6 @@ but you wonder does it end [here?](../movie-ripoffs/selfaware/selfaware.md) But then you realized that Bruce Wayne is really John Travolta from Face Off! Holy toledo! You jump up and down at this realization, then you go: -[tell papa-louie and he says...](../papa-louie/papa-louie.md) \ No newline at end of file +[tell papa-louie and he says...](../papa-louie/papa-louie.md) + +Bruce Wayne: It's not who I am underneath, but what I do that defines me. From 70be5549a9f6248061ae8c4cbf9d341ce7af8e04 Mon Sep 17 00:00:00 2001 From: kk Date: Sat, 12 Sep 2015 11:47:03 -0400 Subject: [PATCH 0957/5486] Add Commissioner Gordon's line to batman.md --- english/batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index a0149e445a..5c240cc7d6 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -20,3 +20,5 @@ this realization, then you go: [tell papa-louie and he says...](../papa-louie/papa-louie.md) Bruce Wayne: It's not who I am underneath, but what I do that defines me. + +Commissioner Gordon: He's the hero Gotham deserves but not the one that it needs right now. From b2094f796a9f14b4ba6085b5db7d5e6aa9a0afbd Mon Sep 17 00:00:00 2001 From: Torstein Meland Date: Sat, 12 Sep 2015 19:51:49 +0200 Subject: [PATCH 0958/5486] Add sound of cry from shower --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 98c7460aaa..68abfb5337 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -8,6 +8,8 @@ For a second, you decide whether or not to just [go back to sleep](go-back-to-sl A sound from a Hitchcock movie fills the room, then quickly fades away. +Was it the sound of a cry from the shower? + Thinking back, there are no memories to suggest that this should have been anything but an ordinary morning. You didn't go out last night, you don't usually take intoxicants, what's happening...? From c0d96cdb03ef15c32467c266bdf5b5d3c584a56f Mon Sep 17 00:00:00 2001 From: vmysechko Date: Sat, 12 Sep 2015 21:52:06 +0300 Subject: [PATCH 0959/5486] Insert outside view description from the hole in the wall. --- ukrainian/eat-wall/obese/continue/continue_eat.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ukrainian/eat-wall/obese/continue/continue_eat.md b/ukrainian/eat-wall/obese/continue/continue_eat.md index 7653b54a91..4a9441939d 100644 --- a/ukrainian/eat-wall/obese/continue/continue_eat.md +++ b/ukrainian/eat-wall/obese/continue/continue_eat.md @@ -1,2 +1,4 @@ , ii i, i i. + , , +, . "" . From accccf7a00b01d613f0d9bc75d7a03a20fbaac91 Mon Sep 17 00:00:00 2001 From: inhundreds Date: Sat, 12 Sep 2015 22:10:04 +0200 Subject: [PATCH 0960/5486] Add an observation about aftershave --- Italian/scappare/barba/barba.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Italian/scappare/barba/barba.md b/Italian/scappare/barba/barba.md index d99a60edc5..dbc4eec671 100644 --- a/Italian/scappare/barba/barba.md +++ b/Italian/scappare/barba/barba.md @@ -1 +1,3 @@ -Non importano le circostanze, per te rimanere impeccabile anche nelle situazioni più avverse è fondamentale. \ No newline at end of file +Non importano le circostanze, per te rimanere impeccabile anche nelle situazioni più avverse è fondamentale. + +Ma senza dopobarba non è piacevole. From 75d527e0783e9a53bcdf78b662d5f1fa8006b2ec Mon Sep 17 00:00:00 2001 From: Trang Date: Sat, 12 Sep 2015 17:43:48 -0400 Subject: [PATCH 0961/5486] Add a recommendation to exercise --- english/exercise/exercise.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/exercise/exercise.md diff --git a/english/exercise/exercise.md b/english/exercise/exercise.md new file mode 100644 index 0000000000..6628fc0553 --- /dev/null +++ b/english/exercise/exercise.md @@ -0,0 +1 @@ +If you [eat too much mashmallows](https://github.com/udacity/create-your-own-adventure/blob/master/english/eating-walls/eating-marshmallows.md), you will gain weight. Therefore, be sure to go for a run and do some exercise, lose some calories and then [eat](https://github.com/udacity/create-your-own-adventure/blob/master/english/eating-walls/eating-marshmallows.md) again. \ No newline at end of file From 75fcd3bf55ec850a3891be797620cca1f4285ec0 Mon Sep 17 00:00:00 2001 From: Trang Date: Sat, 12 Sep 2015 17:56:28 -0400 Subject: [PATCH 0962/5486] Remove links and put the second sentence on another line --- english/exercise/exercise.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/exercise/exercise.md b/english/exercise/exercise.md index 6628fc0553..3a7c4651e3 100644 --- a/english/exercise/exercise.md +++ b/english/exercise/exercise.md @@ -1 +1,2 @@ -If you [eat too much mashmallows](https://github.com/udacity/create-your-own-adventure/blob/master/english/eating-walls/eating-marshmallows.md), you will gain weight. Therefore, be sure to go for a run and do some exercise, lose some calories and then [eat](https://github.com/udacity/create-your-own-adventure/blob/master/english/eating-walls/eating-marshmallows.md) again. \ No newline at end of file +If you eat too much mashmallows, you will gain weight. +Therefore, be sure to go for a run and do some exercise, lose some calories and then eat again. \ No newline at end of file From 8f724f9ba1b6d83f254a49c4a7c64cd89455cfb6 Mon Sep 17 00:00:00 2001 From: Trang Date: Sat, 12 Sep 2015 18:01:06 -0400 Subject: [PATCH 0963/5486] Add a recommendation to exercise --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 68abfb5337..ed36a5b040 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -489,3 +489,5 @@ Click [here](young/young.md) to listen to music. [Think about happy thoughts while spinning around in circles](my-story/my-story.md) [Story of DKER](DKER/DKER.md) + +If you eat a lot, you should also [exercise](english/exercise/exercise.md) \ No newline at end of file From ae4272ee0bc0984da9be1596375024095b440b63 Mon Sep 17 00:00:00 2001 From: Trang Date: Sat, 12 Sep 2015 18:04:21 -0400 Subject: [PATCH 0964/5486] Fix link to exercise.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index ed36a5b040..9a367892ca 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -490,4 +490,4 @@ Click [here](young/young.md) to listen to music. [Story of DKER](DKER/DKER.md) -If you eat a lot, you should also [exercise](english/exercise/exercise.md) \ No newline at end of file +If you eat a lot, you should also [exercise](exercise/exercise.md) \ No newline at end of file From 76d5ea87cd7989adf314d5b895079f842b730d49 Mon Sep 17 00:00:00 2001 From: dwkarbowsky Date: Sat, 12 Sep 2015 23:33:10 -0400 Subject: [PATCH 0965/5486] ADD: Smile of Marshmellows --- english/bob-barker/barker.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/bob-barker/barker.md b/english/bob-barker/barker.md index d3db646b12..336f0be108 100644 --- a/english/bob-barker/barker.md +++ b/english/bob-barker/barker.md @@ -16,6 +16,8 @@ You step into the room and walk up to Bob. Behind him are two large doors. The flaming hot marshmallows are gesturing suggestively at the doors while swaying their flaming hips. +They grin with barely hidden glee. + "Which door is the door for you, the blue door, or the red door?", he asks. "Before you decide, Remember help control the pet population. Have your pet spayed or neutered.", he announced. From cb795d5b032bfc2a7c06dbbada9aabc5ceb72eb8 Mon Sep 17 00:00:00 2001 From: MikeD317 Date: Sun, 13 Sep 2015 13:52:00 -0400 Subject: [PATCH 0966/5486] Added reference to diet and exercise --- english/exercise/exercise.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/exercise/exercise.md b/english/exercise/exercise.md index 3a7c4651e3..951abe9313 100644 --- a/english/exercise/exercise.md +++ b/english/exercise/exercise.md @@ -1,2 +1,4 @@ If you eat too much mashmallows, you will gain weight. -Therefore, be sure to go for a run and do some exercise, lose some calories and then eat again. \ No newline at end of file +Therefore, be sure to go for a run and do some exercise, lose some calories and then eat again. + +Actually, you can't out-exercise a bad diet. \ No newline at end of file From 5fc7811b00e88a601f348531283fca00d307b03c Mon Sep 17 00:00:00 2001 From: Robert Kohl Date: Sun, 13 Sep 2015 12:20:49 -0600 Subject: [PATCH 0967/5486] Add sonic-screwdriver folder and file to ./english Add sonic-screwdriver option to ./english/marshmallow.md Add up and down links to ./english/challenge-marshmallow-to-rock-off/joker.md Add go-down.md and go-up.md to ./english/challenge-marshmallow-to-rock-off/light-route/up-or-down --- .../challenge-marshmellow-to-rock-off/light-route/joker.md | 2 +- .../light-route/up-or-down/go-down.md | 2 ++ .../light-route/up-or-down/go-up.md | 4 ++++ english/marshmallow.md | 4 +++- english/sonic-screwdriver/sonic-screwdriver.md | 2 ++ 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down.md create mode 100644 english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-up.md create mode 100644 english/sonic-screwdriver/sonic-screwdriver.md diff --git a/english/challenge-marshmellow-to-rock-off/light-route/joker.md b/english/challenge-marshmellow-to-rock-off/light-route/joker.md index eb0d10397e..4241043209 100644 --- a/english/challenge-marshmellow-to-rock-off/light-route/joker.md +++ b/english/challenge-marshmellow-to-rock-off/light-route/joker.md @@ -14,4 +14,4 @@ and there is a tiny camera looking at you from above. Who is on the other side, you cannot tell; but, for now, what will you do? -Go up or go down? +Go [up](./up-or-down/go-up.md) or go [down](./up-or-down/go-down.md)? diff --git a/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down.md b/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down.md new file mode 100644 index 0000000000..6872adb56d --- /dev/null +++ b/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down.md @@ -0,0 +1,2 @@ +You descend into madness. Your only light is the glowing of marshmallow lights. You are weightless. +Your confused mind wonders how it will taste when the marshmallows eat your mind... \ No newline at end of file diff --git a/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-up.md b/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-up.md new file mode 100644 index 0000000000..4394fcffcf --- /dev/null +++ b/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-up.md @@ -0,0 +1,4 @@ +You push the button for up and the elevator carries you higher. Eventually it stops and an old woman welcomes you in. +"Hello" She says. "I'm glad it was you that made all the right choices." +She hands you an envelope. Inside you find the keys to a safe deposit box with the word "Solutions" written on it. +"This has all the answers you are looking for." She says as she guides you back to the elevator. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 68abfb5337..a77e14c884 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -85,7 +85,9 @@ But it sounds like it might be coming out of speakers. Something lightly brushes the back of your neck, sending a chill down your spine! -Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. +Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. + +Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air for alien life forms. When you look away, a marshmallow hand attempts to grab the lighter. diff --git a/english/sonic-screwdriver/sonic-screwdriver.md b/english/sonic-screwdriver/sonic-screwdriver.md new file mode 100644 index 0000000000..4177ef965c --- /dev/null +++ b/english/sonic-screwdriver/sonic-screwdriver.md @@ -0,0 +1,2 @@ +You scan the air and hear the familiar sound of you trusty sonic-screwdriver. +It tells you that you are, in fact, alone. \ No newline at end of file From 9aa1bf5eac907240de8574b376ea3e18761e90c4 Mon Sep 17 00:00:00 2001 From: robertkohl125 Date: Sun, 13 Sep 2015 12:31:46 -0600 Subject: [PATCH 0968/5486] Update joker.md --- .../challenge-marshmellow-to-rock-off/light-route/joker.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/challenge-marshmellow-to-rock-off/light-route/joker.md b/english/challenge-marshmellow-to-rock-off/light-route/joker.md index 4241043209..6b38199509 100644 --- a/english/challenge-marshmellow-to-rock-off/light-route/joker.md +++ b/english/challenge-marshmellow-to-rock-off/light-route/joker.md @@ -14,4 +14,6 @@ and there is a tiny camera looking at you from above. Who is on the other side, you cannot tell; but, for now, what will you do? -Go [up](./up-or-down/go-up.md) or go [down](./up-or-down/go-down.md)? +Go [up](./up-or-down/go-up.md)? + +Or go [down](./up-or-down/go-down.md)? From 70f2d03a72161491138fe0b81f0bf27bbdb254e6 Mon Sep 17 00:00:00 2001 From: robertkohl125 Date: Sun, 13 Sep 2015 12:32:17 -0600 Subject: [PATCH 0969/5486] Update joker.md --- english/challenge-marshmellow-to-rock-off/light-route/joker.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/challenge-marshmellow-to-rock-off/light-route/joker.md b/english/challenge-marshmellow-to-rock-off/light-route/joker.md index 6b38199509..40e91fa8b1 100644 --- a/english/challenge-marshmellow-to-rock-off/light-route/joker.md +++ b/english/challenge-marshmellow-to-rock-off/light-route/joker.md @@ -14,6 +14,8 @@ and there is a tiny camera looking at you from above. Who is on the other side, you cannot tell; but, for now, what will you do? +Go up or go down? + Go [up](./up-or-down/go-up.md)? Or go [down](./up-or-down/go-down.md)? From f79efdc0acb0211e7a7c225bcf5380aab728eb57 Mon Sep 17 00:00:00 2001 From: robertkohl125 Date: Sun, 13 Sep 2015 12:33:22 -0600 Subject: [PATCH 0970/5486] Update marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index a77e14c884..865f41c860 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -85,7 +85,7 @@ But it sounds like it might be coming out of speakers. Something lightly brushes the back of your neck, sending a chill down your spine! -Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. +Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air for alien life forms. From 61675c67bff8ea2794daf95c9919eee54baeb1a7 Mon Sep 17 00:00:00 2001 From: Robert Kohl Date: Sun, 13 Sep 2015 12:43:40 -0600 Subject: [PATCH 0971/5486] updated directory ./english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down/ updated directory ./english/challenge-marshmellow-to-rock-off/light-route/up-or-up/go-up/ modified ./english/challenge-marshmellow-to-rock-off/light-route/joker.md --- .../challenge-marshmellow-to-rock-off/light-route/joker.md | 4 ++-- .../light-route/up-or-down/go-down.md | 2 -- .../light-route/up-or-down/go-up.md | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down.md delete mode 100644 english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-up.md diff --git a/english/challenge-marshmellow-to-rock-off/light-route/joker.md b/english/challenge-marshmellow-to-rock-off/light-route/joker.md index 40e91fa8b1..62e37585cd 100644 --- a/english/challenge-marshmellow-to-rock-off/light-route/joker.md +++ b/english/challenge-marshmellow-to-rock-off/light-route/joker.md @@ -16,6 +16,6 @@ Who is on the other side, you cannot tell; but, for now, what will you do? Go up or go down? -Go [up](./up-or-down/go-up.md)? +Go [up](./up-or-down/go-up/go-up.md)? -Or go [down](./up-or-down/go-down.md)? +Or go [down](./up-or-down/go-down/go-down.md)? diff --git a/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down.md b/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down.md deleted file mode 100644 index 6872adb56d..0000000000 --- a/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down.md +++ /dev/null @@ -1,2 +0,0 @@ -You descend into madness. Your only light is the glowing of marshmallow lights. You are weightless. -Your confused mind wonders how it will taste when the marshmallows eat your mind... \ No newline at end of file diff --git a/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-up.md b/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-up.md deleted file mode 100644 index 4394fcffcf..0000000000 --- a/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-up.md +++ /dev/null @@ -1,4 +0,0 @@ -You push the button for up and the elevator carries you higher. Eventually it stops and an old woman welcomes you in. -"Hello" She says. "I'm glad it was you that made all the right choices." -She hands you an envelope. Inside you find the keys to a safe deposit box with the word "Solutions" written on it. -"This has all the answers you are looking for." She says as she guides you back to the elevator. \ No newline at end of file From 42c93e60857f74d13c875489de386e5bd3c407f3 Mon Sep 17 00:00:00 2001 From: Robert Kohl Date: Sun, 13 Sep 2015 12:46:43 -0600 Subject: [PATCH 0972/5486] Add track directory updates --- .../light-route/up-or-down/go-down/go-down.md | 2 ++ .../light-route/up-or-down/go-up/go-up.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down/go-down.md create mode 100644 english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-up/go-up.md diff --git a/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down/go-down.md b/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down/go-down.md new file mode 100644 index 0000000000..6872adb56d --- /dev/null +++ b/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-down/go-down.md @@ -0,0 +1,2 @@ +You descend into madness. Your only light is the glowing of marshmallow lights. You are weightless. +Your confused mind wonders how it will taste when the marshmallows eat your mind... \ No newline at end of file diff --git a/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-up/go-up.md b/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-up/go-up.md new file mode 100644 index 0000000000..4394fcffcf --- /dev/null +++ b/english/challenge-marshmellow-to-rock-off/light-route/up-or-down/go-up/go-up.md @@ -0,0 +1,4 @@ +You push the button for up and the elevator carries you higher. Eventually it stops and an old woman welcomes you in. +"Hello" She says. "I'm glad it was you that made all the right choices." +She hands you an envelope. Inside you find the keys to a safe deposit box with the word "Solutions" written on it. +"This has all the answers you are looking for." She says as she guides you back to the elevator. \ No newline at end of file From d10a84f4d9b4696eebd7bac34a0d1a63c193c7c8 Mon Sep 17 00:00:00 2001 From: robertkohl125 Date: Sun, 13 Sep 2015 12:51:00 -0600 Subject: [PATCH 0973/5486] Update marshmallow.md --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 865f41c860..ca0dafb1bf 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -87,7 +87,8 @@ Something lightly brushes the back of your neck, sending a chill down your spine Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. -Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air for alien life forms. +Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air +for alien life forms. When you look away, a marshmallow hand attempts to grab the lighter. From aefa53a860de8c50f104377f401bf4b6857ee8a5 Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 13 Sep 2015 14:44:21 -0700 Subject: [PATCH 0974/5486] Add proposal response to propose-to-her.md --- english/karaoke/karaoke/propose-to-her/propose-to-her.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/karaoke/karaoke/propose-to-her/propose-to-her.md b/english/karaoke/karaoke/propose-to-her/propose-to-her.md index f631d735c2..7b4b14ff21 100644 --- a/english/karaoke/karaoke/propose-to-her/propose-to-her.md +++ b/english/karaoke/karaoke/propose-to-her/propose-to-her.md @@ -1,4 +1,10 @@ You stop singing. Get down on your knees and pull out a thread from your pocket and tie around the finger of the lady and ask her to marry you. -What does she do? \ No newline at end of file +What does she do? + +Her eyes light up and her lips part in an elated smile. + +But then she remembers something. Her expression turns solemn. "Well, that's very kind +of you," she says, "but... I'm afraid I can't. I'm only dreaming you see, and I couldn't +in good conscience engage myself to a stranger I met in a dream." From d192c5bc8fd0e3cd521519e962dcf778982e25cd Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 13 Sep 2015 14:53:43 -0700 Subject: [PATCH 0975/5486] Change wording of response in propose-to-her.md --- english/karaoke/karaoke/propose-to-her/propose-to-her.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/karaoke/karaoke/propose-to-her/propose-to-her.md b/english/karaoke/karaoke/propose-to-her/propose-to-her.md index 7b4b14ff21..aae0088a36 100644 --- a/english/karaoke/karaoke/propose-to-her/propose-to-her.md +++ b/english/karaoke/karaoke/propose-to-her/propose-to-her.md @@ -7,4 +7,4 @@ Her eyes light up and her lips part in an elated smile. But then she remembers something. Her expression turns solemn. "Well, that's very kind of you," she says, "but... I'm afraid I can't. I'm only dreaming you see, and I couldn't -in good conscience engage myself to a stranger I met in a dream." +in good conscience engage myself to a figment in one of my dreams." From 40761726fceb5dab72882fcadc06cad9e2dfd4b6 Mon Sep 17 00:00:00 2001 From: Anne Date: Mon, 14 Sep 2015 08:34:22 -0500 Subject: [PATCH 0976/5486] Shorten lines in scream --- .../walk/portal/wishes/teleport/scream/scream.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/scream/scream.md b/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/scream/scream.md index acfb458b31..32f99c5187 100644 --- a/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/scream/scream.md +++ b/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/scream/scream.md @@ -1,4 +1,6 @@ You manage to scream for the entire 11 seconds it takes to fall to the ground. The little red fellow seems to be muttering something, but you can't hear anything over the sound of your -own screaming. You don't notice when he disappears. Your broken body is soon burnt to a crisp beside the flaming tower. Better use your wits next time. +own screaming. You don't notice when he disappears. Your +broken body is soon burnt to a crisp beside the flaming tower. +Better use your wits next time. From f982ff67a61fe344c393ab0a945b48caddf4ad49 Mon Sep 17 00:00:00 2001 From: Anne Date: Mon, 14 Sep 2015 08:35:06 -0500 Subject: [PATCH 0977/5486] Shorten lines in wish-hangglider --- .../portal/wishes/teleport/wish-hangglider/wish-hangglider.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/wish-hangglider/wish-hangglider.md b/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/wish-hangglider/wish-hangglider.md index 90597cb96c..2fc615bd93 100644 --- a/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/wish-hangglider/wish-hangglider.md +++ b/english/explore-outside/journey-to-flaming-tower/walk/portal/wishes/teleport/wish-hangglider/wish-hangglider.md @@ -1,3 +1,5 @@ -A bright red hangglider appears 20 feet above your heads. You need to catch it before it stalls and crashes to the ground without you. +A bright red hangglider appears 20 feet above your heads. +You need to catch it before it stalls and crashes to the +ground without you. You: From 33b6dc0f7379255bce5ee34f02161f21f07eb68f Mon Sep 17 00:00:00 2001 From: DJ Date: Mon, 14 Sep 2015 12:58:35 -0400 Subject: [PATCH 0978/5486] Add breaking-bad selection and loop back to start --- english/breaking-bad/breaking-bad.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/breaking-bad/breaking-bad.md diff --git a/english/breaking-bad/breaking-bad.md b/english/breaking-bad/breaking-bad.md new file mode 100644 index 0000000000..95ef85ecf4 --- /dev/null +++ b/english/breaking-bad/breaking-bad.md @@ -0,0 +1,3 @@ +Spoiler Alert! + +Cancer kills. But sometimes it is a [dream](../marshmallow.md) \ No newline at end of file From 10cdc9a2f773562188d7d85ddb70761c06b9bab3 Mon Sep 17 00:00:00 2001 From: DJ Date: Mon, 14 Sep 2015 13:01:47 -0400 Subject: [PATCH 0979/5486] Modify netflix to add Breaking Bad --- english/netflix/netflix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/netflix/netflix.md b/english/netflix/netflix.md index 04de1b031a..419876f46e 100644 --- a/english/netflix/netflix.md +++ b/english/netflix/netflix.md @@ -16,4 +16,4 @@ Watch the Passion of the Christ instead Until you realised you hate Mel Gibson -So instead watch Breaking Bad for the 12th time. +So instead watch [Breaking Bad](../breaking-bad/breaking-bad.md) for the 12th time. \ No newline at end of file From b310a02f2fcb2c618e84719331e89772b3d5a20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irene=20Mar=C3=ADn?= Date: Mon, 14 Sep 2015 21:02:57 +0200 Subject: [PATCH 0980/5486] fix: Edit some words and punctuation --- catala/catala.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/catala/catala.md b/catala/catala.md index 5b67cc6ed0..cd3d0e4efa 100644 --- a/catala/catala.md +++ b/catala/catala.md @@ -2,11 +2,12 @@ Un matí, t'aixeques en una estranya habitació amb les parets fetes de núvols Què fas? -Tanque els ulls els torne a obrir. No pot ser. On estic? +Tanque els ulls, els torne a obrir. "No pot ser. On estic?" -Em resulta familiar, però no sé on estic. [Que és aixó ](http://www.google.es/imgres?imgurl=http%3A%2F%2F1.bp.blogspot.com%2F-b0CZu7RAyiM%2FULaNOLTJMZI%2FAAAAAAAAAA8%2FwmVTGAKDC-U%2Fs400%2FCaptura3.PNG&imgrefurl=http%3A%2F%2Fsusandsan.blogspot.com%2F2012%2F11%2Fsimbolismo-figuracion-y-abstraccion.html&h=304&w=400&tbnid=jAdgGBhRlYxgwM%3A&zoom=1&docid=j7NOlpg8lyjPMM&ei=xo95VOvhDc7zasWGgaAP&tbm=isch&ved=0CGMQMygfMB8&iact=rc&uact=3&dur=1931&page=3&start=20&ndsp=13) +"Em resulta familiar, però no sé on estic." [Què és això? ](http://www.google.es/imgres?imgurl=http%3A%2F%2F1.bp.blogspot.com%2F-b0CZu7RAyiM%2FULaNOLTJMZI%2FAAAAAAAAAA8%2FwmVTGAKDC-U%2Fs400%2FCaptura3.PNG&imgrefurl=http%3A%2F%2Fsusandsan.blogspot.com%2F2012%2F11%2Fsimbolismo-figuracion-y-abstraccion.html&h=304&w=400&tbnid=jAdgGBhRlYxgwM%3A&zoom=1&docid=j7NOlpg8lyjPMM&ei=xo95VOvhDc7zasWGgaAP&tbm=isch&ved=0CGMQMygfMB8&iact=rc&uact=3&dur=1931&page=3&start=20&ndsp=13) Què fas? + [Et poses a dormir](dormir/dormir.md) [Cantes de l'alegria](cantar/cantar.md) From 2210c895cd18d18bcb02196bb1600c52a6fa5c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irene=20Mar=C3=ADn?= Date: Mon, 14 Sep 2015 21:38:21 +0200 Subject: [PATCH 0981/5486] feat: Create new options for tastes_sol story --- catala/cantar/tastar/tastes_sol/tastes_sol.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/catala/cantar/tastar/tastes_sol/tastes_sol.md b/catala/cantar/tastar/tastes_sol/tastes_sol.md index d8c7dfb96c..9b4339085c 100644 --- a/catala/cantar/tastar/tastes_sol/tastes_sol.md +++ b/catala/cantar/tastar/tastes_sol/tastes_sol.md @@ -1,3 +1,7 @@ T'acostes a l'horitzó i tastes el caramel que cau del sol. Té un gust deliciós i sorprenent, com corrents de calor pessigollant entre les teves dents. -Quan te n'has fartat t'adones que rere l'horitzó no hi ha més caramel: només una llarga caiguda al buit. \ No newline at end of file +Quan te n'has fartat t'adones que rere l'horitzó no hi ha més caramel: només una llarga caiguda al buit. + +[Estàs tan tip de caramel, que decideixes deixar-te caure al buit. Fins que xoques contra el fons...](aixecar/aixecar.md) + +[Busques alguna forma de parar la caiguda. Trobes una gran roca i et puges a sobre](troll/troll.md) From a984318f2ed22fddc2a90916f1874e2eab991640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irene=20Mar=C3=ADn?= Date: Mon, 14 Sep 2015 21:39:19 +0200 Subject: [PATCH 0982/5486] Update tastes_sol.md --- catala/cantar/tastar/tastes_sol/tastes_sol.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catala/cantar/tastar/tastes_sol/tastes_sol.md b/catala/cantar/tastar/tastes_sol/tastes_sol.md index 9b4339085c..2cebf0d4b8 100644 --- a/catala/cantar/tastar/tastes_sol/tastes_sol.md +++ b/catala/cantar/tastar/tastes_sol/tastes_sol.md @@ -2,6 +2,6 @@ T'acostes a l'horitzó i tastes el caramel que cau del sol. Té un gust deliciós i sorprenent, com corrents de calor pessigollant entre les teves dents. Quan te n'has fartat t'adones que rere l'horitzó no hi ha més caramel: només una llarga caiguda al buit. -[Estàs tan tip de caramel, que decideixes deixar-te caure al buit. Fins que xoques contra el fons...](aixecar/aixecar.md) +[Estàs tan tip de caramel, que decideixes deixar-te caure al buit. Fins que xoques contra el fons...](../../../aixecar/aixecar.md) -[Busques alguna forma de parar la caiguda. Trobes una gran roca i et puges a sobre](troll/troll.md) +[Busques alguna forma de parar la caiguda. Trobes una gran roca i et puges a sobre](../../../troll/troll.md) From d18968df66adfa88584bc7ca2c8a1bf246e098a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irene=20Mar=C3=ADn?= Date: Mon, 14 Sep 2015 21:50:07 +0200 Subject: [PATCH 0983/5486] feat: Create new troll option --- catala/troll/troll.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 catala/troll/troll.md diff --git a/catala/troll/troll.md b/catala/troll/troll.md new file mode 100644 index 0000000000..e3ee916052 --- /dev/null +++ b/catala/troll/troll.md @@ -0,0 +1,5 @@ +De sobte, la roca comença a moure's. T'agafes ben fort a ella per no caure +mentre veus, sorprès, com es va aixecant del terra un gran troll! + +El troll no s'ha adonat de la teva presència, petit que ets, així que et quedes agafat al seu clatell +sense fer cap soroll, mentre comença a caminar cap al bosc... From 4662e36eb9d7d3a5e3b3900c13ca5603ed7f9140 Mon Sep 17 00:00:00 2001 From: cihan Date: Mon, 14 Sep 2015 23:15:51 +0100 Subject: [PATCH 0984/5486] Update CrazyStone --- Chinese/CrazyStone/CrazyStone.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Chinese/CrazyStone/CrazyStone.md b/Chinese/CrazyStone/CrazyStone.md index ae8e9780ca..418d8f31b4 100644 --- a/Chinese/CrazyStone/CrazyStone.md +++ b/Chinese/CrazyStone/CrazyStone.md @@ -5,3 +5,4 @@ 相见恨晚，大排档喝到半夜。第二天早上6点麦克被广场舞震醒，发现自己一个人躺在床上。 迈克起来伸了个懒腰，正要好好欣赏一下跳广场舞大妈们的优雅身姿，听见有人叫自己的名字， 原来是昨天碰到的小贼，手里拿着两套夹饼果子。麦克毫不客气的结果其中一套，与小贼一起大快朵颐。 +突然，麦克眼前一黑，昏死了过去。 \ No newline at end of file From 4d4ededb4e5087f6bc1e3236a6264a485b996b10 Mon Sep 17 00:00:00 2001 From: Andrew Parmar Date: Mon, 14 Sep 2015 18:05:30 -0700 Subject: [PATCH 0985/5486] Eat that pizza and dive in .. --- english/is-this-a-dream/is-this-a-dream.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/is-this-a-dream/is-this-a-dream.md b/english/is-this-a-dream/is-this-a-dream.md index 6adebb0cb3..1d43c818a5 100644 --- a/english/is-this-a-dream/is-this-a-dream.md +++ b/english/is-this-a-dream/is-this-a-dream.md @@ -3,4 +3,8 @@ to tremble stronger and stronet and brighten up until they blow up around you in that engulfs you...you close your eyes from the strong light and when you open them up...the beautiful view from your 20th floor in central park NY and the sexy ass of the current babe you conquered last night welcomes you :) -No more eating at that strange ass pizzaria you promise your self... \ No newline at end of file +No more eating at that strange ass pizzaria you promise your self... + +But then again .. none of this fabulous shit would have been yours had you not be a frequent visitor at +Joe's hallucination pizza bar. You know you want it cause life is short and there is yet much to lord over + .. so you pick up the phone and dial. "Hi I'd like to order a pizza ..." \ No newline at end of file From 8398377963a78e06d7878a3fe76e1a9a2fa7002b Mon Sep 17 00:00:00 2001 From: sabrinacales Date: Mon, 14 Sep 2015 20:20:18 -0500 Subject: [PATCH 0986/5486] added calculus to wiki --- english/wikipedia/wiki.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/wikipedia/wiki.md b/english/wikipedia/wiki.md index 74ba1e947d..e57adb05e8 100644 --- a/english/wikipedia/wiki.md +++ b/english/wikipedia/wiki.md @@ -25,3 +25,5 @@ Then after you explore the website, you learn a few neat tricks. [Play minecraft](../you-are-in-minecraft/minecraft.md) [Play Skyrim](../fus-roh-dah/fus-roh-dah.md) + +[Learn Calculus](https://en.wikipedia.org/wiki/Calculus) From 344514a41a1563874bb84c6c44bbc1f14d642845 Mon Sep 17 00:00:00 2001 From: Art Shishkin Date: Tue, 15 Sep 2015 10:47:17 +0300 Subject: [PATCH 0987/5486] Add old photo to the story --- ukrainian/dream/stranger/carroll.md | 6 +++++- ukrainian/old-photo/old-photo.md | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 ukrainian/old-photo/old-photo.md diff --git a/ukrainian/dream/stranger/carroll.md b/ukrainian/dream/stranger/carroll.md index ccbbff280b..1532a39fe6 100644 --- a/ukrainian/dream/stranger/carroll.md +++ b/ukrainian/dream/stranger/carroll.md @@ -1,2 +1,6 @@ Ви впізнаєте цього чоловіка: звісно, це Льюїс Керролл. Він хитро всміхається, підморгує Вам і жує зефір. -Ви дуже здивовані та [хочете запитати в нього що то було?](talk-to/talk-to.md) \ No newline at end of file +Ви дуже здивовані та [хочете запитати в нього що то було?](talk-to/talk-to.md) + +Але він раптово дістає з кишені старе чорно-біло фото і мовчки протягує Вам. + +[Ви берете і уважно роздивляєтесь фотокартку](..\..\old-photo\old-photo.md) \ No newline at end of file diff --git a/ukrainian/old-photo/old-photo.md b/ukrainian/old-photo/old-photo.md new file mode 100644 index 0000000000..d6cf9e6c12 --- /dev/null +++ b/ukrainian/old-photo/old-photo.md @@ -0,0 +1,5 @@ +О, боже мій! + +На фото, якому вже більше 100 років, зображений саме Ви, та же й у якомусь дивному капелюсі. + +Як це може бути? \ No newline at end of file From f5eacb9c9d870cc1ae187aac5bc0435a14b4b298 Mon Sep 17 00:00:00 2001 From: Art Shishkin Date: Tue, 15 Sep 2015 10:55:36 +0300 Subject: [PATCH 0988/5486] Fix link to a file old-photo.md --- ukrainian/dream/stranger/carroll.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/dream/stranger/carroll.md b/ukrainian/dream/stranger/carroll.md index 1532a39fe6..4e1cdca9ed 100644 --- a/ukrainian/dream/stranger/carroll.md +++ b/ukrainian/dream/stranger/carroll.md @@ -3,4 +3,4 @@ Але він раптово дістає з кишені старе чорно-біло фото і мовчки протягує Вам. -[Ви берете і уважно роздивляєтесь фотокартку](..\..\old-photo\old-photo.md) \ No newline at end of file +[Ви берете і уважно роздивляєтесь фотокартку](../../old-photo/old-photo.md) \ No newline at end of file From 5997ddd5b9ec5918b4c44af35ffe0fff6dd14b6c Mon Sep 17 00:00:00 2001 From: Art Shishkin Date: Tue, 15 Sep 2015 10:58:55 +0300 Subject: [PATCH 0989/5486] Fix typo in old-photo.md --- ukrainian/old-photo/old-photo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/old-photo/old-photo.md b/ukrainian/old-photo/old-photo.md index d6cf9e6c12..e87b1a34e7 100644 --- a/ukrainian/old-photo/old-photo.md +++ b/ukrainian/old-photo/old-photo.md @@ -1,5 +1,5 @@ О, боже мій! -На фото, якому вже більше 100 років, зображений саме Ви, та же й у якомусь дивному капелюсі. +На фото, якому вже більше 100 років, зображені саме Ви, та же й у якомусь дивному капелюсі. Як це може бути? \ No newline at end of file From 8f7ccee55aeca094b487bb2a58465be6c7154698 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 15 Sep 2015 12:22:29 +0100 Subject: [PATCH 0990/5486] Add some lines to the story --- english/scream/walk/walkwiththought.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/scream/walk/walkwiththought.md b/english/scream/walk/walkwiththought.md index 3cc5608c75..ff7d860d07 100644 --- a/english/scream/walk/walkwiththought.md +++ b/english/scream/walk/walkwiththought.md @@ -1,2 +1,4 @@ You will realize that we have not taken a long walk from long time and this is the right time for this + +You put on your shoes and coat and open the door. Opening the door you see a \ No newline at end of file From 83e0a763bfddf839b678bfeaed1c492aefecd6b9 Mon Sep 17 00:00:00 2001 From: MasterMind Date: Tue, 15 Sep 2015 20:57:01 +0300 Subject: [PATCH 0991/5486] Add two new options in the first choises point --- romanian/nalba.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/romanian/nalba.md b/romanian/nalba.md index 1775edc080..26e42b1b70 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -1,8 +1,12 @@ Te trezesti intr-o dimineatza si patul este facut din nalbe. Ce faci? +[Il chemi pe Ginel](Ginel/ginel.md) + [Te apuci sa faci un foc](foc/faci-foc.md) +[Te culci la loc](somn/somn.md) + Cand ii gata focu o suni pe Ginuta. Abea astepti sa-i dai si ei nalbe. Sti tu ca ii plac mult de tot nalbele. Asa ca atunci cand ajunge Va dati impreuna capat pana ramaneti fara... pat. From 868c0e0239379521a5a60a7dbd2c1ac78c5fe0e7 Mon Sep 17 00:00:00 2001 From: MasterMind Date: Tue, 15 Sep 2015 20:58:15 +0300 Subject: [PATCH 0992/5486] create new file somn/somn.md --- romanian/somn/somn.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 romanian/somn/somn.md diff --git a/romanian/somn/somn.md b/romanian/somn/somn.md new file mode 100644 index 0000000000..584f46c045 --- /dev/null +++ b/romanian/somn/somn.md @@ -0,0 +1 @@ +Si in timp ce dormi visezi tot felul de lucruri; se facea ca te afli in: \ No newline at end of file From 0c583e19237090dff6c26d3d5f4636fd1716b186 Mon Sep 17 00:00:00 2001 From: Julio Date: Tue, 15 Sep 2015 21:00:39 +0200 Subject: [PATCH 0993/5486] Add muerte-dragon to dragon in espanol --- espanol/dragon/dragon.md | 5 +++++ espanol/dragon/muerte-dragon/muerte-dragon.md | 1 + 2 files changed, 6 insertions(+) create mode 100644 espanol/dragon/muerte-dragon/muerte-dragon.md diff --git a/espanol/dragon/dragon.md b/espanol/dragon/dragon.md index 2131702d45..e23aa57ea1 100644 --- a/espanol/dragon/dragon.md +++ b/espanol/dragon/dragon.md @@ -19,3 +19,8 @@ vendedor de dragones del pueblo. __) \ \\___(_ __/.__,' ,((,-,__\ '", __\_/. __,' '"./_._._-' + + +Pero no sabía controlar al dragón, así que decidió: + +[matarlo](muerte-dragon/muerte-dragon.md) \ No newline at end of file diff --git a/espanol/dragon/muerte-dragon/muerte-dragon.md b/espanol/dragon/muerte-dragon/muerte-dragon.md new file mode 100644 index 0000000000..4431096338 --- /dev/null +++ b/espanol/dragon/muerte-dragon/muerte-dragon.md @@ -0,0 +1 @@ +La muerte del dragn provoc la ira de sus hermanos, que no dudaron en jurar venganza por aquel atroz acto. \ No newline at end of file From b441e508b342cb3eea631b1d29fdc9593ba69d47 Mon Sep 17 00:00:00 2001 From: Chris Earle Date: Tue, 15 Sep 2015 19:54:54 -0500 Subject: [PATCH 0994/5486] Add choice option to cast a spell in selfie --- english/selfie/selfie.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/selfie/selfie.md b/english/selfie/selfie.md index 215395cc1d..c293e45f8d 100644 --- a/english/selfie/selfie.md +++ b/english/selfie/selfie.md @@ -15,3 +15,5 @@ The next logical step then is to: [Begin to eat!](../light-fire/eating/inside.md) [Build a fire](../light-fire/fire.md) + +[Cast a spell](../magic/magic.md) \ No newline at end of file From 7beb96ea00952b2464409ca471d028a831ef07bc Mon Sep 17 00:00:00 2001 From: Victor R Zambrano Date: Tue, 15 Sep 2015 22:22:16 -0430 Subject: [PATCH 0995/5486] Completar historia de la bruja --- espanol/bruja/bruja.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/bruja/bruja.md b/espanol/bruja/bruja.md index 19352f13d0..99cdc8ccdd 100644 --- a/espanol/bruja/bruja.md +++ b/espanol/bruja/bruja.md @@ -1 +1,3 @@ La bruja les ofreció su ayuda para derrotar al ejército invasor a cambio del primer hijo del rey. + +A lo que el rey accedió gustoso From 908b750e5bf75d46d560597a8c8bb5f89d18a69d Mon Sep 17 00:00:00 2001 From: Sheshlok Samal Date: Wed, 16 Sep 2015 13:57:01 +0530 Subject: [PATCH 0996/5486] Make a change to the story --- english/yoga/mind/yoga_mind.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/yoga/mind/yoga_mind.md b/english/yoga/mind/yoga_mind.md index 996555547d..4c9f197736 100644 --- a/english/yoga/mind/yoga_mind.md +++ b/english/yoga/mind/yoga_mind.md @@ -5,3 +5,5 @@ Oops! I mean your soul. Want to know about Yoga lifestyle? Click [here](../lifestyle/yoga_lifestyle.md) Most people have discovered that exercising can lift their mood. + +Meditation is simply training your mind to focus and concentrate From f166121c13bc20b9f8e84d69d5888127c8156baf Mon Sep 17 00:00:00 2001 From: JJ Date: Wed, 16 Sep 2015 17:30:21 +0530 Subject: [PATCH 0997/5486] story added --- Malayalam/boy/life.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Malayalam/boy/life.md b/Malayalam/boy/life.md index 13b83cad7e..b4c18cb19d 100644 --- a/Malayalam/boy/life.md +++ b/Malayalam/boy/life.md @@ -1 +1,2 @@ +ജയ്സണ്‍ ഈ കുട്ടിയുടെ പേര്? \ No newline at end of file From c7b478a7f3b9089a466100802af1051f9de96384 Mon Sep 17 00:00:00 2001 From: anydoby Date: Wed, 16 Sep 2015 22:50:34 +0200 Subject: [PATCH 0998/5486] added another page and a loop --- .../look_out_from_window/break_surface/break_surface.md | 4 ++++ russian/call-mom/look_out_from_window/look_out_from_window.md | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 russian/call-mom/look_out_from_window/break_surface/break_surface.md diff --git a/russian/call-mom/look_out_from_window/break_surface/break_surface.md b/russian/call-mom/look_out_from_window/break_surface/break_surface.md new file mode 100644 index 0000000000..038521b7ea --- /dev/null +++ b/russian/call-mom/look_out_from_window/break_surface/break_surface.md @@ -0,0 +1,4 @@ +Вы разбежались и изо всех сил стукнули головой в зеркало. Оно разбилось и вы влетели в другую комнату. + +[далее...](../../zefir.md) + diff --git a/russian/call-mom/look_out_from_window/look_out_from_window.md b/russian/call-mom/look_out_from_window/look_out_from_window.md index ff5b538475..6257d3fd51 100644 --- a/russian/call-mom/look_out_from_window/look_out_from_window.md +++ b/russian/call-mom/look_out_from_window/look_out_from_window.md @@ -1 +1,5 @@ Выглянув в окно, Вы видите свое зеркальное отражение в какой-то серебристой поверхности + +[Вернуться назад](../call_mom.md) + +[Попытаться разбить серебристую поверхность](../break_surface/break_surface.md) From cb21927ae7734f940eab0f465a63603045906ca6 Mon Sep 17 00:00:00 2001 From: anydoby Date: Wed, 16 Sep 2015 22:56:03 +0200 Subject: [PATCH 0999/5486] fixing the navigation --- .../look_out_from_window/break_surface/break_surface.md | 2 +- russian/call-mom/look_out_from_window/look_out_from_window.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/russian/call-mom/look_out_from_window/break_surface/break_surface.md b/russian/call-mom/look_out_from_window/break_surface/break_surface.md index 038521b7ea..7aac162cb2 100644 --- a/russian/call-mom/look_out_from_window/break_surface/break_surface.md +++ b/russian/call-mom/look_out_from_window/break_surface/break_surface.md @@ -1,4 +1,4 @@ Вы разбежались и изо всех сил стукнули головой в зеркало. Оно разбилось и вы влетели в другую комнату. -[далее...](../../zefir.md) +[далее...](../../../zefir.md) diff --git a/russian/call-mom/look_out_from_window/look_out_from_window.md b/russian/call-mom/look_out_from_window/look_out_from_window.md index 6257d3fd51..e5ac457958 100644 --- a/russian/call-mom/look_out_from_window/look_out_from_window.md +++ b/russian/call-mom/look_out_from_window/look_out_from_window.md @@ -1,5 +1,5 @@ Выглянув в окно, Вы видите свое зеркальное отражение в какой-то серебристой поверхности -[Вернуться назад](../call_mom.md) +[Вернуться назад](../call-mom.md) -[Попытаться разбить серебристую поверхность](../break_surface/break_surface.md) +[Попытаться разбить серебристую поверхность](break_surface/break_surface.md) From 31c824c36b2216518fe50e4b6de83e29deef1258 Mon Sep 17 00:00:00 2001 From: Mike Jones Date: Wed, 16 Sep 2015 15:55:07 -0700 Subject: [PATCH 1000/5486] create impossible girl page --- english/impossible-girl/impossible.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/impossible-girl/impossible.md diff --git a/english/impossible-girl/impossible.md b/english/impossible-girl/impossible.md new file mode 100644 index 0000000000..d3d558cd1e --- /dev/null +++ b/english/impossible-girl/impossible.md @@ -0,0 +1,3 @@ +You return to the marshmallow realm and begin to search for Clara. + +Suddenly, your blood runs cold as you hear a familiar mechanical voice greet you. "Exterminate!" \ No newline at end of file From 6e170cffcea024d8a5bdd650556b67f8ac0e001f Mon Sep 17 00:00:00 2001 From: Mike Jones Date: Wed, 16 Sep 2015 15:55:39 -0700 Subject: [PATCH 1001/5486] modify sonic-screwdriver with option to impossible girl --- english/sonic-screwdriver/sonic-screwdriver.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/sonic-screwdriver/sonic-screwdriver.md b/english/sonic-screwdriver/sonic-screwdriver.md index 4177ef965c..a0d385c5fb 100644 --- a/english/sonic-screwdriver/sonic-screwdriver.md +++ b/english/sonic-screwdriver/sonic-screwdriver.md @@ -1,2 +1,8 @@ You scan the air and hear the familiar sound of you trusty sonic-screwdriver. -It tells you that you are, in fact, alone. \ No newline at end of file +It tells you that you are, in fact, alone. + +You return to the Tardis flip some levers and hear that familiar whirling sound. When you open the door back in Londo you realize that you left your trusty sidekick behind. + +Do you: + +[Go back and find the impossible girl?](../impossible-girl/impossible.md) \ No newline at end of file From e3245aea252f03185555adc7e7a3e05014398402 Mon Sep 17 00:00:00 2001 From: Mike Jones Date: Wed, 16 Sep 2015 15:58:32 -0700 Subject: [PATCH 1002/5486] fixed typos --- english/sonic-screwdriver/sonic-screwdriver.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sonic-screwdriver/sonic-screwdriver.md b/english/sonic-screwdriver/sonic-screwdriver.md index a0d385c5fb..86447a16bd 100644 --- a/english/sonic-screwdriver/sonic-screwdriver.md +++ b/english/sonic-screwdriver/sonic-screwdriver.md @@ -1,7 +1,7 @@ You scan the air and hear the familiar sound of you trusty sonic-screwdriver. It tells you that you are, in fact, alone. -You return to the Tardis flip some levers and hear that familiar whirling sound. When you open the door back in Londo you realize that you left your trusty sidekick behind. +You return to the Tardis, flip some levers and hear that familiar whirling sound. When you open the door back in Londo you realize that you left your trusty sidekick behind. Do you: From 432268bd70f6720a4309074cdfa098e86ab69bfa Mon Sep 17 00:00:00 2001 From: Mike Jones Date: Wed, 16 Sep 2015 16:09:36 -0700 Subject: [PATCH 1003/5486] corrected excessive line length --- english/sonic-screwdriver/sonic-screwdriver.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/sonic-screwdriver/sonic-screwdriver.md b/english/sonic-screwdriver/sonic-screwdriver.md index 86447a16bd..62eacd039b 100644 --- a/english/sonic-screwdriver/sonic-screwdriver.md +++ b/english/sonic-screwdriver/sonic-screwdriver.md @@ -1,7 +1,8 @@ You scan the air and hear the familiar sound of you trusty sonic-screwdriver. It tells you that you are, in fact, alone. -You return to the Tardis, flip some levers and hear that familiar whirling sound. When you open the door back in Londo you realize that you left your trusty sidekick behind. +You return to the Tardis, flip some levers and hear that familiar whirling sound. +When you open the door back in Londo you realize that you left your trusty sidekick behind. Do you: From 076571046b2d5ba16faebb662513d7683d9f3a55 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Wed, 16 Sep 2015 20:31:57 -0700 Subject: [PATCH 1004/5486] Acts of kindness page. Share your story! --- english/kindness/acts-of-kindness.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/kindness/acts-of-kindness.md diff --git a/english/kindness/acts-of-kindness.md b/english/kindness/acts-of-kindness.md new file mode 100644 index 0000000000..6fe20fe66a --- /dev/null +++ b/english/kindness/acts-of-kindness.md @@ -0,0 +1 @@ +I made my parents happy today. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 237a06c41e..8a3704a8aa 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -4,6 +4,8 @@ One morning, you wake up in a strange room with marshmallows for walls. *(Must be a Tuesday.)* +Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. + For a second, you decide whether or not to just [go back to sleep](go-back-to-sleep/go-back-to-sleep.md) A sound from a Hitchcock movie fills the room, then quickly fades away. From 936f9c4363c95594b2752af4cdf973e5cf2ae128 Mon Sep 17 00:00:00 2001 From: appleJax Date: Wed, 16 Sep 2015 22:41:30 -0700 Subject: [PATCH 1005/5486] Add a second act of kindness --- english/kindness/acts-of-kindness.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/kindness/acts-of-kindness.md b/english/kindness/acts-of-kindness.md index 6fe20fe66a..7f43159e51 100644 --- a/english/kindness/acts-of-kindness.md +++ b/english/kindness/acts-of-kindness.md @@ -1 +1,3 @@ -I made my parents happy today. \ No newline at end of file +I made my parents happy today. + +Today, I pooped in my neighbor's garden, so that his zucchini may grow large and deep green in color. \ No newline at end of file From 870a89d788f255dc0286faa2fc0707e712d1719b Mon Sep 17 00:00:00 2001 From: thyagx Date: Thu, 17 Sep 2015 13:47:44 -0300 Subject: [PATCH 1006/5486] =?UTF-8?q?Adiciona=20a=20op=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20matar=20o=20inseto=20com=20spray?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/colaborando.md | 4 +++- portugues/spray/joaninha/liberar.md | 2 ++ portugues/spray/joaninha/matar.md | 3 +++ portugues/spray/matainsetos.md | 7 +++++++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 portugues/spray/joaninha/liberar.md create mode 100644 portugues/spray/joaninha/matar.md create mode 100644 portugues/spray/matainsetos.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index bb9d3ec6b5..f0197ae2a4 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -11,4 +11,6 @@ Você: [Procura um amigo que sabe de tecnologia](amigo/tecnologia.md) -[Cria um aplicativo melhor](cria/melhor.md) \ No newline at end of file +[Cria um aplicativo melhor](cria/melhor.md) + +[Levanta-se a vai buscar o spray mata insetos](spray/matainsetos.md) diff --git a/portugues/spray/joaninha/liberar.md b/portugues/spray/joaninha/liberar.md new file mode 100644 index 0000000000..3072b42cee --- /dev/null +++ b/portugues/spray/joaninha/liberar.md @@ -0,0 +1,2 @@ +Meus parabéns! Sua misericórdia salvou sua vida e impediu a total destruição +do planeta por uma invasão das joaninhas alienígenas. diff --git a/portugues/spray/joaninha/matar.md b/portugues/spray/joaninha/matar.md new file mode 100644 index 0000000000..11fbb1e611 --- /dev/null +++ b/portugues/spray/joaninha/matar.md @@ -0,0 +1,3 @@ +Oh não! Essa não era uma joaninha comum! Você acaba de exterminar a joaninha rainha +de um planeta em uma parte antiga do universo. A terra foi invadida e a raça humana +exterminada. diff --git a/portugues/spray/matainsetos.md b/portugues/spray/matainsetos.md new file mode 100644 index 0000000000..70cd450d67 --- /dev/null +++ b/portugues/spray/matainsetos.md @@ -0,0 +1,7 @@ +Observando melhor, você repara que na verdade o inseto é apenas uma joaninha. + +Você não faria mal a uma joaninha, faria? + +[Matar a joaninha](joaninha/matar.md) + +[Claro que não! Elas são adoráveis.](joaninha/liberar.md) From ac97855e742450a51a9066ced4bd84bc40a9547e Mon Sep 17 00:00:00 2001 From: thyagx Date: Thu, 17 Sep 2015 13:54:41 -0300 Subject: [PATCH 1007/5486] Adiciona mais diretorios --- portugues/spray/joaninha/liberar.md | 2 -- portugues/spray/joaninha/matar.md | 3 --- portugues/spray/matainsetos.md | 4 ++-- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 portugues/spray/joaninha/liberar.md delete mode 100644 portugues/spray/joaninha/matar.md diff --git a/portugues/spray/joaninha/liberar.md b/portugues/spray/joaninha/liberar.md deleted file mode 100644 index 3072b42cee..0000000000 --- a/portugues/spray/joaninha/liberar.md +++ /dev/null @@ -1,2 +0,0 @@ -Meus parabéns! Sua misericórdia salvou sua vida e impediu a total destruição -do planeta por uma invasão das joaninhas alienígenas. diff --git a/portugues/spray/joaninha/matar.md b/portugues/spray/joaninha/matar.md deleted file mode 100644 index 11fbb1e611..0000000000 --- a/portugues/spray/joaninha/matar.md +++ /dev/null @@ -1,3 +0,0 @@ -Oh não! Essa não era uma joaninha comum! Você acaba de exterminar a joaninha rainha -de um planeta em uma parte antiga do universo. A terra foi invadida e a raça humana -exterminada. diff --git a/portugues/spray/matainsetos.md b/portugues/spray/matainsetos.md index 70cd450d67..7813ebc375 100644 --- a/portugues/spray/matainsetos.md +++ b/portugues/spray/matainsetos.md @@ -2,6 +2,6 @@ Observando melhor, você repara que na verdade o inseto é apenas uma joaninha. Você não faria mal a uma joaninha, faria? -[Matar a joaninha](joaninha/matar.md) +[Matar a joaninha](joaninha/matar/matar.md) -[Claro que não! Elas são adoráveis.](joaninha/liberar.md) +[Claro que não! Elas são adoráveis.](joaninha/liberar/liberar.md) From 8b0506b7f6ccb88e993e02e211d593e839e27750 Mon Sep 17 00:00:00 2001 From: thyagx Date: Thu, 17 Sep 2015 13:55:23 -0300 Subject: [PATCH 1008/5486] Adiciona arquivos as novas pastas --- portugues/spray/joaninha/liberar/liberar.md | 2 ++ portugues/spray/joaninha/matar/matar.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 portugues/spray/joaninha/liberar/liberar.md create mode 100644 portugues/spray/joaninha/matar/matar.md diff --git a/portugues/spray/joaninha/liberar/liberar.md b/portugues/spray/joaninha/liberar/liberar.md new file mode 100644 index 0000000000..3072b42cee --- /dev/null +++ b/portugues/spray/joaninha/liberar/liberar.md @@ -0,0 +1,2 @@ +Meus parabéns! Sua misericórdia salvou sua vida e impediu a total destruição +do planeta por uma invasão das joaninhas alienígenas. diff --git a/portugues/spray/joaninha/matar/matar.md b/portugues/spray/joaninha/matar/matar.md new file mode 100644 index 0000000000..11fbb1e611 --- /dev/null +++ b/portugues/spray/joaninha/matar/matar.md @@ -0,0 +1,3 @@ +Oh não! Essa não era uma joaninha comum! Você acaba de exterminar a joaninha rainha +de um planeta em uma parte antiga do universo. A terra foi invadida e a raça humana +exterminada. From a12e1701c49891ab1abf0ed81d9c1d43c3e2caff Mon Sep 17 00:00:00 2001 From: Michael Shabsin Date: Thu, 17 Sep 2015 10:52:31 -0700 Subject: [PATCH 1009/5486] Option added to exercise path --- english/exercise/exercise.md | 8 +++++++- english/exercise/fuck_it/fuck_it.md | 3 +++ english/exercise/seek_veg/seek_veg.md | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 english/exercise/fuck_it/fuck_it.md create mode 100644 english/exercise/seek_veg/seek_veg.md diff --git a/english/exercise/exercise.md b/english/exercise/exercise.md index 951abe9313..b5db6b3c94 100644 --- a/english/exercise/exercise.md +++ b/english/exercise/exercise.md @@ -1,4 +1,10 @@ If you eat too much mashmallows, you will gain weight. Therefore, be sure to go for a run and do some exercise, lose some calories and then eat again. -Actually, you can't out-exercise a bad diet. \ No newline at end of file +Actually, you can't out-exercise a bad diet. + +What do you do? Do you: + +[Seek Vegetables](./seek_veg/seek_veg.md) + +[Say, "Fuck it" and continue eating marshmallows](./fuck_it/fuck_it.md) diff --git a/english/exercise/fuck_it/fuck_it.md b/english/exercise/fuck_it/fuck_it.md new file mode 100644 index 0000000000..3b339cb477 --- /dev/null +++ b/english/exercise/fuck_it/fuck_it.md @@ -0,0 +1,3 @@ +You have been eating marshmallows for the past (who knows how many) days. You have lost all self respect and are now +unable to see your feet. Having a stomachache that won't quite you decide you will: + diff --git a/english/exercise/seek_veg/seek_veg.md b/english/exercise/seek_veg/seek_veg.md new file mode 100644 index 0000000000..11972d0deb --- /dev/null +++ b/english/exercise/seek_veg/seek_veg.md @@ -0,0 +1,2 @@ +You go on a quest for vegetables, unfortunately, they are scarce in the land of marshmallows. +You quest on for many hours over many miles only to find [Althaea officinalis](https://en.wikipedia.org/wiki/Althaea_officinalis). From 452abe036b49eb56f1ee450f8a3400159946b6aa Mon Sep 17 00:00:00 2001 From: Michael Shabsin Date: Thu, 17 Sep 2015 10:57:41 -0700 Subject: [PATCH 1010/5486] Fix length of line --- english/exercise/seek_veg/seek_veg.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/exercise/seek_veg/seek_veg.md b/english/exercise/seek_veg/seek_veg.md index 11972d0deb..5044febac9 100644 --- a/english/exercise/seek_veg/seek_veg.md +++ b/english/exercise/seek_veg/seek_veg.md @@ -1,2 +1,3 @@ You go on a quest for vegetables, unfortunately, they are scarce in the land of marshmallows. -You quest on for many hours over many miles only to find [Althaea officinalis](https://en.wikipedia.org/wiki/Althaea_officinalis). +You quest on for many hours over many miles only to find +[Althaea officinalis](https://en.wikipedia.org/wiki/Althaea_officinalis). From 2f5743c2ad057d0eac6470f6bf392cf2b792de98 Mon Sep 17 00:00:00 2001 From: Joshua Hunsberger Date: Thu, 17 Sep 2015 18:59:06 -0400 Subject: [PATCH 1011/5486] Add japan.md branch of the story --- english/dream/fly/asia/japan/japan.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/dream/fly/asia/japan/japan.md diff --git a/english/dream/fly/asia/japan/japan.md b/english/dream/fly/asia/japan/japan.md new file mode 100644 index 0000000000..326c4faf04 --- /dev/null +++ b/english/dream/fly/asia/japan/japan.md @@ -0,0 +1,5 @@ +You have decided to leave India and fly to Japan. + +You land in Tokyo Haneda Airport in the morning. + +What is your first stop in Japan? \ No newline at end of file From 353e1db6c407b9468a295c4ad5650e2edd6b8170 Mon Sep 17 00:00:00 2001 From: Joshua Hunsberger Date: Thu, 17 Sep 2015 19:06:08 -0400 Subject: [PATCH 1012/5486] Add story links to asia.md --- english/dream/fly/asia/asia.md | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/english/dream/fly/asia/asia.md b/english/dream/fly/asia/asia.md index 834c72789d..f47797cd61 100644 --- a/english/dream/fly/asia/asia.md +++ b/english/dream/fly/asia/asia.md @@ -15,16 +15,6 @@ around. What exotic adventures await? +[Travel to Japan](./japan/japan.md) - - - - - - - - - - - - +[Wake up](/eating-walls/find-a-toilet/find-a-toilet.md) From 10d7b33a9e2b5f0877ba906244c23cb2d7dfbfa5 Mon Sep 17 00:00:00 2001 From: Andre Melo Date: Thu, 17 Sep 2015 20:11:45 -0300 Subject: [PATCH 1013/5486] =?UTF-8?q?Add=20op=C3=A7=C3=A3o=20caso=20n?= =?UTF-8?q?=C3=A3o=20tenha=20resposta=20stackoverflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sono/stackoverflow/semresposta/livros/livros.md | 1 + .../sono/stackoverflow/semresposta/pergunta/pergunta.md | 1 + .../pentefino/sono/stackoverflow/semresposta/semresposta.md | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/livros/livros.md create mode 100644 portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/pergunta/pergunta.md diff --git a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/livros/livros.md b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/livros/livros.md new file mode 100644 index 0000000000..993686962e --- /dev/null +++ b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/livros/livros.md @@ -0,0 +1 @@ +Você lê vários livros e ... \ No newline at end of file diff --git a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/pergunta/pergunta.md b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/pergunta/pergunta.md new file mode 100644 index 0000000000..0a483da3b5 --- /dev/null +++ b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/pergunta/pergunta.md @@ -0,0 +1 @@ +Você posta a pergunta em vários fóruns e... \ No newline at end of file diff --git a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md index 001e362649..383e295ef2 100644 --- a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md +++ b/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md @@ -1 +1,5 @@ -Você fica louco para receber uma resposta, então você... \ No newline at end of file +Você fica louco para receber uma resposta, então você... + +[Pergunta em outros lugares](pergunta/pergunta.md) + +[Lê vários livros para tentar achar alguma dica.](livros/livros.md) \ No newline at end of file From ee84f39c16771d1a3cac735ad845718f1e8fd1ff Mon Sep 17 00:00:00 2001 From: Joshua Hunsberger Date: Thu, 17 Sep 2015 19:11:47 -0400 Subject: [PATCH 1014/5486] Return whitespace for automatic merging --- english/dream/fly/asia/asia.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/english/dream/fly/asia/asia.md b/english/dream/fly/asia/asia.md index f47797cd61..5de0d048fe 100644 --- a/english/dream/fly/asia/asia.md +++ b/english/dream/fly/asia/asia.md @@ -18,3 +18,12 @@ What exotic adventures await? [Travel to Japan](./japan/japan.md) [Wake up](/eating-walls/find-a-toilet/find-a-toilet.md) + + + + + + + + + From d60faadcea55f4fedfa9818c6e40e785cffccfb3 Mon Sep 17 00:00:00 2001 From: Joshua Hunsberger Date: Thu, 17 Sep 2015 19:22:21 -0400 Subject: [PATCH 1015/5486] Fix broken link in asia.md --- english/dream/fly/asia/asia.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/dream/fly/asia/asia.md b/english/dream/fly/asia/asia.md index 5de0d048fe..f3ca1ff60b 100644 --- a/english/dream/fly/asia/asia.md +++ b/english/dream/fly/asia/asia.md @@ -17,7 +17,9 @@ What exotic adventures await? [Travel to Japan](./japan/japan.md) -[Wake up](/eating-walls/find-a-toilet/find-a-toilet.md) + + +[Wake up](../../../eating-walls/find-a-toilet/find-a-toilet.md) From 81563c4f02707e389ed74403d8b2d0f37240a264 Mon Sep 17 00:00:00 2001 From: Joshua Hunsberger Date: Thu, 17 Sep 2015 19:24:19 -0400 Subject: [PATCH 1016/5486] Add a line of whitespace for commit --- english/dream/fly/asia/asia.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/dream/fly/asia/asia.md b/english/dream/fly/asia/asia.md index f3ca1ff60b..f37e73b1c3 100644 --- a/english/dream/fly/asia/asia.md +++ b/english/dream/fly/asia/asia.md @@ -19,6 +19,7 @@ What exotic adventures await? + [Wake up](../../../eating-walls/find-a-toilet/find-a-toilet.md) From 655c11bb06ecfc858c992c2211f0e67e948a68e4 Mon Sep 17 00:00:00 2001 From: davidcashm Date: Thu, 17 Sep 2015 21:42:15 -0400 Subject: [PATCH 1017/5486] Add troll under bridge --- .../walk/under_bridge/under_bridge.md | 4 ++++ .../explore-outside/journey-to-flaming-tower/walk/walk.md | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/explore-outside/journey-to-flaming-tower/walk/under_bridge/under_bridge.md diff --git a/english/explore-outside/journey-to-flaming-tower/walk/under_bridge/under_bridge.md b/english/explore-outside/journey-to-flaming-tower/walk/under_bridge/under_bridge.md new file mode 100644 index 0000000000..360bdf8cfd --- /dev/null +++ b/english/explore-outside/journey-to-flaming-tower/walk/under_bridge/under_bridge.md @@ -0,0 +1,4 @@ +There is a troll under the bridge. + +It eats you. Yum. + diff --git a/english/explore-outside/journey-to-flaming-tower/walk/walk.md b/english/explore-outside/journey-to-flaming-tower/walk/walk.md index 0e8f38d64f..3da59eb4d4 100644 --- a/english/explore-outside/journey-to-flaming-tower/walk/walk.md +++ b/english/explore-outside/journey-to-flaming-tower/walk/walk.md @@ -10,4 +10,7 @@ Do you: [Steal sailboat](./sailboat/sailboat.md) -[Jump into portal because why not](./portal/portal.md) \ No newline at end of file +[Jump into portal because why not](./portal/portal.md) + +[Look under the bridge](./under_bridge/under_bridge.md) + From 0fa550654d3e269a9ff0278c4e5fbe1803b420d6 Mon Sep 17 00:00:00 2001 From: Alexey Drozdov Date: Fri, 18 Sep 2015 19:22:49 +0300 Subject: [PATCH 1018/5486] Add knock on the door (rat-rat) story --- russian/rat-rat/rat-rat.md | 2 ++ russian/zefir.md | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 russian/rat-rat/rat-rat.md diff --git a/russian/rat-rat/rat-rat.md b/russian/rat-rat/rat-rat.md new file mode 100644 index 0000000000..93a0a341de --- /dev/null +++ b/russian/rat-rat/rat-rat.md @@ -0,0 +1,2 @@ +Пойдёте откроете дверь и пройдётё вместе с людьми в белых халатах в их +замечательную машину из зефира с надписью "Санитары". diff --git a/russian/zefir.md b/russian/zefir.md index b9ad28719e..2c21f2554e 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -32,4 +32,6 @@ [Начинайте танцевать от радости.](dance/dance.md) -[Вспомните интересную шутку](Holms-Watson/Holmes-Watson.md) \ No newline at end of file +[Вспомните интересную шутку](Holms-Watson/Holmes-Watson.md) + +[Откроете дверь, в нее настойчиво стучат.](rat-rat/rat-rat.md) \ No newline at end of file From d34e0c76cf199136b237d6eb8585b5ae1716368d Mon Sep 17 00:00:00 2001 From: Christopher Bonuel Date: Fri, 18 Sep 2015 15:54:22 -0400 Subject: [PATCH 1019/5486] Add ice cream as a wish option --- english/sleep/ice-cream.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/sleep/ice-cream.md diff --git a/english/sleep/ice-cream.md b/english/sleep/ice-cream.md new file mode 100644 index 0000000000..76c0c05753 --- /dev/null +++ b/english/sleep/ice-cream.md @@ -0,0 +1 @@ +Your delicious wish came true! Yummy, yummy ice cream... From 8a6edfc668936309f2c38c398289f8eea97878e9 Mon Sep 17 00:00:00 2001 From: Christopher Bonuel Date: Fri, 18 Sep 2015 15:57:13 -0400 Subject: [PATCH 1020/5486] Move ice-cream.md file --- english/sleep/ice-cream/ice-cream.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/sleep/ice-cream/ice-cream.md diff --git a/english/sleep/ice-cream/ice-cream.md b/english/sleep/ice-cream/ice-cream.md new file mode 100644 index 0000000000..76c0c05753 --- /dev/null +++ b/english/sleep/ice-cream/ice-cream.md @@ -0,0 +1 @@ +Your delicious wish came true! Yummy, yummy ice cream... From cb92ca6b8c50b21ae29ae0647e0de1ee4da5bfc5 Mon Sep 17 00:00:00 2001 From: Christopher Bonuel Date: Fri, 18 Sep 2015 15:59:26 -0400 Subject: [PATCH 1021/5486] Move ice-cream.md file (step 2) --- english/sleep/ice-cream.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 english/sleep/ice-cream.md diff --git a/english/sleep/ice-cream.md b/english/sleep/ice-cream.md deleted file mode 100644 index 76c0c05753..0000000000 --- a/english/sleep/ice-cream.md +++ /dev/null @@ -1 +0,0 @@ -Your delicious wish came true! Yummy, yummy ice cream... From 34a5d3b45cd9e21cb1340e25b7738b92b2cf72eb Mon Sep 17 00:00:00 2001 From: Christopher Bonuel Date: Fri, 18 Sep 2015 16:08:56 -0400 Subject: [PATCH 1022/5486] Add link to ice-cream.md --- english/sleep/marshmallow.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/english/sleep/marshmallow.md b/english/sleep/marshmallow.md index 5814f221b9..691b63b493 100644 --- a/english/sleep/marshmallow.md +++ b/english/sleep/marshmallow.md @@ -7,8 +7,8 @@ Maybe some chocolate. You wish there were some chocolate furniture too. -And suddenly your wish come true, the chocolate furniture appears, -and you start thinking is it really possible, +And suddenly your wish come true, the chocolate furniture appears, +and you start thinking is it really possible, whatever i think will come true. You think if you should wish there was a way to melt these chocolates @@ -37,4 +37,6 @@ Do you: [Wish for graham crackers](./crackers/crackers.md) -[Sit down to meditate](sit-down-to-meditate/sit-down-to-meditate.md) \ No newline at end of file +[Sit down to meditate](sit-down-to-meditate/sit-down-to-meditate.md) + +[Wish for ice cream](./ice-cream/ice-cream.md) From abb3d901dd91128339e87ad52b6683feafa50bcb Mon Sep 17 00:00:00 2001 From: jboludae Date: Fri, 18 Sep 2015 23:00:48 +0200 Subject: [PATCH 1023/5486] afegit link a cantar.md --- catala/cantar/cantar.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/catala/cantar/cantar.md b/catala/cantar/cantar.md index 747a7caadf..5029502109 100644 --- a/catala/cantar/cantar.md +++ b/catala/cantar/cantar.md @@ -1,9 +1,11 @@ -La pluja que cau sobre la tenda et desperta. -El teu company de tenda havia deixat una bossa plena de llaminadures +La pluja que cau sobre la tenda et desperta. +El teu company de tenda havia deixat una bossa plena de llaminadures prop del teu cap, deu ser això el que t'ha fet somniar amb les parets de sucre... I ara... què vols fer? [Tasto una llaminadura](tastar/tastar.md) -[Surto de la tenda](sortir_tenda/sortir_tenda.md) \ No newline at end of file +[Surto de la tenda](sortir_tenda/sortir_tenda.md) + +[Em pose a dormir](../dormir/dormir.md) \ No newline at end of file From 000f6ab671d05f69dcf682c36718d9dc7f699266 Mon Sep 17 00:00:00 2001 From: Joseph Agostini Date: Fri, 18 Sep 2015 18:07:46 -0700 Subject: [PATCH 1024/5486] Add shotgun part to story --- english/shotgun/shotgun.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/shotgun/shotgun.md diff --git a/english/shotgun/shotgun.md b/english/shotgun/shotgun.md new file mode 100644 index 0000000000..55bd1c181d --- /dev/null +++ b/english/shotgun/shotgun.md @@ -0,0 +1 @@ +You cock the shotgun and blast the polar bear in the face. Brain matter flys all over the marshmallow wall. Suddenly the brain matter starts to disintegrate the wall. You see sunlight peeking through. After a while the wall is gone and you are free. From b4685dfcd29af5f1e1f123465394688b30597307 Mon Sep 17 00:00:00 2001 From: Joseph Agostini Date: Fri, 18 Sep 2015 18:13:48 -0700 Subject: [PATCH 1025/5486] Add shotgun link --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 8a3704a8aa..14567fb181 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -77,6 +77,8 @@ You decide to try to light a fire to melt some of the marshmallows so you look f You see a polar bear searching for food. +[A Shotgun appears!](./shotgun/shotgun.md) + [Whilst cycling backwards.](./cycling-backwards/cycling-backwards.md) "Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" @@ -495,4 +497,4 @@ Click [here](young/young.md) to listen to music. [Story of DKER](DKER/DKER.md) -If you eat a lot, you should also [exercise](exercise/exercise.md) \ No newline at end of file +If you eat a lot, you should also [exercise](exercise/exercise.md) From dbd5943f1c6e6abce106728db8850cac911d1afb Mon Sep 17 00:00:00 2001 From: Joseph Agostini Date: Fri, 18 Sep 2015 18:16:27 -0700 Subject: [PATCH 1026/5486] Fix line breaks --- english/shotgun/shotgun.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/shotgun/shotgun.md b/english/shotgun/shotgun.md index 55bd1c181d..31ef702b37 100644 --- a/english/shotgun/shotgun.md +++ b/english/shotgun/shotgun.md @@ -1 +1,5 @@ -You cock the shotgun and blast the polar bear in the face. Brain matter flys all over the marshmallow wall. Suddenly the brain matter starts to disintegrate the wall. You see sunlight peeking through. After a while the wall is gone and you are free. +You cock the shotgun and blast the polar bear in the face. Brain matter flys all +over the marshmallow wall. +Suddenly the brain matter starts to disintegrate the wall. +You see sunlight peeking through. +After a while the wall is gone and you are free. From 0bcb9e4d8711028c5f5cb653860556e3657aca73 Mon Sep 17 00:00:00 2001 From: eddiechou Date: Fri, 18 Sep 2015 19:18:53 -0700 Subject: [PATCH 1027/5486] Update sing.md with option for bird is the word! --- english/sing-song/sing.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/sing-song/sing.md b/english/sing-song/sing.md index 9099824880..a9ce4e7278 100644 --- a/english/sing-song/sing.md +++ b/english/sing-song/sing.md @@ -15,3 +15,5 @@ Eventually you realize this is not very adventurous and decide to: [Eat ALL the marshmallows!](../count-the-marshmellows/eat-all-the-marshmellows/eat-all-the-marshmellows.md) [Make Taffy!](../marshmallow-taffy/taffy.md) + +[The bird is the word!](../birdistheword/birdistheword.md) \ No newline at end of file From d929f7a972cbacd6f419ac96ccc2ef24591162b3 Mon Sep 17 00:00:00 2001 From: Shinsuke JJ Ikegame Date: Sat, 19 Sep 2015 12:40:31 +0700 Subject: [PATCH 1028/5486] Add new line --- japanese/chasitsu.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/japanese/chasitsu.md b/japanese/chasitsu.md index 4a9515533e..6577eb7195 100644 --- a/japanese/chasitsu.md +++ b/japanese/chasitsu.md @@ -4,3 +4,5 @@ [取り敢えずビールを頼む？](beer/beer.md) [庭に出る](garden/garden.md) + +今日食べた[カツ丼](katsudon/katsudon.md)美味しかったなー。 \ No newline at end of file From 02aeb98feeb5fd96e32ca07be773116936c39a38 Mon Sep 17 00:00:00 2001 From: Shinsuke JJ Ikegame Date: Sat, 19 Sep 2015 12:45:34 +0700 Subject: [PATCH 1029/5486] Add Katsudon markdown --- japanese/katsudon/katsudon.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 japanese/katsudon/katsudon.md diff --git a/japanese/katsudon/katsudon.md b/japanese/katsudon/katsudon.md new file mode 100644 index 0000000000..393d33e12f --- /dev/null +++ b/japanese/katsudon/katsudon.md @@ -0,0 +1 @@ +タイはチェンマイ市のやや郊外にある「ごはん亭」のカツ丼がとても美味しい \ No newline at end of file From a159117ad7adf5199415ea3bcfdff515be00b8cb Mon Sep 17 00:00:00 2001 From: miguelestrella Date: Sat, 19 Sep 2015 11:13:22 -0500 Subject: [PATCH 1030/5486] Espanol-heroe-aventurero --- espanol/heroe/aventurero/aventurero.md | 1 + espanol/heroe/heroe.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 espanol/heroe/aventurero/aventurero.md diff --git a/espanol/heroe/aventurero/aventurero.md b/espanol/heroe/aventurero/aventurero.md new file mode 100644 index 0000000000..32819c9ee8 --- /dev/null +++ b/espanol/heroe/aventurero/aventurero.md @@ -0,0 +1 @@ +Un heroe aventurero siguió sus pies hasta la cima de una colina con su espada escarlata. \ No newline at end of file diff --git a/espanol/heroe/heroe.md b/espanol/heroe/heroe.md index 9a9fcd3f22..4775401204 100644 --- a/espanol/heroe/heroe.md +++ b/espanol/heroe/heroe.md @@ -17,3 +17,5 @@ El capitan miró hacia el cielo y encontró: [Una Impresionante Carrera](../carrera/carrera.md) [Chuky el muñeco diabólico](chuky/chuky.md) + +[Aventurero](aventurero/aventurero.md) \ No newline at end of file From df8955ba534ad71735d638765a6aed49b6d41461 Mon Sep 17 00:00:00 2001 From: Ivo Date: Sun, 20 Sep 2015 00:18:25 +0800 Subject: [PATCH 1031/5486] add bandaz storyline to czech/kapsy/nuz/riz --- czech/kapsy/nuz/bandaz/marsmelak.md | 6 ++++++ czech/kapsy/nuz/riz.md | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 czech/kapsy/nuz/bandaz/marsmelak.md diff --git a/czech/kapsy/nuz/bandaz/marsmelak.md b/czech/kapsy/nuz/bandaz/marsmelak.md new file mode 100644 index 0000000000..5da1ee5212 --- /dev/null +++ b/czech/kapsy/nuz/bandaz/marsmelak.md @@ -0,0 +1,6 @@ +Tak je to jasné, je to zatraceně dobrá simulace, protože kdyby to byla realita, +tak jsi už dávno omdlel z pohledu na krev. + +Teď už jen potřebuješ najít, kde se za stěnou z maršmeláku skrývá ovládací ovládací panel, +pak přečteš manuál v činštině a zazračně prolomíš administrátorské heslo a jsi vítěz.... +... a nebo by ses mohl podívat, co se skrývá za těmi otevřenými dveřmi... diff --git a/czech/kapsy/nuz/riz.md b/czech/kapsy/nuz/riz.md index 3338a90a27..3fff542585 100644 --- a/czech/kapsy/nuz/riz.md +++ b/czech/kapsy/nuz/riz.md @@ -3,3 +3,5 @@ Z rozespalosti to trochu přeženeš. Zabereš víc, než jsi měl v úmyslu a málem si uřežeš poslední článek ukazováčku. K nechutně sladkému smradu marshmelounů se připojí nasládlý pach čerstvé krve. + +["Honem chňapneš jednoho maršmeláka, uděláš v něm díru, nasadíš ho na krvácející prst a zapalovačem stmelíš"](bandaz/marsmelak.md) \ No newline at end of file From e7a751c6a525e81f8b0a1b02004beffcd85001e1 Mon Sep 17 00:00:00 2001 From: Dima Sokol Date: Sun, 20 Sep 2015 17:35:16 +0300 Subject: [PATCH 1032/5486] Fix typo --- ukrainian/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index c065ddb402..80589bbbdf 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -14,7 +14,7 @@ [Зроблю зефірну стіну в вигляді двері та вийду через неї](door/door.md) -[Відчуваючи внутрішнім голосом, що все це маячня, легти поспати ще](dream/dream.md) +[Відчуваючи внутрішнім голосом, що все це маячня, лягти поспати ще](dream/dream.md) [Сфоткаю все на телефон](photo/photo.md) From 0c95aedfc5b5e18ae84b11408b32914fdb9f837d Mon Sep 17 00:00:00 2001 From: Dima Sokol Date: Sun, 20 Sep 2015 17:42:33 +0300 Subject: [PATCH 1033/5486] Fix story break --- .../try-the-taste/continue-eating/back/break/break.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ukrainian/break-through-wall/try-the-taste/continue-eating/back/break/break.md b/ukrainian/break-through-wall/try-the-taste/continue-eating/back/break/break.md index f78e027392..054101c992 100644 --- a/ukrainian/break-through-wall/try-the-taste/continue-eating/back/break/break.md +++ b/ukrainian/break-through-wall/try-the-taste/continue-eating/back/break/break.md @@ -1,4 +1,9 @@ Відступивши декілька кроків від стіни, ви розігналися і спробували пробити стіну, але нічго не вийшло, стіна вас відштовхнула і ви упали. Наступної миті роздався гуркіт. Раптом ви побачили перед собою отвір в стіні. -Через отвір видно постать гнома. Він запрошує вас зайти до себе. \ No newline at end of file +Через отвір видно постать гнома. Він запрошує вас зайти до себе. + +Приймаєте запрошення гнома і [заходите](../whait/go-with-dwarf/go-with-dwarf.md) у діру... + +З диким ревом б'єте гнома по голові і знову намагаєтеся +[пробити стіну](../whait/break-through-wall-again/break-through-wall-again.md)... From bfae51a139a69587f586be8710c6d21d83cf9c86 Mon Sep 17 00:00:00 2001 From: Dima Sokol Date: Sun, 20 Sep 2015 17:45:28 +0300 Subject: [PATCH 1034/5486] Fix link typo --- .../try-the-taste/continue-eating/back/break/break.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ukrainian/break-through-wall/try-the-taste/continue-eating/back/break/break.md b/ukrainian/break-through-wall/try-the-taste/continue-eating/back/break/break.md index 054101c992..39accd7ea8 100644 --- a/ukrainian/break-through-wall/try-the-taste/continue-eating/back/break/break.md +++ b/ukrainian/break-through-wall/try-the-taste/continue-eating/back/break/break.md @@ -3,7 +3,7 @@ Наступної миті роздався гуркіт. Раптом ви побачили перед собою отвір в стіні. Через отвір видно постать гнома. Він запрошує вас зайти до себе. -Приймаєте запрошення гнома і [заходите](../whait/go-with-dwarf/go-with-dwarf.md) у діру... +Приймаєте запрошення гнома і [заходите](../../whait/go-with-dwarf/go-with-dwarf.md) у діру... З диким ревом б'єте гнома по голові і знову намагаєтеся -[пробити стіну](../whait/break-through-wall-again/break-through-wall-again.md)... +[пробити стіну](../../whait/break-through-wall-again/break-through-wall-again.md)... From ab2b37ce4e8c648a2e77210f4dd911961fbfd632 Mon Sep 17 00:00:00 2001 From: Dima Sokol Date: Sun, 20 Sep 2015 17:48:44 +0300 Subject: [PATCH 1035/5486] Fix typo --- .../try-the-taste/continue-eating/back/break/break.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ukrainian/break-through-wall/try-the-taste/continue-eating/back/break/break.md b/ukrainian/break-through-wall/try-the-taste/continue-eating/back/break/break.md index 39accd7ea8..52757aabb7 100644 --- a/ukrainian/break-through-wall/try-the-taste/continue-eating/back/break/break.md +++ b/ukrainian/break-through-wall/try-the-taste/continue-eating/back/break/break.md @@ -3,7 +3,7 @@ Наступної миті роздався гуркіт. Раптом ви побачили перед собою отвір в стіні. Через отвір видно постать гнома. Він запрошує вас зайти до себе. -Приймаєте запрошення гнома і [заходите](../../whait/go-with-dwarf/go-with-dwarf.md) у діру... +Приймаєте запрошення гнома і [заходите](../../wait/go-with-dwarf/go-with-dwarf.md) у діру... З диким ревом б'єте гнома по голові і знову намагаєтеся -[пробити стіну](../../whait/break-through-wall-again/break-through-wall-again.md)... +[пробити стіну](../../wait/break-through-wall-again/break-through-wall-again.md)... From 3ffc87527df463def15edecfde129a3f500740f1 Mon Sep 17 00:00:00 2001 From: Forthy999 Date: Sun, 20 Sep 2015 20:33:30 +0100 Subject: [PATCH 1036/5486] Corrected spelling of Marshmallow throughout # Please enter the commit message for your changes. Lines starting --- english/ghostbusters/ghostbusters.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/english/ghostbusters/ghostbusters.md b/english/ghostbusters/ghostbusters.md index 09cf6f1e3e..f26cb7d424 100644 --- a/english/ghostbusters/ghostbusters.md +++ b/english/ghostbusters/ghostbusters.md @@ -1,4 +1,4 @@ -You vaguely remember something from your childhood, something about marshmellows +You vaguely remember something from your childhood, something about marshmallows and a strange tune begins forming in your mind... @@ -10,19 +10,19 @@ and a strange tune begins forming in your mind... "GHOSTBUSTERS!" -You immediately look around and notice a marshmellow phone. You pick it up and dial the Ghostbusters. +You immediately look around and notice a marshmallow phone. You pick it up and dial the Ghostbusters. The air is suddenly filled with the sounds of blaring sirens as the Ghostbuster mobile -smashes through the marshmellow wall beside you barely missing you. +smashes through the marshmallow wall beside you barely missing you. -The marshmellow wall oozes down to close off the hole that the Ghostbuster mobile made +The marshmallow wall oozes down to close off the hole that the Ghostbuster mobile made as it made its entrance. Out pop the four ghostbusters from your childhood youth. Dr. Egon Spengler pulls out his doo-hickey which starts emitting a strange noise. -"I'm detecting an epic amount of paranormal activity from these marshmellow walls!" +"I'm detecting an epic amount of paranormal activity from these marshmallow walls!" Dr. Peter Venkman looks at the other 3 as they all nod to each other. @@ -30,7 +30,7 @@ All four of them pull out their proton packs and begin blasting the walls all ar with their proton streams. Pockets of sunlight and the outside world reveal themselves as the -marshmellow walls begin melting away into a puddle. +marshmallow walls begin melting away into a puddle. "This is a piece of cake compared to Mr. Stay Puff" yells Dr. Ray Stantz. From c9880eec8d8223118dac1cee2dae8c6885053c39 Mon Sep 17 00:00:00 2001 From: manavm1990 Date: Sun, 20 Sep 2015 16:11:53 -0500 Subject: [PATCH 1037/5486] Add explanation from Leo. --- english/go-back-to-sleep/dream-ception/dream-ception.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/go-back-to-sleep/dream-ception/dream-ception.md b/english/go-back-to-sleep/dream-ception/dream-ception.md index 170032763a..2df2429300 100644 --- a/english/go-back-to-sleep/dream-ception/dream-ception.md +++ b/english/go-back-to-sleep/dream-ception/dream-ception.md @@ -1,3 +1,9 @@ His hair is disarrayed, and he smells vaguely like motor oil. -"You are not safe here," he says. \ No newline at end of file +"You are not safe here," he says. + +"Why not?" I ask. + +"You've entered a parallel universe of sorts, where things are strangely similar to films, I've starred in," he answers. + +Leo continues, "Here, you're on board a marshmallow version of the *Titanic!* I've been in the engine room trying to make some adjustments to the motors..." \ No newline at end of file From 7ad0262411f751d121f61bc58284ebb3147f8cac Mon Sep 17 00:00:00 2001 From: manavm1990 Date: Sun, 20 Sep 2015 16:17:57 -0500 Subject: [PATCH 1038/5486] Fix long line issue. --- english/go-back-to-sleep/dream-ception/dream-ception.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/go-back-to-sleep/dream-ception/dream-ception.md b/english/go-back-to-sleep/dream-ception/dream-ception.md index 2df2429300..81a8afdaf8 100644 --- a/english/go-back-to-sleep/dream-ception/dream-ception.md +++ b/english/go-back-to-sleep/dream-ception/dream-ception.md @@ -6,4 +6,5 @@ His hair is disarrayed, and he smells vaguely like motor oil. "You've entered a parallel universe of sorts, where things are strangely similar to films, I've starred in," he answers. -Leo continues, "Here, you're on board a marshmallow version of the *Titanic!* I've been in the engine room trying to make some adjustments to the motors..." \ No newline at end of file +Leo continues, "Here, you're on board a marshmallow version of the *Titanic!* +I've been in the engine room trying to make some adjustments to the motors..." \ No newline at end of file From 548cdff003a3c36b58b121f4f83bcb3fd0014055 Mon Sep 17 00:00:00 2001 From: erafat Date: Sun, 20 Sep 2015 17:01:23 -0700 Subject: [PATCH 1039/5486] Add new option to the story --- english/ethical-reason/ethical-reason.md | 5 +++++ english/marshmallow.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 english/ethical-reason/ethical-reason.md diff --git a/english/ethical-reason/ethical-reason.md b/english/ethical-reason/ethical-reason.md new file mode 100644 index 0000000000..c0070d00f3 --- /dev/null +++ b/english/ethical-reason/ethical-reason.md @@ -0,0 +1,5 @@ +Ethical reasons? Seriously? + +As if using this god-knows-what term will ease the pain caused by the sense of touch. + +I'm familiar of the touch of leather, or, to be specific, the skin. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 14567fb181..cad71fef56 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -57,6 +57,8 @@ You are feeling very anxious at this point. This is because you do not like leather for ethical reasons. +[Ethical reason? Seriously?](./ethical-reason/ethical-reason.md) + You begin to break out of the jacket and find a lighter, a fork, and rope. You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. From a50bfb0712969a3bd29c9a1f22412e465f63fe50 Mon Sep 17 00:00:00 2001 From: alexander Date: Sun, 20 Sep 2015 20:09:45 -0400 Subject: [PATCH 1040/5486] Add OnceThereIsAHill --- Chinese/OnceThereIsAHill/OnceThereIsAHill.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Chinese/OnceThereIsAHill/OnceThereIsAHill.md diff --git a/Chinese/OnceThereIsAHill/OnceThereIsAHill.md b/Chinese/OnceThereIsAHill/OnceThereIsAHill.md new file mode 100644 index 0000000000..2f85e24007 --- /dev/null +++ b/Chinese/OnceThereIsAHill/OnceThereIsAHill.md @@ -0,0 +1,2 @@ +从前有座山，山里有个庙，庙里有个老和尚，给小和尚讲故事。故事讲的是：从前有座山，山里 +有个庙，庙里有个老和尚，给小和尚讲故事。故事讲的是：从前有座山，山里有个庙…… \ No newline at end of file From af016cea99e1d357fa81acc8ab89b3c06d2f091f Mon Sep 17 00:00:00 2001 From: alexander Date: Sun, 20 Sep 2015 20:19:52 -0400 Subject: [PATCH 1041/5486] =?UTF-8?q?Add=20link=20in=20=E5=A4=A7=E8=AF=9D?= =?UTF-8?q?=E8=A5=BF=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 4e5fd6068a..2026002735 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -49,3 +49,5 @@ [ɽ](heishanlaoyao/heishanlaoyao.md)? [Michael](Michael/signal.md) + +[OnceThereIsAHill](OnceThereIsAHill/OnceThereIsAHill.md) From b3fe02b1f5b67c3deef0e49b01abf49dbb83e476 Mon Sep 17 00:00:00 2001 From: Michael Reynolds Date: Sun, 20 Sep 2015 21:50:44 -0400 Subject: [PATCH 1042/5486] Add how we feel about Safeway cake --- english/eat-rainbows/right/right.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md index 466c3e1cee..f900e1c850 100644 --- a/english/eat-rainbows/right/right.md +++ b/english/eat-rainbows/right/right.md @@ -1 +1,3 @@ You turned right and slammed into another customer carrying a birthday cake. + +Ughh, cake from Safeway with lard icing! \ No newline at end of file From a2df0c94b732fcea225387f01edcd06be7d7bb52 Mon Sep 17 00:00:00 2001 From: Freddie Cox Date: Mon, 21 Sep 2015 09:40:32 -0500 Subject: [PATCH 1043/5486] Add option to play chess after coffee --- english/coffee/chess/chess.md | 3 +++ english/coffee/coffee.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 english/coffee/chess/chess.md diff --git a/english/coffee/chess/chess.md b/english/coffee/chess/chess.md new file mode 100644 index 0000000000..b72e15e0c0 --- /dev/null +++ b/english/coffee/chess/chess.md @@ -0,0 +1,3 @@ +Drinking coffee excites your brain. +You feel like a mental challenge.... +and look for a challenging chess game. \ No newline at end of file diff --git a/english/coffee/coffee.md b/english/coffee/coffee.md index ba867beab6..db044daca2 100644 --- a/english/coffee/coffee.md +++ b/english/coffee/coffee.md @@ -41,4 +41,6 @@ After having your coffee do you want to: [Go for a run?](Run/run.md) +[Play Chess?](chess/chess.md) + . From 15c83ef32f7af4178d3efb5700d03c714c4b0c4b Mon Sep 17 00:00:00 2001 From: Cristian Zamora Date: Mon, 21 Sep 2015 10:25:49 -0500 Subject: [PATCH 1044/5486] Aparece una bruja en la historia del capitan --- espanol/capitan/trueno.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/espanol/capitan/trueno.md b/espanol/capitan/trueno.md index 3c31afac43..d598dae0be 100644 --- a/espanol/capitan/trueno.md +++ b/espanol/capitan/trueno.md @@ -1 +1,5 @@ -El Capitán Trueno estaba volviendo en ese momento de su campaña en las tierras de Kirlian +El Capitán Trueno estaba volviendo en ese momento de su campaña en las tierras de Kirlian. + +En su camino de regreso se encontro con una bruja. + +[Una bruja ofrece ayuda](bruja/bruja.md) From 94410af16e3a28293e943cbd65ede518fb48ce2f Mon Sep 17 00:00:00 2001 From: Cristian Zamora Date: Mon, 21 Sep 2015 10:35:42 -0500 Subject: [PATCH 1045/5486] fix typo on link --- espanol/capitan/trueno.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/capitan/trueno.md b/espanol/capitan/trueno.md index d598dae0be..0d46dbd992 100644 --- a/espanol/capitan/trueno.md +++ b/espanol/capitan/trueno.md @@ -2,4 +2,4 @@ El Capitán Trueno estaba volviendo en ese momento de su campaña en las tierras En su camino de regreso se encontro con una bruja. -[Una bruja ofrece ayuda](bruja/bruja.md) +[Una bruja ofrece ayuda](../bruja/bruja.md) \ No newline at end of file From 0202169dfbb3affac4a0036ecca616720718f9e2 Mon Sep 17 00:00:00 2001 From: Cristian Zamora Date: Mon, 21 Sep 2015 10:39:45 -0500 Subject: [PATCH 1046/5486] remove dot at the end of line 1 --- espanol/capitan/trueno.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/capitan/trueno.md b/espanol/capitan/trueno.md index 0d46dbd992..6970133357 100644 --- a/espanol/capitan/trueno.md +++ b/espanol/capitan/trueno.md @@ -1,4 +1,4 @@ -El Capitán Trueno estaba volviendo en ese momento de su campaña en las tierras de Kirlian. +El Capitán Trueno estaba volviendo en ese momento de su campaña en las tierras de Kirlian En su camino de regreso se encontro con una bruja. From 51e7c0fafb6359cb907dc3ab0be4f9f0bec81e6b Mon Sep 17 00:00:00 2001 From: "Francisco M. Delicado" Date: Mon, 21 Sep 2015 20:12:32 +0200 Subject: [PATCH 1047/5486] =?UTF-8?q?A=C3=B1ado=20la=20historia=20del=20v?= =?UTF-8?q?=C3=B3mito?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/canudos.md | 2 ++ espanol/comida/comida.md | 4 ++++ espanol/comida/ogros/ogros.md | 5 +++++ espanol/comida/victoria/victoria.md | 3 +++ 4 files changed, 14 insertions(+) create mode 100644 espanol/comida/comida.md create mode 100644 espanol/comida/ogros/ogros.md create mode 100644 espanol/comida/victoria/victoria.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 46ec1dc38b..0a2ff8ae30 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -2,6 +2,8 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del i república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: +[Sintió como la comida le subía por el exófago](comida/comida.md) + [Mandó a congregar a Canudos entero al templo.](templo/templo.md) [Se arrodilló y se echó a rezar mientras Beatito salía por la puerta.](rezando/rezando.md) diff --git a/espanol/comida/comida.md b/espanol/comida/comida.md new file mode 100644 index 0000000000..ad5b122a57 --- /dev/null +++ b/espanol/comida/comida.md @@ -0,0 +1,4 @@ +Aguantose las náuseas, y tras enjugarse el sudor, pensó que nuevas le traería el capitán de las tropas: + +[El ejercito había vencido al enemigo](victoria/victoria.md) +[Una orda de ogros había atravesado la frontera norte](ogros/ogros.md) \ No newline at end of file diff --git a/espanol/comida/ogros/ogros.md b/espanol/comida/ogros/ogros.md new file mode 100644 index 0000000000..b521964d73 --- /dev/null +++ b/espanol/comida/ogros/ogros.md @@ -0,0 +1,5 @@ +Desencajado por el horror de lo presenciado, y por el cansancio del camino. +El capitán, saludó irreverentemente al rey, y le comunicó atropelladamente que una orda de ogros estaba +asolando el país desde el norte, y no tardarían en llegar hasta la capital del reino. + +[En ese momento una bruja apareció](../../bruja/bruja.md) \ No newline at end of file diff --git a/espanol/comida/victoria/victoria.md b/espanol/comida/victoria/victoria.md new file mode 100644 index 0000000000..1e49c676df --- /dev/null +++ b/espanol/comida/victoria/victoria.md @@ -0,0 +1,3 @@ +El capitán tras presentarse anter el rey, y mostrar su respeto con una gran reverencia. + +Le comunicó que su ejército había ganado la batalla decisiva contra el país vecino. \ No newline at end of file From c301ca7576f0f011b642ddb1ded410f6f8cab4b0 Mon Sep 17 00:00:00 2001 From: "Francisco M. Delicado" Date: Mon, 21 Sep 2015 20:19:24 +0200 Subject: [PATCH 1048/5486] Insert blank lines between links --- espanol/comida/comida.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/comida/comida.md b/espanol/comida/comida.md index ad5b122a57..ef338f7f41 100644 --- a/espanol/comida/comida.md +++ b/espanol/comida/comida.md @@ -1,4 +1,5 @@ Aguantose las náuseas, y tras enjugarse el sudor, pensó que nuevas le traería el capitán de las tropas: [El ejercito había vencido al enemigo](victoria/victoria.md) + [Una orda de ogros había atravesado la frontera norte](ogros/ogros.md) \ No newline at end of file From b9fcc8f5c50556f38c74c092dd661c2b99713239 Mon Sep 17 00:00:00 2001 From: Brody Date: Mon, 21 Sep 2015 12:18:05 -0700 Subject: [PATCH 1049/5486] Add a sentence to say that not going to dentist for root canal actually saves hundreds of bucks --- english/bite-the-marshmallow/tasty-marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index 2039ae417a..50a9b5802b 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -7,7 +7,7 @@ thought marshmallows, so white, so innocent, could cause such excruciating pain! But come to think of it, you've never gone to the dentist about that root canal he recommended almost a year ago, and perhaps you should have gone back instead of -trying to save a few bucks... +trying to save a few bucks...(hundreds of bucks actually!) Wait a minute....how did you end up in this car? You must be hallucinating From 53cad542b03f6b8da6c25fb4ee65c5e56f83c74c Mon Sep 17 00:00:00 2001 From: Brody Date: Mon, 21 Sep 2015 12:48:59 -0700 Subject: [PATCH 1050/5486] Move the adding sentence to a new line --- english/bite-the-marshmallow/tasty-marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index 50a9b5802b..8eb9001461 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -7,7 +7,9 @@ thought marshmallows, so white, so innocent, could cause such excruciating pain! But come to think of it, you've never gone to the dentist about that root canal he recommended almost a year ago, and perhaps you should have gone back instead of -trying to save a few bucks...(hundreds of bucks actually!) +trying to save a few bucks... + +hundreds of bucks actually! Wait a minute....how did you end up in this car? You must be hallucinating From 5836c1a1663d55fc2e5ec63d25f0527194eb67ae Mon Sep 17 00:00:00 2001 From: Joseph McMurry Date: Mon, 21 Sep 2015 15:19:57 -0500 Subject: [PATCH 1051/5486] add joke --- english/android-v6/use-android-v6.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/android-v6/use-android-v6.md b/english/android-v6/use-android-v6.md index fe2c08fb39..2b439e8ded 100644 --- a/english/android-v6/use-android-v6.md +++ b/english/android-v6/use-android-v6.md @@ -16,3 +16,5 @@ The image changes and a border is now clear. A 3D green droid figure displays with V6.0 stamped on its metallic chest. In its arms is a single marshmallow. + +The green droid figure bows down to a silvery apple. \ No newline at end of file From e001edef3c0b77b30d686c392d97f178ec0896a2 Mon Sep 17 00:00:00 2001 From: Maurice A Date: Mon, 21 Sep 2015 21:26:38 -0600 Subject: [PATCH 1052/5486] add new story option appelle-genie --- french/appelle-genie/appelle-genie.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 french/appelle-genie/appelle-genie.md diff --git a/french/appelle-genie/appelle-genie.md b/french/appelle-genie/appelle-genie.md new file mode 100644 index 0000000000..061b548ce9 --- /dev/null +++ b/french/appelle-genie/appelle-genie.md @@ -0,0 +1,7 @@ +Vous sortez votre lampe magique que vous aviez oublié +dans votre poche et invoquez le génie de la lampe. +Il vous rappelle que vous avez déja exaucer vos trois souhaits +et retourne dans sa lampe +vous laissant desesperé et rempli de desespoir. + +[Je reconsidère mes options une fois de plus](../feu-de-camp.md) \ No newline at end of file From 6d5650f04d9c40bf45860feb5fda1f17634b32f5 Mon Sep 17 00:00:00 2001 From: "Maurice A." Date: Mon, 21 Sep 2015 21:49:06 -0600 Subject: [PATCH 1053/5486] Add new link to story Links to story option appelle-genie --- french/feu-de-camp.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 5e909609c1..5160a2054d 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -1,6 +1,6 @@ -Par un beau matin, vous vous rveillez dans une pice trange aux murs en pain d'pice. +Par un beau matin, vous vous réveillez dans une pièce étrange aux murs en pain d'épice. -On aurait p faire que les murs soient fait en pte de guimave, mais ce sont des murs franais. ;) +On aurait pû faire que les murs soient fait en pâte de guimave, mais ce sont des murs français. ;) Que faites-vous ? @@ -18,10 +18,12 @@ Que faites-vous ? [J'appelle mon prof de musique](telephone/prof_musique.md) -[Je dessine une porte avec un syphon de crme chantilly qui traine](dessine/porte.md) +[Je dessine une porte avec un syphon de crème chantilly qui traine](dessine/porte.md) [Je ne parle pas francais](../english/marshmallow.md) -[J'appelle ma mre immdiatement](appel-maman/appeler-maman.md) +[J'appelle ma mère immédiatement](appel-maman/appeler-maman.md) -[Je demande de l'aide a Google](google/google.md) \ No newline at end of file +[Je demande de l'aide a Google](google/google.md) + +[J'appelle le genie](appelle-genie/appelle-genie.md) From 313710cba41dfbb7aa9fb45a0e7675e977d543d5 Mon Sep 17 00:00:00 2001 From: adai183 Date: Tue, 22 Sep 2015 13:14:32 +0200 Subject: [PATCH 1054/5486] Verwandelt sich in einen Frosch --- german/Hilfeschrei/Vertrauen/insMaul/reinhauen/reinhauen.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Hilfeschrei/Vertrauen/insMaul/reinhauen/reinhauen.md b/german/Hilfeschrei/Vertrauen/insMaul/reinhauen/reinhauen.md index 06ebf45efe..9877b5534d 100644 --- a/german/Hilfeschrei/Vertrauen/insMaul/reinhauen/reinhauen.md +++ b/german/Hilfeschrei/Vertrauen/insMaul/reinhauen/reinhauen.md @@ -1 +1,3 @@ -Der Kobold ist für einen Moment etwas irritiert, tut aber keinen Wank und dann... \ No newline at end of file +Der Kobold ist für einen Moment etwas irritiert, tut aber keinen Wank und dann... + +und verwandelt sich in einen Frosch. \ No newline at end of file From 03c31a53d163fd6825b55de524ec413119e38373 Mon Sep 17 00:00:00 2001 From: Xalemg Date: Tue, 22 Sep 2015 18:37:25 +0200 Subject: [PATCH 1055/5486] Update asustado.md --- espanol/torre/alarma/asustado/asustado.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/alarma/asustado/asustado.md b/espanol/torre/alarma/asustado/asustado.md index 4e33bc5289..5c44b508f6 100644 --- a/espanol/torre/alarma/asustado/asustado.md +++ b/espanol/torre/alarma/asustado/asustado.md @@ -1 +1 @@ -Empezando un escándalo, entonces el consejero fue corriendo hacia donde estaba el alcalde del pueblo. \ No newline at end of file +Empezando un escándalo, entonces el consejero fue corriendo hacia donde estaba el alcalde del pueblo. Y aprovechado la confusión del pueblo saco una daga y le apuñalo en el corazon. From 13f44322f483c7b75560a22a2f8f32211ecee67e Mon Sep 17 00:00:00 2001 From: Xalemg Date: Tue, 22 Sep 2015 18:39:05 +0200 Subject: [PATCH 1056/5486] Update asustado.md --- espanol/torre/alarma/asustado/asustado.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/torre/alarma/asustado/asustado.md b/espanol/torre/alarma/asustado/asustado.md index 5c44b508f6..fa3b5703d2 100644 --- a/espanol/torre/alarma/asustado/asustado.md +++ b/espanol/torre/alarma/asustado/asustado.md @@ -1 +1,2 @@ -Empezando un escándalo, entonces el consejero fue corriendo hacia donde estaba el alcalde del pueblo. Y aprovechado la confusión del pueblo saco una daga y le apuñalo en el corazon. +Empezando un escándalo, entonces el consejero fue corriendo hacia donde estaba el alcalde del pueblo. +Y aprovechado la confusión del pueblo saco una daga y le apuñalo en el corazon. From e2438590e525c14093014578fe43e1267156b506 Mon Sep 17 00:00:00 2001 From: Daniel Long Date: Tue, 22 Sep 2015 21:28:37 +0100 Subject: [PATCH 1057/5486] Add new option --- english/bake-cookies/cookies.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/bake-cookies/cookies.md b/english/bake-cookies/cookies.md index 146eea0d93..078715b5e6 100644 --- a/english/bake-cookies/cookies.md +++ b/english/bake-cookies/cookies.md @@ -17,4 +17,6 @@ Do you: [Breathe?](../yoga/breathe/breathe.md) -[Want to get high?](../weed/weed.md) \ No newline at end of file +[Want to get high?](../weed/weed.md) + +[Call a doctor?](../call-a-doctor/doctor.md) From ed524dc265b147ba2b713060d1a7ee6f572ef340 Mon Sep 17 00:00:00 2001 From: Austin Jones Date: Tue, 22 Sep 2015 19:47:15 -0600 Subject: [PATCH 1058/5486] add marshmallow watching F-Troop --- english/watch-movie/Up.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/watch-movie/Up.md b/english/watch-movie/Up.md index b43eb51a46..b316d9fe99 100644 --- a/english/watch-movie/Up.md +++ b/english/watch-movie/Up.md @@ -1 +1,2 @@ -You decided to asked the marshmallow to watch your favourite movie Up with you. \ No newline at end of file +You decided to asked the marshmallow to watch your favourite movie Up with you. +Halfway through the movie, the marshmallow walks out. You change the TV to F-Troop and it comes back in and sits down. Turns out it loves Agarn! \ No newline at end of file From 73e5c862ca31abac626dfb46a337929c0a03bd64 Mon Sep 17 00:00:00 2001 From: Austin Jones Date: Tue, 22 Sep 2015 19:59:37 -0600 Subject: [PATCH 1059/5486] fix line over 120 characters --- english/watch-movie/Up.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/watch-movie/Up.md b/english/watch-movie/Up.md index b316d9fe99..3b0ab9789e 100644 --- a/english/watch-movie/Up.md +++ b/english/watch-movie/Up.md @@ -1,2 +1,4 @@ You decided to asked the marshmallow to watch your favourite movie Up with you. -Halfway through the movie, the marshmallow walks out. You change the TV to F-Troop and it comes back in and sits down. Turns out it loves Agarn! \ No newline at end of file +Halfway through the movie, the marshmallow walks out. +You change the TV to F-Troop and it comes back in and sits down. +Turns out it loves Agarn! \ No newline at end of file From f77a927c26361c6afea8b22888adf202e6fdd072 Mon Sep 17 00:00:00 2001 From: Craig Hollinshead Date: Tue, 22 Sep 2015 22:32:27 -0400 Subject: [PATCH 1060/5486] add Vegas storyline. --- english/vegas/fear-loathing-las-vegas.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 english/vegas/fear-loathing-las-vegas.md diff --git a/english/vegas/fear-loathing-las-vegas.md b/english/vegas/fear-loathing-las-vegas.md new file mode 100644 index 0000000000..b2076ca91b --- /dev/null +++ b/english/vegas/fear-loathing-las-vegas.md @@ -0,0 +1,15 @@ +Strange memories on this nervous night in Las Vegas. Five years later? Six? It seems like a lifetime, +or at least a Main Era -- the kind of peak that never comes again. + +There was madness in any direction, There was a fantastic universal sense that whatever we were doing was +right, that we were winning. + +No, this is not a good town for psychedelic drugs. Reality itself is too twisted. + +No sympathy for the devil; keep that in mind. Buy the ticket, take the ride...and if it occasionally gets +a little heavier than what you had in mind, well...maybe chalk it off to forced conscious expansion: Tune +in, freak out, get beaten. + +Too weird to live, too rare to die! + +[Leaving Las Vegas] (../marshmallow.md) \ No newline at end of file From acfbbfa917dbe63cc18f99c88eba8e85307c48e2 Mon Sep 17 00:00:00 2001 From: Craig Hollinshead Date: Tue, 22 Sep 2015 22:34:03 -0400 Subject: [PATCH 1061/5486] Add Vegas storyline link. --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index cad71fef56..ac7fc52ace 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -500,3 +500,5 @@ Click [here](young/young.md) to listen to music. [Story of DKER](DKER/DKER.md) If you eat a lot, you should also [exercise](exercise/exercise.md) + +[Buy a first-class ticket and fly to Las Vegas NV, because what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) From 885400fa7d72b82cbfcc92462be1b2230747d167 Mon Sep 17 00:00:00 2001 From: cholli2 Date: Tue, 22 Sep 2015 22:56:34 -0400 Subject: [PATCH 1062/5486] Update marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index ac7fc52ace..001f059189 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -501,4 +501,4 @@ Click [here](young/young.md) to listen to music. If you eat a lot, you should also [exercise](exercise/exercise.md) -[Buy a first-class ticket and fly to Las Vegas NV, because what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) +[Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) From 7400ee822e0ec42cb0b02eb8c51ea1c6f3713081 Mon Sep 17 00:00:00 2001 From: Craig Hollinshead Date: Tue, 22 Sep 2015 23:04:38 -0400 Subject: [PATCH 1063/5486] Reduce line length. --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index ac7fc52ace..001f059189 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -501,4 +501,4 @@ Click [here](young/young.md) to listen to music. If you eat a lot, you should also [exercise](exercise/exercise.md) -[Buy a first-class ticket and fly to Las Vegas NV, because what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) +[Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) From 398ccb5a17668793067b63afa6829fffff96ec24 Mon Sep 17 00:00:00 2001 From: Jason Polubinsky Date: Tue, 22 Sep 2015 23:33:36 -0400 Subject: [PATCH 1064/5486] docs: Add "Consider unsubscribing from r/awww" line --- english/reddit/ask-reddit.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/reddit/ask-reddit.md b/english/reddit/ask-reddit.md index e5f9c69065..aca8fdbf41 100644 --- a/english/reddit/ask-reddit.md +++ b/english/reddit/ask-reddit.md @@ -16,6 +16,8 @@ Oh look..[a kitten laying in marshmallows in r/awww](http://i.imgur.com/NXmEI.jp Oh look, a cute puppy... +Consider unsubscribing from r/awww... + And that, my friends, is how I spent the last week. But finally i stumbled upon [r/outside](outside_subreddit/r_outside.md) From 9e2e06195d9adb7133092a96d7709ff9e755e3dd Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 23 Sep 2015 11:00:14 +0530 Subject: [PATCH 1065/5486] Add chai/marshmallow-masala-chai.md --- english/chai/make-marshmallow-masala-chai.md | 10 ++++++++++ english/marshmallow.md | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 english/chai/make-marshmallow-masala-chai.md diff --git a/english/chai/make-marshmallow-masala-chai.md b/english/chai/make-marshmallow-masala-chai.md new file mode 100644 index 0000000000..dcfcc0e8f9 --- /dev/null +++ b/english/chai/make-marshmallow-masala-chai.md @@ -0,0 +1,10 @@ +The marshmallow has terrorized you so much that it has become a part of you now. +It takes a thorn to remove a thorn. And you decide to make marshmallow masala chai. +Take half a cup of water. Bring it to boil. Add one and a half teaspoon of Taj mahal tea powder. +(Ahmed tea if you can find it). +Add 1 green cardamom, 1 clove, half an inch of ginger and half an inch of cinnamon stick. Let it boil for 2 minutes. +Add half a cup of milk and let it boil. And now to the best part. Add the marshmallow to the boiling hot tea. +Rejoice as the marshmallow melts. Stir it into the tea and watch it disintegrate. +Sieve the tea into a cup and drink it hot. +The tea is done. SDo is the marshmallow. +[Get back now.] (../marshmallow.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 001f059189..8d45428664 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -502,3 +502,5 @@ Click [here](young/young.md) to listen to music. If you eat a lot, you should also [exercise](exercise/exercise.md) [Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) + +[Make marshmallow masala chai](chai/marshmallow-masala-chai.md) \ No newline at end of file From 557bdd4c67fdab430c236d0e0582edecdbdae6cf Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 23 Sep 2015 11:14:07 +0530 Subject: [PATCH 1066/5486] Fix the link to make-marshmallow-masala-chai.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 8d45428664..f6f1355485 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -503,4 +503,4 @@ If you eat a lot, you should also [exercise](exercise/exercise.md) [Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) -[Make marshmallow masala chai](chai/marshmallow-masala-chai.md) \ No newline at end of file +[Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) \ No newline at end of file From 6a699e79807678d06cae086cd2213a5c5acb56d1 Mon Sep 17 00:00:00 2001 From: ABM Ruman Date: Wed, 23 Sep 2015 20:14:26 +0600 Subject: [PATCH 1067/5486] Add new link to marshmallow.md Necessary directory and files with contents. --- english/in-matrix/matrix.md | 7 +++++++ english/marshmallow.md | 2 ++ 2 files changed, 9 insertions(+) create mode 100644 english/in-matrix/matrix.md diff --git a/english/in-matrix/matrix.md b/english/in-matrix/matrix.md new file mode 100644 index 0000000000..7d80c34d02 --- /dev/null +++ b/english/in-matrix/matrix.md @@ -0,0 +1,7 @@ +You suddenly realize that everything looks greener than usual. + +You start to think why is everything so much greener than it used to be. + +Then you finally jump to the obvious conclusion that you are in the matrix ... + +And the world you once knew, now no longer exists. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index f6f1355485..a41bff4f2b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -145,6 +145,8 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: +[Realize you are in the ...](in-matrix/matrix.md) + [Turn off all the lights](lightsoff/lightsoff.md) [Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) From f43bb243e56d4c626d56425025bdec9150636591 Mon Sep 17 00:00:00 2001 From: chynes Date: Wed, 23 Sep 2015 11:30:04 -0400 Subject: [PATCH 1068/5486] add extra story to marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index f6f1355485..4bc78c767e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -16,6 +16,8 @@ Thinking back, there are no memories to suggest that this should have been anything but an ordinary morning. You didn't go out last night, you don't usually take intoxicants, what's happening...? +Maybe this is a dream? + But it's probably not worth dwelling on that right now, you could be in danger. Grave danger. Oh No! From 7e32225d97727fdbecea6dad4ae9472b05eb10d6 Mon Sep 17 00:00:00 2001 From: Kevin Frutiger Date: Wed, 23 Sep 2015 15:26:56 -0700 Subject: [PATCH 1069/5486] Add 'have a cup of coffee' link to ride.md --- english/enjoy-DreamRide/ride.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/enjoy-DreamRide/ride.md b/english/enjoy-DreamRide/ride.md index 7ee57dec2e..1450d33c3a 100644 --- a/english/enjoy-DreamRide/ride.md +++ b/english/enjoy-DreamRide/ride.md @@ -12,4 +12,6 @@ Do you: [sleep](../sleep/marshmallow.md) -[jump off the swing](jump-off/jump.md) \ No newline at end of file +[jump off the swing](jump-off/jump.md) + +[have a cup of coffee?] (../coffee/coffee.md) \ No newline at end of file From a8862b8a82d44005b089b4a474f72e2340adce94 Mon Sep 17 00:00:00 2001 From: NidAd1 Date: Wed, 23 Sep 2015 19:39:40 -0700 Subject: [PATCH 1070/5486] Add option to procrastinate after having coffee --- english/coffee/coffee.md | 1 + english/coffee/procrastinate/procrastinate.md | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 english/coffee/procrastinate/procrastinate.md diff --git a/english/coffee/coffee.md b/english/coffee/coffee.md index ba867beab6..a4a67ecd5a 100644 --- a/english/coffee/coffee.md +++ b/english/coffee/coffee.md @@ -41,4 +41,5 @@ After having your coffee do you want to: [Go for a run?](Run/run.md) +[Procrastinate?](procrastinate/procrastinate.md) . diff --git a/english/coffee/procrastinate/procrastinate.md b/english/coffee/procrastinate/procrastinate.md new file mode 100644 index 0000000000..bc40ee1aef --- /dev/null +++ b/english/coffee/procrastinate/procrastinate.md @@ -0,0 +1,5 @@ +As you sit there and sip your coffee pondering over this huge marshmallow problem which is staring right at your face, +you strike upon a golden idea! Why hadn't you thought of this before? +Procrastinate!! Well, That seems to work every time you want to avoid a problem. +You flip out your phone and tap on that little twitter icon and voila! +Problems just disappear and you are in a whole new world! \ No newline at end of file From f3ef38ad98351b4bc56149fddde34c18f7ddf2df Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 23 Sep 2015 22:25:21 -0500 Subject: [PATCH 1071/5486] Add a sentence --- english/netflix/netflix.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/netflix/netflix.md b/english/netflix/netflix.md index 04de1b031a..898e831304 100644 --- a/english/netflix/netflix.md +++ b/english/netflix/netflix.md @@ -17,3 +17,5 @@ Watch the Passion of the Christ instead Until you realised you hate Mel Gibson So instead watch Breaking Bad for the 12th time. + +Couldn't finish it, where are the new movies, netflix?! \ No newline at end of file From cc7f9ec02c3cdf04d99e8c952d2a03e7327dec25 Mon Sep 17 00:00:00 2001 From: Torchid Date: Wed, 23 Sep 2015 21:31:14 -0600 Subject: [PATCH 1072/5486] Add dialog to imagination land --- english/my-story/my-story.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/my-story/my-story.md b/english/my-story/my-story.md index 53559db0df..20941d020f 100644 --- a/english/my-story/my-story.md +++ b/english/my-story/my-story.md @@ -1,2 +1,4 @@ *BOOM* You've been transported to Imagination Land. You're surrounded by all your favorite cartoon characters. -One of them comes up to you and asks... \ No newline at end of file +One of them comes up to you and asks... + +"Where did you hide the princess?! And what's with the stupid disguise, ICE KING!!" \ No newline at end of file From e8557ef447060542c6af604884a5ee5aae5667b7 Mon Sep 17 00:00:00 2001 From: Ehlers Date: Wed, 23 Sep 2015 21:01:58 -0700 Subject: [PATCH 1073/5486] Added line to laugh out loud --- english/make-friends/lol/laugh-out-loud.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/make-friends/lol/laugh-out-loud.md b/english/make-friends/lol/laugh-out-loud.md index bd3e0b1607..2a5f5db998 100644 --- a/english/make-friends/lol/laugh-out-loud.md +++ b/english/make-friends/lol/laugh-out-loud.md @@ -1,6 +1,8 @@ You laugh out loud, realizing that the Marshmallow Man was nothing to fear. +The Marshmallow man is actually quite friendly. + You reach out and shake his hand, saying, "It's a shame you don't have opposable thumbs! We won't be able to play thumb wars!" -He chuckles and hands you the lighter, which you help him to light. \ No newline at end of file +He chuckles and hands you the lighter, which you help him to light. From 2e6bc51f6df88568a793b902e6e8012acfa4e205 Mon Sep 17 00:00:00 2001 From: Sellen Date: Thu, 24 Sep 2015 16:17:28 +0200 Subject: [PATCH 1074/5486] few new sentences --- czech/druhy_bok/spanek.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/czech/druhy_bok/spanek.md b/czech/druhy_bok/spanek.md index dccfb6b01e..c42d971d81 100644 --- a/czech/druhy_bok/spanek.md +++ b/czech/druhy_bok/spanek.md @@ -1,3 +1,6 @@ Spíš, ale ve spánku si uvědomuješ sama sebe. Divné. Dokážeš ovlivnit své myšlenky. Co uděláš? Spoustu lidí chce létat a ve spánku, pokud jsme si vědomi sami sebe, můžeme. Existuje -i odborný termín - anglicky lucid dreaming. \ No newline at end of file +i odborný termín - anglicky lucid dreaming. +Jsi v oblacích. Všude okolo tebe jsou bílé mraky co vypadají jak cukrová vata a ty nad nimi letíš. +Mraky jsou krásné, ale tebe zajímá kde to vlastně jsi a tak zamíříš pozvolna dolů. Prolétáš bílou mlhou +a před tebou se začíná objevovat krajina. From 333d698be0af9c4d6a633edf4f365f0078dfa8d2 Mon Sep 17 00:00:00 2001 From: Sellen Date: Thu, 24 Sep 2015 16:37:17 +0200 Subject: [PATCH 1075/5486] few dots at the end --- czech/druhy_bok/spanek.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/czech/druhy_bok/spanek.md b/czech/druhy_bok/spanek.md index c42d971d81..db483182a6 100644 --- a/czech/druhy_bok/spanek.md +++ b/czech/druhy_bok/spanek.md @@ -3,4 +3,4 @@ Spoustu lidí chce létat a ve spánku, pokud jsme si vědomi sami sebe, můžem i odborný termín - anglicky lucid dreaming. Jsi v oblacích. Všude okolo tebe jsou bílé mraky co vypadají jak cukrová vata a ty nad nimi letíš. Mraky jsou krásné, ale tebe zajímá kde to vlastně jsi a tak zamíříš pozvolna dolů. Prolétáš bílou mlhou -a před tebou se začíná objevovat krajina. +a před tebou se začíná objevovat krajina... From 1ab43486550352efe15607f8b72a36f5e5f94c5f Mon Sep 17 00:00:00 2001 From: Sellen Date: Thu, 24 Sep 2015 17:07:59 +0200 Subject: [PATCH 1076/5486] revent spanek and add few lines in roztocit Please review this, @casey-collab --- czech/druhy_bok/spanek.md | 5 +---- czech/kapsy/mince/roztocit.md | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/czech/druhy_bok/spanek.md b/czech/druhy_bok/spanek.md index db483182a6..dccfb6b01e 100644 --- a/czech/druhy_bok/spanek.md +++ b/czech/druhy_bok/spanek.md @@ -1,6 +1,3 @@ Spíš, ale ve spánku si uvědomuješ sama sebe. Divné. Dokážeš ovlivnit své myšlenky. Co uděláš? Spoustu lidí chce létat a ve spánku, pokud jsme si vědomi sami sebe, můžeme. Existuje -i odborný termín - anglicky lucid dreaming. -Jsi v oblacích. Všude okolo tebe jsou bílé mraky co vypadají jak cukrová vata a ty nad nimi letíš. -Mraky jsou krásné, ale tebe zajímá kde to vlastně jsi a tak zamíříš pozvolna dolů. Prolétáš bílou mlhou -a před tebou se začíná objevovat krajina... +i odborný termín - anglicky lucid dreaming. \ No newline at end of file diff --git a/czech/kapsy/mince/roztocit.md b/czech/kapsy/mince/roztocit.md index b9fc7079f2..0ab14f9adf 100644 --- a/czech/kapsy/mince/roztocit.md +++ b/czech/kapsy/mince/roztocit.md @@ -4,3 +4,5 @@ Na zemi roztočíš šestikorunu. Ta se točí, točí, točí ... Až se zastaví o kousek maršmelounu, který se odlepil od stropu podivné místnosti. +Když chceš zjistit zda padl rub nebo líc s překvapením zjistíš, že to nebyla normální +šestikoruna, ale na lícní straně je vyryta podobizna šklebícího se ďábla. From 695180f275dbf04fc8ba38af13b0203451784bea Mon Sep 17 00:00:00 2001 From: Falk Pearl Date: Thu, 24 Sep 2015 18:07:07 +0200 Subject: [PATCH 1077/5486] Add do not care option --- .../find-a-toilet/door/alien/dont-care/dont-care.md | 5 +++++ english/eating-walls/find-a-toilet/door/alien/use-torch.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 english/eating-walls/find-a-toilet/door/alien/dont-care/dont-care.md diff --git a/english/eating-walls/find-a-toilet/door/alien/dont-care/dont-care.md b/english/eating-walls/find-a-toilet/door/alien/dont-care/dont-care.md new file mode 100644 index 0000000000..25f5d0858c --- /dev/null +++ b/english/eating-walls/find-a-toilet/door/alien/dont-care/dont-care.md @@ -0,0 +1,5 @@ +The alien gets angry with you +and his eyes have just started getting red. +You see that his eyes are the laser ones. + +(You still don't care and you're teleported again)[../../../../../marshmallow.md] diff --git a/english/eating-walls/find-a-toilet/door/alien/use-torch.md b/english/eating-walls/find-a-toilet/door/alien/use-torch.md index 8026ed7079..3b37a70f6a 100644 --- a/english/eating-walls/find-a-toilet/door/alien/use-torch.md +++ b/english/eating-walls/find-a-toilet/door/alien/use-torch.md @@ -16,3 +16,5 @@ have a ticket with a placed bet for Toronto to win or Atlanta to win. [Choose the Atlanta ticket](../../find-a-toilet.md) [Choose the Toronto ticket](../../../../private-party-island/island.md) + +[You don't care about the offer of the alien and just enjoy the show](dont-care/dont-care.md) From a58d342a74821df8543ec3bf72f5c64843045c2c Mon Sep 17 00:00:00 2001 From: Falk Pearl Date: Thu, 24 Sep 2015 18:13:41 +0200 Subject: [PATCH 1078/5486] fix link --- .../find-a-toilet/door/alien/dont-care/dont-care.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/eating-walls/find-a-toilet/door/alien/dont-care/dont-care.md b/english/eating-walls/find-a-toilet/door/alien/dont-care/dont-care.md index 25f5d0858c..cc25ac5e10 100644 --- a/english/eating-walls/find-a-toilet/door/alien/dont-care/dont-care.md +++ b/english/eating-walls/find-a-toilet/door/alien/dont-care/dont-care.md @@ -2,4 +2,4 @@ The alien gets angry with you and his eyes have just started getting red. You see that his eyes are the laser ones. -(You still don't care and you're teleported again)[../../../../../marshmallow.md] +[You still don't care and you're teleported again](../../../../../marshmallow.md) From 6e77f45ce3852193a6d411a43fbb463fb5a3e856 Mon Sep 17 00:00:00 2001 From: Jonathon Tait Date: Thu, 24 Sep 2015 22:24:13 +0100 Subject: [PATCH 1079/5486] update existing text --- english/impossible-girl/impossible.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/impossible-girl/impossible.md b/english/impossible-girl/impossible.md index d3d558cd1e..e56ac9366d 100644 --- a/english/impossible-girl/impossible.md +++ b/english/impossible-girl/impossible.md @@ -1,3 +1,5 @@ You return to the marshmallow realm and begin to search for Clara. -Suddenly, your blood runs cold as you hear a familiar mechanical voice greet you. "Exterminate!" \ No newline at end of file +Suddenly, your blood runs cold as you hear a familiar mechanical voice greet you. "Exterminate!" + +You turn around and see a Dalek From c5309f5c847962735268ac3e37e48ab5f77e1916 Mon Sep 17 00:00:00 2001 From: kkas Date: Fri, 25 Sep 2015 11:25:59 +0900 Subject: [PATCH 1080/5486] Add plastic iPhone option to beanus --- japanese/beanus/beanus.md | 4 +++- japanese/smartphone/iphone-plastic.md | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 japanese/smartphone/iphone-plastic.md diff --git a/japanese/beanus/beanus.md b/japanese/beanus/beanus.md index ef0c6a0666..9ac29205ab 100644 --- a/japanese/beanus/beanus.md +++ b/japanese/beanus/beanus.md @@ -1,4 +1,6 @@ 川の音を頼りに、森の中にぐんぐん分け入ってと、綺麗な泉を見つけたあなた。 急に喉が渇き、夢中で泉の水を飲んでいると、ポケットの中のスマホが泉に落ちてしまった。 あまりのできごとに茫然としていると、泉の中から女神さまが現れた。 -お前が落としたのは、 \ No newline at end of file +お前が落としたのは、 + +この[プラスチック製のiPhoneか?](../smartphone/iphone-plastic.md) diff --git a/japanese/smartphone/iphone-plastic.md b/japanese/smartphone/iphone-plastic.md new file mode 100644 index 0000000000..2a73392001 --- /dev/null +++ b/japanese/smartphone/iphone-plastic.md @@ -0,0 +1,9 @@ +「嘘はいけませんよ。これは、私がAmazonで注文した３Ｄプリンターで、昨晩作ったものです。 +どうしてそれをあなたが落とすことができるのでしょう？」 + +と女神は言いました。そして、続けざまに + +「そんな嘘つきのあなたにはお仕置きが必要ですね。 +ただし、あたなはイケメンなので、特別にお仕置きを選ばせてあげましょう。」 + +さて、あなたが選んだお仕置きは： From 1eaeb256812273ede9c3f34abb21a82e105ee655 Mon Sep 17 00:00:00 2001 From: stepsame Date: Fri, 25 Sep 2015 11:14:50 +0800 Subject: [PATCH 1081/5486] add a line in CrazyStone.md --- Chinese/CrazyStone/CrazyStone.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Chinese/CrazyStone/CrazyStone.md b/Chinese/CrazyStone/CrazyStone.md index 418d8f31b4..87cb96d364 100644 --- a/Chinese/CrazyStone/CrazyStone.md +++ b/Chinese/CrazyStone/CrazyStone.md @@ -5,4 +5,5 @@ 相见恨晚，大排档喝到半夜。第二天早上6点麦克被广场舞震醒，发现自己一个人躺在床上。 迈克起来伸了个懒腰，正要好好欣赏一下跳广场舞大妈们的优雅身姿，听见有人叫自己的名字， 原来是昨天碰到的小贼，手里拿着两套夹饼果子。麦克毫不客气的结果其中一套，与小贼一起大快朵颐。 -突然，麦克眼前一黑，昏死了过去。 \ No newline at end of file +突然，麦克眼前一黑，昏死了过去。 +“防守！防守！”麦克被喊叫声惊醒，发现自己正躺在医院里，旁边坐着两名警察，正用手机看着什么比赛，好像是篮球。 \ No newline at end of file From 097068b4e6cb21ac25c0737be7795a0b8e9d4ff8 Mon Sep 17 00:00:00 2001 From: "David R. Chapman" Date: Thu, 24 Sep 2015 21:57:16 -0700 Subject: [PATCH 1082/5486] Fix spelling of smores to s'mores. --- english/smores/smores.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/smores/smores.md b/english/smores/smores.md index bb1dfe1a79..ffe704f593 100644 --- a/english/smores/smores.md +++ b/english/smores/smores.md @@ -1,3 +1,3 @@ -You try to make smores! Too bad you don't have any chocolate... +You try to make s'mores! Too bad you don't have any chocolate... ...but you do have stroopwafels! This will be a huge sugar hit. -Now, what is the perfect ratio of marshmallow to stroopwafel? \ No newline at end of file +Now, what is the perfect ratio of marshmallow to stroopwafel? From 610a668b660d8ce5ec2ea82e3f00863e92472b04 Mon Sep 17 00:00:00 2001 From: Suhas <5891srp@gmail.com> Date: Fri, 25 Sep 2015 12:26:06 +0530 Subject: [PATCH 1083/5486] Long for more adventure. --- .../pull_request/cooper-station/cooper-station.md | 5 +++++ .../create_fork/pull_request/success.md | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 english/make_changes_GitHub/create_fork/pull_request/cooper-station/cooper-station.md diff --git a/english/make_changes_GitHub/create_fork/pull_request/cooper-station/cooper-station.md b/english/make_changes_GitHub/create_fork/pull_request/cooper-station/cooper-station.md new file mode 100644 index 0000000000..49379b8b8d --- /dev/null +++ b/english/make_changes_GitHub/create_fork/pull_request/cooper-station/cooper-station.md @@ -0,0 +1,5 @@ +You open up your fork again. Make a change to be transported to the Cooper Station 150 years from now. You pray for it +to exist by then. You don't want to be floating in space around Saturn without oxygen. You make that pull request. +Wait for it to be merged. + +Lo and behold! It was all real. Cooper station really exists! diff --git a/english/make_changes_GitHub/create_fork/pull_request/success.md b/english/make_changes_GitHub/create_fork/pull_request/success.md index be66524bc4..949d04ec12 100644 --- a/english/make_changes_GitHub/create_fork/pull_request/success.md +++ b/english/make_changes_GitHub/create_fork/pull_request/success.md @@ -10,7 +10,13 @@ eyes to see that you are back in your room. You immediately run into your bathroom and had the greatest pee session ever. Everything was alright in the world. +Thank goodness for GitHub! +But wait, you're an elite software engineer. The comforts of your home don't keep you entertained for long. You're +bored. You start thinking of the marshmallow adventure again. You long for that adrenaline rush and using your +skills to get out of trouble. You look for the wormhole. It's still there. +[Go back to marshmallow land](../../../marshmallow.md) + +[Create a new wormhole to go to Cooper Station](cooper-station/cooper-station.md) -Thank goodness for GitHub! From 78eafb5c54d901892d002035fbf5a0d2f1456a22 Mon Sep 17 00:00:00 2001 From: Suhas <5891srp@gmail.com> Date: Fri, 25 Sep 2015 13:40:34 +0530 Subject: [PATCH 1084/5486] Make it easier for @casey-collab to merge pull request. --- .../make_changes_GitHub/create_fork/pull_request/success.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/make_changes_GitHub/create_fork/pull_request/success.md b/english/make_changes_GitHub/create_fork/pull_request/success.md index 949d04ec12..6aa4508203 100644 --- a/english/make_changes_GitHub/create_fork/pull_request/success.md +++ b/english/make_changes_GitHub/create_fork/pull_request/success.md @@ -10,6 +10,9 @@ eyes to see that you are back in your room. You immediately run into your bathroom and had the greatest pee session ever. Everything was alright in the world. + + + Thank goodness for GitHub! But wait, you're an elite software engineer. The comforts of your home don't keep you entertained for long. You're From 954747fb8d410c7a003e867249861440f2ec48fb Mon Sep 17 00:00:00 2001 From: soma1020 Date: Fri, 25 Sep 2015 21:46:11 +0700 Subject: [PATCH 1085/5486] Add my hometown story in vietnamese section --- vietnamese/que-cua-ban.md | 3 +++ vietnamese/tien-giang/tien-giang.md | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 vietnamese/que-cua-ban.md create mode 100644 vietnamese/tien-giang/tien-giang.md diff --git a/vietnamese/que-cua-ban.md b/vietnamese/que-cua-ban.md new file mode 100644 index 0000000000..0fe03c2ac0 --- /dev/null +++ b/vietnamese/que-cua-ban.md @@ -0,0 +1,3 @@ +Que cua ban o dau? + + Que minh o [Tien Giang](../tien-giang/tien-giang.md) \ No newline at end of file diff --git a/vietnamese/tien-giang/tien-giang.md b/vietnamese/tien-giang/tien-giang.md new file mode 100644 index 0000000000..5d99a33d99 --- /dev/null +++ b/vietnamese/tien-giang/tien-giang.md @@ -0,0 +1,4 @@ + +Que minh o My Tho, Tien Giang, 1 tinh thuoc Dong bang song Cuu Long. + +Ban hay gioi thieu ve que ban di ! :) \ No newline at end of file From a4701f6b22885f2d0b354fa9ffd675521265026d Mon Sep 17 00:00:00 2001 From: soma1020 Date: Fri, 25 Sep 2015 22:09:40 +0700 Subject: [PATCH 1086/5486] Add the Markdown into kechuyen.md and delete que-cua-ban.md --- vietnamese/que-cua-ban.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 vietnamese/que-cua-ban.md diff --git a/vietnamese/que-cua-ban.md b/vietnamese/que-cua-ban.md deleted file mode 100644 index 0fe03c2ac0..0000000000 --- a/vietnamese/que-cua-ban.md +++ /dev/null @@ -1,3 +0,0 @@ -Que cua ban o dau? - - Que minh o [Tien Giang](../tien-giang/tien-giang.md) \ No newline at end of file From b0eeb592c3cb1d59d8f08741316b8d230fdcd41c Mon Sep 17 00:00:00 2001 From: soma1020 Date: Fri, 25 Sep 2015 22:11:27 +0700 Subject: [PATCH 1087/5486] Modify kechuyen.md. Forgot to do it in last commit/ --- vietnamese/kechuyen.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index 71ec84fc71..b473b11bba 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -1,3 +1,7 @@ Bạn thích nghe [truyện ma](https://www.youtube.com/watch?v=0dfWjEKXpZk)? -Thế còn [truyện cười](https://www.youtube.com/watch?v=3r_-ZLZCxQs)? \ No newline at end of file +Thế còn [truyện cười](https://www.youtube.com/watch?v=3r_-ZLZCxQs)? + +Que cua ban o dau? Hay cho minh biet ve que cua ban ! + + -Que minh o [Tien Giang](/tien-giang/tien-giang.md) \ No newline at end of file From 29b01ac65409e7bef070ac4fe49d885285ee9633 Mon Sep 17 00:00:00 2001 From: soma1020 Date: Fri, 25 Sep 2015 22:24:44 +0700 Subject: [PATCH 1088/5486] Fix the error of the link on the Markdown --- vietnamese/kechuyen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index b473b11bba..e118d7a9ed 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -4,4 +4,4 @@ Thế còn [truyện cười](https://www.youtube.com/watch?v=3r_-ZLZCxQs)? Que cua ban o dau? Hay cho minh biet ve que cua ban ! - -Que minh o [Tien Giang](/tien-giang/tien-giang.md) \ No newline at end of file + -Que minh o [Tien Giang](tien-giang/tien-giang.md) From 8977c5c68f82e2c2cb9319072e8f54273b3c319c Mon Sep 17 00:00:00 2001 From: soma1020 Date: Fri, 25 Sep 2015 22:25:40 +0700 Subject: [PATCH 1089/5486] test --- vietnamese/kechuyen.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index e118d7a9ed..52f0136140 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -5,3 +5,5 @@ Thế còn [truyện cười](https://www.youtube.com/watch?v=3r_-ZLZCxQs)? Que cua ban o dau? Hay cho minh biet ve que cua ban ! -Que minh o [Tien Giang](tien-giang/tien-giang.md) + +[cc](tien-giang/tien-giang.md) From 0d5e5fc8f04b7b11e3a07673721ad9d1817efa23 Mon Sep 17 00:00:00 2001 From: soma1020 Date: Fri, 25 Sep 2015 22:26:09 +0700 Subject: [PATCH 1090/5486] test --- vietnamese/kechuyen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index 52f0136140..9599795518 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -4,6 +4,6 @@ Thế còn [truyện cười](https://www.youtube.com/watch?v=3r_-ZLZCxQs)? Que cua ban o dau? Hay cho minh biet ve que cua ban ! - -Que minh o [Tien Giang](tien-giang/tien-giang.md) +Que minh o [Tien Giang](tien-giang/tien-giang.md) [cc](tien-giang/tien-giang.md) From 784135fe782b16ec2ac30bd5cf08c4a9a2c74607 Mon Sep 17 00:00:00 2001 From: soma1020 Date: Fri, 25 Sep 2015 22:26:36 +0700 Subject: [PATCH 1091/5486] Fix the error of the link on the Markdown --- vietnamese/kechuyen.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index 9599795518..3a826ddcb6 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -2,8 +2,5 @@ Thế còn [truyện cười](https://www.youtube.com/watch?v=3r_-ZLZCxQs)? -Que cua ban o dau? Hay cho minh biet ve que cua ban ! - -Que minh o [Tien Giang](tien-giang/tien-giang.md) - -[cc](tien-giang/tien-giang.md) +Que cua ban o dau? Hay cho minh biet ve que cua ban ! Que minh o [Tien Giang](tien-giang/tien-giang.md) + From d86ce6c4c69f83a47bf4ead2f14577165c9494c1 Mon Sep 17 00:00:00 2001 From: Ram Viswanathan Date: Fri, 25 Sep 2015 10:54:13 -0700 Subject: [PATCH 1092/5486] Adding copper plate man story --- english/copper-plate-man/copper-plate-man.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/copper-plate-man/copper-plate-man.md diff --git a/english/copper-plate-man/copper-plate-man.md b/english/copper-plate-man/copper-plate-man.md new file mode 100644 index 0000000000..9341feabb2 --- /dev/null +++ b/english/copper-plate-man/copper-plate-man.md @@ -0,0 +1 @@ +Did you know the copper plate man can read your mind without anyone uttering a word? Remarkably, he will have answers to those questions as well without ever speaking a word. Hard to believe? [Here is his story] (http://www.jameskelleher.com/index.php/journal/copperplateman.html) From e892e75e30068343dbb05ade4866add37727361f Mon Sep 17 00:00:00 2001 From: Ram Viswanathan Date: Fri, 25 Sep 2015 11:21:53 -0700 Subject: [PATCH 1093/5486] Modified my story to meet repo requirements --- english/copper-plate-man/copper-plate-man.md | 6 +++++- english/marshmallow.md | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/english/copper-plate-man/copper-plate-man.md b/english/copper-plate-man/copper-plate-man.md index 9341feabb2..ec3f1ad319 100644 --- a/english/copper-plate-man/copper-plate-man.md +++ b/english/copper-plate-man/copper-plate-man.md @@ -1 +1,5 @@ -Did you know the copper plate man can read your mind without anyone uttering a word? Remarkably, he will have answers to those questions as well without ever speaking a word. Hard to believe? [Here is his story] (http://www.jameskelleher.com/index.php/journal/copperplateman.html) +The copper plate man can read your mind and answers your questions without ever speaking a word. + +Hard to believe? + +[Read on] (http://www.jameskelleher.com/index.php/journal/copperplateman.html) diff --git a/english/marshmallow.md b/english/marshmallow.md index bb8b480568..fd2d22d356 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -507,4 +507,6 @@ If you eat a lot, you should also [exercise](exercise/exercise.md) [Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) -[Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) \ No newline at end of file +[Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) + +This miracle man (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. \ No newline at end of file From c4304c3a0c35f6d568a90fd0ea468cdb4bc358d0 Mon Sep 17 00:00:00 2001 From: Ram Viswanathan Date: Fri, 25 Sep 2015 13:41:56 -0700 Subject: [PATCH 1094/5486] Added link from marshmallow.md to copper-plate man --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index fd2d22d356..a4fa071ecf 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -509,4 +509,4 @@ If you eat a lot, you should also [exercise](exercise/exercise.md) [Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) -This miracle man (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. \ No newline at end of file +This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. \ No newline at end of file From 550bb44c6ec3beb3a701fc24c49c1394d6f83b55 Mon Sep 17 00:00:00 2001 From: Kian Woo Date: Sat, 26 Sep 2015 14:18:32 +1000 Subject: [PATCH 1095/5486] Add tshirt sentence --- .../say-hello/say-hello/say-hello.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/explore-outside/investigate-marshmallow-structure/say-hello/say-hello/say-hello.md b/english/explore-outside/investigate-marshmallow-structure/say-hello/say-hello/say-hello.md index f3720ca672..8e7b95ef99 100644 --- a/english/explore-outside/investigate-marshmallow-structure/say-hello/say-hello/say-hello.md +++ b/english/explore-outside/investigate-marshmallow-structure/say-hello/say-hello/say-hello.md @@ -1,5 +1,6 @@ You say hello and the green people all turn and look at you. They seem to be waving at you. A leader of the green people moves towards you. +You notice he is wearing a tshirt with a picture of you on it. [Go up to meet them.](../../greet-green/greet-green.md) From 9c995c3fb91aadd89d905ee997da395db56f909d Mon Sep 17 00:00:00 2001 From: Tiglas Date: Sat, 26 Sep 2015 14:15:53 +0200 Subject: [PATCH 1096/5486] . --- language.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/language.md b/language.md index 39c8a2a78e..3c005a7083 100644 --- a/language.md +++ b/language.md @@ -121,8 +121,6 @@ Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) -<<<<<<< HEAD Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) ======= Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) ->>>>>>> upstream/master From 10f88b8c2a558518cfd98cffb251048b2312c60e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=AF=E4=BC=9F=E5=85=89?= Date: Sat, 26 Sep 2015 19:11:50 +0300 Subject: [PATCH 1097/5486] =?UTF-8?q?duanduan=E4=BF=AE=E6=94=B9=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/Peter/.DS_Store | Bin 0 -> 6148 bytes Chinese/Peter/Peter.md | 2 ++ ...4\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 3 files changed, 4 insertions(+) create mode 100644 Chinese/Peter/.DS_Store create mode 100644 Chinese/Peter/Peter.md diff --git a/Chinese/Peter/.DS_Store b/Chinese/Peter/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..aa3320bcb4d152305dffd0110e0ea31e6d0540a3 GIT binary patch literal 6148 zcmeHKJxfDD5S-N%4{TCeUTG!x4~`H6=>-3P#MngwV)|G4yZmQy_5(3It;9xVVRr8J zcHiYq@iq&<7KiN(Fb6OY&UkY-H9vPu?5rY2CisjOT;mzr^=|(-$^JgzwFB<(gjeEA z{bsk{@XUYMint=|c%+v}0VyB_q<|EV0>4qfdoOLcNS2oZQa}oPD&XITMmYE4F*!aR zbTI;uXAFmN9kT?vd4SxD$7DummZjt@wHh%j%NcK#*NeyGEQiI-d`{hLHKADC&UlM- zSWlLh0#e{qf%DwXz5m}5Kg|E9McPRLDe$ipu-Wo{x!@~RZ=JlH_u5805T5f+xN#jN nbkUB<(T=(Cc6=F0nb&;H^IkkAM>*qBPS&3R*F`1;{#t<#tS1*R literal 0 HcmV?d00001 diff --git a/Chinese/Peter/Peter.md b/Chinese/Peter/Peter.md new file mode 100644 index 0000000000..39764a252d --- /dev/null +++ b/Chinese/Peter/Peter.md @@ -0,0 +1,2 @@ +孙悟空变成了recipe，被fork了好几千次。 +后来汤森对recipe发送了pull request，修改了孙悟空的配方。 \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index f88d2e82c2..3a3c1ae224 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -1,5 +1,7 @@ 在1994年大话西游之月光宝盒的电影中，主角周星驰饰演的孙悟空在500年后转世成为： +[recipe](Peter/Peter.md) + [国际大盗](CrazyStone/CrazyStone.md) ? [Casey](Casey/Casey.md) ? From 9101d463509740748934860bb498424ddd55cf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=AF=E4=BC=9F=E5=85=89?= Date: Sat, 26 Sep 2015 19:19:34 +0300 Subject: [PATCH 1098/5486] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 -- 1 file changed, 2 deletions(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 3a3c1ae224..f88d2e82c2 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -1,7 +1,5 @@ 在1994年大话西游之月光宝盒的电影中，主角周星驰饰演的孙悟空在500年后转世成为： -[recipe](Peter/Peter.md) - [国际大盗](CrazyStone/CrazyStone.md) ? [Casey](Casey/Casey.md) ? From cc00077df3291085f7b95bfeeec91e7d28e8bd5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=AF=E4=BC=9F=E5=85=89?= Date: Sat, 26 Sep 2015 19:25:05 +0300 Subject: [PATCH 1099/5486] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=AC=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index f88d2e82c2..3a3c1ae224 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -1,5 +1,7 @@ 在1994年大话西游之月光宝盒的电影中，主角周星驰饰演的孙悟空在500年后转世成为： +[recipe](Peter/Peter.md) + [国际大盗](CrazyStone/CrazyStone.md) ? [Casey](Casey/Casey.md) ? From b601fdfd9755205eadb889538d415255e57af4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=AF=E4=BC=9F=E5=85=89?= Date: Sat, 26 Sep 2015 19:40:41 +0300 Subject: [PATCH 1100/5486] Delete .DS --- Chinese/Peter/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Chinese/Peter/.DS_Store diff --git a/Chinese/Peter/.DS_Store b/Chinese/Peter/.DS_Store deleted file mode 100644 index aa3320bcb4d152305dffd0110e0ea31e6d0540a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJxfDD5S-N%4{TCeUTG!x4~`H6=>-3P#MngwV)|G4yZmQy_5(3It;9xVVRr8J zcHiYq@iq&<7KiN(Fb6OY&UkY-H9vPu?5rY2CisjOT;mzr^=|(-$^JgzwFB<(gjeEA z{bsk{@XUYMint=|c%+v}0VyB_q<|EV0>4qfdoOLcNS2oZQa}oPD&XITMmYE4F*!aR zbTI;uXAFmN9kT?vd4SxD$7DummZjt@wHh%j%NcK#*NeyGEQiI-d`{hLHKADC&UlM- zSWlLh0#e{qf%DwXz5m}5Kg|E9McPRLDe$ipu-Wo{x!@~RZ=JlH_u5805T5f+xN#jN nbkUB<(T=(Cc6=F0nb&;H^IkkAM>*qBPS&3R*F`1;{#t<#tS1*R From 0dfda1828ea0160c0df033ee5bc7a0139bb44f0f Mon Sep 17 00:00:00 2001 From: Logan Patino Date: Sat, 26 Sep 2015 13:11:09 -0400 Subject: [PATCH 1101/5486] Add story about mysterious text --- english/check-phone/check-phone.md | 7 +++++++ english/check-phone/delete-message/delete-message.md | 3 +++ english/check-phone/open-message/open-message.md | 5 +++++ english/marshmallow.md | 5 ++++- 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 english/check-phone/check-phone.md create mode 100644 english/check-phone/delete-message/delete-message.md create mode 100644 english/check-phone/open-message/open-message.md diff --git a/english/check-phone/check-phone.md b/english/check-phone/check-phone.md new file mode 100644 index 0000000000..7e2fa84f1f --- /dev/null +++ b/english/check-phone/check-phone.md @@ -0,0 +1,7 @@ +You get a notification that someone has texted you, but you don't +recognize the number. You open your messaging app, but you can't see +a preview of the text. Do you: + +[Open the message](../open-message.md) + +[Delete the message string](../delete-message.md) diff --git a/english/check-phone/delete-message/delete-message.md b/english/check-phone/delete-message/delete-message.md new file mode 100644 index 0000000000..6b924d9c95 --- /dev/null +++ b/english/check-phone/delete-message/delete-message.md @@ -0,0 +1,3 @@ +You press delete and the message string is gone. A few weeks later, you +lay in bed, wondering what the mysterious message might have said. +"Oh well," you decide, "probably just spam." diff --git a/english/check-phone/open-message/open-message.md b/english/check-phone/open-message/open-message.md new file mode 100644 index 0000000000..47da4a1763 --- /dev/null +++ b/english/check-phone/open-message/open-message.md @@ -0,0 +1,5 @@ +You open up the message, but nothing appears. Suddenly, the screen turns +white. Two black dots appear, slowly morphing into eyes as the white of +the screen takes over your whole field of vision. + +The marshmallows are here. diff --git a/english/marshmallow.md b/english/marshmallow.md index 78b8b04800..d6e46ab513 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -510,4 +510,7 @@ If you eat a lot, you should also [exercise](exercise/exercise.md) [Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) -This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. \ No newline at end of file +This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. + +You decide that you do not want to visit the miracle man. You check your +phone to find something else to do. From d361b3f4adb7bbd70ac0710304c7460c9d082fa6 Mon Sep 17 00:00:00 2001 From: Logan Patino Date: Sat, 26 Sep 2015 13:30:19 -0400 Subject: [PATCH 1102/5486] Add link to check-phone --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index d6e46ab513..1d56fc7e6a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -512,5 +512,5 @@ If you eat a lot, you should also [exercise](exercise/exercise.md) This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. -You decide that you do not want to visit the miracle man. You check your -phone to find something else to do. +You decide that you do not want to visit the miracle man. [You check your +phone to find something else to do](../check-phone/check-phone.md). From ea08c1c8bf21c587105c11ac21181d6e68cd3099 Mon Sep 17 00:00:00 2001 From: JIMMY Date: Sat, 26 Sep 2015 23:25:10 +0200 Subject: [PATCH 1103/5486] I added a sentence ! --- english/wikipedia/wiki.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/wikipedia/wiki.md b/english/wikipedia/wiki.md index e57adb05e8..1f5ee2382e 100644 --- a/english/wikipedia/wiki.md +++ b/english/wikipedia/wiki.md @@ -1,5 +1,7 @@ You enter a world called 'Wikipedia.' +One of the greatest knowledge sites ever ! + It is mesmerizing. It is transcendental. From a22f04cb122974a8e6081e2e8333652b78f44d7b Mon Sep 17 00:00:00 2001 From: ALEX Date: Sun, 27 Sep 2015 19:28:19 +0300 Subject: [PATCH 1104/5486] New commit --- bulgarian/burning_room.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bulgarian/burning_room.md b/bulgarian/burning_room.md index a79bedb4ed..ae83924641 100644 --- a/bulgarian/burning_room.md +++ b/bulgarian/burning_room.md @@ -17,3 +17,5 @@ 7. [Завиваш се с одеалото и се опитваш да набереш някой близък човек.](./under_the_covers/under_the_covers.md) 8. [Решаваш да провериш дали не сънуваш.](./check_if_dreaming/check_if_dreaming.md) + +9. [Пиеш си хапчетата, взимаш от на Алексиев бурканитe](./Aleksiev/TodorAleksiev.md) From 96ab8342028d59c9128e9f8be6378f96b02d1c60 Mon Sep 17 00:00:00 2001 From: ALEX Date: Sun, 27 Sep 2015 19:28:47 +0300 Subject: [PATCH 1105/5486] Newer commit --- bulgarian/Aleksiev/TodorAleksiev.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 bulgarian/Aleksiev/TodorAleksiev.md diff --git a/bulgarian/Aleksiev/TodorAleksiev.md b/bulgarian/Aleksiev/TodorAleksiev.md new file mode 100644 index 0000000000..869935f752 --- /dev/null +++ b/bulgarian/Aleksiev/TodorAleksiev.md @@ -0,0 +1,3 @@ + . . + , , ? + . \ No newline at end of file From a928cebc57bb550fc27b52a444a392eb6abb681f Mon Sep 17 00:00:00 2001 From: Moaz Ahmed Date: Mon, 28 Sep 2015 06:18:52 +0200 Subject: [PATCH 1106/5486] add option to order food online --- arabic/salamoAlikom.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index cc3ca1142f..608b654448 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -10,6 +10,8 @@ [اريد ان احلم](dream/dream.md) +[ أريد أن آكل](http://www.otlob.com/ar) + [وظيفة](Job/Job.md) -[أريد أن أحصل على Nanodegree](https://www.udacity.com/nanodegree) \ No newline at end of file +[أريد أن أحصل على Nanodegree](https://www.udacity.com/nanodegree) From decbd86a13c02c707d7df6446f5b3d80be8cf8d7 Mon Sep 17 00:00:00 2001 From: Mario Mitre Date: Mon, 28 Sep 2015 10:14:53 +0300 Subject: [PATCH 1107/5486] Add a new choice --- .../coffee/nude-run/warm-water/rebel/rebel.md | 6 ++++++ .../warm-water/surrender/surrender.md | 19 +++++++++++++++++++ .../coffee/nude-run/warm-water/warm-water.md | 9 +++++++++ 3 files changed, 34 insertions(+) create mode 100644 english/coffee/nude-run/warm-water/rebel/rebel.md create mode 100644 english/coffee/nude-run/warm-water/surrender/surrender.md diff --git a/english/coffee/nude-run/warm-water/rebel/rebel.md b/english/coffee/nude-run/warm-water/rebel/rebel.md new file mode 100644 index 0000000000..c3d00797ab --- /dev/null +++ b/english/coffee/nude-run/warm-water/rebel/rebel.md @@ -0,0 +1,6 @@ +You begin feeling angrier and angrier at the situation. You did not +ask to be here, and you most certainly don't want to be here. + +As you turn around towards the water, you scream "All of this is absurd! +None of this is real!" As you walk back into the water you know, you just +know, that there is only one way out of this madness. \ No newline at end of file diff --git a/english/coffee/nude-run/warm-water/surrender/surrender.md b/english/coffee/nude-run/warm-water/surrender/surrender.md new file mode 100644 index 0000000000..e269588229 --- /dev/null +++ b/english/coffee/nude-run/warm-water/surrender/surrender.md @@ -0,0 +1,19 @@ +You sit down next to the badger. + +"Bees?" you ask, genuinely curious. + +"Yes, bees. If you listen to your body, you can feel +the energy of a million bees flying through your veins +when you are happy, and the sting of a million more when +you are sad. + +"Close your eyes, and feel, see, those bees inside you." + +As he said that, a warm feeling started radiating from my +core. I could feel the bees zooming through my body, and +every single cell began to vibrate along with their buzz. + +I only opened my eyes when my skin felt wet, sticky. +Surprisingly (or maybe not), I was covered in honey. + +My teacher, the badger, was gone. \ No newline at end of file diff --git a/english/coffee/nude-run/warm-water/warm-water.md b/english/coffee/nude-run/warm-water/warm-water.md index d126ad2e4f..67ae2d568a 100644 --- a/english/coffee/nude-run/warm-water/warm-water.md +++ b/english/coffee/nude-run/warm-water/warm-water.md @@ -6,3 +6,12 @@ at last speaks again. "You know," says the badger, "the more I think about it, the more certain I become that we are all made of bees." + +He says this with the absurd certainty of Yoda, or the Little Prince. Part of +you wants to scream (there is no such thing as speaking badgers, and I am +certainly not made of bees). But there is also a small part of you that feels +the pull of the badgers soft voice, his calm but engaging eyes. + +Do you: +* [rebel against the absurdity of it all?] (rebel/rebel.md) +* [let your mind surrender] (surrender/surrender.md) \ No newline at end of file From 66fb3d9e8e89274961dad6c42f5738ccca64c3ed Mon Sep 17 00:00:00 2001 From: William Date: Mon, 28 Sep 2015 16:59:31 +0800 Subject: [PATCH 1108/5486] Finished sentence of driver. --- english/bite-the-marshmallow/ricky/ricky.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/ricky/ricky.md b/english/bite-the-marshmallow/ricky/ricky.md index bcc293a110..fef6de2524 100644 --- a/english/bite-the-marshmallow/ricky/ricky.md +++ b/english/bite-the-marshmallow/ricky/ricky.md @@ -3,6 +3,6 @@ He peers into the rear view mirror, head tilt down, his eyes rising above his cool-cat sunglasses. "You don't need to know where we are going. -All you need to know is that I'm ..." +All you need to know is that I'm never gonna give you up!" [Finish the drivers mysterious answer](https://youtu.be/dQw4w9WgXcQ?t=42s) \ No newline at end of file From 1e657bdb20cc72b06da8d1a3f4aad1c13fb328f8 Mon Sep 17 00:00:00 2001 From: Ru Date: Mon, 28 Sep 2015 11:09:21 +0200 Subject: [PATCH 1109/5486] add possibility to drink --- german/Einladen/Vorstellen/Berlin/aus_Berlin.md | 1 + german/Einladen/Vorstellen/MekPom/aus_Mekpom.md | 1 + german/Einladen/Vorstellen/vorstellen.md | 9 ++++++++- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 german/Einladen/Vorstellen/Berlin/aus_Berlin.md create mode 100644 german/Einladen/Vorstellen/MekPom/aus_Mekpom.md diff --git a/german/Einladen/Vorstellen/Berlin/aus_Berlin.md b/german/Einladen/Vorstellen/Berlin/aus_Berlin.md new file mode 100644 index 0000000000..72a422ddd8 --- /dev/null +++ b/german/Einladen/Vorstellen/Berlin/aus_Berlin.md @@ -0,0 +1 @@ +sie ist eine Berlinerin!! \ No newline at end of file diff --git a/german/Einladen/Vorstellen/MekPom/aus_Mekpom.md b/german/Einladen/Vorstellen/MekPom/aus_Mekpom.md new file mode 100644 index 0000000000..56efae72b7 --- /dev/null +++ b/german/Einladen/Vorstellen/MekPom/aus_Mekpom.md @@ -0,0 +1 @@ +Sie ist aus MekPom!! \ No newline at end of file diff --git a/german/Einladen/Vorstellen/vorstellen.md b/german/Einladen/Vorstellen/vorstellen.md index c61bceb8ad..a0bb63271a 100644 --- a/german/Einladen/Vorstellen/vorstellen.md +++ b/german/Einladen/Vorstellen/vorstellen.md @@ -1 +1,8 @@ -Sie antworten "Ich bin ... jetzt kennst Du mich ja. Magst Du ein Bier oder etwas anderes?". Sie lacht. \ No newline at end of file +Sie antworten "Ich bin ... jetzt kennst Du mich ja. Magst Du ein Bier oder etwas anderes?". Sie lacht. +Sie schlgt vor: + + +[Kuchen essen dann Wodka trinken und dann Bier.](Berlin/aus_Berlin.md) + + +[Wodka trinken and Currywurst essen.](MekPom/aus_Mekpom.md) \ No newline at end of file From fa10c6da169806a4c98e775748d419d54aeebd56 Mon Sep 17 00:00:00 2001 From: Ru Date: Mon, 28 Sep 2015 11:18:11 +0200 Subject: [PATCH 1110/5486] edit inaccuracy --- german/Einladen/Vorstellen/MeckPomm/aus_Meckpomm.md | 1 + german/Einladen/Vorstellen/MekPom/aus_Mekpom.md | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 german/Einladen/Vorstellen/MeckPomm/aus_Meckpomm.md delete mode 100644 german/Einladen/Vorstellen/MekPom/aus_Mekpom.md diff --git a/german/Einladen/Vorstellen/MeckPomm/aus_Meckpomm.md b/german/Einladen/Vorstellen/MeckPomm/aus_Meckpomm.md new file mode 100644 index 0000000000..96a313620b --- /dev/null +++ b/german/Einladen/Vorstellen/MeckPomm/aus_Meckpomm.md @@ -0,0 +1 @@ +Sie ist aus MeckPomm!! \ No newline at end of file diff --git a/german/Einladen/Vorstellen/MekPom/aus_Mekpom.md b/german/Einladen/Vorstellen/MekPom/aus_Mekpom.md deleted file mode 100644 index 56efae72b7..0000000000 --- a/german/Einladen/Vorstellen/MekPom/aus_Mekpom.md +++ /dev/null @@ -1 +0,0 @@ -Sie ist aus MekPom!! \ No newline at end of file From d436da9bb8fd3327a8cde8dd7858e5197f0057f4 Mon Sep 17 00:00:00 2001 From: mariath Date: Mon, 28 Sep 2015 12:38:01 +0300 Subject: [PATCH 1111/5486] continue story in greek --- .../set_it_on_fire/set_it_on_fire.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md index b28f1c1f84..cfd8126541 100644 --- a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md @@ -1,3 +1,7 @@ Ανάβεις τον αναπτήρα, ψήνεις το χέρι και το τρως. Συνεχίζεις με τους τοίχους μέχρι που δημιουργείς ένα άνοιγμα -που σε χωράει. \ No newline at end of file +που σε χωράει. + +Και τώρα; Βγάζεις το κεφάλι από το άνοιγμα και αυτό που +αντικρύζεις είναι τόσο φρικιαστικό που θέλεις να ξαναμπείς μέσα +και να κλείσεις το άνοιγμα για πάντα. \ No newline at end of file From 13657cfacf2fd33afe499098f3778ffa74f5331e Mon Sep 17 00:00:00 2001 From: Ru Date: Mon, 28 Sep 2015 12:54:31 +0200 Subject: [PATCH 1112/5486] edit false path --- german/Einladen/Vorstellen/vorstellen.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/german/Einladen/Vorstellen/vorstellen.md b/german/Einladen/Vorstellen/vorstellen.md index a0bb63271a..82aa4a5243 100644 --- a/german/Einladen/Vorstellen/vorstellen.md +++ b/german/Einladen/Vorstellen/vorstellen.md @@ -2,7 +2,7 @@ Sie antworten "Ich bin ... jetzt kennst Du mich ja. Magst Du ein Bier oder etwas Sie schlgt vor: -[Kuchen essen dann Wodka trinken und dann Bier.](Berlin/aus_Berlin.md) +[Kuchen essen dann Wodka trinken und dann Bier.](MeckPomm/aus_Meckpomm.md) -[Wodka trinken and Currywurst essen.](MekPom/aus_Mekpom.md) \ No newline at end of file +[Wodka trinken and Currywurst essen.](Berlin/aus_Berlin.md) \ No newline at end of file From 96200953b886ac5022fafeac4fcbff4d48ceb925 Mon Sep 17 00:00:00 2001 From: Nimish Jain Date: Mon, 28 Sep 2015 16:35:36 +0530 Subject: [PATCH 1113/5486] Shared details about Art of Living --- hindi/art-of-living/art-of-living.md | 3 +++ hindi/bollywood.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 hindi/art-of-living/art-of-living.md diff --git a/hindi/art-of-living/art-of-living.md b/hindi/art-of-living/art-of-living.md new file mode 100644 index 0000000000..5d2edbef78 --- /dev/null +++ b/hindi/art-of-living/art-of-living.md @@ -0,0 +1,3 @@ +Founded in 1981 by Sri Sri Ravi Shankar,The Art of Living is an educational and humanitarian movement engaged in stress-management and service initiatives. The organization operates globally in 154 countries and has touched the lives of over 370 million people. + +To know more, kindly visit this [link](http://www.artofliving.org/in-en) \ No newline at end of file diff --git a/hindi/bollywood.md b/hindi/bollywood.md index cff6f049d8..74189ac997 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -1,4 +1,6 @@ -चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) +Art of Living [Know More](art-of-living/art-of-living.md) + +चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) बॉलीवुड में आपका स्वागत है ! From c0445642f3b7f1476459c9fdbce8049ea3a00f70 Mon Sep 17 00:00:00 2001 From: Ricevind Date: Mon, 28 Sep 2015 13:19:01 +0200 Subject: [PATCH 1114/5486] Add choice (sleep) after using muscle --- Polish/przygoda/miesnie/miesnie.md | 2 ++ Polish/przygoda/miesnie/spanie/spanie.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 Polish/przygoda/miesnie/spanie/spanie.md diff --git a/Polish/przygoda/miesnie/miesnie.md b/Polish/przygoda/miesnie/miesnie.md index 42035c0666..cdeefa2af1 100644 --- a/Polish/przygoda/miesnie/miesnie.md +++ b/Polish/przygoda/miesnie/miesnie.md @@ -5,3 +5,5 @@ Co robisz? [Rozbijasz ściany siłą woli](../wola/wola.md) [Zaczynasz jeść ptasie mleczko](../jedzenie/jedzenie.md) + +[Kładziesz się na podłodze i zasypiasz](../spanie/spanie.md) diff --git a/Polish/przygoda/miesnie/spanie/spanie.md b/Polish/przygoda/miesnie/spanie/spanie.md new file mode 100644 index 0000000000..44f1ba14ad --- /dev/null +++ b/Polish/przygoda/miesnie/spanie/spanie.md @@ -0,0 +1 @@ +Budzisz się z okropnym bólem głowy. Z przerażeniem stwierdzasz, że nie możesz poruszyć nogami ani rękami. From 2bf83639bd7c7753fdd6cb9cb7b1404c37e5c2b0 Mon Sep 17 00:00:00 2001 From: Nimish Jain Date: Mon, 28 Sep 2015 16:55:05 +0530 Subject: [PATCH 1115/5486] Removing CRLF --- hindi/bollywood.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 74189ac997..dfd10e6123 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -1,6 +1,4 @@ -Art of Living [Know More](art-of-living/art-of-living.md) - -चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) +चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) बॉलीवुड में आपका स्वागत है ! @@ -17,3 +15,5 @@ Amithab, [go here](actor3/amithab.md) दीपिका पादुकोन के लिए [ यहाँ ](./actor5/deepika.md) + +Art of Living [Know More](art-of-living/art-of-living.md) \ No newline at end of file From 359d0d70dbd2551ba11d8da137167044cbae96ae Mon Sep 17 00:00:00 2001 From: Ricevind Date: Mon, 28 Sep 2015 13:25:21 +0200 Subject: [PATCH 1116/5486] Fix path for sleep option --- Polish/przygoda/miesnie/miesnie.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polish/przygoda/miesnie/miesnie.md b/Polish/przygoda/miesnie/miesnie.md index cdeefa2af1..c47ae21f21 100644 --- a/Polish/przygoda/miesnie/miesnie.md +++ b/Polish/przygoda/miesnie/miesnie.md @@ -6,4 +6,4 @@ Co robisz? [Zaczynasz jeść ptasie mleczko](../jedzenie/jedzenie.md) -[Kładziesz się na podłodze i zasypiasz](../spanie/spanie.md) +[Kładziesz się na podłodze i zasypiasz](./spanie/spanie.md) From 8b8a2b690a3676ea5bbbed751fbfe1b5cfaf2a77 Mon Sep 17 00:00:00 2001 From: Nimish Jain Date: Mon, 28 Sep 2015 17:01:58 +0530 Subject: [PATCH 1117/5486] Lines of 120 characters --- hindi/art-of-living/art-of-living.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hindi/art-of-living/art-of-living.md b/hindi/art-of-living/art-of-living.md index 5d2edbef78..6f7f8d1719 100644 --- a/hindi/art-of-living/art-of-living.md +++ b/hindi/art-of-living/art-of-living.md @@ -1,3 +1,6 @@ -Founded in 1981 by Sri Sri Ravi Shankar,The Art of Living is an educational and humanitarian movement engaged in stress-management and service initiatives. The organization operates globally in 154 countries and has touched the lives of over 370 million people. +Founded in 1981 by Sri Sri Ravi Shankar,The Art of Living is an educational +and humanitarian movement engaged in stress-management and service initiatives. +The organization operates globally in 154 countries and has touched the lives +of over 370 million people. To know more, kindly visit this [link](http://www.artofliving.org/in-en) \ No newline at end of file From 586241d68ea8aca2b2c7b897fcf142aae5ddeca5 Mon Sep 17 00:00:00 2001 From: roedvig Date: Mon, 28 Sep 2015 15:43:38 +0200 Subject: [PATCH 1118/5486] Add lighten the mood option --- danish/synging/synging.md | 9 +++++++++ danish/velkommen.md | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 danish/synging/synging.md diff --git a/danish/synging/synging.md b/danish/synging/synging.md new file mode 100644 index 0000000000..c601552c37 --- /dev/null +++ b/danish/synging/synging.md @@ -0,0 +1,9 @@ +Du siger “Maybe en bette song kan make us in a better humor!” + +Hvilken sang vælger du: + +[Synge “Knokkel pukkel man“](https://www.youtube.com/watch?v=KPvqm28mL4Q) + +[Synge “it's hard to be a nissemann“](https://www.youtube.com/watch?v=JqyjDQGS_Sg) + +[Spørge "Then I will go there over and drik some øl with Hansi"](../velkommen.md) \ No newline at end of file diff --git a/danish/velkommen.md b/danish/velkommen.md index 4e700b4a6b..3a6fe7edd5 100644 --- a/danish/velkommen.md +++ b/danish/velkommen.md @@ -6,4 +6,6 @@ Gammel Nok bliver i sin seng. Vælger du at: -[Spørge "Well Gynter! How goes it with the snitting?"](snitting/snitting.md) \ No newline at end of file +[Spørge "Well Gynter! How goes it with the snitting?"](snitting/snitting.md) + +[Prøver at lette stemningen](synging/synging.md) \ No newline at end of file From bd512ef5330671393cc6e794fba29a652fcd7c8d Mon Sep 17 00:00:00 2001 From: eduartua Date: Mon, 28 Sep 2015 11:55:15 -0500 Subject: [PATCH 1119/5486] Add a new line at the end of file --- espanol/canudos.md | 4 ++++ espanol/dimension/dimension.md | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 espanol/dimension/dimension.md diff --git a/espanol/canudos.md b/espanol/canudos.md index fae215e9c7..861c59a226 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -61,3 +61,7 @@ el Consejero: [En el rincón donde dormía, el beatito...](beatito/beatito.md) [Ocupó su lugar junto al emperador en el recibimiento](recibimiento/recibimiento.md) + +[Le dice a Beatito, el momento ha llegado, La Nueva Dimensión](dimension/dimension.md) + + diff --git a/espanol/dimension/dimension.md b/espanol/dimension/dimension.md new file mode 100644 index 0000000000..95ed50b958 --- /dev/null +++ b/espanol/dimension/dimension.md @@ -0,0 +1,3 @@ +Resulta que el sonido de las trompetas comenzo a crear un orificio en el espacio entre las tropas y el fuerte. + +Dicho orificio deslumbraba luz indicanto que habia algo si entrabas a traves de el. Una nueva dimension. From 39db1f06ed4faba8bfde26575c3d32b284f08a1c Mon Sep 17 00:00:00 2001 From: Logan Patino Date: Mon, 28 Sep 2015 14:47:37 -0400 Subject: [PATCH 1120/5486] Fix broken links --- english/check-phone/check-phone.md | 4 ++-- english/marshmallow.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/english/check-phone/check-phone.md b/english/check-phone/check-phone.md index 7e2fa84f1f..1323aae9cf 100644 --- a/english/check-phone/check-phone.md +++ b/english/check-phone/check-phone.md @@ -2,6 +2,6 @@ You get a notification that someone has texted you, but you don't recognize the number. You open your messaging app, but you can't see a preview of the text. Do you: -[Open the message](../open-message.md) +[Open the message](open-message/open-message.md) -[Delete the message string](../delete-message.md) +[Delete the message string](delete-message/delete-message.md) diff --git a/english/marshmallow.md b/english/marshmallow.md index 1d56fc7e6a..bb7fc96e5b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -513,4 +513,4 @@ If you eat a lot, you should also [exercise](exercise/exercise.md) This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. You decide that you do not want to visit the miracle man. [You check your -phone to find something else to do](../check-phone/check-phone.md). +phone to find something else to do](check-phone/check-phone.md). From 34c5dd25a717bbde68584a9ada76e76bdcdaccab Mon Sep 17 00:00:00 2001 From: MFink Date: Mon, 28 Sep 2015 11:53:56 -0700 Subject: [PATCH 1121/5486] added a link back from the is-this-a-dream tangent dead-end. --- english/is-this-a-dream/is-this-a-dream.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/is-this-a-dream/is-this-a-dream.md b/english/is-this-a-dream/is-this-a-dream.md index 1d43c818a5..1023a9c660 100644 --- a/english/is-this-a-dream/is-this-a-dream.md +++ b/english/is-this-a-dream/is-this-a-dream.md @@ -7,4 +7,6 @@ No more eating at that strange ass pizzaria you promise your self... But then again .. none of this fabulous shit would have been yours had you not be a frequent visitor at Joe's hallucination pizza bar. You know you want it cause life is short and there is yet much to lord over - .. so you pick up the phone and dial. "Hi I'd like to order a pizza ..." \ No newline at end of file + .. so you pick up the phone and dial. "Hi I'd like to order a pizza ..." + +Nah. I'm not hungry. Let's get [back to the story.](../marshmallow.md) From 5fe9f9eb83fcd6e04a3dd98f3a821b4eae0e19ae Mon Sep 17 00:00:00 2001 From: David Wishnia Date: Mon, 28 Sep 2015 16:26:16 -0700 Subject: [PATCH 1122/5486] Add meta story element --- english/marshmallow.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index bb7fc96e5b..923137c365 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -104,6 +104,10 @@ But you are too quick for the marshmallow! The realization suddenly dawns upon you the marshmallow is self aware! +You try to bury your contribution because you are slightly + +Embarrassed by the exercise. + If you don't do something quickly, this marshmallow belly will digest you! Marshmallows are going to rule the world! From d0bef4e9ab493f866a3bfa6d7dfaf537934f9479 Mon Sep 17 00:00:00 2001 From: TheLonliestMonk Date: Tue, 29 Sep 2015 23:20:14 +0800 Subject: [PATCH 1123/5486] Added my contribution to the story of dream-ception, with two options in the warning directory --- .../dream-ception/dream-ception.md | 6 ++++- english/warning/heed.md | 26 +++++++++++++++++++ english/warning/ignore.md | 4 +++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 english/warning/heed.md create mode 100644 english/warning/ignore.md diff --git a/english/go-back-to-sleep/dream-ception/dream-ception.md b/english/go-back-to-sleep/dream-ception/dream-ception.md index 170032763a..610817418c 100644 --- a/english/go-back-to-sleep/dream-ception/dream-ception.md +++ b/english/go-back-to-sleep/dream-ception/dream-ception.md @@ -1,3 +1,7 @@ His hair is disarrayed, and he smells vaguely like motor oil. -"You are not safe here," he says. \ No newline at end of file +"You are not safe here," he says. + +Do you [ignore](../../warning/ignore.md) or + +[listen to] (../../warning/heed.md) his warning? diff --git a/english/warning/heed.md b/english/warning/heed.md new file mode 100644 index 0000000000..f8d7cc44c9 --- /dev/null +++ b/english/warning/heed.md @@ -0,0 +1,26 @@ +"So what is the problem?" you ask the man with the crazy hair. + +The old man replies, "Within this area there exists a bridge. A bridge to multiple universes." + +As you start to walk away, he continues, "Don't walk away now, I haven't finished." + +"The fabric that keeps these mutliverses from breaking into our reality is thin here. You will +find strange happenings going on. Some of these incursions will be harmless, others can be deadly.", the old man continues. + +"How different are these multiverses?", you ask. + +"Well," he continues, "the basic eveidence of the incursion is a difference in your reality. For instance, +you may see a building where the was none before, or animals that should be extinct or rare. Major +incursions will be evidenced by major changes in the fabric of your reality, such as historical events +playing out differntly. These changes may last briefly, but there is always the danger that they can become your +permanent reality." + +"So how do we stop these excursions?", you ask the old man. + +"Well, it's not as easy as falling off a log, but there is a way. First, we need to ...." + +Suddenly at that moment something which resembles a cross between a shark, man and elephant comes out of nowhere, +grabs the old man with the crazy hair in what can only be described as a trunk and shoved into the razor sharp teeth +lining the jaws of the sharmanphant. + +You stand there drenched in the blodd of the old man with the crazy hair as the sharmanphant turns to you. diff --git a/english/warning/ignore.md b/english/warning/ignore.md new file mode 100644 index 0000000000..069ae68320 --- /dev/null +++ b/english/warning/ignore.md @@ -0,0 +1,4 @@ +You tell him to leave you alone and go back to bed. An hour later you wake to a rustling sound. +Deciding to investigate you go to the other room only to find it filled with rats. There is a moment +of silence when the rats stop moving and stare at you. Then suddenly, as quickly as a flash of lightening +the rats begin to swarm you. From 0e7451ddb1ea066303db9e6b93cba30f99993e47 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Sep 2015 14:55:47 -0400 Subject: [PATCH 1124/5486] add coffee line to story --- english/bite-the-marshmallow/tasty-marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index 8eb9001461..2827649501 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -1,4 +1,4 @@ -"Mmmmm... these marshmallows are soooo good" +"Mmmmm... these marshmallows are soooo good. They would be delicious with a cup of coffee." You close your eyes. From 434a1883bbe5f29889296e009792c0a9f67f3879 Mon Sep 17 00:00:00 2001 From: Mike Desrochers Date: Tue, 29 Sep 2015 13:06:46 -0600 Subject: [PATCH 1125/5486] Add a terrible pun to the bear story --- english/eating-walls/find-a-toilet/door/bear/stand-still.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/eating-walls/find-a-toilet/door/bear/stand-still.md b/english/eating-walls/find-a-toilet/door/bear/stand-still.md index 8045fb802c..52d81ad998 100644 --- a/english/eating-walls/find-a-toilet/door/bear/stand-still.md +++ b/english/eating-walls/find-a-toilet/door/bear/stand-still.md @@ -6,6 +6,8 @@ and all muscle. As you stand there shaking in you boots the bear speaks and asks "You going to be in there long? +I have to use it too. I can bear-ly hold it in!" + Do you: [Try to distract the bear by pointing out an imaginary beehive behind him?](beehive/beehive.md) From 9c3596ade51c3e84383f5451a1238bc992369fef Mon Sep 17 00:00:00 2001 From: Gabriel Oliveira Date: Tue, 29 Sep 2015 16:38:44 -0300 Subject: [PATCH 1126/5486] added a short story about a boat of bugs --- portugues/colaborando.md | 2 ++ portugues/titanic/arrumar/arrumar.md | 3 +++ portugues/titanic/arrumar/arrumar.md~ | 0 portugues/titanic/arrumar/imitar/falha.md | 1 + portugues/titanic/arrumar/imitar/falha.md~ | 0 portugues/titanic/iceberg.md | 5 +++++ portugues/titanic/iceberg.md~ | 0 portugues/titanic/pular/boiar/computador.md | 3 +++ portugues/titanic/pular/boiar/computador.md~ | 0 portugues/titanic/pular/boiar/voce.md | 5 +++++ portugues/titanic/pular/boiar/voce.md~ | 0 portugues/titanic/pular/pular.md | 10 ++++++++++ portugues/titanic/pular/pular.md~ | 0 13 files changed, 29 insertions(+) create mode 100644 portugues/titanic/arrumar/arrumar.md create mode 100644 portugues/titanic/arrumar/arrumar.md~ create mode 100644 portugues/titanic/arrumar/imitar/falha.md create mode 100644 portugues/titanic/arrumar/imitar/falha.md~ create mode 100644 portugues/titanic/iceberg.md create mode 100644 portugues/titanic/iceberg.md~ create mode 100644 portugues/titanic/pular/boiar/computador.md create mode 100644 portugues/titanic/pular/boiar/computador.md~ create mode 100644 portugues/titanic/pular/boiar/voce.md create mode 100644 portugues/titanic/pular/boiar/voce.md~ create mode 100644 portugues/titanic/pular/pular.md create mode 100644 portugues/titanic/pular/pular.md~ diff --git a/portugues/colaborando.md b/portugues/colaborando.md index f0197ae2a4..fb7aee12c9 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -14,3 +14,5 @@ Você: [Cria um aplicativo melhor](cria/melhor.md) [Levanta-se a vai buscar o spray mata insetos](spray/matainsetos.md) + +[Mas esse navio não pode ter bugs!](titanic/iceberg.md) diff --git a/portugues/titanic/arrumar/arrumar.md b/portugues/titanic/arrumar/arrumar.md new file mode 100644 index 0000000000..f2efee1134 --- /dev/null +++ b/portugues/titanic/arrumar/arrumar.md @@ -0,0 +1,3 @@ +Você mesmo com todos os os programadores do barco percebem que não tem mais jeito, e colidem com toda a forca no bugberg. O aplicativo nunca mais abre. + +[Tentar fazer uma imitacão de Di Caprio na proa do barco](imitar/falha.md) diff --git a/portugues/titanic/arrumar/arrumar.md~ b/portugues/titanic/arrumar/arrumar.md~ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portugues/titanic/arrumar/imitar/falha.md b/portugues/titanic/arrumar/imitar/falha.md new file mode 100644 index 0000000000..0b44662141 --- /dev/null +++ b/portugues/titanic/arrumar/imitar/falha.md @@ -0,0 +1 @@ +Você falhou ao tentar imitar Di Caprio, no momento que voce abre os bracos, o navio range e faz um movimento brusco. Você cai na água e percebe que ser um cubo de gelo é o seu novo eu. diff --git a/portugues/titanic/arrumar/imitar/falha.md~ b/portugues/titanic/arrumar/imitar/falha.md~ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portugues/titanic/iceberg.md b/portugues/titanic/iceberg.md new file mode 100644 index 0000000000..ecea987f64 --- /dev/null +++ b/portugues/titanic/iceberg.md @@ -0,0 +1,5 @@ +Nesse momento você percebe que já é tarde demais, e o iceberg de bugs é muito maior que todos esperavam. + +[Tentar arranjar programadores a bordo para arrumar o bug](arrumar/arrumar.md) + +[Desistir de tudo e pular na água](pular/pular.md) diff --git a/portugues/titanic/iceberg.md~ b/portugues/titanic/iceberg.md~ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portugues/titanic/pular/boiar/computador.md b/portugues/titanic/pular/boiar/computador.md new file mode 100644 index 0000000000..c1730aa17f --- /dev/null +++ b/portugues/titanic/pular/boiar/computador.md @@ -0,0 +1,3 @@ +As pessoas não entedem muito bem como um computador chegou a costa em cima de um pedaco de madeira ainda funcionando. Como esse é o computador empresarial que tinha sido cedido a voce pela empresa ele é devolvido ao seu chefe. Ao ver os arquivos, ele nota que voce realmente trabalhou no que ele pediu. Assim que ele roda o seu código ele vê que está cheio de práticas ruins e não funciona muito bem. Você é demitido pós-mortem por causa de um aplicativo mal feito. + +-Witney Huston comeca a tocar- diff --git a/portugues/titanic/pular/boiar/computador.md~ b/portugues/titanic/pular/boiar/computador.md~ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portugues/titanic/pular/boiar/voce.md b/portugues/titanic/pular/boiar/voce.md new file mode 100644 index 0000000000..003d5e80bc --- /dev/null +++ b/portugues/titanic/pular/boiar/voce.md @@ -0,0 +1,5 @@ +Após dias à deriva, voce chega a terra firme. Após ser socorrido, voce volta ao trabalho uma semana depois. + +Seu chefe pergunta sobre o código que você estava trabalhando e deveria ter entregue uma semana atrás. Tristemente você não tinha internet e não pode fazer push do seu trabalho. Você é despedido por que não entregou o código + +-Witney Huston comeca a tocar- diff --git a/portugues/titanic/pular/boiar/voce.md~ b/portugues/titanic/pular/boiar/voce.md~ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portugues/titanic/pular/pular.md b/portugues/titanic/pular/pular.md new file mode 100644 index 0000000000..09a8eaf92f --- /dev/null +++ b/portugues/titanic/pular/pular.md @@ -0,0 +1,10 @@ +Você pula e aterrisa num bote salva-vidas, completamente destruindo-o. +Ao ver que alguns pedacos de madeira flutuando voce decide segurar em um deles. + +O unico problema é que você trouxe consigo um thinkpad de 2005 para fixar os bugs e ele é pesado demais, fazendo com que você e o computador afundem o pedaco de madeira. + +Voc6e agora precisa escolher o seu futuro + +[Deixar o computador boiar à deriva fazedo disso seu sacrífico](boiar/computador.md) + +[Deixar o computador pra trás e boiar a deriva](boiar/voce.md) diff --git a/portugues/titanic/pular/pular.md~ b/portugues/titanic/pular/pular.md~ new file mode 100644 index 0000000000..e69de29bb2 From 1ee4ae840984091f601ee97ad130fd896647402f Mon Sep 17 00:00:00 2001 From: Gabriel Oliveira Date: Tue, 29 Sep 2015 16:48:14 -0300 Subject: [PATCH 1127/5486] apparently i dont know how to write Whitney --- portugues/titanic/pular/boiar/computador.md | 2 +- portugues/titanic/pular/boiar/computador.md~ | 3 +++ portugues/titanic/pular/boiar/voce.md | 2 +- portugues/titanic/pular/boiar/voce.md~ | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/portugues/titanic/pular/boiar/computador.md b/portugues/titanic/pular/boiar/computador.md index c1730aa17f..c3c46c2dc4 100644 --- a/portugues/titanic/pular/boiar/computador.md +++ b/portugues/titanic/pular/boiar/computador.md @@ -1,3 +1,3 @@ As pessoas não entedem muito bem como um computador chegou a costa em cima de um pedaco de madeira ainda funcionando. Como esse é o computador empresarial que tinha sido cedido a voce pela empresa ele é devolvido ao seu chefe. Ao ver os arquivos, ele nota que voce realmente trabalhou no que ele pediu. Assim que ele roda o seu código ele vê que está cheio de práticas ruins e não funciona muito bem. Você é demitido pós-mortem por causa de um aplicativo mal feito. --Witney Huston comeca a tocar- +-Whitney Huston comeca a tocar- diff --git a/portugues/titanic/pular/boiar/computador.md~ b/portugues/titanic/pular/boiar/computador.md~ index e69de29bb2..c1730aa17f 100644 --- a/portugues/titanic/pular/boiar/computador.md~ +++ b/portugues/titanic/pular/boiar/computador.md~ @@ -0,0 +1,3 @@ +As pessoas não entedem muito bem como um computador chegou a costa em cima de um pedaco de madeira ainda funcionando. Como esse é o computador empresarial que tinha sido cedido a voce pela empresa ele é devolvido ao seu chefe. Ao ver os arquivos, ele nota que voce realmente trabalhou no que ele pediu. Assim que ele roda o seu código ele vê que está cheio de práticas ruins e não funciona muito bem. Você é demitido pós-mortem por causa de um aplicativo mal feito. + +-Witney Huston comeca a tocar- diff --git a/portugues/titanic/pular/boiar/voce.md b/portugues/titanic/pular/boiar/voce.md index 003d5e80bc..83e8fc129f 100644 --- a/portugues/titanic/pular/boiar/voce.md +++ b/portugues/titanic/pular/boiar/voce.md @@ -2,4 +2,4 @@ Após dias à deriva, voce chega a terra firme. Após ser socorrido, voce volta Seu chefe pergunta sobre o código que você estava trabalhando e deveria ter entregue uma semana atrás. Tristemente você não tinha internet e não pode fazer push do seu trabalho. Você é despedido por que não entregou o código --Witney Huston comeca a tocar- +-Whitney Huston comeca a tocar- diff --git a/portugues/titanic/pular/boiar/voce.md~ b/portugues/titanic/pular/boiar/voce.md~ index e69de29bb2..003d5e80bc 100644 --- a/portugues/titanic/pular/boiar/voce.md~ +++ b/portugues/titanic/pular/boiar/voce.md~ @@ -0,0 +1,5 @@ +Após dias à deriva, voce chega a terra firme. Após ser socorrido, voce volta ao trabalho uma semana depois. + +Seu chefe pergunta sobre o código que você estava trabalhando e deveria ter entregue uma semana atrás. Tristemente você não tinha internet e não pode fazer push do seu trabalho. Você é despedido por que não entregou o código + +-Witney Huston comeca a tocar- From c8abe29da3df0cc90d534e42bd33657898b1425a Mon Sep 17 00:00:00 2001 From: Gabriel Oliveira Date: Tue, 29 Sep 2015 17:16:28 -0300 Subject: [PATCH 1128/5486] fixed some problems with lines --- portugues/titanic/arrumar/arrumar.md | 4 +++- portugues/titanic/arrumar/imitar/falha.md | 4 +++- portugues/titanic/iceberg.md~ | 0 portugues/titanic/pular/boiar/computador.md | 6 +++++- portugues/titanic/pular/boiar/voce.md | 8 +++++--- portugues/titanic/pular/pular.md | 8 ++++---- 6 files changed, 20 insertions(+), 10 deletions(-) delete mode 100644 portugues/titanic/iceberg.md~ diff --git a/portugues/titanic/arrumar/arrumar.md b/portugues/titanic/arrumar/arrumar.md index f2efee1134..2c9430b384 100644 --- a/portugues/titanic/arrumar/arrumar.md +++ b/portugues/titanic/arrumar/arrumar.md @@ -1,3 +1,5 @@ -Você mesmo com todos os os programadores do barco percebem que não tem mais jeito, e colidem com toda a forca no bugberg. O aplicativo nunca mais abre. +Você mesmo com todos os os programadores do barco percebem que não tem mais jeito. +Assim, vocês colidem com toda a forca no bugberg. +O aplicativo nunca mais abre. [Tentar fazer uma imitacão de Di Caprio na proa do barco](imitar/falha.md) diff --git a/portugues/titanic/arrumar/imitar/falha.md b/portugues/titanic/arrumar/imitar/falha.md index 0b44662141..88815150f0 100644 --- a/portugues/titanic/arrumar/imitar/falha.md +++ b/portugues/titanic/arrumar/imitar/falha.md @@ -1 +1,3 @@ -Você falhou ao tentar imitar Di Caprio, no momento que voce abre os bracos, o navio range e faz um movimento brusco. Você cai na água e percebe que ser um cubo de gelo é o seu novo eu. +Você falhou ao tentar imitar Di Caprio. +No momento que voce abre os bracos, o navio range e faz um movimento brusco. +Você cai na água e percebe que ser um cubo de gelo é o seu novo eu. diff --git a/portugues/titanic/iceberg.md~ b/portugues/titanic/iceberg.md~ deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/portugues/titanic/pular/boiar/computador.md b/portugues/titanic/pular/boiar/computador.md index c3c46c2dc4..8f8999ade2 100644 --- a/portugues/titanic/pular/boiar/computador.md +++ b/portugues/titanic/pular/boiar/computador.md @@ -1,3 +1,7 @@ -As pessoas não entedem muito bem como um computador chegou a costa em cima de um pedaco de madeira ainda funcionando. Como esse é o computador empresarial que tinha sido cedido a voce pela empresa ele é devolvido ao seu chefe. Ao ver os arquivos, ele nota que voce realmente trabalhou no que ele pediu. Assim que ele roda o seu código ele vê que está cheio de práticas ruins e não funciona muito bem. Você é demitido pós-mortem por causa de um aplicativo mal feito. +As pessoas não entedem muito bem como um computador chegou a costa em cima de um pedaco de madeira ainda funcionando. +Como esse é o computador empresarial que tinha sido cedido a voce pela empresa ele é devolvido ao seu chefe. +Ao ver os arquivos, ele nota que voce realmente trabalhou no que ele pediu. +Assim que ele roda o seu código ele vê que está cheio de práticas ruins e não funciona muito bem. +Você é demitido pós-mortem por causa de um aplicativo mal feito. -Whitney Huston comeca a tocar- diff --git a/portugues/titanic/pular/boiar/voce.md b/portugues/titanic/pular/boiar/voce.md index 83e8fc129f..c0f69bedea 100644 --- a/portugues/titanic/pular/boiar/voce.md +++ b/portugues/titanic/pular/boiar/voce.md @@ -1,5 +1,7 @@ -Após dias à deriva, voce chega a terra firme. Após ser socorrido, voce volta ao trabalho uma semana depois. - -Seu chefe pergunta sobre o código que você estava trabalhando e deveria ter entregue uma semana atrás. Tristemente você não tinha internet e não pode fazer push do seu trabalho. Você é despedido por que não entregou o código +Após dias à deriva, voce chega a terra firme. +Após ser socorrido, voce volta ao trabalho uma semana depois. +Seu chefe pergunta sobre o código que você estava trabalhando e deveria ter entregue uma semana atrás. +Tristemente você não tinha internet e não pode fazer push do seu trabalho. +Você é despedido por que não entregou o código. -Whitney Huston comeca a tocar- diff --git a/portugues/titanic/pular/pular.md b/portugues/titanic/pular/pular.md index 09a8eaf92f..923fc9bc0a 100644 --- a/portugues/titanic/pular/pular.md +++ b/portugues/titanic/pular/pular.md @@ -1,9 +1,9 @@ Você pula e aterrisa num bote salva-vidas, completamente destruindo-o. Ao ver que alguns pedacos de madeira flutuando voce decide segurar em um deles. - -O unico problema é que você trouxe consigo um thinkpad de 2005 para fixar os bugs e ele é pesado demais, fazendo com que você e o computador afundem o pedaco de madeira. - -Voc6e agora precisa escolher o seu futuro +O unico problema é que você trouxe consigo um thinkpad de 2005 para fixar os bugs. +Ele é pesado demais. +Você e o computador comecam a afundar o pedaco de madeira. +Você agora precisa escolher o seu futuro [Deixar o computador boiar à deriva fazedo disso seu sacrífico](boiar/computador.md) From c2703e8ca8cb42e0c9b8fee6dd352a2d1dc30c80 Mon Sep 17 00:00:00 2001 From: Sowee0 Date: Tue, 29 Sep 2015 17:19:39 -0300 Subject: [PATCH 1129/5486] Delete pular.md~ --- portugues/titanic/pular/pular.md~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 portugues/titanic/pular/pular.md~ diff --git a/portugues/titanic/pular/pular.md~ b/portugues/titanic/pular/pular.md~ deleted file mode 100644 index e69de29bb2..0000000000 From 05560f8dcc0f78d5c9aedf9935724d01906b812c Mon Sep 17 00:00:00 2001 From: Sowee0 Date: Tue, 29 Sep 2015 17:19:57 -0300 Subject: [PATCH 1130/5486] Delete computador.md~ --- portugues/titanic/pular/boiar/computador.md~ | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 portugues/titanic/pular/boiar/computador.md~ diff --git a/portugues/titanic/pular/boiar/computador.md~ b/portugues/titanic/pular/boiar/computador.md~ deleted file mode 100644 index c1730aa17f..0000000000 --- a/portugues/titanic/pular/boiar/computador.md~ +++ /dev/null @@ -1,3 +0,0 @@ -As pessoas não entedem muito bem como um computador chegou a costa em cima de um pedaco de madeira ainda funcionando. Como esse é o computador empresarial que tinha sido cedido a voce pela empresa ele é devolvido ao seu chefe. Ao ver os arquivos, ele nota que voce realmente trabalhou no que ele pediu. Assim que ele roda o seu código ele vê que está cheio de práticas ruins e não funciona muito bem. Você é demitido pós-mortem por causa de um aplicativo mal feito. - --Witney Huston comeca a tocar- From 521dd0b9161c48585d36774486a402ad61bf3cb9 Mon Sep 17 00:00:00 2001 From: Sowee0 Date: Tue, 29 Sep 2015 17:20:09 -0300 Subject: [PATCH 1131/5486] Delete voce.md~ --- portugues/titanic/pular/boiar/voce.md~ | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 portugues/titanic/pular/boiar/voce.md~ diff --git a/portugues/titanic/pular/boiar/voce.md~ b/portugues/titanic/pular/boiar/voce.md~ deleted file mode 100644 index 003d5e80bc..0000000000 --- a/portugues/titanic/pular/boiar/voce.md~ +++ /dev/null @@ -1,5 +0,0 @@ -Após dias à deriva, voce chega a terra firme. Após ser socorrido, voce volta ao trabalho uma semana depois. - -Seu chefe pergunta sobre o código que você estava trabalhando e deveria ter entregue uma semana atrás. Tristemente você não tinha internet e não pode fazer push do seu trabalho. Você é despedido por que não entregou o código - --Witney Huston comeca a tocar- From 2bad6cffdeb681f857a0ea6e4ee67495a3bf34fb Mon Sep 17 00:00:00 2001 From: Sowee0 Date: Tue, 29 Sep 2015 17:20:28 -0300 Subject: [PATCH 1132/5486] Delete arrumar.md~ --- portugues/titanic/arrumar/arrumar.md~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 portugues/titanic/arrumar/arrumar.md~ diff --git a/portugues/titanic/arrumar/arrumar.md~ b/portugues/titanic/arrumar/arrumar.md~ deleted file mode 100644 index e69de29bb2..0000000000 From b946f0571a5e0c9b8303c9250486ae9979145e1d Mon Sep 17 00:00:00 2001 From: Sowee0 Date: Tue, 29 Sep 2015 17:21:04 -0300 Subject: [PATCH 1133/5486] Delete falha.md~ --- portugues/titanic/arrumar/imitar/falha.md~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 portugues/titanic/arrumar/imitar/falha.md~ diff --git a/portugues/titanic/arrumar/imitar/falha.md~ b/portugues/titanic/arrumar/imitar/falha.md~ deleted file mode 100644 index e69de29bb2..0000000000 From cac79f14dc0a589d2f0fc9dbf743fa74dcffdfcd Mon Sep 17 00:00:00 2001 From: Florin Bota Date: Tue, 29 Sep 2015 23:28:38 +0300 Subject: [PATCH 1134/5486] Beau tot --- romanian/Beau/Beau_paharul_pana_la_fund.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 romanian/Beau/Beau_paharul_pana_la_fund.md diff --git a/romanian/Beau/Beau_paharul_pana_la_fund.md b/romanian/Beau/Beau_paharul_pana_la_fund.md new file mode 100644 index 0000000000..bb0ca56671 --- /dev/null +++ b/romanian/Beau/Beau_paharul_pana_la_fund.md @@ -0,0 +1 @@ +Ginel ca un adevarat mafiot bau tot, ca era de menta. \ No newline at end of file From e95f774e9a68ef3f1845bd33ef4564bf0da20f55 Mon Sep 17 00:00:00 2001 From: Gabriel Oliveira Date: Tue, 29 Sep 2015 17:32:42 -0300 Subject: [PATCH 1135/5486] fixed the separated folders --- portugues/titanic/pular/boiar/{ => computador}/computador.md | 0 portugues/titanic/pular/boiar/{ => voce}/voce.md | 0 portugues/titanic/pular/pular.md | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename portugues/titanic/pular/boiar/{ => computador}/computador.md (100%) rename portugues/titanic/pular/boiar/{ => voce}/voce.md (100%) diff --git a/portugues/titanic/pular/boiar/computador.md b/portugues/titanic/pular/boiar/computador/computador.md similarity index 100% rename from portugues/titanic/pular/boiar/computador.md rename to portugues/titanic/pular/boiar/computador/computador.md diff --git a/portugues/titanic/pular/boiar/voce.md b/portugues/titanic/pular/boiar/voce/voce.md similarity index 100% rename from portugues/titanic/pular/boiar/voce.md rename to portugues/titanic/pular/boiar/voce/voce.md diff --git a/portugues/titanic/pular/pular.md b/portugues/titanic/pular/pular.md index 923fc9bc0a..1fde9d31a9 100644 --- a/portugues/titanic/pular/pular.md +++ b/portugues/titanic/pular/pular.md @@ -5,6 +5,6 @@ Ele é pesado demais. Você e o computador comecam a afundar o pedaco de madeira. Você agora precisa escolher o seu futuro -[Deixar o computador boiar à deriva fazedo disso seu sacrífico](boiar/computador.md) +[Deixar o computador boiar à deriva fazedo disso seu sacrífico](boiar/computador/computador.md) -[Deixar o computador pra trás e boiar a deriva](boiar/voce.md) +[Deixar o computador pra trás e boiar a deriva](boiar/voce/voce.md) From faa26945f66aa2dbd6802f675854f7c222845437 Mon Sep 17 00:00:00 2001 From: Florin Bota Date: Tue, 29 Sep 2015 23:32:45 +0300 Subject: [PATCH 1136/5486] Adaugat link catre beau_paharul_pana_la_fund --- romanian/nalba.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/romanian/nalba.md b/romanian/nalba.md index 26e42b1b70..4ba6b24947 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -66,3 +66,5 @@ sau... Bineinteles ca o sa bea. Ginel stia ca asta inseamna sa fii mafiot la urma urmei (bautura si femei). +[Beau tot](Beau/Beau_paharul_pana_la_fund.md) + From 122a7616f57f2a50b3ddbfa7d49373756f966239 Mon Sep 17 00:00:00 2001 From: Cody Barnes Date: Tue, 29 Sep 2015 14:57:36 -0700 Subject: [PATCH 1137/5486] Added lightsaber option to marshmallow.md/created lightsaber folder in english --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 923137c365..66473dbc6a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -498,6 +498,8 @@ Click [here](young/young.md) to listen to music. [Consult Flann O'Brien](flann-o-brien/truth-is-odd.md) +[Attack it with a lightsaber](lightsaber/lightsaber.md) + [It's time to take a vacation] (licked-cat/vacation.md) And then you realize that Burning Man is over, so no real vacations :( From c32e9783efa794ec8701a1e1d17b2ed551724621 Mon Sep 17 00:00:00 2001 From: Cody Barnes Date: Tue, 29 Sep 2015 15:21:02 -0700 Subject: [PATCH 1138/5486] Added lightsaber.md --- english/lightsaber/lightsaber.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/lightsaber/lightsaber.md diff --git a/english/lightsaber/lightsaber.md b/english/lightsaber/lightsaber.md new file mode 100644 index 0000000000..d2d66ec0ba --- /dev/null +++ b/english/lightsaber/lightsaber.md @@ -0,0 +1,3 @@ +You slice through the marshmallow man with your lightsaber. +Luckily for you, the heat from it cooks the marshmallows to perfection. +You now have a tasty snack and a way out of the house. \ No newline at end of file From 50a87e4075a979a11c00957016f9e683ec7f8a93 Mon Sep 17 00:00:00 2001 From: kike mendez Date: Tue, 29 Sep 2015 21:44:55 -0300 Subject: [PATCH 1139/5486] a new story has been added. --- espanol/canudos.md | 2 ++ espanol/comandante/almirante/almirante.md | 1 + espanol/comandante/comandante.md | 4 ++++ 3 files changed, 7 insertions(+) create mode 100644 espanol/comandante/almirante/almirante.md create mode 100644 espanol/comandante/comandante.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 46ec1dc38b..0f12e775be 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -57,3 +57,5 @@ el Consejero: [Un ejercito de angeles para ayudar a los guerreros.](angeles/angeles.md) [En el rincón donde dormía, el beatito...](beatito/beatito.md) + +[Llamo a su comandante en jefe..](comandante/comandante.md) diff --git a/espanol/comandante/almirante/almirante.md b/espanol/comandante/almirante/almirante.md new file mode 100644 index 0000000000..23a4827915 --- /dev/null +++ b/espanol/comandante/almirante/almirante.md @@ -0,0 +1 @@ +El almirate tiger woods estaba muy feliz por la recomendacion de chuck asi que le dedico un hoyo en uno en su honor!! diff --git a/espanol/comandante/comandante.md b/espanol/comandante/comandante.md new file mode 100644 index 0000000000..14eadac9f5 --- /dev/null +++ b/espanol/comandante/comandante.md @@ -0,0 +1,4 @@ +El comandante en jefe chuck norris, mas conocido como walker ranger de texas, estaba de vacaciones en punta del este. +Al enterarse de dichos acontecimientos recomendo llamar al almirante tiger woods + +[Llamar al almirante..](almirante/almirante.md) From d07b80750e529c723c63c510fffd5592b183418c Mon Sep 17 00:00:00 2001 From: kfranks7 Date: Tue, 29 Sep 2015 22:54:40 -0400 Subject: [PATCH 1140/5486] Must have tri-suit! --- english/triathlon/triathlon.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/english/triathlon/triathlon.md b/english/triathlon/triathlon.md index ef5c79c68c..16e478ddee 100644 --- a/english/triathlon/triathlon.md +++ b/english/triathlon/triathlon.md @@ -7,3 +7,8 @@ You click on the [IRONMAN](http://www.ironman.com) link on the wikipedia page. There happens to be a race very close to you and you sign up. What the? did I just do? +It's only noon, and the race is 6 months away. You must train. +After one hour perusing pictures of glorious triathlon victories, you realize +the true key to success is all in your tri-suit. +You head over to [Amazon](http://www.amazon.com) to spend the rest of your day +reading reviews. From aecf55af72dc2b76740f1e5936aef3c022337ea8 Mon Sep 17 00:00:00 2001 From: TheLonliestMonk Date: Wed, 30 Sep 2015 11:33:51 +0800 Subject: [PATCH 1141/5486] reformatted story files, separated out two story files to separate directories --- .../dream-ception/dream-ception.md | 4 +-- english/warning-heed/heed.md | 28 +++++++++++++++++++ english/warning-ignore/ignore.md | 5 ++++ english/warning/heed.md | 26 ----------------- english/warning/ignore.md | 4 --- 5 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 english/warning-heed/heed.md create mode 100644 english/warning-ignore/ignore.md delete mode 100644 english/warning/heed.md delete mode 100644 english/warning/ignore.md diff --git a/english/go-back-to-sleep/dream-ception/dream-ception.md b/english/go-back-to-sleep/dream-ception/dream-ception.md index 610817418c..4acfe765d9 100644 --- a/english/go-back-to-sleep/dream-ception/dream-ception.md +++ b/english/go-back-to-sleep/dream-ception/dream-ception.md @@ -2,6 +2,6 @@ His hair is disarrayed, and he smells vaguely like motor oil. "You are not safe here," he says. -Do you [ignore](../../warning/ignore.md) or +Do you [ignore](../../warning-ignore/ignore.md) or -[listen to] (../../warning/heed.md) his warning? +[listen to] (../../warning-heed/heed.md) his warning? diff --git a/english/warning-heed/heed.md b/english/warning-heed/heed.md new file mode 100644 index 0000000000..91e4e89b68 --- /dev/null +++ b/english/warning-heed/heed.md @@ -0,0 +1,28 @@ +"So what is the problem?" you ask the man with the crazy hair. + +The old man replies, "Within this area there exists a bridge to multiple +universes." +As you start to walk away, he continues, "Don't walk away now, I haven't +finished." +"The fabric that keeps these mutliverses from breaking into our reality is +thin here. You will find strange happenings going on. Some of these incursions +will be harmless, others can be deadly.", the old man continues. +"How different are these multiverses?", you ask. +"Well," he continues, "the basic eveidence of the incursion is a difference +in your reality. For instance, you may see a building where the was none +before, people you thought were dead are now alive or vice versa, as well +seeing animals that should be extinct or rare. Major incursions will be +evidenced by major changes in the fabric of your reality, such as historical +events playing out differntly than you remember. These changes may last +briefly, but there is always the danger that they can become youri permanent +reality." +"So how do we stop these excursions?", you ask the old man. +"Well, it's not as easy as falling off a log, but there is a way. +First, we need to get some kalimoxto, then we need to ...." +Suddenly at that moment something which resembles a cross between a shark, +man and elephant comes out of nowhere, grabs the old man with the crazy hair +in what can only be described as a trunk and shoved into the razor sharp teeth +lining the jaws of the sharmanphant. + +You stand there drenched in the blodd of the old man with the crazy hair as the +sharmanphant slowly turns towards you, blood dripping from its teeth... diff --git a/english/warning-ignore/ignore.md b/english/warning-ignore/ignore.md new file mode 100644 index 0000000000..debdc6af2a --- /dev/null +++ b/english/warning-ignore/ignore.md @@ -0,0 +1,5 @@ +You tell him to leave you alone and go back to bed. An hour later you wake +to a rustling sound. Deciding to investigate you go to the other room only +to find it filled with rats. There is a moment of silence when the rats stop +moving and stare at you. Then suddenly, as quickly as a flash of lightening +the rats begin to swarm you. diff --git a/english/warning/heed.md b/english/warning/heed.md deleted file mode 100644 index f8d7cc44c9..0000000000 --- a/english/warning/heed.md +++ /dev/null @@ -1,26 +0,0 @@ -"So what is the problem?" you ask the man with the crazy hair. - -The old man replies, "Within this area there exists a bridge. A bridge to multiple universes." - -As you start to walk away, he continues, "Don't walk away now, I haven't finished." - -"The fabric that keeps these mutliverses from breaking into our reality is thin here. You will -find strange happenings going on. Some of these incursions will be harmless, others can be deadly.", the old man continues. - -"How different are these multiverses?", you ask. - -"Well," he continues, "the basic eveidence of the incursion is a difference in your reality. For instance, -you may see a building where the was none before, or animals that should be extinct or rare. Major -incursions will be evidenced by major changes in the fabric of your reality, such as historical events -playing out differntly. These changes may last briefly, but there is always the danger that they can become your -permanent reality." - -"So how do we stop these excursions?", you ask the old man. - -"Well, it's not as easy as falling off a log, but there is a way. First, we need to ...." - -Suddenly at that moment something which resembles a cross between a shark, man and elephant comes out of nowhere, -grabs the old man with the crazy hair in what can only be described as a trunk and shoved into the razor sharp teeth -lining the jaws of the sharmanphant. - -You stand there drenched in the blodd of the old man with the crazy hair as the sharmanphant turns to you. diff --git a/english/warning/ignore.md b/english/warning/ignore.md deleted file mode 100644 index 069ae68320..0000000000 --- a/english/warning/ignore.md +++ /dev/null @@ -1,4 +0,0 @@ -You tell him to leave you alone and go back to bed. An hour later you wake to a rustling sound. -Deciding to investigate you go to the other room only to find it filled with rats. There is a moment -of silence when the rats stop moving and stare at you. Then suddenly, as quickly as a flash of lightening -the rats begin to swarm you. From f87c65999c383ead2392b47e493693edb2d90932 Mon Sep 17 00:00:00 2001 From: Ramiro Oliveira Date: Wed, 30 Sep 2015 13:46:34 +0100 Subject: [PATCH 1142/5486] computador salvou-se --- portugues/titanic/pular/boiar/voce/voce.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/portugues/titanic/pular/boiar/voce/voce.md b/portugues/titanic/pular/boiar/voce/voce.md index c0f69bedea..e61a457302 100644 --- a/portugues/titanic/pular/boiar/voce/voce.md +++ b/portugues/titanic/pular/boiar/voce/voce.md @@ -5,3 +5,7 @@ Tristemente você não tinha internet e não pode fazer push do seu trabalho. Você é despedido por que não entregou o código. -Whitney Huston comeca a tocar- + +Você vai dar uma volta pela praia, e você vê algo que parece o seu portátil. +Vendo mais de perto, é mesmo o seu portátil. Você leva para casa e como é um Thinkpad você consegue recuperar [seus dados](https://www.youtube.com/watch?v=3KXx-Kys-Fk) +Você toma uma decisão. From 578aa828f5d5a6cd3f11dc0cd6093f8ef6b48556 Mon Sep 17 00:00:00 2001 From: Ramiro Oliveira Date: Wed, 30 Sep 2015 13:49:42 +0100 Subject: [PATCH 1143/5486] Formatar linhas --- portugues/titanic/pular/boiar/voce/voce.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/titanic/pular/boiar/voce/voce.md b/portugues/titanic/pular/boiar/voce/voce.md index e61a457302..53649e7960 100644 --- a/portugues/titanic/pular/boiar/voce/voce.md +++ b/portugues/titanic/pular/boiar/voce/voce.md @@ -7,5 +7,7 @@ Você é despedido por que não entregou o código. -Whitney Huston comeca a tocar- Você vai dar uma volta pela praia, e você vê algo que parece o seu portátil. + Vendo mais de perto, é mesmo o seu portátil. Você leva para casa e como é um Thinkpad você consegue recuperar [seus dados](https://www.youtube.com/watch?v=3KXx-Kys-Fk) + Você toma uma decisão. From 1b3ffb9e2de2a03e1567b1909065f934991a1d5f Mon Sep 17 00:00:00 2001 From: RamiroOliveira Date: Wed, 30 Sep 2015 13:54:16 +0100 Subject: [PATCH 1144/5486] Update voce.md --- portugues/titanic/pular/boiar/voce/voce.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/titanic/pular/boiar/voce/voce.md b/portugues/titanic/pular/boiar/voce/voce.md index 53649e7960..cf0e056461 100644 --- a/portugues/titanic/pular/boiar/voce/voce.md +++ b/portugues/titanic/pular/boiar/voce/voce.md @@ -8,6 +8,8 @@ Você é despedido por que não entregou o código. Você vai dar uma volta pela praia, e você vê algo que parece o seu portátil. -Vendo mais de perto, é mesmo o seu portátil. Você leva para casa e como é um Thinkpad você consegue recuperar [seus dados](https://www.youtube.com/watch?v=3KXx-Kys-Fk) +Vendo mais de perto, é mesmo o seu portátil. + +Você leva até casa, como é um Thinkpad você consegue recuperar [seus dados](https://www.youtube.com/watch?v=3KXx-Kys-Fk) Você toma uma decisão. From a9cd366198b43d054648b6f3e87eba4782050f05 Mon Sep 17 00:00:00 2001 From: dr Date: Wed, 30 Sep 2015 13:44:42 -0400 Subject: [PATCH 1145/5486] add story to french 'manger le miel' story line --- french/dessine/miel/forest/approcher.md | 5 ++++- french/dessine/miel/forest/fuite/fuite.md | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 french/dessine/miel/forest/fuite/fuite.md diff --git a/french/dessine/miel/forest/approcher.md b/french/dessine/miel/forest/approcher.md index 08b03e1912..bc84665b6b 100644 --- a/french/dessine/miel/forest/approcher.md +++ b/french/dessine/miel/forest/approcher.md @@ -1,3 +1,6 @@ C'est malheureusement bien ce que j'avais pressenti: un ours me regarde goulument! -Si seulement je pouvais lui parler et lui demander pitie...! +Si seulement je pouvais lui parler et lui demander pitie! Je décide de... + +[Partir a courrir pour me sauver de l'ours](fuite/fuite.md) + diff --git a/french/dessine/miel/forest/fuite/fuite.md b/french/dessine/miel/forest/fuite/fuite.md new file mode 100644 index 0000000000..7b45e64aad --- /dev/null +++ b/french/dessine/miel/forest/fuite/fuite.md @@ -0,0 +1 @@ +Je decide de me sauver de l'ours en courrant vers la porte par laquelle je suis passe. Apres quelques pas l'ours m'a rattrape et se delecte du miel... \ No newline at end of file From d6201b211808264b78456e90448a8676bf0fe920 Mon Sep 17 00:00:00 2001 From: dr Date: Wed, 30 Sep 2015 14:15:35 -0400 Subject: [PATCH 1146/5486] remove deletion --- french/dessine/miel/forest/approcher.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/french/dessine/miel/forest/approcher.md b/french/dessine/miel/forest/approcher.md index bc84665b6b..f224214aa1 100644 --- a/french/dessine/miel/forest/approcher.md +++ b/french/dessine/miel/forest/approcher.md @@ -1,6 +1,8 @@ C'est malheureusement bien ce que j'avais pressenti: un ours me regarde goulument! -Si seulement je pouvais lui parler et lui demander pitie! Je décide de... +Si seulement je pouvais lui parler et lui demander pitie...! + +Je décide de... [Partir a courrir pour me sauver de l'ours](fuite/fuite.md) From 7d2ac96b70ceadf3d29296b06138fb380a839d98 Mon Sep 17 00:00:00 2001 From: dr Date: Wed, 30 Sep 2015 14:21:19 -0400 Subject: [PATCH 1147/5486] split line into smaller lines --- french/dessine/miel/forest/fuite/fuite.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/french/dessine/miel/forest/fuite/fuite.md b/french/dessine/miel/forest/fuite/fuite.md index 7b45e64aad..b55105e2da 100644 --- a/french/dessine/miel/forest/fuite/fuite.md +++ b/french/dessine/miel/forest/fuite/fuite.md @@ -1 +1,2 @@ -Je decide de me sauver de l'ours en courrant vers la porte par laquelle je suis passe. Apres quelques pas l'ours m'a rattrape et se delecte du miel... \ No newline at end of file +Je decide de me sauver de l'ours en courrant vers la porte par laquelle je +suis passe. Apres quelques pas l'ours m'a rattrape et se delecte du miel... \ No newline at end of file From dc7b45d15286b862e6ebde7f2131183564368b16 Mon Sep 17 00:00:00 2001 From: Eyal C Date: Thu, 1 Oct 2015 17:17:39 +0300 Subject: [PATCH 1148/5486] Create new path for story --- hebrew/sane-option/fresh-start.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 hebrew/sane-option/fresh-start.md diff --git a/hebrew/sane-option/fresh-start.md b/hebrew/sane-option/fresh-start.md new file mode 100644 index 0000000000..93aa37a259 --- /dev/null +++ b/hebrew/sane-option/fresh-start.md @@ -0,0 +1,3 @@ +אתה מתעורר בבוקר, ורואה קירות עשויים ממרשמלו. + +ברגע הראשון, לא ברור לך מה לעשות, אבל אתה מתעשת ומחליט לעשות משהו. \ No newline at end of file From abca4f9830bdd4024d112e5fbbad675a7394f7b0 Mon Sep 17 00:00:00 2001 From: Eyal C Date: Thu, 1 Oct 2015 17:18:35 +0300 Subject: [PATCH 1149/5486] Added anothe option - a sane one :) --- hebrew/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hebrew/marshmallow.md b/hebrew/marshmallow.md index ce7ac73155..8d4a5b581c 100644 --- a/hebrew/marshmallow.md +++ b/hebrew/marshmallow.md @@ -7,3 +7,5 @@ [תזיין את בר רפאלי](bar/bar.md) [תזיין את אחותך](sister/your-sister.md) + +[אתה קורא את מה שכתוב, יוצא מההלם, ומפחש אופציה שפויה](sane-option/fresh-start.md) \ No newline at end of file From c2bf7e4ab2d114bdb3c9a638b9055906c56777ea Mon Sep 17 00:00:00 2001 From: Eyal C Date: Thu, 1 Oct 2015 17:25:44 +0300 Subject: [PATCH 1150/5486] misspell correction --- hebrew/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hebrew/marshmallow.md b/hebrew/marshmallow.md index 8d4a5b581c..523f7e4637 100644 --- a/hebrew/marshmallow.md +++ b/hebrew/marshmallow.md @@ -8,4 +8,4 @@ [תזיין את אחותך](sister/your-sister.md) -[אתה קורא את מה שכתוב, יוצא מההלם, ומפחש אופציה שפויה](sane-option/fresh-start.md) \ No newline at end of file +[אתה קורא את מה שכתוב, יוצא מההלם, ומחפש אופציה שפויה](sane-option/fresh-start.md) \ No newline at end of file From 7a5270d939d910eccf3dfd5a883bfd8eec94b62d Mon Sep 17 00:00:00 2001 From: spoon Date: Thu, 1 Oct 2015 21:40:59 +0700 Subject: [PATCH 1151/5486] Add a line of story into Thai food experience story. --- Thai/Cuisine/TomYumKung.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Thai/Cuisine/TomYumKung.md b/Thai/Cuisine/TomYumKung.md index 0563bbf877..ec2a709a2d 100644 --- a/Thai/Cuisine/TomYumKung.md +++ b/Thai/Cuisine/TomYumKung.md @@ -6,6 +6,7 @@ I had Thai food once and it was hot! Please try to taste Tom Yum Kung when you found Thai restaurant around you. +You may also want to try Kang-kiew-wan. Do you: [eat Thai food with Japanese beer](../../japanese/beer/beer.md) From 6d3a6903c95c300079a4d8381fb9a2098f367a90 Mon Sep 17 00:00:00 2001 From: Larry Natalicio Date: Thu, 1 Oct 2015 13:53:07 -0400 Subject: [PATCH 1152/5486] added my file --- english/goto/goto.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/goto/goto.md diff --git a/english/goto/goto.md b/english/goto/goto.md new file mode 100644 index 0000000000..f59841bf25 --- /dev/null +++ b/english/goto/goto.md @@ -0,0 +1,3 @@ +Go to goole.com + +[Here's the link](https://www.google.com) \ No newline at end of file From 64fe8161f207f610042f1acffbd65092fe10e9de Mon Sep 17 00:00:00 2001 From: Larry Natalicio Date: Thu, 1 Oct 2015 14:10:24 -0400 Subject: [PATCH 1153/5486] added link to marshmallow page for my created file --- english/eating-walls/eating-marshmallows.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/eating-walls/eating-marshmallows.md b/english/eating-walls/eating-marshmallows.md index 2c50c67747..215236a7bb 100644 --- a/english/eating-walls/eating-marshmallows.md +++ b/english/eating-walls/eating-marshmallows.md @@ -46,4 +46,6 @@ Do you: [Remember the advice your mother gave you:](../advice_from_mother/advice_from_mother.md) -[Succumb] (../madness/cthulhu.md) to the madness. \ No newline at end of file +[Succumb] (../madness/cthulhu.md) to the madness. + +[Goto] (../goto/goto.md) google. \ No newline at end of file From 4fd09ea37ba79dee1085f626770c78a5e34aa823 Mon Sep 17 00:00:00 2001 From: Edpo Natalicio Date: Thu, 1 Oct 2015 14:40:21 -0400 Subject: [PATCH 1154/5486] Addition to the story - Success --- english/Rules to Success/Rules.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 english/Rules to Success/Rules.txt diff --git a/english/Rules to Success/Rules.txt b/english/Rules to Success/Rules.txt new file mode 100644 index 0000000000..c540430a89 --- /dev/null +++ b/english/Rules to Success/Rules.txt @@ -0,0 +1,17 @@ +Get comfortable being uncomfortable. Get outside your comfort zone on a regular basis. The more you do, the wider that area becomes. Things that used to seem impossible can become part of your everyday life. +Never quit. Unless you're doing something you should stop doing. Just because something doesn't work out the first time doesn't mean there isn't a different approach or a better way to do it. We used to say in the Teams, "Plan your dive and dive your plan." Don't change course just because you face obstacles. +Know the difference between preparation and planning. Plans are great and essential for success. But preparation and execution are what gets it done. As General Patton once said, "A good plan executed violently today is far better than a great plan tomorrow." +Eat the elephant one bite at a time. Setting and achieving lofty goals is great. But those big, far-reaching goals mean nothing without a series of more near-term strategic achievable goals and milestone set along that path to the achievement of the larger goal. Break the big goals into bite-size chunks, making them less daunting and more achievable. +Never stop moving forward. One of my favorite quotes from Martin Luther King Jr. says, "If you can't fly, you run; if you can't run, you walk; and if you can't walk, you crawl. But no matter what, you keep moving forward." If you are not focusing on improving your life and career every day, things will stagnate. If you aren't always trying to improve, then what's the point? +Measure everything that is important. If you aren't measuring the success of your activities, there isn't much chance they will thrive. But if you do, there is little chance they won't improve. +Manage everything that is important. I don't know how many times I've set something on cruise control to focus on other initiatives only to circle back later to find things either in shambles or with zero progress. It doesn't have to be you, but someone needs to be actively managing the important aspects of your business or life. +Know that life isn't fair. I've been in combat, lost brothers, spent years as a single dad while trying to lead a company, gone through costly divorce, battled to maintain much needed full custody of my son, and worked hard to recover from inevitable business mistakes. But God doesn't put us in situations we can't handle. He blessed me with the most amazing wife who saved my life. And she blessed us with a beautiful baby girl. Then she was born with a birth defect and spent a month in the neonatal intensive care unit. That's life. As long as you take every day knowing things aren't fair, you'll be just fine. Never be out of the fight. +Laugh when you would rather cry. There is always a reason to smile, especially when you are leading a team. Positivity and calmness are contagious. As is panic. Decide what type of environment you want to promote. Lead by example. +Know the difference between skill and success. The world is full of highly skilled people or teams that fall short of achieving true success. In SEAL training, often it was the most elite athletes who were the first to quit. Although they had the physicality, they lacked the mental fortitude to compete and win at that level. They lacked the ability to adapt. We have to be able to bridge the gap between skill and applying that skill to achieving goals. +Surround yourself with subject-matter experts. And then take credit for all of their work. Just joking! I would never be where I am today without my wife, business partners, advisers, and our amazing team. I am the least important person at my company. As soon as I realized that, I knew how to get out of the way. + + + + + +source : http://www.inc.com/brent-gleeson/11-proven-rules-for-success.html \ No newline at end of file From 666e3dc19aaa56a9ad952fc1c00dd8c7a5bfec02 Mon Sep 17 00:00:00 2001 From: isabelzv Date: Thu, 1 Oct 2015 13:40:32 -0600 Subject: [PATCH 1155/5486] Add link to honest trailer --- english/I'm-batman/batman.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index 04e36016f8..4798983b69 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -3,3 +3,6 @@ Did you know that your parents died and you are left with Wayne Manor? Golly Gos Be careful of the Joker! [Realize that you are Batman and have the Utility Belt on you. Yeah!!!](https://youtu.be/YpIQQeL2ZYk?t=22s) + +Alfred Pennyworth: Why do we fall sir? So we might learn to pick ourselves up. +Bruce Wayne: You still haven't given up on [me](https://www.youtube.com/watch?v=u843KNE-exo)? From 79f747d9f0fda1da103b178872d41b3ef99b5734 Mon Sep 17 00:00:00 2001 From: Edpo Natalicio Date: Thu, 1 Oct 2015 18:48:01 -0400 Subject: [PATCH 1156/5486] New changes to story --- english/Rules to Success/Rules.txt | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/english/Rules to Success/Rules.txt b/english/Rules to Success/Rules.txt index c540430a89..b9930b9938 100644 --- a/english/Rules to Success/Rules.txt +++ b/english/Rules to Success/Rules.txt @@ -1,17 +1 @@ Get comfortable being uncomfortable. Get outside your comfort zone on a regular basis. The more you do, the wider that area becomes. Things that used to seem impossible can become part of your everyday life. -Never quit. Unless you're doing something you should stop doing. Just because something doesn't work out the first time doesn't mean there isn't a different approach or a better way to do it. We used to say in the Teams, "Plan your dive and dive your plan." Don't change course just because you face obstacles. -Know the difference between preparation and planning. Plans are great and essential for success. But preparation and execution are what gets it done. As General Patton once said, "A good plan executed violently today is far better than a great plan tomorrow." -Eat the elephant one bite at a time. Setting and achieving lofty goals is great. But those big, far-reaching goals mean nothing without a series of more near-term strategic achievable goals and milestone set along that path to the achievement of the larger goal. Break the big goals into bite-size chunks, making them less daunting and more achievable. -Never stop moving forward. One of my favorite quotes from Martin Luther King Jr. says, "If you can't fly, you run; if you can't run, you walk; and if you can't walk, you crawl. But no matter what, you keep moving forward." If you are not focusing on improving your life and career every day, things will stagnate. If you aren't always trying to improve, then what's the point? -Measure everything that is important. If you aren't measuring the success of your activities, there isn't much chance they will thrive. But if you do, there is little chance they won't improve. -Manage everything that is important. I don't know how many times I've set something on cruise control to focus on other initiatives only to circle back later to find things either in shambles or with zero progress. It doesn't have to be you, but someone needs to be actively managing the important aspects of your business or life. -Know that life isn't fair. I've been in combat, lost brothers, spent years as a single dad while trying to lead a company, gone through costly divorce, battled to maintain much needed full custody of my son, and worked hard to recover from inevitable business mistakes. But God doesn't put us in situations we can't handle. He blessed me with the most amazing wife who saved my life. And she blessed us with a beautiful baby girl. Then she was born with a birth defect and spent a month in the neonatal intensive care unit. That's life. As long as you take every day knowing things aren't fair, you'll be just fine. Never be out of the fight. -Laugh when you would rather cry. There is always a reason to smile, especially when you are leading a team. Positivity and calmness are contagious. As is panic. Decide what type of environment you want to promote. Lead by example. -Know the difference between skill and success. The world is full of highly skilled people or teams that fall short of achieving true success. In SEAL training, often it was the most elite athletes who were the first to quit. Although they had the physicality, they lacked the mental fortitude to compete and win at that level. They lacked the ability to adapt. We have to be able to bridge the gap between skill and applying that skill to achieving goals. -Surround yourself with subject-matter experts. And then take credit for all of their work. Just joking! I would never be where I am today without my wife, business partners, advisers, and our amazing team. I am the least important person at my company. As soon as I realized that, I knew how to get out of the way. - - - - - -source : http://www.inc.com/brent-gleeson/11-proven-rules-for-success.html \ No newline at end of file From 70fcef4a7ad765d478eca93b042d64e9ec8e35e8 Mon Sep 17 00:00:00 2001 From: Edpo Natalicio Date: Thu, 1 Oct 2015 18:54:02 -0400 Subject: [PATCH 1157/5486] Runn Robott --- english/Rules to Success/Rules.txt | 1 - english/run/I am still running.md | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 english/Rules to Success/Rules.txt create mode 100644 english/run/I am still running.md diff --git a/english/Rules to Success/Rules.txt b/english/Rules to Success/Rules.txt deleted file mode 100644 index b9930b9938..0000000000 --- a/english/Rules to Success/Rules.txt +++ /dev/null @@ -1 +0,0 @@ -Get comfortable being uncomfortable. Get outside your comfort zone on a regular basis. The more you do, the wider that area becomes. Things that used to seem impossible can become part of your everyday life. diff --git a/english/run/I am still running.md b/english/run/I am still running.md new file mode 100644 index 0000000000..9796998bc2 --- /dev/null +++ b/english/run/I am still running.md @@ -0,0 +1,2 @@ +Runnnnnnn Github Robot Runnnnnnn! + \ No newline at end of file From b78182de2ae0e23d6ce32962a55bf8a1e3f75f0f Mon Sep 17 00:00:00 2001 From: Edpo Natalicio Date: Thu, 1 Oct 2015 19:04:28 -0400 Subject: [PATCH 1158/5486] Yay Raiders --- english/Raiders/LetsgoRaiders.md | 1 + english/eating-walls/eating-marshmallows.md | 4 +++- english/run/I am still running.md | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 english/Raiders/LetsgoRaiders.md delete mode 100644 english/run/I am still running.md diff --git a/english/Raiders/LetsgoRaiders.md b/english/Raiders/LetsgoRaiders.md new file mode 100644 index 0000000000..bf4a8580cf --- /dev/null +++ b/english/Raiders/LetsgoRaiders.md @@ -0,0 +1 @@ +Lets go Raiders! \ No newline at end of file diff --git a/english/eating-walls/eating-marshmallows.md b/english/eating-walls/eating-marshmallows.md index 215236a7bb..a657e708d7 100644 --- a/english/eating-walls/eating-marshmallows.md +++ b/english/eating-walls/eating-marshmallows.md @@ -48,4 +48,6 @@ Do you: [Succumb] (../madness/cthulhu.md) to the madness. -[Goto] (../goto/goto.md) google. \ No newline at end of file +[Goto] (../goto/goto.md) google. + +[raidersfile] (../Raiders/LetsGoRaiders.md) Raiders. \ No newline at end of file diff --git a/english/run/I am still running.md b/english/run/I am still running.md deleted file mode 100644 index 9796998bc2..0000000000 --- a/english/run/I am still running.md +++ /dev/null @@ -1,2 +0,0 @@ -Runnnnnnn Github Robot Runnnnnnn! - \ No newline at end of file From 939c4b2e9ee17111f1078f65c48b00fba81fad84 Mon Sep 17 00:00:00 2001 From: Edpo Natalicio Date: Thu, 1 Oct 2015 19:10:23 -0400 Subject: [PATCH 1159/5486] lastCommit --- english/Raiders/LetsgoRaiders.md | 4 +++- english/eating-walls/eating-marshmallows.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/english/Raiders/LetsgoRaiders.md b/english/Raiders/LetsgoRaiders.md index bf4a8580cf..26a9c50458 100644 --- a/english/Raiders/LetsgoRaiders.md +++ b/english/Raiders/LetsgoRaiders.md @@ -1 +1,3 @@ -Lets go Raiders! \ No newline at end of file +Lets go Raiders! + +[Here's the link](https://www.google.com) \ No newline at end of file diff --git a/english/eating-walls/eating-marshmallows.md b/english/eating-walls/eating-marshmallows.md index a657e708d7..975b4afef0 100644 --- a/english/eating-walls/eating-marshmallows.md +++ b/english/eating-walls/eating-marshmallows.md @@ -50,4 +50,4 @@ Do you: [Goto] (../goto/goto.md) google. -[raidersfile] (../Raiders/LetsGoRaiders.md) Raiders. \ No newline at end of file +[raidersfile] (../Raiders/LetsgoRaiders.md) Raiders. \ No newline at end of file From 4e76ee2d95ebb5ffc565d8a9f599114c70ff434c Mon Sep 17 00:00:00 2001 From: Matt F Date: Fri, 2 Oct 2015 16:53:09 +1000 Subject: [PATCH 1160/5486] Add new link to ninja --- english/ninja/ninja.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/ninja/ninja.md b/english/ninja/ninja.md index df43a8d6b9..ac4803fe68 100644 --- a/english/ninja/ninja.md +++ b/english/ninja/ninja.md @@ -17,3 +17,9 @@ I'm like a wild animal in the corner Waiting for the break of dawn Trying to get through the night Just a man with the will to survive + +you realize that Pokemon is great and can still help you with your troubles, +you find a man at a flea market selling Pokemon Red, +Blue, and Yellow all for 20 dollars along with a Gameboy. You buy it. + +[But it's not a game, boy](/english/ninja/ninja.md) From 407c6cf5a390f11917705651b66d9059df8c0756 Mon Sep 17 00:00:00 2001 From: ggambardella Date: Fri, 2 Oct 2015 12:11:02 +0200 Subject: [PATCH 1161/5486] Add new option to creare-uscita.md (Italian) --- Italian/scappare/cercare-uscita.md | 4 +++- Italian/scappare/scopri-oggetto/scopri-oggetto.md | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 Italian/scappare/scopri-oggetto/scopri-oggetto.md diff --git a/Italian/scappare/cercare-uscita.md b/Italian/scappare/cercare-uscita.md index d385992621..f8aa237596 100644 --- a/Italian/scappare/cercare-uscita.md +++ b/Italian/scappare/cercare-uscita.md @@ -7,4 +7,6 @@ Inciampi in una bottiglia rotta a metà, e ci sono vetri ovunque. [Ti arrabbi perchè il tappeto è sporco](arrabbi/arrabbi.md) -[Approfitti del vetro più tagliente per farti la barba](barba/barba.md) \ No newline at end of file +[Approfitti del vetro più tagliente per farti la barba](barba/barba.md) + +[Fra i vetri rotti scopri un oggetto](scopri-oggetto/scopri-oggetto.md) \ No newline at end of file diff --git a/Italian/scappare/scopri-oggetto/scopri-oggetto.md b/Italian/scappare/scopri-oggetto/scopri-oggetto.md new file mode 100644 index 0000000000..d320c15643 --- /dev/null +++ b/Italian/scappare/scopri-oggetto/scopri-oggetto.md @@ -0,0 +1,3 @@ +Fra i vetri rotti scopri un piccolo oggetto di forma triangolare, sembra +anch'esso essere fatto di vetro. Ti avvicini e noti che all'interno c'e' +una sfera dorata che emana una luce soffusa e pulsante. From c28f3efd224c993a4c52c3992c044ef011b861f8 Mon Sep 17 00:00:00 2001 From: Steven Wooding Date: Fri, 2 Oct 2015 16:53:28 +0100 Subject: [PATCH 1162/5486] feat: Add link back to the start --- english/burn-down-the-house/house-burn.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/burn-down-the-house/house-burn.md b/english/burn-down-the-house/house-burn.md index ea395fed35..f4ff0c927d 100644 --- a/english/burn-down-the-house/house-burn.md +++ b/english/burn-down-the-house/house-burn.md @@ -6,4 +6,6 @@ Suddenly, your whole beautiful dream of your crush now turns into nightmare as y slip into the abyss of eternity. Just before that happens, you hear a loud noise as of a bang coming from downstairs. This may be the firemen or more destruction as a result of the flames, as you continue to wonder the cause of the noise, you slip -into a coma and wake up only to realise it was just a dream. \ No newline at end of file +into a coma and wake up only to realise it was just a dream. + +[Open your eyes...](../marshmallow.md) From c5373d887b56f00a7fc6f13cc47588b1dc0f9dfd Mon Sep 17 00:00:00 2001 From: drnorthcutt Date: Fri, 2 Oct 2015 11:40:40 -0500 Subject: [PATCH 1163/5486] Add Knock --- english/sonic-screwdriver/sonic-screwdriver.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/sonic-screwdriver/sonic-screwdriver.md b/english/sonic-screwdriver/sonic-screwdriver.md index 62eacd039b..f70fd90ba9 100644 --- a/english/sonic-screwdriver/sonic-screwdriver.md +++ b/english/sonic-screwdriver/sonic-screwdriver.md @@ -6,4 +6,6 @@ When you open the door back in Londo you realize that you left your trusty sidek Do you: -[Go back and find the impossible girl?](../impossible-girl/impossible.md) \ No newline at end of file +[Answer the sudden knock at the door?](.../knock/answer.md) + +[Go back and find the impossible girl?](../impossible-girl/impossible.md) From 557261a944a277e1fabeb18de79bbaed911e802a Mon Sep 17 00:00:00 2001 From: drnorthcutt Date: Fri, 2 Oct 2015 11:43:32 -0500 Subject: [PATCH 1164/5486] Amend impossible --- english/impossible-girl/impossible.md | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/english/impossible-girl/impossible.md b/english/impossible-girl/impossible.md index e56ac9366d..d880d177eb 100644 --- a/english/impossible-girl/impossible.md +++ b/english/impossible-girl/impossible.md @@ -3,3 +3,39 @@ You return to the marshmallow realm and begin to search for Clara. Suddenly, your blood runs cold as you hear a familiar mechanical voice greet you. "Exterminate!" You turn around and see a Dalek + +Or is it? + +As your eyes adjust to the gloom, you suddenly realize that it is just a child wearing a topside down rubbish bin, +and holding a toilet plunger. He thrusts the plunger in your general direction, screaming "EXTERMINATE!" once more. +What a strange child, you think. Surely he realizes the danger of impersonation of the deadliest entities ever to +exist... + +Just then, you hear a noise. It is a dim sound, just on the edge of your consciousness. You could almost +think you were imagining it. + +thud... thud... thud... + +You hold your breath in anticipation... Nothing. Just the wind. Just the darkness. Just the... + +"EXTERMINATE!," screams the boy again, lunging at you with such force that you are certain to get a bruise. + +"EXTERMI...," he starts. + +THUD... THUD... THUD... + +He freezes in place, his eyes growing wide. + +THUD... THUD... THUD... + +He whirls before the echoes die, holding the plunger aloft as if to repel the...well, whatever it is. And then he +is gone. Without a "by your leave" or a "ta ta," he runs. He runs as if his life depended upon it. And you watch +as the darkness englulfs him. + +THUD... THUD... THUD... + +Do you: + +[Ignore the noise and taste a bit of the marshmallow wall you just noticed to your right.](../eating-walls/eating-marshmallows.md) + +[Investigate further...](../knock/answer.md) From c4a93c43a573f25d8cf08a285e0dd0fe6a9ab53f Mon Sep 17 00:00:00 2001 From: drnorthcutt Date: Fri, 2 Oct 2015 11:46:00 -0500 Subject: [PATCH 1165/5486] Add Answer --- english/knock/answer.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 english/knock/answer.md diff --git a/english/knock/answer.md b/english/knock/answer.md new file mode 100644 index 0000000000..e69de29bb2 From a1a09449bf568d89000ccf2a8e6e9927d45ee80b Mon Sep 17 00:00:00 2001 From: "Daniel R. Northcutt" Date: Fri, 2 Oct 2015 11:51:26 -0500 Subject: [PATCH 1166/5486] Update sonic screwdriver.md Please review this, @casey-collab From 0c2450ec088c259ca4dd817f654bdf2df0cdfbda Mon Sep 17 00:00:00 2001 From: "Daniel R. Northcutt" Date: Fri, 2 Oct 2015 11:53:17 -0500 Subject: [PATCH 1167/5486] Update impossible.md --- english/impossible-girl/impossible.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/impossible-girl/impossible.md b/english/impossible-girl/impossible.md index d880d177eb..6c25875bd4 100644 --- a/english/impossible-girl/impossible.md +++ b/english/impossible-girl/impossible.md @@ -36,6 +36,7 @@ THUD... THUD... THUD... Do you: -[Ignore the noise and taste a bit of the marshmallow wall you just noticed to your right.](../eating-walls/eating-marshmallows.md) +[Ignore the noise and taste a bit of the marshmallow wall you just noticed to your right.] +(../eating-walls/eating-marshmallows.md) [Investigate further...](../knock/answer.md) From 449561addcd2aae0edce34c74b332f6cda4475fb Mon Sep 17 00:00:00 2001 From: "Daniel R. Northcutt" Date: Fri, 2 Oct 2015 12:02:50 -0500 Subject: [PATCH 1168/5486] Update sonic-screwdriver.md From c52bf2bcbce387ad469f956710272a8c3a4f418b Mon Sep 17 00:00:00 2001 From: "Daniel R. Northcutt" Date: Fri, 2 Oct 2015 12:04:03 -0500 Subject: [PATCH 1169/5486] Update answer.md --- english/knock/answer.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/english/knock/answer.md b/english/knock/answer.md index e69de29bb2..779af6cd62 100644 --- a/english/knock/answer.md +++ b/english/knock/answer.md @@ -0,0 +1,20 @@ +THUD... THUD... THUD... + +Whatever, or whomever it is, they are certainly insistent. You hold your head high, sniffing... Chocolate. Or is it +fudge? You pat your pockets, in search of... + +And then you see it. A door. Not the quaint six panel door of a cottage, nor the ornate door of a mansion, not even +the plain door of a lavatory in a low-rent flat on the East side, it is just a door. You try to describe it +mentally, try to keep the image in your mind to give it words, to give it shape, to give it substance, but you can't. +It is just a door, without shape or size or... Well, without anything. It just is, and you know that it is without +being able to qualify it in the least. + +THUD... THUD... THUD... + +You jump, not realizing your ear was pressed against it. It felt like... It felt like... It felt like moonlight. +It felt like rain. It felt like the smell of a fresh-cut lawn. It felt like forever. It felt like just a moment ago. +It felt like... It felt like... It felt like nothing, and something, and everything. + +You know this thing! You have seen this thing! When was it? What was it? What was it?! Oh yes... It was... + +THUD... THUD... THUD... From 49ae6282d1ab8e2acb00787ed1c6050fb0ab2976 Mon Sep 17 00:00:00 2001 From: "Daniel R. Northcutt" Date: Fri, 2 Oct 2015 12:11:01 -0500 Subject: [PATCH 1170/5486] Update again --- english/sonic-screwdriver/sonic-screwdriver.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/english/sonic-screwdriver/sonic-screwdriver.md b/english/sonic-screwdriver/sonic-screwdriver.md index f70fd90ba9..1e45802ccf 100644 --- a/english/sonic-screwdriver/sonic-screwdriver.md +++ b/english/sonic-screwdriver/sonic-screwdriver.md @@ -5,7 +5,6 @@ You return to the Tardis, flip some levers and hear that familiar whirling sound When you open the door back in Londo you realize that you left your trusty sidekick behind. Do you: - -[Answer the sudden knock at the door?](.../knock/answer.md) +[Answer the sudden knock at the door?](../knock/answer.md) [Go back and find the impossible girl?](../impossible-girl/impossible.md) From 9bd0979eb1199455d9d0fae1f94fb1e2be1784d4 Mon Sep 17 00:00:00 2001 From: "Daniel R. Northcutt" Date: Fri, 2 Oct 2015 12:13:07 -0500 Subject: [PATCH 1171/5486] Update again --- english/sonic-screwdriver/sonic-screwdriver.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/sonic-screwdriver/sonic-screwdriver.md b/english/sonic-screwdriver/sonic-screwdriver.md index 1e45802ccf..8a544ad227 100644 --- a/english/sonic-screwdriver/sonic-screwdriver.md +++ b/english/sonic-screwdriver/sonic-screwdriver.md @@ -5,6 +5,7 @@ You return to the Tardis, flip some levers and hear that familiar whirling sound When you open the door back in Londo you realize that you left your trusty sidekick behind. Do you: + [Answer the sudden knock at the door?](../knock/answer.md) [Go back and find the impossible girl?](../impossible-girl/impossible.md) From c1650fff595d3874548c715074a0460be7da1f7e Mon Sep 17 00:00:00 2001 From: "Daniel R. Northcutt" Date: Fri, 2 Oct 2015 12:17:07 -0500 Subject: [PATCH 1172/5486] Update sonic-screwdriver.md --- english/sonic-screwdriver/sonic-screwdriver.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/sonic-screwdriver/sonic-screwdriver.md b/english/sonic-screwdriver/sonic-screwdriver.md index 8a544ad227..9aacb446df 100644 --- a/english/sonic-screwdriver/sonic-screwdriver.md +++ b/english/sonic-screwdriver/sonic-screwdriver.md @@ -6,6 +6,4 @@ When you open the door back in Londo you realize that you left your trusty sidek Do you: -[Answer the sudden knock at the door?](../knock/answer.md) - [Go back and find the impossible girl?](../impossible-girl/impossible.md) From af68f4baaa79446a4b1277c7b9f5ca8478425980 Mon Sep 17 00:00:00 2001 From: "Daniel R. Northcutt" Date: Fri, 2 Oct 2015 12:17:41 -0500 Subject: [PATCH 1173/5486] Update sonic-screwdriver.md From 7b0a7c72a51db954340fee17e40b00e8d47f0bf6 Mon Sep 17 00:00:00 2001 From: "Daniel R. Northcutt" Date: Fri, 2 Oct 2015 12:22:25 -0500 Subject: [PATCH 1174/5486] removing changes From 59d68bb7dcff54bf4ec885cb873c16e547fd1166 Mon Sep 17 00:00:00 2001 From: frinko Date: Fri, 2 Oct 2015 15:03:33 -0400 Subject: [PATCH 1175/5486] Update code.md --- english/code/code.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/code/code.md b/english/code/code.md index abe77c7681..2d225a13a4 100644 --- a/english/code/code.md +++ b/english/code/code.md @@ -3,3 +3,5 @@ It seems like the only thing to do is code. You create a program that is designed to make your pants stop glowing. It works. Your pants stop glowing, but then the marshmallow-walled room starts glowing, slowly getting brighter and brighter. + +You continue coding. From 10f8fedd1331d4054a36a66097c0e0f0ea471d09 Mon Sep 17 00:00:00 2001 From: Carlos Silva Date: Fri, 2 Oct 2015 19:04:28 -0400 Subject: [PATCH 1176/5486] feat: Add better caul saul story path --- english/better-call-saul/saul.md | 5 +++++ english/marshmallow.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 english/better-call-saul/saul.md diff --git a/english/better-call-saul/saul.md b/english/better-call-saul/saul.md new file mode 100644 index 0000000000..9d01b77eb5 --- /dev/null +++ b/english/better-call-saul/saul.md @@ -0,0 +1,5 @@ +You dial Sauls number... + +"Hi, its Saul Goodman!" + +Clearly you are not good and you think you are being pranked so you [go back to thinking about what you should do](/english/marshmallow.md) diff --git a/english/marshmallow.md b/english/marshmallow.md index 66473dbc6a..1fcd992f20 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -153,6 +153,8 @@ Do you: [Realize you are in the ...](in-matrix/matrix.md) +[Realize you better call Saul](better-call-saul/saul.md) + [Turn off all the lights](lightsoff/lightsoff.md) [Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) From 0503e2902edb4c20694d8b31d8853d1ebd4d964f Mon Sep 17 00:00:00 2001 From: Carlos Silva Date: Fri, 2 Oct 2015 19:36:35 -0400 Subject: [PATCH 1177/5486] Broke line to fit into 120 characters limit Fixed relative link --- english/better-call-saul/saul.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/better-call-saul/saul.md b/english/better-call-saul/saul.md index 9d01b77eb5..50e46fa38d 100644 --- a/english/better-call-saul/saul.md +++ b/english/better-call-saul/saul.md @@ -2,4 +2,5 @@ You dial Sauls number... "Hi, its Saul Goodman!" -Clearly you are not good and you think you are being pranked so you [go back to thinking about what you should do](/english/marshmallow.md) +Clearly you are not good and you think you are being pranked so you +[go back to thinking about what you should do](../marshmallow.md) From 71e92a77743030a3731a787ef66e65f63a7d7630 Mon Sep 17 00:00:00 2001 From: Matt F Date: Sat, 3 Oct 2015 10:29:01 +1000 Subject: [PATCH 1178/5486] fix netflix typo --- english/netflix/netflix.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/netflix/netflix.md b/english/netflix/netflix.md index 87959af444..69c7151df9 100644 --- a/english/netflix/netflix.md +++ b/english/netflix/netflix.md @@ -4,11 +4,11 @@ networks in the marshmallow. What do you do? -Especially since house of cards season 3 just became available. +Especially since house of cards season 3 just became available. You search for the tech support number. -No answer, so you swith to HBO +No answer, so you switch to HBO But, since it was Lent I decided to From 0d35d441b0e6be10858de373a7f81b45b68057e9 Mon Sep 17 00:00:00 2001 From: Matt F Date: Sat, 3 Oct 2015 10:39:53 +1000 Subject: [PATCH 1179/5486] add link ninja to karaoke --- english/ninja/ninja.md | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/english/ninja/ninja.md b/english/ninja/ninja.md index ac4803fe68..c9135c6ead 100644 --- a/english/ninja/ninja.md +++ b/english/ninja/ninja.md @@ -18,8 +18,19 @@ Waiting for the break of dawn Trying to get through the night Just a man with the will to survive -you realize that Pokemon is great and can still help you with your troubles, -you find a man at a flea market selling Pokemon Red, -Blue, and Yellow all for 20 dollars along with a Gameboy. You buy it. -[But it's not a game, boy](/english/ninja/ninja.md) +After that episode, + +You feel like your singing has reached its ultimate +ability, and never in your life will you reach this level +of skill or readiness again... + +You decide to do the unthinkable... + +[Try out Karaoke](../karaoke/nome.md) + +No way man! + +Knees weak, arms spaghetti, vomit on spaghetti already + +[Back to reality](../marshmallow.md) ohp there goes spaghetti From e6bb7d75d49d98e252584f6c2b535b4abeabc7fb Mon Sep 17 00:00:00 2001 From: Matt F Date: Sat, 3 Oct 2015 10:40:31 +1000 Subject: [PATCH 1180/5486] add link ninja back to marshmallow if you dont have the guts to follow your dreams --- english/ninja/ninja.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/ninja/ninja.md b/english/ninja/ninja.md index c9135c6ead..2ddadfdeea 100644 --- a/english/ninja/ninja.md +++ b/english/ninja/ninja.md @@ -29,7 +29,7 @@ You decide to do the unthinkable... [Try out Karaoke](../karaoke/nome.md) -No way man! +No way man! I don't have the guts to follow my dreams like that! Knees weak, arms spaghetti, vomit on spaghetti already From 97017d7709184b86798d7fbf495cd4a86cbd9a18 Mon Sep 17 00:00:00 2001 From: Matt F Date: Sat, 3 Oct 2015 10:43:23 +1000 Subject: [PATCH 1181/5486] fix typo in ninja-karaoke link --- english/ninja/ninja.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/ninja/ninja.md b/english/ninja/ninja.md index 2ddadfdeea..87964c11ff 100644 --- a/english/ninja/ninja.md +++ b/english/ninja/ninja.md @@ -27,7 +27,7 @@ of skill or readiness again... You decide to do the unthinkable... -[Try out Karaoke](../karaoke/nome.md) +[Try out Karaoke](../karaoke/none.md) No way man! I don't have the guts to follow my dreams like that! From 3355355d7bb793dff56947505c08c454909ec7a9 Mon Sep 17 00:00:00 2001 From: Matt F Date: Sat, 3 Oct 2015 10:51:26 +1000 Subject: [PATCH 1182/5486] fix typo in ninja-karaoke link AGAIN --- english/ninja/ninja.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/ninja/ninja.md b/english/ninja/ninja.md index 87964c11ff..b8decf29be 100644 --- a/english/ninja/ninja.md +++ b/english/ninja/ninja.md @@ -27,9 +27,9 @@ of skill or readiness again... You decide to do the unthinkable... -[Try out Karaoke](../karaoke/none.md) +[Try out Karaoke](../karaoke/nope.md) -No way man! I don't have the guts to follow my dreams like that! +No way! I don't have the guts to follow my dreams like that! Knees weak, arms spaghetti, vomit on spaghetti already From e49608cd410b5488fc63e51b8951d14fec88b3cc Mon Sep 17 00:00:00 2001 From: Preeti Viswanathan Date: Fri, 2 Oct 2015 23:30:50 -0400 Subject: [PATCH 1183/5486] Add benefit to list of yoga benefits --- english/yoga/benefits/yoga_benefits.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/yoga/benefits/yoga_benefits.md b/english/yoga/benefits/yoga_benefits.md index 8923dac285..e4e804af1b 100644 --- a/english/yoga/benefits/yoga_benefits.md +++ b/english/yoga/benefits/yoga_benefits.md @@ -15,3 +15,4 @@ Here we provide a list of benefits: 5. Increase hipster status 6. Weight reduction 7. Protection from injury +9. Increases happiness From bd390eb86b2781bb70de2cd3de596874ff211947 Mon Sep 17 00:00:00 2001 From: dhey2k Date: Sat, 3 Oct 2015 18:26:34 +0530 Subject: [PATCH 1184/5486] @casey-collab --- english/code/code.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/code/code.md b/english/code/code.md index 2d225a13a4..1b76c4bf09 100644 --- a/english/code/code.md +++ b/english/code/code.md @@ -5,3 +5,6 @@ Your pants stop glowing, but then the marshmallow-walled room starts glowing, slowly getting brighter and brighter. You continue coding. + +one day i got bored with the stuff so i created an algorithm to add some color +and randomness. From 96ed811a3c268c6a825e207c62d1223200501fad Mon Sep 17 00:00:00 2001 From: Alan Lai Date: Sat, 3 Oct 2015 22:30:48 +0800 Subject: [PATCH 1185/5486] =?UTF-8?q?create=20=E8=B5=B0=E5=90=91=E4=B8=96?= =?UTF-8?q?=E7=95=8C.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../world/\350\265\260\345\220\221\344\270\226\347\225\214.md" | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 "Chinese/world/\350\265\260\345\220\221\344\270\226\347\225\214.md" diff --git "a/Chinese/world/\350\265\260\345\220\221\344\270\226\347\225\214.md" "b/Chinese/world/\350\265\260\345\220\221\344\270\226\347\225\214.md" new file mode 100644 index 0000000000..f9069ca7c0 --- /dev/null +++ "b/Chinese/world/\350\265\260\345\220\221\344\270\226\347\225\214.md" @@ -0,0 +1,3 @@ +从[这里](http://www.google.com)走向世界 +Across the Great wall, +we can reach every corner in the world. From 8c4eefac4232b49c37c3c4ea1be4d398f0dc4181 Mon Sep 17 00:00:00 2001 From: Alan Lai Date: Sat, 3 Oct 2015 22:38:20 +0800 Subject: [PATCH 1186/5486] =?UTF-8?q?Update=20=E5=A4=A7=E8=AF=9D=E8=A5=BF?= =?UTF-8?q?=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 3a3c1ae224..8fd0e206f5 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -53,3 +53,5 @@ [Michael](Michael/signal.md) [OnceThereIsAHill](OnceThereIsAHill/OnceThereIsAHill.md) + +[万里长城](world/走向世界.md) From 97ab3d40cfca5e52fc0f922195fdefef6b541cf1 Mon Sep 17 00:00:00 2001 From: multimentha Date: Sat, 3 Oct 2015 18:15:48 +0200 Subject: [PATCH 1187/5486] add 3 new choices to german adventure Each choice is associated with an (yet empty) file. --- german/Leichen/Ausschau/Ausschau.md | 0 german/Leichen/Kleidung/Kleidung.md | 0 german/Leichen/Leichen.md | 10 +++++++++- german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md | 0 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 german/Leichen/Ausschau/Ausschau.md create mode 100644 german/Leichen/Kleidung/Kleidung.md create mode 100644 german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md diff --git a/german/Leichen/Ausschau/Ausschau.md b/german/Leichen/Ausschau/Ausschau.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/german/Leichen/Kleidung/Kleidung.md b/german/Leichen/Kleidung/Kleidung.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 7585e2d95d..bfdfef10e3 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -5,4 +5,12 @@ werfen die beiden Leichen aus dem Boot. Sie schnaufen einmal kräftig durch während ihnen tausend Gedanken durch den Kopf gehen... -Schnell, aber unbemerkt versuchen Sie an Land zu kommen, aber es scheint nicht näher zu kommen.... \ No newline at end of file +Schnell, aber unbemerkt versuchen Sie an Land zu kommen, aber es scheint nicht näher zu kommen.... + +Was tun Sie? + +Ich halte nach etwas (Ausschau)[Ausschau/Ausschau.md], an dass ich mich klammern könnte. + +All meine Kraft geht in meine zunehmend panischen [Schwimmbewegungen](Schwimmbewegungen/Schwimmbewegungen.md). Ich versuche mit letzter Kraft den Strand zu erreichen. + +Meine Kleidung hindert mich absolut am Schwimmen. Die Kälte des Wassers macht meine Bewegungen steif, die vollgesogene [Kleidung](Kleidung/Kleidung.md) macht sie träge. Irgendwie muss ich versuchen sie los zu werden! diff --git a/german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md b/german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md new file mode 100644 index 0000000000..e69de29bb2 From b43dcc2bc3f73001bf3a1cb8f9b3a1e1c252d9f9 Mon Sep 17 00:00:00 2001 From: multimentha Date: Sat, 3 Oct 2015 18:27:42 +0200 Subject: [PATCH 1188/5486] =?UTF-8?q?Add=20narrative=20for=20German?= =?UTF-8?q?=E2=86=92Leichen=E2=86=92Ausschau?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Leichen/Ausschau/Ausschau.md | 1 + 1 file changed, 1 insertion(+) diff --git a/german/Leichen/Ausschau/Ausschau.md b/german/Leichen/Ausschau/Ausschau.md index e69de29bb2..643f8051a1 100644 --- a/german/Leichen/Ausschau/Ausschau.md +++ b/german/Leichen/Ausschau/Ausschau.md @@ -0,0 +1 @@ +Da! Dort drben in der Ferne! Leicht ber der Wassermarke zeichnet sich etwas ab. Jedes Mal, wenn die wiegenden Wogen es zu lassen spht ihr gen Strand. Vielleicht ein Stck Treibholz, eine verwahrloste Boje? Ihr knnt euren Kopf kaum ber Wasser halten und schluckt jede Menge Salzwasser, aber ihr seit euch sicher: wenn ihr es nur bis dort hin schafft, berlebt ihr vielleicht. \ No newline at end of file From 7e79dea608689e18abb3c07da0a6531c33256dae Mon Sep 17 00:00:00 2001 From: multimentha Date: Sat, 3 Oct 2015 18:34:17 +0200 Subject: [PATCH 1189/5486] =?UTF-8?q?Add=20narrative=20for=20path=20German?= =?UTF-8?q?=E2=86=92Leichen=E2=86=92Kleidung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Leichen/Kleidung/Kleidung.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/german/Leichen/Kleidung/Kleidung.md b/german/Leichen/Kleidung/Kleidung.md index e69de29bb2..5c4131dec0 100644 --- a/german/Leichen/Kleidung/Kleidung.md +++ b/german/Leichen/Kleidung/Kleidung.md @@ -0,0 +1,3 @@ +Mit groer Mhe schafft ihr es euch das Hemd auszuziehen. Das war berhaupt nicht einfach. Ihr knnt euch schon etwas freier bewegen. Obwohl ihr jetzt gebt seit, macht euch eure liebgewonnene Designerjeans die gleichen Probleme. Nach etlichen Schlucken Salzwasser habt ihr euch aber auch ihrer entledigt. + +Jetzt, da ihr euch frei im Wasser bewegen knnt, gewinnt das eigentliche Problem eure Aufmerksamkeit zurck. From 93068109c3cfc57c80c70a1e70ba1af3347671c0 Mon Sep 17 00:00:00 2001 From: multimentha Date: Sat, 3 Oct 2015 18:42:34 +0200 Subject: [PATCH 1190/5486] =?UTF-8?q?Add=20narrative=20for=20German?= =?UTF-8?q?=E2=86=92Leichen=E2=86=92Schwimmbewegungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md | 1 + 1 file changed, 1 insertion(+) diff --git a/german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md b/german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md index e69de29bb2..9a27f5abbf 100644 --- a/german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md +++ b/german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md @@ -0,0 +1 @@ +Es gibt Momente im Leben die, obgleich sie nur Minuten andauern, spter Teil unseres Lebens werden als wren sie Jahre. Dies ist ein solcher Moment in eurem Leben. Eure ganze Aufmerksamtkeit geht in euren Krper. Wohlwissend um euer eventuelles Ende, schwimmt ihr wie ihr noch nicht geschwommen seit. Das schwierigste ist in Mitten der Wellen die Orienturng zu behalten. Wenn ihr es nur nah genug an den Strand schafft, findet ihr vielleicht ein Riff oder eine Sandbank, eine kleine Verschnaufpause vor der letzten Anstrengung. From ebfa8fcae272238fd171705f4d0bfe10444382cb Mon Sep 17 00:00:00 2001 From: multimentha Date: Sat, 3 Oct 2015 18:51:43 +0200 Subject: [PATCH 1191/5486] Break up lines with more than 120 chars --- german/Leichen/Ausschau/Ausschau.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Leichen/Ausschau/Ausschau.md b/german/Leichen/Ausschau/Ausschau.md index 643f8051a1..fe3ec1853e 100644 --- a/german/Leichen/Ausschau/Ausschau.md +++ b/german/Leichen/Ausschau/Ausschau.md @@ -1 +1,3 @@ -Da! Dort drben in der Ferne! Leicht ber der Wassermarke zeichnet sich etwas ab. Jedes Mal, wenn die wiegenden Wogen es zu lassen spht ihr gen Strand. Vielleicht ein Stck Treibholz, eine verwahrloste Boje? Ihr knnt euren Kopf kaum ber Wasser halten und schluckt jede Menge Salzwasser, aber ihr seit euch sicher: wenn ihr es nur bis dort hin schafft, berlebt ihr vielleicht. \ No newline at end of file +Da! Dort drben in der Ferne! Leicht ber der Wassermarke zeichnet sich etwas ab. +Jedes Mal, wenn die wiegenden Wogen es zu lassen spht ihr gen Strand. Vielleicht ein Stck Treibholz, eine verwahrloste Boje? +Ihr knnt euren Kopf kaum ber Wasser halten und schluckt jede Menge Salzwasser, aber ihr seit euch sicher: wenn ihr es nur bis dort hin schafft, berlebt ihr vielleicht. \ No newline at end of file From d26ba198f599e25a206698141cecb4db84a290b0 Mon Sep 17 00:00:00 2001 From: multimentha Date: Sat, 3 Oct 2015 18:53:50 +0200 Subject: [PATCH 1192/5486] fix broken link --- german/Leichen/Leichen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index bfdfef10e3..283d9b0591 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -9,7 +9,7 @@ Schnell, aber unbemerkt versuchen Sie an Land zu kommen, aber es scheint nicht n Was tun Sie? -Ich halte nach etwas (Ausschau)[Ausschau/Ausschau.md], an dass ich mich klammern könnte. +Ich halte nach etwas [Ausschau](Ausschau/Ausschau.md), an dass ich mich klammern könnte. All meine Kraft geht in meine zunehmend panischen [Schwimmbewegungen](Schwimmbewegungen/Schwimmbewegungen.md). Ich versuche mit letzter Kraft den Strand zu erreichen. From 0bd691611ec5978d3584190928ccea13eceff146 Mon Sep 17 00:00:00 2001 From: multimentha Date: Sat, 3 Oct 2015 19:01:28 +0200 Subject: [PATCH 1193/5486] Fixed line width, link syntax and minor wording --- german/Leichen/Ausschau/Ausschau.md | 6 ++++-- german/Leichen/Kleidung/Kleidung.md | 8 ++++++-- german/Leichen/Leichen.md | 5 ++++- german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md | 8 +++++++- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/german/Leichen/Ausschau/Ausschau.md b/german/Leichen/Ausschau/Ausschau.md index fe3ec1853e..6eb3dc9e22 100644 --- a/german/Leichen/Ausschau/Ausschau.md +++ b/german/Leichen/Ausschau/Ausschau.md @@ -1,3 +1,5 @@ Da! Dort drben in der Ferne! Leicht ber der Wassermarke zeichnet sich etwas ab. -Jedes Mal, wenn die wiegenden Wogen es zu lassen spht ihr gen Strand. Vielleicht ein Stck Treibholz, eine verwahrloste Boje? -Ihr knnt euren Kopf kaum ber Wasser halten und schluckt jede Menge Salzwasser, aber ihr seit euch sicher: wenn ihr es nur bis dort hin schafft, berlebt ihr vielleicht. \ No newline at end of file +Jedes Mal, wenn die wiegenden Wogen es zu lassen spht ihr gen Strand. +Vielleicht ein Stck Treibholz, eine verwahrloste Boje? +Ihr knnt euren Kopf kaum ber Wasser halten und schluckt jede Menge Salzwasser, +aber ihr seit euch sicher: wenn ihr es nur bis dort hin schafft, berlebt ihr vielleicht. diff --git a/german/Leichen/Kleidung/Kleidung.md b/german/Leichen/Kleidung/Kleidung.md index 5c4131dec0..3aaa61ed2e 100644 --- a/german/Leichen/Kleidung/Kleidung.md +++ b/german/Leichen/Kleidung/Kleidung.md @@ -1,3 +1,7 @@ -Mit groer Mhe schafft ihr es euch das Hemd auszuziehen. Das war berhaupt nicht einfach. Ihr knnt euch schon etwas freier bewegen. Obwohl ihr jetzt gebt seit, macht euch eure liebgewonnene Designerjeans die gleichen Probleme. Nach etlichen Schlucken Salzwasser habt ihr euch aber auch ihrer entledigt. +Mit groer Mhe schafft ihr es euch das Hemd auszuziehen. +Das war berhaupt nicht einfach. +Ihr knnt euch schon etwas freier bewegen. +Obwohl ihr jetzt gebt seit, macht euch eure liebgewonnene Designerjeans die gleichen Probleme. +Nach etlichen Schlucken Salzwasser habt ihr euch aber auch ihrer entledigt. -Jetzt, da ihr euch frei im Wasser bewegen knnt, gewinnt das eigentliche Problem eure Aufmerksamkeit zurck. +Jetzt, da ihr euch frei im Wasser bewegen knnt, dringt das eigentliche Problem eure Aufmerksamkeit zurck. diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 283d9b0591..18d467bced 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -13,4 +13,7 @@ Ich halte nach etwas [Ausschau](Ausschau/Ausschau.md), an dass ich mich klammern All meine Kraft geht in meine zunehmend panischen [Schwimmbewegungen](Schwimmbewegungen/Schwimmbewegungen.md). Ich versuche mit letzter Kraft den Strand zu erreichen. -Meine Kleidung hindert mich absolut am Schwimmen. Die Kälte des Wassers macht meine Bewegungen steif, die vollgesogene [Kleidung](Kleidung/Kleidung.md) macht sie träge. Irgendwie muss ich versuchen sie los zu werden! +Meine Kleidung hindert mich absolut am Schwimmen. +Die Kälte des Wassers macht meine Bewegungen steif, +die vollgesogene [Kleidung](Kleidung/Kleidung.md) macht sie träge. +Irgendwie muss ich versuchen sie los zu werden! diff --git a/german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md b/german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md index 9a27f5abbf..934a9903e4 100644 --- a/german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md +++ b/german/Leichen/Schwimmbewegungen/Schwimmbewegungen.md @@ -1 +1,7 @@ -Es gibt Momente im Leben die, obgleich sie nur Minuten andauern, spter Teil unseres Lebens werden als wren sie Jahre. Dies ist ein solcher Moment in eurem Leben. Eure ganze Aufmerksamtkeit geht in euren Krper. Wohlwissend um euer eventuelles Ende, schwimmt ihr wie ihr noch nicht geschwommen seit. Das schwierigste ist in Mitten der Wellen die Orienturng zu behalten. Wenn ihr es nur nah genug an den Strand schafft, findet ihr vielleicht ein Riff oder eine Sandbank, eine kleine Verschnaufpause vor der letzten Anstrengung. +Es gibt Momente die, obgleich sie nur Minuten andauern, spter Teil unseres Lebens werden als dauerten sie Jahre. +Dies ist ein solcher Moment in eurem Leben. +Eure ganze Aufmerksamtkeit geht in euren Krper. +Wohlwissend um euer eventuelles Ende, schwimmt ihr wie ihr noch nie geschwommen seit. +Das schwierigste ist in Mitten der Wellen die Orienturng zu behalten. +Wenn ihr es nur nah genug an den Strand schafft, findet ihr vielleicht ein Riff oder eine Sandbank, +eine kleine Verschnaufpause vor der letzten Anstrengung. From e1becbc674a7e65b13ad909b1d765eaf89994386 Mon Sep 17 00:00:00 2001 From: multimentha Date: Sat, 3 Oct 2015 19:09:04 +0200 Subject: [PATCH 1194/5486] Restrict lines to 120 chars max --- german/Leichen/Leichen.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 18d467bced..4d5a6a83a0 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -11,7 +11,8 @@ Was tun Sie? Ich halte nach etwas [Ausschau](Ausschau/Ausschau.md), an dass ich mich klammern könnte. -All meine Kraft geht in meine zunehmend panischen [Schwimmbewegungen](Schwimmbewegungen/Schwimmbewegungen.md). Ich versuche mit letzter Kraft den Strand zu erreichen. +All meine Kraft geht in meine zunehmend panischen [Schwimmbewegungen](Schwimmbewegungen/Schwimmbewegungen.md). +Ich versuche mit letzter Kraft den Strand zu erreichen. Meine Kleidung hindert mich absolut am Schwimmen. Die Kälte des Wassers macht meine Bewegungen steif, From 95d2d1a13613fc80eec5b2d4897af106ade8442a Mon Sep 17 00:00:00 2001 From: Mario Mitre Date: Sat, 3 Oct 2015 22:01:32 +0300 Subject: [PATCH 1195/5486] Change options from list to two different paragraphs. --- english/coffee/nude-run/warm-water/warm-water.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/coffee/nude-run/warm-water/warm-water.md b/english/coffee/nude-run/warm-water/warm-water.md index 67ae2d568a..d420dec629 100644 --- a/english/coffee/nude-run/warm-water/warm-water.md +++ b/english/coffee/nude-run/warm-water/warm-water.md @@ -13,5 +13,6 @@ certainly not made of bees). But there is also a small part of you that feels the pull of the badgers soft voice, his calm but engaging eyes. Do you: -* [rebel against the absurdity of it all?] (rebel/rebel.md) -* [let your mind surrender] (surrender/surrender.md) \ No newline at end of file +[rebel against the absurdity of it all?] (rebel/rebel.md) + +[let your mind surrender] (surrender/surrender.md) \ No newline at end of file From d181b58d222e81c284105e41a43347f43079624f Mon Sep 17 00:00:00 2001 From: Rohith Bandikatla Date: Sun, 4 Oct 2015 01:38:48 +0530 Subject: [PATCH 1196/5486] Add entry playmusic --- english/marshmallow.md | 2 ++ english/play-music/playmusic.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/play-music/playmusic.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 1fcd992f20..e60292f5f0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -522,3 +522,5 @@ This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind wit You decide that you do not want to visit the miracle man. [You check your phone to find something else to do](check-phone/check-phone.md). + +And you plug-in to [play some music](play-music/playmusic.md). diff --git a/english/play-music/playmusic.md b/english/play-music/playmusic.md new file mode 100644 index 0000000000..c62ac20b25 --- /dev/null +++ b/english/play-music/playmusic.md @@ -0,0 +1 @@ +You decide to just [Play some music](https://youtu.be/IcrbM1l_BoI) From 0c06e664a687b00f74c914f5fa60126c0f38bb02 Mon Sep 17 00:00:00 2001 From: "nadiia.lukianenko" Date: Sun, 4 Oct 2015 12:26:28 +0200 Subject: [PATCH 1197/5486] new file: conspiracy/conspiracy.md modified: old-photo.md --- ukrainian/old-photo/conspiracy/conspiracy.md | 1 + ukrainian/old-photo/old-photo.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 ukrainian/old-photo/conspiracy/conspiracy.md diff --git a/ukrainian/old-photo/conspiracy/conspiracy.md b/ukrainian/old-photo/conspiracy/conspiracy.md new file mode 100644 index 0000000000..587f025b98 --- /dev/null +++ b/ukrainian/old-photo/conspiracy/conspiracy.md @@ -0,0 +1 @@ +На звороті номер телефону ... \ No newline at end of file diff --git a/ukrainian/old-photo/old-photo.md b/ukrainian/old-photo/old-photo.md index e87b1a34e7..7b8dce876e 100644 --- a/ukrainian/old-photo/old-photo.md +++ b/ukrainian/old-photo/old-photo.md @@ -2,4 +2,6 @@ На фото, якому вже більше 100 років, зображені саме Ви, та же й у якомусь дивному капелюсі. -Як це може бути? \ No newline at end of file +Як це може бути? + +[Це змова!](conspiracy/conspiracy.md) \ No newline at end of file From 0cd6dc46031aabd9a7d8d1b5fd408b8f9ac38278 Mon Sep 17 00:00:00 2001 From: Paolo Cacciaguida Date: Sun, 4 Oct 2015 19:22:12 +0200 Subject: [PATCH 1198/5486] Add first room inspection after glass bottle found --- .../esamina-stanza/controlla-stanza/controlla-stanza.md | 3 +++ .../esamina-stanza/esamina-fogli/esamina-fogli.md | 2 ++ .../scopri-oggetto/esamina-stanza/esamina-stanza.md | 6 ++++++ Italian/scappare/scopri-oggetto/scopri-oggetto.md | 2 ++ 4 files changed, 13 insertions(+) create mode 100644 Italian/scappare/scopri-oggetto/esamina-stanza/controlla-stanza/controlla-stanza.md create mode 100644 Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md create mode 100644 Italian/scappare/scopri-oggetto/esamina-stanza/esamina-stanza.md diff --git a/Italian/scappare/scopri-oggetto/esamina-stanza/controlla-stanza/controlla-stanza.md b/Italian/scappare/scopri-oggetto/esamina-stanza/controlla-stanza/controlla-stanza.md new file mode 100644 index 0000000000..35fd88f5b3 --- /dev/null +++ b/Italian/scappare/scopri-oggetto/esamina-stanza/controlla-stanza/controlla-stanza.md @@ -0,0 +1,3 @@ +Mentre ti volti verso la parete opposta, che ospita una libreria piena di volumi antichi, +noti con inquietudine che la stanza è priva di finestre. +Non c'è traccia di porte: la consapevolezza di essere in trappola si fa strada nei tuoi pensieri. diff --git a/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md b/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md new file mode 100644 index 0000000000..1c8331653d --- /dev/null +++ b/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md @@ -0,0 +1,2 @@ +I fogli sono tutti bianchi. +Mentre osservi la scrivania noti un cassetto. Curiosamente, al posto della maniglia è presente solo un intaglio di forma triangolare. diff --git a/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-stanza.md b/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-stanza.md new file mode 100644 index 0000000000..5908ae8184 --- /dev/null +++ b/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-stanza.md @@ -0,0 +1,6 @@ +La stanza intorno a te ha pareti di pietra che ricordano quelle di un antico castello. +Vicino al letto noti una scrivania di legno con alcuni fogli sparsi su di essa. + +[Esamini i fogli sulla scrivania](esamina-fogli/esamina-fogli.md) + +[Osservi il resto della stanza](controlla-stanza/controlla-stanza.md) diff --git a/Italian/scappare/scopri-oggetto/scopri-oggetto.md b/Italian/scappare/scopri-oggetto/scopri-oggetto.md index d320c15643..9dcbc9ed77 100644 --- a/Italian/scappare/scopri-oggetto/scopri-oggetto.md +++ b/Italian/scappare/scopri-oggetto/scopri-oggetto.md @@ -1,3 +1,5 @@ Fra i vetri rotti scopri un piccolo oggetto di forma triangolare, sembra anch'esso essere fatto di vetro. Ti avvicini e noti che all'interno c'e' una sfera dorata che emana una luce soffusa e pulsante. + +[Ti guardi intorno e cerchi di capire dove ti trovi](esamina-stanza/esamina-stanza.md) From f8da0b9779f1241a080ca4bca0f2bec0c7affed6 Mon Sep 17 00:00:00 2001 From: Paolo Cacciaguida Date: Sun, 4 Oct 2015 19:39:37 +0200 Subject: [PATCH 1199/5486] Add newline to comply with 120 char line length limit --- .../esamina-stanza/esamina-fogli/esamina-fogli.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md b/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md index 1c8331653d..5538ca6749 100644 --- a/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md +++ b/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md @@ -1,2 +1,3 @@ I fogli sono tutti bianchi. -Mentre osservi la scrivania noti un cassetto. Curiosamente, al posto della maniglia è presente solo un intaglio di forma triangolare. +Mentre osservi la scrivania noti un cassetto. +Curiosamente, al posto della maniglia è presente solo un intaglio di forma triangolare. From cbc5d68cbe3551124128edaa3a5d60048f2f23d2 Mon Sep 17 00:00:00 2001 From: Andreas Voniatis MBP10 Date: Sun, 4 Oct 2015 21:28:13 +0100 Subject: [PATCH 1200/5486] Add new croat storyline --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index e60292f5f0..2c6dad04c7 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -524,3 +524,5 @@ You decide that you do not want to visit the miracle man. [You check your phone to find something else to do](check-phone/check-phone.md). And you plug-in to [play some music](play-music/playmusic.md). + +The next thing you know, you're up all night in Croatia mixing a new playlist From c47e6a7cdb8b3814dc0a968746f2dc514a0b9c7a Mon Sep 17 00:00:00 2001 From: Derek Morrison Date: Sun, 4 Oct 2015 17:48:50 -0600 Subject: [PATCH 1201/5486] Added a twist to the story --- english/wake-up/wake-up.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/english/wake-up/wake-up.md b/english/wake-up/wake-up.md index 0a3d315732..ef1293c45e 100644 --- a/english/wake-up/wake-up.md +++ b/english/wake-up/wake-up.md @@ -8,4 +8,12 @@ by a camp fire (with the smell of burnt marshmallow in the air) on a deserted island +Now you wonder how you got to this island. What were you doing + +before you were on the island and where did the marshmallows come + +from? Since you cannot remember any of these things then it begins + +to dawn on you that you really are still having a dream. + ....... [Not quite.](wake-up-again/wake-up-again.md) \ No newline at end of file From 93da66eabcc9a06e5f1a79f9d4f277d252da65f1 Mon Sep 17 00:00:00 2001 From: rishsethia Date: Mon, 5 Oct 2015 13:56:30 +0530 Subject: [PATCH 1202/5486] Add the-nights story --- english/the-nights/the-nights.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/the-nights/the-nights.md diff --git a/english/the-nights/the-nights.md b/english/the-nights/the-nights.md new file mode 100644 index 0000000000..306e13512f --- /dev/null +++ b/english/the-nights/the-nights.md @@ -0,0 +1,3 @@ +One day you'll leave this world behind +So live a life you will remember. + [Go Back](../marshmallow.md) \ No newline at end of file From 3df045940a881f97dacabff26e591171a9e23c7e Mon Sep 17 00:00:00 2001 From: rishsethia Date: Mon, 5 Oct 2015 13:57:12 +0530 Subject: [PATCH 1203/5486] Add the changes to main file --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index e60292f5f0..f919218a3b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,5 @@ +[Some inspirational Lines](the-nights/the-nights.md) + [Time for some teachings on life and success](swami-vivekananda/swami-vivekananda.md) One morning, you wake up in a strange room with marshmallows for walls. From 7558699de28025c2c2a9bc2cdef9dfb16d5bd4c8 Mon Sep 17 00:00:00 2001 From: kike mendez Date: Mon, 5 Oct 2015 09:42:27 -0200 Subject: [PATCH 1204/5486] The oso story has been deleted --- espanol/oso/grito/grito.md | 1 - espanol/oso/madre/madre.md | 2 -- espanol/oso/oso.md | 5 ----- 3 files changed, 8 deletions(-) delete mode 100644 espanol/oso/grito/grito.md delete mode 100644 espanol/oso/madre/madre.md delete mode 100644 espanol/oso/oso.md diff --git a/espanol/oso/grito/grito.md b/espanol/oso/grito/grito.md deleted file mode 100644 index 09705d632b..0000000000 --- a/espanol/oso/grito/grito.md +++ /dev/null @@ -1 +0,0 @@ -Edgardo!! Edgardo!! gritaban de la tribuna del estadio centenario en el partido de Penarol, Edgardo era el numero 9. diff --git a/espanol/oso/madre/madre.md b/espanol/oso/madre/madre.md deleted file mode 100644 index 14293faa68..0000000000 --- a/espanol/oso/madre/madre.md +++ /dev/null @@ -1,2 +0,0 @@ -Edgardo vos sos retrazado o que? no te dije que te dejes de jugar al play? -haceme el favor y ponete a juntar bayas como hacen los osos gummys \ No newline at end of file diff --git a/espanol/oso/oso.md b/espanol/oso/oso.md deleted file mode 100644 index 1733b760f7..0000000000 --- a/espanol/oso/oso.md +++ /dev/null @@ -1,5 +0,0 @@ -El oso edgardo estaba tranquilo en su cueva cuando de pronto: - -[Se oyo un grito desaforado](grito/grito.md) - -[la madre de edgardo lo cago a putiadas](madre/madre.md) \ No newline at end of file From 054a82d34721677c6e2106d211fc403b2f3fc4de Mon Sep 17 00:00:00 2001 From: kike mendez Date: Mon, 5 Oct 2015 09:48:21 -0200 Subject: [PATCH 1205/5486] Conflict solved --- espanol/canudos.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index fc1606558e..6c21a82bce 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -60,12 +60,10 @@ el Consejero: [En el rincón donde dormía, el beatito...](beatito/beatito.md) -<<<<<<< HEAD [Llamo a su comandante en jefe..](comandante/comandante.md) -======= + [Ocupó su lugar junto al emperador en el recibimiento](recibimiento/recibimiento.md) [Le dice a Beatito, el momento ha llegado, La Nueva Dimensión](dimension/dimension.md) ->>>>>>> 043f5db0795e6d306861c84019b61f900f970fee From 73cdd22ebff6f12328a2df9120d981a3eeed31ec Mon Sep 17 00:00:00 2001 From: Mitch Howe Date: Mon, 5 Oct 2015 12:23:51 -0700 Subject: [PATCH 1206/5486] Add a line --- english/eat-rainbows/right/right.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md index f900e1c850..25ce7355d1 100644 --- a/english/eat-rainbows/right/right.md +++ b/english/eat-rainbows/right/right.md @@ -1,3 +1,5 @@ You turned right and slammed into another customer carrying a birthday cake. -Ughh, cake from Safeway with lard icing! \ No newline at end of file +Ughh, cake from Safeway with lard icing! + +Worst. Day. Ever. \ No newline at end of file From a3b253fd36e6f4ad65ec3b406f65478df780ac1e Mon Sep 17 00:00:00 2001 From: Martin Currie Date: Tue, 6 Oct 2015 01:58:59 +0400 Subject: [PATCH 1207/5486] feat: Add new option under dream - to code --- english/dream/code/code.md | 1 + english/dream/dream.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/dream/code/code.md diff --git a/english/dream/code/code.md b/english/dream/code/code.md new file mode 100644 index 0000000000..f099453804 --- /dev/null +++ b/english/dream/code/code.md @@ -0,0 +1 @@ +You decide that talk of marshmallow real estate is purile so you escape, to code per chance to dream... \ No newline at end of file diff --git a/english/dream/dream.md b/english/dream/dream.md index 0bf8f312da..8fa870c44c 100644 --- a/english/dream/dream.md +++ b/english/dream/dream.md @@ -11,6 +11,8 @@ Afterwards, you decide to: [swim](../dream/swim/swim.md) +[code](../dream/code/code.md) + [dance](../dance/dance.md) [karaoke](../karaoke/nope.md) From 03c730592e14ad677d835359880dfb017a220037 Mon Sep 17 00:00:00 2001 From: Dan Stormont Date: Mon, 5 Oct 2015 23:06:11 -0700 Subject: [PATCH 1208/5486] feat: Add new line to Kai-El story options --- english/marshmallow.md | 2 ++ english/sounds-familiar/sounds-familiar.md | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 english/sounds-familiar/sounds-familiar.md diff --git a/english/marshmallow.md b/english/marshmallow.md index e60292f5f0..4b11b8e9ab 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -42,6 +42,8 @@ capacity for good, I have sent them you... my only son." [Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) +[That sure sounds familiar...](./sounds-familiar/sounds-familiar.md) + These marshmallows are numerous and they look so delicious. ... despite the feeling they're somehow judging you for only wearing one sock. diff --git a/english/sounds-familiar/sounds-familiar.md b/english/sounds-familiar/sounds-familiar.md new file mode 100644 index 0000000000..a42c857f96 --- /dev/null +++ b/english/sounds-familiar/sounds-familiar.md @@ -0,0 +1,14 @@ +This story rattling around in your head sure sounds familiar. + +You seem to remember hearing about someone giving up their only son somewhere... + +Was it as you were dozing off to the drone of some old guy standing in front of +a bunch of pews as you were surrounded by blue-haired ladies that smelled +sickeningly of sweet rose perfume on a Sunday morning? + +Or maybe it was when you were playing video games on the couch while some cheesy +movie from the 80s was playing on the TV in the background. + +Maybe it was at that comicon. + +To hell with it, [you go back to sleep]. (./english/marshmallow.md) \ No newline at end of file From 09f28b1a8ca50ba451deba2cca6790f25ba000fb Mon Sep 17 00:00:00 2001 From: Dan Stormont Date: Mon, 5 Oct 2015 23:13:18 -0700 Subject: [PATCH 1209/5486] bug: Fix misplaced period breaking markdown --- english/sounds-familiar/sounds-familiar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sounds-familiar/sounds-familiar.md b/english/sounds-familiar/sounds-familiar.md index a42c857f96..a4d5f156de 100644 --- a/english/sounds-familiar/sounds-familiar.md +++ b/english/sounds-familiar/sounds-familiar.md @@ -11,4 +11,4 @@ movie from the 80s was playing on the TV in the background. Maybe it was at that comicon. -To hell with it, [you go back to sleep]. (./english/marshmallow.md) \ No newline at end of file +[To hell with it, you go back to sleep.](./english/marshmallow.md) \ No newline at end of file From 0fd6e2159767a4be61f94a015ed74138a4f59025 Mon Sep 17 00:00:00 2001 From: Dan Stormont Date: Mon, 5 Oct 2015 23:17:04 -0700 Subject: [PATCH 1210/5486] bug: Fix path in return link --- english/sounds-familiar/sounds-familiar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sounds-familiar/sounds-familiar.md b/english/sounds-familiar/sounds-familiar.md index a4d5f156de..ccd24a12a2 100644 --- a/english/sounds-familiar/sounds-familiar.md +++ b/english/sounds-familiar/sounds-familiar.md @@ -11,4 +11,4 @@ movie from the 80s was playing on the TV in the background. Maybe it was at that comicon. -[To hell with it, you go back to sleep.](./english/marshmallow.md) \ No newline at end of file +[To hell with it, you go back to sleep.](../marshmallow.md) \ No newline at end of file From 680fbee25f0d024465150b703be7ace3725366e0 Mon Sep 17 00:00:00 2001 From: Andrew Lam Date: Tue, 6 Oct 2015 21:14:40 +0800 Subject: [PATCH 1211/5486] Add chocolate expired on marshmallow.md --- english/132-days-ago/132-days-ago.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/132-days-ago/132-days-ago.md diff --git a/english/132-days-ago/132-days-ago.md b/english/132-days-ago/132-days-ago.md new file mode 100644 index 0000000000..74889e5e82 --- /dev/null +++ b/english/132-days-ago/132-days-ago.md @@ -0,0 +1 @@ +132 days ago you went to Tesco to buy marshmallow but end up buying chocolate because you had not enough money to buy marshmallow. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 4419024766..59d9dce464 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -69,6 +69,8 @@ You begin to break out of the jacket and find a lighter, a fork, and rope. You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. +But only find out that the chocolate has expired [132 days ago](./132-days-ago/132-days-ago.md). + Do you want to [try to fill the remaining space in the sock with marshmallows](./fill-sock/fill-sock.md)? You are not sure who placed these objects near you or why. From 7d86c0af97787d8eecb246bafb3933eba6c68553 Mon Sep 17 00:00:00 2001 From: Andrew Lam Date: Tue, 6 Oct 2015 21:26:06 +0800 Subject: [PATCH 1212/5486] Breakdown 132-days-ago.md into two lines --- english/132-days-ago/132-days-ago.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/132-days-ago/132-days-ago.md b/english/132-days-ago/132-days-ago.md index 74889e5e82..e01718426a 100644 --- a/english/132-days-ago/132-days-ago.md +++ b/english/132-days-ago/132-days-ago.md @@ -1 +1,2 @@ -132 days ago you went to Tesco to buy marshmallow but end up buying chocolate because you had not enough money to buy marshmallow. \ No newline at end of file +132 days ago you went to Tesco to buy marshmallow +but end up buying chocolate because you had not enough money to buy marshmallow. \ No newline at end of file From 21b32424ddcf5ce743c4a7b78cd0a3f59308d83d Mon Sep 17 00:00:00 2001 From: devellmy Date: Tue, 6 Oct 2015 15:58:32 +0200 Subject: [PATCH 1213/5486] Add an alternative to smell flowers --- french/panique/frapper-le-mur.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/french/panique/frapper-le-mur.md b/french/panique/frapper-le-mur.md index 808e9976c8..5cf462ea3c 100644 --- a/french/panique/frapper-le-mur.md +++ b/french/panique/frapper-le-mur.md @@ -5,3 +5,5 @@ Finalement, emporté par votre élan, vous finissez par frapper un mur et vous v Maintenat que vous etes dehors, quoi faire? [Je sens des fleurs](sentir/fleurs.md) + +[Il fait froid. Je rentre](../feu-de-camp.md) \ No newline at end of file From 55832d2aef1fe8bcdc04201f17d01db70dfedc1a Mon Sep 17 00:00:00 2001 From: xt Date: Wed, 7 Oct 2015 00:12:08 +0800 Subject: [PATCH 1214/5486] new story added --- Chinese/crime_school/crime_school.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Chinese/crime_school/crime_school.md diff --git a/Chinese/crime_school/crime_school.md b/Chinese/crime_school/crime_school.md new file mode 100644 index 0000000000..b1ebe14cdd --- /dev/null +++ b/Chinese/crime_school/crime_school.md @@ -0,0 +1,2 @@ +李杀神、王诛魔和刘斩仙三位少年做梦也没有想到会在狼牙区飞虎路私立断罪小学再度聚首，面对校园 +里号称屠遍三界的“魔神”，四年级的赵日天，他们能否力挽狂澜，再度改写被上天诅咒的命运呢？！ From af8a17715a5f0c40891170476da5788127e6595d Mon Sep 17 00:00:00 2001 From: xt Date: Wed, 7 Oct 2015 00:18:05 +0800 Subject: [PATCH 1215/5486] update links --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 8fd0e206f5..6883978e47 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -55,3 +55,5 @@ [OnceThereIsAHill](OnceThereIsAHill/OnceThereIsAHill.md) [万里长城](world/走向世界.md) + +[断罪小学](crime-school/crime-school.md) From c625ba3f369fbc6c517d5fb888646d58dc3620d8 Mon Sep 17 00:00:00 2001 From: zxt5885577 Date: Wed, 7 Oct 2015 00:44:45 +0800 Subject: [PATCH 1216/5486] =?UTF-8?q?Update=20=E5=A4=A7=E8=AF=9D=E8=A5=BF?= =?UTF-8?q?=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 6883978e47..679bad4cfe 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -56,4 +56,4 @@ [万里长城](world/走向世界.md) -[断罪小学](crime-school/crime-school.md) +[断罪小学](crime_school/crime_school.md) From a2b21e16b9efe15e12c8f4264da58e65bd476cb0 Mon Sep 17 00:00:00 2001 From: Ankit Dhyani Date: Tue, 6 Oct 2015 22:55:23 +0530 Subject: [PATCH 1217/5486] Add Sunny Deol in actor's list. --- hindi/bollywood.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index dfd10e6123..8cf392fdfc 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -16,4 +16,6 @@ Amithab, [go here](actor3/amithab.md) दीपिका पादुकोन के लिए [ यहाँ ](./actor5/deepika.md) -Art of Living [Know More](art-of-living/art-of-living.md) \ No newline at end of file +Art of Living [Know More](art-of-living/art-of-living.md) + +[Sunny Deol](sunny_deol/sunny.md) \ No newline at end of file From 9222e462540f8b0e5bfb2970512a82c6df1ca28a Mon Sep 17 00:00:00 2001 From: Ankit Dhyani Date: Tue, 6 Oct 2015 23:02:06 +0530 Subject: [PATCH 1218/5486] Sunny Deol foler added. --- hindi/Sunny_Deol/sunny.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 hindi/Sunny_Deol/sunny.md diff --git a/hindi/Sunny_Deol/sunny.md b/hindi/Sunny_Deol/sunny.md new file mode 100644 index 0000000000..28c8994504 --- /dev/null +++ b/hindi/Sunny_Deol/sunny.md @@ -0,0 +1,5 @@ +Sunny Deol is eldest son of [Dharmendra](https://en.wikipedia.org/wiki/Dharmendra). +Known for his trade mark dialouge dilivery, there is hardly +anybody else in the vollywood who match his acting skill. + +To know more about him [click here](https://en.wikipedia.org/wiki/Sunny_Deol) \ No newline at end of file From 9b1824e6ec8b00a3ef4e7c2ce030a8e1a7907a95 Mon Sep 17 00:00:00 2001 From: Heather Khoury Date: Tue, 6 Oct 2015 13:43:57 -0400 Subject: [PATCH 1219/5486] Add zork adventure --- english/pinch/go-out/keep-running/keep-running.md | 9 ++++++++- english/zork/zork.md | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 english/zork/zork.md diff --git a/english/pinch/go-out/keep-running/keep-running.md b/english/pinch/go-out/keep-running/keep-running.md index 73815c3415..ce0bb2d9da 100644 --- a/english/pinch/go-out/keep-running/keep-running.md +++ b/english/pinch/go-out/keep-running/keep-running.md @@ -1,3 +1,10 @@ You keep running, going nowhere in particular. -Then you tripped over something and fell flat on your face. \ No newline at end of file +Then you tripped over something and fell flat on your face. + +You tripped on a half-open manhole cover. You move the cover to +reveal the top of a ladder leading down into the dark. + +[Climb down](../zork/zork.md) + +[Notice that there's a patch of fluffy moss off to your left and go to take a nap?](../moss-nap/moss-nap.md) diff --git a/english/zork/zork.md b/english/zork/zork.md new file mode 100644 index 0000000000..c7a18a7c50 --- /dev/null +++ b/english/zork/zork.md @@ -0,0 +1,5 @@ +You are in a maze of dark and twisty passages, all alike. + +You are likely to be eaten by a grue. + +[What's a grue?](../grue/grue.md) From 93a60857daa3991f4d08998e482cecc6d280bb53 Mon Sep 17 00:00:00 2001 From: Heather Khoury Date: Tue, 6 Oct 2015 13:50:58 -0400 Subject: [PATCH 1220/5486] Fix path for choices --- english/pinch/go-out/keep-running/keep-running.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/pinch/go-out/keep-running/keep-running.md b/english/pinch/go-out/keep-running/keep-running.md index ce0bb2d9da..5f150173ae 100644 --- a/english/pinch/go-out/keep-running/keep-running.md +++ b/english/pinch/go-out/keep-running/keep-running.md @@ -5,6 +5,6 @@ Then you tripped over something and fell flat on your face. You tripped on a half-open manhole cover. You move the cover to reveal the top of a ladder leading down into the dark. -[Climb down](../zork/zork.md) +[Climb down](../../zork/zork.md) -[Notice that there's a patch of fluffy moss off to your left and go to take a nap?](../moss-nap/moss-nap.md) +[Notice that there's a patch of fluffy moss off to your left and go to take a nap?](../../moss-nap/moss-nap.md) From 068435ce708f936ff59cd5eb5756dc0425d82bab Mon Sep 17 00:00:00 2001 From: Heather Khoury Date: Tue, 6 Oct 2015 13:56:05 -0400 Subject: [PATCH 1221/5486] Fix path --- english/pinch/go-out/keep-running/keep-running.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/pinch/go-out/keep-running/keep-running.md b/english/pinch/go-out/keep-running/keep-running.md index 5f150173ae..31bc06a8d4 100644 --- a/english/pinch/go-out/keep-running/keep-running.md +++ b/english/pinch/go-out/keep-running/keep-running.md @@ -5,6 +5,6 @@ Then you tripped over something and fell flat on your face. You tripped on a half-open manhole cover. You move the cover to reveal the top of a ladder leading down into the dark. -[Climb down](../../zork/zork.md) +[Climb down](../../../zork/zork.md) -[Notice that there's a patch of fluffy moss off to your left and go to take a nap?](../../moss-nap/moss-nap.md) +[Notice that there's a patch of fluffy moss off to your left and go to take a nap?](../../../moss-nap/moss-nap.md) From 6406ec82b8d7ce4492de8bad625670e8f8f40a98 Mon Sep 17 00:00:00 2001 From: Heather Khoury Date: Tue, 6 Oct 2015 13:58:01 -0400 Subject: [PATCH 1222/5486] Fix path --- english/pinch/go-out/keep-running/keep-running.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/pinch/go-out/keep-running/keep-running.md b/english/pinch/go-out/keep-running/keep-running.md index 31bc06a8d4..2a6b147684 100644 --- a/english/pinch/go-out/keep-running/keep-running.md +++ b/english/pinch/go-out/keep-running/keep-running.md @@ -7,4 +7,4 @@ reveal the top of a ladder leading down into the dark. [Climb down](../../../zork/zork.md) -[Notice that there's a patch of fluffy moss off to your left and go to take a nap?](../../../moss-nap/moss-nap.md) +[Notice that there's a patch of fluffy moss off to your left and go to take a nap?](english/explore-outside/moss-nap/moss-nap.md) From 5af4f4a91fac98dfe633efdf38a1229442a6918a Mon Sep 17 00:00:00 2001 From: Heather Khoury Date: Tue, 6 Oct 2015 14:04:53 -0400 Subject: [PATCH 1223/5486] Fix path --- english/pinch/go-out/keep-running/keep-running.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/pinch/go-out/keep-running/keep-running.md b/english/pinch/go-out/keep-running/keep-running.md index 2a6b147684..cfe633860c 100644 --- a/english/pinch/go-out/keep-running/keep-running.md +++ b/english/pinch/go-out/keep-running/keep-running.md @@ -7,4 +7,5 @@ reveal the top of a ladder leading down into the dark. [Climb down](../../../zork/zork.md) -[Notice that there's a patch of fluffy moss off to your left and go to take a nap?](english/explore-outside/moss-nap/moss-nap.md) +[Notice that there's a patch of fluffy moss off to your left and go to take a nap?] +(../../../../moss-nap/moss-nap.md) From 4fc36497a9216ad27b2e5a4d389ad7fe4bf524b1 Mon Sep 17 00:00:00 2001 From: Heather Khoury Date: Tue, 6 Oct 2015 14:05:57 -0400 Subject: [PATCH 1224/5486] Fix path --- english/pinch/go-out/keep-running/keep-running.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/pinch/go-out/keep-running/keep-running.md b/english/pinch/go-out/keep-running/keep-running.md index cfe633860c..03b4a492b7 100644 --- a/english/pinch/go-out/keep-running/keep-running.md +++ b/english/pinch/go-out/keep-running/keep-running.md @@ -8,4 +8,4 @@ reveal the top of a ladder leading down into the dark. [Climb down](../../../zork/zork.md) [Notice that there's a patch of fluffy moss off to your left and go to take a nap?] -(../../../../moss-nap/moss-nap.md) +(../../../moss-nap/moss-nap.md) From 2109181e306f57bee04c0992f5d419d88aca9096 Mon Sep 17 00:00:00 2001 From: Heather Khoury Date: Tue, 6 Oct 2015 14:06:57 -0400 Subject: [PATCH 1225/5486] Fix path --- english/pinch/go-out/keep-running/keep-running.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/pinch/go-out/keep-running/keep-running.md b/english/pinch/go-out/keep-running/keep-running.md index 03b4a492b7..4ede1cd3a8 100644 --- a/english/pinch/go-out/keep-running/keep-running.md +++ b/english/pinch/go-out/keep-running/keep-running.md @@ -8,4 +8,4 @@ reveal the top of a ladder leading down into the dark. [Climb down](../../../zork/zork.md) [Notice that there's a patch of fluffy moss off to your left and go to take a nap?] -(../../../moss-nap/moss-nap.md) +(../../explore-outside/moss-nap/moss-nap.md) From 4229f9724058388a74d53f5c58e8113d43ec762f Mon Sep 17 00:00:00 2001 From: Heather Khoury Date: Tue, 6 Oct 2015 14:07:37 -0400 Subject: [PATCH 1226/5486] Fix path --- english/pinch/go-out/keep-running/keep-running.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/pinch/go-out/keep-running/keep-running.md b/english/pinch/go-out/keep-running/keep-running.md index 4ede1cd3a8..6c20d144b2 100644 --- a/english/pinch/go-out/keep-running/keep-running.md +++ b/english/pinch/go-out/keep-running/keep-running.md @@ -8,4 +8,4 @@ reveal the top of a ladder leading down into the dark. [Climb down](../../../zork/zork.md) [Notice that there's a patch of fluffy moss off to your left and go to take a nap?] -(../../explore-outside/moss-nap/moss-nap.md) +(../../../explore-outside/moss-nap/moss-nap.md) From 13304bda4d07bef84df739e9fb966b457475b6e4 Mon Sep 17 00:00:00 2001 From: Ankit Dhyani Date: Tue, 6 Oct 2015 23:45:42 +0530 Subject: [PATCH 1227/5486] Story reachable. --- hindi/bollywood.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 8cf392fdfc..74e9f804bb 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -18,4 +18,4 @@ Amithab, [go here](actor3/amithab.md) Art of Living [Know More](art-of-living/art-of-living.md) -[Sunny Deol](sunny_deol/sunny.md) \ No newline at end of file +[Sunny Deol](Sunny_Deol/sunny.md) \ No newline at end of file From 6a68270b8b935c4a51ee5c18cf239af2a6b04955 Mon Sep 17 00:00:00 2001 From: baharman78 Date: Tue, 6 Oct 2015 15:21:49 -0400 Subject: [PATCH 1228/5486] Added sentence to code.md --- english/code/code.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/code/code.md b/english/code/code.md index 1b76c4bf09..f42e28e440 100644 --- a/english/code/code.md +++ b/english/code/code.md @@ -8,3 +8,6 @@ You continue coding. one day i got bored with the stuff so i created an algorithm to add some color and randomness. + +Then I decided to change the transparency of the +marshmallows to 50%. From 1e2c2b7a6e877dd49736386fdb32f6111b88dc87 Mon Sep 17 00:00:00 2001 From: jastillero Date: Tue, 6 Oct 2015 19:00:06 -0400 Subject: [PATCH 1229/5486] Add happy robot story --- english/happy-robot/happy-robot.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/happy-robot/happy-robot.md diff --git a/english/happy-robot/happy-robot.md b/english/happy-robot/happy-robot.md new file mode 100644 index 0000000000..a2e0a5e072 --- /dev/null +++ b/english/happy-robot/happy-robot.md @@ -0,0 +1 @@ +A happy robot helps people. \ No newline at end of file From 5546530f38e7d7da49fe604dddefe38d59aedd55 Mon Sep 17 00:00:00 2001 From: jastillero Date: Tue, 6 Oct 2015 19:04:47 -0400 Subject: [PATCH 1230/5486] Add new line to story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 59d9dce464..617edf3b5b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -532,3 +532,5 @@ phone to find something else to do](check-phone/check-phone.md). And you plug-in to [play some music](play-music/playmusic.md). The next thing you know, you're up all night in Croatia mixing a new playlist + +You remember the story of a [robot](happy-robot/happy-robot.md). From ee3161daa8d2e31148f904f28ec725aafcc8620a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Oct 2015 21:16:17 -0400 Subject: [PATCH 1231/5486] Add link to Batman-vs-superman page Extend Superman story with new Spoiler story page --- .../do-you-bleed/Batman-vs-superman/Batman-vs-superman.md | 4 +++- .../do-you-bleed/Batman-vs-superman/Spoilers/Spoilers.md | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/Batman-vs-superman/Spoilers/Spoilers.md diff --git a/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/Batman-vs-superman/Batman-vs-superman.md b/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/Batman-vs-superman/Batman-vs-superman.md index bef99b12db..f434e11969 100644 --- a/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/Batman-vs-superman/Batman-vs-superman.md +++ b/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/Batman-vs-superman/Batman-vs-superman.md @@ -1,3 +1,5 @@ The plot of Batman v Superman: Dawn of Justice starts to unfold, before the movie even comes out! -Spoilers ahead! \ No newline at end of file +Spoilers ahead! + +[SPOILERS!!!](./Spoilers/Spoilers.md) \ No newline at end of file diff --git a/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/Batman-vs-superman/Spoilers/Spoilers.md b/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/Batman-vs-superman/Spoilers/Spoilers.md new file mode 100644 index 0000000000..e69cfc4352 --- /dev/null +++ b/english/remember-you-are-superman/zack-snyder-movie/do-you-bleed/Batman-vs-superman/Spoilers/Spoilers.md @@ -0,0 +1,7 @@ +Just before they start to fight, a thought comes to Batman's mind! + +"Why not film all of this and make a movie! We could be rich!!" + +Superman replies: "But aren't we already rich?!" + +Batman: "Ummm...did I say rich? I meant RICHER!!! Muwhahaha..coughcough..I mean...I'm BATMANNN!!!" From d8f5f21f18b4a71f33db3b1979dc46dc8af6733d Mon Sep 17 00:00:00 2001 From: gfcmills Date: Wed, 7 Oct 2015 17:21:57 +0100 Subject: [PATCH 1232/5486] Add heffalump storyline --- english/heffalump/heffalump.md | 3 +++ english/marshmallow.md | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 english/heffalump/heffalump.md diff --git a/english/heffalump/heffalump.md b/english/heffalump/heffalump.md new file mode 100644 index 0000000000..02617d1230 --- /dev/null +++ b/english/heffalump/heffalump.md @@ -0,0 +1,3 @@ +A heffalump you say? What's one of those... + +Well it's a magical beast with [super powers](../super-powers/practice-flying.md). Not to be confused with a [scarab](../scarab/goddess.md), or in fact a [marshmallow](../marshmallow.md). \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 617edf3b5b..ea792e1f29 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -14,6 +14,10 @@ A sound from a Hitchcock movie fills the room, then quickly fades away. Was it the sound of a cry from the shower? +It sounded like it could have been a [heffalump](heffalump/heffalump.md) + +No... perhaps not. + Thinking back, there are no memories to suggest that this should have been anything but an ordinary morning. You didn't go out last night, you don't usually take intoxicants, what's happening...? From b3bd47f7f83174ad2e636a2a780f34a9847040d1 Mon Sep 17 00:00:00 2001 From: gfcmills Date: Wed, 7 Oct 2015 17:26:00 +0100 Subject: [PATCH 1233/5486] Space out links --- english/heffalump/heffalump.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/heffalump/heffalump.md b/english/heffalump/heffalump.md index 02617d1230..08a7e33e19 100644 --- a/english/heffalump/heffalump.md +++ b/english/heffalump/heffalump.md @@ -1,3 +1,7 @@ A heffalump you say? What's one of those... -Well it's a magical beast with [super powers](../super-powers/practice-flying.md). Not to be confused with a [scarab](../scarab/goddess.md), or in fact a [marshmallow](../marshmallow.md). \ No newline at end of file +Well it's a magical beast with [super powers](../super-powers/practice-flying.md). + +Not to be confused with a [scarab](../scarab/goddess.md), + + or in fact a [marshmallow](../marshmallow.md). \ No newline at end of file From 578acfbd04ccd0f5446edee94dcb086e5fd74577 Mon Sep 17 00:00:00 2001 From: Peter Brooks Date: Wed, 7 Oct 2015 13:27:15 -0400 Subject: [PATCH 1234/5486] add imdb batman source to english version --- english/batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index 5c240cc7d6..c83426153c 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -6,6 +6,8 @@ click [here](https://en.wikipedia.org/wiki/Batman) and see it for yourself. Click [here](http://www.google.com) to visit Google. +Click [here](http://www.imdb.com/title/tt0096895/) to visit IMDB. + But I know what you're wondering. If Bruch Wayne is the Bat, then who is Bruce Wayne? Well it's obvious... ...IT'S JOHN CENA!!! From 397256061a9860949c9b4799c82c91f7e935b9d7 Mon Sep 17 00:00:00 2001 From: Daniel Justice Date: Wed, 7 Oct 2015 14:01:08 -0400 Subject: [PATCH 1235/5486] Inv Glow Pants links to page Interrogate-Pixie -investigate glowing pants now has link to interrogate pixie -interrogate pixie was created --- english/interrogate-pixie/interrogate-pixie.md | 16 ++++++++++++++++ .../investigate-glowing-pants.md | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 english/interrogate-pixie/interrogate-pixie.md diff --git a/english/interrogate-pixie/interrogate-pixie.md b/english/interrogate-pixie/interrogate-pixie.md new file mode 100644 index 0000000000..c973ae1fd3 --- /dev/null +++ b/english/interrogate-pixie/interrogate-pixie.md @@ -0,0 +1,16 @@ + The pixie was approximately 6 inches tall and slender. Even a small pigeon would +be about twice her size in every direction. Her white, faintly glowing skin +would have made her difficult to see against the marshmallow walls if it +were not for her sky blue tunic. + + She looks to be the only other sentient being in the room and so you decide +to talk to her. You approach slowly because she looks frightened and because with +you luck she might not be as gentle as she looks. + + Once close enough you sit down and aske her, "Do these strange walls frighten you?" + + With a confused expression she appears to drop her guard to ask, "Why should they? +What is so strange about them." + + Shocked, all you can think to yourself is 'Because they are strange! And surely +marshmallow walls are no normal to you!?' \ No newline at end of file diff --git a/english/investigate-glowing-pants/investigate-glowing-pants.md b/english/investigate-glowing-pants/investigate-glowing-pants.md index 0441670f84..833bedad34 100644 --- a/english/investigate-glowing-pants/investigate-glowing-pants.md +++ b/english/investigate-glowing-pants/investigate-glowing-pants.md @@ -2,4 +2,5 @@ You take your pants off, turn them upside down, and shake them vigorously. A small pixie falls out and angrily bites you on the nose before flying off to hide in a corner of the room. -[Ignore the pixie for now](../marshmallow.md) \ No newline at end of file +[Ignore the pixie for now](../marshmallow.md) +[Ask the pixie a few questions](../interrogate-pixie/interrogate-pixie.md) \ No newline at end of file From 0a45f547b23d277d9f49b43081aed7c901bba6d3 Mon Sep 17 00:00:00 2001 From: Dan Zeidler Date: Wed, 7 Oct 2015 13:44:50 -0600 Subject: [PATCH 1236/5486] added option to summon dragons --- english/super-powers/practice-flying.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/super-powers/practice-flying.md b/english/super-powers/practice-flying.md index 830b3f5cdc..65114e4f6a 100644 --- a/english/super-powers/practice-flying.md +++ b/english/super-powers/practice-flying.md @@ -19,3 +19,5 @@ Do you: [Plummet like a rock?](../plummet/plummet.md) [Dance, dance for elevation?](../hammertime/hammertime.md) + +[Summon dragons!](../dragons/fire-everywhere.md) From c94ad751f847cae9cba17d15048accf11217c3f5 Mon Sep 17 00:00:00 2001 From: datasciencefan Date: Wed, 7 Oct 2015 12:48:18 -0700 Subject: [PATCH 1237/5486] Add breakfast option to friends --- english/invite-friends/friends.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/invite-friends/friends.md b/english/invite-friends/friends.md index 7f0352fec7..80355400b7 100644 --- a/english/invite-friends/friends.md +++ b/english/invite-friends/friends.md @@ -19,4 +19,6 @@ Do you: [don't sing karaoke?](../karaoke/nope.md) -[do a flip](flip/flip.md) \ No newline at end of file +[do a flip](flip/flip.md) + +[eat breakfast?](breakfast/breakfast.md) \ No newline at end of file From 10fdb60bc352b4ce6a668aceaf4538d2b063fc9a Mon Sep 17 00:00:00 2001 From: datasciencefan Date: Wed, 7 Oct 2015 12:52:58 -0700 Subject: [PATCH 1238/5486] Fix breakfast link --- english/invite-friends/friends.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/invite-friends/friends.md b/english/invite-friends/friends.md index 80355400b7..f5c785dcc2 100644 --- a/english/invite-friends/friends.md +++ b/english/invite-friends/friends.md @@ -21,4 +21,4 @@ Do you: [do a flip](flip/flip.md) -[eat breakfast?](breakfast/breakfast.md) \ No newline at end of file +[eat breakfast?](../breakfast/breakfast.md) \ No newline at end of file From c6db88f3933d44190863237d167876a89d67be31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=89=AC?= Date: Thu, 8 Oct 2015 21:19:17 +0800 Subject: [PATCH 1239/5486] =?UTF-8?q?=E5=91=A8=E6=9D=B0=E4=BC=A6=E4=B9=B1?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/Jay_Chou/Jay_Chou.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/Jay_Chou/Jay_Chou.md diff --git a/Chinese/Jay_Chou/Jay_Chou.md b/Chinese/Jay_Chou/Jay_Chou.md new file mode 100644 index 0000000000..a7487bf27b --- /dev/null +++ b/Chinese/Jay_Chou/Jay_Chou.md @@ -0,0 +1 @@ +周杰伦自从参加了中国好声音之后，觉得比以前幽默多了，哎哟不错哦！ From ca27bd539c900b1ae264402904c123528dbd4024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=89=AC?= Date: Thu, 8 Oct 2015 21:21:20 +0800 Subject: [PATCH 1240/5486] =?UTF-8?q?=E5=91=A8=E6=9D=B0=E4=BC=A6=E4=B9=B1?= =?UTF-8?q?=E5=85=A5=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/Jay_Chou/Jay_Chou.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/Jay_Chou/Jay_Chou.md b/Chinese/Jay_Chou/Jay_Chou.md index a7487bf27b..e316bffc67 100644 --- a/Chinese/Jay_Chou/Jay_Chou.md +++ b/Chinese/Jay_Chou/Jay_Chou.md @@ -1 +1 @@ -周杰伦自从参加了中国好声音之后，觉得比以前幽默多了，哎哟不错哦！ +周杰伦自从参加了中国好声音之后，觉得比以前幽默多了，哎哟不错哦！哈哈！ From ad2a2a75b33120e4af507c2a5ae3feea1a84ac8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=89=AC?= Date: Thu, 8 Oct 2015 21:23:23 +0800 Subject: [PATCH 1241/5486] =?UTF-8?q?=E5=91=A8=E6=9D=B0=E4=BC=A6=E4=B9=B1?= =?UTF-8?q?=E5=85=A5=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 3 +++ 1 file changed, 3 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 679bad4cfe..bff0774f58 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -57,3 +57,6 @@ [万里长城](world/走向世界.md) [断罪小学](crime_school/crime_school.md) + +[周杰伦](Jay_Chou/Jay_Chou.md) + From dabaeb892c04212f25ae296eceda2c3632b2118f Mon Sep 17 00:00:00 2001 From: Daniel Justice Date: Thu, 8 Oct 2015 13:36:43 -0400 Subject: [PATCH 1242/5486] Added a blank line between links --- english/investigate-glowing-pants/investigate-glowing-pants.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/investigate-glowing-pants/investigate-glowing-pants.md b/english/investigate-glowing-pants/investigate-glowing-pants.md index 833bedad34..fc58dd98f1 100644 --- a/english/investigate-glowing-pants/investigate-glowing-pants.md +++ b/english/investigate-glowing-pants/investigate-glowing-pants.md @@ -3,4 +3,5 @@ You take your pants off, turn them upside down, and shake them vigorously. A small pixie falls out and angrily bites you on the nose before flying off to hide in a corner of the room. [Ignore the pixie for now](../marshmallow.md) + [Ask the pixie a few questions](../interrogate-pixie/interrogate-pixie.md) \ No newline at end of file From 7e60244dd9da339e39e778357558391899b05ee8 Mon Sep 17 00:00:00 2001 From: kstukenborg <@stuk> Date: Thu, 8 Oct 2015 15:48:10 -0700 Subject: [PATCH 1243/5486] Add hermione because she knows her spells --- english/hermione/hermioneHere | 2 ++ english/marshmallow.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/hermione/hermioneHere diff --git a/english/hermione/hermioneHere b/english/hermione/hermioneHere new file mode 100644 index 0000000000..e9a486fe12 --- /dev/null +++ b/english/hermione/hermioneHere @@ -0,0 +1,2 @@ +Hermione is always getting into trouble with Ron and Harry. They +could be at Hagrid's hut or in town having a butter beer. diff --git a/english/marshmallow.md b/english/marshmallow.md index ea792e1f29..b972ac3ced 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -139,6 +139,8 @@ I felt a sudden ease of mind. "Ok", I said to myself, "I need to get out of here" "But first I must remember the magic spell needed to open the enchanted door!" +Where is Hermione Granger when you need her? Where I ask you? +Oh, I know. Click [here] You pick up the fork and wrap it in rope to fashion a crappy wand. From 9f265d3f5c105c3b659ff45b393981e52278db97 Mon Sep 17 00:00:00 2001 From: kstukenborg <@stuk> Date: Thu, 8 Oct 2015 15:54:40 -0700 Subject: [PATCH 1244/5486] Fix file typo for hermione/hermioneHere --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b972ac3ced..a00266e043 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -140,7 +140,7 @@ I felt a sudden ease of mind. "But first I must remember the magic spell needed to open the enchanted door!" Where is Hermione Granger when you need her? Where I ask you? -Oh, I know. Click [here] +Oh, I know. Click [here](./hermione/hermioneHere.md) You pick up the fork and wrap it in rope to fashion a crappy wand. From 2ca2eb15e1873d97d4ba7b7e667c9370f2c26701 Mon Sep 17 00:00:00 2001 From: kstukenborg <@stuk> Date: Thu, 8 Oct 2015 15:58:26 -0700 Subject: [PATCH 1245/5486] Fix file to be hermione/hermioneHere without ./ --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index a00266e043..f835cdbeec 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -140,7 +140,7 @@ I felt a sudden ease of mind. "But first I must remember the magic spell needed to open the enchanted door!" Where is Hermione Granger when you need her? Where I ask you? -Oh, I know. Click [here](./hermione/hermioneHere.md) +Oh, I know. Click [here](hermione/hermioneHere.md) You pick up the fork and wrap it in rope to fashion a crappy wand. From 1a7c3f131d7466fa9eb7153c1ffb233202be1ab1 Mon Sep 17 00:00:00 2001 From: kstukenborg <@stuk> Date: Thu, 8 Oct 2015 16:03:26 -0700 Subject: [PATCH 1246/5486] Rename hermioneHere to hermioneHere.md --- english/hermione/hermioneHere.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/hermione/hermioneHere.md diff --git a/english/hermione/hermioneHere.md b/english/hermione/hermioneHere.md new file mode 100644 index 0000000000..e9a486fe12 --- /dev/null +++ b/english/hermione/hermioneHere.md @@ -0,0 +1,2 @@ +Hermione is always getting into trouble with Ron and Harry. They +could be at Hagrid's hut or in town having a butter beer. From 4bdf67b719da9e77d6748d0d6aa2ef48a817eb5b Mon Sep 17 00:00:00 2001 From: buckocee Date: Thu, 8 Oct 2015 19:22:03 -0400 Subject: [PATCH 1247/5486] Step into the Marshmallow --- english/moving/moving.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/moving/moving.md b/english/moving/moving.md index 0e18b332fc..649a3692c2 100644 --- a/english/moving/moving.md +++ b/english/moving/moving.md @@ -9,3 +9,5 @@ What do you do next? [Try to run away from the supposedly dead marshmallow](../run/run.md) [Eat the marshmallow](../eatmarshmallow/eatmarshmallow.md) + +[Step into the Marshmallow](../matrix/matrix2inception/matrix2inception.md) From 8e3a315c4051345964a9c475ee10c2a0af6d184d Mon Sep 17 00:00:00 2001 From: kstukenborg Date: Thu, 8 Oct 2015 18:06:55 -0700 Subject: [PATCH 1248/5486] Delete hermioneHere --- english/hermione/hermioneHere | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 english/hermione/hermioneHere diff --git a/english/hermione/hermioneHere b/english/hermione/hermioneHere deleted file mode 100644 index e9a486fe12..0000000000 --- a/english/hermione/hermioneHere +++ /dev/null @@ -1,2 +0,0 @@ -Hermione is always getting into trouble with Ron and Harry. They -could be at Hagrid's hut or in town having a butter beer. From d9dd8d9f9b3d9cc40ed99263bc7bc81c94493461 Mon Sep 17 00:00:00 2001 From: Kim Richard Lisenko Date: Thu, 8 Oct 2015 21:03:09 -0700 Subject: [PATCH 1249/5486] Added a cat adventure. --- english/animal/animal.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/animal/animal.md diff --git a/english/animal/animal.md b/english/animal/animal.md new file mode 100644 index 0000000000..27a382adec --- /dev/null +++ b/english/animal/animal.md @@ -0,0 +1 @@ +My worst fears have come true. My cat is crying out for food. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index f835cdbeec..29566b3001 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -18,6 +18,8 @@ It sounded like it could have been a [heffalump](heffalump/heffalump.md) No... perhaps not. +I think it was an [animal](animal/animal.md). + Thinking back, there are no memories to suggest that this should have been anything but an ordinary morning. You didn't go out last night, you don't usually take intoxicants, what's happening...? From d40ae49a9da1f5141101a54ed257f6efc1e33193 Mon Sep 17 00:00:00 2001 From: kstukenborg <@stuk> Date: Fri, 9 Oct 2015 06:30:20 -0700 Subject: [PATCH 1250/5486] Add different days --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 29566b3001..56cfc8d436 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -6,6 +6,8 @@ One morning, you wake up in a strange room with marshmallows for walls. *(Must be a Tuesday.)* +Or a Wednesday...Thursday...maybe even a Friday. + Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. For a second, you decide whether or not to just [go back to sleep](go-back-to-sleep/go-back-to-sleep.md) From 563f155e38e55a28ceffc71362f89fdbf9b6b80a Mon Sep 17 00:00:00 2001 From: Jason Pike Date: Fri, 9 Oct 2015 14:22:21 -0500 Subject: [PATCH 1251/5486] monster retreats --- english/sing/out-of-tune/out-of-tune.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/sing/out-of-tune/out-of-tune.md b/english/sing/out-of-tune/out-of-tune.md index 42f5bd785e..2badf61a65 100644 --- a/english/sing/out-of-tune/out-of-tune.md +++ b/english/sing/out-of-tune/out-of-tune.md @@ -1 +1,3 @@ -You really concentrate this time, and finally start singing, with the clearest voice ever heard! \ No newline at end of file +You really concentrate this time, and finally start singing, with the clearest voice ever heard! + +It is clearly awful. The monster retreats in disgust. From 22a02d2151a15d63d7b3f7b7a125c682ff24f07c Mon Sep 17 00:00:00 2001 From: kstukenborg <@stuk> Date: Fri, 9 Oct 2015 18:55:13 -0700 Subject: [PATCH 1252/5486] Add Saturday --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 56cfc8d436..03be6cfaf5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -6,7 +6,7 @@ One morning, you wake up in a strange room with marshmallows for walls. *(Must be a Tuesday.)* -Or a Wednesday...Thursday...maybe even a Friday. +Or a Wednesday...Thursday...maybe even a Friday. Ok, maybe Saturday too. Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. From 68aa38177f5e1b311cf76b2b1eb4821a89038850 Mon Sep 17 00:00:00 2001 From: kstukenborg <@stuk> Date: Sat, 10 Oct 2015 06:30:12 -0700 Subject: [PATCH 1253/5486] Add saturday on the correct line --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 03be6cfaf5..e07c5dbe1e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -6,7 +6,9 @@ One morning, you wake up in a strange room with marshmallows for walls. *(Must be a Tuesday.)* -Or a Wednesday...Thursday...maybe even a Friday. Ok, maybe Saturday too. +Or a Wednesday...Thursday...maybe even a Friday. + +Ok, we have to consider Saturday too. Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. From fcaf674081c77f36b40c80da91a55149bcb3438a Mon Sep 17 00:00:00 2001 From: Sam Devine Date: Sat, 10 Oct 2015 15:40:37 -0400 Subject: [PATCH 1254/5486] Become a marshmallow wizard --- english/marshmallow-wizard/marshmallow-wizard.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/marshmallow-wizard/marshmallow-wizard.md diff --git a/english/marshmallow-wizard/marshmallow-wizard.md b/english/marshmallow-wizard/marshmallow-wizard.md new file mode 100644 index 0000000000..1f20bd247a --- /dev/null +++ b/english/marshmallow-wizard/marshmallow-wizard.md @@ -0,0 +1 @@ +Spawning thousands and thousands of beautiful marshmallows of every color, you revel in your power and swear to use it for good—for example, to cure world hunger with unlimited sugary treats—rather than for evil—for example, to buffet your enemies with a barrage of soft multicolored projectiles. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index e07c5dbe1e..7a360ad563 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -546,3 +546,5 @@ And you plug-in to [play some music](play-music/playmusic.md). The next thing you know, you're up all night in Croatia mixing a new playlist You remember the story of a [robot](happy-robot/happy-robot.md). + +Wondering how you got here, you feel a strange tingling in your hands, almost as if they are responding to your new surroundings. You feel an urge to gesture forward, and as you do a large pink marshmallow shoots out of your hand into the wall before you. [Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) From 08d632320444e5f57cf56ef6ebb155f104f65cc9 Mon Sep 17 00:00:00 2001 From: Sam Devine Date: Sat, 10 Oct 2015 15:44:19 -0400 Subject: [PATCH 1255/5486] Shortened line lengths --- english/marshmallow-wizard/marshmallow-wizard.md | 5 ++++- english/marshmallow.md | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/english/marshmallow-wizard/marshmallow-wizard.md b/english/marshmallow-wizard/marshmallow-wizard.md index 1f20bd247a..c6d4f67857 100644 --- a/english/marshmallow-wizard/marshmallow-wizard.md +++ b/english/marshmallow-wizard/marshmallow-wizard.md @@ -1 +1,4 @@ -Spawning thousands and thousands of beautiful marshmallows of every color, you revel in your power and swear to use it for good—for example, to cure world hunger with unlimited sugary treats—rather than for evil—for example, to buffet your enemies with a barrage of soft multicolored projectiles. \ No newline at end of file +Spawning thousands and thousands of beautiful marshmallows of every color, +you revel in your power and swear to use it for good—for example, to cure +world hunger with unlimited sugary treats—rather than for evil—for example, +to buffet your enemies with a barrage of soft multicolored projectiles. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 7a360ad563..b0edfdc810 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -547,4 +547,7 @@ The next thing you know, you're up all night in Croatia mixing a new playlist You remember the story of a [robot](happy-robot/happy-robot.md). -Wondering how you got here, you feel a strange tingling in your hands, almost as if they are responding to your new surroundings. You feel an urge to gesture forward, and as you do a large pink marshmallow shoots out of your hand into the wall before you. [Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) +Wondering how you got here, you feel a strange tingling in your hands, almost as if +they are responding to your new surroundings. You feel an urge to gesture forward, +and as you do a large pink marshmallow shoots out of your hand into the wall before you. +[Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) From 2d077c8fea4bd130a45c1d96b2dd75c19ac3eff2 Mon Sep 17 00:00:00 2001 From: Markus Loeffler Date: Sun, 11 Oct 2015 15:36:51 +0100 Subject: [PATCH 1256/5486] Continue cannibal scene --- german/schwimmen/hunger/momentmal/momentmal.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/german/schwimmen/hunger/momentmal/momentmal.md b/german/schwimmen/hunger/momentmal/momentmal.md index 21fc3610fa..a79b0585a6 100644 --- a/german/schwimmen/hunger/momentmal/momentmal.md +++ b/german/schwimmen/hunger/momentmal/momentmal.md @@ -3,3 +3,7 @@ merkst du, dass das ja gar kein Kiosk ist. Eher so eine Hütte, die du schon mal in irgendeiner Doku gesehen hast. Was war das doch gleich? Ach ja - Papua Neuguinea ... Eingeborene ... Kannibalen ... + +Du beschließt, doch besser woanders hinzugehen, aber plötzlich bist +du von einer Gruppe von kleinen, fast nackten Männern mit Speeren +umringt, die wild gestikulieren. From f101dcfb0472d42ee2b922331f3178fc700c1e19 Mon Sep 17 00:00:00 2001 From: Udacity_Lesson Date: Sun, 11 Oct 2015 14:46:13 -0400 Subject: [PATCH 1257/5486] Add rrb as proof of coming singularity --- english/robot-rap-battle/robot-rap-battle.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/robot-rap-battle/robot-rap-battle.md b/english/robot-rap-battle/robot-rap-battle.md index 4db4c81d6e..e94d04b6c7 100644 --- a/english/robot-rap-battle/robot-rap-battle.md +++ b/english/robot-rap-battle/robot-rap-battle.md @@ -2,4 +2,6 @@ You create the most advanced artificial intelligence known to man to escape. Now that you've escaped should you use this AI to solve world hunger? Cure all diseases? -No. You will use this AI to witness an [Epic Rap Battle](https://www.youtube.com/watch?v=Jmqa99Ar1Hs) \ No newline at end of file +No. You will use this AI to witness an [Epic Rap Battle](https://www.youtube.com/watch?v=Jmqa99Ar1Hs) + +Now, do you use this to show the ablity of robots to replace humans? \ No newline at end of file From 298baf446cd44ca9f15e250af9ead30bf94c858f Mon Sep 17 00:00:00 2001 From: jaspinall Date: Sun, 11 Oct 2015 13:58:33 -0700 Subject: [PATCH 1258/5486] Add new option to silent approach page --- .../talk-child/silent-approach/run-away/run-away.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 english/explore-outside/talk-child/silent-approach/run-away/run-away.md diff --git a/english/explore-outside/talk-child/silent-approach/run-away/run-away.md b/english/explore-outside/talk-child/silent-approach/run-away/run-away.md new file mode 100644 index 0000000000..ffd690a1bc --- /dev/null +++ b/english/explore-outside/talk-child/silent-approach/run-away/run-away.md @@ -0,0 +1,8 @@ +You realize that this demon-child means business. You turn around and flee, +running as fast as you can. In your haste, you trip over a tree branch. You struggle +upwards, but feel a sharp pain in your ankle and are reduced to a slow hobble. + +You now know that this is the end. Resigned to your fate, you glance over your right +shoulder to face your nemesis. It's over in a flash of hot red light. + +All that remains of you is a pile of dust. \ No newline at end of file From ffdfedfdc001b0add9d23e2a458f5d568178d632 Mon Sep 17 00:00:00 2001 From: jaspinall Date: Sun, 11 Oct 2015 14:18:28 -0700 Subject: [PATCH 1259/5486] Add option to the silent treatment page --- .../talk-child/silent-approach/silent-approach.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/explore-outside/talk-child/silent-approach/silent-approach.md b/english/explore-outside/talk-child/silent-approach/silent-approach.md index 49bd176a2c..44804aa84e 100644 --- a/english/explore-outside/talk-child/silent-approach/silent-approach.md +++ b/english/explore-outside/talk-child/silent-approach/silent-approach.md @@ -5,4 +5,6 @@ that is around you. You have now reached the child. What do you do? -[Talk to the child anyway](../talk-more/talk-more.md) \ No newline at end of file +[Talk to the child anyway](../talk-more/talk-more.md) + +[Run away!](../run-away/run-away.md) \ No newline at end of file From e76eb4c9c13b72f788fdd53d3096c06f38e70e96 Mon Sep 17 00:00:00 2001 From: jaspinall Date: Sun, 11 Oct 2015 14:35:34 -0700 Subject: [PATCH 1260/5486] Add option to the silent treatment page --- .../talk-child/silent-approach/silent-approach.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/explore-outside/talk-child/silent-approach/silent-approach.md b/english/explore-outside/talk-child/silent-approach/silent-approach.md index 44804aa84e..397a49ac13 100644 --- a/english/explore-outside/talk-child/silent-approach/silent-approach.md +++ b/english/explore-outside/talk-child/silent-approach/silent-approach.md @@ -5,6 +5,6 @@ that is around you. You have now reached the child. What do you do? -[Talk to the child anyway](../talk-more/talk-more.md) +[Talk to the child anyway](./talk-more/talk-more.md) -[Run away!](../run-away/run-away.md) \ No newline at end of file +[Run away!](./run-away/run-away.md) \ No newline at end of file From 6a758bbabc5233337134238605ca2ebcb0630ef7 Mon Sep 17 00:00:00 2001 From: jaspinall Date: Sun, 11 Oct 2015 14:43:53 -0700 Subject: [PATCH 1261/5486] Update silent-approach.md --- .../talk-child/silent-approach/silent-approach.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/explore-outside/talk-child/silent-approach/silent-approach.md b/english/explore-outside/talk-child/silent-approach/silent-approach.md index 397a49ac13..c67c7c43d1 100644 --- a/english/explore-outside/talk-child/silent-approach/silent-approach.md +++ b/english/explore-outside/talk-child/silent-approach/silent-approach.md @@ -5,6 +5,6 @@ that is around you. You have now reached the child. What do you do? -[Talk to the child anyway](./talk-more/talk-more.md) +[Talk to the child anyway](../talk-more/talk-more.md) -[Run away!](./run-away/run-away.md) \ No newline at end of file +[Run away!](/run-away/run-away.md) From ffe15a9094598ff3fecf97b83bd53d17dad2db1a Mon Sep 17 00:00:00 2001 From: jaspinall Date: Sun, 11 Oct 2015 14:44:14 -0700 Subject: [PATCH 1262/5486] Update silent-approach.md --- .../talk-child/silent-approach/silent-approach.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/explore-outside/talk-child/silent-approach/silent-approach.md b/english/explore-outside/talk-child/silent-approach/silent-approach.md index c67c7c43d1..f1059ba0f8 100644 --- a/english/explore-outside/talk-child/silent-approach/silent-approach.md +++ b/english/explore-outside/talk-child/silent-approach/silent-approach.md @@ -7,4 +7,4 @@ You have now reached the child. What do you do? [Talk to the child anyway](../talk-more/talk-more.md) -[Run away!](/run-away/run-away.md) +[Run away!](../run-away/run-away.md) From 2ce13390ebce99253c93bd85c1bf267244bcfc81 Mon Sep 17 00:00:00 2001 From: jaspinall Date: Sun, 11 Oct 2015 14:44:45 -0700 Subject: [PATCH 1263/5486] Update silent-approach.md --- .../talk-child/silent-approach/silent-approach.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/explore-outside/talk-child/silent-approach/silent-approach.md b/english/explore-outside/talk-child/silent-approach/silent-approach.md index f1059ba0f8..d26ad27ef3 100644 --- a/english/explore-outside/talk-child/silent-approach/silent-approach.md +++ b/english/explore-outside/talk-child/silent-approach/silent-approach.md @@ -7,4 +7,4 @@ You have now reached the child. What do you do? [Talk to the child anyway](../talk-more/talk-more.md) -[Run away!](../run-away/run-away.md) +[Run away!](../silent-approach/run-away/run-away.md) From 3c6fba8ee83002e0ac4b75d9173c004a16102eb6 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Sun, 11 Oct 2015 20:03:47 -0400 Subject: [PATCH 1264/5486] Add content to the wiki adventure. --- english/wikipedia/wiki.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/wikipedia/wiki.md b/english/wikipedia/wiki.md index 1f5ee2382e..8131f26646 100644 --- a/english/wikipedia/wiki.md +++ b/english/wikipedia/wiki.md @@ -14,6 +14,8 @@ And you don't have to go to the library. [Behold!](http://en.wikipedia.org) +You may also like it's sister site, wikiyoyage (https://www.wikivoyage.org) with more detailed information on travel destinations. + You are so impressed with Wikipedia, you decide that you might even like to [donate](http://wikimediafoundation.org/wiki/Support_Wikipedia/en) some money to help keep Wikipedia running. From fc339399d3cb6b8192abe2fc9b44fd937eaa4bdb Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Sun, 11 Oct 2015 20:06:25 -0400 Subject: [PATCH 1265/5486] Add line as requested --- english/wikipedia/wiki.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/wikipedia/wiki.md b/english/wikipedia/wiki.md index 8131f26646..24c2f6e2c0 100644 --- a/english/wikipedia/wiki.md +++ b/english/wikipedia/wiki.md @@ -14,7 +14,8 @@ And you don't have to go to the library. [Behold!](http://en.wikipedia.org) -You may also like it's sister site, wikiyoyage (https://www.wikivoyage.org) with more detailed information on travel destinations. +You may also like it's sister site, wikiyoyage (https://www.wikivoyage.org) +with more detailed information on travel destinations. You are so impressed with Wikipedia, you decide that you might even like to [donate](http://wikimediafoundation.org/wiki/Support_Wikipedia/en) some money to help keep Wikipedia running. From adde4224d1d0a2c7a6394835ee19a2c83bcb8e03 Mon Sep 17 00:00:00 2001 From: Elizabeth Date: Sun, 11 Oct 2015 18:36:43 -0700 Subject: [PATCH 1266/5486] add to story --- english/get-out-of-system/get-out-of-system.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/get-out-of-system/get-out-of-system.md b/english/get-out-of-system/get-out-of-system.md index 1cdf36b806..6f11bf40b8 100644 --- a/english/get-out-of-system/get-out-of-system.md +++ b/english/get-out-of-system/get-out-of-system.md @@ -9,3 +9,7 @@ Puke starts going everywhere. Walls, ceiling, door. The door opens a guard comes and ushers you out of the room. Do you? + +run after the guards? +Talk to the guards? +Puke on the guards? \ No newline at end of file From 26ff432f07949b51d8526b943b6a765d6c9405c9 Mon Sep 17 00:00:00 2001 From: spacegoing Date: Mon, 12 Oct 2015 20:41:47 +1100 Subject: [PATCH 1267/5486] Add Douniwan to Chinese version --- Chinese/Douniwan/douniwan.md | 6 ++++++ .../\345\244\247\350\257\235\350\245\277\346\270\270.md" | 1 + 2 files changed, 7 insertions(+) create mode 100644 Chinese/Douniwan/douniwan.md diff --git a/Chinese/Douniwan/douniwan.md b/Chinese/Douniwan/douniwan.md new file mode 100644 index 0000000000..0591a3bd50 --- /dev/null +++ b/Chinese/Douniwan/douniwan.md @@ -0,0 +1,6 @@ +十里红妆，尽是断肠，与其西天成佛，青楼成魔，不如到德云社当个逗逼算了（liao），念 +及至此，孙悟空摇身一变，只见天雷滚滚，一声屁响冲上云霄，袅袅青烟下走出了一只郭德 +纲，手里捧着一堆逗你丸“ +放棹西湖发浩歌，诗情画意两如何？ +莫嫌秋老山容淡，私人会馆美人多！ +” diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index bff0774f58..c2a5b7c8c0 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -60,3 +60,4 @@ [周杰伦](Jay_Chou/Jay_Chou.md) +[逗你丸](Douniwan/douniwan.md) From 912815224f8ccbab83d03770a18b402eef1555e0 Mon Sep 17 00:00:00 2001 From: ngrandal Date: Mon, 12 Oct 2015 17:05:08 -0400 Subject: [PATCH 1268/5486] Add oxygen page --- hungarian/malyvacukor.md | 4 +++- hungarian/oxygen/oxygen.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 hungarian/oxygen/oxygen.md diff --git a/hungarian/malyvacukor.md b/hungarian/malyvacukor.md index 42086f7919..b88ba642ce 100644 --- a/hungarian/malyvacukor.md +++ b/hungarian/malyvacukor.md @@ -8,4 +8,6 @@ Mit csinálsz? [lezuhanyzol](zuhanyzas/zuhanyzas.md) -[megreggelizel](reggeli/reggeli.md) \ No newline at end of file +[megreggelizel](reggeli/reggeli.md) + +Jól belerúgsz az [oxigén generátorba](oxygen/oxygen.md) \ No newline at end of file diff --git a/hungarian/oxygen/oxygen.md b/hungarian/oxygen/oxygen.md new file mode 100644 index 0000000000..a34ad1bc5a --- /dev/null +++ b/hungarian/oxygen/oxygen.md @@ -0,0 +1 @@ +Ide fent nagyon konnyu hallucinalni [zuhanyzas](../zuhanyzas/zuhanyzas.md) elott \ No newline at end of file From c42b1d729c36ddd49c29a146b95fe4d13358bcb6 Mon Sep 17 00:00:00 2001 From: Solange Umuhire GASENGAYIRE Date: Tue, 13 Oct 2015 08:02:04 +0200 Subject: [PATCH 1269/5486] Add option to feu-de-camp --- french/feu-de-camp.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 5160a2054d..0a80cb504e 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -27,3 +27,5 @@ Que faites-vous ? [Je demande de l'aide a Google](google/google.md) [J'appelle le genie](appelle-genie/appelle-genie.md) + +[Je me lève et me dirige vers la sortie](sortie/pousser-porte/pousser-porte.md) From 4b543df33205b51dd1388a38993c4b59001d2126 Mon Sep 17 00:00:00 2001 From: avior Date: Tue, 13 Oct 2015 12:16:54 +0530 Subject: [PATCH 1270/5486] edit the wikipedia story in english stories --- english/wikipedia/wiki.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/wikipedia/wiki.md b/english/wikipedia/wiki.md index 24c2f6e2c0..58a4c78b91 100644 --- a/english/wikipedia/wiki.md +++ b/english/wikipedia/wiki.md @@ -2,6 +2,10 @@ You enter a world called 'Wikipedia.' One of the greatest knowledge sites ever ! +It is best of the internet. + +It is free. + It is mesmerizing. It is transcendental. From a49579a1530f9538609a7f276b52ba20fc2ad8b1 Mon Sep 17 00:00:00 2001 From: tuta-tuta Date: Tue, 13 Oct 2015 12:54:41 +0100 Subject: [PATCH 1271/5486] Add new story --- russian/zefir.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/zefir.md b/russian/zefir.md index 2c21f2554e..01f4ec12ff 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -34,4 +34,6 @@ [Вспомните интересную шутку](Holms-Watson/Holmes-Watson.md) -[Откроете дверь, в нее настойчиво стучат.](rat-rat/rat-rat.md) \ No newline at end of file +[Откроете дверь, в нее настойчиво стучат.](rat-rat/rat-rat.md) + +[Поздравлю деда.] (grandad/grandad.md) \ No newline at end of file From eb9d953a3b4d902effb56975c02956d177737961 Mon Sep 17 00:00:00 2001 From: tuta-tuta Date: Tue, 13 Oct 2015 12:58:46 +0100 Subject: [PATCH 1272/5486] Add new story files --- russian/grandad/grandad.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 russian/grandad/grandad.md diff --git a/russian/grandad/grandad.md b/russian/grandad/grandad.md new file mode 100644 index 0000000000..58651b0079 --- /dev/null +++ b/russian/grandad/grandad.md @@ -0,0 +1 @@ +Когда дед задул 90 свечей с первого раза. Внуки поняли, что трешка в Москве освободится не скоро. \ No newline at end of file From 3dcd9c375bf48d23d55f9be72ee10e9b89ffeee3 Mon Sep 17 00:00:00 2001 From: tuta-tuta Date: Tue, 13 Oct 2015 13:07:13 +0100 Subject: [PATCH 1273/5486] Format the text --- russian/zefir.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/zefir.md b/russian/zefir.md index 01f4ec12ff..4565d5502f 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -36,4 +36,4 @@ [Откроете дверь, в нее настойчиво стучат.](rat-rat/rat-rat.md) -[Поздравлю деда.] (grandad/grandad.md) \ No newline at end of file +[Поздравлю деда.](grandad/grandad.md) \ No newline at end of file From 56584acf5c462b941b184f125ec5f5d5252c5398 Mon Sep 17 00:00:00 2001 From: giamaerGUImac Date: Tue, 13 Oct 2015 18:37:03 +0200 Subject: [PATCH 1274/5486] typo --- Italian/verifica/verifica.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Italian/verifica/verifica.md b/Italian/verifica/verifica.md index 465111fe27..90f561d386 100644 --- a/Italian/verifica/verifica.md +++ b/Italian/verifica/verifica.md @@ -1,6 +1,6 @@ -Mi conti le dita, e la prima volta sono 12, +Mi conto le dita, e la prima volta sono 12, la seconda volta sono 7, la terza sono 4, -mi rendo conto che stai dormendo, ma per +mi rendo conto che stao dormendo, ma per la gioia di sapermi in un sogno, mi sveglio, -stavolta nella tua stanza. +stavolta nella mia stanza. From c01c899b8b2ae3cdbbfbd07f671c9f79a67e55e6 Mon Sep 17 00:00:00 2001 From: giamaerGUImac Date: Tue, 13 Oct 2015 19:35:43 +0200 Subject: [PATCH 1275/5486] Add a sentence or two to an existing "page" (file) of the story --- Italian/finestra/apri.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Italian/finestra/apri.md b/Italian/finestra/apri.md index 48c2a90bac..e1f4cf027a 100644 --- a/Italian/finestra/apri.md +++ b/Italian/finestra/apri.md @@ -1,5 +1,9 @@ -Ti appare un paesaggio fiabesco +Ti appare un paesaggio fiabesco, + +noti subito un tappeto volante che + +staziona ad una ventina di metri da te e in lontananza sullo sfondo scorgi un gigantesco T-rex From e9b733bf8369c3e0215143735f9119552bb6d532 Mon Sep 17 00:00:00 2001 From: giamaerGUImac Date: Tue, 13 Oct 2015 19:38:14 +0200 Subject: [PATCH 1276/5486] Add a new option to an existing choice point, and link that option to an existing "page". --- Italian/guardare/guarda.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Italian/guardare/guarda.md b/Italian/guardare/guarda.md index 9c6134b246..86dc7e547f 100644 --- a/Italian/guardare/guarda.md +++ b/Italian/guardare/guarda.md @@ -11,3 +11,5 @@ Sugli scaffali trovi solo vecchi libri di leggende francesi e alcune fotografie [Esamini le fotografie, sperando di riconoscere qualcuno](vecchie-fotografie/vecchie-fotografie.md) [Sfogli i libri, in cerca di qualche indizio](libri-francesi/libri-francesi.md) + +[Ti manca l'aria, apri la finestra](../finestra/apri.md) From f71480e9201b70aabeb58cac94213d6bea2a55ac Mon Sep 17 00:00:00 2001 From: giamaerGUImac Date: Tue, 13 Oct 2015 19:39:10 +0200 Subject: [PATCH 1277/5486] Add a new option to an existing choice point, create a new "page" for that option, and add a sentence or two to the new "page". --- Italian/guardare/libri-francesi/libri-francesi.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Italian/guardare/libri-francesi/libri-francesi.md b/Italian/guardare/libri-francesi/libri-francesi.md index c90aec2b08..8615187535 100644 --- a/Italian/guardare/libri-francesi/libri-francesi.md +++ b/Italian/guardare/libri-francesi/libri-francesi.md @@ -10,3 +10,5 @@ dei bambini pipistrello". [Lasci perdere i libri e decidi di esaminare le fotografie](../vecchie-fotografie/vecchie-fotografie.md) [Prendi il libro](./prendere-il-libro/prendere-il-libro.md) + +[Hai fame... Colazione](colazione/colazione.md) \ No newline at end of file From 57bcb0c14f1bf9bcb603fdfebda9937c2df257f7 Mon Sep 17 00:00:00 2001 From: Calvin Ku Date: Wed, 14 Oct 2015 01:39:30 +0800 Subject: [PATCH 1278/5486] Add 3-Body --- Chinese/CK/CK.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/CK/CK.md diff --git a/Chinese/CK/CK.md b/Chinese/CK/CK.md new file mode 100644 index 0000000000..208fbd7e04 --- /dev/null +++ b/Chinese/CK/CK.md @@ -0,0 +1 @@ +三體行星距離地球 4.5 光年，周遭有三顆恆星環繞，文明遭毀滅與復甦 200 多次。在一次與地球的通訊接觸後，決定對擁有穩定恆星的地球發動侵略攻擊！ \ No newline at end of file From b248917b0a636597b75d1323023792f47cb8b482 Mon Sep 17 00:00:00 2001 From: giamaerGUImac Date: Tue, 13 Oct 2015 19:40:54 +0200 Subject: [PATCH 1279/5486] add new directory --- Italian/guardare/libri-francesi/colazione/colazione.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Italian/guardare/libri-francesi/colazione/colazione.md diff --git a/Italian/guardare/libri-francesi/colazione/colazione.md b/Italian/guardare/libri-francesi/colazione/colazione.md new file mode 100644 index 0000000000..c2ffe33f7e --- /dev/null +++ b/Italian/guardare/libri-francesi/colazione/colazione.md @@ -0,0 +1,3 @@ +Decidi dunque di scoprire da dove possa provenire quel profumino + +che ti ha fatto ricordare che è ora di colazione \ No newline at end of file From f1468e504cab671fe8b4d4566d7c247bfa4d53a8 Mon Sep 17 00:00:00 2001 From: Calvin Ku Date: Wed, 14 Oct 2015 01:41:50 +0800 Subject: [PATCH 1280/5486] Change the main md --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index c2a5b7c8c0..f9da5f6f52 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -61,3 +61,5 @@ [周杰伦](Jay_Chou/Jay_Chou.md) [逗你丸](Douniwan/douniwan.md) + +[三體人](CK/CK.md) From 9e6ac0e1739476585f0369edb957b250bcaa742f Mon Sep 17 00:00:00 2001 From: giamaerGUImac Date: Tue, 13 Oct 2015 19:51:31 +0200 Subject: [PATCH 1281/5486] Add a couple of options to a current dead-end "page", and add a "page" or link to an existing "page" for each option. --- Italian/finestra/apri.md | 2 +- Italian/finestra/cadi/cadi.md | 6 +++++- Italian/finestra/cadi/tappeto-volante/tappeto-volante.md | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 Italian/finestra/cadi/tappeto-volante/tappeto-volante.md diff --git a/Italian/finestra/apri.md b/Italian/finestra/apri.md index e1f4cf027a..99af3e3023 100644 --- a/Italian/finestra/apri.md +++ b/Italian/finestra/apri.md @@ -15,4 +15,4 @@ Come reagisci? [Torni a dormire](../caramelle.md) -[Crei una bambola voodoo per addomesticarlo] (tour/tour.md) +[Crei una bambola voodoo per addomesticarlo](tour/tour.md) diff --git a/Italian/finestra/cadi/cadi.md b/Italian/finestra/cadi/cadi.md index 7b7b471d6a..cbc5a2682d 100644 --- a/Italian/finestra/cadi/cadi.md +++ b/Italian/finestra/cadi/cadi.md @@ -2,4 +2,8 @@ Ti stai calando dalla finestra, quando la fune si spezza e precipiti nel vuoto Per fortuna sotto di te si trova un gigantesco Marshmellow che attutisce la tua caduta -Ma attento perch il Tirannosauro si sta avvicinando! \ No newline at end of file +Ma attento perch il Tirannosauro si sta avvicinando! + +[Crei una bambola voodoo per addomesticarlo](../tour/tour.md) + +[Corri verso il tappeto volante](tappeto-volante/tappeto-volante.md) \ No newline at end of file diff --git a/Italian/finestra/cadi/tappeto-volante/tappeto-volante.md b/Italian/finestra/cadi/tappeto-volante/tappeto-volante.md new file mode 100644 index 0000000000..2b188f8f4f --- /dev/null +++ b/Italian/finestra/cadi/tappeto-volante/tappeto-volante.md @@ -0,0 +1,3 @@ +Corri a più non posso e raggiungi il tappeto volante appena in tempo... + +Il tappeto si alza in volo \ No newline at end of file From 3ceee4abac1b541fab99dcb733fad1c0620b0216 Mon Sep 17 00:00:00 2001 From: giamaerGUImac Date: Tue, 13 Oct 2015 20:04:22 +0200 Subject: [PATCH 1282/5486] corrections --- Italian/finestra/cadi/cadi.md | 2 +- Italian/finestra/cadi/tappeto-volante/tappeto-volante.md | 2 +- Italian/guardare/libri-francesi/colazione/colazione.md | 2 +- Italian/guardare/libri-francesi/libri-francesi.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Italian/finestra/cadi/cadi.md b/Italian/finestra/cadi/cadi.md index cbc5a2682d..00ef173e5d 100644 --- a/Italian/finestra/cadi/cadi.md +++ b/Italian/finestra/cadi/cadi.md @@ -6,4 +6,4 @@ Ma attento perch [Crei una bambola voodoo per addomesticarlo](../tour/tour.md) -[Corri verso il tappeto volante](tappeto-volante/tappeto-volante.md) \ No newline at end of file +[Corri verso il tappeto volante](tappeto-volante/tappeto-volante.md) diff --git a/Italian/finestra/cadi/tappeto-volante/tappeto-volante.md b/Italian/finestra/cadi/tappeto-volante/tappeto-volante.md index 2b188f8f4f..f4aeef9cf4 100644 --- a/Italian/finestra/cadi/tappeto-volante/tappeto-volante.md +++ b/Italian/finestra/cadi/tappeto-volante/tappeto-volante.md @@ -1,3 +1,3 @@ Corri a più non posso e raggiungi il tappeto volante appena in tempo... -Il tappeto si alza in volo \ No newline at end of file +Il tappeto si alza in volo diff --git a/Italian/guardare/libri-francesi/colazione/colazione.md b/Italian/guardare/libri-francesi/colazione/colazione.md index c2ffe33f7e..fbbaccb57f 100644 --- a/Italian/guardare/libri-francesi/colazione/colazione.md +++ b/Italian/guardare/libri-francesi/colazione/colazione.md @@ -1,3 +1,3 @@ Decidi dunque di scoprire da dove possa provenire quel profumino -che ti ha fatto ricordare che è ora di colazione \ No newline at end of file +che ti ha fatto ricordare che è ora di colazione diff --git a/Italian/guardare/libri-francesi/libri-francesi.md b/Italian/guardare/libri-francesi/libri-francesi.md index 8615187535..d71aacb741 100644 --- a/Italian/guardare/libri-francesi/libri-francesi.md +++ b/Italian/guardare/libri-francesi/libri-francesi.md @@ -11,4 +11,4 @@ dei bambini pipistrello". [Prendi il libro](./prendere-il-libro/prendere-il-libro.md) -[Hai fame... Colazione](colazione/colazione.md) \ No newline at end of file +[Hai fame... Colazione](colazione/colazione.md) From 80dd4c22eb3f05689f95e56f0efbc614c751c977 Mon Sep 17 00:00:00 2001 From: LimeDeveloper Date: Tue, 13 Oct 2015 22:24:42 +0400 Subject: [PATCH 1283/5486] p-story loop --- english/make_changes_GitHub/make_changes_GitHub.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/make_changes_GitHub/make_changes_GitHub.md b/english/make_changes_GitHub/make_changes_GitHub.md index 92860597c0..1e0b4cc384 100644 --- a/english/make_changes_GitHub/make_changes_GitHub.md +++ b/english/make_changes_GitHub/make_changes_GitHub.md @@ -14,3 +14,5 @@ local copy of the repository. Do you: [Clone the source repository](clone_source/stuck.md) [Google what to do because you have no idea](google/die.md) + +[Might be want to start again…](../marshmallow.md) From 6cfecc3c4c393a4a6daa8a160fa13a10e2bf2642 Mon Sep 17 00:00:00 2001 From: Chungman Kim Date: Tue, 13 Oct 2015 14:43:17 -0400 Subject: [PATCH 1284/5486] Add line to ghostbusters.md --- english/ghostbusters/ghostbusters.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/english/ghostbusters/ghostbusters.md b/english/ghostbusters/ghostbusters.md index f26cb7d424..6e915e053d 100644 --- a/english/ghostbusters/ghostbusters.md +++ b/english/ghostbusters/ghostbusters.md @@ -12,13 +12,13 @@ and a strange tune begins forming in your mind... You immediately look around and notice a marshmallow phone. You pick it up and dial the Ghostbusters. -The air is suddenly filled with the sounds of blaring sirens as the Ghostbuster mobile +The air is suddenly filled with the sounds of blaring sirens as the Ghostbuster mobile smashes through the marshmallow wall beside you barely missing you. -The marshmallow wall oozes down to close off the hole that the Ghostbuster mobile made +The marshmallow wall oozes down to close off the hole that the Ghostbuster mobile made -as it made its entrance. Out pop the four ghostbusters from your childhood youth. +as it made its entrance. Out pop the four ghostbusters from your childhood youth. Dr. Egon Spengler pulls out his doo-hickey which starts emitting a strange noise. @@ -28,7 +28,7 @@ Dr. Peter Venkman looks at the other 3 as they all nod to each other. All four of them pull out their proton packs and begin blasting the walls all around them -with their proton streams. Pockets of sunlight and the outside world reveal themselves as the +with their proton streams. Pockets of sunlight and the outside world reveal themselves as the marshmallow walls begin melting away into a puddle. @@ -36,9 +36,9 @@ marshmallow walls begin melting away into a puddle. He props his proton gun under his armpit and continues firing as he pulls out a cigarette to light it. -During this process his proton stream accidently crosses Dr. Egon Spengler's stream. +During this process his proton stream accidently crosses Dr. Egon Spengler's stream. -There is a sudden loud CRACKLE and BOOM as everything around you explodes in a ball of light +There is a sudden loud CRACKLE and BOOM as everything around you explodes in a ball of light and sparkle as your body and mind are sent reeling. @@ -46,7 +46,7 @@ You awaken to bluriness and a numbing headache as you wonder WHERE AM I ??? - +a voice calls out from your right From 771dbbecfd1d9d62d62614998ea1392d108760e7 Mon Sep 17 00:00:00 2001 From: William Brown Date: Tue, 13 Oct 2015 16:52:09 -0700 Subject: [PATCH 1285/5486] Add Mai Brat Language Support --- language.md | 2 ++ maibrat/tinyi.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 maibrat/tinyi.md diff --git a/language.md b/language.md index 3c005a7083..72f911c6f2 100644 --- a/language.md +++ b/language.md @@ -2,6 +2,8 @@ Jei kalbi lietuviškai [spausk čia](lithuanian/startas.md) +Nhar mai sai to, [nsit mai wefo](maibrat/tinyi.md) + If you speak Telugu, మీరు తెలుగులొ మాట్లాడుతార [ఇక్కడ నొక్కండి](telugu/telangana-telugu/Telanganatelugu.md). If you understand Tamil, தமிழ் வணக்கம் [இங்கே அழுத்தவும்](Tamil/Thirukural.md) diff --git a/maibrat/tinyi.md b/maibrat/tinyi.md new file mode 100644 index 0000000000..ab3c929ae0 --- /dev/null +++ b/maibrat/tinyi.md @@ -0,0 +1 @@ +Tao tano na. Meen kanu. Soh nawe hah nee nmat mai roto to, [nsit mai wefo](../language.md) From da38f8ff16a9ff212f0323102a90ef1ffe8a9ab9 Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Tue, 13 Oct 2015 22:09:30 -0400 Subject: [PATCH 1286/5486] add sua imaginacao --- portugues/colaborando.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index fb7aee12c9..5ba7d7eb4e 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -16,3 +16,5 @@ Você: [Levanta-se a vai buscar o spray mata insetos](spray/matainsetos.md) [Mas esse navio não pode ter bugs!](titanic/iceberg.md) + +Na verdade, isto tudo é a sua imaginação. Você vive em 1991 e usa MS-DOS 5.0 e um modem de 9600 baud. From e1651c90b077e53dd7efcc3aa8c55b55d3cfb9b0 Mon Sep 17 00:00:00 2001 From: Craig Zeise Date: Tue, 13 Oct 2015 21:18:29 -0500 Subject: [PATCH 1287/5486] Update to dreamland --- english/go-back-to-sleep/go-back-to-sleep.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/go-back-to-sleep/go-back-to-sleep.md b/english/go-back-to-sleep/go-back-to-sleep.md index e777861ca6..a21c2fe7a8 100644 --- a/english/go-back-to-sleep/go-back-to-sleep.md +++ b/english/go-back-to-sleep/go-back-to-sleep.md @@ -1,5 +1,8 @@ The marshmallow floor is soft, and thankfully not very sticky. +It's super weird that there is a marshmallow floor whether you're awake or you're dreaming. Maybe you're always +dreaming? + You roll over, let your eyes close shut, and drift off into [dreamland](../dream/dream.md) You wonder, idly, what happens if you start dreaming from within a dream.. From a1ee618bb8202dff13c40dcc44461c023e9b3392 Mon Sep 17 00:00:00 2001 From: Roberto Shironoshita Date: Tue, 13 Oct 2015 21:22:41 -0500 Subject: [PATCH 1288/5486] A few more lines in Spanish --- espanol/dimension/dimension.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/espanol/dimension/dimension.md b/espanol/dimension/dimension.md index 95ed50b958..c603445c64 100644 --- a/espanol/dimension/dimension.md +++ b/espanol/dimension/dimension.md @@ -1,3 +1,7 @@ Resulta que el sonido de las trompetas comenzo a crear un orificio en el espacio entre las tropas y el fuerte. Dicho orificio deslumbraba luz indicanto que habia algo si entrabas a traves de el. Una nueva dimension. + +El Consejero le dijo a Beatito, "ve qué hay del otro lado y me informas". + +Beatito cruza el umbral, mientras el Consejero le observa. From 8366dc3764ca64ef0dd815338ccc42f56a05b740 Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Tue, 13 Oct 2015 23:23:10 -0400 Subject: [PATCH 1289/5486] add cia telefonica com link e nova pagina --- portugues/colaborando.md | 7 +++++++ portugues/telefonica/ocupado.md | 1 + 2 files changed, 8 insertions(+) create mode 100644 portugues/telefonica/ocupado.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 5ba7d7eb4e..0e795539af 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -18,3 +18,10 @@ Você: [Mas esse navio não pode ter bugs!](titanic/iceberg.md) Na verdade, isto tudo é a sua imaginação. Você vive em 1991 e usa MS-DOS 5.0 e um modem de 9600 baud. + +A sua linha telefônica está uma droga hoje e você tem que baixar a ultima versão do XTree para enciumar os seus amigos. + +[Você liga para a companhia telefônica](telefonica/ocupado.md) + + + diff --git a/portugues/telefonica/ocupado.md b/portugues/telefonica/ocupado.md new file mode 100644 index 0000000000..2a220dba07 --- /dev/null +++ b/portugues/telefonica/ocupado.md @@ -0,0 +1 @@ +Só dá ocupado. \ No newline at end of file From f5a14601fad7b67632100552e61adfdf4e9afbe3 Mon Sep 17 00:00:00 2001 From: Emanuel Date: Wed, 14 Oct 2015 00:41:55 -0300 Subject: [PATCH 1290/5486] Add new story about evil marshmallow --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index b0edfdc810..019757b11e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -551,3 +551,5 @@ Wondering how you got here, you feel a strange tingling in your hands, almost as they are responding to your new surroundings. You feel an urge to gesture forward, and as you do a large pink marshmallow shoots out of your hand into the wall before you. [Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) + +[The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) \ No newline at end of file From ec9fd8203037d70095fc47eb62cb2f4873be1ae8 Mon Sep 17 00:00:00 2001 From: Emanuel Date: Wed, 14 Oct 2015 00:45:59 -0300 Subject: [PATCH 1291/5486] Create new tree directory with marshmallow-slayer and freddie files --- english/the-slayer/freddie/freddie.md | 2 ++ english/the-slayer/marshmallow-slayer.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 english/the-slayer/freddie/freddie.md create mode 100644 english/the-slayer/marshmallow-slayer.md diff --git a/english/the-slayer/freddie/freddie.md b/english/the-slayer/freddie/freddie.md new file mode 100644 index 0000000000..edf4ebd270 --- /dev/null +++ b/english/the-slayer/freddie/freddie.md @@ -0,0 +1,2 @@ +Freddie saved the little marshmallows stabing the terrible marshmallow with +his chocolate stick. \ No newline at end of file diff --git a/english/the-slayer/marshmallow-slayer.md b/english/the-slayer/marshmallow-slayer.md new file mode 100644 index 0000000000..40fd46030b --- /dev/null +++ b/english/the-slayer/marshmallow-slayer.md @@ -0,0 +1,5 @@ +Once upon a time it was the most terrible marshmallow, he slain too many of poor little marshmallows. +But for fortune it was a heroic marshmallow called Freddie. Lets look at how he saved the little +marshmallows: + +[Freddie](the-slayer/freddie/freddie.md) \ No newline at end of file From cfea524f7cb309c45472b5f4161c0a0755ef9f88 Mon Sep 17 00:00:00 2001 From: Emanuel Date: Wed, 14 Oct 2015 01:06:54 -0300 Subject: [PATCH 1292/5486] Fix relative link to freddie.md --- english/the-slayer/marshmallow-slayer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/the-slayer/marshmallow-slayer.md b/english/the-slayer/marshmallow-slayer.md index 40fd46030b..2bc503d77a 100644 --- a/english/the-slayer/marshmallow-slayer.md +++ b/english/the-slayer/marshmallow-slayer.md @@ -2,4 +2,4 @@ Once upon a time it was the most terrible marshmallow, he slain too many of poor But for fortune it was a heroic marshmallow called Freddie. Lets look at how he saved the little marshmallows: -[Freddie](the-slayer/freddie/freddie.md) \ No newline at end of file +[Freddie](english/the-slayer/freddie/freddie.md) \ No newline at end of file From b4c0a20f980e734654cb33e25f949d1935a8419a Mon Sep 17 00:00:00 2001 From: Emanuel Date: Wed, 14 Oct 2015 01:14:07 -0300 Subject: [PATCH 1293/5486] Fix again the link it has to be at he level of the directory --- english/the-slayer/marshmallow-slayer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/the-slayer/marshmallow-slayer.md b/english/the-slayer/marshmallow-slayer.md index 2bc503d77a..c1a2eaccfa 100644 --- a/english/the-slayer/marshmallow-slayer.md +++ b/english/the-slayer/marshmallow-slayer.md @@ -2,4 +2,4 @@ Once upon a time it was the most terrible marshmallow, he slain too many of poor But for fortune it was a heroic marshmallow called Freddie. Lets look at how he saved the little marshmallows: -[Freddie](english/the-slayer/freddie/freddie.md) \ No newline at end of file +[Freddie](freddie/freddie.md) \ No newline at end of file From 074df9c4fcae8e7117b920540544eb1e5ba0ca55 Mon Sep 17 00:00:00 2001 From: Li Yin Date: Tue, 13 Oct 2015 21:47:02 -0700 Subject: [PATCH 1294/5486] =?UTF-8?q?Add=20=E6=91=B8=E9=87=91=E6=A0=A1?= =?UTF-8?q?=E5=B0=89=20option?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/.DS_Store | Bin 0 -> 8196 bytes ...4\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ ...1\270\351\207\221\346\240\241\345\260\211.md" | 1 + 3 files changed, 3 insertions(+) create mode 100644 Chinese/.DS_Store create mode 100644 "Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" diff --git a/Chinese/.DS_Store b/Chinese/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ed71acd2867fe58e662ebac3a1317d6eab7488e3 GIT binary patch literal 8196 zcmeI1O>YuG7{{L}TLm-`jYhn!CoeSN#X@_M03J-6NJ7&lwhivGTi9f~LtrU3goF>^ z#rRVF9O~CF(US+S`Ze^K7YHuhgN8IT%tL1W!^}L(&Tn>S_E`XclzLVMAPE3bOiUBk zFgwRsJ4-XRB5Q7;67&bKp@YfAk1^9*RVV_AfFhs>C<2PWA`rkmn^`nu-xsYaR|FJ+ zr6j=C2OSgBqSTR4zI0&5LjY6_tGQtr;{fiXOD#$r3FWSMOc6a0=}KgXL4-TD>#RF! zQR+yja0epXfyiGbGD0Ez*U?Ys-GLN^s$3CJ1ZD}a*gXzqaKHm=I(|3%-L~mc6Wf28 zZP)4g>GXH9646$#T#d%!%x=UEYc1NZ`G()?mW<9m|K?b>Da%#EZ;i`4l)96$VeUG1 zzn-{Vrk-y&p52*pJ=k+Ri}p*j=ULr);!d?=pJ4B*;n}-R*D)Q}@lT^MX7xmJFvw=J zDIK$6N*@#o>6HF3mmdzJ(R&YakGA%_!Rt3~-<`ex@JS4w$OQy$24H*+BXLsecrNvt z*v@>f!xm7a)r2*uK?}*P!4cNbDPlhtnAlw;mP1OJ4GwH0pVABKo96)gC;){5V?aY; z1fXfKjjx0(I9*0alfeg|MBo|h!1m=qvR=rIubccP-gN(e-N>N_fN0i>S6^HA4`NST z+K`J6?&stXU^V`m8^0ze{gx5kWbke?Q)|%Uwzy6I26Id+6|3hr0KS!9ehIc&p>6F} z_%VZ%WuKYJ(T}J5OF0SS!CT#iYvR_%b_Q)+86Y(^K?_xkh_gwu`2TVE`~QVHXLT}) zfFdwo0z|9SDkVJT_|Z6ccou8xn4V)|#`=wfau>{aIF8E0an#8lhFI3IEAuHz9SOx6 qv@m7Cn_y0e*n$f`k literal 0 HcmV?d00001 diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index f9da5f6f52..37adef021e 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -63,3 +63,5 @@ [逗你丸](Douniwan/douniwan.md) [三體人](CK/CK.md) + +[胡八一](摸金校尉/摸金校尉.md) diff --git "a/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" "b/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" new file mode 100644 index 0000000000..295e9d0de7 --- /dev/null +++ "b/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" @@ -0,0 +1 @@ +500年后化身胡八一，继承了摸金校尉的香火！ \ No newline at end of file From 6193ac176dea936cf18316ad06a201bd0defda40 Mon Sep 17 00:00:00 2001 From: Li Yin Date: Tue, 13 Oct 2015 22:50:21 -0700 Subject: [PATCH 1295/5486] Delet DS_Store file --- Chinese/.DS_Store | Bin 8196 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Chinese/.DS_Store diff --git a/Chinese/.DS_Store b/Chinese/.DS_Store deleted file mode 100644 index ed71acd2867fe58e662ebac3a1317d6eab7488e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeI1O>YuG7{{L}TLm-`jYhn!CoeSN#X@_M03J-6NJ7&lwhivGTi9f~LtrU3goF>^ z#rRVF9O~CF(US+S`Ze^K7YHuhgN8IT%tL1W!^}L(&Tn>S_E`XclzLVMAPE3bOiUBk zFgwRsJ4-XRB5Q7;67&bKp@YfAk1^9*RVV_AfFhs>C<2PWA`rkmn^`nu-xsYaR|FJ+ zr6j=C2OSgBqSTR4zI0&5LjY6_tGQtr;{fiXOD#$r3FWSMOc6a0=}KgXL4-TD>#RF! zQR+yja0epXfyiGbGD0Ez*U?Ys-GLN^s$3CJ1ZD}a*gXzqaKHm=I(|3%-L~mc6Wf28 zZP)4g>GXH9646$#T#d%!%x=UEYc1NZ`G()?mW<9m|K?b>Da%#EZ;i`4l)96$VeUG1 zzn-{Vrk-y&p52*pJ=k+Ri}p*j=ULr);!d?=pJ4B*;n}-R*D)Q}@lT^MX7xmJFvw=J zDIK$6N*@#o>6HF3mmdzJ(R&YakGA%_!Rt3~-<`ex@JS4w$OQy$24H*+BXLsecrNvt z*v@>f!xm7a)r2*uK?}*P!4cNbDPlhtnAlw;mP1OJ4GwH0pVABKo96)gC;){5V?aY; z1fXfKjjx0(I9*0alfeg|MBo|h!1m=qvR=rIubccP-gN(e-N>N_fN0i>S6^HA4`NST z+K`J6?&stXU^V`m8^0ze{gx5kWbke?Q)|%Uwzy6I26Id+6|3hr0KS!9ehIc&p>6F} z_%VZ%WuKYJ(T}J5OF0SS!CT#iYvR_%b_Q)+86Y(^K?_xkh_gwu`2TVE`~QVHXLT}) zfFdwo0z|9SDkVJT_|Z6ccou8xn4V)|#`=wfau>{aIF8E0an#8lhFI3IEAuHz9SOx6 qv@m7Cn_y0e*n$f`k From 4344f1be08c0c8f943df1727ed7c65643d5ed594 Mon Sep 17 00:00:00 2001 From: Norbert Date: Wed, 14 Oct 2015 11:18:15 +0100 Subject: [PATCH 1296/5486] add a pack of donuts to 132-days-ago --- english/132-days-ago/132-days-ago.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/132-days-ago/132-days-ago.md b/english/132-days-ago/132-days-ago.md index e01718426a..c93561b5b1 100644 --- a/english/132-days-ago/132-days-ago.md +++ b/english/132-days-ago/132-days-ago.md @@ -1,2 +1,3 @@ 132 days ago you went to Tesco to buy marshmallow -but end up buying chocolate because you had not enough money to buy marshmallow. \ No newline at end of file +but end up buying chocolate because you had not enough money to buy marshmallow. +or a pack of four donuts. \ No newline at end of file From 28c4c5b790012d6b7da524f94c75f9985cb2d552 Mon Sep 17 00:00:00 2001 From: "codeniro@gmail.com" Date: Wed, 14 Oct 2015 07:50:15 -0400 Subject: [PATCH 1297/5486] Add Merge conflict --- .../create_fork/wait/merge-conflict/resolution.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/make_changes_GitHub/create_fork/wait/merge-conflict/resolution.md diff --git a/english/make_changes_GitHub/create_fork/wait/merge-conflict/resolution.md b/english/make_changes_GitHub/create_fork/wait/merge-conflict/resolution.md new file mode 100644 index 0000000000..50800fc189 --- /dev/null +++ b/english/make_changes_GitHub/create_fork/wait/merge-conflict/resolution.md @@ -0,0 +1,5 @@ +It seems like you were not the only one who turned to GitHub to get out of this mess. +A hundred pull requests have been successfully merged upstream...except yours. You see a large red note that read: "Merge conflict!" + +To compund your horror, you see people taking bets on your Pull Request on how long it would take you to resolve +this conflict. \ No newline at end of file From d0c5e6553617fc760526b815a59ec05f638a71c2 Mon Sep 17 00:00:00 2001 From: "codeniro@gmail.com" Date: Wed, 14 Oct 2015 07:53:10 -0400 Subject: [PATCH 1298/5486] Add link to 'merge-conflict' --- english/make_changes_GitHub/create_fork/wait/forever_alone.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/make_changes_GitHub/create_fork/wait/forever_alone.md b/english/make_changes_GitHub/create_fork/wait/forever_alone.md index c4aaa791b4..4a2158acfb 100644 --- a/english/make_changes_GitHub/create_fork/wait/forever_alone.md +++ b/english/make_changes_GitHub/create_fork/wait/forever_alone.md @@ -4,3 +4,5 @@ here is just a little slow. So you wait... and wait... and wait... 35 years pass, and suddenly you realize... You are forever alone. + +[You log onto GitHub to see your last commit...](merge-conflict/resolution.md) \ No newline at end of file From 381c749fd22745731edc9faf01bafa816771a2c7 Mon Sep 17 00:00:00 2001 From: "codeniro@gmail.com" Date: Wed, 14 Oct 2015 08:27:50 -0400 Subject: [PATCH 1299/5486] Break up lines over 120 characters --- .../create_fork/wait/merge-conflict/resolution.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/make_changes_GitHub/create_fork/wait/merge-conflict/resolution.md b/english/make_changes_GitHub/create_fork/wait/merge-conflict/resolution.md index 50800fc189..9a4febddac 100644 --- a/english/make_changes_GitHub/create_fork/wait/merge-conflict/resolution.md +++ b/english/make_changes_GitHub/create_fork/wait/merge-conflict/resolution.md @@ -1,5 +1,7 @@ It seems like you were not the only one who turned to GitHub to get out of this mess. -A hundred pull requests have been successfully merged upstream...except yours. You see a large red note that read: "Merge conflict!" +A hundred pull requests have been successfully merged upstream...except yours. You see a large red note that read: + + "Merge conflict!" To compund your horror, you see people taking bets on your Pull Request on how long it would take you to resolve this conflict. \ No newline at end of file From ac6b16f80bc73d79bb94464110204f3368eaac86 Mon Sep 17 00:00:00 2001 From: Jamie Wilson Date: Wed, 14 Oct 2015 10:21:33 -0400 Subject: [PATCH 1300/5486] Added 33Hours story --- english/33hours/explore-outside/outside.md | 6 ++++++ .../explore-room/look-under-bed/look-under-bed.md | 6 ++++++ english/33hours/explore-room/room.md | 6 ++++++ english/33hours/explore-room/use-phone/use-phone.md | 8 ++++++++ english/33hours/wakingup.md | 10 ++++++++++ 5 files changed, 36 insertions(+) create mode 100644 english/33hours/explore-outside/outside.md create mode 100644 english/33hours/explore-room/look-under-bed/look-under-bed.md create mode 100644 english/33hours/explore-room/room.md create mode 100644 english/33hours/explore-room/use-phone/use-phone.md create mode 100644 english/33hours/wakingup.md diff --git a/english/33hours/explore-outside/outside.md b/english/33hours/explore-outside/outside.md new file mode 100644 index 0000000000..11fe10cd40 --- /dev/null +++ b/english/33hours/explore-outside/outside.md @@ -0,0 +1,6 @@ +You open the door and step outside in the bright sunshine. It takes a few seconds for your eyes to adjust and only then +do you see your surroundings. You are standing near a long two-lane highway that stretches off into the distance to your +left and your right. You stand there several minutes, but see no cars at all. + +The motel parking lot is completely empty. It looks to be abandoned. There are no other buildings around for as far as +you can see. \ No newline at end of file diff --git a/english/33hours/explore-room/look-under-bed/look-under-bed.md b/english/33hours/explore-room/look-under-bed/look-under-bed.md new file mode 100644 index 0000000000..8d7064c7fd --- /dev/null +++ b/english/33hours/explore-room/look-under-bed/look-under-bed.md @@ -0,0 +1,6 @@ +You look under the bed and find nothing. It's like this entire motel room has been sanitized of every possible +detail or clue that might help you figure out what's going on. + +[Try the phone.](../use-phone/use-phone.md) + +[Go outside.](../../explore-outside/outside.md) \ No newline at end of file diff --git a/english/33hours/explore-room/room.md b/english/33hours/explore-room/room.md new file mode 100644 index 0000000000..69225b7fbf --- /dev/null +++ b/english/33hours/explore-room/room.md @@ -0,0 +1,6 @@ +You're not really sure what you're looking for, but search the room frantically to find out where you are and why you +are here. The nightstand is completely empty. There's not even a phonebook. + +[Try the phone.](use-phone/use-phone.md) + +[Look under the bed.](look-under-bed/look-under-bed.md) \ No newline at end of file diff --git a/english/33hours/explore-room/use-phone/use-phone.md b/english/33hours/explore-room/use-phone/use-phone.md new file mode 100644 index 0000000000..6ab8aec427 --- /dev/null +++ b/english/33hours/explore-room/use-phone/use-phone.md @@ -0,0 +1,8 @@ +You pick up the phone and start to dial, but stop when you hear a strange high-pitched hum. You press the receiver +button several times, but the hum will not go away. You try dialing a number, but nothing happens. At one point you +hear a crackle and then what sounds like faint voices, but then the hum continues until you give up and put the +phone down. + +[Look under bed.](../look-under-bed/look-under-bed.md) + +[Go outside.](../../explore-outside/outside.md) \ No newline at end of file diff --git a/english/33hours/wakingup.md b/english/33hours/wakingup.md new file mode 100644 index 0000000000..1625829e1f --- /dev/null +++ b/english/33hours/wakingup.md @@ -0,0 +1,10 @@ +The sun on your face is the first thing you become aware of and you instinctively put your hand up to shield your eyes +from the brightness. You're still in your clothes and are lying in the middle of a bed in what looks to be some sort of +cheap motel room. You have no idea where you are or how you got here. + +You sit up and immediately feel pain on the back of your head. Some dried blood cakes the pillow you were lying on. Your +wallet and mobile phone are gone. In fact, your pockets are completely empty. + +[Explore the motel room.](explore-room/room.md) + +[Go outside.](explore-outside/outside.md) \ No newline at end of file From dd3a79a8fd22aa7d62b70f617ade85a5048d5217 Mon Sep 17 00:00:00 2001 From: Andrei Kharlanov Date: Wed, 14 Oct 2015 21:28:40 +0700 Subject: [PATCH 1301/5486] Add option to call buildings dep again --- russian/buildings-dep/buildings-dep.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/buildings-dep/buildings-dep.md b/russian/buildings-dep/buildings-dep.md index f63941a15f..f34fd600b9 100644 --- a/russian/buildings-dep/buildings-dep.md +++ b/russian/buildings-dep/buildings-dep.md @@ -6,3 +6,5 @@ [Вы чуете неладное и решаете включить телевизор.](tv/tv.md) [Вас одолевает паника и вы спешите позвонить маме.](callmum/callmum.md) + +[Вы испытываете чувство несправедливости и решаете перезвонить в ЖЭК.](buildings-dep.md) From d32c688ab84e44a13e035f4904d80fe1348626d8 Mon Sep 17 00:00:00 2001 From: Jamie Wilson Date: Wed, 14 Oct 2015 10:54:30 -0400 Subject: [PATCH 1302/5486] Added link to 33Hours --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index b0edfdc810..53f30c4469 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -169,6 +169,8 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: +[Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) + [Realize you are in the ...](in-matrix/matrix.md) [Realize you better call Saul](better-call-saul/saul.md) From f79bcb6df1d3886b7ad6a85f853bcac280aae1b7 Mon Sep 17 00:00:00 2001 From: Jamie Wilson Date: Wed, 14 Oct 2015 10:59:02 -0400 Subject: [PATCH 1303/5486] Added action for exploring outside --- english/33hours/explore-outside/outside.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/33hours/explore-outside/outside.md b/english/33hours/explore-outside/outside.md index 11fe10cd40..620bfa5c58 100644 --- a/english/33hours/explore-outside/outside.md +++ b/english/33hours/explore-outside/outside.md @@ -3,4 +3,6 @@ do you see your surroundings. You are standing near a long two-lane highway that left and your right. You stand there several minutes, but see no cars at all. The motel parking lot is completely empty. It looks to be abandoned. There are no other buildings around for as far as -you can see. \ No newline at end of file +you can see. + +[Go back inside and explore the motel room.](../explore-room/room.md) \ No newline at end of file From bb5d028b0c801822c003694e189e9eb0a4fac00d Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Wed, 14 Oct 2015 11:13:17 -0400 Subject: [PATCH 1304/5486] add centro e praia --- portugues/ocupado.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 portugues/ocupado.md diff --git a/portugues/ocupado.md b/portugues/ocupado.md new file mode 100644 index 0000000000..cffc8e534d --- /dev/null +++ b/portugues/ocupado.md @@ -0,0 +1,5 @@ +Só dá ocupado. + +[Você pega um ônibus até o centro para comprar a ultima versão XTree, mas você só tem Cr$ 5,00 na carteira.](centro.md) + +[Como você não consegue usar o telefone, você resolve ir a praia e gastar seus 5 Cruzeiros num mate Leão.](praia.md) \ No newline at end of file From 61bbec3352b568da75edb440323f38ed35ee20b7 Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Wed, 14 Oct 2015 11:27:27 -0400 Subject: [PATCH 1305/5486] fix path --- portugues/telefonica/ocupado.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/portugues/telefonica/ocupado.md b/portugues/telefonica/ocupado.md index 2a220dba07..cffc8e534d 100644 --- a/portugues/telefonica/ocupado.md +++ b/portugues/telefonica/ocupado.md @@ -1 +1,5 @@ -Só dá ocupado. \ No newline at end of file +Só dá ocupado. + +[Você pega um ônibus até o centro para comprar a ultima versão XTree, mas você só tem Cr$ 5,00 na carteira.](centro.md) + +[Como você não consegue usar o telefone, você resolve ir a praia e gastar seus 5 Cruzeiros num mate Leão.](praia.md) \ No newline at end of file From 84cefdb88fd8578a40d3e6846de76119a6ab91d6 Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Wed, 14 Oct 2015 11:46:50 -0400 Subject: [PATCH 1306/5486] fix ocupado.md path --- portugues/ocupado.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 portugues/ocupado.md diff --git a/portugues/ocupado.md b/portugues/ocupado.md deleted file mode 100644 index cffc8e534d..0000000000 --- a/portugues/ocupado.md +++ /dev/null @@ -1,5 +0,0 @@ -Só dá ocupado. - -[Você pega um ônibus até o centro para comprar a ultima versão XTree, mas você só tem Cr$ 5,00 na carteira.](centro.md) - -[Como você não consegue usar o telefone, você resolve ir a praia e gastar seus 5 Cruzeiros num mate Leão.](praia.md) \ No newline at end of file From 5496f1157d73b39fada40ea5038aa34a8ea59bd7 Mon Sep 17 00:00:00 2001 From: Gunkanes Date: Wed, 14 Oct 2015 19:31:30 +0200 Subject: [PATCH 1307/5486] Add General dialogo --- espanol/canudos.md | 2 ++ espanol/general/general.md | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 espanol/general/general.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 6c21a82bce..dbbf6d2e1d 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -66,4 +66,6 @@ el Consejero: [Le dice a Beatito, el momento ha llegado, La Nueva Dimensión](dimension/dimension.md) +[Intenta recordar el nombre del general del ejercito](general/general.md) + diff --git a/espanol/general/general.md b/espanol/general/general.md new file mode 100644 index 0000000000..ccef470f94 --- /dev/null +++ b/espanol/general/general.md @@ -0,0 +1,8 @@ +Con paso ascelerado, cruzó los grandes salones imperiales mientras, a su alrededor, +medio centenar de sirvientes preparaban la alfombra que daría entrada a los gloriosos +generales que volvían con novedades sobre las recientes campañas en la frontera norte. + +Se terminaba de acomodar en su sitio el Consejero, alisando la dorada capa que lucía +para la ocasión, cuando los firmes pasos se escucharon con un fuerte eco desde el +pasillo abovedado. Se abrieron las gigantescas puertas y aparecieron los cinco +generales, portadores de las tan esperadas noticias... \ No newline at end of file From b9fcfe38edf00a7dc3ae1616c1dbd7891f1b4606 Mon Sep 17 00:00:00 2001 From: juanjoferres Date: Wed, 14 Oct 2015 19:35:56 +0200 Subject: [PATCH 1308/5486] Update general.md --- espanol/general/general.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/espanol/general/general.md b/espanol/general/general.md index ccef470f94..84cb7ec860 100644 --- a/espanol/general/general.md +++ b/espanol/general/general.md @@ -1,8 +1 @@ -Con paso ascelerado, cruzó los grandes salones imperiales mientras, a su alrededor, -medio centenar de sirvientes preparaban la alfombra que daría entrada a los gloriosos -generales que volvían con novedades sobre las recientes campañas en la frontera norte. - -Se terminaba de acomodar en su sitio el Consejero, alisando la dorada capa que lucía -para la ocasión, cuando los firmes pasos se escucharon con un fuerte eco desde el -pasillo abovedado. Se abrieron las gigantescas puertas y aparecieron los cinco -generales, portadores de las tan esperadas noticias... \ No newline at end of file +Y recuerda que su nombre era sinónimo de pavor: Tanatos. From cea43a7fc0165b96f7a3caaf86fa9f8db0e3dcc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Men=C3=A9ndez=20Guti=C3=A9rrez?= Date: Wed, 14 Oct 2015 20:02:28 +0200 Subject: [PATCH 1309/5486] Du esperplena ebloj --- esperanto/komenci.md | 6 +++++- esperanto/lukto/perdita.md | 1 + esperanto/malpacienca/malpacienca.md | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 esperanto/lukto/perdita.md create mode 100644 esperanto/malpacienca/malpacienca.md diff --git a/esperanto/komenci.md b/esperanto/komenci.md index ac3cfa5190..26b69aa259 100644 --- a/esperanto/komenci.md +++ b/esperanto/komenci.md @@ -1 +1,5 @@ -Vi vidas ke vi estas en marsxmala cxambro. +Vi vidas ke vi estas en marsxmala cxambro. Vi aspektas ĉirkaŭ vi. Ĉio estas lanugaj, invitante. En la fono oni muro aperas movi. + +[Vi estas malpacienca azeno, vi venis por ludi...](malpacienca/malpacienca.md) + +[Estas neniu iras. La lukto estas perdita.](lukto/perdita.md) diff --git a/esperanto/lukto/perdita.md b/esperanto/lukto/perdita.md new file mode 100644 index 0000000000..3af8a4fa70 --- /dev/null +++ b/esperanto/lukto/perdita.md @@ -0,0 +1 @@ +La grundo ŝajnas komforta. Vi faligi kaj sorbas vin, kiel vestaĵoj. Laŭgrade komencas atingi viajn orelojn ritmon kun la notoj de piano. En la malproksimo venas la sono de trumpeto. Estas kanto. Ĝi ŝajnas preni por ĉiam kaptita en la melcocha... \ No newline at end of file diff --git a/esperanto/malpacienca/malpacienca.md b/esperanto/malpacienca/malpacienca.md new file mode 100644 index 0000000000..d56a6cfd8a --- /dev/null +++ b/esperanto/malpacienca/malpacienca.md @@ -0,0 +1 @@ +Vi estas serioza. Vi volas scii kion kaŝas ĉi melcocha ĉambro tro alloga. Vi iru rapide al la muro. Vi vibranta! Nur ŝatas vin! Kiel vi alproksimigi the'll sentas pli en vi, via tuta korpo salti ritma ritmo. La muro nun estas rozkolora ondo kiu ĉirkaŭas vin. Vi sentas bone. Subite ĉio fariĝas spongeca, kiel tiuj febra noktoj ĉe internulejo when'd batadi vian kapon kontraŭ la vatita muroj subpremi doloro. Tie. Ĉiuj estas bone. Neniu bezono teni bataladon. Ripozo. \ No newline at end of file From 4f6bf0bf57f28d6141cd0dcf9c5905eaeb7bb2c7 Mon Sep 17 00:00:00 2001 From: Menulio Baxter Date: Wed, 14 Oct 2015 20:06:40 +0200 Subject: [PATCH 1310/5486] Update komenci.md --- esperanto/komenci.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/esperanto/komenci.md b/esperanto/komenci.md index 26b69aa259..96a1fc7302 100644 --- a/esperanto/komenci.md +++ b/esperanto/komenci.md @@ -1,4 +1,5 @@ -Vi vidas ke vi estas en marsxmala cxambro. Vi aspektas ĉirkaŭ vi. Ĉio estas lanugaj, invitante. En la fono oni muro aperas movi. +Vi vidas ke vi estas en marsxmala cxambro. +Vi aspektas ĉirkaŭ vi. Ĉio estas lanugaj, invitante. En la fono oni muro aperas movi. [Vi estas malpacienca azeno, vi venis por ludi...](malpacienca/malpacienca.md) From d36c535e9a4fb1a3a9f87253276ebdd65142644f Mon Sep 17 00:00:00 2001 From: Menulio Baxter Date: Wed, 14 Oct 2015 20:09:12 +0200 Subject: [PATCH 1311/5486] Update komenci.md --- esperanto/komenci.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esperanto/komenci.md b/esperanto/komenci.md index 96a1fc7302..d6a5d80256 100644 --- a/esperanto/komenci.md +++ b/esperanto/komenci.md @@ -1,4 +1,4 @@ -Vi vidas ke vi estas en marsxmala cxambro. +Vi vidas ke vi estas en marsxmala cxambro. Vi aspektas ĉirkaŭ vi. Ĉio estas lanugaj, invitante. En la fono oni muro aperas movi. [Vi estas malpacienca azeno, vi venis por ludi...](malpacienca/malpacienca.md) From ab53b77ef887c6f11dc863d315ffbb7512476d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Men=C3=A9ndez=20Guti=C3=A9rrez?= Date: Wed, 14 Oct 2015 20:11:55 +0200 Subject: [PATCH 1312/5486] Mallongigita linioj --- esperanto/lukto/perdita.md | 4 +++- esperanto/malpacienca/malpacienca.md | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/esperanto/lukto/perdita.md b/esperanto/lukto/perdita.md index 3af8a4fa70..23a207a133 100644 --- a/esperanto/lukto/perdita.md +++ b/esperanto/lukto/perdita.md @@ -1 +1,3 @@ -La grundo ŝajnas komforta. Vi faligi kaj sorbas vin, kiel vestaĵoj. Laŭgrade komencas atingi viajn orelojn ritmon kun la notoj de piano. En la malproksimo venas la sono de trumpeto. Estas kanto. Ĝi ŝajnas preni por ĉiam kaptita en la melcocha... \ No newline at end of file +La grundo ŝajnas komforta. Vi faligi kaj sorbas vin, kiel vestaĵoj. +Laŭgrade komencas atingi viajn orelojn ritmon kun la notoj de piano. +En la malproksimo venas la sono de trumpeto. Estas kanto. Ĝi ŝajnas preni por ĉiam kaptita en la melcocha... \ No newline at end of file diff --git a/esperanto/malpacienca/malpacienca.md b/esperanto/malpacienca/malpacienca.md index d56a6cfd8a..cc0e01d4ae 100644 --- a/esperanto/malpacienca/malpacienca.md +++ b/esperanto/malpacienca/malpacienca.md @@ -1 +1,5 @@ -Vi estas serioza. Vi volas scii kion kaŝas ĉi melcocha ĉambro tro alloga. Vi iru rapide al la muro. Vi vibranta! Nur ŝatas vin! Kiel vi alproksimigi the'll sentas pli en vi, via tuta korpo salti ritma ritmo. La muro nun estas rozkolora ondo kiu ĉirkaŭas vin. Vi sentas bone. Subite ĉio fariĝas spongeca, kiel tiuj febra noktoj ĉe internulejo when'd batadi vian kapon kontraŭ la vatita muroj subpremi doloro. Tie. Ĉiuj estas bone. Neniu bezono teni bataladon. Ripozo. \ No newline at end of file +Vi estas serioza. Vi volas scii kion kaŝas ĉi melcocha ĉambro tro alloga. Vi iru rapide al la muro. +Vi vibranta! Nur ŝatas vin! Kiel vi alproksimigi the'll sentas pli en vi, via tuta korpo salti ritma ritmo. +La muro nun estas rozkolora ondo kiu ĉirkaŭas vin. Vi sentas bone. Subite ĉio fariĝas spongeca, kiel tiuj +febra noktoj ĉe internulejo when'd batadi vian kapon kontraŭ la vatita muroj subpremi doloro. Tie. Ĉiuj +estas bone. Neniu bezono teni bataladon. Ripozo. \ No newline at end of file From 13ff40698e9812801bf0b959c870bc8eb0884413 Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Wed, 14 Oct 2015 14:18:00 -0400 Subject: [PATCH 1313/5486] add windows line --- portugues/colaborando.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 0e795539af..d9d216591d 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -23,5 +23,7 @@ A sua linha telefônica está uma droga hoje e você tem que baixar a ultima ver [Você liga para a companhia telefônica](telefonica/ocupado.md) +O Git te parece ser util, mas como você ainda não vive no século XXI, você está mais preocupado com esse tal de Windows. + From 6dcca4677ba03dee6fcd0c31de9db3dc21092a65 Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Wed, 14 Oct 2015 14:24:25 -0400 Subject: [PATCH 1314/5486] fix broken links --- portugues/telefonica/centro/camelo.md | 0 portugues/telefonica/ocupado.md | 4 ++-- portugues/telefonica/praia/mate.md | 0 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 portugues/telefonica/centro/camelo.md create mode 100644 portugues/telefonica/praia/mate.md diff --git a/portugues/telefonica/centro/camelo.md b/portugues/telefonica/centro/camelo.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portugues/telefonica/ocupado.md b/portugues/telefonica/ocupado.md index cffc8e534d..16be5cf1c8 100644 --- a/portugues/telefonica/ocupado.md +++ b/portugues/telefonica/ocupado.md @@ -1,5 +1,5 @@ Só dá ocupado. -[Você pega um ônibus até o centro para comprar a ultima versão XTree, mas você só tem Cr$ 5,00 na carteira.](centro.md) +[Você pega um ônibus até o centro para comprar a ultima versão XTree, mas você só tem Cr$ 5,00 na carteira.](centro/camelo.md) -[Como você não consegue usar o telefone, você resolve ir a praia e gastar seus 5 Cruzeiros num mate Leão.](praia.md) \ No newline at end of file +[Como você não consegue usar o telefone, você resolve ir a praia e gastar seus 5 Cruzeiros num mate Leão.](praia/mate.md) \ No newline at end of file diff --git a/portugues/telefonica/praia/mate.md b/portugues/telefonica/praia/mate.md new file mode 100644 index 0000000000..e69de29bb2 From a67aa167ab2a0a890f8969c064064eb0a3d9ec65 Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Wed, 14 Oct 2015 14:31:34 -0400 Subject: [PATCH 1315/5486] fixed empty pages --- portugues/telefonica/centro/camelo.md | 1 + portugues/telefonica/praia/mate.md | 1 + 2 files changed, 2 insertions(+) diff --git a/portugues/telefonica/centro/camelo.md b/portugues/telefonica/centro/camelo.md index e69de29bb2..217b0fd452 100644 --- a/portugues/telefonica/centro/camelo.md +++ b/portugues/telefonica/centro/camelo.md @@ -0,0 +1 @@ +Você deu sorte e logo que saiu do ônibus se deparou com um camelô vendendo cópias piratas de software. \ No newline at end of file diff --git a/portugues/telefonica/praia/mate.md b/portugues/telefonica/praia/mate.md index e69de29bb2..9273d0a638 100644 --- a/portugues/telefonica/praia/mate.md +++ b/portugues/telefonica/praia/mate.md @@ -0,0 +1 @@ +Você chegou à praia e comprou seu mate, mas foi decapitado ("detached HEAD") - por um Leão marinho. \ No newline at end of file From 94c8397b82a0512463cd702c9c6d41bc3bad63ce Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Wed, 14 Oct 2015 14:35:51 -0400 Subject: [PATCH 1316/5486] short to less than 120 chars --- portugues/telefonica/ocupado.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portugues/telefonica/ocupado.md b/portugues/telefonica/ocupado.md index 16be5cf1c8..174b5275f3 100644 --- a/portugues/telefonica/ocupado.md +++ b/portugues/telefonica/ocupado.md @@ -1,5 +1,5 @@ Só dá ocupado. -[Você pega um ônibus até o centro para comprar a ultima versão XTree, mas você só tem Cr$ 5,00 na carteira.](centro/camelo.md) +[Você pega um ônibus até o centro para visitar o camelódromo, mas você só tem Cr$ 5,00 na carteira.](centro/camelo.md) -[Como você não consegue usar o telefone, você resolve ir a praia e gastar seus 5 Cruzeiros num mate Leão.](praia/mate.md) \ No newline at end of file +[Como você não consegue ligar, você resolve ir a praia e gastar seus 5 Cruzeiros num mate Leão.](praia/mate.md) \ No newline at end of file From b6ecb48e131fa513948cf29a947421b479e24b4e Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Wed, 14 Oct 2015 16:18:14 -0400 Subject: [PATCH 1317/5486] add fome --- portugues/colaborando.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index d9d216591d..02b96963db 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -25,5 +25,4 @@ A sua linha telefônica está uma droga hoje e você tem que baixar a ultima ver O Git te parece ser util, mas como você ainda não vive no século XXI, você está mais preocupado com esse tal de Windows. - - +Mas te bateu uma fome danada e você não tem nada na geladeira e nenhum tostão. \ No newline at end of file From dd160454c3a9035de0d1692d4431f67a307c613e Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Wed, 14 Oct 2015 16:21:32 -0400 Subject: [PATCH 1318/5486] add blank lines I deleted --- portugues/colaborando.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 02b96963db..51b9790a4f 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -25,4 +25,6 @@ A sua linha telefônica está uma droga hoje e você tem que baixar a ultima ver O Git te parece ser util, mas como você ainda não vive no século XXI, você está mais preocupado com esse tal de Windows. + + Mas te bateu uma fome danada e você não tem nada na geladeira e nenhum tostão. \ No newline at end of file From c7428c6b7697ae1b86846195a367743080c0c567 Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Wed, 14 Oct 2015 16:55:39 -0400 Subject: [PATCH 1319/5486] add fazer um dinheirinho --- portugues/colaborando.md | 6 +++++- portugues/venda/nao.md | 1 + portugues/venda/sim.md | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 portugues/venda/nao.md create mode 100644 portugues/venda/sim.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 51b9790a4f..a672c673e5 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -27,4 +27,8 @@ O Git te parece ser util, mas como você ainda não vive no século XXI, você e -Mas te bateu uma fome danada e você não tem nada na geladeira e nenhum tostão. \ No newline at end of file +Mas te bateu uma fome danada e você não tem nada na geladeira e nenhum tostão. + +Vende seu PC? +[SIM](venda/sim.md) +[NÃO](venda/nao.md) \ No newline at end of file diff --git a/portugues/venda/nao.md b/portugues/venda/nao.md new file mode 100644 index 0000000000..acfa76e6f6 --- /dev/null +++ b/portugues/venda/nao.md @@ -0,0 +1 @@ +Boa idéia. Melhor morrer de fome do que perder o lançamento de Wolfenstein 3D ano que vem. \ No newline at end of file diff --git a/portugues/venda/sim.md b/portugues/venda/sim.md new file mode 100644 index 0000000000..6be65fd21f --- /dev/null +++ b/portugues/venda/sim.md @@ -0,0 +1 @@ +A sua mãe que detesta jogos de violência, mas mora na baixada fluminense, fica feliz com a sua decisão. \ No newline at end of file From ca30dd242c364dc0b88a096d3dd69a4243e09d10 Mon Sep 17 00:00:00 2001 From: Bernie Gama Date: Wed, 14 Oct 2015 17:25:28 -0400 Subject: [PATCH 1320/5486] fix fix fix --- portugues/colaborando.md | 3 ++- portugues/{venda => nvenda}/nao.md | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename portugues/{venda => nvenda}/nao.md (100%) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index a672c673e5..b2cda5d41c 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -31,4 +31,5 @@ Mas te bateu uma fome danada e você não tem nada na geladeira e nenhum tostão Vende seu PC? [SIM](venda/sim.md) -[NÃO](venda/nao.md) \ No newline at end of file + +[NÃO](nvenda/nao.md) \ No newline at end of file diff --git a/portugues/venda/nao.md b/portugues/nvenda/nao.md similarity index 100% rename from portugues/venda/nao.md rename to portugues/nvenda/nao.md From 3d6c0e46483baf3381b8d7e0d175676c4d0f0562 Mon Sep 17 00:00:00 2001 From: boyerr Date: Wed, 14 Oct 2015 20:11:15 -0700 Subject: [PATCH 1321/5486] A contribution to the story --- english/zork/zork.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/zork/zork.md b/english/zork/zork.md index c7a18a7c50..5bcede997d 100644 --- a/english/zork/zork.md +++ b/english/zork/zork.md @@ -2,4 +2,6 @@ You are in a maze of dark and twisty passages, all alike. You are likely to be eaten by a grue. +Not to be confused with Felonious Gru and his minions... + [What's a grue?](../grue/grue.md) From 1903371217f1a84214de2e975125fcea903b48f0 Mon Sep 17 00:00:00 2001 From: Alexey <23lnlx@gmail.com> Date: Fri, 16 Oct 2015 01:59:56 +1000 Subject: [PATCH 1322/5486] New lines for asking for help --- russian/sleep/brushing/bluebrush/ask-for-help/Ded/ded.md | 1 + russian/sleep/brushing/bluebrush/ask-for-help/Kon/kon.md | 1 + russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md | 3 +++ 3 files changed, 5 insertions(+) create mode 100644 russian/sleep/brushing/bluebrush/ask-for-help/Ded/ded.md create mode 100644 russian/sleep/brushing/bluebrush/ask-for-help/Kon/kon.md diff --git a/russian/sleep/brushing/bluebrush/ask-for-help/Ded/ded.md b/russian/sleep/brushing/bluebrush/ask-for-help/Ded/ded.md new file mode 100644 index 0000000000..4db6e4c532 --- /dev/null +++ b/russian/sleep/brushing/bluebrush/ask-for-help/Ded/ded.md @@ -0,0 +1 @@ +Дед Пихто дает вам пирожок diff --git a/russian/sleep/brushing/bluebrush/ask-for-help/Kon/kon.md b/russian/sleep/brushing/bluebrush/ask-for-help/Kon/kon.md new file mode 100644 index 0000000000..3c21233ed1 --- /dev/null +++ b/russian/sleep/brushing/bluebrush/ask-for-help/Kon/kon.md @@ -0,0 +1 @@ +Конь громко стучит копытами и накрывает вас плащем. diff --git a/russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md b/russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md index 38efc62bfa..5cd4a7af2b 100644 --- a/russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md +++ b/russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md @@ -1 +1,4 @@ Вы начинаете звать на помощь и слышите, что кто-то бежит к вам на помощь. Кто это? + +[Дед Пихто] (Ded/ded.md) +[Конь в пальто] (Kon/kon.md) From 9e7caad27724a2cabf9addbbd41352308474b12c Mon Sep 17 00:00:00 2001 From: Alexey <23lnlx@gmail.com> Date: Fri, 16 Oct 2015 02:04:12 +1000 Subject: [PATCH 1323/5486] Fixed a typo --- russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md | 1 + 1 file changed, 1 insertion(+) diff --git a/russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md b/russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md index 5cd4a7af2b..c8d7359cb3 100644 --- a/russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md +++ b/russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md @@ -1,4 +1,5 @@ Вы начинаете звать на помощь и слышите, что кто-то бежит к вам на помощь. Кто это? [Дед Пихто] (Ded/ded.md) + [Конь в пальто] (Kon/kon.md) From a5409ea8518ad9cd04ccc09158cbda4397ba3cac Mon Sep 17 00:00:00 2001 From: jmullally Date: Thu, 15 Oct 2015 21:04:12 -0400 Subject: [PATCH 1324/5486] Add lawn-mower.md --- english/lawn-mower/lawn-mower.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 english/lawn-mower/lawn-mower.md diff --git a/english/lawn-mower/lawn-mower.md b/english/lawn-mower/lawn-mower.md new file mode 100644 index 0000000000..0e4d503c51 --- /dev/null +++ b/english/lawn-mower/lawn-mower.md @@ -0,0 +1,9 @@ +You head back to the shed, and open the door. + +You see you trusty old lawn mower, and drag it out. + +You pull and pull and pull on the cord, but it just won't start. + +What do you do? + +[Give up and keep exploring?](../explore-outside/explore-outside.md) \ No newline at end of file From 8e744fae443f519689acb72fa3946d1648f1a256 Mon Sep 17 00:00:00 2001 From: jmullally Date: Thu, 15 Oct 2015 21:05:12 -0400 Subject: [PATCH 1325/5486] Add lawn-mower to explore-outside --- english/explore-outside/explore-outside.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/explore-outside/explore-outside.md b/english/explore-outside/explore-outside.md index db272a45d9..47ea2a2d61 100644 --- a/english/explore-outside/explore-outside.md +++ b/english/explore-outside/explore-outside.md @@ -26,3 +26,5 @@ Do you: [Notice that there's a patch of fluffy moss off to your left and go to take a nap?](./moss-nap/moss-nap.md) [Have a cup of coffee](../coffee/coffee.md) + +[Notice the grass is long, and decide to find your lawn mower?](../lawn-mower/lawn-mower.md) From 9c65be0ac425473ddd96b48d6cee4ceb7fa0566b Mon Sep 17 00:00:00 2001 From: Charles Holz Date: Thu, 15 Oct 2015 19:08:43 -0700 Subject: [PATCH 1326/5486] Add option to pinch yourself. --- english/find-bird/bird.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/find-bird/bird.md b/english/find-bird/bird.md index d6d0c0e840..a49acbebb4 100644 --- a/english/find-bird/bird.md +++ b/english/find-bird/bird.md @@ -13,3 +13,5 @@ but very strong. You tie the rope to its feet and: Are lifted [to freedom](../marshmallow.md) Or so you hope... Enjoy the [ride](../enjoy-DreamRide/ride.md) + +Pinch [yourself.](../is-this-a-dream/is-this-a-dream.md) From 9aced104b83fbd3e6a501b50a0398367ae7d27b8 Mon Sep 17 00:00:00 2001 From: Phuong Nguyen Date: Fri, 16 Oct 2015 00:41:32 -0400 Subject: [PATCH 1327/5486] Add haloi/khongvoiduocdau.md to vietnamese language folder --- vietnamese/haloi/khongvoiduocdau.md | 2 ++ vietnamese/kechuyen.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 vietnamese/haloi/khongvoiduocdau.md diff --git a/vietnamese/haloi/khongvoiduocdau.md b/vietnamese/haloi/khongvoiduocdau.md new file mode 100644 index 0000000000..bc732069ee --- /dev/null +++ b/vietnamese/haloi/khongvoiduocdau.md @@ -0,0 +1,2 @@ +Bạn click gì mà nhiều thế? +Hà Lội không vội được đâu! \ No newline at end of file diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index 3a826ddcb6..25412c9e9d 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -4,3 +4,4 @@ Thế còn [truyện cười](https://www.youtube.com/watch?v=3r_-ZLZCxQs)? Que cua ban o dau? Hay cho minh biet ve que cua ban ! Que minh o [Tien Giang](tien-giang/tien-giang.md) +Rồi từ Tiên Giang tôi bay ra Thủ đô [Hà Lội](haloi/khongvoiduocdau.md) \ No newline at end of file From a6dd099d8c6e0df89f17f30561e1dcb5a7c70993 Mon Sep 17 00:00:00 2001 From: Tim Ott Date: Fri, 16 Oct 2015 01:32:34 -0500 Subject: [PATCH 1328/5486] Add new piece of story --- english/virtualreality/oculus.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/virtualreality/oculus.md b/english/virtualreality/oculus.md index b8380abac0..db178e4895 100644 --- a/english/virtualreality/oculus.md +++ b/english/virtualreality/oculus.md @@ -16,3 +16,7 @@ You try to take off the oculus gear again to no avail. You faintly hear Sonny and Cher's "I Got You Babe" in the background. After scanning the room you see Hansel smoking his joint. He's in the exact same position as he was yesterday. + + +You walk up to Hansel and start to ask him what happened, but he does not answer. +It is then that you notice a yellow exclamation point above his head! \ No newline at end of file From 82bca2fba0ab02475600135e37296e862ea50cd3 Mon Sep 17 00:00:00 2001 From: sanfordcb Date: Fri, 16 Oct 2015 10:31:18 -0500 Subject: [PATCH 1329/5486] Create outta-here --- english/outta-here | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/outta-here diff --git a/english/outta-here b/english/outta-here new file mode 100644 index 0000000000..5635d32641 --- /dev/null +++ b/english/outta-here @@ -0,0 +1,2 @@ +All of a sudden it hits you like a ton of brick-flavored marshmallows... +You are Doug, and you are out of heeeeeeeeeere. From 2a5505a260b174c052da380818b2f948d1e8f0e9 Mon Sep 17 00:00:00 2001 From: sanfordcb Date: Fri, 16 Oct 2015 10:34:26 -0500 Subject: [PATCH 1330/5486] Rename outta-here to outta-here.md --- english/{outta-here => outta-here.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/{outta-here => outta-here.md} (100%) diff --git a/english/outta-here b/english/outta-here.md similarity index 100% rename from english/outta-here rename to english/outta-here.md From 25c587707ea9a5b69e2be3169781e5eb4e36cbe2 Mon Sep 17 00:00:00 2001 From: sanfordcb Date: Fri, 16 Oct 2015 10:37:03 -0500 Subject: [PATCH 1331/5486] Add outta-here.md to outta-here sub-directory --- english/outta-here/outta-here.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/outta-here/outta-here.md diff --git a/english/outta-here/outta-here.md b/english/outta-here/outta-here.md new file mode 100644 index 0000000000..5635d32641 --- /dev/null +++ b/english/outta-here/outta-here.md @@ -0,0 +1,2 @@ +All of a sudden it hits you like a ton of brick-flavored marshmallows... +You are Doug, and you are out of heeeeeeeeeere. From 4b483681c098e1201417b0fcb4931274fc30315f Mon Sep 17 00:00:00 2001 From: sanfordcb Date: Fri, 16 Oct 2015 11:43:51 -0500 Subject: [PATCH 1332/5486] Deleted outta-here --- english/outta-here.md | 2 -- english/outta-here/outta-here.md | 2 -- 2 files changed, 4 deletions(-) delete mode 100644 english/outta-here.md delete mode 100644 english/outta-here/outta-here.md diff --git a/english/outta-here.md b/english/outta-here.md deleted file mode 100644 index 5635d32641..0000000000 --- a/english/outta-here.md +++ /dev/null @@ -1,2 +0,0 @@ -All of a sudden it hits you like a ton of brick-flavored marshmallows... -You are Doug, and you are out of heeeeeeeeeere. diff --git a/english/outta-here/outta-here.md b/english/outta-here/outta-here.md deleted file mode 100644 index 5635d32641..0000000000 --- a/english/outta-here/outta-here.md +++ /dev/null @@ -1,2 +0,0 @@ -All of a sudden it hits you like a ton of brick-flavored marshmallows... -You are Doug, and you are out of heeeeeeeeeere. From bc6ab55c64e41236ae7c9a76738bb6ea4fd66ac6 Mon Sep 17 00:00:00 2001 From: sanfordcb Date: Fri, 16 Oct 2015 12:01:55 -0500 Subject: [PATCH 1333/5486] Create outta-here.md --- english/outta-here/outta-here.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/outta-here/outta-here.md diff --git a/english/outta-here/outta-here.md b/english/outta-here/outta-here.md new file mode 100644 index 0000000000..5635d32641 --- /dev/null +++ b/english/outta-here/outta-here.md @@ -0,0 +1,2 @@ +All of a sudden it hits you like a ton of brick-flavored marshmallows... +You are Doug, and you are out of heeeeeeeeeere. From 922161005f9f1bd1a20f0c64d195183ce2946590 Mon Sep 17 00:00:00 2001 From: sanfordcb Date: Fri, 16 Oct 2015 12:09:19 -0500 Subject: [PATCH 1334/5486] Add outta-here to marshmallow.md --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index cadd7c5c9c..dd0175506e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -142,7 +142,8 @@ A soft echo of a torrent is fading from far... I felt a sudden ease of mind. -"Ok", I said to myself, "I need to get out of here" +"Ok", I said to myself, "I need to get +[out of here](outta-here/outta-here.md)" "But first I must remember the magic spell needed to open the enchanted door!" Where is Hermione Granger when you need her? Where I ask you? From 45f78872d8b6401356affb7d6db7712f162be673 Mon Sep 17 00:00:00 2001 From: Jennifer Louthan Date: Fri, 16 Oct 2015 10:34:24 -0700 Subject: [PATCH 1335/5486] Add option to fly back inside and keep sleeping --- english/dream/fly/fly.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/dream/fly/fly.md b/english/dream/fly/fly.md index d609dee67f..3ff2014c2e 100644 --- a/english/dream/fly/fly.md +++ b/english/dream/fly/fly.md @@ -16,3 +16,5 @@ Where do you go? [Asia?](./asia/asia.md) [Space?](./space/space.md) + +[Back inside and wait to wake up](../sleep/marshmallow.md) From 4e4607b9a5dab4ab1a08eb1e0710d582a834db9a Mon Sep 17 00:00:00 2001 From: Jennifer Louthan Date: Fri, 16 Oct 2015 10:40:47 -0700 Subject: [PATCH 1336/5486] Fix relative link path --- english/dream/fly/fly.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/fly/fly.md b/english/dream/fly/fly.md index 3ff2014c2e..112ea3a91c 100644 --- a/english/dream/fly/fly.md +++ b/english/dream/fly/fly.md @@ -17,4 +17,4 @@ Where do you go? [Space?](./space/space.md) -[Back inside and wait to wake up](../sleep/marshmallow.md) +[Back inside and wait to wake up](../../sleep/marshmallow.md) From 441e3760fad8d7c1559d16d5219db9ce8cf61967 Mon Sep 17 00:00:00 2001 From: peng-ling Date: Fri, 16 Oct 2015 20:04:20 +0200 Subject: [PATCH 1337/5486] added one more sentence --- german/finger-ins-loch/finger-ins-loch.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/finger-ins-loch/finger-ins-loch.md b/german/finger-ins-loch/finger-ins-loch.md index d53392c2a0..4d264b73f4 100644 --- a/german/finger-ins-loch/finger-ins-loch.md +++ b/german/finger-ins-loch/finger-ins-loch.md @@ -1,4 +1,6 @@ -Glückwunsch! Jetzt steckt ihr Finger im Loch fest! Leider wird der Wassereinstrom dadurch auch nur minimal aufgehalten. +Glückwunsch! Jetzt steckt ihr Finger im Loch fest! +Vielleicht hätten sie doch einen Moment länger überlegen sollen. +Leider wird der Wassereinstrom dadurch auch nur minimal aufgehalten. Ihnen sollte nun besser bald was einfallen, wie sie sich wieder befreien können... Ihnen sticht eine Kiste ins Auge. Sie öffnen sie, From 04d96aafb35690de46779899fb91c5e4c36415ee Mon Sep 17 00:00:00 2001 From: peng-ling Date: Fri, 16 Oct 2015 20:04:20 +0200 Subject: [PATCH 1338/5486] added one more sentence --- german/finger-ins-loch/finger-ins-loch.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/finger-ins-loch/finger-ins-loch.md b/german/finger-ins-loch/finger-ins-loch.md index d53392c2a0..4d264b73f4 100644 --- a/german/finger-ins-loch/finger-ins-loch.md +++ b/german/finger-ins-loch/finger-ins-loch.md @@ -1,4 +1,6 @@ -Glückwunsch! Jetzt steckt ihr Finger im Loch fest! Leider wird der Wassereinstrom dadurch auch nur minimal aufgehalten. +Glückwunsch! Jetzt steckt ihr Finger im Loch fest! +Vielleicht hätten sie doch einen Moment länger überlegen sollen. +Leider wird der Wassereinstrom dadurch auch nur minimal aufgehalten. Ihnen sollte nun besser bald was einfallen, wie sie sich wieder befreien können... Ihnen sticht eine Kiste ins Auge. Sie öffnen sie, From 006c635d4905a54a955c0dbbdf7a297a7a0e173e Mon Sep 17 00:00:00 2001 From: peng-ling Date: Fri, 16 Oct 2015 20:24:32 +0200 Subject: [PATCH 1339/5486] reverted --- german/finger-ins-loch/finger-ins-loch.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/german/finger-ins-loch/finger-ins-loch.md b/german/finger-ins-loch/finger-ins-loch.md index 4d264b73f4..d53392c2a0 100644 --- a/german/finger-ins-loch/finger-ins-loch.md +++ b/german/finger-ins-loch/finger-ins-loch.md @@ -1,6 +1,4 @@ -Glückwunsch! Jetzt steckt ihr Finger im Loch fest! -Vielleicht hätten sie doch einen Moment länger überlegen sollen. -Leider wird der Wassereinstrom dadurch auch nur minimal aufgehalten. +Glückwunsch! Jetzt steckt ihr Finger im Loch fest! Leider wird der Wassereinstrom dadurch auch nur minimal aufgehalten. Ihnen sollte nun besser bald was einfallen, wie sie sich wieder befreien können... Ihnen sticht eine Kiste ins Auge. Sie öffnen sie, From c7ce962717fade839551c246753537d2d7d7afd9 Mon Sep 17 00:00:00 2001 From: peng-ling Date: Fri, 16 Oct 2015 20:27:03 +0200 Subject: [PATCH 1340/5486] added one more sentence --- german/finger-ins-loch/finger-ins-loch.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/german/finger-ins-loch/finger-ins-loch.md b/german/finger-ins-loch/finger-ins-loch.md index d53392c2a0..44edb8bbde 100644 --- a/german/finger-ins-loch/finger-ins-loch.md +++ b/german/finger-ins-loch/finger-ins-loch.md @@ -1,9 +1,10 @@ Glückwunsch! Jetzt steckt ihr Finger im Loch fest! Leider wird der Wassereinstrom dadurch auch nur minimal aufgehalten. +Vielleicht hätten Sie einen Moment länger nachdenken sollen. Ihnen sollte nun besser bald was einfallen, wie sie sich wieder befreien können... -Ihnen sticht eine Kiste ins Auge. Sie öffnen sie, -finden darin einen Lappen, ziehen den Finger -aus dem Loch und stopfen den Lappen ins Loch. +Ihnen sticht eine Kiste ins Auge. Sie öffnen sie, +finden darin einen Lappen, ziehen den Finger +aus dem Loch und stopfen den Lappen ins Loch. Nun müssen Sie schnellstmöglichst ans Ufer. Dazu … @@ -12,4 +13,4 @@ Dazu … … benutzen Sie das [hoelzerne Paddel](hoelzernes-Paddel/hoelzernes-Paddel.md). -… benutzen Sie den [solarbetriebenen Motor](solarbetriebener-Motor/solarbetriebener-Motor.md). \ No newline at end of file +… benutzen Sie den [solarbetriebenen Motor](solarbetriebener-Motor/solarbetriebener-Motor.md). From 07a641a9d2b2be236de097df76eb14de4c7acb82 Mon Sep 17 00:00:00 2001 From: peng-ling Date: Fri, 16 Oct 2015 20:29:14 +0200 Subject: [PATCH 1341/5486] Revert "added one more sentence" This reverts commit c7ce962717fade839551c246753537d2d7d7afd9. --- german/finger-ins-loch/finger-ins-loch.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/german/finger-ins-loch/finger-ins-loch.md b/german/finger-ins-loch/finger-ins-loch.md index 44edb8bbde..d53392c2a0 100644 --- a/german/finger-ins-loch/finger-ins-loch.md +++ b/german/finger-ins-loch/finger-ins-loch.md @@ -1,10 +1,9 @@ Glückwunsch! Jetzt steckt ihr Finger im Loch fest! Leider wird der Wassereinstrom dadurch auch nur minimal aufgehalten. -Vielleicht hätten Sie einen Moment länger nachdenken sollen. Ihnen sollte nun besser bald was einfallen, wie sie sich wieder befreien können... -Ihnen sticht eine Kiste ins Auge. Sie öffnen sie, -finden darin einen Lappen, ziehen den Finger -aus dem Loch und stopfen den Lappen ins Loch. +Ihnen sticht eine Kiste ins Auge. Sie öffnen sie, +finden darin einen Lappen, ziehen den Finger +aus dem Loch und stopfen den Lappen ins Loch. Nun müssen Sie schnellstmöglichst ans Ufer. Dazu … @@ -13,4 +12,4 @@ Dazu … … benutzen Sie das [hoelzerne Paddel](hoelzernes-Paddel/hoelzernes-Paddel.md). -… benutzen Sie den [solarbetriebenen Motor](solarbetriebener-Motor/solarbetriebener-Motor.md). +… benutzen Sie den [solarbetriebenen Motor](solarbetriebener-Motor/solarbetriebener-Motor.md). \ No newline at end of file From 5d46fa8d8dc1c52dafae7209c1455308b8089d0f Mon Sep 17 00:00:00 2001 From: peng-ling Date: Fri, 16 Oct 2015 20:42:58 +0200 Subject: [PATCH 1342/5486] added one more sentence --- german/finger-ins-loch/finger-ins-loch.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/german/finger-ins-loch/finger-ins-loch.md b/german/finger-ins-loch/finger-ins-loch.md index d53392c2a0..b91a4f6ea6 100644 --- a/german/finger-ins-loch/finger-ins-loch.md +++ b/german/finger-ins-loch/finger-ins-loch.md @@ -1,9 +1,9 @@ Glückwunsch! Jetzt steckt ihr Finger im Loch fest! Leider wird der Wassereinstrom dadurch auch nur minimal aufgehalten. -Ihnen sollte nun besser bald was einfallen, wie sie sich wieder befreien können... +Ihnen sollte nun besser bald was einfallen, wie sie sich wieder befreien können... Sie hätten vielleicht mehr Nachdenken sollen. -Ihnen sticht eine Kiste ins Auge. Sie öffnen sie, -finden darin einen Lappen, ziehen den Finger -aus dem Loch und stopfen den Lappen ins Loch. +Ihnen sticht eine Kiste ins Auge. Sie öffnen sie, +finden darin einen Lappen, ziehen den Finger +aus dem Loch und stopfen den Lappen ins Loch. Nun müssen Sie schnellstmöglichst ans Ufer. Dazu … @@ -12,4 +12,4 @@ Dazu … … benutzen Sie das [hoelzerne Paddel](hoelzernes-Paddel/hoelzernes-Paddel.md). -… benutzen Sie den [solarbetriebenen Motor](solarbetriebener-Motor/solarbetriebener-Motor.md). \ No newline at end of file +… benutzen Sie den [solarbetriebenen Motor](solarbetriebener-Motor/solarbetriebener-Motor.md). From 09e006af028847bb0ee781ecf9b97c75f0f697ce Mon Sep 17 00:00:00 2001 From: snackattas Date: Fri, 16 Oct 2015 20:18:23 -0500 Subject: [PATCH 1343/5486] Add sandwich option to karaoke branch --- english/karaoke/karaoke/sandwich/sandwich.md | 2 ++ english/karaoke/karaoke/sing.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/karaoke/karaoke/sandwich/sandwich.md diff --git a/english/karaoke/karaoke/sandwich/sandwich.md b/english/karaoke/karaoke/sandwich/sandwich.md new file mode 100644 index 0000000000..c382ebf308 --- /dev/null +++ b/english/karaoke/karaoke/sandwich/sandwich.md @@ -0,0 +1,2 @@ +You decide now is the time to impress this girl with your sandwich making skills. +Don't forget the [Russian dressing](https://www.youtube.com/watch?v=HgG_b9L7dwo)! \ No newline at end of file diff --git a/english/karaoke/karaoke/sing.md b/english/karaoke/karaoke/sing.md index 133ab67e7b..47d37f6191 100644 --- a/english/karaoke/karaoke/sing.md +++ b/english/karaoke/karaoke/sing.md @@ -12,3 +12,5 @@ Do you: [puke on the mike](puke-on-the-mike/puke-on-the-mike.md) [check if she is real](girl-is-real/girl-is-real.md) + +[make a sandwich](sandwich/sandwich.md) From 00cfb9cda97b59089d0071bada7ae075bf2cf436 Mon Sep 17 00:00:00 2001 From: Jhonasttan Date: Sat, 17 Oct 2015 07:51:51 -0400 Subject: [PATCH 1344/5486] A Dago le gusta su dueno --- espanol/perro/perro.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/espanol/perro/perro.md b/espanol/perro/perro.md index 37ff759fd7..3a1a835c3b 100644 --- a/espanol/perro/perro.md +++ b/espanol/perro/perro.md @@ -1,3 +1,4 @@ -Un perro se puso a bailar con un muchacho mientras tocaba la guitarra +Un perro se puso a bailar con un muchacho mientras tocaba la guitarra. El perro se llama Dago. -A Dago le gustaba bailar porque al bailar recordaba a su antiguo dueño +A Dago le gustaba bailar porque al bailar recordaba a su antiguo dueño. +Dago a sido fiel con su dueño porque siempre le da los juecitos de gallina, su favorito.. From 799a2cf4a259d1e94f464a91bf95da2fab6f58a0 Mon Sep 17 00:00:00 2001 From: Jhonasttan Date: Sat, 17 Oct 2015 07:58:47 -0400 Subject: [PATCH 1345/5486] Reverted the original changes and kept one line addition --- espanol/perro/perro.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/espanol/perro/perro.md b/espanol/perro/perro.md index 3a1a835c3b..bfd0e771b0 100644 --- a/espanol/perro/perro.md +++ b/espanol/perro/perro.md @@ -1,4 +1,5 @@ -Un perro se puso a bailar con un muchacho mientras tocaba la guitarra. +Un perro se puso a bailar con un muchacho mientras tocaba la guitarra El perro se llama Dago. -A Dago le gustaba bailar porque al bailar recordaba a su antiguo dueño. -Dago a sido fiel con su dueño porque siempre le da los juecitos de gallina, su favorito.. +A Dago le gustaba bailar porque al bailar recordaba a su antiguo dueño +Dago a sido fiel con su dueño porque siempre le da los juecitos de gallina, su favorito. + From b3cdc1047ca29310428e441bd182d91208e5e789 Mon Sep 17 00:00:00 2001 From: Giuseppe Santaniello Date: Sat, 17 Oct 2015 16:52:25 +0200 Subject: [PATCH 1346/5486] Add Help option --- Italian/aiuto/aiuto.md | 7 +++++++ Italian/aiuto/chi/chi.md | 5 +++++ Italian/aiuto/dove/dove.md | 3 +++ Italian/aiuto/fine/fine.md | 5 +++++ Italian/aiuto/uscita/uscita.md | 1 + Italian/caramelle.md | 2 ++ 6 files changed, 23 insertions(+) create mode 100644 Italian/aiuto/aiuto.md create mode 100644 Italian/aiuto/chi/chi.md create mode 100644 Italian/aiuto/dove/dove.md create mode 100644 Italian/aiuto/fine/fine.md create mode 100644 Italian/aiuto/uscita/uscita.md diff --git a/Italian/aiuto/aiuto.md b/Italian/aiuto/aiuto.md new file mode 100644 index 0000000000..9e9b775cf1 --- /dev/null +++ b/Italian/aiuto/aiuto.md @@ -0,0 +1,7 @@ +Benvenuto straniero, risponde una voce da sotto il letto!. Come posso aiutarti? + +[Dove mi trovo](dove/dove.md) + +[Chi sei](chi/chi.md) + +[Come esco da qui](uscita/uscita.md) \ No newline at end of file diff --git a/Italian/aiuto/chi/chi.md b/Italian/aiuto/chi/chi.md new file mode 100644 index 0000000000..a2d6c38747 --- /dev/null +++ b/Italian/aiuto/chi/chi.md @@ -0,0 +1,5 @@ +Sono il supporto tecnico della tua mente. Faccio parte di un programma speciale creato per carpire i + +segreti della mente umana. + +Mi sà tanto che devo smettere di bere, [Buonanotte!](..\caramelle.md) \ No newline at end of file diff --git a/Italian/aiuto/dove/dove.md b/Italian/aiuto/dove/dove.md new file mode 100644 index 0000000000..d5f83d9f2f --- /dev/null +++ b/Italian/aiuto/dove/dove.md @@ -0,0 +1,3 @@ +Sei all'interno della tua mente, in realta stai ancora dormendo. Non cercare di svegliarti non ci riusciresti! + +[Perchè sono qui](fine\fine.md) \ No newline at end of file diff --git a/Italian/aiuto/fine/fine.md b/Italian/aiuto/fine/fine.md new file mode 100644 index 0000000000..9c88117fa0 --- /dev/null +++ b/Italian/aiuto/fine/fine.md @@ -0,0 +1,5 @@ +Perchè hai deciso di sottoporti ad un nuovo esperimento segreto che cerca di svelare i segreti della mente. + +La tua mente non è ancora pronta, devi cercare di riaddomentarti. + +[Ti riaddormenti](..\..\caramelle.md) \ No newline at end of file diff --git a/Italian/aiuto/uscita/uscita.md b/Italian/aiuto/uscita/uscita.md new file mode 100644 index 0000000000..f9d88750a0 --- /dev/null +++ b/Italian/aiuto/uscita/uscita.md @@ -0,0 +1 @@ +In realtà non si esce da questo posto, ci si può solo entrare \ No newline at end of file diff --git a/Italian/caramelle.md b/Italian/caramelle.md index 095ce734c3..acb9af3887 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -10,3 +10,5 @@ Che fai? [Mi guardo intorno](guardare/guarda.md) [Mi conto le dita per vedere se sono veramente sveglio](verifica/verifica.md) + +[Cerco aiuto ulrando c'è qualcuno?](aiuto/aiuto.md) From 374d1096dff2672a7e53a8f09728c4b47e5ecb67 Mon Sep 17 00:00:00 2001 From: Giuseppe Santaniello Date: Sat, 17 Oct 2015 17:35:05 +0200 Subject: [PATCH 1347/5486] Fix path for some file --- Italian/aiuto/chi/chi.md | 2 +- Italian/aiuto/dove/dove.md | 2 +- Italian/aiuto/fine/fine.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Italian/aiuto/chi/chi.md b/Italian/aiuto/chi/chi.md index a2d6c38747..5162292f65 100644 --- a/Italian/aiuto/chi/chi.md +++ b/Italian/aiuto/chi/chi.md @@ -2,4 +2,4 @@ Sono il supporto tecnico della tua mente. Faccio parte di un programma speciale segreti della mente umana. -Mi sà tanto che devo smettere di bere, [Buonanotte!](..\caramelle.md) \ No newline at end of file +Mi sà tanto che devo smettere di bere, [Buonanotte!](../../caramelle.md) \ No newline at end of file diff --git a/Italian/aiuto/dove/dove.md b/Italian/aiuto/dove/dove.md index d5f83d9f2f..98621736d0 100644 --- a/Italian/aiuto/dove/dove.md +++ b/Italian/aiuto/dove/dove.md @@ -1,3 +1,3 @@ Sei all'interno della tua mente, in realta stai ancora dormendo. Non cercare di svegliarti non ci riusciresti! -[Perchè sono qui](fine\fine.md) \ No newline at end of file +[Perchè sono qui](fine/fine.md) \ No newline at end of file diff --git a/Italian/aiuto/fine/fine.md b/Italian/aiuto/fine/fine.md index 9c88117fa0..17425f733c 100644 --- a/Italian/aiuto/fine/fine.md +++ b/Italian/aiuto/fine/fine.md @@ -2,4 +2,4 @@ Perchè hai deciso di sottoporti ad un nuovo esperimento segreto che cerca di sv La tua mente non è ancora pronta, devi cercare di riaddomentarti. -[Ti riaddormenti](..\..\caramelle.md) \ No newline at end of file +[Ti riaddormenti](../../caramelle.md) \ No newline at end of file From 0d964a15e2e38a897e44aba0a9dd5b2c5fd963d2 Mon Sep 17 00:00:00 2001 From: Giuseppe Santaniello Date: Sat, 17 Oct 2015 17:49:00 +0200 Subject: [PATCH 1348/5486] Change fine directory location --- Italian/aiuto/dove/fine/fine.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Italian/aiuto/dove/fine/fine.md diff --git a/Italian/aiuto/dove/fine/fine.md b/Italian/aiuto/dove/fine/fine.md new file mode 100644 index 0000000000..6614f85794 --- /dev/null +++ b/Italian/aiuto/dove/fine/fine.md @@ -0,0 +1,5 @@ +Perchè hai deciso di sottoporti ad un nuovo esperimento segreto che cerca di svelare i segreti della mente. + +La tua mente non è ancora pronta, devi cercare di riaddomentarti. + +[Ti riaddormenti](../../../caramelle.md) \ No newline at end of file From 88ea3f849112d45444249551669301041271e5ad Mon Sep 17 00:00:00 2001 From: Giuseppe Santaniello Date: Sat, 17 Oct 2015 17:56:17 +0200 Subject: [PATCH 1349/5486] Delete wrong dir in stage --- Italian/aiuto/fine/fine.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 Italian/aiuto/fine/fine.md diff --git a/Italian/aiuto/fine/fine.md b/Italian/aiuto/fine/fine.md deleted file mode 100644 index 17425f733c..0000000000 --- a/Italian/aiuto/fine/fine.md +++ /dev/null @@ -1,5 +0,0 @@ -Perchè hai deciso di sottoporti ad un nuovo esperimento segreto che cerca di svelare i segreti della mente. - -La tua mente non è ancora pronta, devi cercare di riaddomentarti. - -[Ti riaddormenti](../../caramelle.md) \ No newline at end of file From 3a09628caad92d13d304c52822e1db58d93141ae Mon Sep 17 00:00:00 2001 From: emlmarck Date: Sat, 17 Oct 2015 13:49:57 -0700 Subject: [PATCH 1350/5486] create new link on "memories" --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index cadd7c5c9c..6a58f2fb0f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -24,7 +24,7 @@ No... perhaps not. I think it was an [animal](animal/animal.md). -Thinking back, there are no memories to suggest that this should have been +Thinking back, there are no [memories](memories/memories.md) to suggest that this should have been anything but an ordinary morning. You didn't go out last night, you don't usually take intoxicants, what's happening...? From f32f076daf7128cf75018bb4008f0ce92cebffbb Mon Sep 17 00:00:00 2001 From: emlmarck Date: Sat, 17 Oct 2015 14:03:26 -0700 Subject: [PATCH 1351/5486] add memories.md file with text for thought --- english/memories/memories.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/memories/memories.md diff --git a/english/memories/memories.md b/english/memories/memories.md new file mode 100644 index 0000000000..e8a638500a --- /dev/null +++ b/english/memories/memories.md @@ -0,0 +1,7 @@ +What are memories? + +Where do they come from? + +Why can I only remember the past and not the future? + +The first thing I remember is the cold tile floor. The last thing I remember is the dark moment as my eyelids fell as sleep came over me. \ No newline at end of file From 720cf5baadba959ea049ac8767ea328d1f766e76 Mon Sep 17 00:00:00 2001 From: emlmarck Date: Sat, 17 Oct 2015 14:11:06 -0700 Subject: [PATCH 1352/5486] remove line modification and replace with new line --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6a58f2fb0f..02e7b37e1f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -24,12 +24,14 @@ No... perhaps not. I think it was an [animal](animal/animal.md). -Thinking back, there are no [memories](memories/memories.md) to suggest that this should have been +Thinking back, there are no memories memories/memories.md to suggest that this should have been anything but an ordinary morning. You didn't go out last night, you don't usually take intoxicants, what's happening...? Maybe this is a dream? +Or a [memory](memories/memories.md)? + But it's probably not worth dwelling on that right now, you could be in danger. Grave danger. Oh No! From 6b0bf6e318bc03f675ae6ddc9ea665d8bbeee39b Mon Sep 17 00:00:00 2001 From: emlmarck Date: Sat, 17 Oct 2015 14:12:08 -0700 Subject: [PATCH 1353/5486] brake long line into parts (less than 120 characters) --- english/memories/memories.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/memories/memories.md b/english/memories/memories.md index e8a638500a..bc81d3a3aa 100644 --- a/english/memories/memories.md +++ b/english/memories/memories.md @@ -4,4 +4,6 @@ Where do they come from? Why can I only remember the past and not the future? -The first thing I remember is the cold tile floor. The last thing I remember is the dark moment as my eyelids fell as sleep came over me. \ No newline at end of file +The first thing I remember is the cold tile floor. + +The last thing I remember is the dark moment as my eyelids fell as sleep came over me. \ No newline at end of file From f4340b37b9c558abe8a1a8f3d5234bbec49ac7df Mon Sep 17 00:00:00 2001 From: emlmarck Date: Sat, 17 Oct 2015 14:15:34 -0700 Subject: [PATCH 1354/5486] fix typo --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 02e7b37e1f..5be90c72a4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -24,7 +24,7 @@ No... perhaps not. I think it was an [animal](animal/animal.md). -Thinking back, there are no memories memories/memories.md to suggest that this should have been +Thinking back, there are no memories to suggest that this should have been anything but an ordinary morning. You didn't go out last night, you don't usually take intoxicants, what's happening...? From 34a16d7063592b7d9d829a50d16d0ea656bb5a84 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 18 Oct 2015 16:21:55 +0530 Subject: [PATCH 1355/5486] added my story --- .../find-a-toilet/door/open-door.md | 4 +++- .../find-a-toilet/door/scream/fight/fight.md | 11 ++++++++++ .../find-a-toilet/door/scream/scream.md | 20 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 english/eating-walls/find-a-toilet/door/scream/fight/fight.md create mode 100644 english/eating-walls/find-a-toilet/door/scream/scream.md diff --git a/english/eating-walls/find-a-toilet/door/open-door.md b/english/eating-walls/find-a-toilet/door/open-door.md index 666f71cdf6..70bd48ff10 100644 --- a/english/eating-walls/find-a-toilet/door/open-door.md +++ b/english/eating-walls/find-a-toilet/door/open-door.md @@ -10,4 +10,6 @@ Do you: [Run into the room and close the door](run-in/run-into-room.md) -[Blind the eyes with your torch](alien/use-torch.md) \ No newline at end of file +[Blind the eyes with your torch](alien/use-torch.md) + +[Scream as loud as you can](scream/scream.md) \ No newline at end of file diff --git a/english/eating-walls/find-a-toilet/door/scream/fight/fight.md b/english/eating-walls/find-a-toilet/door/scream/fight/fight.md new file mode 100644 index 0000000000..44abcb09dc --- /dev/null +++ b/english/eating-walls/find-a-toilet/door/scream/fight/fight.md @@ -0,0 +1,11 @@ +In an attempt to save your self , you decide to fight. + +You throw a punch at that thing , but your are only hitting the air. + +You start throwing punches frantically in the air. + +As start taking a step back as you throw another punch. + +Suddenly you hear footsteps behind you and before you could turn around, + +[Something hard hit your head](../../../../marshmallow.md) \ No newline at end of file diff --git a/english/eating-walls/find-a-toilet/door/scream/scream.md b/english/eating-walls/find-a-toilet/door/scream/scream.md new file mode 100644 index 0000000000..e1f5de00b4 --- /dev/null +++ b/english/eating-walls/find-a-toilet/door/scream/scream.md @@ -0,0 +1,20 @@ +As you look at those dark black eyes, they look back at you. +They start moving towards you, the eye are getting closer. + +You want to ask, them " who are you ?" + +You open your mouth to form words...but all that comes out is : + +"AAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAA" + +and the strange thing in front of you also start to screams, + +soon it tunrs into screaming competition. But you realize + you are now very closer to that strange thing. + + Do you : + + [Run...](../run-in/run-into-room.md) + + [Fight that thing](fight/fight.md) + From 72ea1ec73cfe4668762b3e15f5ac072f5ce98a98 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 18 Oct 2015 16:27:45 +0530 Subject: [PATCH 1356/5486] Corrected spelling mistakes and last link --- english/eating-walls/find-a-toilet/door/scream/fight/fight.md | 2 +- english/eating-walls/find-a-toilet/door/scream/scream.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/english/eating-walls/find-a-toilet/door/scream/fight/fight.md b/english/eating-walls/find-a-toilet/door/scream/fight/fight.md index 44abcb09dc..cbf42d705c 100644 --- a/english/eating-walls/find-a-toilet/door/scream/fight/fight.md +++ b/english/eating-walls/find-a-toilet/door/scream/fight/fight.md @@ -8,4 +8,4 @@ As start taking a step back as you throw another punch. Suddenly you hear footsteps behind you and before you could turn around, -[Something hard hit your head](../../../../marshmallow.md) \ No newline at end of file +[Something hard hits your head](../../../../../marshmallow.md) diff --git a/english/eating-walls/find-a-toilet/door/scream/scream.md b/english/eating-walls/find-a-toilet/door/scream/scream.md index e1f5de00b4..740e2c998a 100644 --- a/english/eating-walls/find-a-toilet/door/scream/scream.md +++ b/english/eating-walls/find-a-toilet/door/scream/scream.md @@ -9,7 +9,7 @@ You open your mouth to form words...but all that comes out is : and the strange thing in front of you also start to screams, -soon it tunrs into screaming competition. But you realize +soon it turns into screaming competition. But you realize you are now very closer to that strange thing. Do you : From 08bb4be9ffc818bac1f2aeda72e8f03206b4ab80 Mon Sep 17 00:00:00 2001 From: Samuel Garcia Date: Sun, 18 Oct 2015 20:50:30 +0200 Subject: [PATCH 1357/5486] Added Kraken sntence --- espanol/canudos.md | 2 ++ espanol/kraken/kraken.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 espanol/kraken/kraken.md diff --git a/espanol/canudos.md b/espanol/canudos.md index dbbf6d2e1d..4660b0c027 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -68,4 +68,6 @@ el Consejero: [Intenta recordar el nombre del general del ejercito](general/general.md) +[Y de repente se acordo y sintion miedo...](kraken/kraken.md) + diff --git a/espanol/kraken/kraken.md b/espanol/kraken/kraken.md new file mode 100644 index 0000000000..e9d3507934 --- /dev/null +++ b/espanol/kraken/kraken.md @@ -0,0 +1 @@ +"Soltad al Kraken" grito!!!!! \ No newline at end of file From 923eec334a74a55d0af71f96798d787ec829440e Mon Sep 17 00:00:00 2001 From: Eddie Siegel Date: Sun, 18 Oct 2015 22:30:39 -0700 Subject: [PATCH 1358/5486] Adding in the reference file. --- english/tweet-it/tweet-it.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/tweet-it/tweet-it.md diff --git a/english/tweet-it/tweet-it.md b/english/tweet-it/tweet-it.md new file mode 100644 index 0000000000..cb11cdc29a --- /dev/null +++ b/english/tweet-it/tweet-it.md @@ -0,0 +1,5 @@ + +Why try and figure out what could go wrong in a bizzare marshallow-filled room when you have twitter followers to keep happy? + +"@Udacity totes lol look at deez dank marshmallows #snacktime #blessed" + From 1b4f77c033e89ba85e9e4e886dcbfae8f2d9b05f Mon Sep 17 00:00:00 2001 From: Eddie Siegel Date: Sun, 18 Oct 2015 22:32:41 -0700 Subject: [PATCH 1359/5486] Adding in the new marshmallow master file w/ link. --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index cadd7c5c9c..f937f023ee 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -169,6 +169,7 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: +[Live Tweet the situation](tweet-it/tweet-it.md) [Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) [Realize you are in the ...](in-matrix/matrix.md) @@ -554,4 +555,4 @@ they are responding to your new surroundings. You feel an urge to gesture forwar and as you do a large pink marshmallow shoots out of your hand into the wall before you. [Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) -[The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) \ No newline at end of file +[The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) From 852026c1af626c8d5e4e69c1f32f9541267f5d4e Mon Sep 17 00:00:00 2001 From: Eddie Siegel Date: Sun, 18 Oct 2015 22:37:11 -0700 Subject: [PATCH 1360/5486] Fixed missing space after new tweet-it link. --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index f937f023ee..8dc65f1810 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -170,6 +170,7 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: [Live Tweet the situation](tweet-it/tweet-it.md) + [Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) [Realize you are in the ...](in-matrix/matrix.md) From 4998db713dac96f85bc9c31052563a4ffeac4d8f Mon Sep 17 00:00:00 2001 From: Eddie Siegel Date: Sun, 18 Oct 2015 22:46:36 -0700 Subject: [PATCH 1361/5486] Fixed too long of a line, added a return. --- english/tweet-it/tweet-it.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/tweet-it/tweet-it.md b/english/tweet-it/tweet-it.md index cb11cdc29a..ce8d21d656 100644 --- a/english/tweet-it/tweet-it.md +++ b/english/tweet-it/tweet-it.md @@ -1,5 +1,6 @@ -Why try and figure out what could go wrong in a bizzare marshallow-filled room when you have twitter followers to keep happy? +Why try and figure out what could go wrong in a bizzare + marshallow-filled room when you have twitter followers to keep happy? "@Udacity totes lol look at deez dank marshmallows #snacktime #blessed" From 8acee8209f955200140f6ad6086cb1e28d4ee4a7 Mon Sep 17 00:00:00 2001 From: b-ritter Date: Mon, 19 Oct 2015 07:34:54 -0400 Subject: [PATCH 1362/5486] Add a new option to go to 'bugs.' --- english/dream/code/code.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/dream/code/code.md b/english/dream/code/code.md index f099453804..f23df5b062 100644 --- a/english/dream/code/code.md +++ b/english/dream/code/code.md @@ -1 +1,2 @@ -You decide that talk of marshmallow real estate is purile so you escape, to code per chance to dream... \ No newline at end of file +You decide that talk of marshmallow real estate is purile so you escape, to code per chance to dream... aye, there's the rub, +For in that sleep of code, what [bugs](bugs/bugs.md) may come. From c461d44d577efeb615f18b24f596119aa69bb451 Mon Sep 17 00:00:00 2001 From: b-ritter Date: Mon, 19 Oct 2015 07:35:54 -0400 Subject: [PATCH 1363/5486] Write story for option 'bugs.' --- english/dream/code/bugs/bugs.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/dream/code/bugs/bugs.md diff --git a/english/dream/code/bugs/bugs.md b/english/dream/code/bugs/bugs.md new file mode 100644 index 0000000000..c5c177bd6f --- /dev/null +++ b/english/dream/code/bugs/bugs.md @@ -0,0 +1 @@ +As I sat down to my laptop, I noticed that the keys had been transformed into little beetles with white glyphs marked on their black carapaces. My fingers tapped down in their familiar rhythm, but the tiny black bugs scurried away before any input could be collected. From 1b4f2e8f1d0cb4664ac9abbdb686c0d61061dca2 Mon Sep 17 00:00:00 2001 From: Tudor Turcu Date: Mon, 19 Oct 2015 17:41:24 +0300 Subject: [PATCH 1364/5486] add shutter island story. --- .../dream-ception/shutter-island/shutter-island.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 english/go-back-to-sleep/dream-ception/shutter-island/shutter-island.md diff --git a/english/go-back-to-sleep/dream-ception/shutter-island/shutter-island.md b/english/go-back-to-sleep/dream-ception/shutter-island/shutter-island.md new file mode 100644 index 0000000000..8c7c8d674c --- /dev/null +++ b/english/go-back-to-sleep/dream-ception/shutter-island/shutter-island.md @@ -0,0 +1,11 @@ +The Marshmallow Titanic is rapidly shattering, and you are falling into the water. The straitjacket +is tight, preventing you from making any movement. Just before you reach the water surface, sand +starts to rise from the ocean, forming an island. Your landing is soft. You realize that the island +is actually a giant marshmallow! + +Standing in front of you is Leo, dressed in his detective suit, the badge shining from his belt. +But something feels wrong. + +Leo slowly raises his face towards you, and with a look of terror in his eyes, he exclaims: + +"We gotta get off this marshmallow, Chuck!" \ No newline at end of file From 75cc1ddddd43ed8419636bd58ede70c0a95ca641 Mon Sep 17 00:00:00 2001 From: Tudor Turcu Date: Mon, 19 Oct 2015 17:42:09 +0300 Subject: [PATCH 1365/5486] add wolf of wall street and introduction links --- .../go-back-to-sleep/dream-ception/dream-ception.md | 11 +++++++++++ .../wolf-of-wall-street/wolf-of-wall-street.md | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 english/go-back-to-sleep/dream-ception/wolf-of-wall-street/wolf-of-wall-street.md diff --git a/english/go-back-to-sleep/dream-ception/dream-ception.md b/english/go-back-to-sleep/dream-ception/dream-ception.md index 89fbf64b3d..b542e59d32 100644 --- a/english/go-back-to-sleep/dream-ception/dream-ception.md +++ b/english/go-back-to-sleep/dream-ception/dream-ception.md @@ -9,6 +9,17 @@ His hair is disarrayed, and he smells vaguely like motor oil. Leo continues, "Here, you're on board a marshmallow version of the *Titanic!* I've been in the engine room trying to make some adjustments to the motors..." +"And here", he says, as the marshmallow walls close in and wrap around you like a straitjacket, +"you are on an island, [shutter...](./shutter-island/shutter-island.md)!" + +"But wait, there's more!" he shouts. The straitjacket is gone and money falls from the ceiling. +Marshmallow bills and coins are softly hitting your head. +You start to feel [dizzy](./wolf-of-wall-street/wolf-of-wall-street.md). + +"Hello, are you with me?" asks Leo. You find yourself sitting in the enigne room just as before. +"The motors are unstable, I've been trying to make some adjustments but to no avail. Get out of +here, you are not safe!" + Do you [ignore](../../warning-ignore/ignore.md) or [listen to] (../../warning-heed/heed.md) his warning? diff --git a/english/go-back-to-sleep/dream-ception/wolf-of-wall-street/wolf-of-wall-street.md b/english/go-back-to-sleep/dream-ception/wolf-of-wall-street/wolf-of-wall-street.md new file mode 100644 index 0000000000..5f577caf71 --- /dev/null +++ b/english/go-back-to-sleep/dream-ception/wolf-of-wall-street/wolf-of-wall-street.md @@ -0,0 +1,6 @@ +You wake up at the sound of money and take a bite of a 100$ marshmallow bill sitting on your face. +You stand up and hear distant laughter. You are in a room full of people listening to Leo. Silence +then. Everybody turns around, watching him as he paces to the back of the room, where you are +standing. He stops and then suddenly throws you a white cilinder. + + "Sell me this marshmallow!" \ No newline at end of file From 429caab8300ae6b8e0d05317f0cc851a2f5d829f Mon Sep 17 00:00:00 2001 From: milka Date: Mon, 19 Oct 2015 17:52:09 +0300 Subject: [PATCH 1366/5486] Fix bugs in main file and add new story --- bulgarian/burning_room.md | 10 ++++++---- bulgarian/taken/taken.md | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 bulgarian/taken/taken.md diff --git a/bulgarian/burning_room.md b/bulgarian/burning_room.md index ae83924641..5773373cfa 100644 --- a/bulgarian/burning_room.md +++ b/bulgarian/burning_room.md @@ -1,21 +1,23 @@ Събуждаш се в непозната стая, на последния етаж на небостъргач, и виждаш, че съседната стая е обвзета в пламаци. -Оглеждаш се наоколо и забелязвате пистолет, желязна верига, одеало и мобилен телефон. (Мисля че мафията е след теб.) +Оглеждаш се наоколо и забелязваш пистолет, желязна верига, одеало и мобилен телефон. (Мисля че мафията е след теб.) Какво правиш? 1. [Впускаш се да бягаш, с всичка сила, към най-близкия изход.](./go_out/go_out.md) 2. [Решаваш да се обадиш на пожарната.](./fire-police/fire-police.md) -3. [Взимаш телефона и бързо набираш бригадата за да подготвиш засада на мафиотите.](./call_pesho/call_pesho.md) +3. [Взимаш телефона и бързо набираш бригадата, за да подготвиш засада на мафиотите.](./call_pesho/call_pesho.md) 4. [Грабваш одеалото и се впускаш да потушаваш пожара.](./save_the_day/save_the_day.md) -5. [Преди години си тренирал паркур. Грабваш веригата и се измъкнеш през прозореца.](./free_runner/free_runner.md) +5. [Преди години си тренирал паркур. Грабваш веригата и се измъкваш през прозореца.](./free_runner/free_runner.md) -6. [Грабваш пистолета и започваш да търсиш мафиотите съм.](./terminator/terminator.md) +6. [Грабваш пистолета и започваш да търсиш мафиотите.](./terminator/terminator.md) 7. [Завиваш се с одеалото и се опитваш да набереш някой близък човек.](./under_the_covers/under_the_covers.md) 8. [Решаваш да провериш дали не сънуваш.](./check_if_dreaming/check_if_dreaming.md) 9. [Пиеш си хапчетата, взимаш от на Алексиев бурканитe](./Aleksiev/TodorAleksiev.md) + +10. [Решаваш, че си попаднал в Твърде лично и ти си Лиъм Нийсън.](./taken/taken.md) diff --git a/bulgarian/taken/taken.md b/bulgarian/taken/taken.md new file mode 100644 index 0000000000..4076221217 --- /dev/null +++ b/bulgarian/taken/taken.md @@ -0,0 +1,2 @@ +Обаждаш се на дъщеря си и й казваш - "Те идват. Ще бъдеш отвлечена. Ще имаш само няколко секунди. Огледай ги и изкрещи високо какви отличителни белези виждаш - брада, татуировка, коса, дрехи. Имаш само един шанс." +След това прибираш пистолета, взимаш желязната верига, чупиш прозореца и я използваш, за да слезеш на улицата, а с одеалото омекотяваш удара, когато падаш върху лека кола, паркирала долу. \ No newline at end of file From 591f368a21aa5309e0e60d819a88f9b128a75b3f Mon Sep 17 00:00:00 2001 From: edabot Date: Mon, 19 Oct 2015 09:32:15 -0700 Subject: [PATCH 1367/5486] change my-story to link to new other-castle --- english/my-story/my-story.md | 4 +++- english/other-castle/other-castle.md | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 english/other-castle/other-castle.md diff --git a/english/my-story/my-story.md b/english/my-story/my-story.md index 20941d020f..494f566e83 100644 --- a/english/my-story/my-story.md +++ b/english/my-story/my-story.md @@ -1,4 +1,6 @@ *BOOM* You've been transported to Imagination Land. You're surrounded by all your favorite cartoon characters. One of them comes up to you and asks... -"Where did you hide the princess?! And what's with the stupid disguise, ICE KING!!" \ No newline at end of file +"Where did you hide the princess?! And what's with the stupid disguise, ICE KING!!" + +["The princess is in another castle!"](../other-castle/other-castle.md) \ No newline at end of file diff --git a/english/other-castle/other-castle.md b/english/other-castle/other-castle.md new file mode 100644 index 0000000000..f4ba5dd5e5 --- /dev/null +++ b/english/other-castle/other-castle.md @@ -0,0 +1,9 @@ +"Show me where this other castle is!" + +You look at your feet. You're wearing some strange brown loafers. + +You don't remember putting them on. They're not your style. You're more into New Balance. + +That's right, you don't have much style. + +Oh, wait, someone asked you a question... \ No newline at end of file From 2ad636c90a9a0c3d6f274a587c0392a244a57894 Mon Sep 17 00:00:00 2001 From: b-ritter Date: Mon, 19 Oct 2015 13:56:22 -0400 Subject: [PATCH 1368/5486] Fix line lengths for auto-merge. --- english/dream/code/bugs/bugs.md | 5 ++++- english/dream/code/code.md | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/english/dream/code/bugs/bugs.md b/english/dream/code/bugs/bugs.md index c5c177bd6f..4f434fa447 100644 --- a/english/dream/code/bugs/bugs.md +++ b/english/dream/code/bugs/bugs.md @@ -1 +1,4 @@ -As I sat down to my laptop, I noticed that the keys had been transformed into little beetles with white glyphs marked on their black carapaces. My fingers tapped down in their familiar rhythm, but the tiny black bugs scurried away before any input could be collected. +As I sat down to my laptop, I noticed that the keys had been transformed into +little beetles with white glyphs marked on their black carapaces. My fingers +tapped down in their familiar rhythm, but the tiny black bugs scurried away +before any input could be collected. diff --git a/english/dream/code/code.md b/english/dream/code/code.md index f23df5b062..da5032208d 100644 --- a/english/dream/code/code.md +++ b/english/dream/code/code.md @@ -1,2 +1,3 @@ -You decide that talk of marshmallow real estate is purile so you escape, to code per chance to dream... aye, there's the rub, -For in that sleep of code, what [bugs](bugs/bugs.md) may come. +You decide that talk of marshmallow real estate is purile so you escape, to code per chance to dream... + +Aye, there's the rub, for in that sleep of code, what [bugs](bugs/bugs.md) may come. From 5af444b5d3018f41cbefb1e13c6e8f057ddc0844 Mon Sep 17 00:00:00 2001 From: Ewa Date: Mon, 19 Oct 2015 21:25:20 +0200 Subject: [PATCH 1369/5486] =?UTF-8?q?Dodanie=20dalszego=20ci=C4=85gu=20his?= =?UTF-8?q?torii=20o=20wymacanym=20kalafiorze.=20Dodanie=20dw=C3=B3ch=20li?= =?UTF-8?q?nk=C3=B3w:=20terrory=C5=9Bci=20i=20zupa.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Polish/ubranie/macasz/macasz.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Polish/ubranie/macasz/macasz.md b/Polish/ubranie/macasz/macasz.md index 16051d1ba4..820eb74ffb 100644 --- a/Polish/ubranie/macasz/macasz.md +++ b/Polish/ubranie/macasz/macasz.md @@ -1,2 +1,5 @@ Wyczuwasz coś dużego, nieregularnego i twardego.. Myślisz, że to niemożliwe, że to nie ma sensu... -Czy to... czy naprawdę... kalafior? +Czy to... czy naprawdę... kalafior? A może brokuły? I wtedy wracają najgorsze wspomnienia z przedszkolnej stołówki. + +[Kalafior](terrorysci/terrorysci.md) +[Brokuły](zupa/zupa.md) From c2a76dc0b9478b2b80be5316e7e91bbc9bd3c575 Mon Sep 17 00:00:00 2001 From: Ewa Date: Mon, 19 Oct 2015 21:28:12 +0200 Subject: [PATCH 1370/5486] =?UTF-8?q?Pocz=C4=85tek=20historii=20o=20kalafi?= =?UTF-8?q?orowych=20terrorystach.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Polish/ubranie/macasz/terrorysci/terrorysci.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Polish/ubranie/macasz/terrorysci/terrorysci.md diff --git a/Polish/ubranie/macasz/terrorysci/terrorysci.md b/Polish/ubranie/macasz/terrorysci/terrorysci.md new file mode 100644 index 0000000000..c45a5e00f5 --- /dev/null +++ b/Polish/ubranie/macasz/terrorysci/terrorysci.md @@ -0,0 +1,2 @@ +Otwierasz kieszeń. Niestety jest tak jak myślałeś, to kalafior. +Nagle przenosisz się do przedszkola opanowanego przez niebezpieczną grupę kalafiorowych terrorystów. \ No newline at end of file From a92e8342ddb229fea4257dd5180f4416840ced00 Mon Sep 17 00:00:00 2001 From: Ewa Date: Mon, 19 Oct 2015 21:30:45 +0200 Subject: [PATCH 1371/5486] =?UTF-8?q?Pocz=C4=85tek=20historii=20o=20zupie?= =?UTF-8?q?=20broku=C5=82owej.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Polish/ubranie/macasz/zupa/zupa.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Polish/ubranie/macasz/zupa/zupa.md diff --git a/Polish/ubranie/macasz/zupa/zupa.md b/Polish/ubranie/macasz/zupa/zupa.md new file mode 100644 index 0000000000..22501dd182 --- /dev/null +++ b/Polish/ubranie/macasz/zupa/zupa.md @@ -0,0 +1,2 @@ +Otwierasz kieszeń. Tak to brokuły. +Nagle przenosisz się do przedszkolnej stołówki, a przed tobą stoi talerz pełen pożywnej zupy brokułowej bez soli. From 79c2fddee4899d808477fe941a0bf3f394bd8bf1 Mon Sep 17 00:00:00 2001 From: Ewa Date: Mon, 19 Oct 2015 21:35:23 +0200 Subject: [PATCH 1372/5486] =?UTF-8?q?Poprawka:=20linki=20wy=C5=9Bwietlaj?= =?UTF-8?q?=C4=85=20si=C4=99=20pod=20sob=C4=85=20a=20nie=20obok=20siebie.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Polish/ubranie/macasz/macasz.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Polish/ubranie/macasz/macasz.md b/Polish/ubranie/macasz/macasz.md index 820eb74ffb..ac255c40ea 100644 --- a/Polish/ubranie/macasz/macasz.md +++ b/Polish/ubranie/macasz/macasz.md @@ -2,4 +2,5 @@ Wyczuwasz coś dużego, nieregularnego i twardego.. Myślisz, że to niemożliwe Czy to... czy naprawdę... kalafior? A może brokuły? I wtedy wracają najgorsze wspomnienia z przedszkolnej stołówki. [Kalafior](terrorysci/terrorysci.md) + [Brokuły](zupa/zupa.md) From 467745b059e70521fefef76ee8140d053f6b0d9a Mon Sep 17 00:00:00 2001 From: Yanis Date: Tue, 20 Oct 2015 04:15:56 +0300 Subject: [PATCH 1373/5486] short story from Yanis Urbis --- russian/thinking-about/pen-paper/pen-paper.md | 11 ++++++++++ russian/thinking-about/thinking.md | 22 +++++++++++++++++++ russian/zefir.md | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 russian/thinking-about/pen-paper/pen-paper.md create mode 100644 russian/thinking-about/thinking.md diff --git a/russian/thinking-about/pen-paper/pen-paper.md b/russian/thinking-about/pen-paper/pen-paper.md new file mode 100644 index 0000000000..efd0bcdf41 --- /dev/null +++ b/russian/thinking-about/pen-paper/pen-paper.md @@ -0,0 +1,11 @@ +Ты развернул бумажку и прочитал: + +" +Когда ты чувствуешь, что тебе трудно встать утром, подумай про себя: я пробудился для исполнения обязанностей человека, почему же огорчаться тем, что мне нужно сделать то, для чего я родился, для чего я послам, в мир? Разве я родился затем, чтобы удобно лежать под одеялом?— Но это доставляет такое удовольствие. — А разве ты родился для удовольствия, а не для того, чтобы действовать и работать? Разве ты не видишь, что растения, муравьи, пауки, каждый исполняют свои обязанности и все служат мировой гармоний? А ты будешь отказываться исполнять свою обязанность человека, ты не хочешь делать того, что сообразно твоей природе. — Но нужно же отдохнуть. — Ты хочешь отдыхать? Но ведь природа положила предел этой потребности так же, как потребности есть и пить. А ты теперь переходишь этот предел, ты идешь дальше того, что должно бы тебя удовлетворить; а вот в деятельности это не совсем так: ты остаешься ниже возможного. Ты не любишь сам себя, если не любишь свою природу и ее требования. Да, те, которые любят свое дело, сохнуть над работой, забывая и пить и есть; а ты на свою природу обращаешь меньше внимания, чем резчик на свое искусство, танцор на танцы, скупец на деньги, а безумный честолюбец на свою славу. Когда они работают, они меньше заботятся об еде или об сне, чем о привлекающем их успехе своего дела. Неужели действия, имеющие целью общественное благо, кажутся тебе менее важными и менее достойными твоих забот? +" + +Вдохновленный, ты встал с колен и открыл дверь. +Там ты увидел диван, скатерть-самобранку, плазму, коробокс и подписку на Netflix на 100 лет. + + +[...](../../zefir.md) diff --git a/russian/thinking-about/thinking.md b/russian/thinking-about/thinking.md new file mode 100644 index 0000000000..c80c256452 --- /dev/null +++ b/russian/thinking-about/thinking.md @@ -0,0 +1,22 @@ +Ты поймешь, что не помнишь, как умер. +Ты поймешь, что смерть не так уж тебя и расстроила. +Конечно, умереть в столь юном возрасте... + +Ты поймешь, что раз уж выпал второй шанс, +раз уж он выпал именно тебе, то ты не потратишь его зря, +а будешь использовать каждую минуту, чтобы исследовать окружающий мир +и задавать вопросы, +чтобы двигать науку вперед, +чтобы помогать людям, +чтобы делать что-нибудь полезное, +чтобы любить маму, +друзей тоже любить, +больше кодить, +взять кого-нибудь в ученики, +стать кем-нибудь учеником, +бороться с мракобесием и ватниками, +ходить на выборы, +делать зарядку по утрам и обливаться холодной водой... + + +[Ты достал листочек и ручку из кармана и решил все это записать, чтобы не забыть.](pen-paper/pen-paper.md) \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index 4565d5502f..8a9a85b806 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -6,6 +6,8 @@ Ваши действия: +[Поразмышляете о причинах вашей неожиданной смерти и природе сознания.](thinking-about/thinking.md) + [Начнёте есть стены.](eating-walls/eating-marshmallows.md) [Разведёте костер.](light-fire/fire.md) From 582a8be45fbd146a94118afeba5ce46de0048c77 Mon Sep 17 00:00:00 2001 From: Yanis Date: Tue, 20 Oct 2015 04:21:51 +0300 Subject: [PATCH 1374/5486] new story from Yanis Urbis with small changes --- russian/thinking-about/pen-paper/pen-paper.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/russian/thinking-about/pen-paper/pen-paper.md b/russian/thinking-about/pen-paper/pen-paper.md index efd0bcdf41..f683540f41 100644 --- a/russian/thinking-about/pen-paper/pen-paper.md +++ b/russian/thinking-about/pen-paper/pen-paper.md @@ -1,7 +1,20 @@ Ты развернул бумажку и прочитал: " -Когда ты чувствуешь, что тебе трудно встать утром, подумай про себя: я пробудился для исполнения обязанностей человека, почему же огорчаться тем, что мне нужно сделать то, для чего я родился, для чего я послам, в мир? Разве я родился затем, чтобы удобно лежать под одеялом?— Но это доставляет такое удовольствие. — А разве ты родился для удовольствия, а не для того, чтобы действовать и работать? Разве ты не видишь, что растения, муравьи, пауки, каждый исполняют свои обязанности и все служат мировой гармоний? А ты будешь отказываться исполнять свою обязанность человека, ты не хочешь делать того, что сообразно твоей природе. — Но нужно же отдохнуть. — Ты хочешь отдыхать? Но ведь природа положила предел этой потребности так же, как потребности есть и пить. А ты теперь переходишь этот предел, ты идешь дальше того, что должно бы тебя удовлетворить; а вот в деятельности это не совсем так: ты остаешься ниже возможного. Ты не любишь сам себя, если не любишь свою природу и ее требования. Да, те, которые любят свое дело, сохнуть над работой, забывая и пить и есть; а ты на свою природу обращаешь меньше внимания, чем резчик на свое искусство, танцор на танцы, скупец на деньги, а безумный честолюбец на свою славу. Когда они работают, они меньше заботятся об еде или об сне, чем о привлекающем их успехе своего дела. Неужели действия, имеющие целью общественное благо, кажутся тебе менее важными и менее достойными твоих забот? +-Когда ты чувствуешь, что тебе трудно встать утром, подумай про себя: я пробудился для исполнения обязанностей человека, почему же огорчаться тем, что мне нужно сделать то, для чего я родился, для чего я послам, в мир? +Разве я родился затем, чтобы удобно лежать под одеялом? + +— Но это доставляет такое удовольствие. + +— А разве ты родился для удовольствия, а не для того, чтобы действовать и работать? Разве ты не видишь, что растения, муравьи, пауки, каждый исполняют свои обязанности и все служат мировой гармоний? +А ты будешь отказываться исполнять свою обязанность человека, ты не хочешь делать того, что сообразно твоей природе. + +— Но нужно же отдохнуть. + +— Ты хочешь отдыхать? Но ведь природа положила предел этой потребности так же, как потребности есть и пить. А ты теперь переходишь этот предел, ты идешь дальше того, что должно бы тебя удовлетворить; а вот в деятельности это не совсем так: ты остаешься ниже возможного. +Ты не любишь сам себя, если не любишь свою природу и ее требования. +Да, те, которые любят свое дело, сохнуть над работой, забывая и пить и есть; а ты на свою природу обращаешь меньше внимания, чем резчик на свое искусство, танцор на танцы, скупец на деньги, а безумный честолюбец на свою славу. +Когда они работают, они меньше заботятся об еде или об сне, чем о привлекающем их успехе своего дела. Неужели действия, имеющие целью общественное благо, кажутся тебе менее важными и менее достойными твоих забот? " Вдохновленный, ты встал с колен и открыл дверь. From 67613c516540fa61d14a83e9a79bac22aeb28e5a Mon Sep 17 00:00:00 2001 From: Yanis Date: Tue, 20 Oct 2015 04:25:25 +0300 Subject: [PATCH 1375/5486] third try, story from Yanis Urbis with small changes --- russian/thinking-about/pen-paper/pen-paper.md | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/russian/thinking-about/pen-paper/pen-paper.md b/russian/thinking-about/pen-paper/pen-paper.md index f683540f41..66166b888e 100644 --- a/russian/thinking-about/pen-paper/pen-paper.md +++ b/russian/thinking-about/pen-paper/pen-paper.md @@ -1,20 +1,32 @@ Ты развернул бумажку и прочитал: " --Когда ты чувствуешь, что тебе трудно встать утром, подумай про себя: я пробудился для исполнения обязанностей человека, почему же огорчаться тем, что мне нужно сделать то, для чего я родился, для чего я послам, в мир? +-Когда ты чувствуешь, что тебе трудно встать утром, подумай про себя: +я пробудился для исполнения обязанностей человека, почему же огорчаться тем, +что мне нужно сделать то, для чего я родился, для чего я послам, в мир? Разве я родился затем, чтобы удобно лежать под одеялом? — Но это доставляет такое удовольствие. -— А разве ты родился для удовольствия, а не для того, чтобы действовать и работать? Разве ты не видишь, что растения, муравьи, пауки, каждый исполняют свои обязанности и все служат мировой гармоний? -А ты будешь отказываться исполнять свою обязанность человека, ты не хочешь делать того, что сообразно твоей природе. +— А разве ты родился для удовольствия, а не для того, чтобы действовать и работать? +Разве ты не видишь, что растения, муравьи, пауки, каждый исполняют свои +обязанности и все служат мировой гармоний? +А ты будешь отказываться исполнять свою обязанность человека, +ты не хочешь делать того, что сообразно твоей природе. — Но нужно же отдохнуть. -— Ты хочешь отдыхать? Но ведь природа положила предел этой потребности так же, как потребности есть и пить. А ты теперь переходишь этот предел, ты идешь дальше того, что должно бы тебя удовлетворить; а вот в деятельности это не совсем так: ты остаешься ниже возможного. +— Ты хочешь отдыхать? Но ведь природа положила предел этой потребности так же, +как потребности есть и пить. А ты теперь переходишь этот предел, ты идешь дальше того, +что должно бы тебя удовлетворить; а вот в деятельности это не совсем так: +ты остаешься ниже возможного. Ты не любишь сам себя, если не любишь свою природу и ее требования. -Да, те, которые любят свое дело, сохнуть над работой, забывая и пить и есть; а ты на свою природу обращаешь меньше внимания, чем резчик на свое искусство, танцор на танцы, скупец на деньги, а безумный честолюбец на свою славу. -Когда они работают, они меньше заботятся об еде или об сне, чем о привлекающем их успехе своего дела. Неужели действия, имеющие целью общественное благо, кажутся тебе менее важными и менее достойными твоих забот? +Да, те, которые любят свое дело, сохнуть над работой, забывая и пить и есть; +а ты на свою природу обращаешь меньше внимания, чем резчик на свое искусство, +танцор на танцы, скупец на деньги, а безумный честолюбец на свою славу. +Когда они работают, они меньше заботятся об еде или об сне, чем о привлекающем +их успехе своего дела. Неужели действия, имеющие целью общественное благо, +кажутся тебе менее важными и менее достойными твоих забот? " Вдохновленный, ты встал с колен и открыл дверь. From e60a64da63c5bbb76f2d124c7d70f2f5f9b2ceeb Mon Sep 17 00:00:00 2001 From: Gen Shib Date: Mon, 19 Oct 2015 19:23:01 -0700 Subject: [PATCH 1376/5486] Add a plain sentence. --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5cd8d6b1bd..7c1eafbae7 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -539,6 +539,8 @@ And then you realize that Burning Man is over, so no real vacations :( If you eat a lot, you should also [exercise](exercise/exercise.md) +A quick brown fox jumps over the lazy dog. + [Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) [Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) From e1c4d4bde4649d17d81620258891a9b171848c41 Mon Sep 17 00:00:00 2001 From: Gen Shib Date: Mon, 19 Oct 2015 19:26:35 -0700 Subject: [PATCH 1377/5486] Change the period to an exclamation mark. --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 7c1eafbae7..cccd66ee00 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -539,7 +539,7 @@ And then you realize that Burning Man is over, so no real vacations :( If you eat a lot, you should also [exercise](exercise/exercise.md) -A quick brown fox jumps over the lazy dog. +A quick brown fox jumps over the lazy dog! [Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) From d8accc0ac01eea69bdaac5e342beb1fc9d2307d0 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 19 Oct 2015 23:38:04 -0600 Subject: [PATCH 1378/5486] face --- english/2spooky/2spooky.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index bf44055e79..1cb88ef9fc 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -6,4 +6,6 @@ mr. skeltal is nice! hahahaha +no your face! + [Go back to sleep.](../sleep/marshmallow.md) From c4ed73e69d6a3fbd0922d5aabebc9b488e98a77f Mon Sep 17 00:00:00 2001 From: Jared Date: Tue, 20 Oct 2015 01:29:56 -0700 Subject: [PATCH 1379/5486] Update marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index cccd66ee00..a4e8672daf 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -562,3 +562,5 @@ and as you do a large pink marshmallow shoots out of your hand into the wall bef [Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) [The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) + +All in a hard days work, do you play some [music](play-music/playmusic.md), or do you do the [robot](happy-robot/happy-robot.md) From b41a19126e1dbcc853f033ce6072183dffea7f5d Mon Sep 17 00:00:00 2001 From: jared-cain Date: Tue, 20 Oct 2015 01:33:36 -0700 Subject: [PATCH 1380/5486] Update marshmallow.md Please review this, @casey-collab --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index a4e8672daf..5f1a9abaa1 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -563,4 +563,5 @@ and as you do a large pink marshmallow shoots out of your hand into the wall bef [The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) -All in a hard days work, do you play some [music](play-music/playmusic.md), or do you do the [robot](happy-robot/happy-robot.md) +All in a hard days work, do you play some [music](play-music/playmusic.md), or do you do the +[robot](happy-robot/happy-robot.md) From 1657a35749141096f657b15d5079b3c4976d74fc Mon Sep 17 00:00:00 2001 From: jared-cain Date: Tue, 20 Oct 2015 01:37:17 -0700 Subject: [PATCH 1381/5486] Update marshmallow.md --- english/marshmallow.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5f1a9abaa1..7db35d6f02 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -563,5 +563,4 @@ and as you do a large pink marshmallow shoots out of your hand into the wall bef [The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) -All in a hard days work, do you play some [music](play-music/playmusic.md), or do you do the -[robot](happy-robot/happy-robot.md) +All in a hard days work, do you play some [music](play-music/playmusic.md). From a265610c63053ea1c623a32246caf64ca8146e03 Mon Sep 17 00:00:00 2001 From: milka Date: Tue, 20 Oct 2015 14:19:12 +0300 Subject: [PATCH 1382/5486] Make lines shorter --- bulgarian/taken/taken.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bulgarian/taken/taken.md b/bulgarian/taken/taken.md index 4076221217..95cec26b25 100644 --- a/bulgarian/taken/taken.md +++ b/bulgarian/taken/taken.md @@ -1,2 +1,7 @@ -Обаждаш се на дъщеря си и й казваш - "Те идват. Ще бъдеш отвлечена. Ще имаш само няколко секунди. Огледай ги и изкрещи високо какви отличителни белези виждаш - брада, татуировка, коса, дрехи. Имаш само един шанс." -След това прибираш пистолета, взимаш желязната верига, чупиш прозореца и я използваш, за да слезеш на улицата, а с одеалото омекотяваш удара, когато падаш върху лека кола, паркирала долу. \ No newline at end of file +Обаждаш се на дъщеря си и й казваш: +- Те идват. Ще бъдеш отвлечена. Ще имаш само няколко секунди. Огледай ги и +изкрещи високо какви отличителни белези виждаш: брада, татуировка, коса, +дрехи. Имаш само един шанс. +След това прибираш пистолета, взимаш желязната верига, чупиш прозореца и я +използваш, за да слезеш на улицата, а с одеалото омекотяваш удара, когато +падаш върху лека кола, паркирала долу. \ No newline at end of file From 2b2b4b5049e5d114daaaf312c1082f81f99efa50 Mon Sep 17 00:00:00 2001 From: Jaap Abrahams Date: Tue, 20 Oct 2015 15:52:29 +0200 Subject: [PATCH 1383/5486] delete uncommited change --- dutch/over-het-hek/sleutel/nacht/deze-nacht.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dutch/over-het-hek/sleutel/nacht/deze-nacht.md b/dutch/over-het-hek/sleutel/nacht/deze-nacht.md index 276604ac40..7400535498 100644 --- a/dutch/over-het-hek/sleutel/nacht/deze-nacht.md +++ b/dutch/over-het-hek/sleutel/nacht/deze-nacht.md @@ -1 +1 @@ -Plotseling komen vage beelden naar boven ... +Plotseling komen vage beelden naar boven ... \ No newline at end of file From 875b1f50b34516c9757001ef51e376861891678a Mon Sep 17 00:00:00 2001 From: Jaap Abrahams Date: Tue, 20 Oct 2015 16:20:00 +0200 Subject: [PATCH 1384/5486] Add text and links to deze-nacht.md --- dutch/droom/droom.md | 1 + dutch/over-het-hek/sleutel/nacht/deze-nacht.md | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 dutch/droom/droom.md diff --git a/dutch/droom/droom.md b/dutch/droom/droom.md new file mode 100644 index 0000000000..cec7c6b3b9 --- /dev/null +++ b/dutch/droom/droom.md @@ -0,0 +1 @@ +Maar dan verandert de droom. De letters veranderen in getallen en je wordt plotseling geconfronteerd met moelijke sommen als: hoeveel is drie tankstations gedeeld door vier bomen maal een lekke fietsband? diff --git a/dutch/over-het-hek/sleutel/nacht/deze-nacht.md b/dutch/over-het-hek/sleutel/nacht/deze-nacht.md index 7400535498..375fb7c227 100644 --- a/dutch/over-het-hek/sleutel/nacht/deze-nacht.md +++ b/dutch/over-het-hek/sleutel/nacht/deze-nacht.md @@ -1 +1,4 @@ -Plotseling komen vage beelden naar boven ... \ No newline at end of file +Plotseling komen vage beelden naar boven ... + +Je beseft dat je droomt, alsof je in een slecht verhaal zit, en ziet dat alles verkeerd gespeld is. Een boom heet plotseling booom en benzinetankstation heet bedritanktontiats. Maar zoals in alle dromen die van zichzelf bewust zijn heb je de keuze om [wakker te worden](../welkom.md). +Of toch maar lekker [verder droooomen](../droom.md). \ No newline at end of file From c07df9329a920e619cd4e22a78b803c9eca960e7 Mon Sep 17 00:00:00 2001 From: Jaap Abrahams Date: Tue, 20 Oct 2015 16:24:50 +0200 Subject: [PATCH 1385/5486] Add droom text --- dutch/droom/droom.md | 1 + 1 file changed, 1 insertion(+) diff --git a/dutch/droom/droom.md b/dutch/droom/droom.md index cec7c6b3b9..a0cc318ac9 100644 --- a/dutch/droom/droom.md +++ b/dutch/droom/droom.md @@ -1 +1,2 @@ Maar dan verandert de droom. De letters veranderen in getallen en je wordt plotseling geconfronteerd met moelijke sommen als: hoeveel is drie tankstations gedeeld door vier bomen maal een lekke fietsband? +Toch maar liever wakker worden? Maar waar raak je dan verzeild? From 29c6965d4925187287a79847f824be50810494ee Mon Sep 17 00:00:00 2001 From: Jaap Abrahams Date: Tue, 20 Oct 2015 16:43:39 +0200 Subject: [PATCH 1386/5486] shorten line length --- dutch/droom/droom.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dutch/droom/droom.md b/dutch/droom/droom.md index a0cc318ac9..57484910f0 100644 --- a/dutch/droom/droom.md +++ b/dutch/droom/droom.md @@ -1,2 +1,4 @@ -Maar dan verandert de droom. De letters veranderen in getallen en je wordt plotseling geconfronteerd met moelijke sommen als: hoeveel is drie tankstations gedeeld door vier bomen maal een lekke fietsband? +Maar dan verandert de droom. +De letters veranderen in getallen en je wordt plotseling geconfronteerd met moelijke sommen als: +hoeveel is drie tankstations gedeeld door vier bomen maal een lekke fietsband? Toch maar liever wakker worden? Maar waar raak je dan verzeild? From d96593f79d6af437c2031c4c017c1ce178d4e815 Mon Sep 17 00:00:00 2001 From: Jaap Abrahams Date: Tue, 20 Oct 2015 16:47:37 +0200 Subject: [PATCH 1387/5486] shorten line length, adjust link paths --- dutch/over-het-hek/sleutel/nacht/deze-nacht.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dutch/over-het-hek/sleutel/nacht/deze-nacht.md b/dutch/over-het-hek/sleutel/nacht/deze-nacht.md index 375fb7c227..40dc987aa6 100644 --- a/dutch/over-het-hek/sleutel/nacht/deze-nacht.md +++ b/dutch/over-het-hek/sleutel/nacht/deze-nacht.md @@ -1,4 +1,9 @@ Plotseling komen vage beelden naar boven ... -Je beseft dat je droomt, alsof je in een slecht verhaal zit, en ziet dat alles verkeerd gespeld is. Een boom heet plotseling booom en benzinetankstation heet bedritanktontiats. Maar zoals in alle dromen die van zichzelf bewust zijn heb je de keuze om [wakker te worden](../welkom.md). -Of toch maar lekker [verder droooomen](../droom.md). \ No newline at end of file +Je beseft dat je droomt, alsof je in een slecht verhaal zit, en ziet dat alles verkeerd gespeld is. +Een boom heet plotseling booom en benzinetankstation heet bedritanktontiats. + +Maar zoals in alle dromen die van zichzelf bewust zijn +heb je de keuze om [wakker te worden](../dutch/welkom.md). + +Of toch maar lekker [verder droooomen](../dutch/droom/droom.md). \ No newline at end of file From 033d10d6e13bfbf19dc72152bafee744d8ba2386 Mon Sep 17 00:00:00 2001 From: yuschat Date: Tue, 20 Oct 2015 20:59:46 -0700 Subject: [PATCH 1388/5486] added a line to breakfast --- english/breakfast/breakfast.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/breakfast/breakfast.md b/english/breakfast/breakfast.md index a05d0d7df9..e3c1637465 100644 --- a/english/breakfast/breakfast.md +++ b/english/breakfast/breakfast.md @@ -4,3 +4,4 @@ marshmallows and staring at the wall you found that you made a whole in the wall your flavoured coffee and got out from marshmallows-walled room. It is a beautiful sunny day. Suddenly, you start to sing your favorite song from childhood: "It's a Beautiful Day in the Neighborhood". +Thereafter, you remembered the hole you made in the wall and started thinking of going back to fix it. From e0883602be062702d0f885e6cd6684f7485719ba Mon Sep 17 00:00:00 2001 From: Jaap Abrahams Date: Wed, 21 Oct 2015 10:50:46 +0200 Subject: [PATCH 1389/5486] adjust links --- dutch/over-het-hek/sleutel/nacht/deze-nacht.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dutch/over-het-hek/sleutel/nacht/deze-nacht.md b/dutch/over-het-hek/sleutel/nacht/deze-nacht.md index 40dc987aa6..fe40f487a8 100644 --- a/dutch/over-het-hek/sleutel/nacht/deze-nacht.md +++ b/dutch/over-het-hek/sleutel/nacht/deze-nacht.md @@ -4,6 +4,6 @@ Je beseft dat je droomt, alsof je in een slecht verhaal zit, en ziet dat alles v Een boom heet plotseling booom en benzinetankstation heet bedritanktontiats. Maar zoals in alle dromen die van zichzelf bewust zijn -heb je de keuze om [wakker te worden](../dutch/welkom.md). +heb je de keuze om [wakker te worden](../../../welkom.md). -Of toch maar lekker [verder droooomen](../dutch/droom/droom.md). \ No newline at end of file +Of toch maar lekker [verder droooomen](../../../droom/droom.md). \ No newline at end of file From bbe573b7d56741673d053f2e3598d13b0aae1810 Mon Sep 17 00:00:00 2001 From: Naruto-Man Date: Wed, 21 Oct 2015 17:30:38 +0200 Subject: [PATCH 1390/5486] Paint it black --- english/animal/animal.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/english/animal/animal.md b/english/animal/animal.md index 27a382adec..ae477e1ece 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -1 +1,6 @@ -My worst fears have come true. My cat is crying out for food. \ No newline at end of file +My worst fears have come true. My cat is crying out for food. + +Even if it really start to drop tears or weep blood, it's the same to me ... no food. +The hilarious thing is that i start thinking about making it my own meal. +I remember my last meal, oh it was a dead dog 3 days ago. +We are stepping to the verge of eating each other, human flesh oh what does it taste. \ No newline at end of file From 54602ecd58ea3770c4972da849c04826330c326c Mon Sep 17 00:00:00 2001 From: Patrizio Palazzetti Date: Wed, 21 Oct 2015 22:24:48 -0500 Subject: [PATCH 1391/5486] Add story to spanish version --- espanol/poseso/poseso.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/espanol/poseso/poseso.md b/espanol/poseso/poseso.md index ae100cd634..6f437ea010 100644 --- a/espanol/poseso/poseso.md +++ b/espanol/poseso/poseso.md @@ -1,2 +1,5 @@ Con los ojos muy abiertos y haciendo aspavientos con las manos, el Consejero gritaba ante la atónica mirada de la multitud... + +Y una persona dentro de la multitud empezó a gritar, el de al lado le siguió, +y el de al lado también. Pronto toda la multitud gritaba junto con el Consejero... \ No newline at end of file From 81046f9fd79b641fa317e4239f0bdc52752972ea Mon Sep 17 00:00:00 2001 From: Mindaugas Date: Thu, 22 Oct 2015 14:37:23 +0300 Subject: [PATCH 1392/5486] Adding 'Miegas' --- lithuanian/miegoti/miegas.md | 1 + lithuanian/startas.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 lithuanian/miegoti/miegas.md diff --git a/lithuanian/miegoti/miegas.md b/lithuanian/miegoti/miegas.md new file mode 100644 index 0000000000..4daac32158 --- /dev/null +++ b/lithuanian/miegoti/miegas.md @@ -0,0 +1 @@ +Ir jis skaniai umiega diff --git a/lithuanian/startas.md b/lithuanian/startas.md index 1476c909a2..8e460eb94e 100644 --- a/lithuanian/startas.md +++ b/lithuanian/startas.md @@ -5,3 +5,5 @@ Visiškoje tamsoje jis turėjo pasirinkti [Užsimerkti](uzsimerkti/vejas.md) [Pradėti rėkti](rekti/niekas.md) + +[Eiti miegoti](miegoti/miegas.md) \ No newline at end of file From 6ece896f4985145523468551652420028aa11d30 Mon Sep 17 00:00:00 2001 From: Mindaugas Date: Thu, 22 Oct 2015 14:44:39 +0300 Subject: [PATCH 1393/5486] change to UTF8 --- lithuanian/miegoti/miegas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lithuanian/miegoti/miegas.md b/lithuanian/miegoti/miegas.md index 4daac32158..31e6dec10a 100644 --- a/lithuanian/miegoti/miegas.md +++ b/lithuanian/miegoti/miegas.md @@ -1 +1 @@ -Ir jis skaniai umiega +Ir jis skaniai užmiega From f23996695c5ec128c9fdadae194470805beb76c1 Mon Sep 17 00:00:00 2001 From: gooneraki Date: Thu, 22 Oct 2015 17:05:01 +0300 Subject: [PATCH 1394/5486] modified latest file to point to new created new folder/file --- greek/offer_marshmallow_a_cigar/intimacy/intimacy.md | 1 + greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 greek/offer_marshmallow_a_cigar/intimacy/intimacy.md diff --git a/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md b/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md new file mode 100644 index 0000000000..b019d0528e --- /dev/null +++ b/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md @@ -0,0 +1 @@ +Το σκεφτεσαι περισσοτερο αναβωντας ακομα ένα τσιγαρο. Το ζαχαρωτο χερι εχει πνιγει στους καπνους αλλα πλεον δεν σε νοιαζει, εισαι οικειος μαζι του αφου εχουν περασει πεντε ολοκληρα λεπτα από τοτε που γνωριστηκατε. \ No newline at end of file diff --git a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md index 913e93353a..7493006509 100644 --- a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md +++ b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md @@ -7,4 +7,6 @@ πως είναι ώρα να βγεις από εκεί. Πόρτα δεν υπάρχει οπότε πρέπει να χρησιμοποιήσεις κάτι από αυτά που έχεις. Τι κάνεις; -[Ανάβεις τον αναπτήρα](set_it_on_fire/set_it_on_fire.md) \ No newline at end of file +[Ανάβεις τον αναπτήρα](set_it_on_fire/set_it_on_fire.md) + +[Ανάβεις ακόμη ένα τσιγάρο](intimacy/intimacy.md) \ No newline at end of file From 5da2712431e417df13a9b22ecd88e0f1eb27d15b Mon Sep 17 00:00:00 2001 From: gooneraki Date: Thu, 22 Oct 2015 17:37:01 +0300 Subject: [PATCH 1395/5486] deleted one line to help bot --- greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md | 1 - 1 file changed, 1 deletion(-) diff --git a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md index 7493006509..dc9b2babc3 100644 --- a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md +++ b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md @@ -6,7 +6,6 @@ Αφου καπνίσεις το τσιγάρο που το ζαχαρωτό χέρι αρνήθηκε σκέφτεσαι πως είναι ώρα να βγεις από εκεί. Πόρτα δεν υπάρχει οπότε πρέπει να χρησιμοποιήσεις κάτι από αυτά που έχεις. Τι κάνεις; - [Ανάβεις τον αναπτήρα](set_it_on_fire/set_it_on_fire.md) [Ανάβεις ακόμη ένα τσιγάρο](intimacy/intimacy.md) \ No newline at end of file From 4230b474eff932f92b150bb580f40bdda795e7b7 Mon Sep 17 00:00:00 2001 From: gooneraki Date: Thu, 22 Oct 2015 17:39:31 +0300 Subject: [PATCH 1396/5486] added line back --- greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md | 1 + 1 file changed, 1 insertion(+) diff --git a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md index dc9b2babc3..7493006509 100644 --- a/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md +++ b/greek/offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md @@ -6,6 +6,7 @@ Αφου καπνίσεις το τσιγάρο που το ζαχαρωτό χέρι αρνήθηκε σκέφτεσαι πως είναι ώρα να βγεις από εκεί. Πόρτα δεν υπάρχει οπότε πρέπει να χρησιμοποιήσεις κάτι από αυτά που έχεις. Τι κάνεις; + [Ανάβεις τον αναπτήρα](set_it_on_fire/set_it_on_fire.md) [Ανάβεις ακόμη ένα τσιγάρο](intimacy/intimacy.md) \ No newline at end of file From 413478168ca93f383863c398f4ca6e5bf2b60472 Mon Sep 17 00:00:00 2001 From: Gregg Strohkorb Date: Thu, 22 Oct 2015 16:49:50 -0500 Subject: [PATCH 1397/5486] Added line to oil-field.md in oil-field directory (english) --- english/oil-field/oil-field.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/oil-field/oil-field.md b/english/oil-field/oil-field.md index 02fbd0c701..b8a044e845 100644 --- a/english/oil-field/oil-field.md +++ b/english/oil-field/oil-field.md @@ -4,4 +4,6 @@ Given an MxN grid, and drilling results, write a program that can determine how oil fields are present. Note: if oil is found in adjacent nodes, it is the same field and should not be counted again. -Wait...you seem to remember something about a marshmallow. Mmm...marshmallows... \ No newline at end of file +Wait...you seem to remember something about a marshmallow. Mmm...marshmallows... + +But, wait. What is better than a marshmellow? An oil field on beautiful sand dunes filled with treasure!! From dadf4856b840e43237084c3e1fd941c08e67c9d6 Mon Sep 17 00:00:00 2001 From: DavidNeufeld Date: Thu, 22 Oct 2015 16:14:17 -0700 Subject: [PATCH 1398/5486] Add padded room story line intro --- .../bite-the-marshmallow/padded-room/first-blackout.md | 10 ++++++++++ english/bite-the-marshmallow/tasty-marshmallow.md | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 english/bite-the-marshmallow/padded-room/first-blackout.md diff --git a/english/bite-the-marshmallow/padded-room/first-blackout.md b/english/bite-the-marshmallow/padded-room/first-blackout.md new file mode 100644 index 0000000000..5b236b923d --- /dev/null +++ b/english/bite-the-marshmallow/padded-room/first-blackout.md @@ -0,0 +1,10 @@ +The twinkle bursts into flashes of memory that assemble your senses into a perception +of where you are. Tendrils of deja-vu tug at your mind from movies and television and novels +reeling your conscienceness to the disturbing truth. This looks like the padded cell +from Clockwork Orange or any of a dozen asylum scenes on TV. + +Another tug, this time on your arm, turns into a sharp pain of an needle that snakes back ot +an IV bag. + +Footsteps grow louder, then faster. The room starts to fade. Voices. Darkness. + diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index 2827649501..397634e71a 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -1,3 +1,5 @@ +[A nose length away from the wall, a twinkle in your mind makes you pause.](padded-room/first-blackout) + "Mmmmm... these marshmallows are soooo good. They would be delicious with a cup of coffee." You close your eyes. From e3769bc5a432c7aba6ceff16745073eaa8ae9e8e Mon Sep 17 00:00:00 2001 From: DavidNeufeld Date: Thu, 22 Oct 2015 17:35:51 -0700 Subject: [PATCH 1399/5486] a few edits... --- english/bite-the-marshmallow/padded-room/first-blackout.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/english/bite-the-marshmallow/padded-room/first-blackout.md b/english/bite-the-marshmallow/padded-room/first-blackout.md index 5b236b923d..159e6efe91 100644 --- a/english/bite-the-marshmallow/padded-room/first-blackout.md +++ b/english/bite-the-marshmallow/padded-room/first-blackout.md @@ -1,9 +1,7 @@ The twinkle bursts into flashes of memory that assemble your senses into a perception -of where you are. Tendrils of deja-vu tug at your mind from movies and television and novels -reeling your conscienceness to the disturbing truth. This looks like the padded cell -from Clockwork Orange or any of a dozen asylum scenes on TV. +of where you are. Tendrils of deja-vu tug at your mind reel your conscienceness to the disturbing truth. This looks like the padded cell from a movie or television show. -Another tug, this time on your arm, turns into a sharp pain of an needle that snakes back ot +Another tug, this time on your arm, turns into a sharp pain of an needle snaking back to an IV bag. Footsteps grow louder, then faster. The room starts to fade. Voices. Darkness. From 4d452e4e730e61028afa71c73f2e6c2b8743b7d1 Mon Sep 17 00:00:00 2001 From: fbxy Date: Fri, 23 Oct 2015 13:40:46 +0500 Subject: [PATCH 1400/5486] Hikaye sonuna iple in linki eklendi --- turkce/catalla-kaz/metali-cek/metali-cek.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/turkce/catalla-kaz/metali-cek/metali-cek.md b/turkce/catalla-kaz/metali-cek/metali-cek.md index 7d3dadc8c0..080769080b 100644 --- a/turkce/catalla-kaz/metali-cek/metali-cek.md +++ b/turkce/catalla-kaz/metali-cek/metali-cek.md @@ -11,4 +11,6 @@ Bi taraf karanlık ama çakmakla ilerleyebilirsin. Diğer taraf ise uçurum fakat iple inebilirsin. -Ne yapacaksın? \ No newline at end of file +Ne yapacaksın? + +[İple in](https://github.com/fbxy/create-your-own-adventure/tree/master/turkce/catalla-kaz/metali-cek/iple-in/iple-in.md) \ No newline at end of file From 28c96e2ff3795c3fc7103e0c15a34da0152acea8 Mon Sep 17 00:00:00 2001 From: fbxy Date: Fri, 23 Oct 2015 14:01:17 +0500 Subject: [PATCH 1401/5486] =?UTF-8?q?Iple=20inme=20k=C4=B1sm=C4=B1=20eklen?= =?UTF-8?q?di?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- turkce/catalla-kaz/metali-cek/iple-in/iple-in.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 turkce/catalla-kaz/metali-cek/iple-in/iple-in.md diff --git a/turkce/catalla-kaz/metali-cek/iple-in/iple-in.md b/turkce/catalla-kaz/metali-cek/iple-in/iple-in.md new file mode 100644 index 0000000000..3fb16c701f --- /dev/null +++ b/turkce/catalla-kaz/metali-cek/iple-in/iple-in.md @@ -0,0 +1,5 @@ +Iple inerken karanlığın bir taraftan aydınlandığını gördün. +Meğerse ipin aşağıdaki kısmı yanmaya başlamış. +İpin yanıp biteceğini görünce iki opsiyon aklına gelir: +- ne beklediğini bilmeden karanlığa atlamak veya +- hızla ipten tutunarak yukarı doğru hareket etmek. From 0651f17b6faf77a920686911a77d0750bd1ec6c4 Mon Sep 17 00:00:00 2001 From: fbxy Date: Fri, 23 Oct 2015 14:07:03 +0500 Subject: [PATCH 1402/5486] Resolved the 404 link in iple-cek --- turkce/catalla-kaz/metali-cek/metali-cek.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/turkce/catalla-kaz/metali-cek/metali-cek.md b/turkce/catalla-kaz/metali-cek/metali-cek.md index 080769080b..292b764e78 100644 --- a/turkce/catalla-kaz/metali-cek/metali-cek.md +++ b/turkce/catalla-kaz/metali-cek/metali-cek.md @@ -13,4 +13,4 @@ Diğer taraf ise uçurum fakat iple inebilirsin. Ne yapacaksın? -[İple in](https://github.com/fbxy/create-your-own-adventure/tree/master/turkce/catalla-kaz/metali-cek/iple-in/iple-in.md) \ No newline at end of file +[İple in](iple-in/iple-in.md) From 4db8720191d32e1bcd0690e6efe7938a160984fa Mon Sep 17 00:00:00 2001 From: memerr Date: Fri, 23 Oct 2015 22:51:12 +0800 Subject: [PATCH 1403/5486] add option to take a pill --- english/shrunk/shrunken.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/shrunk/shrunken.md b/english/shrunk/shrunken.md index dc0c6657d7..b278964c32 100644 --- a/english/shrunk/shrunken.md +++ b/english/shrunk/shrunken.md @@ -8,4 +8,6 @@ You look down and see a spoon on the ground next to you...except that it's bigge Oh no, the room didn't get bigger. You SHRANK! You're tiny. Small enough to sit in the spoon, even. -Now what?? How do you either get bigger, or just get out of this mess?! \ No newline at end of file +Now what?? How do you either get bigger, or just get out of this mess?! + +Suddenly, you saw a very very tiny [pill](../super-man/save-the-word.md) and you decided you take it. \ No newline at end of file From acbd4d7b7894e79e270bcce2072a98b9e14e31e9 Mon Sep 17 00:00:00 2001 From: Andrew Jarcho Date: Fri, 23 Oct 2015 17:08:44 -0400 Subject: [PATCH 1404/5486] Add umbrella with chocolate syrup --- english/marshmallow.md | 4 ++++ english/poke-the-wall/poke-the-wall.md | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 english/poke-the-wall/poke-the-wall.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 7db35d6f02..65a22cb1af 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -69,6 +69,10 @@ You also seem to be wearing an uncomfortable and restrictive jacket made of leat You don't own any uncomfortable and restrictive leather jackets... How did you end up sleeping in one? +An umbrella (closed) automagically appears in your left hand. You tentatively + +[poke the wall](./poke-the-wall/poke-the-wall.md) with it. + [You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) You are feeling very anxious at this point. diff --git a/english/poke-the-wall/poke-the-wall.md b/english/poke-the-wall/poke-the-wall.md new file mode 100644 index 0000000000..dd29579caf --- /dev/null +++ b/english/poke-the-wall/poke-the-wall.md @@ -0,0 +1,3 @@ +A thick layer of gooey (or GUI) delicious-looking chocolate syrup begins oozing + +out of the wall! From 4a3f14e06e813d92d4784f73d98a24bb57718d2d Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 24 Oct 2015 00:48:38 +0200 Subject: [PATCH 1405/5486] Add text and link to salon.md --- espanol/cocinero/error/salon/platos/platos.md | 2 ++ espanol/cocinero/error/salon/salon.md | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 espanol/cocinero/error/salon/platos/platos.md diff --git a/espanol/cocinero/error/salon/platos/platos.md b/espanol/cocinero/error/salon/platos/platos.md new file mode 100644 index 0000000000..22d997196e --- /dev/null +++ b/espanol/cocinero/error/salon/platos/platos.md @@ -0,0 +1,2 @@ +Todos los platos estaban ya casi vacíos y los comensales estaban terminando. Así que a Beatito sólo se le ocurrió +gritar en voz alta: \ No newline at end of file diff --git a/espanol/cocinero/error/salon/salon.md b/espanol/cocinero/error/salon/salon.md index bda98c34aa..401e15b1e4 100644 --- a/espanol/cocinero/error/salon/salon.md +++ b/espanol/cocinero/error/salon/salon.md @@ -1,2 +1,4 @@ Beatito empujó con todas sus fuerzas las enormes puertas del salón de banquetes causando un gran estruendo que provocó -que las miradas te todos los comensales se fijaran en él \ No newline at end of file +que las miradas te todos los comensales se fijaran en él + +[Y Beatito se fijó a su vez en las filas de platos de los comensales](platos/platos.md) \ No newline at end of file From 237ff0bc105b9aef201edec7dbcc3a680a2905ac Mon Sep 17 00:00:00 2001 From: DavidNeufeld Date: Fri, 23 Oct 2015 16:22:47 -0700 Subject: [PATCH 1406/5486] Reduce line length to less than 120 characters --- english/bite-the-marshmallow/padded-room/first-blackout.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/padded-room/first-blackout.md b/english/bite-the-marshmallow/padded-room/first-blackout.md index 159e6efe91..8d1584359c 100644 --- a/english/bite-the-marshmallow/padded-room/first-blackout.md +++ b/english/bite-the-marshmallow/padded-room/first-blackout.md @@ -1,5 +1,6 @@ The twinkle bursts into flashes of memory that assemble your senses into a perception -of where you are. Tendrils of deja-vu tug at your mind reel your conscienceness to the disturbing truth. This looks like the padded cell from a movie or television show. +of where you are. Tendrils of deja-vu tug at your mind reel your conscienceness to the disturbing truth. +This looks like the padded cell from a movie or television show. Another tug, this time on your arm, turns into a sharp pain of an needle snaking back to an IV bag. From 146bfcedf90577c7f5a961c725f21afcb5af724c Mon Sep 17 00:00:00 2001 From: DavidNeufeld Date: Fri, 23 Oct 2015 17:43:54 -0700 Subject: [PATCH 1407/5486] fix hyperlink --- english/bite-the-marshmallow/tasty-marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index 397634e71a..a120a361a7 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -1,4 +1,4 @@ -[A nose length away from the wall, a twinkle in your mind makes you pause.](padded-room/first-blackout) +[A nose length away from the wall, a twinkle in your mind makes you pause.](padded-room/first-blackout.md) "Mmmmm... these marshmallows are soooo good. They would be delicious with a cup of coffee." From c9cd50811b2a7f5c9219194bd5cf162f0a6d9af5 Mon Sep 17 00:00:00 2001 From: Kelvin Yong <13miles@gmail.com> Date: Sat, 24 Oct 2015 10:29:25 +0800 Subject: [PATCH 1408/5486] Add new option to play a chess puzzle --- english/chess/00102.jpg | Bin 0 -> 26763 bytes english/chess/chess.md | 9 +++++++++ english/marshmallow.md | 2 ++ 3 files changed, 11 insertions(+) create mode 100644 english/chess/00102.jpg create mode 100644 english/chess/chess.md diff --git a/english/chess/00102.jpg b/english/chess/00102.jpg new file mode 100644 index 0000000000000000000000000000000000000000..fa9ba6daf1a5e81250aa1e145ca730037442747d GIT binary patch literal 26763 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 sjej{CB+#Qo_ Date: Sat, 24 Oct 2015 10:31:35 +0800 Subject: [PATCH 1409/5486] King mating steps is now clearer --- english/chess/chess.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/chess/chess.md b/english/chess/chess.md index 11a41ea6b7..53bcae0a5f 100644 --- a/english/chess/chess.md +++ b/english/chess/chess.md @@ -4,6 +4,6 @@ An image appears in your mind. White to move. ![alt chess](00102.jpg) -You decide the best response is Qf8+, followed by Ra8# +You decide the best response is Qf8+, then Ra8 with mate to follow And you go back to reality. \ No newline at end of file From f75ccc79ef387c2af98092445c9be499c98e63cc Mon Sep 17 00:00:00 2001 From: Kelvin Yong <13miles@gmail.com> Date: Sat, 24 Oct 2015 13:14:39 +0800 Subject: [PATCH 1410/5486] Update md to use external image --- english/chess/00102.jpg | Bin 26763 -> 0 bytes english/chess/chess.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 english/chess/00102.jpg diff --git a/english/chess/00102.jpg b/english/chess/00102.jpg deleted file mode 100644 index fa9ba6daf1a5e81250aa1e145ca730037442747d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26763 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 sjej{CB+#Qo_ Date: Sat, 24 Oct 2015 12:05:15 +0200 Subject: [PATCH 1411/5486] update: add text to kleidung.md --- german/Leichen/Kleidung/Kleidung.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/german/Leichen/Kleidung/Kleidung.md b/german/Leichen/Kleidung/Kleidung.md index 3aaa61ed2e..4b7118aa7c 100644 --- a/german/Leichen/Kleidung/Kleidung.md +++ b/german/Leichen/Kleidung/Kleidung.md @@ -5,3 +5,6 @@ Obwohl ihr jetzt ge Nach etlichen Schlucken Salzwasser habt ihr euch aber auch ihrer entledigt. Jetzt, da ihr euch frei im Wasser bewegen knnt, dringt das eigentliche Problem eure Aufmerksamkeit zurck. + +Ihr werdet immer kratloser und es werden immer grere Wellen. +Lange haltet ihr das nicht mehr durch. From f4b212606ebedee285ace19aa9155ce02d2320a5 Mon Sep 17 00:00:00 2001 From: Arthur Grosser Date: Sat, 24 Oct 2015 12:08:00 +0200 Subject: [PATCH 1412/5486] fix: typo in kleidung.md --- german/Leichen/Kleidung/Kleidung.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/Leichen/Kleidung/Kleidung.md b/german/Leichen/Kleidung/Kleidung.md index 4b7118aa7c..c60bceeb59 100644 --- a/german/Leichen/Kleidung/Kleidung.md +++ b/german/Leichen/Kleidung/Kleidung.md @@ -6,5 +6,5 @@ Nach etlichen Schlucken Salzwasser habt ihr euch aber auch ihrer entledigt. Jetzt, da ihr euch frei im Wasser bewegen knnt, dringt das eigentliche Problem eure Aufmerksamkeit zurck. -Ihr werdet immer kratloser und es werden immer grere Wellen. +Ihr werdet immer kraftloser und es werden immer grere Wellen. Lange haltet ihr das nicht mehr durch. From 647844df5643d024ffe216704728d7285b11daf6 Mon Sep 17 00:00:00 2001 From: xfxf820 Date: Sun, 25 Oct 2015 11:57:11 +0800 Subject: [PATCH 1413/5486] Add branch nico --- Chinese/nico/nico.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Chinese/nico/nico.md diff --git a/Chinese/nico/nico.md b/Chinese/nico/nico.md new file mode 100644 index 0000000000..a06ad97464 --- /dev/null +++ b/Chinese/nico/nico.md @@ -0,0 +1 @@ +niconiconi~☆让你的心也跟着微笑 传递笑容的矢泽日香 爱日香就要记住小香香哦 大家的偶像小香香来了哦~ (咦，谁说我前世是只猴子的！) \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 37adef021e..233737b809 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -65,3 +65,5 @@ [三體人](CK/CK.md) [胡八一](摸金校尉/摸金校尉.md) + +[矢泽日香](nico/nico.md) \ No newline at end of file From 4638cfca6988028b17be8be595ce6e726821c405 Mon Sep 17 00:00:00 2001 From: JD Date: Sat, 24 Oct 2015 22:08:39 -0700 Subject: [PATCH 1414/5486] Added Barket Beauties reference to story. --- english/bob-barker/barker.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/bob-barker/barker.md b/english/bob-barker/barker.md index 336f0be108..980100d94c 100644 --- a/english/bob-barker/barker.md +++ b/english/bob-barker/barker.md @@ -4,6 +4,8 @@ When your vision clears, standing before you is Bob Barker in all his glory. You stare at him in awe. +The Barker beauties are nowhere to be found; you collapse for a moment in dispair. + He doesn't look a day past 50. Like all of the greats he doesn't age in your mind. He is flanked by two of the hottest...marshmallows that you have ever seen. @@ -30,4 +32,4 @@ You hesitate just a moment before replying... [Grab some coffee?](../coffee/coffee.md) -[Can I phone a friend?](phone-a-friend/phone-a-friend.md) \ No newline at end of file +[Can I phone a friend?](phone-a-friend/phone-a-friend.md) From 18b0895f3505c2d5e40a4690b584d8077776df1b Mon Sep 17 00:00:00 2001 From: Gaurav Sharma Date: Sun, 25 Oct 2015 19:31:44 -0400 Subject: [PATCH 1415/5486] Add english/no-worries story line --- english/no-worries/hakuna-matata.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/no-worries/hakuna-matata.md diff --git a/english/no-worries/hakuna-matata.md b/english/no-worries/hakuna-matata.md new file mode 100644 index 0000000000..ca5912ab83 --- /dev/null +++ b/english/no-worries/hakuna-matata.md @@ -0,0 +1 @@ +It means no worries !!!!! [Go back] (english/marshmallow.md) \ No newline at end of file From 3b7e7e2aa7bf5b6e2873da306ea4fb57fc7b2321 Mon Sep 17 00:00:00 2001 From: Gaurav Sharma Date: Sun, 25 Oct 2015 19:38:53 -0400 Subject: [PATCH 1416/5486] Fix the Go back link --- english/no-worries/hakuna-matata.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/no-worries/hakuna-matata.md b/english/no-worries/hakuna-matata.md index ca5912ab83..b3915b4d0b 100644 --- a/english/no-worries/hakuna-matata.md +++ b/english/no-worries/hakuna-matata.md @@ -1 +1 @@ -It means no worries !!!!! [Go back] (english/marshmallow.md) \ No newline at end of file +It means no worries !!!!! [Go back] (../marshmallow.md) \ No newline at end of file From 00b287992cbec76648f6de033e2e82c691c78e2a Mon Sep 17 00:00:00 2001 From: Gaurav Sharma Date: Sun, 25 Oct 2015 21:43:25 -0400 Subject: [PATCH 1417/5486] Add link for hakuna-matata.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index dc334ec808..f06987f184 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -328,6 +328,8 @@ Do you: [Switch on your laptop and..](netflix/netflix.md) +[Lion King ](no-worries/hakuna-matata.md) + [Perform some magic](magic/magic.md) [Raise your self so high](khudi/buland_very_high.md) From c4d779050604a7cba82ef0704c4e848235786548 Mon Sep 17 00:00:00 2001 From: Cory Kane Date: Sun, 25 Oct 2015 22:55:39 -0700 Subject: [PATCH 1418/5486] Add option to browse reddit to story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index dc334ec808..d2cf8a1bda 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -529,6 +529,8 @@ Click [here](young/young.md) to listen to music. [Attack it with a lightsaber](lightsaber/lightsaber.md) +[Decide to browse Reddit instead](https://www.reddit.com/) + [It's time to take a vacation] (licked-cat/vacation.md) And then you realize that Burning Man is over, so no real vacations :( From c8e7f2f5d41530d3608175518a7266b8821ae2fe Mon Sep 17 00:00:00 2001 From: Mike Tubis Date: Mon, 26 Oct 2015 10:00:16 +0100 Subject: [PATCH 1419/5486] changed language.md --- Polish/ptasieMleczko.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polish/ptasieMleczko.md b/Polish/ptasieMleczko.md index 097eec07a7..46627e6dd1 100644 --- a/Polish/ptasieMleczko.md +++ b/Polish/ptasieMleczko.md @@ -1,6 +1,6 @@ Pewnego ranka obudziłeś się w dziwnym pokoju ze ścianami z ptaskiego mleczka. -Okazało się również, że masz na sobie niewygodną kurtkę... +Okazało się również, że masz na sobie niewygodną kurtkę i nie masz na sobie spodni... Co robisz? From 25735513e322b81cb0ee2f400c903efe03fceaec Mon Sep 17 00:00:00 2001 From: slesla Date: Mon, 26 Oct 2015 12:53:28 +0000 Subject: [PATCH 1420/5486] Shake Hansel, shake --- english/virtualreality/oculus.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/virtualreality/oculus.md b/english/virtualreality/oculus.md index db178e4895..19b7c2351b 100644 --- a/english/virtualreality/oculus.md +++ b/english/virtualreality/oculus.md @@ -19,4 +19,6 @@ He's in the exact same position as he was yesterday. You walk up to Hansel and start to ask him what happened, but he does not answer. -It is then that you notice a yellow exclamation point above his head! \ No newline at end of file +It is then that you notice a yellow exclamation point above his head! + +I was sure he went to a denial state. I only had one choice... shake him. Shake Hansel, shake! \ No newline at end of file From 31274eac12c75e605dddcd75916ee5f326bb8a6f Mon Sep 17 00:00:00 2001 From: VY Date: Mon, 26 Oct 2015 20:56:57 +0300 Subject: [PATCH 1421/5486] Add sing option with sveotphor song --- russian/light-fire/sing/sing.md | 2 ++ russian/light-fire/sing/svetophor/svetophor.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 russian/light-fire/sing/svetophor/svetophor.md diff --git a/russian/light-fire/sing/sing.md b/russian/light-fire/sing/sing.md index 1f75581e01..6eab2a0eb3 100644 --- a/russian/light-fire/sing/sing.md +++ b/russian/light-fire/sing/sing.md @@ -11,3 +11,5 @@ [Летели облакааа...лалалалалалала](oblaka/oblaka.md) ["Это не шутки, мы встретились в маршрутке..."](marshrutka/marshrutka.md) + +["Все бегут бегут бегут бегут бегут бегут бегут, а он им светит..."](svetophor/svetophor.md) diff --git a/russian/light-fire/sing/svetophor/svetophor.md b/russian/light-fire/sing/svetophor/svetophor.md new file mode 100644 index 0000000000..dfe5b03d81 --- /dev/null +++ b/russian/light-fire/sing/svetophor/svetophor.md @@ -0,0 +1,2 @@ +Через некоторое время Вы понимаете что Вы не один такой в этом месте. + From 67221450ab9ddebb7ee8f4d14eac0694f9c452bf Mon Sep 17 00:00:00 2001 From: bynumjj Date: Mon, 26 Oct 2015 12:12:39 -0700 Subject: [PATCH 1422/5486] Add "prostate" story and link to it on marshmallow page. --- english/marshmallow.md | 12 +++++++----- english/prostate/prostate.md | 5 +++++ 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 english/prostate/prostate.md diff --git a/english/marshmallow.md b/english/marshmallow.md index dc334ec808..204b59d005 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -115,7 +115,7 @@ Something lightly brushes the back of your neck, sending a chill down your spine Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. -Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air +Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air for alien life forms. When you look away, a marshmallow hand attempts to grab the lighter. @@ -146,7 +146,7 @@ A soft echo of a torrent is fading from far... I felt a sudden ease of mind. -"Ok", I said to myself, "I need to get +"Ok", I said to myself, "I need to get [out of here](outta-here/outta-here.md)" "But first I must remember the magic spell needed to open the enchanted door!" @@ -539,6 +539,8 @@ And then you realize that Burning Man is over, so no real vacations :( [Story of DKER](DKER/DKER.md) +[Get your prostate checked](prostate/prostate.md) + If you eat a lot, you should also [exercise](exercise/exercise.md) A quick brown fox jumps over the lazy dog! @@ -549,7 +551,7 @@ A quick brown fox jumps over the lazy dog! This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. -You decide that you do not want to visit the miracle man. [You check your +You decide that you do not want to visit the miracle man. [You check your phone to find something else to do](check-phone/check-phone.md). And you plug-in to [play some music](play-music/playmusic.md). @@ -559,8 +561,8 @@ The next thing you know, you're up all night in Croatia mixing a new playlist You remember the story of a [robot](happy-robot/happy-robot.md). Wondering how you got here, you feel a strange tingling in your hands, almost as if -they are responding to your new surroundings. You feel an urge to gesture forward, -and as you do a large pink marshmallow shoots out of your hand into the wall before you. +they are responding to your new surroundings. You feel an urge to gesture forward, +and as you do a large pink marshmallow shoots out of your hand into the wall before you. [Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) [The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) diff --git a/english/prostate/prostate.md b/english/prostate/prostate.md new file mode 100644 index 0000000000..45489be368 --- /dev/null +++ b/english/prostate/prostate.md @@ -0,0 +1,5 @@ +“It’s a damn shame when a man can’t get a few hours of sleep without having to get up to pee,” you think as you put on your slippers and shuffle to the bathroom. Ugh, that padded vinyl toilet seat is cold. You realize it’s been a while since you had your prostate checked. Do you: + +[go back to sleep](../go-back-to-sleep/go-back-to-sleep.md) + +[call a doctor](../call-a-doctor/doctor.md) \ No newline at end of file From 5acc55b8c071f21a36f50bd71cae1160f77bd85d Mon Sep 17 00:00:00 2001 From: Avram Gottschlich Date: Mon, 26 Oct 2015 17:23:04 -0400 Subject: [PATCH 1423/5486] edit grammar, word choice --- english/the-slayer/marshmallow-slayer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/the-slayer/marshmallow-slayer.md b/english/the-slayer/marshmallow-slayer.md index c1a2eaccfa..0387c7dee9 100644 --- a/english/the-slayer/marshmallow-slayer.md +++ b/english/the-slayer/marshmallow-slayer.md @@ -1,4 +1,4 @@ -Once upon a time it was the most terrible marshmallow, he slain too many of poor little marshmallows. +Once upon a time it was the most terrible marshmallow, who slew very many poor little marshmallows. But for fortune it was a heroic marshmallow called Freddie. Lets look at how he saved the little marshmallows: From 3451fe86751755c2a28d239c29f6e027ac26b15f Mon Sep 17 00:00:00 2001 From: Avram Gottschlich Date: Mon, 26 Oct 2015 17:27:23 -0400 Subject: [PATCH 1424/5486] Added a line --- english/licked-cat/vacation.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/licked-cat/vacation.md b/english/licked-cat/vacation.md index 36ecd8b6a1..639d76a9af 100644 --- a/english/licked-cat/vacation.md +++ b/english/licked-cat/vacation.md @@ -1 +1,3 @@ It's time to take a vacation [here] (http://freguesiariofrio.pt/) + +Enjoy the trip! From 5da3f1c4edc52034878c37d5bcc97a1abd49928c Mon Sep 17 00:00:00 2001 From: flo Date: Mon, 26 Oct 2015 23:23:08 +0100 Subject: [PATCH 1425/5486] Add a new French part of the story about the toad, the sirena and human voices --- french/manger/trou/reveille/sirene/crapaud.md | 7 +++++++ french/manger/trou/reveille/surprise.md | 6 ++++++ french/manger/trou/reveille/voix-humaines/mystere.md | 2 ++ 3 files changed, 15 insertions(+) create mode 100644 french/manger/trou/reveille/sirene/crapaud.md create mode 100644 french/manger/trou/reveille/voix-humaines/mystere.md diff --git a/french/manger/trou/reveille/sirene/crapaud.md b/french/manger/trou/reveille/sirene/crapaud.md new file mode 100644 index 0000000000..f7ac3225e6 --- /dev/null +++ b/french/manger/trou/reveille/sirene/crapaud.md @@ -0,0 +1,7 @@ +Que sa voix est douce! Vous ne pouvez pas résister, vos lèvres sont attirées irrésistiblement vers celles de la sirène. + +Vous avez perdu le contrôle, les yeux clos, votre bouche contre la sienne, vous avez d'un coup une sensation bizarre. + +En effet, plus de sirène, le vieux crapaud est de retour juste sous votre nez, + +vous regardant d'un oeil satisfait. Il vous a berné, vous avez bel et bien embrassé le batrassien... \ No newline at end of file diff --git a/french/manger/trou/reveille/surprise.md b/french/manger/trou/reveille/surprise.md index b70b519b8e..1f833a28dc 100644 --- a/french/manger/trou/reveille/surprise.md +++ b/french/manger/trou/reveille/surprise.md @@ -10,3 +10,9 @@ En guise de propulsion une colonie de loutre vous rend service. Au loin vous entendez des voix humaines; plus proche de vous la sirène vous sourie tendrement. Que faites vous ? + +[Le concert est merveilleux, je me rapproche](sirene/crapaud.md) + +[Je m'éloigne, avec les sirènes, on connait la musique....](voix-humaines/mystere.md) + + diff --git a/french/manger/trou/reveille/voix-humaines/mystere.md b/french/manger/trou/reveille/voix-humaines/mystere.md new file mode 100644 index 0000000000..4b1ab91e1a --- /dev/null +++ b/french/manger/trou/reveille/voix-humaines/mystere.md @@ -0,0 +1,2 @@ +Vous décidez de traquer les voix humaines. Mais d'ou viennent t'elles? +Vous vous faites discret, et vous rapprochez à pas de loup. \ No newline at end of file From 872afa90363060e55208dcd7e5abd948f8ce173e Mon Sep 17 00:00:00 2001 From: flo Date: Tue, 27 Oct 2015 00:29:28 +0100 Subject: [PATCH 1426/5486] Fix tipo in mystere.md --- french/manger/trou/reveille/voix-humaines/mystere.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/french/manger/trou/reveille/voix-humaines/mystere.md b/french/manger/trou/reveille/voix-humaines/mystere.md index 4b1ab91e1a..ff0a15372a 100644 --- a/french/manger/trou/reveille/voix-humaines/mystere.md +++ b/french/manger/trou/reveille/voix-humaines/mystere.md @@ -1,2 +1,2 @@ -Vous décidez de traquer les voix humaines. Mais d'ou viennent t'elles? +Vous décidez de traquer les voix humaines. Mais d'oú viennent-elles? Vous vous faites discret, et vous rapprochez à pas de loup. \ No newline at end of file From 400225ef92200c059ce516f8f9970b0d80278c69 Mon Sep 17 00:00:00 2001 From: nbaez Date: Mon, 26 Oct 2015 23:47:06 -0400 Subject: [PATCH 1427/5486] Add histories --- espanol/canudos.md | 4 ++++ espanol/cielo/cielo.md | 6 ++++++ espanol/mujeres/mujeres.md | 6 ++++++ 3 files changed, 16 insertions(+) create mode 100644 espanol/cielo/cielo.md create mode 100644 espanol/mujeres/mujeres.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 4660b0c027..4b113c2a25 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -70,4 +70,8 @@ el Consejero: [Y de repente se acordo y sintion miedo...](kraken/kraken.md) +[Organizó sus tropas y mandó a las mujeres y niños para sus casas](mujeres/mujeres.md) + +[Vió de repente en el cielo una luz brillante que iluminó como un sol el campo de batalla..](cielo/cielo.md) + diff --git a/espanol/cielo/cielo.md b/espanol/cielo/cielo.md new file mode 100644 index 0000000000..5a6f43ea36 --- /dev/null +++ b/espanol/cielo/cielo.md @@ -0,0 +1,6 @@ + +Muchos soldados quedaron petrificados, pensaban que era el fin del mundo.., +otros pensaron que los enemigos habian creado una nueva arma para confundirlos, +cuando el capitán pudo percatarse se dió cuenta que: + + diff --git a/espanol/mujeres/mujeres.md b/espanol/mujeres/mujeres.md new file mode 100644 index 0000000000..3b9295d0c7 --- /dev/null +++ b/espanol/mujeres/mujeres.md @@ -0,0 +1,6 @@ + +Las mujeres no querían irse y dejar a sus esposos. El general tuvo que ordenar a +sus soldados retirar a las mujeres histéricas al ver el peligro que se avecinaba. + + + From 914fcfe7daa139845b9c28b52e91977519fff88e Mon Sep 17 00:00:00 2001 From: nbaez Date: Tue, 27 Oct 2015 00:13:13 -0400 Subject: [PATCH 1428/5486] =?UTF-8?q?A=C3=B1adir=20soldados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/canudos.md | 2 ++ espanol/soldados/soldados.md | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 espanol/soldados/soldados.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 4b113c2a25..14edc2d02a 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -74,4 +74,6 @@ el Consejero: [Vió de repente en el cielo una luz brillante que iluminó como un sol el campo de batalla..](cielo/cielo.md) +[Levanta su mano derecha, con el indice señala al ejército enemigo y les dice a sus soldados...](soldados/soldados.md) + diff --git a/espanol/soldados/soldados.md b/espanol/soldados/soldados.md new file mode 100644 index 0000000000..8acd08749d --- /dev/null +++ b/espanol/soldados/soldados.md @@ -0,0 +1,8 @@ + +"En este tipo de situaciones es que los hombres demuestran su valía, +nos toca ahora demostrarles a nuestros antepasados, que ofrendaron su vida +en pos de que nuestro pueblo, que sus hijos heredaron su estirpe grandiosa". + +[Luego, uno de los soldados empezó a rezar.](../rezando/rezando.md) + + From 06eb157a7fc09de6b8845f400361afd667fdf97a Mon Sep 17 00:00:00 2001 From: Kyle Brazil Date: Mon, 26 Oct 2015 21:50:49 -0700 Subject: [PATCH 1429/5486] Added new directory and file 'youre-fine'. Updated and added to '132-days-ago'. --- english/132-days-ago/132-days-ago.md | 6 ++++-- english/marshmallow.md | 10 +++++----- english/youre-fine/youre-fine.md | 3 +++ 3 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 english/youre-fine/youre-fine.md diff --git a/english/132-days-ago/132-days-ago.md b/english/132-days-ago/132-days-ago.md index c93561b5b1..e2f5238731 100644 --- a/english/132-days-ago/132-days-ago.md +++ b/english/132-days-ago/132-days-ago.md @@ -1,3 +1,5 @@ -132 days ago you went to Tesco to buy marshmallow +132 days ago you went to Tesco to buy marshmallow but end up buying chocolate because you had not enough money to buy marshmallow. -or a pack of four donuts. \ No newline at end of file +or a pack of four donuts. + +You decide to [eat the chocolate anyway.](./youre-fine/youre-fine.md) diff --git a/english/marshmallow.md b/english/marshmallow.md index 7db35d6f02..c367822add 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -113,7 +113,7 @@ Something lightly brushes the back of your neck, sending a chill down your spine Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. -Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air +Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air for alien life forms. When you look away, a marshmallow hand attempts to grab the lighter. @@ -144,7 +144,7 @@ A soft echo of a torrent is fading from far... I felt a sudden ease of mind. -"Ok", I said to myself, "I need to get +"Ok", I said to myself, "I need to get [out of here](outta-here/outta-here.md)" "But first I must remember the magic spell needed to open the enchanted door!" @@ -547,7 +547,7 @@ A quick brown fox jumps over the lazy dog! This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. -You decide that you do not want to visit the miracle man. [You check your +You decide that you do not want to visit the miracle man. [You check your phone to find something else to do](check-phone/check-phone.md). And you plug-in to [play some music](play-music/playmusic.md). @@ -557,8 +557,8 @@ The next thing you know, you're up all night in Croatia mixing a new playlist You remember the story of a [robot](happy-robot/happy-robot.md). Wondering how you got here, you feel a strange tingling in your hands, almost as if -they are responding to your new surroundings. You feel an urge to gesture forward, -and as you do a large pink marshmallow shoots out of your hand into the wall before you. +they are responding to your new surroundings. You feel an urge to gesture forward, +and as you do a large pink marshmallow shoots out of your hand into the wall before you. [Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) [The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) diff --git a/english/youre-fine/youre-fine.md b/english/youre-fine/youre-fine.md new file mode 100644 index 0000000000..5cd027b21b --- /dev/null +++ b/english/youre-fine/youre-fine.md @@ -0,0 +1,3 @@ +Whew, you're fine. It was just chocolate. + +[Back to the room...](./English/marshmallow.md) From d89910185f60d0f4ad21dd600754e755c6bd65ec Mon Sep 17 00:00:00 2001 From: Kyle Brazil Date: Mon, 26 Oct 2015 21:56:29 -0700 Subject: [PATCH 1430/5486] Fixed link issue with 'youre-fine'. --- english/youre-fine/youre-fine.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/youre-fine/youre-fine.md b/english/youre-fine/youre-fine.md index 5cd027b21b..eb6d2f5f2c 100644 --- a/english/youre-fine/youre-fine.md +++ b/english/youre-fine/youre-fine.md @@ -1,3 +1,3 @@ Whew, you're fine. It was just chocolate. -[Back to the room...](./English/marshmallow.md) +[Back to the room...](../marshmallow.md) From f370a4d4bb3885b113ff8b44610102062e840120 Mon Sep 17 00:00:00 2001 From: Kyle Brazil Date: Mon, 26 Oct 2015 22:01:49 -0700 Subject: [PATCH 1431/5486] Fixed linked issue in '132-days-ago'. --- english/132-days-ago/132-days-ago.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/132-days-ago/132-days-ago.md b/english/132-days-ago/132-days-ago.md index e2f5238731..e0b1be923d 100644 --- a/english/132-days-ago/132-days-ago.md +++ b/english/132-days-ago/132-days-ago.md @@ -2,4 +2,4 @@ but end up buying chocolate because you had not enough money to buy marshmallow. or a pack of four donuts. -You decide to [eat the chocolate anyway.](./youre-fine/youre-fine.md) +You decide to [eat the chocolate anyway.](../youre-fine/youre-fine.md) From 22257bbbb7852e218359996037ec9f43c82db5ab Mon Sep 17 00:00:00 2001 From: MrAmmar Date: Tue, 27 Oct 2015 06:32:17 +0000 Subject: [PATCH 1432/5486] Add new page speculate.md --- arabic/learn/learn.md | 1 + 1 file changed, 1 insertion(+) diff --git a/arabic/learn/learn.md b/arabic/learn/learn.md index 5b33475d15..ba36e3d7f3 100644 --- a/arabic/learn/learn.md +++ b/arabic/learn/learn.md @@ -1,3 +1,4 @@ اذا قررت ان تكمل الالتعلم فانه عليك ان تبحث عن موضوع مكمل لموضوع السياق الماضي، هل تعرف لماذا؟ لانه يجب عليك الاستفاده من السياق الماضي وتطوير قدراتك فيه لذا ماذا تتوقع ان تفعل الان؟ قال صلى الله عليه وسلم من سلك طريقاً يلتمس فيه علماً سهل الله له طريقاً الى الجنة +[و لماذا التعلم ](learn\whylearning\speculate.md) From 0f91e5792831621b958a4e4585bbcbc9f8cecc18 Mon Sep 17 00:00:00 2001 From: MrAmmar Date: Tue, 27 Oct 2015 06:39:32 +0000 Subject: [PATCH 1433/5486] Create speculate.md My contribution to this community. --- arabic/learn/whylearning/speculate.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 arabic/learn/whylearning/speculate.md diff --git a/arabic/learn/whylearning/speculate.md b/arabic/learn/whylearning/speculate.md new file mode 100644 index 0000000000..1e9ea268a9 --- /dev/null +++ b/arabic/learn/whylearning/speculate.md @@ -0,0 +1,5 @@ +كم من الوقت سنتعلم ؟ أسنتوقف بعد حصولنا مبتغانا؟ +طبعا لا +فطلب العلم نمط حياة ملئ بالفرح و العمل الجاد +فكل يوم جديد ما هو إلا فرصة لمعارف جديدة +لذلك فلنتواضع و نتسامح فكلنا بشر و لنشارك ما تعلمنا مع غيرنا From 705e305801c6e450ff75e7d21f9591716b1214a8 Mon Sep 17 00:00:00 2001 From: Alex Johnson Date: Tue, 27 Oct 2015 10:38:52 +0300 Subject: [PATCH 1434/5486] Add another character to the puke option. --- english/karaoke/karaoke/puke-on-the-mike/puke-on-the-mike.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/karaoke/karaoke/puke-on-the-mike/puke-on-the-mike.md b/english/karaoke/karaoke/puke-on-the-mike/puke-on-the-mike.md index 8657c44e65..cffb6cc81b 100644 --- a/english/karaoke/karaoke/puke-on-the-mike/puke-on-the-mike.md +++ b/english/karaoke/karaoke/puke-on-the-mike/puke-on-the-mike.md @@ -1,2 +1,3 @@ You have had so much beer that you can't hold it down anymore -and puke on the mike while singing karaoke. \ No newline at end of file +and puke on the mike while singing karaoke. The drummer you've +brought along for backup finishes your set with a "bah dum chin." \ No newline at end of file From d0746685dd2af31b68a9391edabea16d06f1f79f Mon Sep 17 00:00:00 2001 From: Alex Johnson Date: Tue, 27 Oct 2015 10:42:08 +0300 Subject: [PATCH 1435/5486] Second puke add. --- english/karaoke/karaoke/puke-on-the-mike/puke-on-the-mike.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/karaoke/karaoke/puke-on-the-mike/puke-on-the-mike.md b/english/karaoke/karaoke/puke-on-the-mike/puke-on-the-mike.md index cffb6cc81b..28513cefce 100644 --- a/english/karaoke/karaoke/puke-on-the-mike/puke-on-the-mike.md +++ b/english/karaoke/karaoke/puke-on-the-mike/puke-on-the-mike.md @@ -1,3 +1,3 @@ You have had so much beer that you can't hold it down anymore and puke on the mike while singing karaoke. The drummer you've -brought along for backup finishes your set with a "bah dum chin." \ No newline at end of file +brought along for backup finishes your set with "bah dum chin." \ No newline at end of file From e8ec9ddffb6938af07ce3f7f570c406ac0f470e8 Mon Sep 17 00:00:00 2001 From: Sinrok Kim Date: Tue, 27 Oct 2015 17:55:39 +0900 Subject: [PATCH 1436/5486] add new option(rush to the wall) --- korean/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/korean/marshmallow.md b/korean/marshmallow.md index 2bfdf787c7..5535a546b3 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -30,4 +30,6 @@ [큰소리로 엄마를 부른다](call-mom/call-mom.md) -[책을 읽는다] (read/read.md)? \ No newline at end of file +[책을 읽는다] (read/read.md)? + +[벽으로 돌진한다](rush/rush.md) \ No newline at end of file From 9c58384cb7cc8aa4fd2da6e864bdbcce5db6aa8a Mon Sep 17 00:00:00 2001 From: Sinrok Kim Date: Tue, 27 Oct 2015 18:13:19 +0900 Subject: [PATCH 1437/5486] update rush.md --- korean/rush/rush.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 korean/rush/rush.md diff --git a/korean/rush/rush.md b/korean/rush/rush.md new file mode 100644 index 0000000000..1a18a25553 --- /dev/null +++ b/korean/rush/rush.md @@ -0,0 +1,3 @@ +출구를 찾을 수 없어 벽으로 돌진했지만 계속 튕겨져 나온다. + +[처음으로 돌아간다](../marshmallow.md) \ No newline at end of file From 00e7a83658597d11030dd9f052878e39ffd034d2 Mon Sep 17 00:00:00 2001 From: Modi Date: Tue, 27 Oct 2015 22:47:44 +0530 Subject: [PATCH 1438/5486] Adding my story for few good men --- english/few-good-men/fgm.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/few-good-men/fgm.md diff --git a/english/few-good-men/fgm.md b/english/few-good-men/fgm.md new file mode 100644 index 0000000000..d5f47a4a42 --- /dev/null +++ b/english/few-good-men/fgm.md @@ -0,0 +1,2 @@ +[Wiki link to movie few good men](https://en.wikipedia.org/wiki/A_Few_Good_Men) Check it out + From e085ec0459064ca0496d4f5dafc678dec554b50c Mon Sep 17 00:00:00 2001 From: Modi Date: Tue, 27 Oct 2015 22:57:58 +0530 Subject: [PATCH 1439/5486] Adding my story link in marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index dc334ec808..b828decd71 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -566,3 +566,5 @@ and as you do a large pink marshmallow shoots out of your hand into the wall bef [The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) All in a hard days work, do you play some [music](play-music/playmusic.md). + +Honesty in a hard way [Watch it](few-good-men/fgm.md) \ No newline at end of file From 9507daf6353425afa82cf276f98c5f23f0a99172 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 27 Oct 2015 23:10:41 +0530 Subject: [PATCH 1440/5486] add text and link to marshmallow-wizard.md --- english/marshmallow-wizard/marshmallow-wizard.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow-wizard/marshmallow-wizard.md b/english/marshmallow-wizard/marshmallow-wizard.md index c6d4f67857..dcf64ff173 100644 --- a/english/marshmallow-wizard/marshmallow-wizard.md +++ b/english/marshmallow-wizard/marshmallow-wizard.md @@ -1,4 +1,6 @@ Spawning thousands and thousands of beautiful marshmallows of every color, you revel in your power and swear to use it for good—for example, to cure world hunger with unlimited sugary treats—rather than for evil—for example, -to buffet your enemies with a barrage of soft multicolored projectiles. \ No newline at end of file +to buffet your enemies with a barrage of soft multicolored projectiles. + +And with your new powers you [imagine](https://www.youtube.com/watch?v=DVg2EJvvlF8) a world... \ No newline at end of file From 222844030bee0c5e23fe20ee62cd7eb3636b7edf Mon Sep 17 00:00:00 2001 From: moscowjh Date: Tue, 27 Oct 2015 19:16:59 -0400 Subject: [PATCH 1441/5486] Add line about "what is a marshmallow anyway?" --- english/marshmallow.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index dc334ec808..4aa19b8c33 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -4,6 +4,8 @@ One morning, you wake up in a strange room with marshmallows for walls. +Marshmallows smell funny. What is a marshmallow anyway? + *(Must be a Tuesday.)* Or a Wednesday...Thursday...maybe even a Friday. @@ -115,7 +117,7 @@ Something lightly brushes the back of your neck, sending a chill down your spine Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. -Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air +Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air for alien life forms. When you look away, a marshmallow hand attempts to grab the lighter. @@ -146,7 +148,7 @@ A soft echo of a torrent is fading from far... I felt a sudden ease of mind. -"Ok", I said to myself, "I need to get +"Ok", I said to myself, "I need to get [out of here](outta-here/outta-here.md)" "But first I must remember the magic spell needed to open the enchanted door!" @@ -549,7 +551,7 @@ A quick brown fox jumps over the lazy dog! This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. -You decide that you do not want to visit the miracle man. [You check your +You decide that you do not want to visit the miracle man. [You check your phone to find something else to do](check-phone/check-phone.md). And you plug-in to [play some music](play-music/playmusic.md). @@ -559,8 +561,8 @@ The next thing you know, you're up all night in Croatia mixing a new playlist You remember the story of a [robot](happy-robot/happy-robot.md). Wondering how you got here, you feel a strange tingling in your hands, almost as if -they are responding to your new surroundings. You feel an urge to gesture forward, -and as you do a large pink marshmallow shoots out of your hand into the wall before you. +they are responding to your new surroundings. You feel an urge to gesture forward, +and as you do a large pink marshmallow shoots out of your hand into the wall before you. [Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) [The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) From 1e2b92699d9aa37307444770720b5918ab3408ce Mon Sep 17 00:00:00 2001 From: Bingxin Zhang Date: Wed, 28 Oct 2015 00:17:49 -0500 Subject: [PATCH 1442/5486] Update zzz.mb I put some random stuff to the story. --- Chinese/ZZB/zzb.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Chinese/ZZB/zzb.md b/Chinese/ZZB/zzb.md index 13fba31580..1dc116e97a 100644 --- a/Chinese/ZZB/zzb.md +++ b/Chinese/ZZB/zzb.md @@ -10,3 +10,5 @@ [你可知月光宝盒？](../Xinyang/MyLoveStory.md) +紫霞仙子说： +人都是失去了才懂得珍惜。 From 651ec7fe69020bf0b24f81f4a8b550dca5395f55 Mon Sep 17 00:00:00 2001 From: Mark Alexander Date: Wed, 28 Oct 2015 00:19:53 -0700 Subject: [PATCH 1443/5486] Add 'Do you:' to watch the new star wars trailer --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index dc334ec808..4840f48d74 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -174,6 +174,8 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: +[Watch the new Star Wars trailer](https://www.youtube.com/watch?v=sGbxmsDFVnE) + [Live Tweet the situation](tweet-it/tweet-it.md) [Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) From ede05fe0182f332d146f5d942f159e5ed6c45d71 Mon Sep 17 00:00:00 2001 From: LaGracia Date: Wed, 28 Oct 2015 22:19:34 +0700 Subject: [PATCH 1444/5486] Add further options to lightsaber choice --- english/lightsaber-falls/lightsaber-falls.md | 5 +++ english/lightsaber-falls/shoot.md | 38 ++++++++++++++++++++ english/lightsaber-falls/wampa.md | 4 +++ 3 files changed, 47 insertions(+) create mode 100644 english/lightsaber-falls/lightsaber-falls.md create mode 100644 english/lightsaber-falls/shoot.md create mode 100644 english/lightsaber-falls/wampa.md diff --git a/english/lightsaber-falls/lightsaber-falls.md b/english/lightsaber-falls/lightsaber-falls.md new file mode 100644 index 0000000000..8ef132f3d1 --- /dev/null +++ b/english/lightsaber-falls/lightsaber-falls.md @@ -0,0 +1,5 @@ +But as you hurry to smoosh through the slowly closing hole in the wall, the lightsaber clatters to the floor. + +[You leap out nimbly and gaze back at the weapon](english/wampa.md). + +[You try to regain the weapon but only get coated in a sticky glaze of whiteness](english/shoot.md). diff --git a/english/lightsaber-falls/shoot.md b/english/lightsaber-falls/shoot.md new file mode 100644 index 0000000000..b9c946d04f --- /dev/null +++ b/english/lightsaber-falls/shoot.md @@ -0,0 +1,38 @@ +Sadly, you don't possess enough midi-chlorians to make you truly strong with the Force. You'll have to leave that fancy +weapon behind and go with what you've got. + +As you clamber awkwardly out the other side of the goo, you hear a smug voice: + +"Koona t'chuta, Solo? + +Agh. You knew you couldn't outrun him. You just didn't think he'd find you here. + +"Yes, Greedo. As a matter of fact, I'm trying to get out of this freaky marshmallow house. Tell Jabba I've got his +"money. + +"Soong peetch alay! + +And then he says some stuff you don't understand without subtitles, but you get the gist of the message, so you reassure +him: "Yeah, but this time I've got the money." + +He tries to bribe you, thinking you'd be desperate enough to hand him the payment (even if you really did have it) right +here, outside a melting marshmallow mansion. You chuckle. "I don't have it with me. Tell Jabba - " + +But he cuts you off and insults you, and now you're seriously annoyed. Your left leg is still inside the collapsing +candy house, for pete's sake! You're in a weird lunging position affording no mood to be humoring a third-rate galactic +bounty hunter. Trying to reach for your holster, you grumble: "Even I get boarded sometimes. Do you think I had a +choice?" + +He says something about Jabba again, a name he regularly uses to threaten you with bodily harm. Or even worse: to +threaten the Falcon with bodily harm. You growl, "Over my dead body!" + +He is so self-satisfied he thinks you've given him the punchline. That's the idea, he retorts. He's been looking forward +to this for a long time. + +You reply, "Yes, I'll bet you have." + +Do you: + +Shoot first? + +Wait until he shoots, and then shoot back with better aim? diff --git a/english/lightsaber-falls/wampa.md b/english/lightsaber-falls/wampa.md new file mode 100644 index 0000000000..cef4c0d959 --- /dev/null +++ b/english/lightsaber-falls/wampa.md @@ -0,0 +1,4 @@ +The Force is strong within you. As you turn to stride away from the melting marshmallow mansion, you hear a blood- +curdling roar. + +You run into something, and it's not just the cold. From e08d26bbf7b5887f38507980f39da96751a2cbbd Mon Sep 17 00:00:00 2001 From: LaGracia Date: Wed, 28 Oct 2015 22:50:56 +0700 Subject: [PATCH 1445/5486] Fixed links to the two options on the page --- english/lightsaber-falls/lightsaber-falls.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/english/lightsaber-falls/lightsaber-falls.md b/english/lightsaber-falls/lightsaber-falls.md index 8ef132f3d1..0fb01ad269 100644 --- a/english/lightsaber-falls/lightsaber-falls.md +++ b/english/lightsaber-falls/lightsaber-falls.md @@ -1,5 +1,9 @@ +You slice through the marshmallow man with your lightsaber. +Luckily for you, the heat from it cooks the marshmallows to perfection. +You now have a tasty snack and a way out of the house. + But as you hurry to smoosh through the slowly closing hole in the wall, the lightsaber clatters to the floor. -[You leap out nimbly and gaze back at the weapon](english/wampa.md). +[You leap out nimbly and gaze back at the weapon](https://github.com/LaGracia/create-your-own-adventure/blob/lightsaber-falls/english/lightsaber-falls/wampa.md). -[You try to regain the weapon but only get coated in a sticky glaze of whiteness](english/shoot.md). +[You try to regain the weapon but only get coated in a sticky glaze of whiteness](https://github.com/LaGracia/create-your-own-adventure/blob/lightsaber-falls/english/lightsaber-falls/shoot.md). \ No newline at end of file From 631a3deeb508e8c6d7ffe43f3b2eebe6314e81eb Mon Sep 17 00:00:00 2001 From: LaGracia Date: Wed, 28 Oct 2015 22:55:24 +0700 Subject: [PATCH 1446/5486] Added a line so the story makes sense --- english/lightsaber-falls/wampa.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/lightsaber-falls/wampa.md b/english/lightsaber-falls/wampa.md index cef4c0d959..dc4890ae06 100644 --- a/english/lightsaber-falls/wampa.md +++ b/english/lightsaber-falls/wampa.md @@ -1,4 +1,4 @@ -The Force is strong within you. As you turn to stride away from the melting marshmallow mansion, you hear a blood- +The Force is strong within you. You stretch out your hand and the lightsaber flies up into it. As you turn to stride away from the melting marshmallow mansion, you hear a blood- curdling roar. -You run into something, and it's not just the cold. +You run into something, and it's not just the cold. \ No newline at end of file From 67f3785f2ebb8934375c98875407d31e15617004 Mon Sep 17 00:00:00 2001 From: LaGracia Date: Wed, 28 Oct 2015 23:04:14 +0700 Subject: [PATCH 1447/5486] Fixed punctuation errors --- english/lightsaber-falls/shoot.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/english/lightsaber-falls/shoot.md b/english/lightsaber-falls/shoot.md index b9c946d04f..1b81420497 100644 --- a/english/lightsaber-falls/shoot.md +++ b/english/lightsaber-falls/shoot.md @@ -3,20 +3,19 @@ weapon behind and go with what you've got. As you clamber awkwardly out the other side of the goo, you hear a smug voice: -"Koona t'chuta, Solo? +"Koona t'chuta, Solo?" Agh. You knew you couldn't outrun him. You just didn't think he'd find you here. -"Yes, Greedo. As a matter of fact, I'm trying to get out of this freaky marshmallow house. Tell Jabba I've got his -"money. +"Yes, Greedo. As a matter of fact, I'm trying to get out of this freaky marshmallow house. Tell Jabba I've got his money." -"Soong peetch alay! +"Soong peetch alay!" And then he says some stuff you don't understand without subtitles, but you get the gist of the message, so you reassure him: "Yeah, but this time I've got the money." He tries to bribe you, thinking you'd be desperate enough to hand him the payment (even if you really did have it) right -here, outside a melting marshmallow mansion. You chuckle. "I don't have it with me. Tell Jabba - " +here, outside a melting mansion. You chuckle patronizingly. "I don't have it with me. Tell Jabba - " But he cuts you off and insults you, and now you're seriously annoyed. Your left leg is still inside the collapsing candy house, for pete's sake! You're in a weird lunging position affording no mood to be humoring a third-rate galactic From 6c700924853ca130d220e2f28f312f16cfd26dff Mon Sep 17 00:00:00 2001 From: w01f359 Date: Wed, 28 Oct 2015 13:41:29 -0400 Subject: [PATCH 1448/5486] Add monster to yoga session --- english/yoga/yoga.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/yoga/yoga.md b/english/yoga/yoga.md index e549477bac..7c50f20ab1 100644 --- a/english/yoga/yoga.md +++ b/english/yoga/yoga.md @@ -7,6 +7,8 @@ Going through the poses, you feel your body warm up and you feel the energy flow Calm music starts to play quietly from all directions. +Suddenly a large beast appears from the shadows and starts terrorizing the village. + You start becoming transcendent. [Goals of yoga](../yoga/goals/goals_of_yoga.md) From 2d5520837e8870ad320e7fe4fadf8f96b68ca91b Mon Sep 17 00:00:00 2001 From: Fede Date: Wed, 28 Oct 2015 14:23:20 -0600 Subject: [PATCH 1449/5486] Add Beatito's treason and the Consejero's death --- espanol/bailar/bailar.md | 4 +++- espanol/bailar/matar/matar.md | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 espanol/bailar/matar/matar.md diff --git a/espanol/bailar/bailar.md b/espanol/bailar/bailar.md index b78b133926..ea71af8f25 100644 --- a/espanol/bailar/bailar.md +++ b/espanol/bailar/bailar.md @@ -4,4 +4,6 @@ Saco la guitarra y empezo a charanguear mientras saltaba en una pata al grito de [Beatito empezo a abuschear al Consejero](abucheo/abucheo.md) -[Beatito sacó una pandereta y le acompañó cantando](musica/pandereta.md) \ No newline at end of file +[Beatito sacó una pandereta y le acompañó cantando](musica/pandereta.md) + +[Beatito decidió matar al consejero](matar/matar.md) \ No newline at end of file diff --git a/espanol/bailar/matar/matar.md b/espanol/bailar/matar/matar.md new file mode 100644 index 0000000000..41cc4c7291 --- /dev/null +++ b/espanol/bailar/matar/matar.md @@ -0,0 +1,4 @@ + +Beatito sacó un arma del bolsillo y mató a quemarropas al consejero. + +Luego, se preparó para recibir a todas las milicias, con quienes ya había acordado el traspaso del poder, y la construcción de una cómoda mansión para él y su joven esposa con vista a toda el desierto del Sertao. \ No newline at end of file From 0ed88e11a4951d520c560cef370f8a19e6c0bd8a Mon Sep 17 00:00:00 2001 From: Lauren Friedmann Date: Wed, 28 Oct 2015 18:48:01 -0400 Subject: [PATCH 1450/5486] type: docs add line about fairy godmother --- english/selfie/selfie.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/selfie/selfie.md b/english/selfie/selfie.md index c293e45f8d..5cf0166c4f 100644 --- a/english/selfie/selfie.md +++ b/english/selfie/selfie.md @@ -6,6 +6,8 @@ You use the fork as a make-shift selfie-stick and try again. Oh no! You are made of marshmallow! +Did your fairy godmother come back again? How did this happen? + This sudden revelation has now complicated the matter. You hate marshmallows but can you really hate yourself? From 90163fe599f66cc9892f76bc8a101a451b36ed45 Mon Sep 17 00:00:00 2001 From: Anna Date: Wed, 28 Oct 2015 21:45:06 -0700 Subject: [PATCH 1451/5486] zdjecie kurtki --- Polish/przygoda/jedzenie/najedzony/najedzony.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Polish/przygoda/jedzenie/najedzony/najedzony.md b/Polish/przygoda/jedzenie/najedzony/najedzony.md index 5fe5ee9238..f518cf4701 100644 --- a/Polish/przygoda/jedzenie/najedzony/najedzony.md +++ b/Polish/przygoda/jedzenie/najedzony/najedzony.md @@ -1 +1,3 @@ Stwierdzasz, że jesteś już najedzony. Z braku laku szczypiesz się w pośladek i budzisz w swoim własnym łóżku. +Zauwazasz jednak, ze wciaz masz na sobie owa niewygodna kurtke! +Stwierdzasz wiec, ze chcesz sie [przebrac](../../../ubranie/ubranie.md) \ No newline at end of file From bcd5d51ff884c8d5b2a6727457dac5a3a7e8a642 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 29 Oct 2015 15:24:15 +0000 Subject: [PATCH 1452/5486] Add option to go to New York to marshmallow.md, and created new-york/new-york.md --- english/marshmallow.md | 2 ++ english/new-york/new-york.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/new-york/new-york.md diff --git a/english/marshmallow.md b/english/marshmallow.md index dc334ec808..5a52b3293a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -515,6 +515,8 @@ Do you: [Attack marshmallow pikachu!](pikachu/pokeball.md) +"I have problems with my sleep," you realise. "I'm going to [move to New York](new-york/new-york.md)." + [Summon Dragons of the Khaleesi](dragons/fire-everywhere.md) [Bounce](bounce/bounce.md) diff --git a/english/new-york/new-york.md b/english/new-york/new-york.md new file mode 100644 index 0000000000..1ed8933081 --- /dev/null +++ b/english/new-york/new-york.md @@ -0,0 +1,3 @@ +# Moving to New York + +"This is no good!" you say, after two sleepless nights. "My insomnia hasn't relented at all." \ No newline at end of file From 7ab450da90c33172e48f4041f8bad3090cba1ac5 Mon Sep 17 00:00:00 2001 From: Stazia Tronboll Date: Thu, 29 Oct 2015 17:22:11 +0100 Subject: [PATCH 1453/5486] Create whole-new-world file --- .../whole-new-world/whole-new-world.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 english/coffee/procrastinate/whole-new-world/whole-new-world.md diff --git a/english/coffee/procrastinate/whole-new-world/whole-new-world.md b/english/coffee/procrastinate/whole-new-world/whole-new-world.md new file mode 100644 index 0000000000..cd2fb5fdd0 --- /dev/null +++ b/english/coffee/procrastinate/whole-new-world/whole-new-world.md @@ -0,0 +1,17 @@ +Alas, not even Twitter is safe from this madness! As you scroll through the +feed, you notice your awareness narrowing into the screen, losing any sense +of the rest of the world... + +...was the screen always that big?... + +...why are the pixels so close, now?... + +...was it really Twitter you were on? You don't remember switching, but you +don't feel the phone in your hand, anymore... + +Suddenly, you find yourself in device-which-may-or-may-not-be-your-phone, +looking out of the screen. Are you in a [Virtual +Reality?](./../../../virtualreality/oculus.md) Perhaps you have [fallen into +Minecraft.](./../../../you-are-in-minecraft/minecraft.md) + + From 61f4593acadc685185f23de74e6f28e3b4712cc7 Mon Sep 17 00:00:00 2001 From: Stazia Tronboll Date: Thu, 29 Oct 2015 17:23:29 +0100 Subject: [PATCH 1454/5486] Update procrastinate to contain whole-new-world link --- english/coffee/procrastinate/procrastinate.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/coffee/procrastinate/procrastinate.md b/english/coffee/procrastinate/procrastinate.md index bc40ee1aef..cf1939cd38 100644 --- a/english/coffee/procrastinate/procrastinate.md +++ b/english/coffee/procrastinate/procrastinate.md @@ -2,4 +2,5 @@ As you sit there and sip your coffee pondering over this huge marshmallow proble you strike upon a golden idea! Why hadn't you thought of this before? Procrastinate!! Well, That seems to work every time you want to avoid a problem. You flip out your phone and tap on that little twitter icon and voila! -Problems just disappear and you are in a whole new world! \ No newline at end of file +Problems just disappear and you are in a [whole new +world!](./whole-new-world/whole-new-world.md) From e37551486b64f1a2f66778ee4dacea0dad43d424 Mon Sep 17 00:00:00 2001 From: z7 Date: Fri, 30 Oct 2015 16:05:17 +0800 Subject: [PATCH 1455/5486] update YingJeouMa's lovers --- Chinese/YingJeouMa/YingJeouMa.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/YingJeouMa/YingJeouMa.md b/Chinese/YingJeouMa/YingJeouMa.md index 97c9f4c764..099b0053fc 100644 --- a/Chinese/YingJeouMa/YingJeouMa.md +++ b/Chinese/YingJeouMa/YingJeouMa.md @@ -1 +1,3 @@ -成為某國總統，禍國殃民。 \ No newline at end of file +成為某國總統，禍國殃民。 + +最喜歡三個人，一個是金溥蔥，一個是周美輕，另一個我不能說。 \ No newline at end of file From fb6e6905587e1a7d5e80211e5e0c1247453bdaed Mon Sep 17 00:00:00 2001 From: z7 Date: Fri, 30 Oct 2015 16:09:54 +0800 Subject: [PATCH 1456/5486] undo YingJeoMa's lovers --- Chinese/YingJeouMa/YingJeouMa.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Chinese/YingJeouMa/YingJeouMa.md b/Chinese/YingJeouMa/YingJeouMa.md index 099b0053fc..97c9f4c764 100644 --- a/Chinese/YingJeouMa/YingJeouMa.md +++ b/Chinese/YingJeouMa/YingJeouMa.md @@ -1,3 +1 @@ -成為某國總統，禍國殃民。 - -最喜歡三個人，一個是金溥蔥，一個是周美輕，另一個我不能說。 \ No newline at end of file +成為某國總統，禍國殃民。 \ No newline at end of file From 64857f5fb6ba3cb9f214b1bba57a5c5d025c5bee Mon Sep 17 00:00:00 2001 From: z7 Date: Fri, 30 Oct 2015 16:13:22 +0800 Subject: [PATCH 1457/5486] update YingJoeMa's Lovers --- Chinese/YingJeouMa/YingJeouMa.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/YingJeouMa/YingJeouMa.md b/Chinese/YingJeouMa/YingJeouMa.md index 97c9f4c764..17f0e1c771 100644 --- a/Chinese/YingJeouMa/YingJeouMa.md +++ b/Chinese/YingJeouMa/YingJeouMa.md @@ -1 +1,3 @@ -成為某國總統，禍國殃民。 \ No newline at end of file +成為某國總統，禍國殃民。 + +最喜歡的人有三個，一個是金葡蔥，一個是周沒清，另一個我不能說。 \ No newline at end of file From db94a2b6e9a15b1ea4eeb05e1381f41dc2d26c23 Mon Sep 17 00:00:00 2001 From: Mary Date: Fri, 30 Oct 2015 06:03:00 -0400 Subject: [PATCH 1458/5486] Add plan to go to Paris --- english/check-your-phone/check-your-phone.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/check-your-phone/check-your-phone.md b/english/check-your-phone/check-your-phone.md index feb96055f9..62f716af7f 100644 --- a/english/check-your-phone/check-your-phone.md +++ b/english/check-your-phone/check-your-phone.md @@ -6,7 +6,7 @@ But you dont know whether to trust yourself. As you look at your phone, you realize that you can't make out what it says.... -You look up and suddenly, there is a woman in front of you +You look up and suddenly, there is a woman in front of you who says "You are on vacation in Paris!" Do you: @@ -15,4 +15,6 @@ Do you: [Realize that it's just a dream](../dream/dream.md) +Think 'Hey, my dream says it's time to go to Paris!' and [plan your trip](http://www.tripadvisor.com/) + From f12e4f995da534571b0a8762c519989d50bac73a Mon Sep 17 00:00:00 2001 From: Nils R Grotnes Date: Fri, 30 Oct 2015 08:29:50 -0400 Subject: [PATCH 1459/5486] feat: Add Norwegian language choice in language.md --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index 72f911c6f2..4a04ea52b2 100644 --- a/language.md +++ b/language.md @@ -80,6 +80,8 @@ Hvis du taler dansk, [tryk her](danish/velkommen.md) Ifall du pratar svenska, [tryck här](swedish/start.md) +Hvis du snakker norsk, [trykk her](norwegian/start.md) + Ako govoris hrvatski, [klikni ovdje](croatian/sljez.md) Ak hovoríš po slovensky, [klikni sem](slovak/marsmelaci.md) From a6e9a6dd23b440857d1e04647c89104db88eb6b0 Mon Sep 17 00:00:00 2001 From: Nils R Grotnes Date: Fri, 30 Oct 2015 08:31:42 -0400 Subject: [PATCH 1460/5486] fix: Add directory and file linked to from language.md --- norwegian/start.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 norwegian/start.md diff --git a/norwegian/start.md b/norwegian/start.md new file mode 100644 index 0000000000..0818f60b6e --- /dev/null +++ b/norwegian/start.md @@ -0,0 +1 @@ +Nå er det din tur å fortsette eventyret herfra! From 16db90178274eba6ed58f739d9a7a354d262b888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=99etislav=20=C5=A0t=C4=9Bp=C3=A1n?= Date: Fri, 30 Oct 2015 17:57:39 +0100 Subject: [PATCH 1461/5486] New line in druhy_bok --- czech/druhy_bok/sen/ve_snu.md | 3 +++ czech/druhy_bok/spanek.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 czech/druhy_bok/sen/ve_snu.md diff --git a/czech/druhy_bok/sen/ve_snu.md b/czech/druhy_bok/sen/ve_snu.md new file mode 100644 index 0000000000..6de43a7b5f --- /dev/null +++ b/czech/druhy_bok/sen/ve_snu.md @@ -0,0 +1,3 @@ +Ve spánku jsis uvědomil sám se a pokusil jsi se usnout. To se ti povedlo. Zdá se ti sen. +Sníš sen o snu ve snu. + diff --git a/czech/druhy_bok/spanek.md b/czech/druhy_bok/spanek.md index dccfb6b01e..da54a92030 100644 --- a/czech/druhy_bok/spanek.md +++ b/czech/druhy_bok/spanek.md @@ -1,3 +1,5 @@ Spíš, ale ve spánku si uvědomuješ sama sebe. Divné. Dokážeš ovlivnit své myšlenky. Co uděláš? Spoustu lidí chce létat a ve spánku, pokud jsme si vědomi sami sebe, můžeme. Existuje -i odborný termín - anglicky lucid dreaming. \ No newline at end of file +i odborný termín - anglicky lucid dreaming. + +[Pokusíš se usnout ve snu](sen/senvesnu.md) \ No newline at end of file From a8cbb91070fc4a72cddff699dcdf138acdac638d Mon Sep 17 00:00:00 2001 From: jaowens Date: Fri, 30 Oct 2015 12:29:55 -0500 Subject: [PATCH 1462/5486] Add line to space.md. --- english/dream/fly/space/space.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/dream/fly/space/space.md b/english/dream/fly/space/space.md index 03158cecfe..23043bdffd 100644 --- a/english/dream/fly/space/space.md +++ b/english/dream/fly/space/space.md @@ -4,6 +4,8 @@ millions on that is quite nice, really!... So you head off to galaxy far, far away.... +...with a Babel fish stuck in your ear. + You eventually reach a solar system with a planet that has intelligent life. While you are there, they explain that dreams are actually the real Universe From 67c907bca46040eaca097a2d67fc3341bdebcc09 Mon Sep 17 00:00:00 2001 From: Manta Date: Fri, 30 Oct 2015 19:35:23 +0100 Subject: [PATCH 1463/5486] =?UTF-8?q?add=20Projit=C3=AD=20dve=C5=99ma?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- czech/kapsy/nuz/bandaz/dvere/dvere.md | 3 +++ czech/kapsy/nuz/bandaz/dvere/dvere.md~ | 0 czech/kapsy/nuz/bandaz/marsmelak.md | 2 ++ czech/kapsy/nuz/bandaz/marsmelak.md~ | 6 ++++++ 4 files changed, 11 insertions(+) create mode 100644 czech/kapsy/nuz/bandaz/dvere/dvere.md create mode 100644 czech/kapsy/nuz/bandaz/dvere/dvere.md~ create mode 100644 czech/kapsy/nuz/bandaz/marsmelak.md~ diff --git a/czech/kapsy/nuz/bandaz/dvere/dvere.md b/czech/kapsy/nuz/bandaz/dvere/dvere.md new file mode 100644 index 0000000000..968556c334 --- /dev/null +++ b/czech/kapsy/nuz/bandaz/dvere/dvere.md @@ -0,0 +1,3 @@ +Projdeš dveřmi azjistiš že je tam hromada maršmeloidních humanoidu kteří vypadají jako panaček mischelin obraceny naruby +a otočený vzhůru nohama. Jeden znich se otoči a vydase tvím směrem. Co udělaš? Vytasíš nuž? Začneš zdrhat? Nebo provedeš +uplně něco jiného? diff --git a/czech/kapsy/nuz/bandaz/dvere/dvere.md~ b/czech/kapsy/nuz/bandaz/dvere/dvere.md~ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/czech/kapsy/nuz/bandaz/marsmelak.md b/czech/kapsy/nuz/bandaz/marsmelak.md index 5da1ee5212..70168e47e6 100644 --- a/czech/kapsy/nuz/bandaz/marsmelak.md +++ b/czech/kapsy/nuz/bandaz/marsmelak.md @@ -4,3 +4,5 @@ tak jsi už dávno omdlel z pohledu na krev. Teď už jen potřebuješ najít, kde se za stěnou z maršmeláku skrývá ovládací ovládací panel, pak přečteš manuál v činštině a zazračně prolomíš administrátorské heslo a jsi vítěz.... ... a nebo by ses mohl podívat, co se skrývá za těmi otevřenými dveřmi... + +["Koukneš za dvere"](dvere/dvere.md) diff --git a/czech/kapsy/nuz/bandaz/marsmelak.md~ b/czech/kapsy/nuz/bandaz/marsmelak.md~ new file mode 100644 index 0000000000..5da1ee5212 --- /dev/null +++ b/czech/kapsy/nuz/bandaz/marsmelak.md~ @@ -0,0 +1,6 @@ +Tak je to jasné, je to zatraceně dobrá simulace, protože kdyby to byla realita, +tak jsi už dávno omdlel z pohledu na krev. + +Teď už jen potřebuješ najít, kde se za stěnou z maršmeláku skrývá ovládací ovládací panel, +pak přečteš manuál v činštině a zazračně prolomíš administrátorské heslo a jsi vítěz.... +... a nebo by ses mohl podívat, co se skrývá za těmi otevřenými dveřmi... From 3f3b6ea6af6b0c6d48cb4f16a00322fc7cdb35c1 Mon Sep 17 00:00:00 2001 From: Lourenco Sequeira Date: Fri, 30 Oct 2015 20:22:55 +0000 Subject: [PATCH 1464/5486] Add ominous-voice and heffalumps-and-woozles adventures --- english/marshmallow.md | 2 + .../heffalumps-and-woozles.md | 40 +++++++++++++++++++ english/ominous-voice/ominous-voice.md | 4 ++ 3 files changed, 46 insertions(+) create mode 100644 english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md create mode 100644 english/ominous-voice/ominous-voice.md diff --git a/english/marshmallow.md b/english/marshmallow.md index dc334ec808..20cbdddd9d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -566,3 +566,5 @@ and as you do a large pink marshmallow shoots out of your hand into the wall bef [The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) All in a hard days work, do you play some [music](play-music/playmusic.md). + +As you hold your pot of precious hunny, you begin to [hear an ominous voice...](ominous-voice/ominous-voice.md) diff --git a/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md b/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md new file mode 100644 index 0000000000..ea50f14ee7 --- /dev/null +++ b/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md @@ -0,0 +1,40 @@ +They're black they're brown they're up they're down +They're in they're out they're all about +They're far they're near they're gone they're here +They're quick and slick, they're insincere +Beware, beware, be a very wary bear + +A Heffalump or Woozle is very confusel +The Heffalump or woozle's very sly +- sly - sly - sly + +They come in ones and twoosels +But if they so choosels +Before your eyes you'll see them multiply +- ply - ply - ply + +They're extra-ordinary, so better be wary +Because they come in every shape and size +- size - size - size + +If honey's what you covet you'll find that they love it +Because they guzzle up the things you prize + +They're green they're blue they're pink they're white +They're round they're square they're a terrible sight +They tie themselves in horrible knots +They come in stripes or polka-dots +Beware, beware, be a very wary bear + +They're extra-ordinary, so better be wary +Because they come in every shape and size +- size - size - size + +If honey's what you covet you'll find that they love it +Because they'll guzzle up the things you prize + +They're black they're brown they're up their down +They're in they're out they're all about +They're far they're near they're gone they're here +They're quick and slick, they're insincere +Beware, beware, beware, beware, beware.... \ No newline at end of file diff --git a/english/ominous-voice/ominous-voice.md b/english/ominous-voice/ominous-voice.md new file mode 100644 index 0000000000..99f2ab4fed --- /dev/null +++ b/english/ominous-voice/ominous-voice.md @@ -0,0 +1,4 @@ +Heffalumps and woozles +HEFFALUMPS AND WOOOOOOZLES +Steal honey +Beware...[BEWAREEEEEE.....](heffalumps-and-woozles/heffalumps-and-woozles.md) \ No newline at end of file From f8c4dea9200fdfd26af20e3b64170597c98aaa02 Mon Sep 17 00:00:00 2001 From: laseq Date: Fri, 30 Oct 2015 20:34:11 +0000 Subject: [PATCH 1465/5486] Update heffalumps-and-woozles.md --- .../heffalumps-and-woozles/heffalumps-and-woozles.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md b/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md index ea50f14ee7..a034a97a69 100644 --- a/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md +++ b/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md @@ -6,16 +6,16 @@ Beware, beware, be a very wary bear A Heffalump or Woozle is very confusel The Heffalump or woozle's very sly -- sly - sly - sly +sly, sly, sly They come in ones and twoosels But if they so choosels Before your eyes you'll see them multiply -- ply - ply - ply +ply, ply, ply They're extra-ordinary, so better be wary Because they come in every shape and size -- size - size - size +size, size, size If honey's what you covet you'll find that they love it Because they guzzle up the things you prize @@ -28,7 +28,7 @@ Beware, beware, be a very wary bear They're extra-ordinary, so better be wary Because they come in every shape and size -- size - size - size +size, size, size If honey's what you covet you'll find that they love it Because they'll guzzle up the things you prize @@ -37,4 +37,4 @@ They're black they're brown they're up their down They're in they're out they're all about They're far they're near they're gone they're here They're quick and slick, they're insincere -Beware, beware, beware, beware, beware.... \ No newline at end of file +Beware, beware, beware, beware, beware.... From 6fd4c8f770cdee752d17dd02b536cb9b2c47d577 Mon Sep 17 00:00:00 2001 From: laseq Date: Fri, 30 Oct 2015 20:36:06 +0000 Subject: [PATCH 1466/5486] Update heffalumps-and-woozles.md --- .../heffalumps-and-woozles/heffalumps-and-woozles.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md b/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md index a034a97a69..2c5079e642 100644 --- a/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md +++ b/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md @@ -1,5 +1,5 @@ -They're black they're brown they're up they're down -They're in they're out they're all about +They're black they're brown they're up they're down +They're in they're out they're all about They're far they're near they're gone they're here They're quick and slick, they're insincere Beware, beware, be a very wary bear From 1dd1d67640c40123923bbe62d7fb922d0a472f04 Mon Sep 17 00:00:00 2001 From: laseq Date: Fri, 30 Oct 2015 20:36:49 +0000 Subject: [PATCH 1467/5486] Update heffalumps-and-woozles.md --- .../heffalumps-and-woozles.md | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md b/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md index 2c5079e642..e336a0054d 100644 --- a/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md +++ b/english/ominous-voice/heffalumps-and-woozles/heffalumps-and-woozles.md @@ -1,40 +1,40 @@ They're black they're brown they're up they're down They're in they're out they're all about -They're far they're near they're gone they're here -They're quick and slick, they're insincere -Beware, beware, be a very wary bear - -A Heffalump or Woozle is very confusel -The Heffalump or woozle's very sly -sly, sly, sly - -They come in ones and twoosels -But if they so choosels -Before your eyes you'll see them multiply -ply, ply, ply - -They're extra-ordinary, so better be wary -Because they come in every shape and size -size, size, size - -If honey's what you covet you'll find that they love it -Because they guzzle up the things you prize - -They're green they're blue they're pink they're white -They're round they're square they're a terrible sight -They tie themselves in horrible knots -They come in stripes or polka-dots -Beware, beware, be a very wary bear - -They're extra-ordinary, so better be wary -Because they come in every shape and size -size, size, size - -If honey's what you covet you'll find that they love it -Because they'll guzzle up the things you prize - -They're black they're brown they're up their down -They're in they're out they're all about -They're far they're near they're gone they're here -They're quick and slick, they're insincere -Beware, beware, beware, beware, beware.... +They're far they're near they're gone they're here +They're quick and slick, they're insincere +Beware, beware, be a very wary bear + +A Heffalump or Woozle is very confusel +The Heffalump or woozle's very sly +sly, sly, sly + +They come in ones and twoosels +But if they so choosels +Before your eyes you'll see them multiply +ply, ply, ply + +They're extra-ordinary, so better be wary +Because they come in every shape and size +size, size, size + +If honey's what you covet you'll find that they love it +Because they guzzle up the things you prize + +They're green they're blue they're pink they're white +They're round they're square they're a terrible sight +They tie themselves in horrible knots +They come in stripes or polka-dots +Beware, beware, be a very wary bear + +They're extra-ordinary, so better be wary +Because they come in every shape and size +size, size, size + +If honey's what you covet you'll find that they love it +Because they'll guzzle up the things you prize + +They're black they're brown they're up their down +They're in they're out they're all about +They're far they're near they're gone they're here +They're quick and slick, they're insincere +Beware, beware, beware, beware, beware.... From 472de5f66984f94896adcecad921eb2f3a87f7ca Mon Sep 17 00:00:00 2001 From: laseq Date: Fri, 30 Oct 2015 20:37:24 +0000 Subject: [PATCH 1468/5486] Update ominous-voice.md --- english/ominous-voice/ominous-voice.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/english/ominous-voice/ominous-voice.md b/english/ominous-voice/ominous-voice.md index 99f2ab4fed..90bd61280f 100644 --- a/english/ominous-voice/ominous-voice.md +++ b/english/ominous-voice/ominous-voice.md @@ -1,4 +1,4 @@ -Heffalumps and woozles -HEFFALUMPS AND WOOOOOOZLES -Steal honey -Beware...[BEWAREEEEEE.....](heffalumps-and-woozles/heffalumps-and-woozles.md) \ No newline at end of file +Heffalumps and woozles +HEFFALUMPS AND WOOOOOOZLES +Steal honey +Beware...[BEWAREEEEEE.....](heffalumps-and-woozles/heffalumps-and-woozles.md) From d86d40fb33983a0ed31bb59112472451dc3cf652 Mon Sep 17 00:00:00 2001 From: Fede Date: Fri, 30 Oct 2015 18:31:23 -0600 Subject: [PATCH 1469/5486] break long lines to comply with guidelines --- espanol/bailar/matar/matar.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/bailar/matar/matar.md b/espanol/bailar/matar/matar.md index 41cc4c7291..d56b60ceac 100644 --- a/espanol/bailar/matar/matar.md +++ b/espanol/bailar/matar/matar.md @@ -1,4 +1,6 @@ Beatito sacó un arma del bolsillo y mató a quemarropas al consejero. -Luego, se preparó para recibir a todas las milicias, con quienes ya había acordado el traspaso del poder, y la construcción de una cómoda mansión para él y su joven esposa con vista a toda el desierto del Sertao. \ No newline at end of file +Luego, se preparó para recibir a todas las milicias, con quienes ya había +acordado el traspaso del poder, y la construcción de una cómoda mansión para +él y su joven esposa con vista a toda el desierto del Sertao. \ No newline at end of file From 190ce3b30d481bdff3fc351eca4d563a86144d6e Mon Sep 17 00:00:00 2001 From: Luke Sheppard Date: Fri, 30 Oct 2015 17:43:29 -0700 Subject: [PATCH 1470/5486] Initial commit. --- english/marshmallow.md | 4 +++- english/references/references.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/references/references.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 008db9b7f7..a4197c46ec 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -6,6 +6,8 @@ One morning, you wake up in a strange room with marshmallows for walls. Marshmallows smell funny. What is a marshmallow anyway? +Unexpectedly, the Chief Marshmallow demands to see your [references](references/references.md). + *(Must be a Tuesday.)* Or a Wednesday...Thursday...maybe even a Friday. @@ -579,4 +581,4 @@ and as you do a large pink marshmallow shoots out of your hand into the wall bef All in a hard days work, do you play some [music](play-music/playmusic.md). -Honesty in a hard way [Watch it](few-good-men/fgm.md) \ No newline at end of file +Honesty in a hard way [Watch it](few-good-men/fgm.md) diff --git a/english/references/references.md b/english/references/references.md new file mode 100644 index 0000000000..e95cfa7d80 --- /dev/null +++ b/english/references/references.md @@ -0,0 +1 @@ +You calmly explain to the Chief Marshmallow that you come from the [land of Ice and Snow](../../norwegian/). From 1ddf170cc6bde9f04b8d4e2f59e387312640902e Mon Sep 17 00:00:00 2001 From: Luke Sheppard Date: Fri, 30 Oct 2015 17:47:57 -0700 Subject: [PATCH 1471/5486] Fix missing capitalization --- english/references/references.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/references/references.md b/english/references/references.md index e95cfa7d80..dd697f056c 100644 --- a/english/references/references.md +++ b/english/references/references.md @@ -1 +1 @@ -You calmly explain to the Chief Marshmallow that you come from the [land of Ice and Snow](../../norwegian/). +You calmly explain to the Chief Marshmallow that you come from the [Land of Ice and Snow](../../norwegian/). From 289b2458b357cf2fe9845acbcd807b190c4d5b71 Mon Sep 17 00:00:00 2001 From: Luke Sheppard Date: Fri, 30 Oct 2015 17:55:35 -0700 Subject: [PATCH 1472/5486] Fix broken URL --- english/references/references.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/references/references.md b/english/references/references.md index dd697f056c..25ad93a6cf 100644 --- a/english/references/references.md +++ b/english/references/references.md @@ -1 +1 @@ -You calmly explain to the Chief Marshmallow that you come from the [Land of Ice and Snow](../../norwegian/). +You calmly explain to the Chief Marshmallow that you come from the [Land of Ice and Snow](../../norwegian/start.md). From 892f690cbcb3b18674281b03ee753e93494dd101 Mon Sep 17 00:00:00 2001 From: Angus Date: Sat, 31 Oct 2015 14:46:03 +1300 Subject: [PATCH 1473/5486] Creating an option in marshmallow-wizard.md --- english/marshmallow-wizard/marshmallow-wizard.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow-wizard/marshmallow-wizard.md b/english/marshmallow-wizard/marshmallow-wizard.md index dcf64ff173..670c5fa110 100644 --- a/english/marshmallow-wizard/marshmallow-wizard.md +++ b/english/marshmallow-wizard/marshmallow-wizard.md @@ -3,4 +3,6 @@ you revel in your power and swear to use it for good—for example, to cure world hunger with unlimited sugary treats—rather than for evil—for example, to buffet your enemies with a barrage of soft multicolored projectiles. -And with your new powers you [imagine](https://www.youtube.com/watch?v=DVg2EJvvlF8) a world... \ No newline at end of file +And with your new powers you [imagine](https://www.youtube.com/watch?v=DVg2EJvvlF8) a world... + +But then you realise, why imagine when you can [save](save-the-world/save-the-world.md) the world? \ No newline at end of file From 3bdbb0d7cffa832bc6c95cfcca7d6e1e33f71e7b Mon Sep 17 00:00:00 2001 From: Angus Date: Sat, 31 Oct 2015 14:47:07 +1300 Subject: [PATCH 1474/5486] Creating the Save the World story --- english/marshmallow-wizard/save-the-world/save-the-world.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/marshmallow-wizard/save-the-world/save-the-world.md diff --git a/english/marshmallow-wizard/save-the-world/save-the-world.md b/english/marshmallow-wizard/save-the-world/save-the-world.md new file mode 100644 index 0000000000..0fc4169217 --- /dev/null +++ b/english/marshmallow-wizard/save-the-world/save-the-world.md @@ -0,0 +1,5 @@ +You jump off your seat, exctited by the idea that you'll save the world. +The options whiz through your head. But you sit down again realising +you will have to book a flight. But to where? All the possibilities... +Ethiopia? Chile? Zimbabwe? You can't make a decision. But you have made +the decision to make a decision tomorrow. ' \ No newline at end of file From 91d1b58b6fc32bdc87503f43a003f0adcf845e44 Mon Sep 17 00:00:00 2001 From: Angus Date: Sat, 31 Oct 2015 15:01:02 +1300 Subject: [PATCH 1475/5486] Create new option in malaria.md --- english/malaria/malaria.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/malaria/malaria.md b/english/malaria/malaria.md index 59e7495905..6f7c86c937 100644 --- a/english/malaria/malaria.md +++ b/english/malaria/malaria.md @@ -7,6 +7,8 @@ marshmallow. You flail and trash but to no avail. You cannot draw breath. You are suffocating! It starts getting dark to your eyes. There is no water near. +You start to [scream](scream/scream.md) + You jump up from the reverie and find yourself by a forest road with a bottle of pills by your side. You see a jeep crashed into the trees some distance away. The sound of distant gunfire reaches your ears and it dawns From 5ca086f61929eab706c7bcc42c21f55d58fae6fa Mon Sep 17 00:00:00 2001 From: Angus Date: Sat, 31 Oct 2015 15:03:15 +1300 Subject: [PATCH 1476/5486] Create story Scream --- english/malaria/scream/scream.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/malaria/scream/scream.md diff --git a/english/malaria/scream/scream.md b/english/malaria/scream/scream.md new file mode 100644 index 0000000000..2891f5f47d --- /dev/null +++ b/english/malaria/scream/scream.md @@ -0,0 +1,3 @@ +The high pitched baby scream that comes out of your mouth is muffled by the enclosing marshmallows. +You keep screaming but with every second your scream gets weaker, and weaker. Then suddenly the +its bright again. The marshmallows have gone! But to where? \ No newline at end of file From b5add34ddf5083f40304bd51daa8b14d9fa1f23b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=99etislav=20=C5=A0t=C4=9Bp=C3=A1n?= Date: Sat, 31 Oct 2015 07:53:03 +0100 Subject: [PATCH 1477/5486] fix: Link to unreachable page --- czech/druhy_bok/spanek.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/czech/druhy_bok/spanek.md b/czech/druhy_bok/spanek.md index da54a92030..2d81b54211 100644 --- a/czech/druhy_bok/spanek.md +++ b/czech/druhy_bok/spanek.md @@ -2,4 +2,4 @@ Spíš, ale ve spánku si uvědomuješ sama sebe. Divné. Dokážeš ovlivnit sv Spoustu lidí chce létat a ve spánku, pokud jsme si vědomi sami sebe, můžeme. Existuje i odborný termín - anglicky lucid dreaming. -[Pokusíš se usnout ve snu](sen/senvesnu.md) \ No newline at end of file +[Pokusíš se usnout ve snu](sen/ve_snu.md) \ No newline at end of file From 82b19b5be28207528993f28d99a1acf7a1e5ac39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=99etislav=20=C5=A0t=C4=9Bp=C3=A1n?= Date: Sat, 31 Oct 2015 07:56:31 +0100 Subject: [PATCH 1478/5486] fix: Typo --- czech/druhy_bok/sen/ve_snu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/czech/druhy_bok/sen/ve_snu.md b/czech/druhy_bok/sen/ve_snu.md index 6de43a7b5f..23014ade50 100644 --- a/czech/druhy_bok/sen/ve_snu.md +++ b/czech/druhy_bok/sen/ve_snu.md @@ -1,3 +1,3 @@ -Ve spánku jsis uvědomil sám se a pokusil jsi se usnout. To se ti povedlo. Zdá se ti sen. +Ve spánku jsis uvědomil sám sebe a pokusil jsi se usnout. To se ti povedlo. Zdá se ti sen. Sníš sen o snu ve snu. From 25aa64f86469767f7d3303907566eb025ad1b3ba Mon Sep 17 00:00:00 2001 From: gooneraki Date: Sat, 31 Oct 2015 11:52:32 +0200 Subject: [PATCH 1479/5486] Update intimacy.md split line to two --- greek/offer_marshmallow_a_cigar/intimacy/intimacy.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md b/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md index b019d0528e..a8e5e486b6 100644 --- a/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md +++ b/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md @@ -1 +1,2 @@ -Το σκεφτεσαι περισσοτερο αναβωντας ακομα ένα τσιγαρο. Το ζαχαρωτο χερι εχει πνιγει στους καπνους αλλα πλεον δεν σε νοιαζει, εισαι οικειος μαζι του αφου εχουν περασει πεντε ολοκληρα λεπτα από τοτε που γνωριστηκατε. \ No newline at end of file +Το σκεφτεσαι περισσοτερο αναβωντας ακομα ένα τσιγαρο. +Το ζαχαρωτο χερι εχει πνιγει στους καπνους αλλα πλεον δεν σε νοιαζει, εισαι οικειος μαζι του αφου εχουν περασει πεντε ολοκληρα λεπτα από τοτε που γνωριστηκατε. From 494aa28f7038da6925a12f1b433f22c7fc4dfa3c Mon Sep 17 00:00:00 2001 From: Sudheer Keshav Bhat Date: Sat, 31 Oct 2015 16:53:05 +0530 Subject: [PATCH 1480/5486] answering. --- tulu/tulu.md | 1 + 1 file changed, 1 insertion(+) diff --git a/tulu/tulu.md b/tulu/tulu.md index 9e4d86a4ae..0c7c639789 100644 --- a/tulu/tulu.md +++ b/tulu/tulu.md @@ -1 +1,2 @@ ಕುಡ್ಲದ ಜನ ಎಂಚ ಉಲ್ಲರ್? +ಎಡ್ಡೆ ಧನಿ From 48e6fa72029dcd93569b8520380a88e5c10ce5b2 Mon Sep 17 00:00:00 2001 From: Sudheer Keshav Bhat Date: Sat, 31 Oct 2015 16:56:28 +0530 Subject: [PATCH 1481/5486] linking with kannada --- tulu/tulu.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tulu/tulu.md b/tulu/tulu.md index 0c7c639789..4526e63419 100644 --- a/tulu/tulu.md +++ b/tulu/tulu.md @@ -1,2 +1,4 @@ ಕುಡ್ಲದ ಜನ ಎಂಚ ಉಲ್ಲರ್? ಎಡ್ಡೆ ಧನಿ + +ಕನ್ನಡ ಆಂಡ[ ಮೂಲು ಒತ್ಲೆ](../kannada/kannada.md) From a821d9bd963337e93c4a05308b4723feb6fe05bf Mon Sep 17 00:00:00 2001 From: Sudheer Keshav Bhat Date: Sat, 31 Oct 2015 16:58:20 +0530 Subject: [PATCH 1482/5486] correcting kannada link --- tulu/tulu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tulu/tulu.md b/tulu/tulu.md index 4526e63419..501e7294f0 100644 --- a/tulu/tulu.md +++ b/tulu/tulu.md @@ -1,4 +1,4 @@ ಕುಡ್ಲದ ಜನ ಎಂಚ ಉಲ್ಲರ್? ಎಡ್ಡೆ ಧನಿ -ಕನ್ನಡ ಆಂಡ[ ಮೂಲು ಒತ್ಲೆ](../kannada/kannada.md) +ಕನ್ನಡ ಆಂಡ[ ಮೂಲು ಒತ್ಲೆ](../kannada/soochike.md) From 4495ae8f5d436e8f3d30b1b7947349ce9adf3a2a Mon Sep 17 00:00:00 2001 From: Mantacz Date: Sat, 31 Oct 2015 19:45:12 +0100 Subject: [PATCH 1483/5486] Delete dvere.md~ --- czech/kapsy/nuz/bandaz/dvere/dvere.md~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 czech/kapsy/nuz/bandaz/dvere/dvere.md~ diff --git a/czech/kapsy/nuz/bandaz/dvere/dvere.md~ b/czech/kapsy/nuz/bandaz/dvere/dvere.md~ deleted file mode 100644 index e69de29bb2..0000000000 From 172573b009f746592bf3d853ba0d4ad5938c850c Mon Sep 17 00:00:00 2001 From: Mantacz Date: Sat, 31 Oct 2015 19:45:35 +0100 Subject: [PATCH 1484/5486] Delete marsmelak.md~ --- czech/kapsy/nuz/bandaz/marsmelak.md~ | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 czech/kapsy/nuz/bandaz/marsmelak.md~ diff --git a/czech/kapsy/nuz/bandaz/marsmelak.md~ b/czech/kapsy/nuz/bandaz/marsmelak.md~ deleted file mode 100644 index 5da1ee5212..0000000000 --- a/czech/kapsy/nuz/bandaz/marsmelak.md~ +++ /dev/null @@ -1,6 +0,0 @@ -Tak je to jasné, je to zatraceně dobrá simulace, protože kdyby to byla realita, -tak jsi už dávno omdlel z pohledu na krev. - -Teď už jen potřebuješ najít, kde se za stěnou z maršmeláku skrývá ovládací ovládací panel, -pak přečteš manuál v činštině a zazračně prolomíš administrátorské heslo a jsi vítěz.... -... a nebo by ses mohl podívat, co se skrývá za těmi otevřenými dveřmi... From 30b47ca13cc384fd9690208af61f2a401cba83aa Mon Sep 17 00:00:00 2001 From: Mantacz Date: Sat, 31 Oct 2015 19:46:37 +0100 Subject: [PATCH 1485/5486] Update dvere.md --- czech/kapsy/nuz/bandaz/dvere/dvere.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/czech/kapsy/nuz/bandaz/dvere/dvere.md b/czech/kapsy/nuz/bandaz/dvere/dvere.md index 968556c334..fb1ee6f0af 100644 --- a/czech/kapsy/nuz/bandaz/dvere/dvere.md +++ b/czech/kapsy/nuz/bandaz/dvere/dvere.md @@ -1,3 +1,5 @@ -Projdeš dveřmi azjistiš že je tam hromada maršmeloidních humanoidu kteří vypadají jako panaček mischelin obraceny naruby -a otočený vzhůru nohama. Jeden znich se otoči a vydase tvím směrem. Co udělaš? Vytasíš nuž? Začneš zdrhat? Nebo provedeš -uplně něco jiného? +Projdeš dveřmi azjistiš že je tam hromada maršmeloidních humanoidu +kteří vypadají jako panaček mischelin obraceny naruby +a otočený vzhůru nohama. Jeden znich se otoči a vydase tvím směrem. +Co udělaš? Vytasíš nuž? Začneš zdrhat? +Nebo provedeš uplně něco jiného? From 9977b930df69ee73545d07f975abcfb3f1938d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alan=20S=C3=A1nchez?= Date: Sat, 31 Oct 2015 17:31:24 -0600 Subject: [PATCH 1486/5486] Add branch with new story options for Spanish language ("tactica") --- espanol/canudos.md | 6 ++++-- espanol/tactica/confesion/confesion.md | 11 +++++++++++ espanol/tactica/suicidio/suicidio.md | 7 +++++++ espanol/tactica/tactica.md | 8 ++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 espanol/tactica/confesion/confesion.md create mode 100644 espanol/tactica/suicidio/suicidio.md create mode 100644 espanol/tactica/tactica.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 14edc2d02a..2a4c94f5c9 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -1,6 +1,8 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento -el Consejero: +el Consejero: + +[Se dio cuenta de que su táctica había sido descubierta] (tactica/tactica.md) [Sintió como la comida le subía por el exófago](comida/comida.md) @@ -15,7 +17,7 @@ el Consejero: [Empaquetó sus cosas e intentó salir por la puerta trasera.](huida/puerta.md) [Miró hacia el cielo mientras pensaba](pensamiento/guerra.md) - + [Mandó a Beatito a buscar al cocinero](cocinero/cocinero.md) [Clavó sus ojos directamente sobre el Beatito...](rebelion/inicio-rebelion.md) diff --git a/espanol/tactica/confesion/confesion.md b/espanol/tactica/confesion/confesion.md new file mode 100644 index 0000000000..952a68f7ed --- /dev/null +++ b/espanol/tactica/confesion/confesion.md @@ -0,0 +1,11 @@ +Sabía que un suicidio significaría una salida más cómoda y relativamente indolora pero +él siempre se consideró a sí mismo un cobarde. Y tenía razón. Siempre pensó que el coraje +era algo con lo que se nacía, algo aleatorio, como el color del cabello. Y así como la divinidad +lo había bendecido con una gran cabellera dorada, digna de un príncipe, también lo maldijo con +una cobardía inigualable. + +Confesó todo a su líder supremo. Para su sorpresa, no hubo reacción alguna en la mirada +del emperador. Él sabía todo desde el inicio y el destino del consejero ya estaba decidido. + +El consejero, desde aquel episodio, ha recibido a millares de visitantes en su nueva morada: el +cementerio imperial. \ No newline at end of file diff --git a/espanol/tactica/suicidio/suicidio.md b/espanol/tactica/suicidio/suicidio.md new file mode 100644 index 0000000000..6682d856ee --- /dev/null +++ b/espanol/tactica/suicidio/suicidio.md @@ -0,0 +1,7 @@ +Supo que no había ningún otro remedio. Al menos no alguno que pudiera evitar una gran cantidad +sufrimiento y humillación. Así, decidió quitarse la vida, consideraba que era lo más honoralbe +en su retorcida cabeza. Sí, sufriría pero sólo por un instante y evitaría la furia del Imperio que +seguramente lo haría sufrir los castigos más severos jamás vistos por cualquier hombre que jamás +haya vivido. + +Nuestro consejero, fue un héroe. Al menos eso pensarían todos al saber de su muerte. \ No newline at end of file diff --git a/espanol/tactica/tactica.md b/espanol/tactica/tactica.md new file mode 100644 index 0000000000..bd9112dde1 --- /dev/null +++ b/espanol/tactica/tactica.md @@ -0,0 +1,8 @@ +El consejero siempre supo que había una gran posibilidad de que sus tácticas manipuladoras fallaran +pero nunca creyó que aquel escenario significaría un envolvimiento del ejército. A sabiendas de que +pocos días quedaban antes de que su fiasco fiasco fuera descubierto por completo y con el riesgo +de muesto que eso conllevaría, decidió entonces: + +[Hacer lo que cualquier hombre honorario haría: quitarse la vida] (suicidio/suicidio.md) + +[Confesar su crimen y evitar así la muerte] (confesion/confesion.md) \ No newline at end of file From b23a5748a0af685bec33a72365c230930f818bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alan=20S=C3=A1nchez?= Date: Sat, 31 Oct 2015 17:46:43 -0600 Subject: [PATCH 1487/5486] Fix deleted lines --- espanol/canudos.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 2a4c94f5c9..96254db020 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -1,6 +1,5 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la -república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento -el Consejero: +república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: [Se dio cuenta de que su táctica había sido descubierta] (tactica/tactica.md) From ad382aa9894c3de68cfa507ff9767217f48221a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alan=20S=C3=A1nchez?= Date: Sat, 31 Oct 2015 17:53:46 -0600 Subject: [PATCH 1488/5486] Another attempt to fix the deleted lines problem --- espanol/canudos.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 96254db020..bf3891f944 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -1,7 +1,6 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la -república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: - -[Se dio cuenta de que su táctica había sido descubierta] (tactica/tactica.md) +república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento +el Consejero: [Sintió como la comida le subía por el exófago](comida/comida.md) @@ -77,4 +76,4 @@ república cuando empezaron a sonar trompetas que indicaban la llegada del ejerc [Levanta su mano derecha, con el indice señala al ejército enemigo y les dice a sus soldados...](soldados/soldados.md) - +[Se dio cuenta de que su táctica había sido descubierta] (tactica/tactica.md) \ No newline at end of file From 731709d4ccb2b43578fdbe7f5d2dadd5ec28de1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alan=20S=C3=A1nchez?= Date: Sat, 31 Oct 2015 18:00:47 -0600 Subject: [PATCH 1489/5486] Yet another attempt to fix the deleted lines issue --- espanol/canudos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index bf3891f944..2a4c94f5c9 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -2,6 +2,8 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del i república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: +[Se dio cuenta de que su táctica había sido descubierta] (tactica/tactica.md) + [Sintió como la comida le subía por el exófago](comida/comida.md) [Mandó a congregar a Canudos entero al templo.](templo/templo.md) @@ -76,4 +78,4 @@ el Consejero: [Levanta su mano derecha, con el indice señala al ejército enemigo y les dice a sus soldados...](soldados/soldados.md) -[Se dio cuenta de que su táctica había sido descubierta] (tactica/tactica.md) \ No newline at end of file + From 392fd9cf8e0c9987e57ef8a33bf63c9597833993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alan=20S=C3=A1nchez?= Date: Sat, 31 Oct 2015 18:07:47 -0600 Subject: [PATCH 1490/5486] Dont give up! Another attempt to fix the deleted lines issue --- espanol/canudos.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 2a4c94f5c9..1d00e75af2 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -2,8 +2,6 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del i república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: -[Se dio cuenta de que su táctica había sido descubierta] (tactica/tactica.md) - [Sintió como la comida le subía por el exófago](comida/comida.md) [Mandó a congregar a Canudos entero al templo.](templo/templo.md) @@ -78,4 +76,5 @@ el Consejero: [Levanta su mano derecha, con el indice señala al ejército enemigo y les dice a sus soldados...](soldados/soldados.md) +[Se dio cuenta de que su táctica había sido descubierta] (tactica/tactica.md) From a0cd392f54c769b7e0acaa626f7573c1bad43c66 Mon Sep 17 00:00:00 2001 From: alan247 Date: Sat, 31 Oct 2015 18:13:50 -0600 Subject: [PATCH 1491/5486] =?UTF-8?q?Add=20another=20option=20(t=C3=A1ctic?= =?UTF-8?q?a=20descubierta)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After many failed attempts to fix the weird deleted lines issue, I'm editing the file directly on github to try and see if I get different results. --- espanol/canudos.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 1d00e75af2..0060ac4b42 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -1,6 +1,6 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento -el Consejero: +el Consejero: [Sintió como la comida le subía por el exófago](comida/comida.md) @@ -15,7 +15,7 @@ el Consejero: [Empaquetó sus cosas e intentó salir por la puerta trasera.](huida/puerta.md) [Miró hacia el cielo mientras pensaba](pensamiento/guerra.md) - + [Mandó a Beatito a buscar al cocinero](cocinero/cocinero.md) [Clavó sus ojos directamente sobre el Beatito...](rebelion/inicio-rebelion.md) From e94f193bff4d611c7d2c88b57f25a9585f9abe47 Mon Sep 17 00:00:00 2001 From: Mark Matthews Date: Sun, 1 Nov 2015 14:02:18 +1100 Subject: [PATCH 1492/5486] Marshmellow wizard save the world from what --- english/marshmallow-wizard/marshmallow-wizard.md | 4 +++- .../marshmallow-wizard/save-the-world-from-what/from-what.md | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/marshmallow-wizard/save-the-world-from-what/from-what.md diff --git a/english/marshmallow-wizard/marshmallow-wizard.md b/english/marshmallow-wizard/marshmallow-wizard.md index 670c5fa110..b6ed34fd38 100644 --- a/english/marshmallow-wizard/marshmallow-wizard.md +++ b/english/marshmallow-wizard/marshmallow-wizard.md @@ -5,4 +5,6 @@ to buffet your enemies with a barrage of soft multicolored projectiles. And with your new powers you [imagine](https://www.youtube.com/watch?v=DVg2EJvvlF8) a world... -But then you realise, why imagine when you can [save](save-the-world/save-the-world.md) the world? \ No newline at end of file +But then you realise, why imagine when you can [save](save-the-world/save-the-world.md) the world? + +Then another thought occurs to you .... [from what?](save-the-world-from-what/from-what.md) diff --git a/english/marshmallow-wizard/save-the-world-from-what/from-what.md b/english/marshmallow-wizard/save-the-world-from-what/from-what.md new file mode 100644 index 0000000000..979dea3977 --- /dev/null +++ b/english/marshmallow-wizard/save-the-world-from-what/from-what.md @@ -0,0 +1,5 @@ +From [space cats from mars](http://www.hdwallpapers.im/commer_kitty_is_ready_to_save_the_world-wallpaper.html) + +from [Bad underwear syndrome](https://www.youtube.com/watch?v=iXsAG4ykFJk) + +or from [Too much of a good thing](https://s3.amazonaws.com/DanniMedia/articlepics/52b47e852dd5055de607dada.jpg) From 500686e650d1605697d616efa4a2dba8dbef297e Mon Sep 17 00:00:00 2001 From: JimRhead Date: Sun, 1 Nov 2015 14:11:06 +0000 Subject: [PATCH 1493/5486] Added more radiohead --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 97097e6fd6..7817efa22a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -584,3 +584,5 @@ All in a hard days work, do you play some [music](play-music/playmusic.md). As you hold your pot of precious hunny, you begin to [hear an ominous voice...](ominous-voice/ominous-voice.md) Honesty in a hard way [Watch it](few-good-men/fgm.md) + +Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube.com/watch?v=lAF8D0ugyVk) From a29601a568995132ab8bf41b25ef0259f64a9fa8 Mon Sep 17 00:00:00 2001 From: JimRhead Date: Sun, 1 Nov 2015 14:22:03 +0000 Subject: [PATCH 1494/5486] Add clarity to quora question --- english/ask-on-quora/ask-on-quora.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/ask-on-quora/ask-on-quora.md b/english/ask-on-quora/ask-on-quora.md index d7a327085e..eb14dae187 100644 --- a/english/ask-on-quora/ask-on-quora.md +++ b/english/ask-on-quora/ask-on-quora.md @@ -1,3 +1,3 @@ -Why not ask a question on Quora ? +Why not ask a question on Quora when you are feeling confused? -Click [here](http://www.quora.com) to visit Quora. \ No newline at end of file +Click [here](http://www.quora.com) to visit Quora. From 60336a9a6567daa0ad994dc54134d747ac0e30b4 Mon Sep 17 00:00:00 2001 From: MrAmmar Date: Sun, 1 Nov 2015 19:07:39 +0000 Subject: [PATCH 1495/5486] Fix broken link --- arabic/learn/learn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arabic/learn/learn.md b/arabic/learn/learn.md index ba36e3d7f3..bee5fc7d98 100644 --- a/arabic/learn/learn.md +++ b/arabic/learn/learn.md @@ -1,4 +1,4 @@ اذا قررت ان تكمل الالتعلم فانه عليك ان تبحث عن موضوع مكمل لموضوع السياق الماضي، هل تعرف لماذا؟ لانه يجب عليك الاستفاده من السياق الماضي وتطوير قدراتك فيه لذا ماذا تتوقع ان تفعل الان؟ قال صلى الله عليه وسلم من سلك طريقاً يلتمس فيه علماً سهل الله له طريقاً الى الجنة -[و لماذا التعلم ](learn\whylearning\speculate.md) +[و لماذا التعلم ](whylearning/speculate.md) From ece46ba2e7ac70b306b6746b65fa0ac0a6be54ef Mon Sep 17 00:00:00 2001 From: Kurt Statham Date: Sun, 1 Nov 2015 16:26:51 -0800 Subject: [PATCH 1496/5486] Add new choice and page to 'bob-barker' --- english/bob-barker/barker.md | 2 ++ english/bob-barker/eat-marshmallow/hot.md | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 english/bob-barker/eat-marshmallow/hot.md diff --git a/english/bob-barker/barker.md b/english/bob-barker/barker.md index 980100d94c..b6ba14d878 100644 --- a/english/bob-barker/barker.md +++ b/english/bob-barker/barker.md @@ -33,3 +33,5 @@ You hesitate just a moment before replying... [Grab some coffee?](../coffee/coffee.md) [Can I phone a friend?](phone-a-friend/phone-a-friend.md) + +[Attack and eat one of the marshmallows](eat-marshmallow/hot.md) diff --git a/english/bob-barker/eat-marshmallow/hot.md b/english/bob-barker/eat-marshmallow/hot.md new file mode 100644 index 0000000000..0af9b29eaf --- /dev/null +++ b/english/bob-barker/eat-marshmallow/hot.md @@ -0,0 +1,7 @@ +You grab for a handful of hot, gooey goodness and cram it into your gaping maw. +This was maybe a mistake. + +Unfortunately, it's hard to taste the sweetness of the marshmallow +with a mouthful of seared flesh. + +Your screams are incredible. In your agony you lose consciousness, collapsing to the floor. \ No newline at end of file From 180fc6c362b85a8a2990475d56aa5af65bcdb7c3 Mon Sep 17 00:00:00 2001 From: "U-ITSERVICES\\df649y" Date: Sun, 1 Nov 2015 16:41:50 -0800 Subject: [PATCH 1497/5486] add halloween reference to zork --- english/zork/zork.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/zork/zork.md b/english/zork/zork.md index 5bcede997d..974b9f48cd 100644 --- a/english/zork/zork.md +++ b/english/zork/zork.md @@ -5,3 +5,5 @@ You are likely to be eaten by a grue. Not to be confused with Felonious Gru and his minions... [What's a grue?](../grue/grue.md) + +Very scary story for halloween From 9f6f2d8be1bcb1149d504efa07e416e3c5113720 Mon Sep 17 00:00:00 2001 From: shainanigans Date: Mon, 2 Nov 2015 15:12:24 +1100 Subject: [PATCH 1498/5486] Add options to weed.md --- english/weed/weed.md | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/english/weed/weed.md b/english/weed/weed.md index 1f2cff1439..0cc1f1404f 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -1,7 +1,15 @@ -well weed contains THC which will make you high. +well weed contains THC which will make you high. To get it out and add to your cookies, use a fat to extract it. -Butter, Milk, cream can be used. -Put the weed in the fat in a pan and add weed. -Heat it for 30 minutes. -Add it to your cookie dough and bake them. -See you - Love Pink Unicorn \ No newline at end of file +Butter, Milk, cream can be used. +Put the weed in the fat in a pan and add weed. +Heat it for 30 minutes. +Add it to your cookie dough and bake them. +See you - Love Pink Unicorn + +Then you wonder why you're taking advice from a Love Pink Unicorn (after all, these are known to be the most untrustworthy breed of unicorn, far worse, even, than the Grim Charcoal Unicorns of Strawgoh). + +You decide to take a new path. Do you: +Take a vow of [sobriety]?(../shrooms/never-again.md) +Decide to go to [sleep] instead?(../sleep/marshmallow.md) +Opt for a [chemical-free nirvana]?(../sleep/sit-down-to-meditate.md) +Go [back to the room]?(../marshmallow.md) \ No newline at end of file From 599c668e24b8b3d772104aeb9e8168f4dca745a0 Mon Sep 17 00:00:00 2001 From: shainanigans Date: Mon, 2 Nov 2015 15:13:02 +1100 Subject: [PATCH 1499/5486] Add Bat Signal option for practice-flying.md --- english/super-powers/practice-flying.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/english/super-powers/practice-flying.md b/english/super-powers/practice-flying.md index 65114e4f6a..2daff3dd1f 100644 --- a/english/super-powers/practice-flying.md +++ b/english/super-powers/practice-flying.md @@ -1,8 +1,8 @@ -You can't save the world until you harness your new found power. -You jump up and down a few times but it doesn't amount to much. -You need to get higher. +You can't save the world until you harness your new found power. +You jump up and down a few times but it doesn't amount to much. +You need to get higher. -Your primal roots take over and you frantically climb the nearest tree. You gaze out accross the forest. +Your primal roots take over and you frantically climb the nearest tree. You gaze out accross the forest. You're pretty high up for an average citizen but not for Superman. Getting ready to jump, your heart beats harder than Dre. @@ -21,3 +21,5 @@ Do you: [Dance, dance for elevation?](../hammertime/hammertime.md) [Summon dragons!](../dragons/fire-everywhere.md) + +[Shine the Bat Signal?](../batman/batman.md) From dcde47ea4cf93cd8527b3b57d66284948cc11198 Mon Sep 17 00:00:00 2001 From: shainanigans Date: Mon, 2 Nov 2015 15:20:23 +1100 Subject: [PATCH 1500/5486] Add spaces between option lines --- english/weed/weed.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/weed/weed.md b/english/weed/weed.md index 0cc1f1404f..a932ca1612 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -9,7 +9,11 @@ See you - Love Pink Unicorn Then you wonder why you're taking advice from a Love Pink Unicorn (after all, these are known to be the most untrustworthy breed of unicorn, far worse, even, than the Grim Charcoal Unicorns of Strawgoh). You decide to take a new path. Do you: + Take a vow of [sobriety]?(../shrooms/never-again.md) + Decide to go to [sleep] instead?(../sleep/marshmallow.md) + Opt for a [chemical-free nirvana]?(../sleep/sit-down-to-meditate.md) + Go [back to the room]?(../marshmallow.md) \ No newline at end of file From 76c8d1c2de489c64a1a10bb924c054377d70e927 Mon Sep 17 00:00:00 2001 From: Sergejus Stankevicius Date: Mon, 2 Nov 2015 14:10:19 +0200 Subject: [PATCH 1501/5486] Add Apsisukti and Garsiau --- lithuanian/apsisukti/apsisukti.md | 1 + lithuanian/rekti/garsiau/garsiau.md | 1 + lithuanian/rekti/niekas.md | 2 ++ lithuanian/startas.md | 4 +++- 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 lithuanian/apsisukti/apsisukti.md create mode 100644 lithuanian/rekti/garsiau/garsiau.md diff --git a/lithuanian/apsisukti/apsisukti.md b/lithuanian/apsisukti/apsisukti.md new file mode 100644 index 0000000000..7b9b8451d8 --- /dev/null +++ b/lithuanian/apsisukti/apsisukti.md @@ -0,0 +1 @@ +Jis apsisuko ir pamatė \ No newline at end of file diff --git a/lithuanian/rekti/garsiau/garsiau.md b/lithuanian/rekti/garsiau/garsiau.md new file mode 100644 index 0000000000..6324a4681f --- /dev/null +++ b/lithuanian/rekti/garsiau/garsiau.md @@ -0,0 +1 @@ +Netrukus atbėgo trys vilkai \ No newline at end of file diff --git a/lithuanian/rekti/niekas.md b/lithuanian/rekti/niekas.md index a78a7937de..25bf24378b 100644 --- a/lithuanian/rekti/niekas.md +++ b/lithuanian/rekti/niekas.md @@ -3,3 +3,5 @@ Bet niekas neįvyksta [Užsimerkti](../uzsimerkti/vejas.md) [Vėl rėkti](./niekas.md) + +[Rėkti garsiau](garsiau/garsiau.md) \ No newline at end of file diff --git a/lithuanian/startas.md b/lithuanian/startas.md index 8e460eb94e..95adcfd3f1 100644 --- a/lithuanian/startas.md +++ b/lithuanian/startas.md @@ -6,4 +6,6 @@ Visiškoje tamsoje jis turėjo pasirinkti [Pradėti rėkti](rekti/niekas.md) -[Eiti miegoti](miegoti/miegas.md) \ No newline at end of file +[Eiti miegoti](miegoti/miegas.md) + +[Apsisukti](apsisukti/apsisukti.md) \ No newline at end of file From f6db4636f943abdc6ed036c33fda96d7a86d8149 Mon Sep 17 00:00:00 2001 From: sergejuss Date: Mon, 2 Nov 2015 14:20:03 +0200 Subject: [PATCH 1502/5486] Add blank lines at the end of modified files --- lithuanian/apsisukti/apsisukti.md | 2 +- lithuanian/rekti/garsiau/garsiau.md | 2 +- lithuanian/startas.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lithuanian/apsisukti/apsisukti.md b/lithuanian/apsisukti/apsisukti.md index 7b9b8451d8..6c9110269d 100644 --- a/lithuanian/apsisukti/apsisukti.md +++ b/lithuanian/apsisukti/apsisukti.md @@ -1 +1 @@ -Jis apsisuko ir pamatė \ No newline at end of file +Jis apsisuko ir pamatė diff --git a/lithuanian/rekti/garsiau/garsiau.md b/lithuanian/rekti/garsiau/garsiau.md index 6324a4681f..dbf5e1af91 100644 --- a/lithuanian/rekti/garsiau/garsiau.md +++ b/lithuanian/rekti/garsiau/garsiau.md @@ -1 +1 @@ -Netrukus atbėgo trys vilkai \ No newline at end of file +Netrukus atbėgo trys vilkai diff --git a/lithuanian/startas.md b/lithuanian/startas.md index 95adcfd3f1..50c800e1c0 100644 --- a/lithuanian/startas.md +++ b/lithuanian/startas.md @@ -8,4 +8,4 @@ Visiškoje tamsoje jis turėjo pasirinkti [Eiti miegoti](miegoti/miegas.md) -[Apsisukti](apsisukti/apsisukti.md) \ No newline at end of file +[Apsisukti](apsisukti/apsisukti.md) From 5a3eb30cd33c824cd712945b5b713367a2689406 Mon Sep 17 00:00:00 2001 From: Scott Burns Date: Mon, 2 Nov 2015 07:35:09 -0500 Subject: [PATCH 1503/5486] Add an Act of Kindness One good(?) deed begets another. --- english/kindness/acts-of-kindness.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/kindness/acts-of-kindness.md b/english/kindness/acts-of-kindness.md index 7f43159e51..988fd6467d 100644 --- a/english/kindness/acts-of-kindness.md +++ b/english/kindness/acts-of-kindness.md @@ -1,3 +1,6 @@ I made my parents happy today. -Today, I pooped in my neighbor's garden, so that his zucchini may grow large and deep green in color. \ No newline at end of file +Today, I pooped in my neighbor's garden, so that his zucchini may grow large and deep green in color. + +Due to the extra fertilization he grew more zucchini than he and his family +could eat. The extra was donated to a local food bank. From 03b3b4eae84e6b91210fc4702122a585699c5d1f Mon Sep 17 00:00:00 2001 From: felix Date: Mon, 2 Nov 2015 18:02:31 +0100 Subject: [PATCH 1504/5486] Story continuation, toilet. --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 7817efa22a..e693daae31 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -586,3 +586,5 @@ As you hold your pot of precious hunny, you begin to [hear an ominous voice...]( Honesty in a hard way [Watch it](few-good-men/fgm.md) Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube.com/watch?v=lAF8D0ugyVk) + +But the call of of nature wasn't going away so you push open the toilet door and go in.. From 8165ba512562d7b4998249bd234fb1d2bb00b03f Mon Sep 17 00:00:00 2001 From: Melkoroth Date: Mon, 2 Nov 2015 20:34:37 +0100 Subject: [PATCH 1505/5486] Fixed a typo and sentence continuity --- espanol/poseso/poseso.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/espanol/poseso/poseso.md b/espanol/poseso/poseso.md index 6f437ea010..7241bfdb04 100644 --- a/espanol/poseso/poseso.md +++ b/espanol/poseso/poseso.md @@ -1,5 +1,5 @@ Con los ojos muy abiertos y haciendo aspavientos con las manos, -el Consejero gritaba ante la atónica mirada de la multitud... +el Consejero gritaba ante la atónita mirada de la multitud... -Y una persona dentro de la multitud empezó a gritar, el de al lado le siguió, +Cuando una persona dentro de la multitud empezó a gritar, el de al lado le siguió, y el de al lado también. Pronto toda la multitud gritaba junto con el Consejero... \ No newline at end of file From f950d79dd529e788df424b73862d27a62e5c7362 Mon Sep 17 00:00:00 2001 From: shainanigans Date: Tue, 3 Nov 2015 09:07:46 +1100 Subject: [PATCH 1506/5486] Make weed.md lines less than 120 characters --- english/weed/weed.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/weed/weed.md b/english/weed/weed.md index a932ca1612..a5a41c2411 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -6,7 +6,8 @@ Heat it for 30 minutes. Add it to your cookie dough and bake them. See you - Love Pink Unicorn -Then you wonder why you're taking advice from a Love Pink Unicorn (after all, these are known to be the most untrustworthy breed of unicorn, far worse, even, than the Grim Charcoal Unicorns of Strawgoh). +Then you wonder why you're taking advice from a Love Pink Unicorn (after all, these are known to be +the most untrustworthy breed of unicorn, far worse, even, than the Grim Charcoal Unicorns of Strawgoh). You decide to take a new path. Do you: From 7a120d6379f679f092328c41c3df367f967c6727 Mon Sep 17 00:00:00 2001 From: wandrinstar Date: Tue, 3 Nov 2015 08:09:13 +0700 Subject: [PATCH 1507/5486] It's not that hot. --- english/singapore/singapore.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/singapore/singapore.md b/english/singapore/singapore.md index b45866ddee..f4a21a3d66 100644 --- a/english/singapore/singapore.md +++ b/english/singapore/singapore.md @@ -11,4 +11,8 @@ significantly smaller islets; also, land reclamation has been used to expand Singapore's land area, which is highly urbanised. As the plane doors open, you are hit by a wave of hot air. -It is 31 degrees outside right now. A typical day in Singapore. \ No newline at end of file +It is 31 degrees outside right now. A typical day in Singapore. + +You realize that 31 degrees is not really that hot. + +Do you chide yourself for whining? \ No newline at end of file From 9b7b095a69e1eddfdf4ebbcb79358ef47291b8d1 Mon Sep 17 00:00:00 2001 From: Dirk Ages Date: Tue, 3 Nov 2015 09:16:10 +0100 Subject: [PATCH 1508/5486] Opties toegevoegd aan lopen --- dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md b/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md index b72565efce..f5ad1e6a7f 100644 --- a/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md +++ b/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md @@ -1,2 +1,8 @@ Je begint te rennen en kijkt na 50 meter om, je ziet de zware jongens achter je aan rennen. -Wat doe je? \ No newline at end of file +Wat doe je? + +Je laat je op de grond vallen en doet alsof je dood bent. + +Je klimt in een boom. + +Je stopt, [draait je om](omdraaien/terugrennen.md) en rent zo hard als je kan op de zware jongens af. \ No newline at end of file From 2677327644843b07db78da97b19d3330ab286d90 Mon Sep 17 00:00:00 2001 From: Dirk Ages Date: Tue, 3 Nov 2015 09:19:22 +0100 Subject: [PATCH 1509/5486] Pagina toegevoegd voor de optie terugrennen --- .../meehelpen/plassen/lopen/omdraaien/terugrennen.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 dutch/bos/ontvoering/meehelpen/plassen/lopen/omdraaien/terugrennen.md diff --git a/dutch/bos/ontvoering/meehelpen/plassen/lopen/omdraaien/terugrennen.md b/dutch/bos/ontvoering/meehelpen/plassen/lopen/omdraaien/terugrennen.md new file mode 100644 index 0000000000..3ab87afc41 --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/plassen/lopen/omdraaien/terugrennen.md @@ -0,0 +1,3 @@ +Terwijl je rent zie je dat de mannen afremmen en angstig jouw kant op kijken. +Vervolgens draaien ze zich om en rennen van je af. Terwijl je je afvraagt waarom ze dat zouden doen, +gebeurt er het volgende: \ No newline at end of file From 0625e26117671ca8f21cba37786c6cfb70ee0d98 Mon Sep 17 00:00:00 2001 From: Martin Kjems Date: Tue, 3 Nov 2015 11:51:53 +0100 Subject: [PATCH 1510/5486] Changed some danish files to UTF-8 --- danish/snitting/snitting.md | 2 +- danish/synging/synging.md | 2 +- danish/velkommen.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/danish/snitting/snitting.md b/danish/snitting/snitting.md index f6ae95cd05..faffa90dbe 100644 --- a/danish/snitting/snitting.md +++ b/danish/snitting/snitting.md @@ -4,4 +4,4 @@ Vælger du at: [Spørge "Why is it egentlig that you are always, snitting Günther?"](https://www.youtube.com/watch?v=2WS7iJNb4lI) -[Spørge "Then I will go there over and drik some øl with Hansi"](../velkommen.md) \ No newline at end of file +[Spørge "Then I will go there over and drik some øl with Hansi"](../velkommen.md) diff --git a/danish/synging/synging.md b/danish/synging/synging.md index c601552c37..0793965228 100644 --- a/danish/synging/synging.md +++ b/danish/synging/synging.md @@ -6,4 +6,4 @@ Hvilken sang vælger du: [Synge “it's hard to be a nissemann“](https://www.youtube.com/watch?v=JqyjDQGS_Sg) -[Spørge "Then I will go there over and drik some øl with Hansi"](../velkommen.md) \ No newline at end of file +[Spørge "Then I will go there over and drik some øl with Hansi"](../velkommen.md) diff --git a/danish/velkommen.md b/danish/velkommen.md index 3a6fe7edd5..e728ad674a 100644 --- a/danish/velkommen.md +++ b/danish/velkommen.md @@ -8,4 +8,4 @@ Vælger du at: [Spørge "Well Gynter! How goes it with the snitting?"](snitting/snitting.md) -[Prøver at lette stemningen](synging/synging.md) \ No newline at end of file +[Prøver at lette stemningen](synging/synging.md) From 2f29094aa30c1bb181368d4bd5f14f6640ec1be8 Mon Sep 17 00:00:00 2001 From: Martin Kjems Date: Tue, 3 Nov 2015 11:54:14 +0100 Subject: [PATCH 1511/5486] An extra line of text to danish page --- danish/snitting/snitting.md | 1 + 1 file changed, 1 insertion(+) diff --git a/danish/snitting/snitting.md b/danish/snitting/snitting.md index faffa90dbe..6da8c09d7a 100644 --- a/danish/snitting/snitting.md +++ b/danish/snitting/snitting.md @@ -1,4 +1,5 @@ Günther siger "It is not so lige til", og fortsætter med at snitte. +Og det kan han jo ha ret i. Vælger du at: From 717cb2907420105993e5e53e47245a2cd6626409 Mon Sep 17 00:00:00 2001 From: Rodrigo Gonzalez Date: Tue, 3 Nov 2015 16:48:34 +0000 Subject: [PATCH 1512/5486] Add option of kill-rats to warning ignore --- english/kill-rats/kill-rats.md | 1 + english/warning-ignore/ignore.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/kill-rats/kill-rats.md diff --git a/english/kill-rats/kill-rats.md b/english/kill-rats/kill-rats.md new file mode 100644 index 0000000000..3bc705b322 --- /dev/null +++ b/english/kill-rats/kill-rats.md @@ -0,0 +1 @@ +You start to smash the rats with your feets and to punch the ones who jump to you, but no matter how bravely you fight they start to eat your body until your end... \ No newline at end of file diff --git a/english/warning-ignore/ignore.md b/english/warning-ignore/ignore.md index debdc6af2a..87914eb89a 100644 --- a/english/warning-ignore/ignore.md +++ b/english/warning-ignore/ignore.md @@ -3,3 +3,5 @@ to a rustling sound. Deciding to investigate you go to the other room only to find it filled with rats. There is a moment of silence when the rats stop moving and stare at you. Then suddenly, as quickly as a flash of lightening the rats begin to swarm you. + +Then you decide to [kill them](../kill-rats/kill-rats.md). \ No newline at end of file From 6ae0bce505239cd563925cfaff126ee805fe3c03 Mon Sep 17 00:00:00 2001 From: Rodrigo Gonzalez Date: Tue, 3 Nov 2015 17:05:12 +0000 Subject: [PATCH 1513/5486] Break in two lines --- english/kill-rats/kill-rats.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/kill-rats/kill-rats.md b/english/kill-rats/kill-rats.md index 3bc705b322..44f84aa594 100644 --- a/english/kill-rats/kill-rats.md +++ b/english/kill-rats/kill-rats.md @@ -1 +1,2 @@ -You start to smash the rats with your feets and to punch the ones who jump to you, but no matter how bravely you fight they start to eat your body until your end... \ No newline at end of file +You start to smash the rats with your feets and to punch the ones who jump to you, +but no matter how bravely you fight they start to eat your body until your end... \ No newline at end of file From 458ad92a0214bc8fbf51406a3d22373db1559ae0 Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Tue, 3 Nov 2015 10:03:20 -0800 Subject: [PATCH 1514/5486] Further ruminations on TASTAAFL --- english/free-lunch/free-lunch.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/free-lunch/free-lunch.md b/english/free-lunch/free-lunch.md index b5f859af44..7ea8f6b152 100644 --- a/english/free-lunch/free-lunch.md +++ b/english/free-lunch/free-lunch.md @@ -1,2 +1,4 @@ "There's no such thing as a free lunch." Things that are offered for free always have a hidden cost. + +Sometimes somebody else pays that hidden cost, but usually it's you. From 00eab0d7de06ad55ae0c9e981ecbb318fde66816 Mon Sep 17 00:00:00 2001 From: Alan Spiewak Date: Tue, 3 Nov 2015 16:11:29 -0500 Subject: [PATCH 1515/5486] Make narrative second-person, present-tense to match parent --- .../nude-run/warm-water/surrender/surrender.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/english/coffee/nude-run/warm-water/surrender/surrender.md b/english/coffee/nude-run/warm-water/surrender/surrender.md index e269588229..3076e99a92 100644 --- a/english/coffee/nude-run/warm-water/surrender/surrender.md +++ b/english/coffee/nude-run/warm-water/surrender/surrender.md @@ -9,11 +9,11 @@ you are sad. "Close your eyes, and feel, see, those bees inside you." -As he said that, a warm feeling started radiating from my -core. I could feel the bees zooming through my body, and -every single cell began to vibrate along with their buzz. +As he says that, a warm feeling starts radiating from your +core. You can feel the bees zooming through your body, and +every single cell begins to vibrate along with their buzz. -I only opened my eyes when my skin felt wet, sticky. -Surprisingly (or maybe not), I was covered in honey. +You only open your eyes when your skin feels wet, sticky. +Surprisingly (or maybe not), you are covered in honey. -My teacher, the badger, was gone. \ No newline at end of file +Your teacher, the badger, is gone. From aba15ceb9858101a388aaacf1bfda6fceae22e66 Mon Sep 17 00:00:00 2001 From: moohgate Date: Tue, 3 Nov 2015 14:16:27 -0800 Subject: [PATCH 1516/5486] Add 2 sentences to acts-of-kindness.md --- english/kindness/acts-of-kindness.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/kindness/acts-of-kindness.md b/english/kindness/acts-of-kindness.md index 988fd6467d..78f9209fa6 100644 --- a/english/kindness/acts-of-kindness.md +++ b/english/kindness/acts-of-kindness.md @@ -4,3 +4,5 @@ Today, I pooped in my neighbor's garden, so that his zucchini may grow large and Due to the extra fertilization he grew more zucchini than he and his family could eat. The extra was donated to a local food bank. + +He also gave some zucchinis to our family. Mom cut them up and cooked zucchini pie for dinner. From d039f0b23e864c0bf388fec88992cb7a54fb52eb Mon Sep 17 00:00:00 2001 From: sarah du Date: Tue, 3 Nov 2015 19:59:04 -0500 Subject: [PATCH 1517/5486] added line to acts of kindness story --- english/kindness/acts-of-kindness.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/kindness/acts-of-kindness.md b/english/kindness/acts-of-kindness.md index 78f9209fa6..49f874201c 100644 --- a/english/kindness/acts-of-kindness.md +++ b/english/kindness/acts-of-kindness.md @@ -6,3 +6,5 @@ Due to the extra fertilization he grew more zucchini than he and his family could eat. The extra was donated to a local food bank. He also gave some zucchinis to our family. Mom cut them up and cooked zucchini pie for dinner. + +My favorite vegetable is zucchini and my sister's favorite dish is zucchini pie, so you can imagine how happy we were. From 7c31de18efad8ec42c9a30c0b040017cee38a18d Mon Sep 17 00:00:00 2001 From: Alan Spiewak Date: Tue, 3 Nov 2015 20:59:13 -0500 Subject: [PATCH 1518/5486] Add choice-point to surrender.md, pointing to 2 stubs --- .../warm-water/surrender/collect-honey/collect-honey.md | 1 + .../warm-water/surrender/follow-badger/follow-badger.md | 1 + english/coffee/nude-run/warm-water/surrender/surrender.md | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 english/coffee/nude-run/warm-water/surrender/collect-honey/collect-honey.md create mode 100644 english/coffee/nude-run/warm-water/surrender/follow-badger/follow-badger.md diff --git a/english/coffee/nude-run/warm-water/surrender/collect-honey/collect-honey.md b/english/coffee/nude-run/warm-water/surrender/collect-honey/collect-honey.md new file mode 100644 index 0000000000..7a14a59092 --- /dev/null +++ b/english/coffee/nude-run/warm-water/surrender/collect-honey/collect-honey.md @@ -0,0 +1 @@ +Stub file to test navigation diff --git a/english/coffee/nude-run/warm-water/surrender/follow-badger/follow-badger.md b/english/coffee/nude-run/warm-water/surrender/follow-badger/follow-badger.md new file mode 100644 index 0000000000..7a14a59092 --- /dev/null +++ b/english/coffee/nude-run/warm-water/surrender/follow-badger/follow-badger.md @@ -0,0 +1 @@ +Stub file to test navigation diff --git a/english/coffee/nude-run/warm-water/surrender/surrender.md b/english/coffee/nude-run/warm-water/surrender/surrender.md index 3076e99a92..76e254f7d3 100644 --- a/english/coffee/nude-run/warm-water/surrender/surrender.md +++ b/english/coffee/nude-run/warm-water/surrender/surrender.md @@ -17,3 +17,8 @@ You only open your eyes when your skin feels wet, sticky. Surprisingly (or maybe not), you are covered in honey. Your teacher, the badger, is gone. + +Do you: +[Collect the honey?] (collect-honey/collect-honey.md) + +[Follow the badger?] (follow-badger/follow-badger.md) From e6acc7be357c2930178107acdd755cc3f8170040 Mon Sep 17 00:00:00 2001 From: Alan Spiewak Date: Tue, 3 Nov 2015 23:36:10 -0500 Subject: [PATCH 1519/5486] Add text to both new choice-options --- .../surrender/collect-honey/collect-honey.md | 13 +++++++++- .../surrender/follow-badger/follow-badger.md | 26 ++++++++++++++++++- .../warm-water/surrender/surrender.md | 1 + 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/english/coffee/nude-run/warm-water/surrender/collect-honey/collect-honey.md b/english/coffee/nude-run/warm-water/surrender/collect-honey/collect-honey.md index 7a14a59092..2344207953 100644 --- a/english/coffee/nude-run/warm-water/surrender/collect-honey/collect-honey.md +++ b/english/coffee/nude-run/warm-water/surrender/collect-honey/collect-honey.md @@ -1 +1,12 @@ -Stub file to test navigation +You stand, alone on the empty beach, puzzled by the honey +covering your body. (Aren't you glad you weren't wearing a +wetsuit to entrap you in the honey?) You ache to examine +the honey, but how? Suddenly you notice, on the badger's +armchair, his pad and pen. There is a note on the pad - +"Fill me" - with an arrow pointing to the right. Next to +the arrow you discover an empty jar with a butter-knife +in it. + +You take the jar and, with the butter knife, you fill it +by scraping the honey from your skin. Staring into the +depths of the honey, you are transfixed. diff --git a/english/coffee/nude-run/warm-water/surrender/follow-badger/follow-badger.md b/english/coffee/nude-run/warm-water/surrender/follow-badger/follow-badger.md index 7a14a59092..519b7d285d 100644 --- a/english/coffee/nude-run/warm-water/surrender/follow-badger/follow-badger.md +++ b/english/coffee/nude-run/warm-water/surrender/follow-badger/follow-badger.md @@ -1 +1,25 @@ -Stub file to test navigation +Bereft, you look all around yourself for signs of the badger. +All that you see is the armchair, which looks as alone as you +feel. You approach it, hoping for a sign of what to do. A +hitch in the herringbone on one arm catches your eye, and +you recognize one of the badger's hairs lodged in the wool +upholstery. + +You take the grey hair and sit, uncomfortably sticky, on the +armchair, holding the badger hair aloft like an unlit torch. +What was it that the badger said? "The more I think about it, +the more certain I become that we are all made of bees." + +You close your eyes again and see the badger's deep eyes. You +reach inward to connect with the state of bee-ing that you +share with the badger - with all badgers. You feel the honey +on your skin buzz and lift, your inner bees carrying you +gently into the warm and salty onshore breeze. Your eyes +tightly closed, you cannot tell whether you are being borne +swiftly or not at all into the breeze. Suddenly you feel your +bare feet touch warm stone, and you are standing. You open +your eyes to the welcome sight of your teacher, the badger, +nattily dressed as before. + +"I sense that you are a coffee drinker," he says. Would you +care for a cup? diff --git a/english/coffee/nude-run/warm-water/surrender/surrender.md b/english/coffee/nude-run/warm-water/surrender/surrender.md index 76e254f7d3..df40abbd14 100644 --- a/english/coffee/nude-run/warm-water/surrender/surrender.md +++ b/english/coffee/nude-run/warm-water/surrender/surrender.md @@ -19,6 +19,7 @@ Surprisingly (or maybe not), you are covered in honey. Your teacher, the badger, is gone. Do you: + [Collect the honey?] (collect-honey/collect-honey.md) [Follow the badger?] (follow-badger/follow-badger.md) From 5cb3dedd9526cc7c08ff4299f5b97d635c521507 Mon Sep 17 00:00:00 2001 From: Jason Gordon Date: Tue, 3 Nov 2015 22:18:14 -0800 Subject: [PATCH 1520/5486] Added pre-existing choice point to go for a swim --- english/coffee/drink-water/drink.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/coffee/drink-water/drink.md b/english/coffee/drink-water/drink.md index 91881d5aad..3a4952172b 100644 --- a/english/coffee/drink-water/drink.md +++ b/english/coffee/drink-water/drink.md @@ -3,4 +3,8 @@ but you have to keep drinking, now your stomach swells to the size of a hot air balloon. You start feeling an urge to release some pressure... -Do you find the nearest [bathroom](bathroom/bathroom.md)? +Do you want to: + +[Find the nearest bathroom](bathroom/bathroom.md)? + +[Go for a swim](Swim/swim.md) \ No newline at end of file From ba74be4acaecfc353f296e21c1ea2e473dd898d0 Mon Sep 17 00:00:00 2001 From: Milkey SUFC Date: Wed, 4 Nov 2015 11:04:55 +0000 Subject: [PATCH 1521/5486] Add "or-do-you" to the story --- english/or-do-you/or-do-you.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/or-do-you/or-do-you.md diff --git a/english/or-do-you/or-do-you.md b/english/or-do-you/or-do-you.md new file mode 100644 index 0000000000..dd5f921d00 --- /dev/null +++ b/english/or-do-you/or-do-you.md @@ -0,0 +1 @@ +Well, it was New Year's Eve. Even hardened stop-at-home-Sundays geeks like us go out for New Years. From 661a5945ffc18c1d8cdc42821b86a00ee5d86d87 Mon Sep 17 00:00:00 2001 From: Milkey SUFC Date: Wed, 4 Nov 2015 11:20:01 +0000 Subject: [PATCH 1522/5486] Add line to reach "or-do-you" in marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index a89817f227..50f61ad742 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -14,6 +14,8 @@ Or a Wednesday...Thursday...maybe even a Friday. Ok, we have to consider Saturday too. +But not Monday; you never go out on a Sunday evening......[or do you](./or-do-you/or-do-you.md)? + Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. For a second, you decide whether or not to just [go back to sleep](go-back-to-sleep/go-back-to-sleep.md) From 1b5be1e441a7cb29df84b0d6fcdf7405d5be4232 Mon Sep 17 00:00:00 2001 From: LaGracia Date: Wed, 4 Nov 2015 22:12:30 +0700 Subject: [PATCH 1523/5486] Delete file that duplicates an existing page This file expands on a previously existing option in the story. However, instead of adding the new options in a separate file, I should edit the file that already exists in the directory. --- english/lightsaber-falls/lightsaber-falls.md | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 english/lightsaber-falls/lightsaber-falls.md diff --git a/english/lightsaber-falls/lightsaber-falls.md b/english/lightsaber-falls/lightsaber-falls.md deleted file mode 100644 index 0fb01ad269..0000000000 --- a/english/lightsaber-falls/lightsaber-falls.md +++ /dev/null @@ -1,9 +0,0 @@ -You slice through the marshmallow man with your lightsaber. -Luckily for you, the heat from it cooks the marshmallows to perfection. -You now have a tasty snack and a way out of the house. - -But as you hurry to smoosh through the slowly closing hole in the wall, the lightsaber clatters to the floor. - -[You leap out nimbly and gaze back at the weapon](https://github.com/LaGracia/create-your-own-adventure/blob/lightsaber-falls/english/lightsaber-falls/wampa.md). - -[You try to regain the weapon but only get coated in a sticky glaze of whiteness](https://github.com/LaGracia/create-your-own-adventure/blob/lightsaber-falls/english/lightsaber-falls/shoot.md). \ No newline at end of file From 371fa69f3156cebb786daf4490e5f83bdf2b6986 Mon Sep 17 00:00:00 2001 From: LaGracia Date: Wed, 4 Nov 2015 22:28:28 +0700 Subject: [PATCH 1524/5486] Break up lines in to make them easier to read --- english/lightsaber-falls/shoot.md | 53 +++++++++++++++++++------------ english/lightsaber-falls/wampa.md | 5 +-- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/english/lightsaber-falls/shoot.md b/english/lightsaber-falls/shoot.md index 1b81420497..3b63c59071 100644 --- a/english/lightsaber-falls/shoot.md +++ b/english/lightsaber-falls/shoot.md @@ -1,32 +1,43 @@ -Sadly, you don't possess enough midi-chlorians to make you truly strong with the Force. You'll have to leave that fancy -weapon behind and go with what you've got. +Sadly, you don't possess enough midi-chlorians to make you truly strong +with the Force. You'll have to leave that fancy weapon behind +and go with what you've got. -As you clamber awkwardly out the other side of the goo, you hear a smug voice: +As you clamber awkwardly out the other side of the goo, +you hear a smug voice: "Koona t'chuta, Solo?" -Agh. You knew you couldn't outrun him. You just didn't think he'd find you here. +Agh. You knew you couldn't outrun him. You just didn't think +he'd find you here. -"Yes, Greedo. As a matter of fact, I'm trying to get out of this freaky marshmallow house. Tell Jabba I've got his money." +"Yes, Greedo. As a matter of fact, I'm trying to get out of this freaky +marshmallow house. Tell Jabba I've got his money." "Soong peetch alay!" -And then he says some stuff you don't understand without subtitles, but you get the gist of the message, so you reassure -him: "Yeah, but this time I've got the money." - -He tries to bribe you, thinking you'd be desperate enough to hand him the payment (even if you really did have it) right -here, outside a melting mansion. You chuckle patronizingly. "I don't have it with me. Tell Jabba - " - -But he cuts you off and insults you, and now you're seriously annoyed. Your left leg is still inside the collapsing -candy house, for pete's sake! You're in a weird lunging position affording no mood to be humoring a third-rate galactic -bounty hunter. Trying to reach for your holster, you grumble: "Even I get boarded sometimes. Do you think I had a -choice?" - -He says something about Jabba again, a name he regularly uses to threaten you with bodily harm. Or even worse: to -threaten the Falcon with bodily harm. You growl, "Over my dead body!" - -He is so self-satisfied he thinks you've given him the punchline. That's the idea, he retorts. He's been looking forward -to this for a long time. +And then he says some stuff you don't understand without subtitles, +but you get the gist of the message, so you reassure him: "Yeah, +but this time I've got the money." + +He tries to bribe you, thinking you'd be desperate enough to hand him +the payment (even if you really did have it) right here, outside +a melting mansion. You chuckle patronizingly. "I don't have it with me. +Tell Jabba - " + +But he cuts you off and insults you, and now you're seriously annoyed. +Your left leg is still inside the collapsing candy house, for pete's +sake! You're in a weird lunging position affording no mood to be +humoring a third-rate galactic bounty hunter. Trying to reach for your +holster, you grumble: "Even I get boarded sometimes. Do you think I had +a choice?" + +He says something about Jabba again, a name he regularly uses +to threaten you with bodily harm. Or even worse: to threaten +the Falcon with bodily harm. You growl, "Over my dead body!" + +He is so self-satisfied he thinks you've given him the punchline. +That's the idea, he retorts. He's been looking forward to this +for a long time. You reply, "Yes, I'll bet you have." diff --git a/english/lightsaber-falls/wampa.md b/english/lightsaber-falls/wampa.md index dc4890ae06..9405c48701 100644 --- a/english/lightsaber-falls/wampa.md +++ b/english/lightsaber-falls/wampa.md @@ -1,4 +1,5 @@ -The Force is strong within you. You stretch out your hand and the lightsaber flies up into it. As you turn to stride away from the melting marshmallow mansion, you hear a blood- -curdling roar. +The Force is strong within you. You stretch out your hand +and the lightsaber flies up into it. As you turn to stride away +from the melting marshmallow mansion, you hear a blood-curdling roar. You run into something, and it's not just the cold. \ No newline at end of file From 42eb77c8c6682af31b68f5967716137817d3f04c Mon Sep 17 00:00:00 2001 From: LaGracia Date: Wed, 4 Nov 2015 23:00:29 +0700 Subject: [PATCH 1525/5486] Move my contribution to the correct directory --- english/lightsaber/lightsaber.md | 10 ++++++- english/lightsaber/shoot.md | 48 ++++++++++++++++++++++++++++++++ english/lightsaber/wampa.md | 5 ++++ 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 english/lightsaber/shoot.md create mode 100644 english/lightsaber/wampa.md diff --git a/english/lightsaber/lightsaber.md b/english/lightsaber/lightsaber.md index d2d66ec0ba..89ba7fc71a 100644 --- a/english/lightsaber/lightsaber.md +++ b/english/lightsaber/lightsaber.md @@ -1,3 +1,11 @@ You slice through the marshmallow man with your lightsaber. Luckily for you, the heat from it cooks the marshmallows to perfection. -You now have a tasty snack and a way out of the house. \ No newline at end of file +You now have a tasty snack and a way out of the house. + +But as you hurry to smoosh through the slowly closing hole in the wall, +the lightsaber clatters to the floor. + +[You leap out nimbly and gaze back at the weapon](https://github.com/LaGracia/create-your-own-adventure/blob/lightsaber-falls/english/lightsaber-falls/wampa.md). + +[You try to regain the weapon but only get coated +in a sticky glaze of whiteness](https://github.com/LaGracia/create-your-own-adventure/blob/lightsaber-falls/english/lightsaber-falls/shoot.md). \ No newline at end of file diff --git a/english/lightsaber/shoot.md b/english/lightsaber/shoot.md new file mode 100644 index 0000000000..3b63c59071 --- /dev/null +++ b/english/lightsaber/shoot.md @@ -0,0 +1,48 @@ +Sadly, you don't possess enough midi-chlorians to make you truly strong +with the Force. You'll have to leave that fancy weapon behind +and go with what you've got. + +As you clamber awkwardly out the other side of the goo, +you hear a smug voice: + +"Koona t'chuta, Solo?" + +Agh. You knew you couldn't outrun him. You just didn't think +he'd find you here. + +"Yes, Greedo. As a matter of fact, I'm trying to get out of this freaky +marshmallow house. Tell Jabba I've got his money." + +"Soong peetch alay!" + +And then he says some stuff you don't understand without subtitles, +but you get the gist of the message, so you reassure him: "Yeah, +but this time I've got the money." + +He tries to bribe you, thinking you'd be desperate enough to hand him +the payment (even if you really did have it) right here, outside +a melting mansion. You chuckle patronizingly. "I don't have it with me. +Tell Jabba - " + +But he cuts you off and insults you, and now you're seriously annoyed. +Your left leg is still inside the collapsing candy house, for pete's +sake! You're in a weird lunging position affording no mood to be +humoring a third-rate galactic bounty hunter. Trying to reach for your +holster, you grumble: "Even I get boarded sometimes. Do you think I had +a choice?" + +He says something about Jabba again, a name he regularly uses +to threaten you with bodily harm. Or even worse: to threaten +the Falcon with bodily harm. You growl, "Over my dead body!" + +He is so self-satisfied he thinks you've given him the punchline. +That's the idea, he retorts. He's been looking forward to this +for a long time. + +You reply, "Yes, I'll bet you have." + +Do you: + +Shoot first? + +Wait until he shoots, and then shoot back with better aim? diff --git a/english/lightsaber/wampa.md b/english/lightsaber/wampa.md new file mode 100644 index 0000000000..9405c48701 --- /dev/null +++ b/english/lightsaber/wampa.md @@ -0,0 +1,5 @@ +The Force is strong within you. You stretch out your hand +and the lightsaber flies up into it. As you turn to stride away +from the melting marshmallow mansion, you hear a blood-curdling roar. + +You run into something, and it's not just the cold. \ No newline at end of file From cfb305c49546d36cbd583161daafd19e3f8e4ce7 Mon Sep 17 00:00:00 2001 From: LaGracia Date: Wed, 4 Nov 2015 23:28:52 +0700 Subject: [PATCH 1526/5486] Delete duplicate files --- english/lightsaber-falls/shoot.md | 48 ------------------------------- english/lightsaber-falls/wampa.md | 5 ---- 2 files changed, 53 deletions(-) delete mode 100644 english/lightsaber-falls/shoot.md delete mode 100644 english/lightsaber-falls/wampa.md diff --git a/english/lightsaber-falls/shoot.md b/english/lightsaber-falls/shoot.md deleted file mode 100644 index 3b63c59071..0000000000 --- a/english/lightsaber-falls/shoot.md +++ /dev/null @@ -1,48 +0,0 @@ -Sadly, you don't possess enough midi-chlorians to make you truly strong -with the Force. You'll have to leave that fancy weapon behind -and go with what you've got. - -As you clamber awkwardly out the other side of the goo, -you hear a smug voice: - -"Koona t'chuta, Solo?" - -Agh. You knew you couldn't outrun him. You just didn't think -he'd find you here. - -"Yes, Greedo. As a matter of fact, I'm trying to get out of this freaky -marshmallow house. Tell Jabba I've got his money." - -"Soong peetch alay!" - -And then he says some stuff you don't understand without subtitles, -but you get the gist of the message, so you reassure him: "Yeah, -but this time I've got the money." - -He tries to bribe you, thinking you'd be desperate enough to hand him -the payment (even if you really did have it) right here, outside -a melting mansion. You chuckle patronizingly. "I don't have it with me. -Tell Jabba - " - -But he cuts you off and insults you, and now you're seriously annoyed. -Your left leg is still inside the collapsing candy house, for pete's -sake! You're in a weird lunging position affording no mood to be -humoring a third-rate galactic bounty hunter. Trying to reach for your -holster, you grumble: "Even I get boarded sometimes. Do you think I had -a choice?" - -He says something about Jabba again, a name he regularly uses -to threaten you with bodily harm. Or even worse: to threaten -the Falcon with bodily harm. You growl, "Over my dead body!" - -He is so self-satisfied he thinks you've given him the punchline. -That's the idea, he retorts. He's been looking forward to this -for a long time. - -You reply, "Yes, I'll bet you have." - -Do you: - -Shoot first? - -Wait until he shoots, and then shoot back with better aim? diff --git a/english/lightsaber-falls/wampa.md b/english/lightsaber-falls/wampa.md deleted file mode 100644 index 9405c48701..0000000000 --- a/english/lightsaber-falls/wampa.md +++ /dev/null @@ -1,5 +0,0 @@ -The Force is strong within you. You stretch out your hand -and the lightsaber flies up into it. As you turn to stride away -from the melting marshmallow mansion, you hear a blood-curdling roar. - -You run into something, and it's not just the cold. \ No newline at end of file From 3be928395f3a34337e2bb11dd2fdadb1a6dd5516 Mon Sep 17 00:00:00 2001 From: LaGracia Date: Wed, 4 Nov 2015 23:32:07 +0700 Subject: [PATCH 1527/5486] Change links from absolute to relative --- english/lightsaber/lightsaber.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/english/lightsaber/lightsaber.md b/english/lightsaber/lightsaber.md index 89ba7fc71a..ad87469721 100644 --- a/english/lightsaber/lightsaber.md +++ b/english/lightsaber/lightsaber.md @@ -5,7 +5,6 @@ You now have a tasty snack and a way out of the house. But as you hurry to smoosh through the slowly closing hole in the wall, the lightsaber clatters to the floor. -[You leap out nimbly and gaze back at the weapon](https://github.com/LaGracia/create-your-own-adventure/blob/lightsaber-falls/english/lightsaber-falls/wampa.md). +[You leap out nimbly and gaze back at the weapon](english/lightsaber/wampa.md). -[You try to regain the weapon but only get coated -in a sticky glaze of whiteness](https://github.com/LaGracia/create-your-own-adventure/blob/lightsaber-falls/english/lightsaber-falls/shoot.md). \ No newline at end of file +[You try to regain the weapon but only get coated in a sticky glaze of whiteness](english/lightsaber/shoot.md). \ No newline at end of file From 4439e94af3dd4c29dd891cf2e1843f3740c24665 Mon Sep 17 00:00:00 2001 From: LaGracia Date: Thu, 5 Nov 2015 00:46:14 +0700 Subject: [PATCH 1528/5486] Correct links to the 2 new pages --- english/lightsaber/lightsaber.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/lightsaber/lightsaber.md b/english/lightsaber/lightsaber.md index ad87469721..6a5eac6f47 100644 --- a/english/lightsaber/lightsaber.md +++ b/english/lightsaber/lightsaber.md @@ -5,6 +5,6 @@ You now have a tasty snack and a way out of the house. But as you hurry to smoosh through the slowly closing hole in the wall, the lightsaber clatters to the floor. -[You leap out nimbly and gaze back at the weapon](english/lightsaber/wampa.md). +[You leap out nimbly and gaze back at the weapon](lightsaber/wampa.md). -[You try to regain the weapon but only get coated in a sticky glaze of whiteness](english/lightsaber/shoot.md). \ No newline at end of file +[You try to regain the weapon but only get coated in a sticky glaze of whiteness](lightsaber/shoot.md). \ No newline at end of file From bd7e1550ec9b7f0d8eb1ca23a40b37f1d1b6be0b Mon Sep 17 00:00:00 2001 From: LaGracia Date: Thu, 5 Nov 2015 01:14:53 +0700 Subject: [PATCH 1529/5486] Move my story pages to their own subdirectories --- english/lightsaber/{ => shoot}/shoot.md | 0 english/lightsaber/{ => wampa}/wampa.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename english/lightsaber/{ => shoot}/shoot.md (100%) rename english/lightsaber/{ => wampa}/wampa.md (100%) diff --git a/english/lightsaber/shoot.md b/english/lightsaber/shoot/shoot.md similarity index 100% rename from english/lightsaber/shoot.md rename to english/lightsaber/shoot/shoot.md diff --git a/english/lightsaber/wampa.md b/english/lightsaber/wampa/wampa.md similarity index 100% rename from english/lightsaber/wampa.md rename to english/lightsaber/wampa/wampa.md From 21babb60aaf0bb1441d6014220c576677d7b9481 Mon Sep 17 00:00:00 2001 From: LaGracia Date: Thu, 5 Nov 2015 01:22:24 +0700 Subject: [PATCH 1530/5486] Corrected my option links again --- english/lightsaber/lightsaber.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/lightsaber/lightsaber.md b/english/lightsaber/lightsaber.md index 6a5eac6f47..d7cf0b9263 100644 --- a/english/lightsaber/lightsaber.md +++ b/english/lightsaber/lightsaber.md @@ -5,6 +5,6 @@ You now have a tasty snack and a way out of the house. But as you hurry to smoosh through the slowly closing hole in the wall, the lightsaber clatters to the floor. -[You leap out nimbly and gaze back at the weapon](lightsaber/wampa.md). +[You leap out nimbly and gaze back at the weapon](wampa/wampa.md). -[You try to regain the weapon but only get coated in a sticky glaze of whiteness](lightsaber/shoot.md). \ No newline at end of file +[You try to regain the weapon but only get coated in a sticky glaze of whiteness](shoot/shoot.md). \ No newline at end of file From 6586923d8f95c4d317300581def916335ce6f5d1 Mon Sep 17 00:00:00 2001 From: Juan-Carlos Castillo Date: Wed, 4 Nov 2015 18:23:14 -0500 Subject: [PATCH 1531/5486] Add a line to the angeles file in the espagnol directory --- espanol/angeles/angeles.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/angeles/angeles.md b/espanol/angeles/angeles.md index 00c20e5c44..756ad1a0de 100644 --- a/espanol/angeles/angeles.md +++ b/espanol/angeles/angeles.md @@ -3,3 +3,5 @@ se arrodillaron para orar y pedir por fuerzas para la batalla! En eso el Consejero se levanta y agradece a los ángeles por toda la ayuda que han brindado. Betito se llenó de fuerzas también y animó a todos los guerreros. + +La voz de un ángel te llama, pero estas distraído con la tecnología! From de67cc7fdea451d1957821f8dd3abbac47f6420e Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 4 Nov 2015 16:51:13 -0800 Subject: [PATCH 1532/5486] Add two lines to determine what is a lego --- english/lego/lego.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/lego/lego.md b/english/lego/lego.md index 0d55c36c5f..fd2b80d247 100644 --- a/english/lego/lego.md +++ b/english/lego/lego.md @@ -33,3 +33,9 @@ or or [Kick the man](../kicktheman/kicktheman.md) + +You see, there are two types of legos in this world. + +We all know and love them lego brand legos, any other brand belongs in the trash heap. IMPOSTERS + + From 6733637cded9c77f4ab60b50702f75e2596a8bc3 Mon Sep 17 00:00:00 2001 From: Robert Mollo Date: Wed, 4 Nov 2015 21:09:43 -0500 Subject: [PATCH 1533/5486] Change conversation text in paris airport interaction --- english/coffee/Paris/fly-to-paris.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/english/coffee/Paris/fly-to-paris.md b/english/coffee/Paris/fly-to-paris.md index dd8e8d033d..5408abcdcf 100644 --- a/english/coffee/Paris/fly-to-paris.md +++ b/english/coffee/Paris/fly-to-paris.md @@ -1,12 +1,12 @@ -You got off the AirFrance flight into Charles De Gaulle Airport. Everyone is speaking French around you. +You get off the AirFrance flight into Charles De Gaulle Airport. Everyone is speaking French around you. -You mustled up some courage, remembered the few French phrases you know, went up to a charming female blonde. +You see a young woman, about 23-24 years old, standing in the corner. You decide to ask her for help. -"Excusez-moi, mademoiselle, vous parlez anglais? Je suis perdu." You asked. +"Excusez-moi, mademoiselle, Je suis un américain et Je suis perdu. Est-ce que vous pouvez m'aide?" -"Mais, bien sur. Yes, I do speak English." +"Mais, bien sur." -"Excellet!" you exclaim. You tell her everything you know so far and she suggests you follow her. +"Merçi!" you exclaim. You tell her everything you know so far and she suggests you follow her. She walks towards a local train into the city. Do you? From 82c97f1a765b61e16dd1c3f6645adccaa6194dea Mon Sep 17 00:00:00 2001 From: csteinbrunn Date: Wed, 4 Nov 2015 20:10:43 -0600 Subject: [PATCH 1534/5486] Added Uncle Ben to Batman (english) --- english/batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index c83426153c..9df2c7855c 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -24,3 +24,5 @@ this realization, then you go: Bruce Wayne: It's not who I am underneath, but what I do that defines me. Commissioner Gordon: He's the hero Gotham deserves but not the one that it needs right now. + +Uncle Ben: With great power comes great responsibility. From 32627bb103f34ae97a1411adf97ed69cf72d766a Mon Sep 17 00:00:00 2001 From: Robert Mollo Date: Wed, 4 Nov 2015 21:28:31 -0500 Subject: [PATCH 1535/5486] Added some text to conversation --- english/coffee/Paris/fly-to-paris.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/english/coffee/Paris/fly-to-paris.md b/english/coffee/Paris/fly-to-paris.md index 5408abcdcf..975cb8b63e 100644 --- a/english/coffee/Paris/fly-to-paris.md +++ b/english/coffee/Paris/fly-to-paris.md @@ -1,12 +1,12 @@ -You get off the AirFrance flight into Charles De Gaulle Airport. Everyone is speaking French around you. +You got off the AirFrance flight into Charles De Gaulle Airport. Everyone is speaking French around you. -You see a young woman, about 23-24 years old, standing in the corner. You decide to ask her for help. +You mustled up some courage, remembered the few French phrases you know, went up to a charming female blonde. -"Excusez-moi, mademoiselle, Je suis un américain et Je suis perdu. Est-ce que vous pouvez m'aide?" +"Excusez-moi, mademoiselle, vous parlez anglais? Je suis perdu. Est-ce que vous pouvez aide-moi?" You asked. -"Mais, bien sur." +"Mais, bien sur. Yes, I do speak English." -"Merçi!" you exclaim. You tell her everything you know so far and she suggests you follow her. +"Excellent!" you exclaim. You tell her everything you know so far and she suggests you follow her. She walks towards a local train into the city. Do you? From ea7368c192eb6831f33b99ddce305b1bd45284d0 Mon Sep 17 00:00:00 2001 From: Jason Gordon Date: Wed, 4 Nov 2015 20:57:23 -0800 Subject: [PATCH 1536/5486] Fixed broken link --- english/coffee/drink-water/drink.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/english/coffee/drink-water/drink.md b/english/coffee/drink-water/drink.md index 3a4952172b..36ca7bff30 100644 --- a/english/coffee/drink-water/drink.md +++ b/english/coffee/drink-water/drink.md @@ -1,10 +1,10 @@ -You start drinking the water, and it seems to relax your stomach, -but you have to keep drinking, -now your stomach swells to the size of a hot air balloon. +You start drinking the water, and it seems to relax your stomach, +but you have to keep drinking, +now your stomach swells to the size of a hot air balloon. You start feeling an urge to release some pressure... Do you want to: - + [Find the nearest bathroom](bathroom/bathroom.md)? -[Go for a swim](Swim/swim.md) \ No newline at end of file +[Go for a swim](cookie/Swim/swim.md) \ No newline at end of file From 82ba22aec23f19706cefd2fe245da580d3395c0a Mon Sep 17 00:00:00 2001 From: Jason Gordon Date: Wed, 4 Nov 2015 20:59:47 -0800 Subject: [PATCH 1537/5486] Added Swim file and fixed link (for real) --- english/coffee/drink-water/drink.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/coffee/drink-water/drink.md b/english/coffee/drink-water/drink.md index 36ca7bff30..6c787a6d86 100644 --- a/english/coffee/drink-water/drink.md +++ b/english/coffee/drink-water/drink.md @@ -7,4 +7,4 @@ Do you want to: [Find the nearest bathroom](bathroom/bathroom.md)? -[Go for a swim](cookie/Swim/swim.md) \ No newline at end of file +[Go for a swim](Swim/swim.md) \ No newline at end of file From cc455254ee54a8ac0cc12f7eb134e7b2ebb091c9 Mon Sep 17 00:00:00 2001 From: Jason Gordon Date: Wed, 4 Nov 2015 21:00:48 -0800 Subject: [PATCH 1538/5486] Swim folder added --- english/coffee/drink-water/Swim/swim.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/coffee/drink-water/Swim/swim.md diff --git a/english/coffee/drink-water/Swim/swim.md b/english/coffee/drink-water/Swim/swim.md new file mode 100644 index 0000000000..5463f85288 --- /dev/null +++ b/english/coffee/drink-water/Swim/swim.md @@ -0,0 +1 @@ +the swim refresses you and makes you feel fresh and rejuvenated. \ No newline at end of file From 51504e9d46b0fde1e2ac55cd008949eb21240630 Mon Sep 17 00:00:00 2001 From: allent Date: Thu, 5 Nov 2015 13:16:35 +0800 Subject: [PATCH 1539/5486] Added goosebumps line --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 50f61ad742..17974485d8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -85,6 +85,8 @@ An umbrella (closed) automagically appears in your left hand. You tentatively You are feeling very anxious at this point. +Goosebumps appear. + This is because you do not like leather for ethical reasons. [Ethical reason? Seriously?](./ethical-reason/ethical-reason.md) From 69460f5ddd37288c31e03caa2919aa40f61e7290 Mon Sep 17 00:00:00 2001 From: Wasay Syed Date: Thu, 5 Nov 2015 00:22:57 -0500 Subject: [PATCH 1540/5486] news story about strange noises --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 50f61ad742..aeb630dc90 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -592,3 +592,5 @@ Honesty in a hard way [Watch it](few-good-men/fgm.md) Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube.com/watch?v=lAF8D0ugyVk) But the call of of nature wasn't going away so you push open the toilet door and go in.. + +Just then you recall the news story of what is causing the [strange noise] in toilet (http://nydn.us/1iLJF83) you look around and From c58269135027b784ac70015e1641af93e02f39a9 Mon Sep 17 00:00:00 2001 From: Wasay Syed Date: Thu, 5 Nov 2015 00:31:53 -0500 Subject: [PATCH 1541/5486] split line in two. --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index aeb630dc90..950c2761cb 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -593,4 +593,5 @@ Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube But the call of of nature wasn't going away so you push open the toilet door and go in.. -Just then you recall the news story of what is causing the [strange noise] in toilet (http://nydn.us/1iLJF83) you look around and +Just then you recall the news story of what is causing the +[strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. From 04ac4a1dc7aeeb836c16eb960ebbcb24274cc667 Mon Sep 17 00:00:00 2001 From: bynumjj Date: Thu, 5 Nov 2015 10:43:54 -0800 Subject: [PATCH 1542/5486] Add shorten line-length of story per reviewer request --- english/prostate/prostate.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/prostate/prostate.md b/english/prostate/prostate.md index 45489be368..12b854596c 100644 --- a/english/prostate/prostate.md +++ b/english/prostate/prostate.md @@ -1,4 +1,7 @@ -“It’s a damn shame when a man can’t get a few hours of sleep without having to get up to pee,” you think as you put on your slippers and shuffle to the bathroom. Ugh, that padded vinyl toilet seat is cold. You realize it’s been a while since you had your prostate checked. Do you: +“It’s a damn shame when a man can’t get a few hours of sleep without having +to get up to pee,” you think as you put on your slippers and shuffle to the +bathroom. Ugh, that padded vinyl toilet seat is cold. You realize it’s been +a while since you had your prostate checked. Do you: [go back to sleep](../go-back-to-sleep/go-back-to-sleep.md) From b44472802ceed05e368dc77299dc0cecd4932625 Mon Sep 17 00:00:00 2001 From: ethan Date: Thu, 5 Nov 2015 14:31:53 -0700 Subject: [PATCH 1543/5486] Add option to take a walk in SF --- english/weed/weed.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/weed/weed.md b/english/weed/weed.md index a5a41c2411..808490e055 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -17,4 +17,6 @@ Decide to go to [sleep] instead?(../sleep/marshmallow.md) Opt for a [chemical-free nirvana]?(../sleep/sit-down-to-meditate.md) -Go [back to the room]?(../marshmallow.md) \ No newline at end of file +Go [back to the room]?(../marshmallow.md) + +Walk [the streets of San Fransisco]?(../sanfran) From d3f50c12335f1e17c1887857b6f1284acf5741ae Mon Sep 17 00:00:00 2001 From: ethan Date: Thu, 5 Nov 2015 14:38:41 -0700 Subject: [PATCH 1544/5486] Add small poem of walk in SF --- english/sanfran/sanfran.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/sanfran/sanfran.md diff --git a/english/sanfran/sanfran.md b/english/sanfran/sanfran.md new file mode 100644 index 0000000000..e113ac231d --- /dev/null +++ b/english/sanfran/sanfran.md @@ -0,0 +1,4 @@ +Strolling down market street, friendly smiles to passerby. +Cold wind rustles minty green leaves. +Soft summer glows over the front sidewalks. +This is a season to remember. From 888f00913850fb979535be195b7d7c207c66a241 Mon Sep 17 00:00:00 2001 From: ethan Date: Thu, 5 Nov 2015 14:56:22 -0700 Subject: [PATCH 1545/5486] Fix broken link --- english/weed/weed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/weed/weed.md b/english/weed/weed.md index 808490e055..2182608559 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -19,4 +19,4 @@ Opt for a [chemical-free nirvana]?(../sleep/sit-down-to-meditate.md) Go [back to the room]?(../marshmallow.md) -Walk [the streets of San Fransisco]?(../sanfran) +Walk [the streets of San Fransisco]?(../sanfran/sanfran.md) From 842163b65a73e3d2b281631057c91b3b9b849143 Mon Sep 17 00:00:00 2001 From: ethan Date: Thu, 5 Nov 2015 15:04:05 -0700 Subject: [PATCH 1546/5486] Add my poem to the marshmallow room. --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b81fb6efc7..1dfa27b0ef 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -89,6 +89,8 @@ Goosebumps appear. This is because you do not like leather for ethical reasons. +Leather is all over [San Fransisco](sanfran/sanfran.md). + [Ethical reason? Seriously?](./ethical-reason/ethical-reason.md) You begin to break out of the jacket and find a lighter, a fork, and rope. @@ -595,5 +597,5 @@ Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube But the call of of nature wasn't going away so you push open the toilet door and go in.. -Just then you recall the news story of what is causing the +Just then you recall the news story of what is causing the [strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. From 69894b8804fe94959050a276ec118a7bf7b4dd96 Mon Sep 17 00:00:00 2001 From: ethan Date: Thu, 5 Nov 2015 15:04:36 -0700 Subject: [PATCH 1547/5486] Remove my option from the weed room --- english/weed/weed.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/weed/weed.md b/english/weed/weed.md index 2182608559..a8a72aa51f 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -18,5 +18,3 @@ Decide to go to [sleep] instead?(../sleep/marshmallow.md) Opt for a [chemical-free nirvana]?(../sleep/sit-down-to-meditate.md) Go [back to the room]?(../marshmallow.md) - -Walk [the streets of San Fransisco]?(../sanfran/sanfran.md) From 008a17897e33128a53f30422a8cef0b3bc325a53 Mon Sep 17 00:00:00 2001 From: geo-bak Date: Thu, 5 Nov 2015 22:32:56 -0500 Subject: [PATCH 1548/5486] A story about cycling forwards... --- english/cycling-backwards/cycling-backwards.md | 4 ++++ english/cycling-forwards/cycling-forwards.md | 1 + 2 files changed, 5 insertions(+) create mode 100644 english/cycling-forwards/cycling-forwards.md diff --git a/english/cycling-backwards/cycling-backwards.md b/english/cycling-backwards/cycling-backwards.md index 6b74b8b0c9..9f2719b66b 100644 --- a/english/cycling-backwards/cycling-backwards.md +++ b/english/cycling-backwards/cycling-backwards.md @@ -1,5 +1,9 @@ It has long been rumoured that Polar Bears can cycle and moreover, cycle backwards. In reverse. Unlike brown bears, who can only play balalaika, and only in Russia. +...but what about other animals that can cycle forwards. [What do they do?](../cycling-forwards/cycling-forwards.md) + [That's got to be horse...note to self.](../marshmallow.md) + + diff --git a/english/cycling-forwards/cycling-forwards.md b/english/cycling-forwards/cycling-forwards.md new file mode 100644 index 0000000000..ac2d879019 --- /dev/null +++ b/english/cycling-forwards/cycling-forwards.md @@ -0,0 +1 @@ +But everyone knows that fish only like to cycle forwards. It's the only way they can breathe while juggling. From 5ea9a17bdbf2dffd38cb8afab4f94869b188ac9c Mon Sep 17 00:00:00 2001 From: "Ray Lugo, Jr" Date: Fri, 6 Nov 2015 02:51:34 -0500 Subject: [PATCH 1549/5486] added line to english/marshmallow.md --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b81fb6efc7..99113e247d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -595,5 +595,7 @@ Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube But the call of of nature wasn't going away so you push open the toilet door and go in.. -Just then you recall the news story of what is causing the +Just then you recall the news story of what is causing the [strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. + +...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) From 0aee4b9fb23963083948ab3775b279bdc05f40ce Mon Sep 17 00:00:00 2001 From: JMrbl Date: Fri, 6 Nov 2015 09:07:09 -0430 Subject: [PATCH 1550/5486] Add phone scene to espanol/canudos.md --- espanol/canudos.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 0060ac4b42..5eba42df3e 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -1,6 +1,6 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento -el Consejero: +el Consejero: [Sintió como la comida le subía por el exófago](comida/comida.md) @@ -15,7 +15,7 @@ el Consejero: [Empaquetó sus cosas e intentó salir por la puerta trasera.](huida/puerta.md) [Miró hacia el cielo mientras pensaba](pensamiento/guerra.md) - + [Mandó a Beatito a buscar al cocinero](cocinero/cocinero.md) [Clavó sus ojos directamente sobre el Beatito...](rebelion/inicio-rebelion.md) @@ -78,3 +78,4 @@ el Consejero: [Se dio cuenta de que su táctica había sido descubierta] (tactica/tactica.md) +[Enseguida agarró el teléfono y realizó una llamada] (telefono/telefono.md) From a01daa7a2e6ff496975b263984e15646188d06b2 Mon Sep 17 00:00:00 2001 From: JMrbl Date: Fri, 6 Nov 2015 09:16:54 -0430 Subject: [PATCH 1551/5486] Include telefono/telefono.md in /espanol folder --- espanol/telefono/telefono.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 espanol/telefono/telefono.md diff --git a/espanol/telefono/telefono.md b/espanol/telefono/telefono.md new file mode 100644 index 0000000000..5ba5eb49d8 --- /dev/null +++ b/espanol/telefono/telefono.md @@ -0,0 +1,2 @@ +El Consejero toma rapidamente su teléfono inteligente y realiza una llamada que +solo duró ocho segundos, diciendo: From ab1362c08798093a12c2a13b745c32f5ceed028f Mon Sep 17 00:00:00 2001 From: Nitin Gupta Date: Fri, 6 Nov 2015 11:21:58 -0500 Subject: [PATCH 1552/5486] Comment on Uncle Ben --- english/batman/batman.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index 9df2c7855c..301c8debfa 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -26,3 +26,4 @@ Bruce Wayne: It's not who I am underneath, but what I do that defines me. Commissioner Gordon: He's the hero Gotham deserves but not the one that it needs right now. Uncle Ben: With great power comes great responsibility. +(Hey Uncle Ben was a character in Spiderman!!, doesn't belong here) From 53044999135472e9032ddbc5dd3c4fbd6eb1c96d Mon Sep 17 00:00:00 2001 From: St1nger13 Date: Fri, 6 Nov 2015 18:49:20 +0200 Subject: [PATCH 1553/5486] first update --- ukrainian/marshmallow.md | 2 ++ ukrainian/wait-more/wait.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 ukrainian/wait-more/wait.md diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 80589bbbdf..a5515318e7 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -20,4 +20,6 @@ [Викличу лікаря](call-a-doctor/doctor.md) +[Просто трошки почекаю](wait-more/wait.md) + І, так, я теж не розумію, для чого мотузка, але в голову лізуть підозрілі думки! diff --git a/ukrainian/wait-more/wait.md b/ukrainian/wait-more/wait.md new file mode 100644 index 0000000000..8a001ebdb7 --- /dev/null +++ b/ukrainian/wait-more/wait.md @@ -0,0 +1,5 @@ +Ви вирішили трошки почекати, і не дарма. Через кілька хвилин одна зі смачних стін почала рухатися і на ній з'явилися двері. +Двері самі відчинилися. Крізь одчиненні двері ви бачите доріжку, яка йде від хатинки, і на вигляд являє собою +купу їстівних цеглин. + +Що будете робити далі? \ No newline at end of file From d72eec9225353957a01b5b7277aa36da2c23f7ff Mon Sep 17 00:00:00 2001 From: St1nger13 Date: Fri, 6 Nov 2015 19:02:37 +0200 Subject: [PATCH 1554/5486] second update --- ukrainian/wait-more/out/index.md | 4 ++++ ukrainian/wait-more/out/try/index.md | 2 ++ ukrainian/wait-more/wait.md | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 ukrainian/wait-more/out/index.md create mode 100644 ukrainian/wait-more/out/try/index.md diff --git a/ukrainian/wait-more/out/index.md b/ukrainian/wait-more/out/index.md new file mode 100644 index 0000000000..e38a91a04d --- /dev/null +++ b/ukrainian/wait-more/out/index.md @@ -0,0 +1,4 @@ +Ви виходите з хатинки, та йдете цією казковою доріжкою. Довкола багато дерев, кущів - все це на вигляд їстівне. +Та ви згадуєте слова мами, що багато солодкого їсти не варто. + +[Все ж таки я спробую кущик на смак](try/index.md) \ No newline at end of file diff --git a/ukrainian/wait-more/out/try/index.md b/ukrainian/wait-more/out/try/index.md new file mode 100644 index 0000000000..6bfe0f8968 --- /dev/null +++ b/ukrainian/wait-more/out/try/index.md @@ -0,0 +1,2 @@ +Ви берете кілька листків с кущика, тягнете до рота та відчуваєте як ваше обличчя перекошує. +Яке ж воно кисле! Цікаво, воно все кисле, чи різні частини куща мають різні смаки.. Спробуємо? \ No newline at end of file diff --git a/ukrainian/wait-more/wait.md b/ukrainian/wait-more/wait.md index 8a001ebdb7..8c50013c49 100644 --- a/ukrainian/wait-more/wait.md +++ b/ukrainian/wait-more/wait.md @@ -2,4 +2,6 @@ Двері самі відчинилися. Крізь одчиненні двері ви бачите доріжку, яка йде від хатинки, і на вигляд являє собою купу їстівних цеглин. -Що будете робити далі? \ No newline at end of file +Що будете робити далі? + +[Звичайно ж вийду з хатинки!](out/index.md) \ No newline at end of file From 8f251e00285d9eeee44fa330935f7e465b3ff6d8 Mon Sep 17 00:00:00 2001 From: IVan Date: Fri, 6 Nov 2015 19:09:57 +0200 Subject: [PATCH 1555/5486] third update Splitted line --- ukrainian/wait-more/wait.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ukrainian/wait-more/wait.md b/ukrainian/wait-more/wait.md index 8c50013c49..fedc444d5a 100644 --- a/ukrainian/wait-more/wait.md +++ b/ukrainian/wait-more/wait.md @@ -1,7 +1,8 @@ -Ви вирішили трошки почекати, і не дарма. Через кілька хвилин одна зі смачних стін почала рухатися і на ній з'явилися двері. -Двері самі відчинилися. Крізь одчиненні двері ви бачите доріжку, яка йде від хатинки, і на вигляд являє собою -купу їстівних цеглин. +Ви вирішили трошки почекати, і не дарма. Через кілька хвилин одна зі смачних стін почала +рухатися і на ній з'явилися двері. +Двері самі відчинилися. Крізь одчиненні двері ви бачите доріжку, яка йде від хатинки, і +на вигляд являє собою купу їстівних цеглин. Що будете робити далі? -[Звичайно ж вийду з хатинки!](out/index.md) \ No newline at end of file +[Звичайно ж вийду з хатинки!](out/index.md) From e03eb1ee5987724afe9ddc51f13024d1e4c127a6 Mon Sep 17 00:00:00 2001 From: JMrbl Date: Fri, 6 Nov 2015 12:53:42 -0430 Subject: [PATCH 1556/5486] Modify verbal tenses to past --- espanol/telefono/telefono.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/espanol/telefono/telefono.md b/espanol/telefono/telefono.md index 5ba5eb49d8..d80d3a17d2 100644 --- a/espanol/telefono/telefono.md +++ b/espanol/telefono/telefono.md @@ -1,2 +1,2 @@ -El Consejero toma rapidamente su teléfono inteligente y realiza una llamada que -solo duró ocho segundos, diciendo: +El Consejero tomó rapidamente su teléfono inteligente y realizó una llamada que +solo duró cinco segundos, diciendo: From b18b6c98e99b52f25393fdefd819ed7dd2cfa69c Mon Sep 17 00:00:00 2001 From: Petros Kalogiannakis Date: Fri, 6 Nov 2015 20:32:17 +0200 Subject: [PATCH 1557/5486] Greek story continuation --- greek/brave_guy/brave_guy.md | 3 +++ .../set_it_on_fire/set_it_on_fire.md | 5 ++++- greek/stay_inside/stay_inside.md | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 greek/brave_guy/brave_guy.md create mode 100644 greek/stay_inside/stay_inside.md diff --git a/greek/brave_guy/brave_guy.md b/greek/brave_guy/brave_guy.md new file mode 100644 index 0000000000..6615112c1c --- /dev/null +++ b/greek/brave_guy/brave_guy.md @@ -0,0 +1,3 @@ +Δεν τα παρατάς. Σε διακρίνει γενναιότητα και τόλμη. +Δένεις το σχοινί στον τοίχο και το πετάς +στο κενό απο την τρύπα που άνοιξες και προσπαθείς να κατέβεις το κενό. \ No newline at end of file diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md index cfd8126541..aa94666c2c 100644 --- a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md @@ -4,4 +4,7 @@ Και τώρα; Βγάζεις το κεφάλι από το άνοιγμα και αυτό που αντικρύζεις είναι τόσο φρικιαστικό που θέλεις να ξαναμπείς μέσα -και να κλείσεις το άνοιγμα για πάντα. \ No newline at end of file +και να κλείσεις το άνοιγμα για πάντα. Τι κάνεις; + +[Χριστέ μου! Τι είναι αυτό; Δεν βγαίνω με τίποτα απο δώ!](stay_inside/stay_inside.md)) +[Μπορώ να τα καταφέρω! Είναι ο μόνος τρόπος για να βγώ απο εδώ!](brave_guy/brave_guy.md)) diff --git a/greek/stay_inside/stay_inside.md b/greek/stay_inside/stay_inside.md new file mode 100644 index 0000000000..c7419701b3 --- /dev/null +++ b/greek/stay_inside/stay_inside.md @@ -0,0 +1,6 @@ +Το θέαμα που αντίκρισες ήταν τόσο φρικιαστίκο που δεν άντεξες και +αποφασίζεις να μείνεις μέσα. Καθώς προσπαθείς να βγάλεις το +κεφάλι σου απο την στενή τρύπα στον τοίχο νιώθεις ένα χέρι να σε +πιάνει απο το πόδι και αμέσως πετάγεσε στο πίσω μέρος του δωματίου. +Ελαφρώς ζαλισμένος και με ελαφριά θολή όραση απο το βίαιο ταρακούνημα +αντιλαμβάνεσαι οτι στο δωμάτιο βρίσκονται και άλλοι σαν εσένα. \ No newline at end of file From 1f53a8e1d59c767b8f4043173b2587cafc3f628b Mon Sep 17 00:00:00 2001 From: Petros Kalogiannakis Date: Fri, 6 Nov 2015 20:36:43 +0200 Subject: [PATCH 1558/5486] Some fixes --- .../set_it_on_fire}/brave_guy/brave_guy.md | 0 greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md | 1 + .../set_it_on_fire}/stay_inside/stay_inside.md | 0 3 files changed, 1 insertion(+) rename greek/{ => offer_marshmallow_a_cigar/set_it_on_fire}/brave_guy/brave_guy.md (100%) rename greek/{ => offer_marshmallow_a_cigar/set_it_on_fire}/stay_inside/stay_inside.md (100%) diff --git a/greek/brave_guy/brave_guy.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md similarity index 100% rename from greek/brave_guy/brave_guy.md rename to greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md index aa94666c2c..ad595fddf8 100644 --- a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md @@ -7,4 +7,5 @@ και να κλείσεις το άνοιγμα για πάντα. Τι κάνεις; [Χριστέ μου! Τι είναι αυτό; Δεν βγαίνω με τίποτα απο δώ!](stay_inside/stay_inside.md)) + [Μπορώ να τα καταφέρω! Είναι ο μόνος τρόπος για να βγώ απο εδώ!](brave_guy/brave_guy.md)) diff --git a/greek/stay_inside/stay_inside.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/stay_inside.md similarity index 100% rename from greek/stay_inside/stay_inside.md rename to greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/stay_inside.md From 22a8810c5df03b3aec00f09d11075f5130993300 Mon Sep 17 00:00:00 2001 From: Petros Kal Date: Fri, 6 Nov 2015 20:38:41 +0200 Subject: [PATCH 1559/5486] Update brave_guy.md --- .../set_it_on_fire/brave_guy/brave_guy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md index 6615112c1c..eaf37ae19b 100644 --- a/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md @@ -1,3 +1,3 @@ Δεν τα παρατάς. Σε διακρίνει γενναιότητα και τόλμη. -Δένεις το σχοινί στον τοίχο και το πετάς -στο κενό απο την τρύπα που άνοιξες και προσπαθείς να κατέβεις το κενό. \ No newline at end of file +Δένεις το σχοινί στον τοίχο, το πετάς +στο κενό απο την τρύπα που άνοιξες και προσπαθείς να κατέβεις το κενό. From 8e315538c04b44ec654c6e88af3f96da501ef3b8 Mon Sep 17 00:00:00 2001 From: Petros Kal Date: Fri, 6 Nov 2015 20:43:52 +0200 Subject: [PATCH 1560/5486] Update set_it_on_fire.md --- .../set_it_on_fire/set_it_on_fire.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md index ad595fddf8..28fb4c2654 100644 --- a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md @@ -4,7 +4,9 @@ Και τώρα; Βγάζεις το κεφάλι από το άνοιγμα και αυτό που αντικρύζεις είναι τόσο φρικιαστικό που θέλεις να ξαναμπείς μέσα -και να κλείσεις το άνοιγμα για πάντα. Τι κάνεις; +και να κλείσεις το άνοιγμα για πάντα. + +Τι κάνεις; [Χριστέ μου! Τι είναι αυτό; Δεν βγαίνω με τίποτα απο δώ!](stay_inside/stay_inside.md)) From 4a869e5925af1e98678baf2eb3867514defbf34c Mon Sep 17 00:00:00 2001 From: Petros Kal Date: Fri, 6 Nov 2015 20:46:19 +0200 Subject: [PATCH 1561/5486] Update set_it_on_fire.md --- .../offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md index 28fb4c2654..b42301a1d0 100644 --- a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md @@ -4,7 +4,7 @@ Και τώρα; Βγάζεις το κεφάλι από το άνοιγμα και αυτό που αντικρύζεις είναι τόσο φρικιαστικό που θέλεις να ξαναμπείς μέσα -και να κλείσεις το άνοιγμα για πάντα. +και να κλείσεις το άνοιγμα για πάντα. Τι κάνεις; From bbdea4c199bb3675b90b1a3876d289bda2f2897a Mon Sep 17 00:00:00 2001 From: Petros Kal Date: Fri, 6 Nov 2015 20:46:35 +0200 Subject: [PATCH 1562/5486] Update set_it_on_fire.md --- .../set_it_on_fire/set_it_on_fire.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md index b42301a1d0..9e148b2fd1 100644 --- a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md @@ -8,6 +8,6 @@ Τι κάνεις; -[Χριστέ μου! Τι είναι αυτό; Δεν βγαίνω με τίποτα απο δώ!](stay_inside/stay_inside.md)) +[Χριστέ μου! Τι είναι αυτό; Δεν βγαίνω με τίποτα απο δώ!](stay_inside/stay_inside.md) -[Μπορώ να τα καταφέρω! Είναι ο μόνος τρόπος για να βγώ απο εδώ!](brave_guy/brave_guy.md)) +[Μπορώ να τα καταφέρω! Είναι ο μόνος τρόπος για να βγώ απο εδώ!](brave_guy/brave_guy.md) From a43aaf937edb1f64c24874ff76b97ee03a846a46 Mon Sep 17 00:00:00 2001 From: Petter Date: Sat, 7 Nov 2015 00:13:17 +0100 Subject: [PATCH 1563/5486] =?UTF-8?q?Titta=20ut=20genom=20f=C3=B6nstret?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- swedish/start.md | 4 +++- swedish/titta-ut/titta-ut.md | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 swedish/titta-ut/titta-ut.md diff --git a/swedish/start.md b/swedish/start.md index cdfc6fa10f..393cbed5ea 100644 --- a/swedish/start.md +++ b/swedish/start.md @@ -9,4 +9,6 @@ På sängbord sitter en stor marshmallow och på marshmallowen står orden "Eat Vad nu, då? -[Äter marshmallowen.](marshmallowen/marshmallowen.md) \ No newline at end of file +[Äter marshmallowen.](marshmallowen/marshmallowen.md) + +[Titta ut genom fönstret.](titta-ut/titta-ut.md) diff --git a/swedish/titta-ut/titta-ut.md b/swedish/titta-ut/titta-ut.md new file mode 100644 index 0000000000..faf23fca78 --- /dev/null +++ b/swedish/titta-ut/titta-ut.md @@ -0,0 +1,7 @@ +När du tittar ut genom fönstret ser du att det regnar. + +Det är fortfarande ganska mörkt ute och du känner dig helt utmattad efter nattens mardrömmar. + +Efter att ha övervägt din situation väljer du att + +[Gå och lägga dig och sova igen](../start.md) From 07a12ee33bee4277d3ac0699b9714887dd348154 Mon Sep 17 00:00:00 2001 From: Petter Date: Sat, 7 Nov 2015 00:23:25 +0100 Subject: [PATCH 1564/5486] Change order of alternatives in Swedish story --- swedish/start.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/swedish/start.md b/swedish/start.md index 393cbed5ea..cfe8cf6d04 100644 --- a/swedish/start.md +++ b/swedish/start.md @@ -9,6 +9,6 @@ På sängbord sitter en stor marshmallow och på marshmallowen står orden "Eat Vad nu, då? -[Äter marshmallowen.](marshmallowen/marshmallowen.md) - [Titta ut genom fönstret.](titta-ut/titta-ut.md) + +[Äter marshmallowen.](marshmallowen/marshmallowen.md) From 5fc138c6f74781440339a438a99f17d6fe9a6c0f Mon Sep 17 00:00:00 2001 From: Icermann Date: Sat, 7 Nov 2015 00:26:34 +0100 Subject: [PATCH 1565/5486] remove unneccesary words --- swedish/titta-ut/titta-ut.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swedish/titta-ut/titta-ut.md b/swedish/titta-ut/titta-ut.md index faf23fca78..467858c021 100644 --- a/swedish/titta-ut/titta-ut.md +++ b/swedish/titta-ut/titta-ut.md @@ -4,4 +4,4 @@ Det är fortfarande ganska mörkt ute och du känner dig helt utmattad efter nat Efter att ha övervägt din situation väljer du att -[Gå och lägga dig och sova igen](../start.md) +[lägga dig och sova igen](../start.md) From 7f564d3adb09e5365039546c7af90f1eedfc9c13 Mon Sep 17 00:00:00 2001 From: Icermann Date: Sat, 7 Nov 2015 00:29:53 +0100 Subject: [PATCH 1566/5486] remove newline From 88eb7fa3f05badba41c365f8d6157d3c2b580a81 Mon Sep 17 00:00:00 2001 From: Icermann Date: Sat, 7 Nov 2015 00:33:34 +0100 Subject: [PATCH 1567/5486] add newline --- swedish/titta-ut/titta-ut.md | 1 + 1 file changed, 1 insertion(+) diff --git a/swedish/titta-ut/titta-ut.md b/swedish/titta-ut/titta-ut.md index 467858c021..99c3b3194c 100644 --- a/swedish/titta-ut/titta-ut.md +++ b/swedish/titta-ut/titta-ut.md @@ -5,3 +5,4 @@ Det är fortfarande ganska mörkt ute och du känner dig helt utmattad efter nat Efter att ha övervägt din situation väljer du att [lägga dig och sova igen](../start.md) + From 4ab4ec08fe18f35e56ed8d378bb68190b3df33b9 Mon Sep 17 00:00:00 2001 From: Milos Sukovic Date: Sat, 7 Nov 2015 00:36:47 +0100 Subject: [PATCH 1568/5486] Nastavak tuzne mamurne price o pekari u kojoj nema bureka sa sirom. --- serbian/burekSir/burekSir.md | 8 +++++++- serbian/burekSir/noz/noz.md | 1 + serbian/burekSir/tihaPatnja/tihaPatnja.md | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 serbian/burekSir/noz/noz.md create mode 100644 serbian/burekSir/tihaPatnja/tihaPatnja.md diff --git a/serbian/burekSir/burekSir.md b/serbian/burekSir/burekSir.md index 54ba6e985d..c0bcddd33f 100644 --- a/serbian/burekSir/burekSir.md +++ b/serbian/burekSir/burekSir.md @@ -1,2 +1,8 @@ "Da'l je moguće? Ne mogu da verujem. Kako nemate? Neću sir!" - razvijao se bes iz njegovih očiju. -Galamom privukao je pažnju momaka koji su već tu sedeli i zadovoljno jeli svoje bureke s mesom i pili jogurt "Granice". \ No newline at end of file +Galamom privukao je pažnju momaka koji su već tu sedeli i zadovoljno jeli svoje bureke s mesom i pili jogurt "Granice". + +Konacno, nakon sto je uzeo burek sasirom, nezadovoljno je poceo da ga jede. Sira nije bilo! + +[uzima noz, i napada pekarku](noz/noz.md) + +[cuti, i mrndza, jer za bolje i nije](tihaPatnja/tihaPatnja.md) \ No newline at end of file diff --git a/serbian/burekSir/noz/noz.md b/serbian/burekSir/noz/noz.md new file mode 100644 index 0000000000..12b29a1974 --- /dev/null +++ b/serbian/burekSir/noz/noz.md @@ -0,0 +1 @@ +Jadna matorka bezi glavom bez obzira, dok on zadovoljno brsti ostale blagodeti pekare. \ No newline at end of file diff --git a/serbian/burekSir/tihaPatnja/tihaPatnja.md b/serbian/burekSir/tihaPatnja/tihaPatnja.md new file mode 100644 index 0000000000..4741470537 --- /dev/null +++ b/serbian/burekSir/tihaPatnja/tihaPatnja.md @@ -0,0 +1,2 @@ +Snuzdeno otaljava svoj burek, i nastavlja da zivi svojim bednim zivotom, +u kome ga gazi, ko i kako hoce. \ No newline at end of file From c914bcfd087fb961ab950b451ca821026510ecc2 Mon Sep 17 00:00:00 2001 From: raqueldata Date: Fri, 6 Nov 2015 16:50:04 -0800 Subject: [PATCH 1569/5486] Add two more options: arrastra and ayuda. --- espanol/huida/rechazar/rechazar.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/espanol/huida/rechazar/rechazar.md b/espanol/huida/rechazar/rechazar.md index 95abd2d1c4..ebef34861f 100644 --- a/espanol/huida/rechazar/rechazar.md +++ b/espanol/huida/rechazar/rechazar.md @@ -1,3 +1,6 @@ Violentamente, apartas al hombre de tu camino y continuas la huida. A tu espalda escuchas al hombre pronunciar lo que parece un conjuro, y en ese momento descubres que ya no puedes mover tus piernas. + +[Decides pedir ayuda.](ayuda/ayuda.md) +[Sigues adelante por tu cuenta.](arrastra/arrastra.md) \ No newline at end of file From 7acafe0f2f9f3873e694deffe8965309e3c7e79c Mon Sep 17 00:00:00 2001 From: raqueldata Date: Fri, 6 Nov 2015 16:50:42 -0800 Subject: [PATCH 1570/5486] Add arrastra option. --- espanol/huida/rechazar/arrastra/arrastra.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/huida/rechazar/arrastra/arrastra.md diff --git a/espanol/huida/rechazar/arrastra/arrastra.md b/espanol/huida/rechazar/arrastra/arrastra.md new file mode 100644 index 0000000000..a148b3352b --- /dev/null +++ b/espanol/huida/rechazar/arrastra/arrastra.md @@ -0,0 +1 @@ +Al no poder mover las piernas, no queda más remedio que moverse con las manos. Saca fuerzas de donde no tiene y comienza a arrastrarase con sus brazos. Todos esos años de natación valieron la pena. \ No newline at end of file From 980b19ac1a897090e43f2d379a5c873ca51533bd Mon Sep 17 00:00:00 2001 From: raqueldata Date: Fri, 6 Nov 2015 16:50:59 -0800 Subject: [PATCH 1571/5486] Add ayuda option. --- espanol/huida/rechazar/ayuda/ayuda.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/huida/rechazar/ayuda/ayuda.md diff --git a/espanol/huida/rechazar/ayuda/ayuda.md b/espanol/huida/rechazar/ayuda/ayuda.md new file mode 100644 index 0000000000..af3fb2aed3 --- /dev/null +++ b/espanol/huida/rechazar/ayuda/ayuda.md @@ -0,0 +1 @@ +Empiezas a gritar y gritar pero nadie te escucha. Todos estan ocupados adentro. Estas desesperado. \ No newline at end of file From a7a3c310c00f591cd079d4ed975784b60b6cedb9 Mon Sep 17 00:00:00 2001 From: raqueldata Date: Fri, 6 Nov 2015 16:54:53 -0800 Subject: [PATCH 1572/5486] Fixed blank spaces. --- espanol/huida/rechazar/rechazar.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/huida/rechazar/rechazar.md b/espanol/huida/rechazar/rechazar.md index ebef34861f..a461878f8d 100644 --- a/espanol/huida/rechazar/rechazar.md +++ b/espanol/huida/rechazar/rechazar.md @@ -3,4 +3,5 @@ A tu espalda escuchas al hombre pronunciar lo que parece un conjuro, y en ese momento descubres que ya no puedes mover tus piernas. [Decides pedir ayuda.](ayuda/ayuda.md) + [Sigues adelante por tu cuenta.](arrastra/arrastra.md) \ No newline at end of file From 0081d4b99d980208d6d9b9cdb885cb5b4887738b Mon Sep 17 00:00:00 2001 From: Chatchawee Tangsayan Date: Sat, 7 Nov 2015 20:11:49 +0700 Subject: [PATCH 1573/5486] Add Torr's story. --- Thai/Songs/ThaiSong_FanJa.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Thai/Songs/ThaiSong_FanJa.md b/Thai/Songs/ThaiSong_FanJa.md index b4bed60bba..5c0138f766 100644 --- a/Thai/Songs/ThaiSong_FanJa.md +++ b/Thai/Songs/ThaiSong_FanJa.md @@ -14,3 +14,11 @@ Do you: [โทรหาเธอ](./callher/callher.md) [ลืมมันซะแล้วไปหาต้มยำกุ้งกิน](../Cuisine/TomYumKung.md) + +##################################### +เว็บอะไรที่สร้างแรงบันดาลใจ หรือทำให้ชีวิตคุณดีขึ้น +สำหรับผมขอเสนอเว็บสอนเกี่ยวกับการเงินส่วนบุคคล มีตั้งแต่พื้นฐาน จนถึงลงทุนในหุ้น แบบมีหลักการจัดเต็ม ทำโดยผู้ที่ไม่หวังสิ่งตอบแทนจริงๆ ครับ นอกจากส่งเสริมให้คนเรียนรู้อยู่ตลอดเวลา +[a-academy](http://www.a-academy.net/) + +by Torr Nov 7, 2015 +##################################### \ No newline at end of file From a12754306dc10c5938c9c4a720fb038c5f4f9d3a Mon Sep 17 00:00:00 2001 From: Chatchawee Tangsayan Date: Sat, 7 Nov 2015 20:20:48 +0700 Subject: [PATCH 1574/5486] Shorten the line as recommended by bot --- Thai/Songs/ThaiSong_FanJa.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Thai/Songs/ThaiSong_FanJa.md b/Thai/Songs/ThaiSong_FanJa.md index 5c0138f766..c06765d126 100644 --- a/Thai/Songs/ThaiSong_FanJa.md +++ b/Thai/Songs/ThaiSong_FanJa.md @@ -17,7 +17,8 @@ Do you: ##################################### เว็บอะไรที่สร้างแรงบันดาลใจ หรือทำให้ชีวิตคุณดีขึ้น -สำหรับผมขอเสนอเว็บสอนเกี่ยวกับการเงินส่วนบุคคล มีตั้งแต่พื้นฐาน จนถึงลงทุนในหุ้น แบบมีหลักการจัดเต็ม ทำโดยผู้ที่ไม่หวังสิ่งตอบแทนจริงๆ ครับ นอกจากส่งเสริมให้คนเรียนรู้อยู่ตลอดเวลา +สำหรับผมขอเสนอเว็บสอนเกี่ยวกับการเงินส่วนบุคคล มีตั้งแต่พื้นฐาน จนถึงลงทุนในหุ้น แบบมีหลักการจัดเต็ม +ทำโดยผู้ที่ไม่หวังสิ่งตอบแทนจริงๆ ครับ นอกจากส่งเสริมให้คนเรียนรู้อยู่ตลอดเวลา [a-academy](http://www.a-academy.net/) by Torr Nov 7, 2015 From 719a8effffc0cd801afa2275f391975f67fe6f22 Mon Sep 17 00:00:00 2001 From: gooneraki Date: Sat, 7 Nov 2015 16:41:48 +0200 Subject: [PATCH 1575/5486] split to another line --- greek/offer_marshmallow_a_cigar/intimacy/intimacy.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md b/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md index a8e5e486b6..080cc83cdf 100644 --- a/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md +++ b/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md @@ -1,2 +1,3 @@ Το σκεφτεσαι περισσοτερο αναβωντας ακομα ένα τσιγαρο. -Το ζαχαρωτο χερι εχει πνιγει στους καπνους αλλα πλεον δεν σε νοιαζει, εισαι οικειος μαζι του αφου εχουν περασει πεντε ολοκληρα λεπτα από τοτε που γνωριστηκατε. +Το ζαχαρωτο χερι εχει πνιγει στους καπνους αλλα πλεον δεν σε νοιαζει. +Εισαι οικειος μαζι του αφου εχουν περασει πεντε ολοκληρα λεπτα από τοτε που γνωριστηκατε. From ec2e557c987ef39d992464948b41d5f4535d070b Mon Sep 17 00:00:00 2001 From: BlackAlbino Date: Sat, 7 Nov 2015 17:13:30 +0100 Subject: [PATCH 1576/5486] Added a new option to Hoele --- german/Korallen/Hoehle/hoehle.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Korallen/Hoehle/hoehle.md b/german/Korallen/Hoehle/hoehle.md index a32a849109..6596860af4 100644 --- a/german/Korallen/Hoehle/hoehle.md +++ b/german/Korallen/Hoehle/hoehle.md @@ -5,4 +5,6 @@ Im Inneren angekommen... [Treffen Sie auf eine Meerjungfrau](Meerjungfrau/meerjungfrau.md) -[Entdecken Sie eine Luftblasen, tauchen auf und forschen weiter](Luftblase/luftblase.md) \ No newline at end of file +[Entdecken Sie eine Luftblasen, tauchen auf und forschen weiter](Luftblase/luftblase.md) + +[Entdecken Sie den Lichtschein einer geheimen Unterwasserstation](Unterwasserstation/Unterwasserstation.md) \ No newline at end of file From 45aaf961f2cb0dae79497145a0dc2f8724986f74 Mon Sep 17 00:00:00 2001 From: BlackAlbino Date: Sat, 7 Nov 2015 17:14:41 +0100 Subject: [PATCH 1577/5486] Added Unterwasserstation with a dead end --- .../Korallen/Hoehle/Unterwasserstation/unterwasserstation.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md diff --git a/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md b/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md new file mode 100644 index 0000000000..f06529139e --- /dev/null +++ b/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md @@ -0,0 +1,4 @@ +Die Unterwasserstation scheint auf der Unterseite eine mit Luft gefüllte Auftauchstation für U-Boote zu haben. +Da Sie immer noch nicht geatmet haben und der Weg aus der Höle zu weit ist, sind Sie gezwungen, in die Station zu tauchen. +Als Sie aufgetaucht sind und nach Luft ringen sehen Sie vor sich auf einmal... + From f0e8181a2cb84740d0461568fd3f7479eb0290b2 Mon Sep 17 00:00:00 2001 From: BlackAlbino Date: Sat, 7 Nov 2015 17:24:42 +0100 Subject: [PATCH 1578/5486] Fixed typo, broken link and line lenght --- .../Korallen/Hoehle/Unterwasserstation/unterwasserstation.md | 4 ++-- german/Korallen/Hoehle/hoehle.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md b/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md index f06529139e..9f2e8a3154 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md +++ b/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md @@ -1,4 +1,4 @@ Die Unterwasserstation scheint auf der Unterseite eine mit Luft gefüllte Auftauchstation für U-Boote zu haben. -Da Sie immer noch nicht geatmet haben und der Weg aus der Höle zu weit ist, sind Sie gezwungen, in die Station zu tauchen. -Als Sie aufgetaucht sind und nach Luft ringen sehen Sie vor sich auf einmal... +Da Sie immer noch nicht geatmet haben und der Weg aus der Höle zu weit ist, sind Sie gezwungen, in die Station +zu tauchen. Als Sie aufgetaucht sind und nach Luft ringen sehen Sie vor sich auf einmal... diff --git a/german/Korallen/Hoehle/hoehle.md b/german/Korallen/Hoehle/hoehle.md index 6596860af4..51bc3d5796 100644 --- a/german/Korallen/Hoehle/hoehle.md +++ b/german/Korallen/Hoehle/hoehle.md @@ -7,4 +7,4 @@ Im Inneren angekommen... [Entdecken Sie eine Luftblasen, tauchen auf und forschen weiter](Luftblase/luftblase.md) -[Entdecken Sie den Lichtschein einer geheimen Unterwasserstation](Unterwasserstation/Unterwasserstation.md) \ No newline at end of file +[Entdecken Sie den Lichtschein einer geheimen Unterwasserstation](Unterwasserstation/unterwasserstation.md) \ No newline at end of file From c6412aa72041fc8315ec7e708a229c47de788757 Mon Sep 17 00:00:00 2001 From: Eduard Bosch Bertran Date: Sat, 7 Nov 2015 18:57:21 +0100 Subject: [PATCH 1579/5486] Add two more pages to catalan story --- catala/dormir/dormir.md | 7 ++++++- catala/dormir/preguntar/preguntar_fum.md | 5 +++++ catala/dormir/tastar/tastar_arros.md | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 catala/dormir/preguntar/preguntar_fum.md create mode 100644 catala/dormir/tastar/tastar_arros.md diff --git a/catala/dormir/dormir.md b/catala/dormir/dormir.md index 195375687d..3596c49817 100644 --- a/catala/dormir/dormir.md +++ b/catala/dormir/dormir.md @@ -1,2 +1,7 @@ Et quedes dormint com un suro. A les 14 hores -et desperta ta mare amb un plat d'arròs al forn. \ No newline at end of file +et desperta ta mare amb un plat d'arròs al forn. + +Veus que surt fum del plat. Què fas? + +[Tasto una mica](tastar/tastar_arros.md) +[Pregunto a la mare per què surt fum del plat](preguntar/preguntar_fum.md) \ No newline at end of file diff --git a/catala/dormir/preguntar/preguntar_fum.md b/catala/dormir/preguntar/preguntar_fum.md new file mode 100644 index 0000000000..7c65501b90 --- /dev/null +++ b/catala/dormir/preguntar/preguntar_fum.md @@ -0,0 +1,5 @@ +La mare diu que acaba de sortir del forn i encara crema. + +Què vols fer? + +[Tasto una mica](../tastar/tastar_arros.md) \ No newline at end of file diff --git a/catala/dormir/tastar/tastar_arros.md b/catala/dormir/tastar/tastar_arros.md new file mode 100644 index 0000000000..f6df62003e --- /dev/null +++ b/catala/dormir/tastar/tastar_arros.md @@ -0,0 +1 @@ +Culleres!! Quina cremada... \ No newline at end of file From 67b8cc1a07b549bd60fa8e47b6f9b6b3cf2a6a08 Mon Sep 17 00:00:00 2001 From: Eduard Bosch Bertran Date: Sat, 7 Nov 2015 19:03:30 +0100 Subject: [PATCH 1580/5486] Fix link separation on 'tastar_arros.md' --- catala/dormir/dormir.md | 1 + 1 file changed, 1 insertion(+) diff --git a/catala/dormir/dormir.md b/catala/dormir/dormir.md index 3596c49817..16d68c3caf 100644 --- a/catala/dormir/dormir.md +++ b/catala/dormir/dormir.md @@ -4,4 +4,5 @@ et desperta ta mare amb un plat d'arròs al forn. Veus que surt fum del plat. Què fas? [Tasto una mica](tastar/tastar_arros.md) + [Pregunto a la mare per què surt fum del plat](preguntar/preguntar_fum.md) \ No newline at end of file From bfff840f0d5ae7ae5e6a7354c9e9e9efa33adcb9 Mon Sep 17 00:00:00 2001 From: jdelaney44 Date: Sat, 7 Nov 2015 17:43:27 -0800 Subject: [PATCH 1581/5486] Add your-dog story part --- english/be-octodog/octodog.md | 2 ++ english/your-dog/your-dog.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/your-dog/your-dog.md diff --git a/english/be-octodog/octodog.md b/english/be-octodog/octodog.md index 5346c0118f..93b4b1baf0 100644 --- a/english/be-octodog/octodog.md +++ b/english/be-octodog/octodog.md @@ -6,3 +6,5 @@ read at least 100 adventures. Let's get started, go to the [beginning](../marshmallow.md) Have fun! + +Unless ... it's really your dog [licking your face ...](../your-dog/your-dog.md) diff --git a/english/your-dog/your-dog.md b/english/your-dog/your-dog.md new file mode 100644 index 0000000000..7ff0056d38 --- /dev/null +++ b/english/your-dog/your-dog.md @@ -0,0 +1,3 @@ +Then you wake up! Or did you really? But your dog is licking you in the face. Lord, that dog breath! + +Then your dog speaks to you and says ["follow me ..."](../../mirror/enter-mirror.md) \ No newline at end of file From dd743c48faf25a249eeea4600e1acc11b3f0bb47 Mon Sep 17 00:00:00 2001 From: jdelaney44 Date: Sat, 7 Nov 2015 17:47:36 -0800 Subject: [PATCH 1582/5486] Changing link ... --- english/your-dog/your-dog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/your-dog/your-dog.md b/english/your-dog/your-dog.md index 7ff0056d38..be4201afe6 100644 --- a/english/your-dog/your-dog.md +++ b/english/your-dog/your-dog.md @@ -1,3 +1,3 @@ Then you wake up! Or did you really? But your dog is licking you in the face. Lord, that dog breath! -Then your dog speaks to you and says ["follow me ..."](../../mirror/enter-mirror.md) \ No newline at end of file +Then your dog speaks to you and says ["follow me ..."](../play-with-dog/dog.md) \ No newline at end of file From 00502d03786b447ee196b51b5bd9ec74bc4f4442 Mon Sep 17 00:00:00 2001 From: aristotelis Date: Sun, 8 Nov 2015 13:22:50 +0200 Subject: [PATCH 1583/5486] Change greek/marshmallow.md --- greek/marshmallow.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/greek/marshmallow.md b/greek/marshmallow.md index 302c033681..b7289690a7 100644 --- a/greek/marshmallow.md +++ b/greek/marshmallow.md @@ -20,4 +20,7 @@ [Παίρνεις το πιρούνι](take_the_fork/take-the-fork.md) -[Προσφέρεις στο ζαχαρωτό τσιγάρο](offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md) \ No newline at end of file +[Προσφέρεις στο ζαχαρωτό τσιγάρο](offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md) + +Τελικά συνειδητοποιείς ότι ο Stay Puft Marshmallow Man από το Ghostbusters ήταν στη πραγματικότητα το +ζαχαρωτό και σε πιάνει τρόμος ... From 46f4a50a7d7ce0b987af3f8bbcbdbae306dbe5f8 Mon Sep 17 00:00:00 2001 From: Berto Date: Sun, 8 Nov 2015 03:33:04 -0800 Subject: [PATCH 1584/5486] More cowbell --- english/more_cowbell/more_cowbell.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/more_cowbell/more_cowbell.md diff --git a/english/more_cowbell/more_cowbell.md b/english/more_cowbell/more_cowbell.md new file mode 100644 index 0000000000..03a3b1b2be --- /dev/null +++ b/english/more_cowbell/more_cowbell.md @@ -0,0 +1 @@ +A wild [Christopher Walken](http://www.hulu.com/watch/536145) appears \ No newline at end of file From 192fd8f0cf9e89f7f5939fb535d92015ba0c2f29 Mon Sep 17 00:00:00 2001 From: Berto Date: Sun, 8 Nov 2015 03:39:15 -0800 Subject: [PATCH 1585/5486] More cowbell link added to marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0cc631a902..b1a5b4ce53 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -601,3 +601,5 @@ Just then you recall the news story of what is causing the [strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. ...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) + +You escape into a [recording studio](more_cowbell/more_cowbell.md) \ No newline at end of file From 68805eaa08f5ece3035709588b5b38d8b110e2fc Mon Sep 17 00:00:00 2001 From: Berto Date: Sun, 8 Nov 2015 03:44:59 -0800 Subject: [PATCH 1586/5486] Exclamation point --- english/more_cowbell/more_cowbell.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/more_cowbell/more_cowbell.md b/english/more_cowbell/more_cowbell.md index 03a3b1b2be..9a123deab8 100644 --- a/english/more_cowbell/more_cowbell.md +++ b/english/more_cowbell/more_cowbell.md @@ -1 +1 @@ -A wild [Christopher Walken](http://www.hulu.com/watch/536145) appears \ No newline at end of file +A wild [Christopher Walken](http://www.hulu.com/watch/536145) appears! \ No newline at end of file From b7fca7062bbd5cfd586de1e6ecbc57baf6aafc71 Mon Sep 17 00:00:00 2001 From: aristotelis Date: Sun, 8 Nov 2015 13:56:13 +0200 Subject: [PATCH 1587/5486] Update marshmallow.md --- greek/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/greek/marshmallow.md b/greek/marshmallow.md index b7289690a7..de5f8388d6 100644 --- a/greek/marshmallow.md +++ b/greek/marshmallow.md @@ -23,4 +23,4 @@ [Προσφέρεις στο ζαχαρωτό τσιγάρο](offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md) Τελικά συνειδητοποιείς ότι ο Stay Puft Marshmallow Man από το Ghostbusters ήταν στη πραγματικότητα το -ζαχαρωτό και σε πιάνει τρόμος ... +ζαχαρωτό και σε πιάνει τρόμος. ... From 3391e7e4bb70096adb41e803224660a2b606b368 Mon Sep 17 00:00:00 2001 From: aristotelis Date: Sun, 8 Nov 2015 15:53:59 +0200 Subject: [PATCH 1588/5486] a update testing merge --- greek/marshmallow.md | 1 - 1 file changed, 1 deletion(-) diff --git a/greek/marshmallow.md b/greek/marshmallow.md index de5f8388d6..d58432568d 100644 --- a/greek/marshmallow.md +++ b/greek/marshmallow.md @@ -23,4 +23,3 @@ [Προσφέρεις στο ζαχαρωτό τσιγάρο](offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md) Τελικά συνειδητοποιείς ότι ο Stay Puft Marshmallow Man από το Ghostbusters ήταν στη πραγματικότητα το -ζαχαρωτό και σε πιάνει τρόμος. ... From 94c076ba15a12cf593ff568ff1c198a937aef5dc Mon Sep 17 00:00:00 2001 From: aristotelis Date: Sun, 8 Nov 2015 15:59:18 +0200 Subject: [PATCH 1589/5486] Update Greek --- greek/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/greek/marshmallow.md b/greek/marshmallow.md index d58432568d..6cc388fd14 100644 --- a/greek/marshmallow.md +++ b/greek/marshmallow.md @@ -23,3 +23,4 @@ [Προσφέρεις στο ζαχαρωτό τσιγάρο](offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md) Τελικά συνειδητοποιείς ότι ο Stay Puft Marshmallow Man από το Ghostbusters ήταν στη πραγματικότητα το +ζαχαρωτό και σε πιάνει τρόμος. ... μπου α χα χα... From 7d002ce4f1c0e39fa486ae2cd879482d12ce52cf Mon Sep 17 00:00:00 2001 From: aristotelis Date: Sun, 8 Nov 2015 16:08:36 +0200 Subject: [PATCH 1590/5486] Update Greek --- greek/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/greek/marshmallow.md b/greek/marshmallow.md index 6cc388fd14..710b46376c 100644 --- a/greek/marshmallow.md +++ b/greek/marshmallow.md @@ -23,4 +23,5 @@ [Προσφέρεις στο ζαχαρωτό τσιγάρο](offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md) Τελικά συνειδητοποιείς ότι ο Stay Puft Marshmallow Man από το Ghostbusters ήταν στη πραγματικότητα το -ζαχαρωτό και σε πιάνει τρόμος. ... μπου α χα χα... +ζαχαρωτό και σε πιάνει τρόμος... +μπου α χα χα... From 6a32159f9d54103d4a62aad06b10fabb08b07f83 Mon Sep 17 00:00:00 2001 From: ametsi Date: Sun, 8 Nov 2015 16:13:08 +0200 Subject: [PATCH 1591/5486] Update marshmallow.md --- greek/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/greek/marshmallow.md b/greek/marshmallow.md index 710b46376c..bb242ad44f 100644 --- a/greek/marshmallow.md +++ b/greek/marshmallow.md @@ -23,5 +23,5 @@ [Προσφέρεις στο ζαχαρωτό τσιγάρο](offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md) Τελικά συνειδητοποιείς ότι ο Stay Puft Marshmallow Man από το Ghostbusters ήταν στη πραγματικότητα το -ζαχαρωτό και σε πιάνει τρόμος... +ζαχαρωτό και σε πιάνει τρόμος ... μπου α χα χα... From 9991fcc0e26df9da3093abd7a99b13db146c1d69 Mon Sep 17 00:00:00 2001 From: Latchezar Mladenov Date: Mon, 9 Nov 2015 21:31:23 +0200 Subject: [PATCH 1592/5486] Update ToshkoAleksiev.md --- bulgarian/Aleksiev/TodorAleksiev.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bulgarian/Aleksiev/TodorAleksiev.md b/bulgarian/Aleksiev/TodorAleksiev.md index 869935f752..c893e4671c 100644 --- a/bulgarian/Aleksiev/TodorAleksiev.md +++ b/bulgarian/Aleksiev/TodorAleksiev.md @@ -1,3 +1,11 @@ . . , , ? - . \ No newline at end of file + . + +1. . + +2. . + +3. . + +4. . \ No newline at end of file From 9384932c98571921f518342db8331978e917f1b6 Mon Sep 17 00:00:00 2001 From: Jon Lee Date: Mon, 9 Nov 2015 12:52:48 -0800 Subject: [PATCH 1593/5486] Add ground hogs day option to memories --- english/memories/memories.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/memories/memories.md b/english/memories/memories.md index bc81d3a3aa..bd6987fd32 100644 --- a/english/memories/memories.md +++ b/english/memories/memories.md @@ -6,4 +6,6 @@ Why can I only remember the past and not the future? The first thing I remember is the cold tile floor. -The last thing I remember is the dark moment as my eyelids fell as sleep came over me. \ No newline at end of file +The last thing I remember is the dark moment as my eyelids fell as sleep came over me. + +Then went the [alarm](ground-hog/wakeup.md). \ No newline at end of file From 1dbee85f50473bf08118b1d66d16ea6e29f9b441 Mon Sep 17 00:00:00 2001 From: Jon Lee Date: Mon, 9 Nov 2015 12:54:16 -0800 Subject: [PATCH 1594/5486] Add ground-hog directory with wakeup.md file --- english/memories/ground-hog/wakeup.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 english/memories/ground-hog/wakeup.md diff --git a/english/memories/ground-hog/wakeup.md b/english/memories/ground-hog/wakeup.md new file mode 100644 index 0000000000..5f40b8ab91 --- /dev/null +++ b/english/memories/ground-hog/wakeup.md @@ -0,0 +1,10 @@ +6 o'clock on the dot. + +Again those voices of Sonny and Cher _singing 'I got you babe...'_ over and over. + +I've been here before... + +Do you ever get [deja vu](wakeup.md) Mrs. Lancaster?. + +Mrs. Lancaster's reply, 'I don't know let me check with the kitchen. + From f9661b4b1f723f013dc1d56df27d42f1b54f80bd Mon Sep 17 00:00:00 2001 From: ele0 Date: Mon, 9 Nov 2015 16:18:39 -0500 Subject: [PATCH 1595/5486] Docs: Add new choice and option to response --- english/references/references.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/english/references/references.md b/english/references/references.md index 25ad93a6cf..c4cb3842cc 100644 --- a/english/references/references.md +++ b/english/references/references.md @@ -1 +1,11 @@ -You calmly explain to the Chief Marshmallow that you come from the [Land of Ice and Snow](../../norwegian/start.md). +You calmly explain to the Chief Marshmallow either that: + +you come from the [Land of Ice and Snow](../../norwegian/start.md). + +or + +["These are not the droids you're looking for"](https://youtu.be/532j-186xEQ), while making a gradual motion with +3 fingers on your right hand. + +Because 'the Force' is strong in you, the Chief Marshmallow agrees. Then with the same motion you say "Be on your way". +The Chief Marshmallow looks at you and waves you on saying ["Be on your way"](../marshmallow.md) From e2454ad5094d536bb013e979ad3012c8e83bfaf4 Mon Sep 17 00:00:00 2001 From: ele0 Date: Mon, 9 Nov 2015 16:35:52 -0500 Subject: [PATCH 1596/5486] Docs: Tweak to ensure no deletions or changes --- english/references/references.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/english/references/references.md b/english/references/references.md index c4cb3842cc..3b60b4a544 100644 --- a/english/references/references.md +++ b/english/references/references.md @@ -1,11 +1,7 @@ -You calmly explain to the Chief Marshmallow either that: +You calmly explain to the Chief Marshmallow that you come from the [Land of Ice and Snow](../../norwegian/start.md). -you come from the [Land of Ice and Snow](../../norwegian/start.md). - -or - -["These are not the droids you're looking for"](https://youtu.be/532j-186xEQ), while making a gradual motion with -3 fingers on your right hand. +Then while making a gradual motion with 3 fingers on your right hand, you say +["These are not the droids you're looking for"](https://youtu.be/532j-186xEQ), Because 'the Force' is strong in you, the Chief Marshmallow agrees. Then with the same motion you say "Be on your way". The Chief Marshmallow looks at you and waves you on saying ["Be on your way"](../marshmallow.md) From e22d1883667639c6b87e70a3386951bfce224860 Mon Sep 17 00:00:00 2001 From: raqueldata Date: Mon, 9 Nov 2015 13:49:49 -0800 Subject: [PATCH 1597/5486] Break down line. --- espanol/huida/rechazar/arrastra/arrastra.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/huida/rechazar/arrastra/arrastra.md b/espanol/huida/rechazar/arrastra/arrastra.md index a148b3352b..c7a81d13a5 100644 --- a/espanol/huida/rechazar/arrastra/arrastra.md +++ b/espanol/huida/rechazar/arrastra/arrastra.md @@ -1 +1,2 @@ -Al no poder mover las piernas, no queda más remedio que moverse con las manos. Saca fuerzas de donde no tiene y comienza a arrastrarase con sus brazos. Todos esos años de natación valieron la pena. \ No newline at end of file +Al no poder mover las piernas, no queda más remedio que moverse con las manos. +Saca fuerzas de donde no tiene y comienza a arrastrarase con sus brazos. Todos esos años de natación valieron la pena. \ No newline at end of file From 0acf5c0a41aa776a6e415f237664e59de2f62209 Mon Sep 17 00:00:00 2001 From: Weiwei Dou Date: Tue, 10 Nov 2015 07:46:26 +0800 Subject: [PATCH 1598/5486] add story WeiXiaobao --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 233737b809..5e5f0f9b71 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -66,4 +66,6 @@ [胡八一](摸金校尉/摸金校尉.md) -[矢泽日香](nico/nico.md) \ No newline at end of file +[矢泽日香](nico/nico.md) + +[韦小宝](Weixiaobao/Weixiaobao.md) \ No newline at end of file From 91f8afa63c8b99e49ce21e61b59959b5dc2126aa Mon Sep 17 00:00:00 2001 From: Weiwei Dou Date: Tue, 10 Nov 2015 07:49:21 +0800 Subject: [PATCH 1599/5486] Add story Weixiaobao 2 --- Chinese/Weixiaobao/Weixiaobao.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/Weixiaobao/Weixiaobao.md diff --git a/Chinese/Weixiaobao/Weixiaobao.md b/Chinese/Weixiaobao/Weixiaobao.md new file mode 100644 index 0000000000..dbb04d05d7 --- /dev/null +++ b/Chinese/Weixiaobao/Weixiaobao.md @@ -0,0 +1 @@ +孙悟空500年后转世成了韦小宝，下面没有了... \ No newline at end of file From a00fb39c0b250a57d9fcd6057e77cc83b815666c Mon Sep 17 00:00:00 2001 From: Wikibeast Date: Mon, 9 Nov 2015 22:01:15 -0500 Subject: [PATCH 1600/5486] feat: add new years continuation to the or-do-you continuation --- english/new-years/new-years.md | 2 ++ english/or-do-you/or-do-you.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/new-years/new-years.md diff --git a/english/new-years/new-years.md b/english/new-years/new-years.md new file mode 100644 index 0000000000..0100ac7fbf --- /dev/null +++ b/english/new-years/new-years.md @@ -0,0 +1,2 @@ +Ah . . . New Year's Eve . . . it all comes back to you now . . . sort of. +It was a costume party, and, come to think of it, the Chief Marshmallow was there too. \ No newline at end of file diff --git a/english/or-do-you/or-do-you.md b/english/or-do-you/or-do-you.md index dd5f921d00..1acc869a37 100644 --- a/english/or-do-you/or-do-you.md +++ b/english/or-do-you/or-do-you.md @@ -1 +1,3 @@ Well, it was New Year's Eve. Even hardened stop-at-home-Sundays geeks like us go out for New Years. + +You went out for [New Year's last year](../new-years/new-years.md), didn't you? \ No newline at end of file From 568303180b3a41368cbe92a5c8e561696ef2cbc2 Mon Sep 17 00:00:00 2001 From: iainbx Date: Tue, 10 Nov 2015 00:08:18 -0500 Subject: [PATCH 1601/5486] Add Tim Berners-Lee to the adventure --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index b1a5b4ce53..aff3151db5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -32,6 +32,8 @@ No... perhaps not. I think it was an [animal](animal/animal.md). +Nope, it was [Tim Berners-Lee](https://en.wikipedia.org/wiki/Tim_Berners-Lee) sobbing in despair. + Thinking back, there are no memories to suggest that this should have been anything but an ordinary morning. You didn't go out last night, you don't usually take intoxicants, what's happening...? From afe27b7e80382b61a872f858720283c44df74241 Mon Sep 17 00:00:00 2001 From: Ian Halloran Date: Mon, 9 Nov 2015 22:14:01 -0800 Subject: [PATCH 1602/5486] Add stack rocks option. --- english/scarab/goddess.md | 4 +++- english/scarab/stack-rocks/stack-rocks.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/scarab/stack-rocks/stack-rocks.md diff --git a/english/scarab/goddess.md b/english/scarab/goddess.md index c4d48911fe..070c7db289 100644 --- a/english/scarab/goddess.md +++ b/english/scarab/goddess.md @@ -16,4 +16,6 @@ Do you: [scream?](../blah-balh/blah-blah.md) -[ask for forgiveness?](https://www.youtube.com/watch?v=fGuR4GOV5L0) \ No newline at end of file +[ask for forgiveness?](https://www.youtube.com/watch?v=fGuR4GOV5L0) + +[Stack rocks until the next move comes to you?](english/scarab/stack-rocks/stack-rocks.md) \ No newline at end of file diff --git a/english/scarab/stack-rocks/stack-rocks.md b/english/scarab/stack-rocks/stack-rocks.md new file mode 100644 index 0000000000..a3f99f0b32 --- /dev/null +++ b/english/scarab/stack-rocks/stack-rocks.md @@ -0,0 +1 @@ +You have chosen wisely. \ No newline at end of file From 074edd7ffa6bec6740174c8fa701227a4dc9dbda Mon Sep 17 00:00:00 2001 From: DarkNormal Date: Tue, 10 Nov 2015 09:14:50 +0000 Subject: [PATCH 1603/5486] Christopher Walken pocket watch added --- english/more_cowbell/more_cowbell.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/more_cowbell/more_cowbell.md b/english/more_cowbell/more_cowbell.md index 9a123deab8..466399c928 100644 --- a/english/more_cowbell/more_cowbell.md +++ b/english/more_cowbell/more_cowbell.md @@ -1 +1,3 @@ -A wild [Christopher Walken](http://www.hulu.com/watch/536145) appears! \ No newline at end of file +A wild [Christopher Walken](http://www.hulu.com/watch/536145) appears! + +He has a [pocket watch](https://www.youtube.com/watch?v=YFtHjV4c4uw) in his hand, he begins to tell you about the watch \ No newline at end of file From c508cf2805ad42bcd1bf192d6b7878bb3c4b48df Mon Sep 17 00:00:00 2001 From: Anirudha Joshi Date: Tue, 10 Nov 2015 07:33:52 -0500 Subject: [PATCH 1604/5486] Add Anirudha's adventure --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index aff3151db5..50827f4417 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -604,4 +604,6 @@ Just then you recall the news story of what is causing the ...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) -You escape into a [recording studio](more_cowbell/more_cowbell.md) \ No newline at end of file +You escape into a [recording studio](more_cowbell/more_cowbell.md) + +And then you stumble upon something [completely different](http://www.atlasobscura.com/) \ No newline at end of file From 91b6a1e8f5efcb713108a596085fbe5ed824edeb Mon Sep 17 00:00:00 2001 From: Ruut Brandsma Date: Tue, 10 Nov 2015 14:05:27 +0100 Subject: [PATCH 1605/5486] add question on marshmallow taste --- english/light-fire/magic-world/back/back.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/light-fire/magic-world/back/back.md b/english/light-fire/magic-world/back/back.md index bdd7991045..7220c5750a 100644 --- a/english/light-fire/magic-world/back/back.md +++ b/english/light-fire/magic-world/back/back.md @@ -2,4 +2,6 @@ By this time, your marshmallow room has burnt down. You atleast got those burnt marshmallows. -Guess that's what you get for backing off!!! \ No newline at end of file +Guess that's what you get for backing off!!! + +The marshmallows have a great taste. Why is that? \ No newline at end of file From c0f539b034aa9035c0a321eedad5094b58ec9d8f Mon Sep 17 00:00:00 2001 From: Ruut Brandsma Date: Tue, 10 Nov 2015 14:44:25 +0100 Subject: [PATCH 1606/5486] add zakmes --- dutch/over-het-hek/zakmes.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 dutch/over-het-hek/zakmes.md diff --git a/dutch/over-het-hek/zakmes.md b/dutch/over-het-hek/zakmes.md new file mode 100644 index 0000000000..b527891f1e --- /dev/null +++ b/dutch/over-het-hek/zakmes.md @@ -0,0 +1,3 @@ +Het zakmes bevat een ijzerzaag. Die is nog flijmscherp want je hebt hem nog nooit gebruikt. + +Je probeert jezelf los te zagen, maar dit heeft geen effect wat je zit vastgeplakt aan het hek. \ No newline at end of file From f86e6dd25655f0a152626f42162d255c4e86261c Mon Sep 17 00:00:00 2001 From: Ruut Brandsma Date: Tue, 10 Nov 2015 14:54:59 +0100 Subject: [PATCH 1607/5486] moved zakmes to subfolder --- dutch/over-het-hek/{ => zakmes}/zakmes.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dutch/over-het-hek/{ => zakmes}/zakmes.md (100%) diff --git a/dutch/over-het-hek/zakmes.md b/dutch/over-het-hek/zakmes/zakmes.md similarity index 100% rename from dutch/over-het-hek/zakmes.md rename to dutch/over-het-hek/zakmes/zakmes.md From 8e750236ff166a5e256112dabde1bc7fde83bdf7 Mon Sep 17 00:00:00 2001 From: Ruut Brandsma Date: Tue, 10 Nov 2015 15:01:05 +0100 Subject: [PATCH 1608/5486] added line ending to hek (hopefully now link works) --- dutch/over-het-hek/hek.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dutch/over-het-hek/hek.md b/dutch/over-het-hek/hek.md index 54c6473694..d11776a26c 100644 --- a/dutch/over-het-hek/hek.md +++ b/dutch/over-het-hek/hek.md @@ -15,3 +15,5 @@ Je zoekt naar hulpmiddelen om los te komen in je zakken en ... wat vind je? [Je autosleutel](sleutel/sleutel.md) [Een paar flippo's uit de jaren '90](flippo/flippo.md) + +[Een Zwitsers zakmes](zakmes/zakmes.md) From 6885b2ad15e9ba968513f3aef2c3ef28eb0b0951 Mon Sep 17 00:00:00 2001 From: Nathan Law Date: Tue, 10 Nov 2015 13:39:54 -0500 Subject: [PATCH 1609/5486] added pushed.md & altered open-door.md to reflect --- english/eating-walls/find-a-toilet/door/open-door.md | 4 +++- .../eating-walls/find-a-toilet/door/pushed/pushed.md | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 english/eating-walls/find-a-toilet/door/pushed/pushed.md diff --git a/english/eating-walls/find-a-toilet/door/open-door.md b/english/eating-walls/find-a-toilet/door/open-door.md index 70bd48ff10..9fe3bedf84 100644 --- a/english/eating-walls/find-a-toilet/door/open-door.md +++ b/english/eating-walls/find-a-toilet/door/open-door.md @@ -12,4 +12,6 @@ Do you: [Blind the eyes with your torch](alien/use-torch.md) -[Scream as loud as you can](scream/scream.md) \ No newline at end of file +[Scream as loud as you can](scream/scream.md) + +[Get pushed through the door](pushed/pushed.md) \ No newline at end of file diff --git a/english/eating-walls/find-a-toilet/door/pushed/pushed.md b/english/eating-walls/find-a-toilet/door/pushed/pushed.md new file mode 100644 index 0000000000..e060db96ce --- /dev/null +++ b/english/eating-walls/find-a-toilet/door/pushed/pushed.md @@ -0,0 +1,10 @@ +A tall thin man in jester's motley stands before you. He sighs and lights a cigarette. + +You look down and realize you have just wet your britches. + +The man looks at you and riggles his fingers in the air like he's really spooky. "HAH! Skiddish are ya? Well, too late to show you to the restrooms..." + +You are slightly embarrassed but happy to not be holding it in anymore. + +The man takes a long drag from his cigarette, promptly turns you to face the open door, and [shoves you through the door](../lego-world/lego-world.md) + \ No newline at end of file From e493a52036443581f913ef4a8604d4aa77ec9709 Mon Sep 17 00:00:00 2001 From: Nathan Law Date: Tue, 10 Nov 2015 13:56:38 -0500 Subject: [PATCH 1610/5486] fixed lines that were too long --- .../eating-walls/find-a-toilet/door/pushed/pushed.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/english/eating-walls/find-a-toilet/door/pushed/pushed.md b/english/eating-walls/find-a-toilet/door/pushed/pushed.md index e060db96ce..52cfec61af 100644 --- a/english/eating-walls/find-a-toilet/door/pushed/pushed.md +++ b/english/eating-walls/find-a-toilet/door/pushed/pushed.md @@ -1,10 +1,14 @@ -A tall thin man in jester's motley stands before you. He sighs and lights a cigarette. +A tall thin man in jester's motley stands before you. +He sighs and lights a cigarette. You look down and realize you have just wet your britches. -The man looks at you and riggles his fingers in the air like he's really spooky. "HAH! Skiddish are ya? Well, too late to show you to the restrooms..." +The man looks at you and riggles his fingers in the air like he's really spooky. + +"HAH! Skiddish are ya? Well, too late to show you to the restrooms..." You are slightly embarrassed but happy to not be holding it in anymore. -The man takes a long drag from his cigarette, promptly turns you to face the open door, and [shoves you through the door](../lego-world/lego-world.md) +The man takes a long drag from his cigarette, +promptly turns you to face the open door, and [shoves you through the door](/lego-world/lego-world.md) \ No newline at end of file From 10aaf16b356b59216614e9a34d33a4d4836ef07b Mon Sep 17 00:00:00 2001 From: Nathan Law Date: Tue, 10 Nov 2015 14:14:30 -0500 Subject: [PATCH 1611/5486] fixed more lines that were too long, hopefully corrected link to lego-world --- .../find-a-toilet/door/pushed/pushed.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/english/eating-walls/find-a-toilet/door/pushed/pushed.md b/english/eating-walls/find-a-toilet/door/pushed/pushed.md index 52cfec61af..4f1ebe4973 100644 --- a/english/eating-walls/find-a-toilet/door/pushed/pushed.md +++ b/english/eating-walls/find-a-toilet/door/pushed/pushed.md @@ -1,14 +1,19 @@ A tall thin man in jester's motley stands before you. He sighs and lights a cigarette. -You look down and realize you have just wet your britches. +You look down and realize you have just wet your +britches. -The man looks at you and riggles his fingers in the air like he's really spooky. +The man looks at you and riggles his fingers in the air +like he's really spooky. -"HAH! Skiddish are ya? Well, too late to show you to the restrooms..." +"HAH! Skiddish are ya? Well, too late to show you to +the restrooms..." -You are slightly embarrassed but happy to not be holding it in anymore. +You are slightly embarrassed but happy to not be +holding it in anymore. The man takes a long drag from his cigarette, -promptly turns you to face the open door, and [shoves you through the door](/lego-world/lego-world.md) +promptly turns you to face the open door, and +[shoves you through the door](create-your-own-adventure/english/lego-world/lego-world.md) \ No newline at end of file From 0c80a4bc601797d3838b823389c2b0ad4868baac Mon Sep 17 00:00:00 2001 From: Nathan Law Date: Tue, 10 Nov 2015 14:43:11 -0500 Subject: [PATCH 1612/5486] Work, DAMN YOU! --- english/eating-walls/find-a-toilet/door/pushed/pushed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/eating-walls/find-a-toilet/door/pushed/pushed.md b/english/eating-walls/find-a-toilet/door/pushed/pushed.md index 4f1ebe4973..71e1983c4e 100644 --- a/english/eating-walls/find-a-toilet/door/pushed/pushed.md +++ b/english/eating-walls/find-a-toilet/door/pushed/pushed.md @@ -15,5 +15,5 @@ holding it in anymore. The man takes a long drag from his cigarette, promptly turns you to face the open door, and -[shoves you through the door](create-your-own-adventure/english/lego-world/lego-world.md) +[shoves you through the door](lego-world/lego-world.md) \ No newline at end of file From 9b2491cc5d280b22e38db4cbf0f58ec4f2ca9fed Mon Sep 17 00:00:00 2001 From: Nathan Law Date: Tue, 10 Nov 2015 14:52:26 -0500 Subject: [PATCH 1613/5486] took out lego-world --- english/eating-walls/find-a-toilet/door/pushed/pushed.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/eating-walls/find-a-toilet/door/pushed/pushed.md b/english/eating-walls/find-a-toilet/door/pushed/pushed.md index 71e1983c4e..a153882b88 100644 --- a/english/eating-walls/find-a-toilet/door/pushed/pushed.md +++ b/english/eating-walls/find-a-toilet/door/pushed/pushed.md @@ -15,5 +15,6 @@ holding it in anymore. The man takes a long drag from his cigarette, promptly turns you to face the open door, and -[shoves you through the door](lego-world/lego-world.md) - \ No newline at end of file +shoves you through the door. + +You wake up in bed having wet yourself. \ No newline at end of file From 9bc9800f9e249627613a025541c9ada52cf309ab Mon Sep 17 00:00:00 2001 From: Alexandros Baramilis Date: Tue, 10 Nov 2015 20:29:25 +0000 Subject: [PATCH 1614/5486] You decide to stay in the room and you realize there are other people. What do you do? --- .../collaborate_to_take_it_down.md | 3 +++ .../stay_inside/kill_everyone_else/kill_everyone_else.md | 3 +++ .../set_it_on_fire/stay_inside/stay_inside.md | 8 +++++++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/collaborate_to_take_it_down/collaborate_to_take_it_down.md create mode 100644 greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/kill_everyone_else/kill_everyone_else.md diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/collaborate_to_take_it_down/collaborate_to_take_it_down.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/collaborate_to_take_it_down/collaborate_to_take_it_down.md new file mode 100644 index 0000000000..8684294a2b --- /dev/null +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/collaborate_to_take_it_down/collaborate_to_take_it_down.md @@ -0,0 +1,3 @@ +Μάγκες μου, αυτό που είδα εκεί μέσα, ξεπερνάει κάθε σατανική φαντασία. +Από την άλλη όμως αυτό το δωμάτιο στο οποίο βρισκόμαστε είναι άρρωστο και πρέπει να φύγουμε από εδώ πάση θυσία. +Προτείνω να κάνουμε ένα ντου όλοι μαζί μπας και το τρομάξουμε. \ No newline at end of file diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/kill_everyone_else/kill_everyone_else.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/kill_everyone_else/kill_everyone_else.md new file mode 100644 index 0000000000..792c538c57 --- /dev/null +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/kill_everyone_else/kill_everyone_else.md @@ -0,0 +1,3 @@ +Αφού έχουν πεθάνει όλοι, κάθεσαι μέσα στα αίματα βαριανασαίνοντας και σκέφτεσαι τη μαλακία που έκανες. +Τώρα είσαι μόνος σου και δεν έχεις κανένα να σε βοηθήσει να σκοτώσετε το τέρας στο επόμενο δωμάτιο. +Βγάζεις το πακέτο με τα τσιγάρα και βλέπεις ότι σου έχει μείνει μόνο ένα... \ No newline at end of file diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/stay_inside.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/stay_inside.md index c7419701b3..3665ff8fe6 100644 --- a/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/stay_inside.md +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/stay_inside.md @@ -3,4 +3,10 @@ κεφάλι σου απο την στενή τρύπα στον τοίχο νιώθεις ένα χέρι να σε πιάνει απο το πόδι και αμέσως πετάγεσε στο πίσω μέρος του δωματίου. Ελαφρώς ζαλισμένος και με ελαφριά θολή όραση απο το βίαιο ταρακούνημα -αντιλαμβάνεσαι οτι στο δωμάτιο βρίσκονται και άλλοι σαν εσένα. \ No newline at end of file +αντιλαμβάνεσαι οτι στο δωμάτιο βρίσκονται και άλλοι σαν εσένα. + +Τι κάνεις; + +[Αποφασίζεις να μοιραστείς αυτό που είδες με τους άλλους και μαζί να βρείτε μια λύση.](collaborate_to_take_it_down/collaborate_to_take_it_down.md) + +[Από την παράνοιά σου, επιτίθεσαι και προσπαθείς να τους σκοτώσεις όλους.](kill_everyone_else/kill_everyone_else.md) \ No newline at end of file From 8ef49ac5be76c14fef77c803b377511ee6dff1fd Mon Sep 17 00:00:00 2001 From: Alexandros Baramilis Date: Tue, 10 Nov 2015 20:34:38 +0000 Subject: [PATCH 1615/5486] Smaller lines... --- .../set_it_on_fire/stay_inside/stay_inside.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/stay_inside.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/stay_inside.md index 3665ff8fe6..3149dbb295 100644 --- a/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/stay_inside.md +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/stay_inside/stay_inside.md @@ -7,6 +7,6 @@ Τι κάνεις; -[Αποφασίζεις να μοιραστείς αυτό που είδες με τους άλλους και μαζί να βρείτε μια λύση.](collaborate_to_take_it_down/collaborate_to_take_it_down.md) +[Αποφασίζεις να μοιραστείς αυτό που είδες με τους άλλους.](collaborate_to_take_it_down/collaborate_to_take_it_down.md) -[Από την παράνοιά σου, επιτίθεσαι και προσπαθείς να τους σκοτώσεις όλους.](kill_everyone_else/kill_everyone_else.md) \ No newline at end of file +[Από την παράνοιά σου, επιτίθεσαι σε όλους.](kill_everyone_else/kill_everyone_else.md) \ No newline at end of file From 36631e524bf7a90ebf1d9072695a913d4f87fda7 Mon Sep 17 00:00:00 2001 From: Keith Owens Date: Tue, 10 Nov 2015 14:43:37 -0600 Subject: [PATCH 1616/5486] Add a couple lines to happy-robot --- english/happy-robot/happy-robot.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/happy-robot/happy-robot.md b/english/happy-robot/happy-robot.md index a2e0a5e072..b57eefea19 100644 --- a/english/happy-robot/happy-robot.md +++ b/english/happy-robot/happy-robot.md @@ -1 +1,4 @@ -A happy robot helps people. \ No newline at end of file +A happy robot helps people. + +It was a dark and stormy night. A scream is heard. A happy robot, let's name him "George," wakes up to the sound. +"Someone needs my help!" From cee50b347ef5fd6e9f1fa0a8b31e087341d62210 Mon Sep 17 00:00:00 2001 From: edcorners Date: Tue, 10 Nov 2015 17:54:41 -0500 Subject: [PATCH 1617/5486] Weapon of choice --- english/more_cowbell/more_cowbell.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/more_cowbell/more_cowbell.md b/english/more_cowbell/more_cowbell.md index 466399c928..da317787d3 100644 --- a/english/more_cowbell/more_cowbell.md +++ b/english/more_cowbell/more_cowbell.md @@ -1,3 +1,6 @@ A wild [Christopher Walken](http://www.hulu.com/watch/536145) appears! -He has a [pocket watch](https://www.youtube.com/watch?v=YFtHjV4c4uw) in his hand, he begins to tell you about the watch \ No newline at end of file +He has a [pocket watch](https://www.youtube.com/watch?v=YFtHjV4c4uw) in his hand, he begins to tell you about the watch + +He also hands you a [weapon](https://www.youtube.com/watch?v=wCDIYvFmgW8) + From 96c32063b10f497447d5445183cb9ac935d4a49b Mon Sep 17 00:00:00 2001 From: Mayor Date: Wed, 11 Nov 2015 01:59:55 +0200 Subject: [PATCH 1618/5486] Fix spelling and discard unnecessary prompt --- greek/marshmallow.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/greek/marshmallow.md b/greek/marshmallow.md index bb242ad44f..e77e279ff3 100644 --- a/greek/marshmallow.md +++ b/greek/marshmallow.md @@ -1,6 +1,6 @@ -Ένα πρωινό, ξυπνάς μέσα σε ένα παράξενο δωμάτιο με ζαχαρωτά για τοίχους. +Ένα πρωινό, ξυπνάς μέσα σε ένα παράξενο δωμάτιο με ζαχαρωτά για τοίχους. -Υπάρχουν άπειρα ζαχαρωτά και φαίνονται πεντανόστημα. +Υπάρχουν άπειρα ζαχαρωτά και φαίνονται πεντανόστιμα. Σιγά σιγά συνειδητοποιείς ότι φοράς μία άβολη και ενοχλητική ζακέτα κατασκευασμένη από δέρμα. @@ -14,8 +14,6 @@ Συγκράτησε την εικόνα του ζαχαρωτού και ... -Κάνεις: - [Βγάζεις την κάλτσα σου](put_socks_off/put-socks-off.md) [Παίρνεις το πιρούνι](take_the_fork/take-the-fork.md) From d0907f4635a1e44dd0343f9a285ed696d77c7a11 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 10 Nov 2015 20:57:29 -0500 Subject: [PATCH 1619/5486] Add racoon to new-years --- english/new-years/new-years.md | 4 +++- english/raccoon-corner/raccoon-corner.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/raccoon-corner/raccoon-corner.md diff --git a/english/new-years/new-years.md b/english/new-years/new-years.md index 0100ac7fbf..7aaabd1894 100644 --- a/english/new-years/new-years.md +++ b/english/new-years/new-years.md @@ -1,2 +1,4 @@ Ah . . . New Year's Eve . . . it all comes back to you now . . . sort of. -It was a costume party, and, come to think of it, the Chief Marshmallow was there too. \ No newline at end of file +It was a costume party, and, come to think of it, the Chief Marshmallow was there too. + +He was obviously angry about something, it could be the horrible smell that was coming from the [raccoon in the corner](raccoon-corner/raccoon-corner.md) \ No newline at end of file diff --git a/english/raccoon-corner/raccoon-corner.md b/english/raccoon-corner/raccoon-corner.md new file mode 100644 index 0000000000..cdb4576969 --- /dev/null +++ b/english/raccoon-corner/raccoon-corner.md @@ -0,0 +1 @@ +No one knew where the raccoon came from, only that he had the strangest, toothy grin. \ No newline at end of file From d3a3c340eadddc95b80ede5ab868416e6a793409 Mon Sep 17 00:00:00 2001 From: Ian Halloran Date: Tue, 10 Nov 2015 20:31:22 -0800 Subject: [PATCH 1620/5486] Add link to scarab/goddess.md link from marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index aff3151db5..33d7969cf3 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -14,6 +14,8 @@ Or a Wednesday...Thursday...maybe even a Friday. Ok, we have to consider Saturday too. +Alice doesn't live here anymore, [or does she?](scarab/goddess.md) + But not Monday; you never go out on a Sunday evening......[or do you](./or-do-you/or-do-you.md)? Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. From 26de0047293add97d994c5aac35e29f4e568953b Mon Sep 17 00:00:00 2001 From: Ian Halloran Date: Tue, 10 Nov 2015 20:35:47 -0800 Subject: [PATCH 1621/5486] Fix link on goddess.md to stack-rocks.md --- english/scarab/goddess.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/scarab/goddess.md b/english/scarab/goddess.md index 070c7db289..7b6de548ec 100644 --- a/english/scarab/goddess.md +++ b/english/scarab/goddess.md @@ -18,4 +18,4 @@ Do you: [ask for forgiveness?](https://www.youtube.com/watch?v=fGuR4GOV5L0) -[Stack rocks until the next move comes to you?](english/scarab/stack-rocks/stack-rocks.md) \ No newline at end of file +[Stack rocks until the next move comes to you?](stack-rocks/stack-rocks.md) \ No newline at end of file From 244bdff7ceee8a364c78f40700e8e8b7c2f94624 Mon Sep 17 00:00:00 2001 From: brianbishop Date: Wed, 11 Nov 2015 11:58:35 +0000 Subject: [PATCH 1622/5486] Add a link --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 50827f4417..2a740aaec1 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -605,5 +605,5 @@ Just then you recall the news story of what is causing the ...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) You escape into a [recording studio](more_cowbell/more_cowbell.md) - +Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) And then you stumble upon something [completely different](http://www.atlasobscura.com/) \ No newline at end of file From 18a6c27df05977fb1ad445931852dcc1d5622fdb Mon Sep 17 00:00:00 2001 From: brianbishop Date: Wed, 11 Nov 2015 12:06:17 +0000 Subject: [PATCH 1623/5486] Add blank lines --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 2a740aaec1..266e1ad4bc 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -605,5 +605,7 @@ Just then you recall the news story of what is causing the ...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) You escape into a [recording studio](more_cowbell/more_cowbell.md) + Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) + And then you stumble upon something [completely different](http://www.atlasobscura.com/) \ No newline at end of file From b0bb6be4b156d68c81fa253875fdc1cb7e69ec82 Mon Sep 17 00:00:00 2001 From: zolani Date: Wed, 11 Nov 2015 14:36:29 +0100 Subject: [PATCH 1624/5486] Modify the genie story (French) --- french/appelle-genie/appelle-genie.md | 1 + 1 file changed, 1 insertion(+) diff --git a/french/appelle-genie/appelle-genie.md b/french/appelle-genie/appelle-genie.md index 061b548ce9..a13678538e 100644 --- a/french/appelle-genie/appelle-genie.md +++ b/french/appelle-genie/appelle-genie.md @@ -3,5 +3,6 @@ dans votre poche et invoquez le génie de la lampe. Il vous rappelle que vous avez déja exaucer vos trois souhaits et retourne dans sa lampe vous laissant desesperé et rempli de desespoir. +Vous jetez alors la lampe par la fenêtre de la maison. [Je reconsidère mes options une fois de plus](../feu-de-camp.md) \ No newline at end of file From df9be447318aa669ff3ea43973de2d2264a8cb50 Mon Sep 17 00:00:00 2001 From: Juanadelacuesta Date: Wed, 11 Nov 2015 12:03:27 -0500 Subject: [PATCH 1625/5486] Poner a bailar al ejercito invasor --- espanol/bailar/musica/pandereta.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/bailar/musica/pandereta.md b/espanol/bailar/musica/pandereta.md index 15fefba1b1..862231045a 100644 --- a/espanol/bailar/musica/pandereta.md +++ b/espanol/bailar/musica/pandereta.md @@ -1 +1,3 @@ Beatito sacó su pandereta y bailó alrededor del Consejero tocandola mientras cantaba "Y no traen cara de contentoooos" +Julio, un poco sorprendido, se sorprendió aun más, al mirar por la ventana de la torre y ver como uno a uno de los +invasores iba sacando de detras de su escudo los zapatos para bailar tap! \ No newline at end of file From f2c778a7b09a68c39d1b13c822b58abf3c36c25e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20del=20R=C3=ADo=20Medina?= Date: Wed, 11 Nov 2015 19:18:13 +0100 Subject: [PATCH 1626/5486] Add option "feed the dragon". --- espanol/dragon/dragon.md | 4 +++- espanol/dragon/festin/festin.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 espanol/dragon/festin/festin.md diff --git a/espanol/dragon/dragon.md b/espanol/dragon/dragon.md index e23aa57ea1..87c89beadd 100644 --- a/espanol/dragon/dragon.md +++ b/espanol/dragon/dragon.md @@ -23,4 +23,6 @@ vendedor de dragones del pueblo. Pero no sabía controlar al dragón, así que decidió: -[matarlo](muerte-dragon/muerte-dragon.md) \ No newline at end of file +[matarlo](muerte-dragon/muerte-dragon.md) +[darle de comer](festin/festing.md) + diff --git a/espanol/dragon/festin/festin.md b/espanol/dragon/festin/festin.md new file mode 100644 index 0000000000..453072e6e7 --- /dev/null +++ b/espanol/dragon/festin/festin.md @@ -0,0 +1 @@ +Compartió sus viandas con el dragón, y éste se lo agradeció llevándole a donde él quería. From 094bbee4a1f539e47dfb7bae213232d1efd0fd2f Mon Sep 17 00:00:00 2001 From: Mayor Date: Wed, 11 Nov 2015 21:39:48 +0200 Subject: [PATCH 1627/5486] Replace english question mark with equivalent greek symbol and fix a compound to display properly --- greek/put_socks_off/put-socks-off.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/greek/put_socks_off/put-socks-off.md b/greek/put_socks_off/put-socks-off.md index cc8b99fc91..2d341b10df 100644 --- a/greek/put_socks_off/put-socks-off.md +++ b/greek/put_socks_off/put-socks-off.md @@ -1,5 +1,5 @@ -Θέλεις να τεστάρεις το ζαχαρωτό. Για τί είναι ικανό? Διαθέτει -άραγε παρόμοια αισθητήρια όπως και εσύ? Βλέπει, ακούει, μυρίζει? -Ας δούμε λοιπόν πως αντιδράει στην μοχθηρή μυρωδιά μιας χιλιο- -φορεμένης καλτσας... +Θέλεις να τεστάρεις το ζαχαρωτό. Για τί είναι ικανό; Διαθέτει +άραγε παρόμοια αισθητήρια όπως και εσύ; Βλέπει, ακούει, μυρίζει; +Ας δούμε λοιπόν πως αντιδράει στην μοχθηρή μυρωδιά μιας +χιλιο-φορεμένης καλτσας... From 59fc516db708a331a04e621c3ffe1b333f387fe4 Mon Sep 17 00:00:00 2001 From: kuthbert Date: Wed, 11 Nov 2015 20:53:41 +0100 Subject: [PATCH 1628/5486] =?UTF-8?q?Neue=20Geschichte=20Hinzugef=C3=BCgen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/schwimmen/hunger/momentmal/momentmal.md | 2 ++ german/schwimmen/hunger/momentmal/verstehen/verstehen.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 german/schwimmen/hunger/momentmal/verstehen/verstehen.md diff --git a/german/schwimmen/hunger/momentmal/momentmal.md b/german/schwimmen/hunger/momentmal/momentmal.md index a79b0585a6..2d64dc2a1c 100644 --- a/german/schwimmen/hunger/momentmal/momentmal.md +++ b/german/schwimmen/hunger/momentmal/momentmal.md @@ -7,3 +7,5 @@ Ach ja - Papua Neuguinea ... Eingeborene ... Kannibalen ... Du beschließt, doch besser woanders hinzugehen, aber plötzlich bist du von einer Gruppe von kleinen, fast nackten Männern mit Speeren umringt, die wild gestikulieren. + +Du wirst versuchen: [die Männer zu verstehen?](verstehen/verstehen.md) \ No newline at end of file diff --git a/german/schwimmen/hunger/momentmal/verstehen/verstehen.md b/german/schwimmen/hunger/momentmal/verstehen/verstehen.md new file mode 100644 index 0000000000..372105c2db --- /dev/null +++ b/german/schwimmen/hunger/momentmal/verstehen/verstehen.md @@ -0,0 +1 @@ +Der Leader der Männer hat dich mit Finger gezeigt, dann gleich eine Krone hoch gehoben und hingekniet. Sie wollen dich als ihr neuer König auf dem Thron sehen!! \ No newline at end of file From 917c64ab8afc82c863292b6610ef23b84604cd44 Mon Sep 17 00:00:00 2001 From: Yixin Wu Date: Wed, 11 Nov 2015 21:20:16 +0100 Subject: [PATCH 1629/5486] Update verstehen.md --- german/schwimmen/hunger/momentmal/verstehen/verstehen.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/german/schwimmen/hunger/momentmal/verstehen/verstehen.md b/german/schwimmen/hunger/momentmal/verstehen/verstehen.md index 372105c2db..8297f4fa24 100644 --- a/german/schwimmen/hunger/momentmal/verstehen/verstehen.md +++ b/german/schwimmen/hunger/momentmal/verstehen/verstehen.md @@ -1 +1,5 @@ -Der Leader der Männer hat dich mit Finger gezeigt, dann gleich eine Krone hoch gehoben und hingekniet. Sie wollen dich als ihr neuer König auf dem Thron sehen!! \ No newline at end of file +Der Leader der Männer hat dich mit Finger gezeigt, dann gleich + +eine Krone hoch gehoben und hingekniet. Sie wollen dich als ihr + +neuer König auf dem Thron sehen!! From 492be1da70c350e13d01f55c8ed3419bccee3868 Mon Sep 17 00:00:00 2001 From: Mihail Petrov Date: Thu, 12 Nov 2015 02:53:08 +0200 Subject: [PATCH 1630/5486] add run option in the polar_bear file --- english/polar-bear/polar-bear.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/polar-bear/polar-bear.md b/english/polar-bear/polar-bear.md index 1346e00cbc..79050c840b 100644 --- a/english/polar-bear/polar-bear.md +++ b/english/polar-bear/polar-bear.md @@ -1,4 +1,4 @@ -The polar bear looks hungry. Maybe i should give him this soft delicious marshmallow. +The polar bear looks hungry. Maybe i should give him this soft delicious marshmallow. Here you go polar bear. But he doesn’t move. Is he color blind? Maybe he doesn’t see white. So after waiting 10 minutes, i decide to just get my picture taken with him. No wait. I’m too far away, let me step of this fence. He grabs my tennis shoe and tries to eat it. He was hungry! @@ -38,3 +38,5 @@ Now you decide to: [Do a dance](../dance/dance.md) [and ride through the worm whole](worm_hole/worm_hole.md) + +[Run](../run.md) From 32da6e6e3bf55048f36c6bc561f1a5d2345bbc80 Mon Sep 17 00:00:00 2001 From: Mihail Petrov Date: Thu, 12 Nov 2015 03:07:34 +0200 Subject: [PATCH 1631/5486] amended with the correct link --- english/polar-bear/polar-bear.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/polar-bear/polar-bear.md b/english/polar-bear/polar-bear.md index 79050c840b..de021c80bd 100644 --- a/english/polar-bear/polar-bear.md +++ b/english/polar-bear/polar-bear.md @@ -39,4 +39,4 @@ Now you decide to: [and ride through the worm whole](worm_hole/worm_hole.md) -[Run](../run.md) +[Run](../run/run.md) From baa1dc9a9e2f7e550d68d0f8111b1c049dfbbf39 Mon Sep 17 00:00:00 2001 From: ReidJD Date: Wed, 11 Nov 2015 20:36:29 -0500 Subject: [PATCH 1632/5486] Fix link --- english/new-years/new-years.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/new-years/new-years.md b/english/new-years/new-years.md index 7aaabd1894..e6d836ee55 100644 --- a/english/new-years/new-years.md +++ b/english/new-years/new-years.md @@ -1,4 +1,5 @@ Ah . . . New Year's Eve . . . it all comes back to you now . . . sort of. It was a costume party, and, come to think of it, the Chief Marshmallow was there too. -He was obviously angry about something, it could be the horrible smell that was coming from the [raccoon in the corner](raccoon-corner/raccoon-corner.md) \ No newline at end of file +He was obviously angry about something. +It could be the horrible smell that was coming from the [raccoon in the corner.](../raccoon-corner/raccoon-corner.md) From 84c5e499aadb2b19090612e8c0c4b5c9f243f06f Mon Sep 17 00:00:00 2001 From: Louis Date: Fri, 13 Nov 2015 13:23:05 +0800 Subject: [PATCH 1633/5486] =?UTF-8?q?Add=20=E5=A4=A7=E8=AF=9D=E8=A5=BF?= =?UTF-8?q?=E6=B8=B8=E4=B9=8B=20Bale?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/Gareth_Bale/Bale.md | 21 +++++++++++++++++++ ...47\350\257\235\350\245\277\346\270\270.md" | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 Chinese/Gareth_Bale/Bale.md diff --git a/Chinese/Gareth_Bale/Bale.md b/Chinese/Gareth_Bale/Bale.md new file mode 100644 index 0000000000..55a68c235c --- /dev/null +++ b/Chinese/Gareth_Bale/Bale.md @@ -0,0 +1,21 @@ +悟空转世之后出生于威尔士，取名 bale，而后成为一名足球运动员。 + +因为酷爱足球，而且速度奇快，bale 很快被豪门相中，并以“贝尔式进球”叱咤足坛， +最终在 2013 年转会皇家马德里。 + +但是大圣并不满足于此，为了让世人一睹自己雄风，在去年国王杯上演了一幕自己助攻 +自己的拿手好戏，成功传球于三秒后的自己并破门得分。于是世人惊呼：”两点之间， +贝尔最短。“ + +但是大家不知道的是，在这一球之前大概 40 分钟左右，也就是上半场快要结束的时候， +大圣也上演了这么一出好戏，只是当时速度太快，大家并没有反应过来。 + +当时大圣在自己半场断球成功，一个大脚把球踢向空中并快速向对方半场跑去。在临近 +对方禁区的时候，皮球刚好落到胸部位置，于是大圣一个鱼跃冲顶将皮球顶向球门死角。 +只是当大圣跑向边线边裁位置查看自己攻门的时候发现自己不经意之间好像右手有触碰到 +皮球边缘，于是大圣果断夺过边裁口哨吹停比赛示意自己犯规在先进球无效。现场皇马 +球迷群情激愤，虽然不知道发生了什么但都为这个进球可惜。只有 bale 一声不吭走向 +自己半场。因为他知道，足球场上，球品才是决定自己高度的关键，何况自己还有逆天 +球技，怕什么。 + +这就是大圣，大圣之大，乃品行之大也。让我们期待更多更精彩的“贝尔式进球”！ \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 5e5f0f9b71..8d27c19c9c 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -68,4 +68,6 @@ [矢泽日香](nico/nico.md) -[韦小宝](Weixiaobao/Weixiaobao.md) \ No newline at end of file +[韦小宝](Weixiaobao/Weixiaobao.md) + +[Gareth Bale](Gareth_Bale/Bale.md) \ No newline at end of file From 6e4732d014dedd525cf7b8c5e2e5964411fff306 Mon Sep 17 00:00:00 2001 From: ddrm86 Date: Fri, 13 Nov 2015 07:11:34 +0100 Subject: [PATCH 1634/5486] Fix link and line break. --- espanol/dragon/dragon.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/dragon/dragon.md b/espanol/dragon/dragon.md index 87c89beadd..d5b3ca2bab 100644 --- a/espanol/dragon/dragon.md +++ b/espanol/dragon/dragon.md @@ -24,5 +24,5 @@ vendedor de dragones del pueblo. Pero no sabía controlar al dragón, así que decidió: [matarlo](muerte-dragon/muerte-dragon.md) -[darle de comer](festin/festing.md) +[darle de comer](festin/festin.md) From 959a36d2d956b7cb1d9f9711fec34087a1f357cc Mon Sep 17 00:00:00 2001 From: Karl Martino Date: Fri, 13 Nov 2015 07:02:45 -0500 Subject: [PATCH 1635/5486] Add going to a new movie to marshmellow.md. --- english/marshmallow.md | 4 +++- english/new-movie/new-movie.md | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 english/new-movie/new-movie.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 300b11f59d..2f5abf630c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -612,4 +612,6 @@ You escape into a [recording studio](more_cowbell/more_cowbell.md) Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) -And then you stumble upon something [completely different](http://www.atlasobscura.com/) \ No newline at end of file +And then you stumble upon something [completely different](http://www.atlasobscura.com/) + +You decide to [take a shortcut](new_movie/new_movie.md) on the way to the movie... diff --git a/english/new-movie/new-movie.md b/english/new-movie/new-movie.md new file mode 100644 index 0000000000..30e4528703 --- /dev/null +++ b/english/new-movie/new-movie.md @@ -0,0 +1,27 @@ +Scratched on the wall you read... + +> No man is an island, +> Entire of itself. +> Each is a piece of the continent, +> A part of the main. + +Further down this abandoned station the following catches your eye... + +> Be still. +> Listen to the stones of the wall. + +It *is* eerie quiet down here, except for a lone water drip and a machine that clanks every minute in the distance. + +But then the following freezes you. + +> I’m still turning my stick. +> He’s already eaten six. + +More of this [marshmellow madness](http://www.poetryfoundation.org/poem/241898) every where you go! + +But you got somewhere to be, friends to meet, a movie to catch, and this shortcut no longer feels like a good idea. + +The marshmellow mystery is going to have to wait. WHO has eaten six? Is there something significant about the number? Clues, clues, everywhere clues that don't connect! + +Dammit! No way you're going to miss this movie, it's been years you've been waiting for it. Time to run! + From ddfc74ca6ea756cec4100c242f19351e8245c92f Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 14 Nov 2015 00:32:46 +1100 Subject: [PATCH 1636/5486] Add line about dreaming and reality --- english/marshmallow.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 300b11f59d..e451e8bd4a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -44,6 +44,9 @@ Maybe this is a dream? Or a [memory](memories/memories.md)? +Maybe it's a dream within a dream? Maybe dreaming and reality are one and the +same. Maybe reality is an oxymoron when considering multiple dimensions. + But it's probably not worth dwelling on that right now, you could be in danger. Grave danger. Oh No! @@ -612,4 +615,4 @@ You escape into a [recording studio](more_cowbell/more_cowbell.md) Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) -And then you stumble upon something [completely different](http://www.atlasobscura.com/) \ No newline at end of file +And then you stumble upon something [completely different](http://www.atlasobscura.com/) From 048372d43b4069d9329717d7d5113055fea66750 Mon Sep 17 00:00:00 2001 From: Felipe Kunzler Date: Fri, 13 Nov 2015 11:55:09 -0200 Subject: [PATCH 1637/5486] Add run-tiger story --- english/forest/scream/run/run.md | 1 + english/forest/scream/scream.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/forest/scream/run/run.md diff --git a/english/forest/scream/run/run.md b/english/forest/scream/run/run.md new file mode 100644 index 0000000000..50bb5bb0be --- /dev/null +++ b/english/forest/scream/run/run.md @@ -0,0 +1 @@ +Since you know you cannot outrun a tiger. You decide to run toward it making as much noise as possible in a way to scare it off!! \ No newline at end of file diff --git a/english/forest/scream/scream.md b/english/forest/scream/scream.md index 1adc1639c8..84e46ce28d 100644 --- a/english/forest/scream/scream.md +++ b/english/forest/scream/scream.md @@ -19,3 +19,5 @@ What will you do? [Throw nearby twigs and crap at it](throw/throw.md) [Play dead](dead/dead.md) + +[Run towards the tiger](run/run.md) From 781841a4ebf0bcb977b653c9da03f455d59f9404 Mon Sep 17 00:00:00 2001 From: Andrey Boreiko Date: Fri, 13 Nov 2015 17:09:49 +0300 Subject: [PATCH 1638/5486] Nip-off a piece of the wall --- russian/nip-off/nip-off.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 russian/nip-off/nip-off.md diff --git a/russian/nip-off/nip-off.md b/russian/nip-off/nip-off.md new file mode 100644 index 0000000000..9159eb94cf --- /dev/null +++ b/russian/nip-off/nip-off.md @@ -0,0 +1 @@ +Ммм, ничего так. Хотя, на мой вкус, слишком сладко. Надо запить чаем. \ No newline at end of file From 1dd439ea4aace54ea8871777a370b53caeded80b Mon Sep 17 00:00:00 2001 From: Andrey Boreiko Date: Fri, 13 Nov 2015 17:13:11 +0300 Subject: [PATCH 1639/5486] Nip-off added --- russian/zefir.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/zefir.md b/russian/zefir.md index 8a9a85b806..a2d6b65c09 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -38,4 +38,6 @@ [Откроете дверь, в нее настойчиво стучат.](rat-rat/rat-rat.md) -[Поздравлю деда.](grandad/grandad.md) \ No newline at end of file +[Поздравлю деда.](grandad/grandad.md) + +[Попробую отщипнуть кусочек зефирной стены.](nip-off/nip-off.md) \ No newline at end of file From 7a0491325f788f2842cdca1d1e1dc7414580e488 Mon Sep 17 00:00:00 2001 From: Jordan Frank Date: Fri, 13 Nov 2015 10:15:32 -0800 Subject: [PATCH 1640/5486] Edit line 40 on marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 300b11f59d..90a5cb113c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -10,7 +10,7 @@ Unexpectedly, the Chief Marshmallow demands to see your [references](references/ *(Must be a Tuesday.)* -Or a Wednesday...Thursday...maybe even a Friday. +Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. Ok, we have to consider Saturday too. From afa907c18c60b396ce70322d1a14016fcb60104e Mon Sep 17 00:00:00 2001 From: Felipe Kunzler Date: Fri, 13 Nov 2015 20:18:47 -0200 Subject: [PATCH 1641/5486] Break text into to two lines --- english/forest/scream/run/run.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/forest/scream/run/run.md b/english/forest/scream/run/run.md index 50bb5bb0be..9352234e92 100644 --- a/english/forest/scream/run/run.md +++ b/english/forest/scream/run/run.md @@ -1 +1,2 @@ -Since you know you cannot outrun a tiger. You decide to run toward it making as much noise as possible in a way to scare it off!! \ No newline at end of file +Since you know you cannot outrun a tiger. You decide to run toward it +making as much noise as possible in a way to scare it off!! \ No newline at end of file From f79b6358ad49f508272d36b896b4f1a55d5bd966 Mon Sep 17 00:00:00 2001 From: Beaglefoot Date: Sat, 14 Nov 2015 19:31:45 +0300 Subject: [PATCH 1642/5486] Add an option to examine in Russian --- russian/close-eyes/close-eyes.md | 4 ++++ russian/close-eyes/examine/examine-man.md | 3 +++ 2 files changed, 7 insertions(+) create mode 100755 russian/close-eyes/examine/examine-man.md diff --git a/russian/close-eyes/close-eyes.md b/russian/close-eyes/close-eyes.md index 6992fee94f..6e178a1b94 100644 --- a/russian/close-eyes/close-eyes.md +++ b/russian/close-eyes/close-eyes.md @@ -5,3 +5,7 @@ а затем в ванне и на балконе... На кухне рядом со столом сидел зефирный человек! + +Ваши действия: + +[Осмотреть зефирного человека](examine/examine-man.md) diff --git a/russian/close-eyes/examine/examine-man.md b/russian/close-eyes/examine/examine-man.md new file mode 100755 index 0000000000..6b2ef2c964 --- /dev/null +++ b/russian/close-eyes/examine/examine-man.md @@ -0,0 +1,3 @@ +Осматривая зефирного человека, вам стало совершенно очевидно, что перед вами мужчина. +Сей факт вас несколько озадачил, но вы не растерялись и облили его с головы до ног шоколадом. +Вам всегда хотелось иметь раба. From e74735c3ef3c6d9693ffeaf7ba5daef09ddf2b5d Mon Sep 17 00:00:00 2001 From: sg0218775 Date: Sat, 14 Nov 2015 10:34:51 -0600 Subject: [PATCH 1643/5486] dded a bike ride --- english/sanfran/bikeride/bikeride.md | 5 +++++ english/sanfran/sanfran.md | 1 + 2 files changed, 6 insertions(+) create mode 100644 english/sanfran/bikeride/bikeride.md diff --git a/english/sanfran/bikeride/bikeride.md b/english/sanfran/bikeride/bikeride.md new file mode 100644 index 0000000000..fdba4c3034 --- /dev/null +++ b/english/sanfran/bikeride/bikeride.md @@ -0,0 +1,5 @@ +I walk to the harbor. +There are several bike rental shops available. +I choose one, and rent a bicycle. +The ride over the Golden Gate Bridge is wonderful, +and I snap a few pictures. diff --git a/english/sanfran/sanfran.md b/english/sanfran/sanfran.md index e113ac231d..6a8d4d2fce 100644 --- a/english/sanfran/sanfran.md +++ b/english/sanfran/sanfran.md @@ -2,3 +2,4 @@ Strolling down market street, friendly smiles to passerby. Cold wind rustles minty green leaves. Soft summer glows over the front sidewalks. This is a season to remember. +I want to go for [a bike ride](bikeride/bikeride.md). From f9c8705c6f937f5f2415ffc04eacacd44d9bf415 Mon Sep 17 00:00:00 2001 From: Daniel Murphy Date: Sat, 14 Nov 2015 20:43:45 +0000 Subject: [PATCH 1644/5486] Add real-marsh-mallows.md linking to wiki page --- english/real-marsh-mallow/real-marsh-mallows.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/real-marsh-mallow/real-marsh-mallows.md diff --git a/english/real-marsh-mallow/real-marsh-mallows.md b/english/real-marsh-mallow/real-marsh-mallows.md new file mode 100644 index 0000000000..a4f12cfc62 --- /dev/null +++ b/english/real-marsh-mallow/real-marsh-mallows.md @@ -0,0 +1 @@ +[So what is real marsh mallow?](https://en.wikipedia.org/wiki/Althaea_officinalis) From cb31a3c671ed687c76c3c09b60d5bfda234d0931 Mon Sep 17 00:00:00 2001 From: Daniel Murphy Date: Sat, 14 Nov 2015 20:56:11 +0000 Subject: [PATCH 1645/5486] Updated english/marshmallow.md --- english/marshmallow.md | 2 ++ english/real-marsh-mallow/real-marsh-mallows.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index e12bcc294d..5a0d27eb04 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -616,3 +616,5 @@ You escape into a [recording studio](more_cowbell/more_cowbell.md) Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) And then you stumble upon something [completely different](http://www.atlasobscura.com/) + +[What is a real marsh mallow ?](real-marsh-mallow/real-marsh-mallows.md) \ No newline at end of file diff --git a/english/real-marsh-mallow/real-marsh-mallows.md b/english/real-marsh-mallow/real-marsh-mallows.md index a4f12cfc62..5c6a4bfb55 100644 --- a/english/real-marsh-mallow/real-marsh-mallows.md +++ b/english/real-marsh-mallow/real-marsh-mallows.md @@ -1 +1 @@ -[So what is real marsh mallow?](https://en.wikipedia.org/wiki/Althaea_officinalis) +So what is real marsh mallow? It's a plant, [Althaea officinalis)](https://en.wikipedia.org/wiki/Althaea_officinalis) From e7fca5a98938cb029c41df385b6461050560e2ab Mon Sep 17 00:00:00 2001 From: Daniel Murphy Date: Sat, 14 Nov 2015 21:06:51 +0000 Subject: [PATCH 1646/5486] Updated english/marshmallow.md and english/real-marsh-mallow/real-marsh-mallows.md --- english/marshmallow.md | 2 +- english/real-marsh-mallow/real-marsh-mallows.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5a0d27eb04..e33f2450b7 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -617,4 +617,4 @@ Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) And then you stumble upon something [completely different](http://www.atlasobscura.com/) -[What is a real marsh mallow ?](real-marsh-mallow/real-marsh-mallows.md) \ No newline at end of file +After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) \ No newline at end of file diff --git a/english/real-marsh-mallow/real-marsh-mallows.md b/english/real-marsh-mallow/real-marsh-mallows.md index 5c6a4bfb55..ac2531e2fd 100644 --- a/english/real-marsh-mallow/real-marsh-mallows.md +++ b/english/real-marsh-mallow/real-marsh-mallows.md @@ -1 +1,3 @@ -So what is real marsh mallow? It's a plant, [Althaea officinalis)](https://en.wikipedia.org/wiki/Althaea_officinalis) +So what actually is a real marsh mallow? + +It's a medicinal plant, [Althaea officinalis] (https://en.wikipedia.org/wiki/Althaea_officinalis) From be7b7367cf99704469f330b61fbf2708a081a046 Mon Sep 17 00:00:00 2001 From: Davo Faulkner Date: Sat, 14 Nov 2015 21:49:09 -0600 Subject: [PATCH 1647/5486] Add bird question --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index e33f2450b7..ca54d7e68c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -28,6 +28,8 @@ A sound from a Hitchcock movie fills the room, then quickly fades away. Was it the sound of a cry from the shower? +Was it the sound of birds? + It sounded like it could have been a [heffalump](heffalump/heffalump.md) No... perhaps not. From 1c1cdab5e344d868790f84d500250aa760a87ca9 Mon Sep 17 00:00:00 2001 From: Almyra Jannelle Valdez Date: Sat, 14 Nov 2015 23:35:54 -0800 Subject: [PATCH 1648/5486] Add option to "Stop and listen to the sound of birds that came out of nowhere" --- english/eating-walls/eating-marshmallows.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/eating-walls/eating-marshmallows.md b/english/eating-walls/eating-marshmallows.md index 975b4afef0..677c705933 100644 --- a/english/eating-walls/eating-marshmallows.md +++ b/english/eating-walls/eating-marshmallows.md @@ -50,4 +50,6 @@ Do you: [Goto] (../goto/goto.md) google. -[raidersfile] (../Raiders/LetsgoRaiders.md) Raiders. \ No newline at end of file +[raidersfile] (../Raiders/LetsgoRaiders.md) Raiders. + +[Stop and listen to the sound of birds that came out of nowhere] (../sound-of-birds/sound-of-birds.md). \ No newline at end of file From 09929ee9c3458adf195b8a3a4f285cbd31717c0a Mon Sep 17 00:00:00 2001 From: Almyra Jannelle Valdez Date: Sat, 14 Nov 2015 23:37:51 -0800 Subject: [PATCH 1649/5486] Add sound-of-birds file --- english/eating-walls/sound-of-birds/sound-of-birds.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/eating-walls/sound-of-birds/sound-of-birds.md diff --git a/english/eating-walls/sound-of-birds/sound-of-birds.md b/english/eating-walls/sound-of-birds/sound-of-birds.md new file mode 100644 index 0000000000..ac96e42bce --- /dev/null +++ b/english/eating-walls/sound-of-birds/sound-of-birds.md @@ -0,0 +1,2 @@ +You turn around and the marshmallow walls have disappeared! +You remember aware that you have been stranded in a forest and you are cold and hungry. \ No newline at end of file From 375a67adfa8c694fa51dc4377711d8519a5b14fd Mon Sep 17 00:00:00 2001 From: Almyra Jannelle Valdez Date: Sun, 15 Nov 2015 00:16:45 -0800 Subject: [PATCH 1650/5486] Fix broken link --- english/eating-walls/eating-marshmallows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/eating-walls/eating-marshmallows.md b/english/eating-walls/eating-marshmallows.md index 677c705933..47aad5072b 100644 --- a/english/eating-walls/eating-marshmallows.md +++ b/english/eating-walls/eating-marshmallows.md @@ -52,4 +52,4 @@ Do you: [raidersfile] (../Raiders/LetsgoRaiders.md) Raiders. -[Stop and listen to the sound of birds that came out of nowhere] (../sound-of-birds/sound-of-birds.md). \ No newline at end of file +[Stop and listen to the sound of birds that came out of nowhere] (sound-of-birds/sound-of-birds.md). \ No newline at end of file From bef2ed78a477f0f8b6e76fc162010bb79da249e7 Mon Sep 17 00:00:00 2001 From: Almyra Jannelle Valdez Date: Sun, 15 Nov 2015 00:20:06 -0800 Subject: [PATCH 1651/5486] Fix sentences --- english/eating-walls/sound-of-birds/sound-of-birds.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/eating-walls/sound-of-birds/sound-of-birds.md b/english/eating-walls/sound-of-birds/sound-of-birds.md index ac96e42bce..baa0c5d0d3 100644 --- a/english/eating-walls/sound-of-birds/sound-of-birds.md +++ b/english/eating-walls/sound-of-birds/sound-of-birds.md @@ -1,2 +1,3 @@ You turn around and the marshmallow walls have disappeared! -You remember aware that you have been stranded in a forest and you are cold and hungry. \ No newline at end of file +You remember that you have been stranded in a forest for some time. +You are cold and hungry. \ No newline at end of file From f519cc9dd784ac7ace962c1962214fb57f2dc75d Mon Sep 17 00:00:00 2001 From: Joe Williams Date: Sun, 15 Nov 2015 02:20:35 -0600 Subject: [PATCH 1652/5486] add link to deep-sleep --- .../more-sleep/expired-milk/even-more-sleep/even-more-sleep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sleep/more-sleep/expired-milk/even-more-sleep/even-more-sleep.md b/english/sleep/more-sleep/expired-milk/even-more-sleep/even-more-sleep.md index 263526e9b3..8b3a5f301c 100644 --- a/english/sleep/more-sleep/expired-milk/even-more-sleep/even-more-sleep.md +++ b/english/sleep/more-sleep/expired-milk/even-more-sleep/even-more-sleep.md @@ -2,4 +2,4 @@ You donn't know why, but you just can't help but got back to sleep again! As you drift into unconsciousness, you can't help but wonder why it is that you don't want to do anything but sleep. Even in your unconsciousness you are sensing that you are moving your legs. And it's at that moment that you hear the voice chanting "Sleep...sleep" in your head. -Before you can even process what's going on, you've fallen into a deep sleep. +Before you can even process what's going on, you've fallen into a [deep](deep-sleep/deep-sleep.md) sleep. \ No newline at end of file From 694f4ab13f6075a5f5f1138a57a011c52979f407 Mon Sep 17 00:00:00 2001 From: Joe Williams Date: Sun, 15 Nov 2015 02:26:48 -0600 Subject: [PATCH 1653/5486] changed link to new line --- .../expired-milk/even-more-sleep/deep-sleep/deep-sleep.md | 1 + .../expired-milk/even-more-sleep/even-more-sleep.md | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/sleep/more-sleep/expired-milk/even-more-sleep/deep-sleep/deep-sleep.md diff --git a/english/sleep/more-sleep/expired-milk/even-more-sleep/deep-sleep/deep-sleep.md b/english/sleep/more-sleep/expired-milk/even-more-sleep/deep-sleep/deep-sleep.md new file mode 100644 index 0000000000..d62e10966a --- /dev/null +++ b/english/sleep/more-sleep/expired-milk/even-more-sleep/deep-sleep/deep-sleep.md @@ -0,0 +1 @@ +You come to while exiting your body. You see yourself lying on the marshmallow floor. You have taken an etherial "form". \ No newline at end of file diff --git a/english/sleep/more-sleep/expired-milk/even-more-sleep/even-more-sleep.md b/english/sleep/more-sleep/expired-milk/even-more-sleep/even-more-sleep.md index 8b3a5f301c..7c2edd3af4 100644 --- a/english/sleep/more-sleep/expired-milk/even-more-sleep/even-more-sleep.md +++ b/english/sleep/more-sleep/expired-milk/even-more-sleep/even-more-sleep.md @@ -2,4 +2,8 @@ You donn't know why, but you just can't help but got back to sleep again! As you drift into unconsciousness, you can't help but wonder why it is that you don't want to do anything but sleep. Even in your unconsciousness you are sensing that you are moving your legs. And it's at that moment that you hear the voice chanting "Sleep...sleep" in your head. -Before you can even process what's going on, you've fallen into a [deep](deep-sleep/deep-sleep.md) sleep. \ No newline at end of file +Before you can even process what's going on, you've fallen into a deep sleep. + +You: + +[..drift away..](deep-sleep/deep-sleep.md) \ No newline at end of file From dfd60dbc9db54e0266ad66a0bc4166630d47a25a Mon Sep 17 00:00:00 2001 From: "david.rigola" Date: Sun, 15 Nov 2015 12:50:27 +0100 Subject: [PATCH 1654/5486] Add dolor to espanol folder --- espanol/dolor/dolor.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 espanol/dolor/dolor.md diff --git a/espanol/dolor/dolor.md b/espanol/dolor/dolor.md new file mode 100644 index 0000000000..5d92d2d3f2 --- /dev/null +++ b/espanol/dolor/dolor.md @@ -0,0 +1,2 @@ +Y todo era oscuro. Y la luz no volvia. Y el cielo estaba abajo. Y nada era lo que debia. +Dolor. From 8fcb11ad4be1a6877f8eb4850fc4f3f2bff7bf42 Mon Sep 17 00:00:00 2001 From: "david.rigola" Date: Sun, 15 Nov 2015 12:55:43 +0100 Subject: [PATCH 1655/5486] Link for dolor --- espanol/canudos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index 5eba42df3e..ef0bdf302d 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -79,3 +79,5 @@ el Consejero: [Se dio cuenta de que su táctica había sido descubierta] (tactica/tactica.md) [Enseguida agarró el teléfono y realizó una llamada] (telefono/telefono.md) + +[La conversacion era irrelevante] (dolor/dolor.md) From fbb02b38c9191f3c93fd42ed9d9703dbaacfc2a6 Mon Sep 17 00:00:00 2001 From: "david.rigola" Date: Sun, 15 Nov 2015 13:01:48 +0100 Subject: [PATCH 1656/5486] upstream lesson --- espanol/dolor/dolor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/dolor/dolor.md b/espanol/dolor/dolor.md index 5d92d2d3f2..2f3d9e46b7 100644 --- a/espanol/dolor/dolor.md +++ b/espanol/dolor/dolor.md @@ -1,2 +1,2 @@ Y todo era oscuro. Y la luz no volvia. Y el cielo estaba abajo. Y nada era lo que debia. -Dolor. +Dolor. Siempre dolor. From 953d2d1e8c47af970f6bda0b455650edf4347977 Mon Sep 17 00:00:00 2001 From: Tony Date: Sun, 15 Nov 2015 12:19:54 -0700 Subject: [PATCH 1657/5486] add a sentence --- english/marshmallow-attack/marsh-attack.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow-attack/marsh-attack.md b/english/marshmallow-attack/marsh-attack.md index eb25a0f0e7..94bc5ae51f 100644 --- a/english/marshmallow-attack/marsh-attack.md +++ b/english/marshmallow-attack/marsh-attack.md @@ -6,7 +6,9 @@ reaches for the lighter you quickly jab the fork into the white fluffy hand. The marshmallow pulls back its hand and -a giant gaping mouth appears and starts to scream. +a giant gaping mouth appears and starts to scream. The + +scream starts to melt your face. Do you From 5f944eb506837a90e4d8ff504958483711483d53 Mon Sep 17 00:00:00 2001 From: Spotty Bowles Date: Sun, 15 Nov 2015 12:59:57 -0800 Subject: [PATCH 1658/5486] Added skydiving part ot english story --- english/skydiving/skydiving.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/skydiving/skydiving.md diff --git a/english/skydiving/skydiving.md b/english/skydiving/skydiving.md new file mode 100644 index 0000000000..b2b01f3038 --- /dev/null +++ b/english/skydiving/skydiving.md @@ -0,0 +1 @@ +And I went to an airport and saw someone jumping out of a plane and open and parachute and though i must try that. \ No newline at end of file From e3f63650ea9e56269b733179c05898dec7f68cff Mon Sep 17 00:00:00 2001 From: Spotty Bowles Date: Sun, 15 Nov 2015 13:03:17 -0800 Subject: [PATCH 1659/5486] Added extra line --- english/skydiving/skydiving.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/skydiving/skydiving.md b/english/skydiving/skydiving.md index b2b01f3038..b906da1603 100644 --- a/english/skydiving/skydiving.md +++ b/english/skydiving/skydiving.md @@ -1 +1,3 @@ -And I went to an airport and saw someone jumping out of a plane and open and parachute and though i must try that. \ No newline at end of file +And I went to an airport and saw someone jumping out of a plane and open and parachute and though i must try that. + +So I did. \ No newline at end of file From 658f53796d4a7e87e12f3b28cd53d29f932bfe18 Mon Sep 17 00:00:00 2001 From: WaterNotWords Date: Mon, 16 Nov 2015 10:40:34 +0900 Subject: [PATCH 1660/5486] Give more description about feel of jacket. --- english/pinch/pinch.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/pinch/pinch.md b/english/pinch/pinch.md index dcd3592979..8e62a6bcbb 100644 --- a/english/pinch/pinch.md +++ b/english/pinch/pinch.md @@ -4,6 +4,8 @@ You take a look around, not to mention, the jacket is quite uncomfortable. You *pinch* yourself one more time just to make double sure, but alas it is still not a dream. +The damn jacket itches like unprocessed wool soaking wet with boric acid. + Do you: [Try taking out your jacket?](jacket/jacket.md) From 99ee7c6664a2e9e03d3242747cf0655f7747979c Mon Sep 17 00:00:00 2001 From: Spotty Bowles Date: Mon, 16 Nov 2015 11:18:11 -0800 Subject: [PATCH 1661/5486] Added link in marshmallow.md to skydiving chapter --- english/marshmallow.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index ca54d7e68c..d1c2f7e816 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -619,4 +619,7 @@ Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) And then you stumble upon something [completely different](http://www.atlasobscura.com/) -After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) \ No newline at end of file +After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) + + +[What about skydiving](skydiving/skydiving.md) \ No newline at end of file From b1f740e9e3536d07b820208fefa123820f15e889 Mon Sep 17 00:00:00 2001 From: Brian Ishii Date: Mon, 16 Nov 2015 20:06:03 -0800 Subject: [PATCH 1662/5486] added links to drool --- english/drool/droolstrategem.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/drool/droolstrategem.md b/english/drool/droolstrategem.md index 559804d59c..2f78a08f02 100644 --- a/english/drool/droolstrategem.md +++ b/english/drool/droolstrategem.md @@ -1,3 +1,7 @@ You casually hold your face over the outstretched hand and protrude your tongue over the offending appendage. As the saliva flows freely over your taste buds you contemplate what decisions in life have lead you to this point. + +[Go for help to dad](../cry-out-for-daddy/oh_daddy.md) + +[take the red pill](../red-pill/red-pill.md) \ No newline at end of file From a8af1a9fc3bd06a97fe958c26fba31dbd7b34de0 Mon Sep 17 00:00:00 2001 From: dianmoshe Date: Tue, 17 Nov 2015 11:04:27 +0300 Subject: [PATCH 1663/5486] add two lines --- english/animal/animal.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/animal/animal.md b/english/animal/animal.md index ae477e1ece..98584263b0 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -3,4 +3,7 @@ My worst fears have come true. My cat is crying out for food. Even if it really start to drop tears or weep blood, it's the same to me ... no food. The hilarious thing is that i start thinking about making it my own meal. I remember my last meal, oh it was a dead dog 3 days ago. -We are stepping to the verge of eating each other, human flesh oh what does it taste. \ No newline at end of file +We are stepping to the verge of eating each other, human flesh oh what does it taste. + +OMG WHAT SHOULD I DO?? +I NEED HELP... \ No newline at end of file From 7a78b18c3457b3aeda87d9f9a271375e95abc59a Mon Sep 17 00:00:00 2001 From: Ritchie Date: Tue, 17 Nov 2015 08:39:10 +0000 Subject: [PATCH 1664/5486] Add get eaten by bear --- .../door/bear/too-many-marshmallows/get-eaten.md | 1 + .../door/bear/too-many-marshmallows/too-many-marshmallows.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/get-eaten.md diff --git a/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/get-eaten.md b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/get-eaten.md new file mode 100644 index 0000000000..baaa1f04cf --- /dev/null +++ b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/get-eaten.md @@ -0,0 +1 @@ +The bear turns round, growls at you, and then in a fit of rage grasps you in a bear hug and starts eating you from the head down. \ No newline at end of file diff --git a/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md index bd7bea2560..1878305400 100644 --- a/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md +++ b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md @@ -7,4 +7,6 @@ What do you do next? [Close the door and finally relieve yourself?](../../../relieve/relieve-yourself.md) -[Go back to the previous room](../../../../../marshmallow.md) \ No newline at end of file +[Go back to the previous room](../../../../../marshmallow.md) + +[Yell at bear to come back](get-eaten.md) \ No newline at end of file From 4a655e6235dccb3c629755292c0b98bcd09c44b0 Mon Sep 17 00:00:00 2001 From: Ritchie Date: Tue, 17 Nov 2015 09:01:41 +0000 Subject: [PATCH 1665/5486] fix: Shortened lines and added directory --- .../door/bear/too-many-marshmallows/yell-at-bear/get-eaten.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/yell-at-bear/get-eaten.md diff --git a/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/yell-at-bear/get-eaten.md b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/yell-at-bear/get-eaten.md new file mode 100644 index 0000000000..be5da21bcd --- /dev/null +++ b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/yell-at-bear/get-eaten.md @@ -0,0 +1,2 @@ +The bear turns round, growls at you, and then in a fit of rage grasps you in a bear hug and +starts eating you from the head down. \ No newline at end of file From 0d02a8f7c2fe4f2e160e2dcf13d4a267ad7f0e1c Mon Sep 17 00:00:00 2001 From: Ritchie Date: Tue, 17 Nov 2015 09:03:14 +0000 Subject: [PATCH 1666/5486] fix: moved file to new directory --- .../find-a-toilet/door/bear/too-many-marshmallows/get-eaten.md | 1 - .../door/bear/too-many-marshmallows/too-many-marshmallows.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/get-eaten.md diff --git a/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/get-eaten.md b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/get-eaten.md deleted file mode 100644 index baaa1f04cf..0000000000 --- a/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/get-eaten.md +++ /dev/null @@ -1 +0,0 @@ -The bear turns round, growls at you, and then in a fit of rage grasps you in a bear hug and starts eating you from the head down. \ No newline at end of file diff --git a/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md index 1878305400..7a74ee40ce 100644 --- a/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md +++ b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md @@ -9,4 +9,4 @@ What do you do next? [Go back to the previous room](../../../../../marshmallow.md) -[Yell at bear to come back](get-eaten.md) \ No newline at end of file +[Yell at bear to come back](yell-at-bear/get-eaten.md) \ No newline at end of file From d456f4de65513b43d7e439e8a5a5487168b48aac Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 17 Nov 2015 14:16:26 -0300 Subject: [PATCH 1667/5486] Adicionando novas historias ao tenta-falha --- .../revisa/tenta-nao-consegue/nao-responde/nao-responde.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 portugues/revisa/tenta-nao-consegue/nao-responde/nao-responde.md diff --git a/portugues/revisa/tenta-nao-consegue/nao-responde/nao-responde.md b/portugues/revisa/tenta-nao-consegue/nao-responde/nao-responde.md new file mode 100644 index 0000000000..fb67c74458 --- /dev/null +++ b/portugues/revisa/tenta-nao-consegue/nao-responde/nao-responde.md @@ -0,0 +1,2 @@ +O desenvolvedor não responde. Depois de muito tempo você recebe a atualização do aplicativo e descobre que o bug foi +corrigido mesmo sem sua ajuda. From 2b7892ddc7dcee0925fcc1a51963c6dd6c5631cb Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 17 Nov 2015 14:41:31 -0300 Subject: [PATCH 1668/5486] Adicionar novas historias no tenta-falha.md --- portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md | 2 ++ portugues/revisa/tenta-nao-consegue/tenta-falha.md | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md diff --git a/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md b/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md new file mode 100644 index 0000000000..44c5bb85d2 --- /dev/null +++ b/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md @@ -0,0 +1,2 @@ +O desenvolvedor te envia um e-mail dizendo que seria muito importante se você conseguisse reproduzir o bug novamente. E ele até +mesmo te oferece uma recompensa para te motivar. diff --git a/portugues/revisa/tenta-nao-consegue/tenta-falha.md b/portugues/revisa/tenta-nao-consegue/tenta-falha.md index e715e36464..b6452a8645 100644 --- a/portugues/revisa/tenta-nao-consegue/tenta-falha.md +++ b/portugues/revisa/tenta-nao-consegue/tenta-falha.md @@ -1,5 +1,7 @@ -Voc envia uma resposta ao desenvolvedor, dizendo que no conseguiu reproduzir o bug. +Voc� envia uma resposta ao desenvolvedor, dizendo que n�o conseguiu reproduzir o bug. O desenvolvedor: [Te responde e adota um comportamento estranho!](eh-perseguido/salve-se-quem-puder.md) +[Te responde de forma amigável!](amigavel/amigavel.md) +[Não te responde!](nao-responde/nao-responde.md) From cd8055e130fa986e6b81fe3f7b6bc5e8089a42a3 Mon Sep 17 00:00:00 2001 From: "david.rigola" Date: Tue, 17 Nov 2015 19:33:26 +0100 Subject: [PATCH 1669/5486] Fixing pull request --- espanol/dolor/dolor.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/dolor/dolor.md b/espanol/dolor/dolor.md index 2f3d9e46b7..3fcaef768b 100644 --- a/espanol/dolor/dolor.md +++ b/espanol/dolor/dolor.md @@ -1,2 +1,3 @@ Y todo era oscuro. Y la luz no volvia. Y el cielo estaba abajo. Y nada era lo que debia. -Dolor. Siempre dolor. +Dolor. +Siempre dolor. From 9066dc48761a944e3d8b0f39381ff0988e75b54c Mon Sep 17 00:00:00 2001 From: Galdino Date: Tue, 17 Nov 2015 15:50:32 -0300 Subject: [PATCH 1670/5486] Fix errors from pull request #2832 --- portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md | 4 ++-- portugues/revisa/tenta-nao-consegue/tenta-falha.md | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md b/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md index 44c5bb85d2..6ee7356f1f 100644 --- a/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md +++ b/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md @@ -1,2 +1,2 @@ -O desenvolvedor te envia um e-mail dizendo que seria muito importante se você conseguisse reproduzir o bug novamente. E ele até -mesmo te oferece uma recompensa para te motivar. +O desenvolvedor te envia um e-mail dizendo que seria muito importante se você conseguisse reproduzir o bug novamente. +E ele até mesmo te oferece uma recompensa para te motivar. diff --git a/portugues/revisa/tenta-nao-consegue/tenta-falha.md b/portugues/revisa/tenta-nao-consegue/tenta-falha.md index b6452a8645..93d403b894 100644 --- a/portugues/revisa/tenta-nao-consegue/tenta-falha.md +++ b/portugues/revisa/tenta-nao-consegue/tenta-falha.md @@ -1,7 +1,9 @@ -Voc� envia uma resposta ao desenvolvedor, dizendo que n�o conseguiu reproduzir o bug. +-Você envia uma resposta ao desenvolvedor, dizendo que não conseguiu reproduzir o bug. O desenvolvedor: [Te responde e adota um comportamento estranho!](eh-perseguido/salve-se-quem-puder.md) + [Te responde de forma amigável!](amigavel/amigavel.md) + [Não te responde!](nao-responde/nao-responde.md) From f4343e4861a55dbf123399515f1f997d906dd117 Mon Sep 17 00:00:00 2001 From: Galdino Date: Tue, 17 Nov 2015 16:05:01 -0300 Subject: [PATCH 1671/5486] Fix errors from pull request #2832 2 --- portugues/revisa/tenta-nao-consegue/tenta-falha.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/revisa/tenta-nao-consegue/tenta-falha.md b/portugues/revisa/tenta-nao-consegue/tenta-falha.md index 93d403b894..92da2496a3 100644 --- a/portugues/revisa/tenta-nao-consegue/tenta-falha.md +++ b/portugues/revisa/tenta-nao-consegue/tenta-falha.md @@ -1,4 +1,4 @@ --Você envia uma resposta ao desenvolvedor, dizendo que não conseguiu reproduzir o bug. +Você envia uma resposta ao desenvolvedor, dizendo que não conseguiu reproduzir o bug. O desenvolvedor: From 7d030cceba6453ad132ca1c6ba838d472201793b Mon Sep 17 00:00:00 2001 From: Galdino Date: Tue, 17 Nov 2015 16:10:25 -0300 Subject: [PATCH 1672/5486] Fix errors from pull request #2832 3 --- portugues/revisa/tenta-nao-consegue/tenta-falha.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/revisa/tenta-nao-consegue/tenta-falha.md b/portugues/revisa/tenta-nao-consegue/tenta-falha.md index 92da2496a3..1fcf499499 100644 --- a/portugues/revisa/tenta-nao-consegue/tenta-falha.md +++ b/portugues/revisa/tenta-nao-consegue/tenta-falha.md @@ -1,4 +1,4 @@ -Você envia uma resposta ao desenvolvedor, dizendo que não conseguiu reproduzir o bug. +Você envia uma resposta ao desenvolvedor, dizendo que não conseguiu reproduzir o bug. O desenvolvedor: From 7e0968911fc400a73894673952dc94355a721fe8 Mon Sep 17 00:00:00 2001 From: freddydumont Date: Tue, 17 Nov 2015 20:58:49 -0500 Subject: [PATCH 1673/5486] Add option "frapper" to travers-hautes-herbes --- .../traverser-hautes-herbes/traverser-hautes-herbes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md b/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md index b9142d8fc6..338ec7e28c 100644 --- a/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md +++ b/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md @@ -1,3 +1,5 @@ Vous prenez une pleine respiration et vous vous engagez dans les hautes-herbes. La végétation est dense et sa traversée plus compliquée que prévue. Soudain, quelque chose saisit votre cheville… + +[Frapper](frapper-la-chose/frapper-la-chose.md) cette chose qui vous tracasse. \ No newline at end of file From 4c8021d84ca3aaab51d396be87a4ec98d6ff6cd7 Mon Sep 17 00:00:00 2001 From: freddydumont Date: Tue, 17 Nov 2015 21:05:54 -0500 Subject: [PATCH 1674/5486] Add description to frapper-la-chose --- .../frapper-la-chose/frapper-la-chose.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 french/sortie/tirer-porte/traverser-hautes-herbes/frapper-la-chose/frapper-la-chose.md diff --git a/french/sortie/tirer-porte/traverser-hautes-herbes/frapper-la-chose/frapper-la-chose.md b/french/sortie/tirer-porte/traverser-hautes-herbes/frapper-la-chose/frapper-la-chose.md new file mode 100644 index 0000000000..4c4925c70c --- /dev/null +++ b/french/sortie/tirer-porte/traverser-hautes-herbes/frapper-la-chose/frapper-la-chose.md @@ -0,0 +1,3 @@ +Vous venez d'assaillir violemment un chaton, qui miaule son désarroi à tue tête. +Vous ne pouvez vivre avec cette honte. Vous vous faites seppuku, comprenant +parfaitement que la vie et la mort ne font qu'un. Vous mourrez honorablement. \ No newline at end of file From 92eac62a24c87e13534189fa78e17c1c1bb2fc74 Mon Sep 17 00:00:00 2001 From: Ronald Date: Tue, 17 Nov 2015 23:59:02 -0500 Subject: [PATCH 1675/5486] Add some sentences in kechuyen.md --- vietnamese/kechuyen.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index 25412c9e9d..b006950e43 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -4,4 +4,12 @@ Thế còn [truyện cười](https://www.youtube.com/watch?v=3r_-ZLZCxQs)? Que cua ban o dau? Hay cho minh biet ve que cua ban ! Que minh o [Tien Giang](tien-giang/tien-giang.md) -Rồi từ Tiên Giang tôi bay ra Thủ đô [Hà Lội](haloi/khongvoiduocdau.md) \ No newline at end of file +Rồi từ Tiên Giang tôi bay ra Thủ đô [Hà Lội](haloi/khongvoiduocdau.md) + +Tôi không thích nghe truyện ma, tôi thích du lịch + +Tôi cũng thích truyện cười, nhưng ngoài ra tôi thích ẩm thực + +Tôi biết Tiền Giang rất đẹp, Quê tôi thì ở Đà Nẵng + +Nhưng hiện tại thì tôi rời xa Đà Nẵng từ nhỏ và đang sống ở Sài Gòn \ No newline at end of file From dcce1ac012f3e5840c664fe21ccad71a582a4d88 Mon Sep 17 00:00:00 2001 From: Ronald Date: Wed, 18 Nov 2015 00:11:08 -0500 Subject: [PATCH 1676/5486] Add DaNang Diretory --- vietnamese/DaNang/DaNang.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 vietnamese/DaNang/DaNang.md diff --git a/vietnamese/DaNang/DaNang.md b/vietnamese/DaNang/DaNang.md new file mode 100644 index 0000000000..8196905126 --- /dev/null +++ b/vietnamese/DaNang/DaNang.md @@ -0,0 +1 @@ +Đà Nãng là một thành phố du lịch sạch đẹp, có bãi biển dài ở Việt Nam. Nếu bạn đến Việt Nam hãy đến đó 1 lần. \ No newline at end of file From 3823a7f9f39c07f0de08c5e8b06baa0bc9523e79 Mon Sep 17 00:00:00 2001 From: Ronald Date: Wed, 18 Nov 2015 00:17:16 -0500 Subject: [PATCH 1677/5486] Add SaiGon Directory --- vietnamese/SaiGon/SaiGon.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 vietnamese/SaiGon/SaiGon.md diff --git a/vietnamese/SaiGon/SaiGon.md b/vietnamese/SaiGon/SaiGon.md new file mode 100644 index 0000000000..c84e54a0dd --- /dev/null +++ b/vietnamese/SaiGon/SaiGon.md @@ -0,0 +1 @@ +Sài Gòn là 1 trong 2 thành phố nổi tiếng nhất ở Việt Nam ngoài Hà Nội. Sài Gòn thành phố rất nhộn nhịp và phát triển. \ No newline at end of file From e58d8b7f4a4b170b050240fcdc2afebcd43dd089 Mon Sep 17 00:00:00 2001 From: Ronald Date: Wed, 18 Nov 2015 00:24:51 -0500 Subject: [PATCH 1678/5486] Add Markdown with local link --- vietnamese/kechuyen.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index b006950e43..0d507dd7fd 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -10,6 +10,6 @@ Tôi không thích nghe truyện ma, tôi thích du lịch Tôi cũng thích truyện cười, nhưng ngoài ra tôi thích ẩm thực -Tôi biết Tiền Giang rất đẹp, Quê tôi thì ở Đà Nẵng +Tôi biết Tiền Giang rất đẹp, Quê tôi thì ở [Đà Nẵng](DaNang/DaNang.md) -Nhưng hiện tại thì tôi rời xa Đà Nẵng từ nhỏ và đang sống ở Sài Gòn \ No newline at end of file +Nhưng hiện tại thì tôi rời xa Đà Nẵng từ nhỏ và đang sống ở [Sài Gòn](SaiGon/SaiGon.md) \ No newline at end of file From f93939f5277c91e4c6f4f0839d715c46ca8382c8 Mon Sep 17 00:00:00 2001 From: Ronald Date: Wed, 18 Nov 2015 00:27:36 -0500 Subject: [PATCH 1679/5486] Add Markdown with External Links --- vietnamese/kechuyen.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index 0d507dd7fd..585bcbbcd9 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -6,9 +6,9 @@ Que cua ban o dau? Hay cho minh biet ve que cua ban ! Que minh o [Tien Giang](ti Rồi từ Tiên Giang tôi bay ra Thủ đô [Hà Lội](haloi/khongvoiduocdau.md) -Tôi không thích nghe truyện ma, tôi thích du lịch +Tôi không thích nghe truyện ma, tôi thích [du lịch](https://www.youtube.com/watch?v=p4VKcCphblI) -Tôi cũng thích truyện cười, nhưng ngoài ra tôi thích ẩm thực +Tôi cũng thích truyện cười, nhưng ngoài ra tôi thích [ẩm thực](https://www.youtube.com/watch?v=CbJwYw2vLIg) Tôi biết Tiền Giang rất đẹp, Quê tôi thì ở [Đà Nẵng](DaNang/DaNang.md) From 41ef329b0f46ecfb5ac41a25e83a9e0444abba57 Mon Sep 17 00:00:00 2001 From: Karl Martino Date: Wed, 18 Nov 2015 08:13:35 -0500 Subject: [PATCH 1680/5486] Fix broken link to new-movie folder. --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 521a73530c..c4a6a77b28 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -623,5 +623,5 @@ After the stumble you trip over a plant [guess what the plant is?](real-marsh-ma [What about skydiving](skydiving/skydiving.md) -You decide to [take a shortcut](new_movie/new_movie.md) on the way to the movie... +You decide to [take a shortcut](new-movie/new_movie.md) on the way to the movie... From ef7c0184896609228fc9ba3193f490ff62328729 Mon Sep 17 00:00:00 2001 From: Karl Martino Date: Wed, 18 Nov 2015 08:15:34 -0500 Subject: [PATCH 1681/5486] Fix line length in new-movie.md --- english/new-movie/new-movie.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/english/new-movie/new-movie.md b/english/new-movie/new-movie.md index 30e4528703..bcaf279992 100644 --- a/english/new-movie/new-movie.md +++ b/english/new-movie/new-movie.md @@ -17,11 +17,13 @@ But then the following freezes you. > I’m still turning my stick. > He’s already eaten six. -More of this [marshmellow madness](http://www.poetryfoundation.org/poem/241898) every where you go! +More of this [marshmellow madness](http://www.poetryfoundation.org/poem/241898) every where you go! But you got somewhere to be, friends to meet, a movie to catch, and this shortcut no longer feels like a good idea. -The marshmellow mystery is going to have to wait. WHO has eaten six? Is there something significant about the number? Clues, clues, everywhere clues that don't connect! +The marshmellow mystery is going to have to wait. WHO has eaten six? Is there something significant about the number? + +Clues, clues, everywhere clues that don't connect! Dammit! No way you're going to miss this movie, it's been years you've been waiting for it. Time to run! From b6e4e8e1f6d3a68de157b555d34a0d2ee889942b Mon Sep 17 00:00:00 2001 From: Antony Savvidis Date: Wed, 18 Nov 2015 15:30:45 +0200 Subject: [PATCH 1682/5486] Dakrise to zaxaroto? --- greek/put_socks_off/put-socks-off.md | 1 + 1 file changed, 1 insertion(+) diff --git a/greek/put_socks_off/put-socks-off.md b/greek/put_socks_off/put-socks-off.md index 2d341b10df..9eb33af64c 100644 --- a/greek/put_socks_off/put-socks-off.md +++ b/greek/put_socks_off/put-socks-off.md @@ -2,4 +2,5 @@ άραγε παρόμοια αισθητήρια όπως και εσύ; Βλέπει, ακούει, μυρίζει; Ας δούμε λοιπόν πως αντιδράει στην μοχθηρή μυρωδιά μιας χιλιο-φορεμένης καλτσας... +... ίσως το ζαχαρωτό να αρχίσει να δακρύζει. Τι θα μας έδειχνε αυτό; From 3b4060216bd700edd3eea1b203e4659f48c0ac0c Mon Sep 17 00:00:00 2001 From: vrastonero Date: Wed, 18 Nov 2015 16:41:53 +0300 Subject: [PATCH 1683/5486] Add Mouse Big Band --- russian/zefir.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/russian/zefir.md b/russian/zefir.md index a2d6b65c09..a113062161 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -4,6 +4,10 @@ Тихая музыка в джазовом стиле слышна, наверно она знакомая? +Да, это Small Mouse Big Band притаился в Вашей подмышечной впадине и наигрывает "Караван". + +От звука тромбона Вам становится щекотно. + Ваши действия: [Поразмышляете о причинах вашей неожиданной смерти и природе сознания.](thinking-about/thinking.md) From ce4d603d60ba3f092cef96fb818498faa60d2d4e Mon Sep 17 00:00:00 2001 From: Vinny Date: Wed, 18 Nov 2015 12:10:00 -0500 Subject: [PATCH 1684/5486] Add sentence in too-many-marshmallows --- .../door/bear/too-many-marshmallows/too-many-marshmallows.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md index 7a74ee40ce..12372bf409 100644 --- a/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md +++ b/english/eating-walls/find-a-toilet/door/bear/too-many-marshmallows/too-many-marshmallows.md @@ -3,6 +3,8 @@ like that?" The bear then stalks away seeming very annoyed. +You wonder if the bear is angry at you for eating so much marshmallows. + What do you do next? [Close the door and finally relieve yourself?](../../../relieve/relieve-yourself.md) From 7e971aaae1d89cacf676d55fa7e703fc040b5c0e Mon Sep 17 00:00:00 2001 From: leBoer Date: Wed, 18 Nov 2015 22:21:31 +0100 Subject: [PATCH 1685/5486] Add a line to the story in Norwegian --- norwegian/start.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/norwegian/start.md b/norwegian/start.md index 0818f60b6e..7818922d94 100644 --- a/norwegian/start.md +++ b/norwegian/start.md @@ -1 +1,3 @@ Nå er det din tur å fortsette eventyret herfra! + +Du sitter på en stein i vannkanten og ser noe flyte i fjæra. \ No newline at end of file From 56a92c9655e3b2c63ae98580ee4217b43790d77e Mon Sep 17 00:00:00 2001 From: Tbull187 Date: Wed, 18 Nov 2015 13:38:52 -0800 Subject: [PATCH 1686/5486] Add story intensification --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index d1c2f7e816..34e102bbd8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -622,4 +622,6 @@ And then you stumble upon something [completely different](http://www.atlasobscu After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) -[What about skydiving](skydiving/skydiving.md) \ No newline at end of file +[What about skydiving](skydiving/skydiving.md) + +*Story intensifies!* \ No newline at end of file From 4636add14c85de405036eb56163ed41a1013bc1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Enrique=20P=C3=A9rez=20Abreu=20Vel=C3=A1zquez?= Date: Wed, 18 Nov 2015 16:03:42 -0600 Subject: [PATCH 1687/5486] Change templo to reflect the comming of an army --- espanol/templo/templo.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/templo/templo.md b/espanol/templo/templo.md index f717ef4175..2851bd2c11 100644 --- a/espanol/templo/templo.md +++ b/espanol/templo/templo.md @@ -5,3 +5,5 @@ Cuando de pronto... [Alguien alzó la mano](manos/manoArriba.md) [Se oyó un grito que decía ](grito/grito.md) + +[Todos vieron cómo venía un ejercito](../ejercito/ejercito.md) From f5423525d93ca28e7762a5ddb6a99809becacd9f Mon Sep 17 00:00:00 2001 From: pnwnelson Date: Wed, 18 Nov 2015 18:38:57 -0800 Subject: [PATCH 1688/5486] Modify marshmallow.md to add a new part of the story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index d1c2f7e816..ccc930dbc6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -8,6 +8,8 @@ Marshmallows smell funny. What is a marshmallow anyway? Unexpectedly, the Chief Marshmallow demands to see your [references](references/references.md). +The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtube.com/watch?v=s9Dp20ydm1E) and be aware that your favorite NBA team is never safe; so tell Commissioner Silver to bring the Sonics back. + *(Must be a Tuesday.)* Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. From 69d3db59b1631cbba8cfd4a5e63e0a95b117960a Mon Sep 17 00:00:00 2001 From: pnwnelson Date: Wed, 18 Nov 2015 18:55:11 -0800 Subject: [PATCH 1689/5486] Shorten the text --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index ccc930dbc6..776871f854 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -8,7 +8,7 @@ Marshmallows smell funny. What is a marshmallow anyway? Unexpectedly, the Chief Marshmallow demands to see your [references](references/references.md). -The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtube.com/watch?v=s9Dp20ydm1E) and be aware that your favorite NBA team is never safe; so tell Commissioner Silver to bring the Sonics back. +The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtube.com/watch?v=s9Dp20ydm1E) *(Must be a Tuesday.)* From 2f5cee3f5808faaec6414aa3f0b26498aa5741f4 Mon Sep 17 00:00:00 2001 From: Mical Wilson Date: Wed, 18 Nov 2015 21:12:23 -0800 Subject: [PATCH 1690/5486] add option to eat a burrito, add burrito.md --- english/sanfran/bikeride/bikeride.md | 3 +++ english/sanfran/bikeride/burrito/burrito.md | 1 + 2 files changed, 4 insertions(+) create mode 100644 english/sanfran/bikeride/burrito/burrito.md diff --git a/english/sanfran/bikeride/bikeride.md b/english/sanfran/bikeride/bikeride.md index fdba4c3034..e495774c51 100644 --- a/english/sanfran/bikeride/bikeride.md +++ b/english/sanfran/bikeride/bikeride.md @@ -3,3 +3,6 @@ There are several bike rental shops available. I choose one, and rent a bicycle. The ride over the Golden Gate Bridge is wonderful, and I snap a few pictures. + +Then I realize that biking has made me slightly hungry. Shall I purchase +a [burrito](burrito/burrito.md)? diff --git a/english/sanfran/bikeride/burrito/burrito.md b/english/sanfran/bikeride/burrito/burrito.md new file mode 100644 index 0000000000..c51fa33ef5 --- /dev/null +++ b/english/sanfran/bikeride/burrito/burrito.md @@ -0,0 +1 @@ +nom nom this burrito is pretty darn tasty From e3ac3aa4f9e9cddcf072304ff7f839aa0ae94c21 Mon Sep 17 00:00:00 2001 From: alpheus masanga Date: Thu, 19 Nov 2015 07:27:44 +0200 Subject: [PATCH 1691/5486] Add new line to punch story. --- english/punch/punch.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/punch/punch.md b/english/punch/punch.md index 88e840850f..c38614d3fe 100644 --- a/english/punch/punch.md +++ b/english/punch/punch.md @@ -1,2 +1,3 @@ Your fist hits a wall -It gives a lot of pain \ No newline at end of file +It gives a lot of pain +You do it again & again & again. \ No newline at end of file From 2922996098396ec0b4c5af869b21d048620ccae7 Mon Sep 17 00:00:00 2001 From: alpheus masanga Date: Thu, 19 Nov 2015 07:30:11 +0200 Subject: [PATCH 1692/5486] Add newline at end of file. --- english/punch/punch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/punch/punch.md b/english/punch/punch.md index c38614d3fe..b29432d00f 100644 --- a/english/punch/punch.md +++ b/english/punch/punch.md @@ -1,3 +1,3 @@ Your fist hits a wall It gives a lot of pain -You do it again & again & again. \ No newline at end of file +You do it again & again & again. From 2b20244b68b3a1af9bd934a42da32ef4c2a387ca Mon Sep 17 00:00:00 2001 From: Ephraim13 Date: Thu, 19 Nov 2015 12:07:05 -0500 Subject: [PATCH 1693/5486] Added line --- english/sanfran/bikeride/bikeride.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/sanfran/bikeride/bikeride.md b/english/sanfran/bikeride/bikeride.md index e495774c51..ac7e3d993c 100644 --- a/english/sanfran/bikeride/bikeride.md +++ b/english/sanfran/bikeride/bikeride.md @@ -6,3 +6,4 @@ and I snap a few pictures. Then I realize that biking has made me slightly hungry. Shall I purchase a [burrito](burrito/burrito.md)? +Or should I continue riding? From 6609a470f3a31bfb066de3f2eb085229a6167948 Mon Sep 17 00:00:00 2001 From: ajahraus Date: Thu, 19 Nov 2015 12:03:36 -0700 Subject: [PATCH 1694/5486] Add a link leading out from the love page --- english/love/love.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/english/love/love.md b/english/love/love.md index 33edd19a53..ba6d0dc5a1 100644 --- a/english/love/love.md +++ b/english/love/love.md @@ -9,3 +9,8 @@ but don’t isolate yourself as you let someone go and heal from the loss. There is no use moping around wondering the ifs, buts, could've, would've, and should'ves. Time goes on and drags you with it. Whether you are in or out of love, make the best of now while being aware of the worst of before. + +Of course, there is no substitute for the experince of it. It must be +lived in order to be understood. All the words there are in the world +cannot make you understand the feeling of it. Anyways, [here's +something comepletely different.](../marshmallow.md) \ No newline at end of file From 23bf662ee96c4fc23c63707ef687b489984afbdd Mon Sep 17 00:00:00 2001 From: Alexey Darvin Date: Thu, 19 Nov 2015 23:05:44 +0300 Subject: [PATCH 1695/5486] New storyline: "Window" initial commit --- russian/window/win-exit.md | 7 +++++++ russian/window/win-jump.md | 7 +++++++ russian/window/win-not-jump.md | 3 +++ russian/window/win-scream.md | 3 +++ russian/window/window.md | 7 +++++++ russian/zefir.md | 2 ++ 6 files changed, 29 insertions(+) create mode 100644 russian/window/win-exit.md create mode 100644 russian/window/win-jump.md create mode 100644 russian/window/win-not-jump.md create mode 100644 russian/window/win-scream.md create mode 100644 russian/window/window.md diff --git a/russian/window/win-exit.md b/russian/window/win-exit.md new file mode 100644 index 0000000000..807ac81229 --- /dev/null +++ b/russian/window/win-exit.md @@ -0,0 +1,7 @@ +Как только вы забираетесь на подоконник и уже готовы спрыгнуть, вы понимаете что окно было несущей конструкцией и дом начинает рушиться! +В этот же миг вы замечаете что цветы, растения и все вокруг на самом деле гигантских размеров и из-за того что дом стоит на скале вам показалось что дом стоит в обычном саду. +Под вами пропасть! +Что же делать? + +[ Прыгнуть](win-jump.md) +[ Не прыгать](win-not-jump.md) \ No newline at end of file diff --git a/russian/window/win-jump.md b/russian/window/win-jump.md new file mode 100644 index 0000000000..807ac81229 --- /dev/null +++ b/russian/window/win-jump.md @@ -0,0 +1,7 @@ +Как только вы забираетесь на подоконник и уже готовы спрыгнуть, вы понимаете что окно было несущей конструкцией и дом начинает рушиться! +В этот же миг вы замечаете что цветы, растения и все вокруг на самом деле гигантских размеров и из-за того что дом стоит на скале вам показалось что дом стоит в обычном саду. +Под вами пропасть! +Что же делать? + +[ Прыгнуть](win-jump.md) +[ Не прыгать](win-not-jump.md) \ No newline at end of file diff --git a/russian/window/win-not-jump.md b/russian/window/win-not-jump.md new file mode 100644 index 0000000000..78a491c037 --- /dev/null +++ b/russian/window/win-not-jump.md @@ -0,0 +1,3 @@ +Вы не успели ничего сообразить, в этот момент дом рушиться и вы падаете вниз. + +[ А-А-А-А-А-а-а-а-а-а-а](win-scream.md) \ No newline at end of file diff --git a/russian/window/win-scream.md b/russian/window/win-scream.md new file mode 100644 index 0000000000..cf02cfac42 --- /dev/null +++ b/russian/window/win-scream.md @@ -0,0 +1,3 @@ +Вся ваша жизнь проноситься перед глазами, вы понимаете что это конец. + +[ Шмяк!](../zefir.md) \ No newline at end of file diff --git a/russian/window/window.md b/russian/window/window.md new file mode 100644 index 0000000000..6ddf8a0f28 --- /dev/null +++ b/russian/window/window.md @@ -0,0 +1,7 @@ +Вы открываете окно и видите цветочный сад во всей своей красе. +Благоухание цветов наполняет ваш разум эйфорией, вы чувствуете счатье. +Вы решаете что... + +[ есть стены, пусть даже из зефира, не очень хорошо и нужно попробовать выбраться через окно.](win-exit.md) + +[ вы очень голодны и начинаете есть стены.](../eating-walls/eating-marshmallows.md) \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index a113062161..0bcfb81a23 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -10,6 +10,8 @@ Ваши действия: +[Уснуть назад](sleep/sleep.md) + [Поразмышляете о причинах вашей неожиданной смерти и природе сознания.](thinking-about/thinking.md) [Начнёте есть стены.](eating-walls/eating-marshmallows.md) From aa0b78ff60aedd029f62f1dbf9911b92d7cf2750 Mon Sep 17 00:00:00 2001 From: Alexey Darvin Date: Thu, 19 Nov 2015 23:12:04 +0300 Subject: [PATCH 1696/5486] Fixed typo and missing page in "Window" path --- russian/window/win-jump.md | 11 +++++------ russian/window/win-stick.md | 3 +++ russian/zefir.md | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 russian/window/win-stick.md diff --git a/russian/window/win-jump.md b/russian/window/win-jump.md index 807ac81229..41115f39d5 100644 --- a/russian/window/win-jump.md +++ b/russian/window/win-jump.md @@ -1,7 +1,6 @@ -Как только вы забираетесь на подоконник и уже готовы спрыгнуть, вы понимаете что окно было несущей конструкцией и дом начинает рушиться! -В этот же миг вы замечаете что цветы, растения и все вокруг на самом деле гигантских размеров и из-за того что дом стоит на скале вам показалось что дом стоит в обычном саду. -Под вами пропасть! -Что же делать? +Вы прыгаете, в этот момент дом рушиться, вместе с вами летят куски зефира, вы ничего не понимаете, куча мыслей в голове, как это произошло, как я здесь оказался, что я еще мог сделать вместо того чтобы прыгать. Вся ваша жизнь проноситься перед глазами. -[ Прыгнуть](win-jump.md) -[ Не прыгать](win-not-jump.md) \ No newline at end of file + +[ А-А-А-А-а-а-а-а-а-а-а](win-scream.md) +[ Вспомнить свою жизнь](win-not-jump.md) +[ Схватить ветку торчащую из скалы!](win-stick.md) \ No newline at end of file diff --git a/russian/window/win-stick.md b/russian/window/win-stick.md new file mode 100644 index 0000000000..87b0758046 --- /dev/null +++ b/russian/window/win-stick.md @@ -0,0 +1,3 @@ +Вы хватаетесь за палку! Она ломается, вы видите еще одну, хваетесь и о чудо, она вас удерживает, сверху мимо вас и на вас падают огромные куски зефира, вы держитесь из последних сил! Но палка опять ломается! + +[ Шмяк!](../zefir.md) \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index 0bcfb81a23..9720c1a81f 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -10,7 +10,7 @@ Ваши действия: -[Уснуть назад](sleep/sleep.md) +[Открыть окно](window/window.md) [Поразмышляете о причинах вашей неожиданной смерти и природе сознания.](thinking-about/thinking.md) From 09ead43c0f1205bc2510fba4a1e2a17d07435fd4 Mon Sep 17 00:00:00 2001 From: Alexey Darvin Date: Thu, 19 Nov 2015 23:22:40 +0300 Subject: [PATCH 1697/5486] Improving window path, fixind mistakes --- russian/window/win-exit.md | 4 ++-- russian/window/win-scream.md | 10 +++++++++- russian/window/window.md | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/russian/window/win-exit.md b/russian/window/win-exit.md index 807ac81229..9a416e44f7 100644 --- a/russian/window/win-exit.md +++ b/russian/window/win-exit.md @@ -1,7 +1,7 @@ Как только вы забираетесь на подоконник и уже готовы спрыгнуть, вы понимаете что окно было несущей конструкцией и дом начинает рушиться! -В этот же миг вы замечаете что цветы, растения и все вокруг на самом деле гигантских размеров и из-за того что дом стоит на скале вам показалось что дом стоит в обычном саду. +В тот же миг вы замечаете что цветы, растения и все вокруг на самом деле гигантских размеров и они очень далеко. Но из-за того что дом стоит на очень высокой скале вам показалось что это обычные цветы в саду. Под вами пропасть! -Что же делать? [ Прыгнуть](win-jump.md) + [ Не прыгать](win-not-jump.md) \ No newline at end of file diff --git a/russian/window/win-scream.md b/russian/window/win-scream.md index cf02cfac42..a6b22de2e5 100644 --- a/russian/window/win-scream.md +++ b/russian/window/win-scream.md @@ -1,3 +1,11 @@ -Вся ваша жизнь проноситься перед глазами, вы понимаете что это конец. +Вся ваша жизнь проноситься перед глазами... + + + + +Земля все ближе.. + + +Вы понимаете что это конец. [ Шмяк!](../zefir.md) \ No newline at end of file diff --git a/russian/window/window.md b/russian/window/window.md index 6ddf8a0f28..00948d8ced 100644 --- a/russian/window/window.md +++ b/russian/window/window.md @@ -1,6 +1,6 @@ Вы открываете окно и видите цветочный сад во всей своей красе. -Благоухание цветов наполняет ваш разум эйфорией, вы чувствуете счатье. -Вы решаете что... +Благоухание цветов наполняет вас эйфорией, вы чувствуете небывалое счатье. +Вы решаете что [ есть стены, пусть даже из зефира, не очень хорошо и нужно попробовать выбраться через окно.](win-exit.md) From bb6a13fb15d58b3ebcc6a89a5010c6583ee22907 Mon Sep 17 00:00:00 2001 From: Alexey Darvin Date: Thu, 19 Nov 2015 23:26:59 +0300 Subject: [PATCH 1698/5486] Fixed more typos in Window path --- russian/window/win-exit.md | 2 ++ russian/window/win-jump.md | 2 ++ russian/window/win-stick.md | 6 ++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/russian/window/win-exit.md b/russian/window/win-exit.md index 9a416e44f7..d4c23f2fb7 100644 --- a/russian/window/win-exit.md +++ b/russian/window/win-exit.md @@ -2,6 +2,8 @@ В тот же миг вы замечаете что цветы, растения и все вокруг на самом деле гигантских размеров и они очень далеко. Но из-за того что дом стоит на очень высокой скале вам показалось что это обычные цветы в саду. Под вами пропасть! +[ ЧТО?!](win-not-jump.md) + [ Прыгнуть](win-jump.md) [ Не прыгать](win-not-jump.md) \ No newline at end of file diff --git a/russian/window/win-jump.md b/russian/window/win-jump.md index 41115f39d5..018faa49de 100644 --- a/russian/window/win-jump.md +++ b/russian/window/win-jump.md @@ -2,5 +2,7 @@ [ А-А-А-А-а-а-а-а-а-а-а](win-scream.md) + [ Вспомнить свою жизнь](win-not-jump.md) + [ Схватить ветку торчащую из скалы!](win-stick.md) \ No newline at end of file diff --git a/russian/window/win-stick.md b/russian/window/win-stick.md index 87b0758046..75df745a83 100644 --- a/russian/window/win-stick.md +++ b/russian/window/win-stick.md @@ -1,3 +1,5 @@ -Вы хватаетесь за палку! Она ломается, вы видите еще одну, хваетесь и о чудо, она вас удерживает, сверху мимо вас и на вас падают огромные куски зефира, вы держитесь из последних сил! Но палка опять ломается! +Ветка ломается! Вы видите еще одну, хваетесь и слава богу, она вас удерживает, сверху на вас падают огромные куски зефира, им чудом не удается вас сбить и они летят дальше, вы держитесь из последних сил! Но палка опять ломается! -[ Шмяк!](../zefir.md) \ No newline at end of file +[ А-А-А-А-А-а-а-а-а-а-а](win-scream.md) + +[ Схватиться за ветку еще раз!](win-stick.md) \ No newline at end of file From 1c7c90ef543dc23f73982bfdec1d646661dbab28 Mon Sep 17 00:00:00 2001 From: Alexey Darvin Date: Fri, 20 Nov 2015 00:05:11 +0300 Subject: [PATCH 1699/5486] Refactored structure of Window path --- russian/window/win-exit.md | 9 --------- russian/window/win-exit/win-exit.md | 11 +++++++++++ russian/window/win-jump.md | 8 -------- russian/window/win-jump/win-jump.md | 11 +++++++++++ russian/window/{ => win-not-jump}/win-not-jump.md | 2 +- russian/window/{ => win-scream}/win-scream.md | 2 +- russian/window/win-stick.md | 5 ----- russian/window/win-stick/win-stick.md | 9 +++++++++ russian/window/window.md | 2 +- 9 files changed, 34 insertions(+), 25 deletions(-) delete mode 100644 russian/window/win-exit.md create mode 100644 russian/window/win-exit/win-exit.md delete mode 100644 russian/window/win-jump.md create mode 100644 russian/window/win-jump/win-jump.md rename russian/window/{ => win-not-jump}/win-not-jump.md (68%) rename russian/window/{ => win-scream}/win-scream.md (85%) delete mode 100644 russian/window/win-stick.md create mode 100644 russian/window/win-stick/win-stick.md diff --git a/russian/window/win-exit.md b/russian/window/win-exit.md deleted file mode 100644 index d4c23f2fb7..0000000000 --- a/russian/window/win-exit.md +++ /dev/null @@ -1,9 +0,0 @@ -Как только вы забираетесь на подоконник и уже готовы спрыгнуть, вы понимаете что окно было несущей конструкцией и дом начинает рушиться! -В тот же миг вы замечаете что цветы, растения и все вокруг на самом деле гигантских размеров и они очень далеко. Но из-за того что дом стоит на очень высокой скале вам показалось что это обычные цветы в саду. -Под вами пропасть! - -[ ЧТО?!](win-not-jump.md) - -[ Прыгнуть](win-jump.md) - -[ Не прыгать](win-not-jump.md) \ No newline at end of file diff --git a/russian/window/win-exit/win-exit.md b/russian/window/win-exit/win-exit.md new file mode 100644 index 0000000000..bdb8dbf2ec --- /dev/null +++ b/russian/window/win-exit/win-exit.md @@ -0,0 +1,11 @@ +Как только вы забираетесь на подоконник и уже готовы спрыгнуть, +вы понимаете что окно было несущей конструкцией и дом начинает рушиться! +В тот же миг вы замечаете что цветы, растения и все вокруг на самом деле гигантских размеров и они очень далеко. +Но из-за того что дом стоит на очень высокой скале вам показалось что это обычные цветы в саду. +Под вами пропасть! + +[ ЧТО?!](../win-not-jump/win-not-jump.md) + +[ Прыгнуть](../win-jump/win-jump.md) + +[ Не прыгать](../win-not-jump/win-not-jump.md) \ No newline at end of file diff --git a/russian/window/win-jump.md b/russian/window/win-jump.md deleted file mode 100644 index 018faa49de..0000000000 --- a/russian/window/win-jump.md +++ /dev/null @@ -1,8 +0,0 @@ -Вы прыгаете, в этот момент дом рушиться, вместе с вами летят куски зефира, вы ничего не понимаете, куча мыслей в голове, как это произошло, как я здесь оказался, что я еще мог сделать вместо того чтобы прыгать. Вся ваша жизнь проноситься перед глазами. - - -[ А-А-А-А-а-а-а-а-а-а-а](win-scream.md) - -[ Вспомнить свою жизнь](win-not-jump.md) - -[ Схватить ветку торчащую из скалы!](win-stick.md) \ No newline at end of file diff --git a/russian/window/win-jump/win-jump.md b/russian/window/win-jump/win-jump.md new file mode 100644 index 0000000000..e852fabd13 --- /dev/null +++ b/russian/window/win-jump/win-jump.md @@ -0,0 +1,11 @@ +Вы прыгаете, в этот момент дом рушиться, вместе с вами летят куски зефира. +Вы ничего не понимаете, куча мыслей в голове, как это произошло, как я здесь оказался? +Что я еще мог сделать вместо того чтобы прыгать? +Вся ваша жизнь проноситься перед глазами. + + +[ А-А-А-А-а-а-а-а-а-а-а](../win-scream/win-scream.md) + +[ Вспомнить свою жизнь](../win-not-jump/win-not-jump.md) + +[ Схватить ветку торчащую из скалы!](../win-stick/win-stick.md) \ No newline at end of file diff --git a/russian/window/win-not-jump.md b/russian/window/win-not-jump/win-not-jump.md similarity index 68% rename from russian/window/win-not-jump.md rename to russian/window/win-not-jump/win-not-jump.md index 78a491c037..7b5589fc6e 100644 --- a/russian/window/win-not-jump.md +++ b/russian/window/win-not-jump/win-not-jump.md @@ -1,3 +1,3 @@ Вы не успели ничего сообразить, в этот момент дом рушиться и вы падаете вниз. -[ А-А-А-А-А-а-а-а-а-а-а](win-scream.md) \ No newline at end of file +[ А-А-А-А-А-а-а-а-а-а-а](../win-scream/win-scream.md) \ No newline at end of file diff --git a/russian/window/win-scream.md b/russian/window/win-scream/win-scream.md similarity index 85% rename from russian/window/win-scream.md rename to russian/window/win-scream/win-scream.md index a6b22de2e5..33e0fdab49 100644 --- a/russian/window/win-scream.md +++ b/russian/window/win-scream/win-scream.md @@ -8,4 +8,4 @@ Вы понимаете что это конец. -[ Шмяк!](../zefir.md) \ No newline at end of file +[ Шмяк!](../../zefir.md) \ No newline at end of file diff --git a/russian/window/win-stick.md b/russian/window/win-stick.md deleted file mode 100644 index 75df745a83..0000000000 --- a/russian/window/win-stick.md +++ /dev/null @@ -1,5 +0,0 @@ -Ветка ломается! Вы видите еще одну, хваетесь и слава богу, она вас удерживает, сверху на вас падают огромные куски зефира, им чудом не удается вас сбить и они летят дальше, вы держитесь из последних сил! Но палка опять ломается! - -[ А-А-А-А-А-а-а-а-а-а-а](win-scream.md) - -[ Схватиться за ветку еще раз!](win-stick.md) \ No newline at end of file diff --git a/russian/window/win-stick/win-stick.md b/russian/window/win-stick/win-stick.md new file mode 100644 index 0000000000..ec9e87e69e --- /dev/null +++ b/russian/window/win-stick/win-stick.md @@ -0,0 +1,9 @@ +Ветка ломается! +Вы видите еще одну, хваетесь и слава богу, она вас удерживает. +Сверху на вас падают огромные куски зефира, им чудом не удается вас сбить и +они летят дальше, вы держитесь из последних сил! +Но палка опять ломается! + +[ А-А-А-А-А-а-а-а-а-а-а](../win-scream/win-scream.md) + +[ Схватиться за ветку еще раз!](../win-stick/win-stick.md) \ No newline at end of file diff --git a/russian/window/window.md b/russian/window/window.md index 00948d8ced..95458cc3a0 100644 --- a/russian/window/window.md +++ b/russian/window/window.md @@ -2,6 +2,6 @@ Благоухание цветов наполняет вас эйфорией, вы чувствуете небывалое счатье. Вы решаете что -[ есть стены, пусть даже из зефира, не очень хорошо и нужно попробовать выбраться через окно.](win-exit.md) +[ есть стены, пусть даже из зефира, не очень хорошо и нужно попробовать выбраться через окно.](win-exit/win-exit.md) [ вы очень голодны и начинаете есть стены.](../eating-walls/eating-marshmallows.md) \ No newline at end of file From 5c17411530a873cb8811df2c600d59eed86fbbd5 Mon Sep 17 00:00:00 2001 From: Arttu Matilainen Date: Thu, 19 Nov 2015 23:34:16 +0200 Subject: [PATCH 1700/5486] =?UTF-8?q?lis=C3=A4=C3=A4=20vaihtoehto=20menn?= =?UTF-8?q?=C3=A4=20uimaan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- finnish/sauna.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/finnish/sauna.md b/finnish/sauna.md index a0f2cbf5cd..7e4a196f03 100644 --- a/finnish/sauna.md +++ b/finnish/sauna.md @@ -1,3 +1,5 @@ Istut saunan terassilla. -Katsellessasi tyyntä järveä kuulet kuikan huudot hämärtyvässä elokuun alun illassa. \ No newline at end of file +Katsellessasi tyyntä järveä kuulet kuikan huudot hämärtyvässä elokuun alun illassa. + +Mene uimaan painamalla [tästä](järvi/järvi.md) \ No newline at end of file From 026e13e5a996fcaf80cf5baa6eccea213fcbb41a Mon Sep 17 00:00:00 2001 From: Arttu Matilainen Date: Thu, 19 Nov 2015 23:37:08 +0200 Subject: [PATCH 1701/5486] fix missing file --- "finnish/j\303\244rvi/j\303\244rvi.md" | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 "finnish/j\303\244rvi/j\303\244rvi.md" diff --git "a/finnish/j\303\244rvi/j\303\244rvi.md" "b/finnish/j\303\244rvi/j\303\244rvi.md" new file mode 100644 index 0000000000..da8b73f978 --- /dev/null +++ "b/finnish/j\303\244rvi/j\303\244rvi.md" @@ -0,0 +1,3 @@ +Pulahdat järveen laiturin nokasta. + +Vesi tuntuu ihanan viileältä ja tunnet olosi rauhalliseksi. \ No newline at end of file From 9ad71f0596f2ec1fbd3b3dbee95e84266bfad7d7 Mon Sep 17 00:00:00 2001 From: jb Date: Thu, 19 Nov 2015 16:36:23 -0800 Subject: [PATCH 1702/5486] add option to go from new york to vacation --- english/new-york/new-york.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/new-york/new-york.md b/english/new-york/new-york.md index 1ed8933081..4d50e8444c 100644 --- a/english/new-york/new-york.md +++ b/english/new-york/new-york.md @@ -1,3 +1,5 @@ # Moving to New York -"This is no good!" you say, after two sleepless nights. "My insomnia hasn't relented at all." \ No newline at end of file +"This is no good!" you say, after two sleepless nights. "My insomnia hasn't relented at all." + +[Go on vacation instead](../licked-cat/vacation.md) From 8102ec98ff360252f78d7b4965bbe71b058237a8 Mon Sep 17 00:00:00 2001 From: Karl Martino Date: Thu, 19 Nov 2015 20:52:48 -0500 Subject: [PATCH 1703/5486] Fix spelling errors in new-movie.md --- english/new-movie/new-movie.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/new-movie/new-movie.md b/english/new-movie/new-movie.md index bcaf279992..85415c8f1f 100644 --- a/english/new-movie/new-movie.md +++ b/english/new-movie/new-movie.md @@ -17,11 +17,11 @@ But then the following freezes you. > I’m still turning my stick. > He’s already eaten six. -More of this [marshmellow madness](http://www.poetryfoundation.org/poem/241898) every where you go! +More of this [marshmallow madness](http://www.poetryfoundation.org/poem/241898) every where you go! But you got somewhere to be, friends to meet, a movie to catch, and this shortcut no longer feels like a good idea. -The marshmellow mystery is going to have to wait. WHO has eaten six? Is there something significant about the number? +The marshmallow mystery is going to have to wait. WHO has eaten six? Is there something significant about the number? Clues, clues, everywhere clues that don't connect! From 5f7bc5db652dd76454e19295d2ebfbe65c582296 Mon Sep 17 00:00:00 2001 From: Karl Martino Date: Fri, 20 Nov 2015 07:22:46 -0500 Subject: [PATCH 1704/5486] Add blank line back to file. --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6723ba75e1..f3511638d0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -623,6 +623,7 @@ And then you stumble upon something [completely different](http://www.atlasobscu After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) + [What about skydiving](skydiving/skydiving.md) *Story intensifies!* From 19ed2e7cf8977d7ffb09eb802b30fab3cd4090b8 Mon Sep 17 00:00:00 2001 From: wwarne Date: Fri, 20 Nov 2015 16:21:34 +0300 Subject: [PATCH 1705/5486] Add a new storyline about Ghostbusters. --- russian/call-ghostbusters/ghostbusters.md | 8 ++++++++ russian/zefir.md | 2 ++ 2 files changed, 10 insertions(+) create mode 100644 russian/call-ghostbusters/ghostbusters.md diff --git a/russian/call-ghostbusters/ghostbusters.md b/russian/call-ghostbusters/ghostbusters.md new file mode 100644 index 0000000000..90cd0d671f --- /dev/null +++ b/russian/call-ghostbusters/ghostbusters.md @@ -0,0 +1,8 @@ +Под звуки знаменитой песни, наигрывающей в голове, вы набираете 8-800-GHOSTBUSTERS и пытаетесь объяснить ситуацию. + +Похоже на проделки Зефирного человека! Охотники уже в пути! - слышите вы и облегчённо кладёте трубку. + +Что же делать теперь? + +[Откроете окно](../window/window.md) +[Вернётесь ко сну.](../sleep/zefir.md) diff --git a/russian/zefir.md b/russian/zefir.md index 9720c1a81f..490dddba2d 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -36,6 +36,8 @@ [Позвоните маме.](call-mom/call-mom.md) +[Позвоните охотникам за привидениями.](call-ghostbusters/ghostbusters.md) + [Поставите запятую после "цветы".] (comma/comma.md) [Начинайте танцевать от радости.](dance/dance.md) From f656a66a2f92e5a348f107344f820a12d1044e1d Mon Sep 17 00:00:00 2001 From: wwarne Date: Fri, 20 Nov 2015 16:27:26 +0300 Subject: [PATCH 1706/5486] Fixed a typo. --- russian/call-ghostbusters/ghostbusters.md | 1 + 1 file changed, 1 insertion(+) diff --git a/russian/call-ghostbusters/ghostbusters.md b/russian/call-ghostbusters/ghostbusters.md index 90cd0d671f..4263de2332 100644 --- a/russian/call-ghostbusters/ghostbusters.md +++ b/russian/call-ghostbusters/ghostbusters.md @@ -5,4 +5,5 @@ Что же делать теперь? [Откроете окно](../window/window.md) + [Вернётесь ко сну.](../sleep/zefir.md) From 5b38dc4d14740a46d9a72e62dd6329c2ddb64948 Mon Sep 17 00:00:00 2001 From: Octavio Ocharan Date: Fri, 20 Nov 2015 13:18:08 -0600 Subject: [PATCH 1707/5486] Add another change in the Spanish version --- espanol/canudos.md | 2 ++ espanol/pesadilla/pesadilla.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 espanol/pesadilla/pesadilla.md diff --git a/espanol/canudos.md b/espanol/canudos.md index ef0bdf302d..6e655956bf 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -81,3 +81,5 @@ el Consejero: [Enseguida agarró el teléfono y realizó una llamada] (telefono/telefono.md) [La conversacion era irrelevante] (dolor/dolor.md) + +[Abrió los ojos. ¿Era todo una cruel pesadilla?](pesadilla/pesadilla.md) diff --git a/espanol/pesadilla/pesadilla.md b/espanol/pesadilla/pesadilla.md new file mode 100644 index 0000000000..22f90a4b4d --- /dev/null +++ b/espanol/pesadilla/pesadilla.md @@ -0,0 +1 @@ +¿Real o no real? \ No newline at end of file From f8b1a66d25151e7d10123df18236099a36f61196 Mon Sep 17 00:00:00 2001 From: Ruben Date: Fri, 20 Nov 2015 14:53:41 -0800 Subject: [PATCH 1708/5486] Add budget consideration --- english/triathlon/triathlon.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/triathlon/triathlon.md b/english/triathlon/triathlon.md index 16e478ddee..833dceba1f 100644 --- a/english/triathlon/triathlon.md +++ b/english/triathlon/triathlon.md @@ -12,3 +12,7 @@ After one hour perusing pictures of glorious triathlon victories, you realize the true key to success is all in your tri-suit. You head over to [Amazon](http://www.amazon.com) to spend the rest of your day reading reviews. + +Okay, now you realize that this is going to cost you some real money. You +have to get some serious gear to compete. You can't just use an old bike +and any pair of sneakers. You need to put together a budget. From c48deafe6a82ea719bc46187d6e80fc06a07be99 Mon Sep 17 00:00:00 2001 From: Dmytro Karataiev Date: Fri, 20 Nov 2015 19:38:29 -0800 Subject: [PATCH 1709/5486] add: factory move --- ukrainian/door/factory/factory.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ukrainian/door/factory/factory.md b/ukrainian/door/factory/factory.md index 0b8f053e9d..8ec70e16b4 100644 --- a/ukrainian/door/factory/factory.md +++ b/ukrainian/door/factory/factory.md @@ -1,3 +1,5 @@ Ви потрапили до фабрики, що повна скарбів, таємниць та зефіру. Проте, замість того щоб дізнатись про таємниці невідомо чого, ви захопили владу на фабриці та встановили контроль над усіма запасами зефіру. + +Але нажаль вам не вистачило прихильників утримати фабрику від контролем, вас побили та посадили в кімнату (../marshmallow.md) \ No newline at end of file From 21b92a2e469baf90eebebee37d738826e160f837 Mon Sep 17 00:00:00 2001 From: Dmytro Karataiev Date: Fri, 20 Nov 2015 19:39:46 -0800 Subject: [PATCH 1710/5486] fix: add link to the room --- ukrainian/door/factory/factory.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/door/factory/factory.md b/ukrainian/door/factory/factory.md index 8ec70e16b4..004ccf1dee 100644 --- a/ukrainian/door/factory/factory.md +++ b/ukrainian/door/factory/factory.md @@ -2,4 +2,4 @@ того щоб дізнатись про таємниці невідомо чого, ви захопили владу на фабриці та встановили контроль над усіма запасами зефіру. -Але нажаль вам не вистачило прихильників утримати фабрику від контролем, вас побили та посадили в кімнату (../marshmallow.md) \ No newline at end of file +Але нажаль вам не вистачило прихильників утримати фабрику від контролем, вас побили та посадили в кімнату (../../marshmallow.md) \ No newline at end of file From 1c3a0c2e3638564d06b930e63cc90e4719b9681c Mon Sep 17 00:00:00 2001 From: Dmytro Karataiev Date: Fri, 20 Nov 2015 19:40:42 -0800 Subject: [PATCH 1711/5486] fix: changed the link again --- ukrainian/door/factory/factory.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/door/factory/factory.md b/ukrainian/door/factory/factory.md index 004ccf1dee..eae4d8656a 100644 --- a/ukrainian/door/factory/factory.md +++ b/ukrainian/door/factory/factory.md @@ -2,4 +2,4 @@ того щоб дізнатись про таємниці невідомо чого, ви захопили владу на фабриці та встановили контроль над усіма запасами зефіру. -Але нажаль вам не вистачило прихильників утримати фабрику від контролем, вас побили та посадили в кімнату (../../marshmallow.md) \ No newline at end of file +[Але нажаль вам не вистачило прихильників утримати фабрику від контролем, вас побили та посадили в кімнату](../../marshmallow.md) \ No newline at end of file From 853bf9bcf97cbc5e8c4f29067e80d6f2adf3b23d Mon Sep 17 00:00:00 2001 From: marzelin Date: Sat, 21 Nov 2015 12:27:33 +0100 Subject: [PATCH 1712/5486] add korwin present story --- Polish/przygoda/jedzenie/korwin/korwin.md | 5 +++++ Polish/przygoda/jedzenie/korwin/prezent/rewolwer.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 Polish/przygoda/jedzenie/korwin/prezent/rewolwer.md diff --git a/Polish/przygoda/jedzenie/korwin/korwin.md b/Polish/przygoda/jedzenie/korwin/korwin.md index b61fa05707..a27dc008a5 100644 --- a/Polish/przygoda/jedzenie/korwin/korwin.md +++ b/Polish/przygoda/jedzenie/korwin/korwin.md @@ -1,2 +1,7 @@ Idziesz głosować na Korwina. W krainie Polonii już na zawsze zapanuje lekkie gwałcenie i wolny rynek. Wygrałeś + +Niedługo koronacja Korwina na krula wszechświata. +Jaki prezent podarujesz swojemu monarsze? + +[Złoty rewolwer](prezent/rewolwer.md) \ No newline at end of file diff --git a/Polish/przygoda/jedzenie/korwin/prezent/rewolwer.md b/Polish/przygoda/jedzenie/korwin/prezent/rewolwer.md new file mode 100644 index 0000000000..c67d602a41 --- /dev/null +++ b/Polish/przygoda/jedzenie/korwin/prezent/rewolwer.md @@ -0,0 +1,2 @@ +Korwin jest wielce zadowolony z Twojego prezentu, dlatego +zabiera Cię na wspólne polowanie na czerwonych. \ No newline at end of file From 47e36cb243821dfb522e6aa44b8b17c1a0091831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Jo=C3=A3o=20Ferreira=20Francisco?= Date: Sat, 21 Nov 2015 13:11:37 -0200 Subject: [PATCH 1713/5486] Desenvolver novo aplicativo --- portugues/amigo/incomodar/aplicativo.md | 4 +++- portugues/amigo/incomodar/desenvolver/aplicativo.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 portugues/amigo/incomodar/desenvolver/aplicativo.md diff --git a/portugues/amigo/incomodar/aplicativo.md b/portugues/amigo/incomodar/aplicativo.md index 75b8676e45..85f382e31f 100644 --- a/portugues/amigo/incomodar/aplicativo.md +++ b/portugues/amigo/incomodar/aplicativo.md @@ -1,3 +1,5 @@ Você fica triste e desiste do aplicativo. -[Você tenta aprender mais com ele](aprender/aprender.md) \ No newline at end of file +[Você tenta aprender mais com ele](aprender/aprender.md) + +[Você parte para desenvolver outro aplicativo](desenvolver/aplicativo.md) diff --git a/portugues/amigo/incomodar/desenvolver/aplicativo.md b/portugues/amigo/incomodar/desenvolver/aplicativo.md new file mode 100644 index 0000000000..d6cc183e0b --- /dev/null +++ b/portugues/amigo/incomodar/desenvolver/aplicativo.md @@ -0,0 +1 @@ +Você começa a desenvolver um aplicativo para ensinar dança. From 06916d6e96cc88c0e752d618bc2caee2db2bba8b Mon Sep 17 00:00:00 2001 From: Villanueva Date: Sat, 21 Nov 2015 17:45:51 -0500 Subject: [PATCH 1714/5486] Adding ring description --- english/alchemy/alchemy.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index a676402d38..1145097c5b 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -21,6 +21,11 @@ in its centre. You hold the malformed coin up to to light and study it moving backwards and forwards - studying its imperfection - a ring like shape. +Looking through the hole, the air shimmers, giving the other side a +hazy appearance. +The objects on the other side appear to be vacillating, as if they were +breathing. + You slip the ring over your finger and ... [A polar bear suddenly appears and charges towards you](../polar-bear-attack/polar-bear-attack.md) From ad5bc0e6b956c2beb98817f0ac07c886e98efa09 Mon Sep 17 00:00:00 2001 From: RoCarmen Date: Sat, 21 Nov 2015 19:48:45 -0800 Subject: [PATCH 1715/5486] Add a second line to the story. --- romanian/zana_albastra/cum_arata_zana.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/romanian/zana_albastra/cum_arata_zana.md b/romanian/zana_albastra/cum_arata_zana.md index fcb4cad546..2d9faabc1a 100644 --- a/romanian/zana_albastra/cum_arata_zana.md +++ b/romanian/zana_albastra/cum_arata_zana.md @@ -1 +1,2 @@ -Cu rochie albastra, cu pantofi din argint albastru si par albastru. \ No newline at end of file +Cu rochie albastra, cu pantofi din argint albastru si par albastru. +Zana poarta un inel de safir (albastru). \ No newline at end of file From 9cfd2df044b8d0f5ea495f97fd9dc30b6fa008f5 Mon Sep 17 00:00:00 2001 From: Iftekhar Anam Date: Sat, 21 Nov 2015 22:09:37 -0600 Subject: [PATCH 1716/5486] Add new quote --- english/the-nights/the-nights.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/the-nights/the-nights.md b/english/the-nights/the-nights.md index 306e13512f..c0d1dddd2a 100644 --- a/english/the-nights/the-nights.md +++ b/english/the-nights/the-nights.md @@ -1,3 +1,4 @@ One day you'll leave this world behind So live a life you will remember. - [Go Back](../marshmallow.md) \ No newline at end of file + [Go Back](../marshmallow.md) + Stay hungry, stay foolish! \ No newline at end of file From deecd8cb14ad1e7cee9fd44b1bca9693e485c136 Mon Sep 17 00:00:00 2001 From: Sylvie Fiquet Date: Sun, 22 Nov 2015 10:43:38 +0000 Subject: [PATCH 1717/5486] Add 'ecouter' option to mystere.md in french version --- french/manger/trou/reveille/voix-humaines/ecouter/ecouter.md | 2 ++ french/manger/trou/reveille/voix-humaines/mystere.md | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 french/manger/trou/reveille/voix-humaines/ecouter/ecouter.md diff --git a/french/manger/trou/reveille/voix-humaines/ecouter/ecouter.md b/french/manger/trou/reveille/voix-humaines/ecouter/ecouter.md new file mode 100644 index 0000000000..5c35b402b2 --- /dev/null +++ b/french/manger/trou/reveille/voix-humaines/ecouter/ecouter.md @@ -0,0 +1,2 @@ +Vous entendez une conversation animée entre trois personnes, mais vous ne reconnaissez pas la langue. +Il y a aussi le bruit d'un bébé qui pleure. diff --git a/french/manger/trou/reveille/voix-humaines/mystere.md b/french/manger/trou/reveille/voix-humaines/mystere.md index ff0a15372a..f88e5ffcdc 100644 --- a/french/manger/trou/reveille/voix-humaines/mystere.md +++ b/french/manger/trou/reveille/voix-humaines/mystere.md @@ -1,2 +1,4 @@ Vous décidez de traquer les voix humaines. Mais d'oú viennent-elles? -Vous vous faites discret, et vous rapprochez à pas de loup. \ No newline at end of file +Vous vous faites discret, et vous rapprochez à pas de loup. + +[Vous vous arrêtez pour écouter sans être vu](ecouter/ecouter.md) \ No newline at end of file From bfb7f457a8be6c6c87283c85a44aaf0ab9b445e3 Mon Sep 17 00:00:00 2001 From: Sylvie Fiquet Date: Sun, 22 Nov 2015 12:01:01 +0000 Subject: [PATCH 1718/5486] Add 'sing' option in punch.md --- english/punch/punch.md | 8 +++++++- english/punch/sing/sing.md | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 english/punch/sing/sing.md diff --git a/english/punch/punch.md b/english/punch/punch.md index 88e840850f..f13be53d9e 100644 --- a/english/punch/punch.md +++ b/english/punch/punch.md @@ -1,2 +1,8 @@ Your fist hits a wall -It gives a lot of pain \ No newline at end of file +It gives a lot of pain + +The person you tried to punch runs away screaming for help. + +What do you do? + +[Burst into song](sing/sing.md) \ No newline at end of file diff --git a/english/punch/sing/sing.md b/english/punch/sing/sing.md new file mode 100644 index 0000000000..93f4afcd56 --- /dev/null +++ b/english/punch/sing/sing.md @@ -0,0 +1,3 @@ +You start singing at the top of your lungs. + +You start to feel less angry but your fist still hurts a lot. \ No newline at end of file From 5b92d7006711a5ce1e376562a8fc6bc61d3edfa1 Mon Sep 17 00:00:00 2001 From: Audisho Sada Date: Sun, 22 Nov 2015 14:36:25 -0500 Subject: [PATCH 1719/5486] Add plow/plow.txt to english folder --- english/plow/plow.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/plow/plow.txt diff --git a/english/plow/plow.txt b/english/plow/plow.txt new file mode 100644 index 0000000000..d7ebd92b69 --- /dev/null +++ b/english/plow/plow.txt @@ -0,0 +1,6 @@ +Mac: Great, onto the matter at hand. We're getting plowed in the ass by the oil companies and the gas companies with their ten gallon hats and their rotten ass-plowing hearts. So, as the brains of this organization, I came up with a plan. +Dennis: Lay it on us, bud. +Mac: It involves us pulling up our bootstraps, oiling up a couple of asses, and doing a little plowing of our own. (long pause) Not gay sex. +Charlie: Ah... okay, 'cause that's what it sounded like. What did you mean... +Mac: We're gonna solve the gas crisis! +Charlie: Oh, good! \ No newline at end of file From ce746c5ef115e54a4bd84457d2864f36831cef5a Mon Sep 17 00:00:00 2001 From: Audisho Sada Date: Sun, 22 Nov 2015 14:40:18 -0500 Subject: [PATCH 1720/5486] Copy contents of plow.txt to plow.md to confirm with rules. Copy was done since parent repo will not allow deletes. --- english/plow/plow.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/plow/plow.md diff --git a/english/plow/plow.md b/english/plow/plow.md new file mode 100644 index 0000000000..d7ebd92b69 --- /dev/null +++ b/english/plow/plow.md @@ -0,0 +1,6 @@ +Mac: Great, onto the matter at hand. We're getting plowed in the ass by the oil companies and the gas companies with their ten gallon hats and their rotten ass-plowing hearts. So, as the brains of this organization, I came up with a plan. +Dennis: Lay it on us, bud. +Mac: It involves us pulling up our bootstraps, oiling up a couple of asses, and doing a little plowing of our own. (long pause) Not gay sex. +Charlie: Ah... okay, 'cause that's what it sounded like. What did you mean... +Mac: We're gonna solve the gas crisis! +Charlie: Oh, good! \ No newline at end of file From c66da83fcd253849d27c0ac90b2329f6961a8cbb Mon Sep 17 00:00:00 2001 From: Audisho Sada Date: Sun, 22 Nov 2015 14:45:02 -0500 Subject: [PATCH 1721/5486] Remove plow.txt since commit was not merged --- english/plow/plow.txt | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 english/plow/plow.txt diff --git a/english/plow/plow.txt b/english/plow/plow.txt deleted file mode 100644 index d7ebd92b69..0000000000 --- a/english/plow/plow.txt +++ /dev/null @@ -1,6 +0,0 @@ -Mac: Great, onto the matter at hand. We're getting plowed in the ass by the oil companies and the gas companies with their ten gallon hats and their rotten ass-plowing hearts. So, as the brains of this organization, I came up with a plan. -Dennis: Lay it on us, bud. -Mac: It involves us pulling up our bootstraps, oiling up a couple of asses, and doing a little plowing of our own. (long pause) Not gay sex. -Charlie: Ah... okay, 'cause that's what it sounded like. What did you mean... -Mac: We're gonna solve the gas crisis! -Charlie: Oh, good! \ No newline at end of file From aa9aea1bc84bd9c6785d52d53abd6e54d1c88aa5 Mon Sep 17 00:00:00 2001 From: Audisho Sada Date: Sun, 22 Nov 2015 14:47:09 -0500 Subject: [PATCH 1722/5486] Modify plow.md to only contain 12 chars max per line --- english/plow/plow.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/english/plow/plow.md b/english/plow/plow.md index d7ebd92b69..4bb74df8ce 100644 --- a/english/plow/plow.md +++ b/english/plow/plow.md @@ -1,6 +1,14 @@ -Mac: Great, onto the matter at hand. We're getting plowed in the ass by the oil companies and the gas companies with their ten gallon hats and their rotten ass-plowing hearts. So, as the brains of this organization, I came up with a plan. +Mac: Great, onto the matter at hand. We're getting plowed in the ass by the oil companies and the gas companies with +their ten gallon hats and their rotten ass-plowing hearts. So, as the brains of this organization, I came up with a +plan. + Dennis: Lay it on us, bud. -Mac: It involves us pulling up our bootstraps, oiling up a couple of asses, and doing a little plowing of our own. (long pause) Not gay sex. + +Mac: It involves us pulling up our bootstraps, oiling up a couple of asses, and doing a little plowing of our own. +(long pause) Not gay sex. + Charlie: Ah... okay, 'cause that's what it sounded like. What did you mean... + Mac: We're gonna solve the gas crisis! + Charlie: Oh, good! \ No newline at end of file From c3bb3e16d520aaee1d2b8ff01b510dda76f48691 Mon Sep 17 00:00:00 2001 From: Audisho Sada Date: Sun, 22 Nov 2015 14:51:06 -0500 Subject: [PATCH 1723/5486] Add link to plow.md in marshmallow.md --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index f3511638d0..2245db9966 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -630,3 +630,4 @@ After the stumble you trip over a plant [guess what the plant is?](real-marsh-ma You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie... +Instead of going to the movies, you decide to [solve the gase crisis](plow/plow.md) instead. \ No newline at end of file From 0d81c764ae9bd16b4752a78962b597bb91ea0f36 Mon Sep 17 00:00:00 2001 From: wbutter Date: Sun, 22 Nov 2015 15:14:21 -0500 Subject: [PATCH 1724/5486] feat: Add link to choose real-life modified: english/marshmallow.md new file: english/real-life/real-life.md --- english/marshmallow.md | 3 ++- english/real-life/real-life.md | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/real-life/real-life.md diff --git a/english/marshmallow.md b/english/marshmallow.md index f3511638d0..72011d0216 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -48,6 +48,8 @@ Maybe this is a dream? Or a [memory](memories/memories.md)? +Or is it just boring old [real-life](real-life/real-life.md)? + Maybe it's a dream within a dream? Maybe dreaming and reality are one and the same. Maybe reality is an oxymoron when considering multiple dimensions. @@ -629,4 +631,3 @@ After the stumble you trip over a plant [guess what the plant is?](real-marsh-ma *Story intensifies!* You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie... - diff --git a/english/real-life/real-life.md b/english/real-life/real-life.md new file mode 100644 index 0000000000..dd86c5bbb4 --- /dev/null +++ b/english/real-life/real-life.md @@ -0,0 +1,6 @@ + So, if this is real-life, then you are either considering doing UDACITY's + course ["How to Use Git and GitHub"](https://www.udacity.com/course/how-to-use-git-and-github--ud775) or + you are well on your way to completing it. + + Therefore, don't consider this a dead-end in the adventure story, but a step + along the path toward better collaborative coding. From a59c51527f376d6274a9311e33723854846c968b Mon Sep 17 00:00:00 2001 From: wbutter Date: Sun, 22 Nov 2015 15:31:20 -0500 Subject: [PATCH 1725/5486] fix: Add blank line at end of modified files modified: english/marshmallow.md modified: english/real-life/real-life.md --- english/marshmallow.md | 1 + english/real-life/real-life.md | 1 + 2 files changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 72011d0216..0826a6cffa 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -631,3 +631,4 @@ After the stumble you trip over a plant [guess what the plant is?](real-marsh-ma *Story intensifies!* You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie... + diff --git a/english/real-life/real-life.md b/english/real-life/real-life.md index dd86c5bbb4..75a72fb693 100644 --- a/english/real-life/real-life.md +++ b/english/real-life/real-life.md @@ -4,3 +4,4 @@ Therefore, don't consider this a dead-end in the adventure story, but a step along the path toward better collaborative coding. + From b43cb0babc5d3abeef2620e5cbff39b4818f14be Mon Sep 17 00:00:00 2001 From: Ian Date: Sun, 22 Nov 2015 19:59:53 -0800 Subject: [PATCH 1726/5486] Add recursion to the story --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 1f39d60c90..ea7afb5713 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -632,4 +632,6 @@ After the stumble you trip over a plant [guess what the plant is?](real-marsh-ma You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie... -Instead of going to the movies, you decide to [solve the gase crisis](plow/plow.md) instead. \ No newline at end of file +Instead of going to the movies, you decide to [solve the gase crisis](plow/plow.md) instead. + +You made it through the day and are starting to get sleepy... [Time to fall asleep](marshmallow.md) From 0839a7b11fe59405f608e869e25800af95db3ab2 Mon Sep 17 00:00:00 2001 From: John Mardlin Date: Mon, 23 Nov 2015 12:58:12 +0000 Subject: [PATCH 1727/5486] Add disconcerting line to goddess.md --- english/scarab/goddess.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/scarab/goddess.md b/english/scarab/goddess.md index 7b6de548ec..b68b1f1786 100644 --- a/english/scarab/goddess.md +++ b/english/scarab/goddess.md @@ -6,6 +6,9 @@ In an instant you understand everything and yet nothing. You exist in a black room, the walls could be 1 meter or a million kilometers away, you cannot tell. +This is much less disconcerting than you would have expected, in fact, you feel oddly calm... +why would you feel calm? That is actually quite disconcerting. + The Sentinel is smiling upon you. At that moment you realize you are not supposed to be there. It all makes sense now. From 8b0bea3240b5fc5911d37d4d5835fb51233a6467 Mon Sep 17 00:00:00 2001 From: Jesse R Weigel Date: Mon, 23 Nov 2015 10:05:01 -0500 Subject: [PATCH 1728/5486] Add some text --- english/marshmallow.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index ea7afb5713..613637b297 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -635,3 +635,7 @@ You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie. Instead of going to the movies, you decide to [solve the gase crisis](plow/plow.md) instead. You made it through the day and are starting to get sleepy... [Time to fall asleep](marshmallow.md) + +You wake up in front of a computer screen. You begin reading +the text of a markdown file called marshmallow.md. As you read +you realize that the story is about you! From b682a4d5c02e66e1c1aa113eabd5422ad0ae1124 Mon Sep 17 00:00:00 2001 From: DaniGate Date: Mon, 23 Nov 2015 16:46:17 +0100 Subject: [PATCH 1729/5486] =?UTF-8?q?Afegeixo=20l'opici=C3=B3=20de=20bufar?= =?UTF-8?q?=20l'arr=C3=B2s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- catala/dormir/bufar/bufar.md | 3 +++ catala/dormir/dormir.md | 4 +++- catala/dormir/dormir.md~ | 10 ++++++++++ catala/dormir/preguntar/preguntar_fum.md | 3 ++- catala/dormir/preguntar/preguntar_fum.md~ | 6 ++++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 catala/dormir/bufar/bufar.md create mode 100644 catala/dormir/dormir.md~ create mode 100644 catala/dormir/preguntar/preguntar_fum.md~ diff --git a/catala/dormir/bufar/bufar.md b/catala/dormir/bufar/bufar.md new file mode 100644 index 0000000000..6e120ba8f0 --- /dev/null +++ b/catala/dormir/bufar/bufar.md @@ -0,0 +1,3 @@ +Agafes una cullerada i bufes per a que es refredi per no controles la teva fora +i tot el contingut de la cullera surt volant i queda escampat pel terra i les parets de l'habitaci. + diff --git a/catala/dormir/dormir.md b/catala/dormir/dormir.md index 16d68c3caf..39a5c01128 100644 --- a/catala/dormir/dormir.md +++ b/catala/dormir/dormir.md @@ -5,4 +5,6 @@ Veus que surt fum del plat. Què fas? [Tasto una mica](tastar/tastar_arros.md) -[Pregunto a la mare per què surt fum del plat](preguntar/preguntar_fum.md) \ No newline at end of file +[Pregunto a la mare per què surt fum del plat](preguntar/preguntar_fum.md) + +[Bufo per que es refredi](bufar/bufar_arros.md) diff --git a/catala/dormir/dormir.md~ b/catala/dormir/dormir.md~ new file mode 100644 index 0000000000..c91225f6b8 --- /dev/null +++ b/catala/dormir/dormir.md~ @@ -0,0 +1,10 @@ +Et quedes dormint com un suro. A les 14 hores +et desperta ta mare amb un plat d'arròs al forn. + +Veus que surt fum del plat. Què fas? + +[Tasto una mica](tastar/tastar_arros.md) + +[Pregunto a la mare per què surt fum del plat](preguntar/preguntar_fum.md) + +[Bufo per que es refredi](../bufar/bufar_arros.md) diff --git a/catala/dormir/preguntar/preguntar_fum.md b/catala/dormir/preguntar/preguntar_fum.md index 7c65501b90..9fdf95c3fb 100644 --- a/catala/dormir/preguntar/preguntar_fum.md +++ b/catala/dormir/preguntar/preguntar_fum.md @@ -2,4 +2,5 @@ La mare diu que acaba de sortir del forn i encara crema. Què vols fer? -[Tasto una mica](../tastar/tastar_arros.md) \ No newline at end of file +[Tasto una mica](../tastar/tastar_arros.md) +[Bufo per que es refredi](../bufar/bufar_arros.md) diff --git a/catala/dormir/preguntar/preguntar_fum.md~ b/catala/dormir/preguntar/preguntar_fum.md~ new file mode 100644 index 0000000000..92e214090e --- /dev/null +++ b/catala/dormir/preguntar/preguntar_fum.md~ @@ -0,0 +1,6 @@ +La mare diu que acaba de sortir del forn i encara crema. + +Què vols fer? + +[Tasto una mica](../tastar/tastar_arros.md) +[Bufo per que es refredi](bufar/bufar_arros.md) From 99a890c1e53c72263d9ca97aab47145619c75b72 Mon Sep 17 00:00:00 2001 From: DaniGate Date: Mon, 23 Nov 2015 16:47:20 +0100 Subject: [PATCH 1730/5486] Elimino backups generats per VIM --- catala/dormir/dormir.md~ | 10 ---------- catala/dormir/preguntar/preguntar_fum.md~ | 6 ------ 2 files changed, 16 deletions(-) delete mode 100644 catala/dormir/dormir.md~ delete mode 100644 catala/dormir/preguntar/preguntar_fum.md~ diff --git a/catala/dormir/dormir.md~ b/catala/dormir/dormir.md~ deleted file mode 100644 index c91225f6b8..0000000000 --- a/catala/dormir/dormir.md~ +++ /dev/null @@ -1,10 +0,0 @@ -Et quedes dormint com un suro. A les 14 hores -et desperta ta mare amb un plat d'arròs al forn. - -Veus que surt fum del plat. Què fas? - -[Tasto una mica](tastar/tastar_arros.md) - -[Pregunto a la mare per què surt fum del plat](preguntar/preguntar_fum.md) - -[Bufo per que es refredi](../bufar/bufar_arros.md) diff --git a/catala/dormir/preguntar/preguntar_fum.md~ b/catala/dormir/preguntar/preguntar_fum.md~ deleted file mode 100644 index 92e214090e..0000000000 --- a/catala/dormir/preguntar/preguntar_fum.md~ +++ /dev/null @@ -1,6 +0,0 @@ -La mare diu que acaba de sortir del forn i encara crema. - -Què vols fer? - -[Tasto una mica](../tastar/tastar_arros.md) -[Bufo per que es refredi](bufar/bufar_arros.md) From e4e0297e44608ad0b01e37204eab78677b80d7ce Mon Sep 17 00:00:00 2001 From: DaniGate Date: Mon, 23 Nov 2015 16:56:20 +0100 Subject: [PATCH 1731/5486] Corrected error with the link --- catala/dormir/bufar/{bufar.md => bufar_arros.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename catala/dormir/bufar/{bufar.md => bufar_arros.md} (100%) diff --git a/catala/dormir/bufar/bufar.md b/catala/dormir/bufar/bufar_arros.md similarity index 100% rename from catala/dormir/bufar/bufar.md rename to catala/dormir/bufar/bufar_arros.md From ab694a186dff86be278905daf65e8513ef4a2811 Mon Sep 17 00:00:00 2001 From: DaniGate Date: Mon, 23 Nov 2015 16:59:40 +0100 Subject: [PATCH 1732/5486] Empty line added between options --- catala/dormir/preguntar/preguntar_fum.md | 1 + 1 file changed, 1 insertion(+) diff --git a/catala/dormir/preguntar/preguntar_fum.md b/catala/dormir/preguntar/preguntar_fum.md index 9fdf95c3fb..ea49da7b9a 100644 --- a/catala/dormir/preguntar/preguntar_fum.md +++ b/catala/dormir/preguntar/preguntar_fum.md @@ -3,4 +3,5 @@ La mare diu que acaba de sortir del forn i encara crema. Què vols fer? [Tasto una mica](../tastar/tastar_arros.md) + [Bufo per que es refredi](../bufar/bufar_arros.md) From 73e67437f55f757e496f08fcab92a3367006118d Mon Sep 17 00:00:00 2001 From: Florin Tulba Date: Mon, 23 Nov 2015 18:09:26 +0200 Subject: [PATCH 1733/5486] simbioza crocobalaur-pitigoi --- romanian/padurea_violet/croco/croco.md | 10 +++++++++- romanian/padurea_violet/croco/pitigoi/pitigoi.md | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 romanian/padurea_violet/croco/pitigoi/pitigoi.md diff --git a/romanian/padurea_violet/croco/croco.md b/romanian/padurea_violet/croco/croco.md index 7839d1c2bf..502d381363 100644 --- a/romanian/padurea_violet/croco/croco.md +++ b/romanian/padurea_violet/croco/croco.md @@ -1 +1,9 @@ -Ce mare era!!! \ No newline at end of file +Ce mare era!!! + +Astfel ajung cei care beau prea mult din [potiunea fermecata](../../potiune_fermecata/potiune.md) + +preparata de [Zana Albastra](../../zana_albastra/cum_arata_zana.md). + + +Ce noroc ca tocmai mancase si acum 500 de [pitigoi lustragii](pitigoi/pitigoi.md) ii curatau incisivii. + diff --git a/romanian/padurea_violet/croco/pitigoi/pitigoi.md b/romanian/padurea_violet/croco/pitigoi/pitigoi.md new file mode 100644 index 0000000000..75ee464f79 --- /dev/null +++ b/romanian/padurea_violet/croco/pitigoi/pitigoi.md @@ -0,0 +1 @@ +Cel mai greu e curatatul incisivilor de sus, caci trebuie sa o faci zburand, iar daca-l gadili, atunci \ No newline at end of file From fdbfac2f7ef0482b1bd0f43cec241ab56f6ca2c5 Mon Sep 17 00:00:00 2001 From: Florin Tulba Date: Mon, 23 Nov 2015 18:28:55 +0200 Subject: [PATCH 1734/5486] Line Ending issue --- romanian/padurea_violet/croco/croco.md | 1 - 1 file changed, 1 deletion(-) diff --git a/romanian/padurea_violet/croco/croco.md b/romanian/padurea_violet/croco/croco.md index 502d381363..07ef1a115f 100644 --- a/romanian/padurea_violet/croco/croco.md +++ b/romanian/padurea_violet/croco/croco.md @@ -1,5 +1,4 @@ Ce mare era!!! - Astfel ajung cei care beau prea mult din [potiunea fermecata](../../potiune_fermecata/potiune.md) preparata de [Zana Albastra](../../zana_albastra/cum_arata_zana.md). From 04c4969d1f2cb53b3967481577cb5316a6741dda Mon Sep 17 00:00:00 2001 From: Florin Tulba Date: Mon, 23 Nov 2015 18:45:14 +0200 Subject: [PATCH 1735/5486] Line Endings --- romanian/padurea_violet/croco/croco.md | 1 - romanian/padurea_violet/croco/pitigoi/pitigoi.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/romanian/padurea_violet/croco/croco.md b/romanian/padurea_violet/croco/croco.md index 07ef1a115f..3d197d316f 100644 --- a/romanian/padurea_violet/croco/croco.md +++ b/romanian/padurea_violet/croco/croco.md @@ -5,4 +5,3 @@ preparata de [Zana Albastra](../../zana_albastra/cum_arata_zana.md). Ce noroc ca tocmai mancase si acum 500 de [pitigoi lustragii](pitigoi/pitigoi.md) ii curatau incisivii. - diff --git a/romanian/padurea_violet/croco/pitigoi/pitigoi.md b/romanian/padurea_violet/croco/pitigoi/pitigoi.md index 75ee464f79..b9dc00b93e 100644 --- a/romanian/padurea_violet/croco/pitigoi/pitigoi.md +++ b/romanian/padurea_violet/croco/pitigoi/pitigoi.md @@ -1 +1 @@ -Cel mai greu e curatatul incisivilor de sus, caci trebuie sa o faci zburand, iar daca-l gadili, atunci \ No newline at end of file +Cel mai greu e curatatul incisivilor de sus, caci trebuie sa o faci zburand, iar daca-l gadili, atunci From ba380e3236b91bb909adf8a76e239a9406d2723a Mon Sep 17 00:00:00 2001 From: Florin Tulba Date: Mon, 23 Nov 2015 19:58:24 +0200 Subject: [PATCH 1736/5486] excess potion effects --- romanian/nalba.md | 4 ++++ romanian/padurea_violet/croco/croco.md | 8 +------- romanian/{padurea_violet/croco => }/pitigoi/pitigoi.md | 0 3 files changed, 5 insertions(+), 7 deletions(-) rename romanian/{padurea_violet/croco => }/pitigoi/pitigoi.md (100%) diff --git a/romanian/nalba.md b/romanian/nalba.md index 4ba6b24947..a787416b29 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -68,3 +68,7 @@ Bineinteles ca o sa bea. Ginel stia ca asta inseamna sa fii mafiot la urma urmei [Beau tot](Beau/Beau_paharul_pana_la_fund.md) +Subit se simtea usor si isi imagina ca zboara - buna [potiunea](potiune_fermecata/potiune.md) asta, gandi el. + +Parea ca devenise un [pitigoi lustragiu](pitigoi/pitigoi.md) pentru incisivii +[crocobalaurului](padurea_violet/croco/croco.md). diff --git a/romanian/padurea_violet/croco/croco.md b/romanian/padurea_violet/croco/croco.md index 3d197d316f..7839d1c2bf 100644 --- a/romanian/padurea_violet/croco/croco.md +++ b/romanian/padurea_violet/croco/croco.md @@ -1,7 +1 @@ -Ce mare era!!! -Astfel ajung cei care beau prea mult din [potiunea fermecata](../../potiune_fermecata/potiune.md) - -preparata de [Zana Albastra](../../zana_albastra/cum_arata_zana.md). - - -Ce noroc ca tocmai mancase si acum 500 de [pitigoi lustragii](pitigoi/pitigoi.md) ii curatau incisivii. +Ce mare era!!! \ No newline at end of file diff --git a/romanian/padurea_violet/croco/pitigoi/pitigoi.md b/romanian/pitigoi/pitigoi.md similarity index 100% rename from romanian/padurea_violet/croco/pitigoi/pitigoi.md rename to romanian/pitigoi/pitigoi.md From c1e8d636200e996df7821b3ca9cd1fa2208fe0c5 Mon Sep 17 00:00:00 2001 From: Florin Tulba Date: Mon, 23 Nov 2015 20:02:06 +0200 Subject: [PATCH 1737/5486] separated lines with links --- romanian/nalba.md | 1 + 1 file changed, 1 insertion(+) diff --git a/romanian/nalba.md b/romanian/nalba.md index a787416b29..3951c81a59 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -71,4 +71,5 @@ Bineinteles ca o sa bea. Ginel stia ca asta inseamna sa fii mafiot la urma urmei Subit se simtea usor si isi imagina ca zboara - buna [potiunea](potiune_fermecata/potiune.md) asta, gandi el. Parea ca devenise un [pitigoi lustragiu](pitigoi/pitigoi.md) pentru incisivii + [crocobalaurului](padurea_violet/croco/croco.md). From 1188993f68113c98be634f7b689d04e7b52f2522 Mon Sep 17 00:00:00 2001 From: Diana Fisher Date: Mon, 23 Nov 2015 12:53:10 -0800 Subject: [PATCH 1738/5486] Add line about carrots and marshmallow --- .../make-smores/look-for-chocolate/look-for-chocolate.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow-attack/make-smores/look-for-chocolate/look-for-chocolate.md b/english/marshmallow-attack/make-smores/look-for-chocolate/look-for-chocolate.md index e0614e47d2..d86535c62f 100644 --- a/english/marshmallow-attack/make-smores/look-for-chocolate/look-for-chocolate.md +++ b/english/marshmallow-attack/make-smores/look-for-chocolate/look-for-chocolate.md @@ -1,3 +1,5 @@ No chocolate here. Time to go on a diet. -It's not good for you anyway. Have a carrot instead. \ No newline at end of file +It's not good for you anyway. Have a carrot instead. + +Carrots do not got well with marshmallow. Keep looking.. \ No newline at end of file From a748f83f914a9a49119c2de156a8cda81ae5c0ee Mon Sep 17 00:00:00 2001 From: gvoigt Date: Mon, 23 Nov 2015 22:09:25 +0100 Subject: [PATCH 1739/5486] =?UTF-8?q?F=C3=BCge=20ein=20Person=20die=20noch?= =?UTF-8?q?=20nicht=20vorgekommen=20is=20hinzu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Korallen/Hoehle/Unterwasserstation/Person/Person.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 german/Korallen/Hoehle/Unterwasserstation/Person/Person.md diff --git a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md new file mode 100644 index 0000000000..3c51609920 --- /dev/null +++ b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md @@ -0,0 +1,2 @@ +Sie reicht Ihnen die Hand um Ihnen aus dem Wasser zu helfen. Erst jetzt gelingt es Ihnen einen Blick auf den Fremden zu +werfen. Er guckt Sie mit einer gewissen Skepsis aber nicht unfreundlich an. From f5d603b00f4f9a053025d16ee490b93200c4e9cf Mon Sep 17 00:00:00 2001 From: gvoigt Date: Mon, 23 Nov 2015 22:10:44 +0100 Subject: [PATCH 1740/5486] =?UTF-8?q?F=C3=BCge=20Link=20zu=20Person=20Zwei?= =?UTF-8?q?gegeschichte=20hinzu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md | 1 + 1 file changed, 1 insertion(+) diff --git a/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md b/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md index 9f2e8a3154..3a7167617b 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md +++ b/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md @@ -2,3 +2,4 @@ Die Unterwasserstation scheint auf der Unterseite eine mit Luft gefüllte Auftau Da Sie immer noch nicht geatmet haben und der Weg aus der Höle zu weit ist, sind Sie gezwungen, in die Station zu tauchen. Als Sie aufgetaucht sind und nach Luft ringen sehen Sie vor sich auf einmal... +[Eine Person](./Person/Person.md) From 626c92c3c9279d27f742705325c2f006fc267381 Mon Sep 17 00:00:00 2001 From: Jose Oliveira Date: Tue, 24 Nov 2015 00:29:07 +0000 Subject: [PATCH 1741/5486] Change on skydiving story. --- english/skydiving/skydiving.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/skydiving/skydiving.md b/english/skydiving/skydiving.md index b906da1603..34a269b5b2 100644 --- a/english/skydiving/skydiving.md +++ b/english/skydiving/skydiving.md @@ -1,3 +1,5 @@ And I went to an airport and saw someone jumping out of a plane and open and parachute and though i must try that. -So I did. \ No newline at end of file +So I did. + +It is on my to do list. \ No newline at end of file From b6bb25157b31e8f6d0fd628518ae5460aba97538 Mon Sep 17 00:00:00 2001 From: Glenn Gartner Date: Mon, 23 Nov 2015 23:00:50 -0500 Subject: [PATCH 1742/5486] Add juicy steaky goodness to the plot --- english/rib-eye/rib-eye.md | 13 +++++++++++++ english/rib-eye/rib-eye.md~ | 11 +++++++++++ 2 files changed, 24 insertions(+) create mode 100644 english/rib-eye/rib-eye.md create mode 100644 english/rib-eye/rib-eye.md~ diff --git a/english/rib-eye/rib-eye.md b/english/rib-eye/rib-eye.md new file mode 100644 index 0000000000..b24103bb76 --- /dev/null +++ b/english/rib-eye/rib-eye.md @@ -0,0 +1,13 @@ +All this talk of chocolate and donuts. You want a steak. A thick, juicy, salty steak. But, what kind? How about a Rib Eye? But where dost thou find a slab of beautiful bovine around here? + +Perhaps in + +[The Forest](../forest/forest.md) + +or + +[In Candyland](../candyland/diabetes.md) + +or + +[Who cares, gimme Smores](../smores/smores.md) diff --git a/english/rib-eye/rib-eye.md~ b/english/rib-eye/rib-eye.md~ new file mode 100644 index 0000000000..c81ae9e1ad --- /dev/null +++ b/english/rib-eye/rib-eye.md~ @@ -0,0 +1,11 @@ +All this talk of chocolate and donuts. You want a steak. A thick, juicy, salty steak. But, what kind? How about a Rib Eye? But where can you find one? Perhaps in + +[The Forest](../forest/forest.md) + +or + +[In Candyland](../candyland/diabetes.md) + +or + +[Forget that, gimme Smores](../smores/smores.md) From cd73b021d8083ea046d13c2da26bcba4a6c4c257 Mon Sep 17 00:00:00 2001 From: Glenn Gartner Date: Mon, 23 Nov 2015 23:02:54 -0500 Subject: [PATCH 1743/5486] Delete strange file type with ~ appended --- english/rib-eye/rib-eye.md~ | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 english/rib-eye/rib-eye.md~ diff --git a/english/rib-eye/rib-eye.md~ b/english/rib-eye/rib-eye.md~ deleted file mode 100644 index c81ae9e1ad..0000000000 --- a/english/rib-eye/rib-eye.md~ +++ /dev/null @@ -1,11 +0,0 @@ -All this talk of chocolate and donuts. You want a steak. A thick, juicy, salty steak. But, what kind? How about a Rib Eye? But where can you find one? Perhaps in - -[The Forest](../forest/forest.md) - -or - -[In Candyland](../candyland/diabetes.md) - -or - -[Forget that, gimme Smores](../smores/smores.md) From b3557fb1f194efa157626330067b22fb4728b7a3 Mon Sep 17 00:00:00 2001 From: Glenn Gartner Date: Mon, 23 Nov 2015 23:12:08 -0500 Subject: [PATCH 1744/5486] Edit 132 days to link rib-eye. Shorten rib-eye --- english/132-days-ago/132-days-ago.md | 2 ++ english/rib-eye/rib-eye.md | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/english/132-days-ago/132-days-ago.md b/english/132-days-ago/132-days-ago.md index e0b1be923d..0b421308a1 100644 --- a/english/132-days-ago/132-days-ago.md +++ b/english/132-days-ago/132-days-ago.md @@ -3,3 +3,5 @@ but end up buying chocolate because you had not enough money to buy marshmallow. or a pack of four donuts. You decide to [eat the chocolate anyway.](../youre-fine/youre-fine.md) + +Or, you could [eat a juicy steak](../rib-eye/rib-eye.md) \ No newline at end of file diff --git a/english/rib-eye/rib-eye.md b/english/rib-eye/rib-eye.md index b24103bb76..c4e98727bc 100644 --- a/english/rib-eye/rib-eye.md +++ b/english/rib-eye/rib-eye.md @@ -1,4 +1,8 @@ -All this talk of chocolate and donuts. You want a steak. A thick, juicy, salty steak. But, what kind? How about a Rib Eye? But where dost thou find a slab of beautiful bovine around here? +All this talk of chocolate and donuts. +You want a steak. +A thick, juicy, salty steak. +But, what kind? How about a Rib Eye? +Where dost thou find a slab of beautiful bovine around here? Perhaps in From c84a84729a499ef2d8852ce2ef2c671cdc2dd2df Mon Sep 17 00:00:00 2001 From: thetreythomas Date: Tue, 24 Nov 2015 04:20:26 -0600 Subject: [PATCH 1745/5486] Update marshmallow.md Add "The Secret to Life...Seriously" --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 613637b297..4f1eb1e518 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,5 @@ +[The Secret to Life...Seriously](https://www.youtube.com/watch?v=dQw4w9WgXcQ) + [Some inspirational Lines](the-nights/the-nights.md) [Time for some teachings on life and success](swami-vivekananda/swami-vivekananda.md) From f1eaaf166908643ba5b864e2f4036dff977dfbe5 Mon Sep 17 00:00:00 2001 From: BartMulder Date: Tue, 24 Nov 2015 17:59:15 +0100 Subject: [PATCH 1746/5486] Added my addition to the story. --- dutch/over-het-hek/mobiel/mobiel.md | 1 + 1 file changed, 1 insertion(+) diff --git a/dutch/over-het-hek/mobiel/mobiel.md b/dutch/over-het-hek/mobiel/mobiel.md index 75d78c4892..b3b6bca417 100644 --- a/dutch/over-het-hek/mobiel/mobiel.md +++ b/dutch/over-het-hek/mobiel/mobiel.md @@ -3,3 +3,4 @@ Je druk op het knopje van je mobiel, het scherm licht nog even op en... ...heb jij weer, 'Battery too low' en het scherm dimt, maar in het laatste schijnsel zie je nog net een schim vlakbij voor je langs bewegen, wat is dit nu weer?? +De schim vervolgt zijn weg zonder je op te merken. In der verte verschijnt een [lichtje](lichtje/lichtje). \ No newline at end of file From b1c83a9e017cadaa13c82b753450bda3f3706fc9 Mon Sep 17 00:00:00 2001 From: BartMulder Date: Tue, 24 Nov 2015 19:06:09 +0100 Subject: [PATCH 1747/5486] Forgot to add the new file --- dutch/over-het-hek/mobiel/lichtje/lichtje.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 dutch/over-het-hek/mobiel/lichtje/lichtje.md diff --git a/dutch/over-het-hek/mobiel/lichtje/lichtje.md b/dutch/over-het-hek/mobiel/lichtje/lichtje.md new file mode 100644 index 0000000000..7b60bbca9f --- /dev/null +++ b/dutch/over-het-hek/mobiel/lichtje/lichtje.md @@ -0,0 +1 @@ +Het lichtje komt snel dichterbij. Wanhopig grijp je naar je [Zwitsers zakmes](../../zakmes/zakmes.md). \ No newline at end of file From c90e9830cc736c0effcbf1a2454464c724110b50 Mon Sep 17 00:00:00 2001 From: BartMulder Date: Tue, 24 Nov 2015 19:13:17 +0100 Subject: [PATCH 1748/5486] Fixed typo in link --- dutch/over-het-hek/mobiel/mobiel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dutch/over-het-hek/mobiel/mobiel.md b/dutch/over-het-hek/mobiel/mobiel.md index b3b6bca417..ee9d6bd559 100644 --- a/dutch/over-het-hek/mobiel/mobiel.md +++ b/dutch/over-het-hek/mobiel/mobiel.md @@ -3,4 +3,4 @@ Je druk op het knopje van je mobiel, het scherm licht nog even op en... ...heb jij weer, 'Battery too low' en het scherm dimt, maar in het laatste schijnsel zie je nog net een schim vlakbij voor je langs bewegen, wat is dit nu weer?? -De schim vervolgt zijn weg zonder je op te merken. In der verte verschijnt een [lichtje](lichtje/lichtje). \ No newline at end of file +De schim vervolgt zijn weg zonder je op te merken. In der verte verschijnt een [lichtje](lichtje/lichtje.md). \ No newline at end of file From 5ed1d9471b0594d38707a6ac36247ce9cd191469 Mon Sep 17 00:00:00 2001 From: Adam Parker Date: Tue, 24 Nov 2015 22:42:15 -0500 Subject: [PATCH 1749/5486] add youtube link to saul.md --- english/better-call-saul/saul.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/better-call-saul/saul.md b/english/better-call-saul/saul.md index 50e46fa38d..d71a41e3cd 100644 --- a/english/better-call-saul/saul.md +++ b/english/better-call-saul/saul.md @@ -2,5 +2,9 @@ You dial Sauls number... "Hi, its Saul Goodman!" +"Saul, I'm really tired but I have so much to do. Can you help me?" you ask. + +"Sure," he says, "Just use the [Cinco Face Time Party Snoozer](https://www.youtube.com/watch?v=Tvu2ZI329V4)." + Clearly you are not good and you think you are being pranked so you [go back to thinking about what you should do](../marshmallow.md) From 7fa34fb162fdbd3ee2332db8fb6852f55de9add3 Mon Sep 17 00:00:00 2001 From: Anferny Date: Thu, 26 Nov 2015 12:54:48 +0800 Subject: [PATCH 1750/5486] add story to chinese/Interstellar/interstellar.md. --- Chinese/Interstellar/Interstellar.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Chinese/Interstellar/Interstellar.md b/Chinese/Interstellar/Interstellar.md index 3b4ef67144..93938e3fda 100644 --- a/Chinese/Interstellar/Interstellar.md +++ b/Chinese/Interstellar/Interstellar.md @@ -13,3 +13,5 @@ 五百年后的重逢， 美美猴与齐天大圣又能否再续前缘？“欲知后事如何，且听下回分解。”说书先生“啪”地一拍醒木，又把这故事断在了最引人入胜之处。 至尊宝端起桌上剩下的半碗酒一饮而尽， 书听完了， 接下来干什么好呢， 思量着站起身， 背起那柄长剑，晃晃悠悠地出了茶楼， 向着城门口的人群走去。 + +"我受够这金箍了！"至尊宝大喝一声，拔地而起直奔云霄，然后掉头之下，朝地面，不，朝地心冲去。像颗导弹，‘嗖’的钻进地面，穿透地表，接着地幔，然后直达狂怒的火烫红岩。在这里，金箍被融化，而至尊宝也获得久违的重生！ \ No newline at end of file From 449d86bbbc1ff1bd9871225bf6993a3c30c90613 Mon Sep 17 00:00:00 2001 From: Anferny Date: Thu, 26 Nov 2015 13:57:00 +0800 Subject: [PATCH 1751/5486] add another story to chinese/interstellar.md --- Chinese/Interstellar/Interstellar.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/Interstellar/Interstellar.md b/Chinese/Interstellar/Interstellar.md index 93938e3fda..8c4c1ee3ea 100644 --- a/Chinese/Interstellar/Interstellar.md +++ b/Chinese/Interstellar/Interstellar.md @@ -14,4 +14,6 @@ 至尊宝端起桌上剩下的半碗酒一饮而尽， 书听完了， 接下来干什么好呢， 思量着站起身， 背起那柄长剑，晃晃悠悠地出了茶楼， 向着城门口的人群走去。 -"我受够这金箍了！"至尊宝大喝一声，拔地而起直奔云霄，然后掉头之下，朝地面，不，朝地心冲去。像颗导弹，‘嗖’的钻进地面，穿透地表，接着地幔，然后直达狂怒的火烫红岩。在这里，金箍被融化，而至尊宝也获得久违的重生！ \ No newline at end of file +"我受够这金箍了！"至尊宝大喝一声，拔地而起直奔云霄，然后掉头之下，朝地面，不，朝地心冲去。像颗导弹，‘嗖’的钻进地面，穿透地表，接着地幔，然后直达狂怒的火烫红岩。在这里，金箍被融化，而至尊宝也获得久违的重生！ + +这时的至尊宝，已练就真正的金刚身，透过裂开的地表，闪耀着万丈光芒，向如来宣战！ \ No newline at end of file From 2c993aedc8cf4afd91a497f78916066624e304db Mon Sep 17 00:00:00 2001 From: Ruben Escribano-Garcia Date: Thu, 26 Nov 2015 08:49:17 +0000 Subject: [PATCH 1752/5486] El dia termina --- espanol/canudos.md | 2 ++ espanol/termino/termino.md | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 espanol/termino/termino.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 6e655956bf..635c0cf537 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -83,3 +83,5 @@ el Consejero: [La conversacion era irrelevante] (dolor/dolor.md) [Abrió los ojos. ¿Era todo una cruel pesadilla?](pesadilla/pesadilla.md) + +[Como siempre, aquel terrible dia terminó y otro lo sucedió](termino/termino.md) diff --git a/espanol/termino/termino.md b/espanol/termino/termino.md new file mode 100644 index 0000000000..c462f9e22f --- /dev/null +++ b/espanol/termino/termino.md @@ -0,0 +1,7 @@ +Todo día llega a término tarde o temprano. Aquel día fue horroroso, tremendo y +desmesurado pero terminó como todos. No fue un sueño, no fue una pesadilla, +fue una experiencia real. Experiencia dura, cruel, fiera y brutal pero no +exenta de moraleja: cualquier hecho pérfido, peligroso y dañino puede acontecer +en un día cualquiera pero de todo se aprender y todo termina + +A todo día le sucede otro. From 396b49c1fcb5d6f96ed6f2115d6643312ac059d7 Mon Sep 17 00:00:00 2001 From: ray13z Date: Fri, 27 Nov 2015 09:26:45 +1100 Subject: [PATCH 1753/5486] welcomes you to the dark side. --- english/marshmallow.md | 2 ++ english/watch-star-wars/watch-star-wars.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/watch-star-wars/watch-star-wars.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 4f1eb1e518..b7a5a83895 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -641,3 +641,5 @@ You made it through the day and are starting to get sleepy... [Time to fall asle You wake up in front of a computer screen. You begin reading the text of a markdown file called marshmallow.md. As you read you realize that the story is about you! + +This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) diff --git a/english/watch-star-wars/watch-star-wars.md b/english/watch-star-wars/watch-star-wars.md new file mode 100644 index 0000000000..207d7d144d --- /dev/null +++ b/english/watch-star-wars/watch-star-wars.md @@ -0,0 +1,3 @@ +You have December 18, 2015 etched in your mind. +If you do not, Google "a long time ago in a galaxy far far away" right now. +[Go back](../mashmallow.md) From 86ac36fb8877577957ad36a370a8bb54a2d35ce7 Mon Sep 17 00:00:00 2001 From: ray13z Date: Fri, 27 Nov 2015 09:32:37 +1100 Subject: [PATCH 1754/5486] welcomes you to the dark side with corrected spellings to take you back to the bright side. --- english/watch-star-wars/watch-star-wars.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/watch-star-wars/watch-star-wars.md b/english/watch-star-wars/watch-star-wars.md index 207d7d144d..06a66c06c1 100644 --- a/english/watch-star-wars/watch-star-wars.md +++ b/english/watch-star-wars/watch-star-wars.md @@ -1,3 +1,3 @@ You have December 18, 2015 etched in your mind. If you do not, Google "a long time ago in a galaxy far far away" right now. -[Go back](../mashmallow.md) +[Go back](../marshmallow.md) From bd89f178c74c2add8068b7f4c8cd5ecb9190f403 Mon Sep 17 00:00:00 2001 From: CasanovaFlores Date: Fri, 27 Nov 2015 17:40:38 +0100 Subject: [PATCH 1755/5486] Aggiunta messaggio dietro foto e uscita dalla stanza --- .../guardare/vecchie-fotografie/girare_foto/messaggio.md | 5 +++++ .../vecchie-fotografie/uscita_stanza/uscita_stanza.md | 1 + Italian/guardare/vecchie-fotografie/vecchie-fotografie.md | 8 ++++++++ 3 files changed, 14 insertions(+) create mode 100644 Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md create mode 100644 Italian/guardare/vecchie-fotografie/uscita_stanza/uscita_stanza.md diff --git a/Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md b/Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md new file mode 100644 index 0000000000..2e70e09b8b --- /dev/null +++ b/Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md @@ -0,0 +1,5 @@ +Giri le fotografie e dietro ad una trovi uno strano messaggio in parte cancellato dal tempo. + +La fotografia ritrae una famiglia numerosa, tutti i volti sono ben visibili ad eccezione di quello di una giovane ragazza che è stato bruciato. + +Il messaggio dietro la fotografia è il seguente: "Sei sulla buona strada..." diff --git a/Italian/guardare/vecchie-fotografie/uscita_stanza/uscita_stanza.md b/Italian/guardare/vecchie-fotografie/uscita_stanza/uscita_stanza.md new file mode 100644 index 0000000000..ac56527461 --- /dev/null +++ b/Italian/guardare/vecchie-fotografie/uscita_stanza/uscita_stanza.md @@ -0,0 +1 @@ +Esci dalla stanza e ti inoltri per uno strano corridoio... diff --git a/Italian/guardare/vecchie-fotografie/vecchie-fotografie.md b/Italian/guardare/vecchie-fotografie/vecchie-fotografie.md index ea33c5dfdc..cf4f41d95b 100644 --- a/Italian/guardare/vecchie-fotografie/vecchie-fotografie.md +++ b/Italian/guardare/vecchie-fotografie/vecchie-fotografie.md @@ -5,3 +5,11 @@ Sembrano fotografie scattate negli anni 50, almeno a giudicare dall'abbigliament Vi sono uomini e donne di diversa età, e in alcune immagini, inspiegabilmente, vi sono delle bruciature sul viso di alcune persone. + +Ti chied chi siano queste persone e cosa c'entrino con la strana avventura che stai vivendo. Per scoprirlo puoi: + +[Girare le fotografie per vedere se c'è scritto un messaggio] (girare_foto/messaggio.md) + +[cercare aiuto nei libri presenti sulla biblioteca] (../libri-francesi/libri-francesi.md) + +[esci dalla stanza per cercare aiuto] (uscita_stanza/uscita_stanza.md) From 5b7a5e00e18edd6ab770d71bef40b663678867ed Mon Sep 17 00:00:00 2001 From: Karl Craven Date: Fri, 27 Nov 2015 21:16:57 -0500 Subject: [PATCH 1756/5486] Added text to padded-room.md along with a link to new file call-out/calling.md. --- english/bite-the-marshmallow/padded-room/call-out/calling.md | 1 + english/bite-the-marshmallow/padded-room/first-blackout.md | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 english/bite-the-marshmallow/padded-room/call-out/calling.md diff --git a/english/bite-the-marshmallow/padded-room/call-out/calling.md b/english/bite-the-marshmallow/padded-room/call-out/calling.md new file mode 100644 index 0000000000..f28a1e4fb4 --- /dev/null +++ b/english/bite-the-marshmallow/padded-room/call-out/calling.md @@ -0,0 +1 @@ +You attempt to call out for assistance, but your throat is dry and your voice is raspy and quiet. Well, that's that, I guess, you think to yourself. I'll just wait here... indefinitely. Then you notice a small white tube sticking up from your armpit that may just be within reach of your poor, chapped lips, and you notice the pressure between your arm and torso that can only mean a foreign object has been wedged in there. Looks like someone has thoughtfully provided you with something to quench your thirst! \ No newline at end of file diff --git a/english/bite-the-marshmallow/padded-room/first-blackout.md b/english/bite-the-marshmallow/padded-room/first-blackout.md index 8d1584359c..9dc8e7aead 100644 --- a/english/bite-the-marshmallow/padded-room/first-blackout.md +++ b/english/bite-the-marshmallow/padded-room/first-blackout.md @@ -7,3 +7,7 @@ an IV bag. Footsteps grow louder, then faster. The room starts to fade. Voices. Darkness. +... + +You awake with a sense of groggy dread and force your eyelids to open up (very much against their wishes). At first the bright light blinds you and hurts your poor retinas, but after a few seconds you adjust and take a look around. You appear to be strapped to a gurney in a narrow (but brightly lit) corridor. The walls and ceiling are white and spotlessly clean. The floor... well, you can't see the floor. In the distance you can hear a faint humming sound, but you appear to be all alone at the moment. Well, now what? Perhaps you could [call out](call-out/calling.md)? + From c303817c5cd530c79f07230bba5ea514b9b04e4f Mon Sep 17 00:00:00 2001 From: Karl Craven Date: Fri, 27 Nov 2015 21:32:28 -0500 Subject: [PATCH 1757/5486] Added line breaks to keep lines short. --- .../bite-the-marshmallow/padded-room/call-out/calling.md | 7 ++++++- .../bite-the-marshmallow/padded-room/first-blackout.md | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/english/bite-the-marshmallow/padded-room/call-out/calling.md b/english/bite-the-marshmallow/padded-room/call-out/calling.md index f28a1e4fb4..6ea15f58aa 100644 --- a/english/bite-the-marshmallow/padded-room/call-out/calling.md +++ b/english/bite-the-marshmallow/padded-room/call-out/calling.md @@ -1 +1,6 @@ -You attempt to call out for assistance, but your throat is dry and your voice is raspy and quiet. Well, that's that, I guess, you think to yourself. I'll just wait here... indefinitely. Then you notice a small white tube sticking up from your armpit that may just be within reach of your poor, chapped lips, and you notice the pressure between your arm and torso that can only mean a foreign object has been wedged in there. Looks like someone has thoughtfully provided you with something to quench your thirst! \ No newline at end of file +You attempt to call out for assistance, but your throat is dry and your voice is +raspy and quiet. Well, that's that, I guess, you think to yourself. I'll just wait here... indefinitely. Then you notice a small white tube sticking up from your armpit +that may just be within reach of your poor, chapped lips, and you notice the pressure +between your arm and torso that can only mean a foreign object has been wedged in +there. Looks like someone has thoughtfully provided you with something to quench your +thirst! \ No newline at end of file diff --git a/english/bite-the-marshmallow/padded-room/first-blackout.md b/english/bite-the-marshmallow/padded-room/first-blackout.md index 9dc8e7aead..cded767255 100644 --- a/english/bite-the-marshmallow/padded-room/first-blackout.md +++ b/english/bite-the-marshmallow/padded-room/first-blackout.md @@ -9,5 +9,11 @@ Footsteps grow louder, then faster. The room starts to fade. Voices. Darkness. ... -You awake with a sense of groggy dread and force your eyelids to open up (very much against their wishes). At first the bright light blinds you and hurts your poor retinas, but after a few seconds you adjust and take a look around. You appear to be strapped to a gurney in a narrow (but brightly lit) corridor. The walls and ceiling are white and spotlessly clean. The floor... well, you can't see the floor. In the distance you can hear a faint humming sound, but you appear to be all alone at the moment. Well, now what? Perhaps you could [call out](call-out/calling.md)? +You awake with a sense of groggy dread and force your eyelids to open up (very much +against their wishes). At first the bright light blinds you and hurts your poor +retinas, but after a few seconds you adjust and take a look around. You appear to be +strapped to a gurney in a narrow (but brightly lit) corridor. The walls and ceiling +are white and spotlessly clean. The floor... well, you can't see the floor. In the +distance you can hear a faint humming sound, but you appear to be all alone at the +moment. Well, now what? Perhaps you could [call out](call-out/calling.md)? From f7e7f1f4b5564104408d3d621c1134fc30933ccd Mon Sep 17 00:00:00 2001 From: Karl Craven Date: Fri, 27 Nov 2015 21:34:58 -0500 Subject: [PATCH 1758/5486] Added a line break I missed on the previous commit. Whoops. --- english/bite-the-marshmallow/padded-room/call-out/calling.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/bite-the-marshmallow/padded-room/call-out/calling.md b/english/bite-the-marshmallow/padded-room/call-out/calling.md index 6ea15f58aa..3c0a82c5aa 100644 --- a/english/bite-the-marshmallow/padded-room/call-out/calling.md +++ b/english/bite-the-marshmallow/padded-room/call-out/calling.md @@ -1,5 +1,6 @@ You attempt to call out for assistance, but your throat is dry and your voice is -raspy and quiet. Well, that's that, I guess, you think to yourself. I'll just wait here... indefinitely. Then you notice a small white tube sticking up from your armpit +raspy and quiet. Well, that's that, I guess, you think to yourself. I'll just wait +here... indefinitely. Then you notice a small white tube sticking up from your armpit that may just be within reach of your poor, chapped lips, and you notice the pressure between your arm and torso that can only mean a foreign object has been wedged in there. Looks like someone has thoughtfully provided you with something to quench your From 57b4b8a312397bcd543dce237015f077fff39d83 Mon Sep 17 00:00:00 2001 From: NAGMA KAPOOR Date: Sat, 28 Nov 2015 02:38:01 -0500 Subject: [PATCH 1759/5486] updated link --- AIRobot.md | 1 + AIattacks.md | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 AIRobot.md create mode 100644 AIattacks.md diff --git a/AIRobot.md b/AIRobot.md new file mode 100644 index 0000000000..9dba6cec90 --- /dev/null +++ b/AIRobot.md @@ -0,0 +1 @@ +You've been thinking of adopting one of those new AI robofriends. Yes, that's right. I know you've been lonely of late. [Here's an early present then.](../AIattacks.md) \ No newline at end of file diff --git a/AIattacks.md b/AIattacks.md new file mode 100644 index 0000000000..158cd857ef --- /dev/null +++ b/AIattacks.md @@ -0,0 +1,5 @@ +You've unpacked a CloneFriend! +You feel uneasy, holding this little robot in your hand, knowing it's capabilities. It begins a countdown to activate: 5 - 4 - 3 - 2 - 1 .... +AND YOU'VE BEEN CUDDLE-ATTACKED BY YOUR CloneFriend! *hugs* + +You'll never be alone again. [(If that doesn't scare you, better go back)](../marshmallow.md) \ No newline at end of file From e0bff44b08b1c3051f9c0327a3fb0081a68ddf1a Mon Sep 17 00:00:00 2001 From: NAGMA KAPOOR Date: Sat, 28 Nov 2015 02:48:16 -0500 Subject: [PATCH 1760/5486] Fixed location of AI Story --- english/robofriend/AIRobot.md | 1 + english/robofriend/AIattacks.md | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 english/robofriend/AIRobot.md create mode 100644 english/robofriend/AIattacks.md diff --git a/english/robofriend/AIRobot.md b/english/robofriend/AIRobot.md new file mode 100644 index 0000000000..9dba6cec90 --- /dev/null +++ b/english/robofriend/AIRobot.md @@ -0,0 +1 @@ +You've been thinking of adopting one of those new AI robofriends. Yes, that's right. I know you've been lonely of late. [Here's an early present then.](../AIattacks.md) \ No newline at end of file diff --git a/english/robofriend/AIattacks.md b/english/robofriend/AIattacks.md new file mode 100644 index 0000000000..158cd857ef --- /dev/null +++ b/english/robofriend/AIattacks.md @@ -0,0 +1,5 @@ +You've unpacked a CloneFriend! +You feel uneasy, holding this little robot in your hand, knowing it's capabilities. It begins a countdown to activate: 5 - 4 - 3 - 2 - 1 .... +AND YOU'VE BEEN CUDDLE-ATTACKED BY YOUR CloneFriend! *hugs* + +You'll never be alone again. [(If that doesn't scare you, better go back)](../marshmallow.md) \ No newline at end of file From c5f6137529a6c8d779aa8a147ff6c35971bf8a88 Mon Sep 17 00:00:00 2001 From: nagmak Date: Sat, 28 Nov 2015 02:52:55 -0500 Subject: [PATCH 1761/5486] Added AI friend story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index b7a5a83895..26e83d6a7d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -643,3 +643,5 @@ the text of a markdown file called marshmallow.md. As you read you realize that the story is about you! This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) + +You must be lonely. [Want a friend?](robofriend/AIRobot.md) From be6f7e3ffb6db9fcf633f25b1fcb9561a2bb9c31 Mon Sep 17 00:00:00 2001 From: nagmak Date: Sat, 28 Nov 2015 02:59:32 -0500 Subject: [PATCH 1762/5486] Early present. --- english/robofriend/AIRobot.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/robofriend/AIRobot.md b/english/robofriend/AIRobot.md index 9dba6cec90..19b2f2986a 100644 --- a/english/robofriend/AIRobot.md +++ b/english/robofriend/AIRobot.md @@ -1 +1 @@ -You've been thinking of adopting one of those new AI robofriends. Yes, that's right. I know you've been lonely of late. [Here's an early present then.](../AIattacks.md) \ No newline at end of file +You've been thinking of adopting one of those new AI robofriends. Yes, that's right. I know you've been lonely of late. [Here's an early present then.](create-your-own-adventure/english/robofriend/AIattacks.md) From 23ee1591577d9ac4d0ea1c1ed9bf41fd3134a2b8 Mon Sep 17 00:00:00 2001 From: nagmak Date: Sat, 28 Nov 2015 03:01:06 -0500 Subject: [PATCH 1763/5486] Finally connected the story --- english/robofriend/AIRobot.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/robofriend/AIRobot.md b/english/robofriend/AIRobot.md index 19b2f2986a..afaf3fbbfe 100644 --- a/english/robofriend/AIRobot.md +++ b/english/robofriend/AIRobot.md @@ -1 +1 @@ -You've been thinking of adopting one of those new AI robofriends. Yes, that's right. I know you've been lonely of late. [Here's an early present then.](create-your-own-adventure/english/robofriend/AIattacks.md) +You've been thinking of adopting one of those new AI robofriends. Yes, that's right. I know you've been lonely of late. [Here's an early present then.](AIattacks.md) From e0d827592dbc811c90af8c945474d06e2aa730ff Mon Sep 17 00:00:00 2001 From: nagmak Date: Sat, 28 Nov 2015 03:02:25 -0500 Subject: [PATCH 1764/5486] Removed redundancy --- AIRobot.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 AIRobot.md diff --git a/AIRobot.md b/AIRobot.md deleted file mode 100644 index 9dba6cec90..0000000000 --- a/AIRobot.md +++ /dev/null @@ -1 +0,0 @@ -You've been thinking of adopting one of those new AI robofriends. Yes, that's right. I know you've been lonely of late. [Here's an early present then.](../AIattacks.md) \ No newline at end of file From 0b01dcb1d81d26b4607e86fc442ef30878aa8803 Mon Sep 17 00:00:00 2001 From: nagmak Date: Sat, 28 Nov 2015 03:03:13 -0500 Subject: [PATCH 1765/5486] Removed redundancy --- AIattacks.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 AIattacks.md diff --git a/AIattacks.md b/AIattacks.md deleted file mode 100644 index 158cd857ef..0000000000 --- a/AIattacks.md +++ /dev/null @@ -1,5 +0,0 @@ -You've unpacked a CloneFriend! -You feel uneasy, holding this little robot in your hand, knowing it's capabilities. It begins a countdown to activate: 5 - 4 - 3 - 2 - 1 .... -AND YOU'VE BEEN CUDDLE-ATTACKED BY YOUR CloneFriend! *hugs* - -You'll never be alone again. [(If that doesn't scare you, better go back)](../marshmallow.md) \ No newline at end of file From cfde22746e94fa912a67d2d92bb177dd0ee91569 Mon Sep 17 00:00:00 2001 From: mzvast Date: Sun, 29 Nov 2015 11:38:25 +0000 Subject: [PATCH 1766/5486] add snow white story and its link --- Chinese/snow_white/story.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Chinese/snow_white/story.md diff --git a/Chinese/snow_white/story.md b/Chinese/snow_white/story.md new file mode 100644 index 0000000000..5fb88c3bb3 --- /dev/null +++ b/Chinese/snow_white/story.md @@ -0,0 +1 @@ + 从此白雪公主 和 七个小矮人 过上了 幸福的生活 diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 8d27c19c9c..8669c4b05f 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -1,5 +1,7 @@ 在1994年大话西游之月光宝盒的电影中，主角周星驰饰演的孙悟空在500年后转世成为： +[白雪公主](snow_white/story.md) + [recipe](Peter/Peter.md) [国际大盗](CrazyStone/CrazyStone.md) ? From 94dc545af0caf125de5319888e623fbf59857d8e Mon Sep 17 00:00:00 2001 From: Nicholas Credli Date: Sun, 29 Nov 2015 22:05:33 +0200 Subject: [PATCH 1767/5486] Add heisenberg --- english/say-my-name/heisenberg/heisenberg.md | 1 + english/say-my-name/say-my-name.md | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 english/say-my-name/heisenberg/heisenberg.md create mode 100644 english/say-my-name/say-my-name.md diff --git a/english/say-my-name/heisenberg/heisenberg.md b/english/say-my-name/heisenberg/heisenberg.md new file mode 100644 index 0000000000..c2404869fe --- /dev/null +++ b/english/say-my-name/heisenberg/heisenberg.md @@ -0,0 +1 @@ +[You're god damn right](https://www.youtube.com/watch?v=dy_DASt7hDs) \ No newline at end of file diff --git a/english/say-my-name/say-my-name.md b/english/say-my-name/say-my-name.md new file mode 100644 index 0000000000..33b2019e32 --- /dev/null +++ b/english/say-my-name/say-my-name.md @@ -0,0 +1,5 @@ +NOW... SAY MY NAME + +[Pizza toss](https://www.youtube.com/watch?v=K_GbFMtPF6I) + +[Heisenberg](heisenberg/heisenberg.md) \ No newline at end of file From 91550bfe863b01ee54ca308544a029b1d58140b6 Mon Sep 17 00:00:00 2001 From: Nicholas Credli Date: Sun, 29 Nov 2015 22:11:00 +0200 Subject: [PATCH 1768/5486] Modify marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index b7a5a83895..760bb14877 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,5 @@ +[I am the one who knocks](say-my-name/say-my-name.md) + [The Secret to Life...Seriously](https://www.youtube.com/watch?v=dQw4w9WgXcQ) [Some inspirational Lines](the-nights/the-nights.md) From 0190560ca0bca3d4b34a61ff524b7e99113d1007 Mon Sep 17 00:00:00 2001 From: Mateusz Widuch Date: Sun, 29 Nov 2015 20:43:27 +0000 Subject: [PATCH 1769/5486] Add new choices in zmarkerem.md --- .../zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md index 2e24c04f11..e6e0565d33 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md @@ -1 +1,7 @@ -Marker wydaje się chętni do wykorzystania jak twoja ręka zbliża się do tablicy. \ No newline at end of file +Marker wydaje się chętni do wykorzystania jak twoja ręka zbliża się do tablicy. + +[Narysuj spodnie](spodnie/spodnie.md) + +[Narysuj zamek od kurtki](zamek/zamek.md) + +[Nabazgraj byle co](bazgroly/bazgroly.md) From 1ec4fd7e85bc5db73090e430e7601276dd87e40f Mon Sep 17 00:00:00 2001 From: Mateusz Widuch Date: Sun, 29 Nov 2015 20:45:30 +0000 Subject: [PATCH 1770/5486] Add placeholder files for story follow-up choices --- .../zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md | 0 .../gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md | 0 .../gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md | 0 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md new file mode 100644 index 0000000000..e69de29bb2 From 38fc9de2e4baaddda4aabf899a5cd425865d5df7 Mon Sep 17 00:00:00 2001 From: Troy Gugler Date: Sun, 29 Nov 2015 18:44:07 -0700 Subject: [PATCH 1771/5486] you are craving marshmellow added --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index b7a5a83895..90a6c06edc 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -643,3 +643,5 @@ the text of a markdown file called marshmallow.md. As you read you realize that the story is about you! This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) + +Suddenly you feel a strong craving for [something.](craving/craving.md) From bc309c1cf43d705bdcb9732b68f91c23f3392161 Mon Sep 17 00:00:00 2001 From: Troy Gugler Date: Sun, 29 Nov 2015 18:44:52 -0700 Subject: [PATCH 1772/5486] add craving marshmellows file add --- english/craving/craving.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/craving/craving.md diff --git a/english/craving/craving.md b/english/craving/craving.md new file mode 100644 index 0000000000..ae4449a162 --- /dev/null +++ b/english/craving/craving.md @@ -0,0 +1 @@ +You are craving marshmellows covered in chocolate! You can't believe how powerful the craving is! You must have them now! You quickly put some in a bowl and cover them with Chocolate. [You begin eating!](eating-walls/eating-marshmellows.md) \ No newline at end of file From 46d959180f3fc3ad7160855b1c94ff7bae32b87d Mon Sep 17 00:00:00 2001 From: Jesse Montgomery Date: Sun, 29 Nov 2015 21:40:29 -0500 Subject: [PATCH 1773/5486] Update wampa --- english/lightsaber/wampa/wampa.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/lightsaber/wampa/wampa.md b/english/lightsaber/wampa/wampa.md index 9405c48701..2f35a18940 100644 --- a/english/lightsaber/wampa/wampa.md +++ b/english/lightsaber/wampa/wampa.md @@ -2,4 +2,7 @@ The Force is strong within you. You stretch out your hand and the lightsaber flies up into it. As you turn to stride away from the melting marshmallow mansion, you hear a blood-curdling roar. +You smell lilac and it reminds you of summering in the hamptons with +your good friends the Millers. I wonder what they are up to now? + You run into something, and it's not just the cold. \ No newline at end of file From c756f37682ce01344f6d4adbeaf989cc966d4926 Mon Sep 17 00:00:00 2001 From: YamauraShusaku Date: Mon, 30 Nov 2015 15:01:47 +0900 Subject: [PATCH 1774/5486] add happy thing in Japanese folder --- japanese/chasitsu.md | 4 +++- japanese/happy/happy.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 japanese/happy/happy.md diff --git a/japanese/chasitsu.md b/japanese/chasitsu.md index 6577eb7195..c381bd1a6d 100644 --- a/japanese/chasitsu.md +++ b/japanese/chasitsu.md @@ -5,4 +5,6 @@ [庭に出る](garden/garden.md) -今日食べた[カツ丼](katsudon/katsudon.md)美味しかったなー。 \ No newline at end of file +今日食べた[カツ丼](katsudon/katsudon.md)美味しかったなー。 + +[ここ](happy/happy.md)を踏むと幸せになれます。 \ No newline at end of file diff --git a/japanese/happy/happy.md b/japanese/happy/happy.md new file mode 100644 index 0000000000..bfde123512 --- /dev/null +++ b/japanese/happy/happy.md @@ -0,0 +1 @@ +自分が変わればすべて変えていける。 \ No newline at end of file From a9ff148f5bb791da69bf9bbf6be82551ee198942 Mon Sep 17 00:00:00 2001 From: Harris Ngan Date: Mon, 30 Nov 2015 21:29:06 +0000 Subject: [PATCH 1775/5486] Added my line of code to the life story. --- english/code-my-life/code-my-life.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/code-my-life/code-my-life.md diff --git a/english/code-my-life/code-my-life.md b/english/code-my-life/code-my-life.md new file mode 100644 index 0000000000..3ed243d2f2 --- /dev/null +++ b/english/code-my-life/code-my-life.md @@ -0,0 +1 @@ +As you have read this far, you are of the same kind. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index b7a5a83895..544b8dd0c5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -643,3 +643,5 @@ the text of a markdown file called marshmallow.md. As you read you realize that the story is about you! This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) + +When I code over my weekend, I feel that this becomes my [whole life]. (code-my-life/code-my-life.md) From 7c045cd6adbb923189f1477792a0d463c4de1091 Mon Sep 17 00:00:00 2001 From: in-flu-ence Date: Mon, 30 Nov 2015 21:37:51 +0000 Subject: [PATCH 1776/5486] Updated Code to reflect link --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 544b8dd0c5..da18303071 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -644,4 +644,4 @@ you realize that the story is about you! This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) -When I code over my weekend, I feel that this becomes my [whole life]. (code-my-life/code-my-life.md) +When I code over my weekend, I feel that this becomes my [whole life](code-my-life/code-my-life.md). From 3b084bf71ef26bf655db0dd71f511734776dba11 Mon Sep 17 00:00:00 2001 From: dmytroKarataiev Date: Mon, 30 Nov 2015 16:52:34 -0800 Subject: [PATCH 1777/5486] Update factory.md --- ukrainian/door/factory/factory.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ukrainian/door/factory/factory.md b/ukrainian/door/factory/factory.md index eae4d8656a..635807c050 100644 --- a/ukrainian/door/factory/factory.md +++ b/ukrainian/door/factory/factory.md @@ -2,4 +2,5 @@ того щоб дізнатись про таємниці невідомо чого, ви захопили владу на фабриці та встановили контроль над усіма запасами зефіру. -[Але нажаль вам не вистачило прихильників утримати фабрику від контролем, вас побили та посадили в кімнату](../../marshmallow.md) \ No newline at end of file +Але нажаль вам не вистачило прихильників утримати фабрику від контролем, +[вас побили та посадили в кімнату](../../marshmallow.md) From 5b73a8339c89227c2367694be2bfc661fa8a01fe Mon Sep 17 00:00:00 2001 From: Curtis Poppe Date: Mon, 30 Nov 2015 21:29:26 -0600 Subject: [PATCH 1778/5486] Add an option for the second new Star Wars trailer in marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 78d209e4d5..171a9dbae0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -207,6 +207,8 @@ Do you: [Watch the new Star Wars trailer](https://www.youtube.com/watch?v=sGbxmsDFVnE) +[Watch the second new Star Wars trailer](https://www.youtube.com/watch?v=ngElkyQ6Rhs) + [Live Tweet the situation](tweet-it/tweet-it.md) [Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) From a76d36d6914058d2836a8a5ca09cd28bed8ec99b Mon Sep 17 00:00:00 2001 From: LeslieJG Date: Tue, 1 Dec 2015 18:32:50 +1300 Subject: [PATCH 1779/5486] Add line to end of Skydiving.md --- english/skydiving/skydiving.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/skydiving/skydiving.md b/english/skydiving/skydiving.md index 34a269b5b2..3fdaf186a1 100644 --- a/english/skydiving/skydiving.md +++ b/english/skydiving/skydiving.md @@ -2,4 +2,6 @@ And I went to an airport and saw someone jumping out of a plane and open and pa So I did. -It is on my to do list. \ No newline at end of file +It is on my to do list. + +After I landed, I realized that this was great! I turned around and said "Let's do it again!" From 4f2bc7d9c2023849b83e85fb34e7b8fc423b8762 Mon Sep 17 00:00:00 2001 From: CasanovaFlores Date: Tue, 1 Dec 2015 09:07:09 +0100 Subject: [PATCH 1780/5486] Modificata lunghezza Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md --- .../vecchie-fotografie/girare_foto/messaggio.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md b/Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md index 2e70e09b8b..dc2089f1ce 100644 --- a/Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md +++ b/Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md @@ -1,5 +1,9 @@ -Giri le fotografie e dietro ad una trovi uno strano messaggio in parte cancellato dal tempo. +Giri le fotografie e dietro ad una trovi uno +strano messaggio in parte cancellato dal tempo. -La fotografia ritrae una famiglia numerosa, tutti i volti sono ben visibili ad eccezione di quello di una giovane ragazza che è stato bruciato. +La fotografia ritrae una famiglia numerosa. +Tutti i volti sono ben visibili ad eccezione di quello +di una giovane ragazza che è stato bruciato. -Il messaggio dietro la fotografia è il seguente: "Sei sulla buona strada..." +Il messaggio dietro la fotografia è il seguente: +"Sei sulla buona strada..." From 446e158cd909cda0f2bdc12df3b33cd52f2cb181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=AD=A6=E8=B1=AA?= Date: Tue, 1 Dec 2015 17:36:05 +0800 Subject: [PATCH 1781/5486] Add xidada.md --- Chinese/xidada/xidada.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/xidada/xidada.md diff --git a/Chinese/xidada/xidada.md b/Chinese/xidada/xidada.md new file mode 100644 index 0000000000..fc77776aaf --- /dev/null +++ b/Chinese/xidada/xidada.md @@ -0,0 +1 @@ +变成中国主席嘻嘻嘻 \ No newline at end of file From e66c02008c66c60349c5367ba42088c13019b254 Mon Sep 17 00:00:00 2001 From: zwhmepsy Date: Tue, 1 Dec 2015 18:00:26 +0800 Subject: [PATCH 1782/5486] Fix the link --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 8d27c19c9c..0ccc62fd63 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -70,4 +70,6 @@ [韦小宝](Weixiaobao/Weixiaobao.md) -[Gareth Bale](Gareth_Bale/Bale.md) \ No newline at end of file +[Gareth Bale](Gareth_Bale/Bale.md) + +[xidada](xidada/xidada.md) \ No newline at end of file From 91ae469253410d139e2f0f95612f5b02e6ea8636 Mon Sep 17 00:00:00 2001 From: Troy Gugler Date: Tue, 1 Dec 2015 13:02:20 -0700 Subject: [PATCH 1783/5486] fix link --- english/craving/craving.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/craving/craving.md b/english/craving/craving.md index ae4449a162..aa7e3778c6 100644 --- a/english/craving/craving.md +++ b/english/craving/craving.md @@ -1 +1,5 @@ -You are craving marshmellows covered in chocolate! You can't believe how powerful the craving is! You must have them now! You quickly put some in a bowl and cover them with Chocolate. [You begin eating!](eating-walls/eating-marshmellows.md) \ No newline at end of file +You are craving marshmellows covered in chocolate! +You can't believe how powerful the craving is! +You must have them now! +You quickly put some in a bowl and cover them with Chocolate. +[You begin eating!](../eating-walls/eating-marshmallows.md) From 96e1f578358ac154627834d85aaa31f70d3277b7 Mon Sep 17 00:00:00 2001 From: Mattia Casella Date: Tue, 1 Dec 2015 22:35:40 +0100 Subject: [PATCH 1784/5486] Vola sopra il T-Rex --- Italian/finestra/cadi/tappeto-volante/tappeto-volante.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Italian/finestra/cadi/tappeto-volante/tappeto-volante.md b/Italian/finestra/cadi/tappeto-volante/tappeto-volante.md index f4aeef9cf4..048b873d8b 100644 --- a/Italian/finestra/cadi/tappeto-volante/tappeto-volante.md +++ b/Italian/finestra/cadi/tappeto-volante/tappeto-volante.md @@ -1,3 +1,5 @@ Corri a più non posso e raggiungi il tappeto volante appena in tempo... Il tappeto si alza in volo + +[Ti dirigi sopra il T-Rex](sopra-t-rex/sopra-t-rex.md) \ No newline at end of file From 3a1e1d2e76cc054abd14edb817e502b8ce527dc1 Mon Sep 17 00:00:00 2001 From: Mattia Casella Date: Tue, 1 Dec 2015 22:37:31 +0100 Subject: [PATCH 1785/5486] Aggiungi file sopra-t-rex --- Italian/finestra/cadi/tappeto-volante/sopra-t-rex/sopra-t-rex.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Italian/finestra/cadi/tappeto-volante/sopra-t-rex/sopra-t-rex.md diff --git a/Italian/finestra/cadi/tappeto-volante/sopra-t-rex/sopra-t-rex.md b/Italian/finestra/cadi/tappeto-volante/sopra-t-rex/sopra-t-rex.md new file mode 100644 index 0000000000..2d3882b709 --- /dev/null +++ b/Italian/finestra/cadi/tappeto-volante/sopra-t-rex/sopra-t-rex.md @@ -0,0 +1 @@ +Vedi il possente animale ruggire verso di te... \ No newline at end of file From d9f736e94d016560a273922fb6f31d4826fc901d Mon Sep 17 00:00:00 2001 From: mzvast Date: Wed, 2 Dec 2015 06:54:31 +0000 Subject: [PATCH 1786/5486] Add a snow man stroy and its link --- Chinese/snowman/story.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Chinese/snowman/story.md diff --git a/Chinese/snowman/story.md b/Chinese/snowman/story.md new file mode 100644 index 0000000000..70560cea9a --- /dev/null +++ b/Chinese/snowman/story.md @@ -0,0 +1 @@ +从此，孙悟空成为了一尊冰雕，过上了冻手冻脚的生活。 \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 25dea4d8c3..5d2e1b2fba 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -1,5 +1,7 @@ 在1994年大话西游之月光宝盒的电影中，主角周星驰饰演的孙悟空在500年后转世成为： +[雪人](snowman/story.md) + [白雪公主](snow_white/story.md) [recipe](Peter/Peter.md) From 165add339ead88659dd41bb0cf5f05698b457beb Mon Sep 17 00:00:00 2001 From: wcx <369808898@qq.com> Date: Wed, 2 Dec 2015 15:12:14 +0800 Subject: [PATCH 1787/5486] Add Kobe option --- Chinese/Kobe/Kobe.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Chinese/Kobe/Kobe.md diff --git a/Chinese/Kobe/Kobe.md b/Chinese/Kobe/Kobe.md new file mode 100644 index 0000000000..d763a76508 --- /dev/null +++ b/Chinese/Kobe/Kobe.md @@ -0,0 +1 @@ + “师傅，我想打篮球”，悟空说道。 diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 0ccc62fd63..b965dd66fa 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -72,4 +72,6 @@ [Gareth Bale](Gareth_Bale/Bale.md) -[xidada](xidada/xidada.md) \ No newline at end of file +[xidada](xidada/xidada.md) + +[Kobe](Kobe/Kobe.md) \ No newline at end of file From 1b982ae549493604a7dcfb93000ba92de3ab7b51 Mon Sep 17 00:00:00 2001 From: Mike Date: Wed, 2 Dec 2015 14:22:29 +0500 Subject: [PATCH 1788/5486] Scratch --- russian/scratch/open-close/open-close.md | 1 + russian/scratch/scratch.md | 3 +++ russian/zefir.md | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 russian/scratch/open-close/open-close.md create mode 100644 russian/scratch/scratch.md diff --git a/russian/scratch/open-close/open-close.md b/russian/scratch/open-close/open-close.md new file mode 100644 index 0000000000..46fa017977 --- /dev/null +++ b/russian/scratch/open-close/open-close.md @@ -0,0 +1 @@ +Вы поморгали несколько раз, зефир поменял цвет на зеленый. При этом вы не можете вспомнить, каким он был до того. diff --git a/russian/scratch/scratch.md b/russian/scratch/scratch.md new file mode 100644 index 0000000000..27a9b81899 --- /dev/null +++ b/russian/scratch/scratch.md @@ -0,0 +1,3 @@ +Вы поскребли подмышкой. Звуки музыки прекратились, но зефир остался. Что дальше? + +[Похлопать глазами](open-close/open-close.md) \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index 490dddba2d..59c360e2a6 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -48,4 +48,6 @@ [Поздравлю деда.](grandad/grandad.md) -[Попробую отщипнуть кусочек зефирной стены.](nip-off/nip-off.md) \ No newline at end of file +[Попробую отщипнуть кусочек зефирной стены.](nip-off/nip-off.md) + +[Почесать в подмышечной впадине.](scratch/scratch.md) From 0266c38e921171bc66a209c5353d3d1489d645a6 Mon Sep 17 00:00:00 2001 From: Aaron Marshall Date: Wed, 2 Dec 2015 11:27:00 -0600 Subject: [PATCH 1789/5486] Add Eating Farts --- english/eat-farts/eat-farts | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 english/eat-farts/eat-farts diff --git a/english/eat-farts/eat-farts b/english/eat-farts/eat-farts new file mode 100644 index 0000000000..b28dac393e --- /dev/null +++ b/english/eat-farts/eat-farts @@ -0,0 +1,8 @@ +"Pfffffffffffttttttt, pffffffftttttttt." - mr. skeltal + +EAT THESE FARTS! +"Poot" - mr. skeltal + +You're now so tired from all the fart eating you've accomplished. + +[Go back to sleep.](../sleep/marshmallow.md) From 5787bf488cf93ba79a80539e120b55d4e9573278 Mon Sep 17 00:00:00 2001 From: Aaron Marshall Date: Wed, 2 Dec 2015 11:35:37 -0600 Subject: [PATCH 1790/5486] Added Story Link To Eat Farts --- english/132-days-ago/132-days-ago.md | 4 +++- english/eat-farts/{eat-farts => eat-farts.md} | 0 2 files changed, 3 insertions(+), 1 deletion(-) rename english/eat-farts/{eat-farts => eat-farts.md} (100%) diff --git a/english/132-days-ago/132-days-ago.md b/english/132-days-ago/132-days-ago.md index 0b421308a1..c5e1cf9773 100644 --- a/english/132-days-ago/132-days-ago.md +++ b/english/132-days-ago/132-days-ago.md @@ -4,4 +4,6 @@ or a pack of four donuts. You decide to [eat the chocolate anyway.](../youre-fine/youre-fine.md) -Or, you could [eat a juicy steak](../rib-eye/rib-eye.md) \ No newline at end of file +Or, you could [eat a juicy steak](../rib-eye/rib-eye.md) + +Maybe even a [fart] (eat-farts/eat-farts.md)or two? \ No newline at end of file diff --git a/english/eat-farts/eat-farts b/english/eat-farts/eat-farts.md similarity index 100% rename from english/eat-farts/eat-farts rename to english/eat-farts/eat-farts.md From 391f330737834de9cb631c24e1b67e98fffb332a Mon Sep 17 00:00:00 2001 From: Aaron Marshall Date: Wed, 2 Dec 2015 11:37:54 -0600 Subject: [PATCH 1791/5486] Fixed Link To Eating Farts --- english/132-days-ago/132-days-ago.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/132-days-ago/132-days-ago.md b/english/132-days-ago/132-days-ago.md index c5e1cf9773..1d96237964 100644 --- a/english/132-days-ago/132-days-ago.md +++ b/english/132-days-ago/132-days-ago.md @@ -6,4 +6,4 @@ You decide to [eat the chocolate anyway.](../youre-fine/youre-fine.md) Or, you could [eat a juicy steak](../rib-eye/rib-eye.md) -Maybe even a [fart] (eat-farts/eat-farts.md)or two? \ No newline at end of file +Maybe even a [fart] (../eat-farts/eat-farts.md)or two? \ No newline at end of file From f62bf90d34dbd150eee178c55bf5de062ea27536 Mon Sep 17 00:00:00 2001 From: Rose Eckhardt Date: Wed, 2 Dec 2015 13:14:37 -0500 Subject: [PATCH 1792/5486] Add sentence about cat --- english/animal/animal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/animal/animal.md b/english/animal/animal.md index 98584263b0..02861fc4b9 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -1,4 +1,4 @@ -My worst fears have come true. My cat is crying out for food. +My worst fears have come true. My cat is crying out for food. I’ve never heard such terrible screams. Even if it really start to drop tears or weep blood, it's the same to me ... no food. The hilarious thing is that i start thinking about making it my own meal. From 4e454e0cb616fbf325ff1260655bd2b768ef9703 Mon Sep 17 00:00:00 2001 From: Rose Eckhardt Date: Wed, 2 Dec 2015 13:24:10 -0500 Subject: [PATCH 1793/5486] Add sentence about the cat --- english/animal/animal.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/animal/animal.md b/english/animal/animal.md index 98584263b0..e87b709d69 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -1,4 +1,5 @@ My worst fears have come true. My cat is crying out for food. +The screams are the worst sound I’ve ever heard in my life. Even if it really start to drop tears or weep blood, it's the same to me ... no food. The hilarious thing is that i start thinking about making it my own meal. From f14d3e684b59e677f7a2b0663ed0ed8f6afe5166 Mon Sep 17 00:00:00 2001 From: Pawel Date: Thu, 3 Dec 2015 13:49:48 +0100 Subject: [PATCH 1794/5486] dodaj dwa kroki w terrorystach --- Polish/ubranie/macasz/terrorysci/lyzka/lyzka.md | 4 ++++ Polish/ubranie/macasz/terrorysci/siku/siku.md | 4 ++++ Polish/ubranie/macasz/terrorysci/terrorysci.md | 7 ++++++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Polish/ubranie/macasz/terrorysci/lyzka/lyzka.md create mode 100644 Polish/ubranie/macasz/terrorysci/siku/siku.md diff --git a/Polish/ubranie/macasz/terrorysci/lyzka/lyzka.md b/Polish/ubranie/macasz/terrorysci/lyzka/lyzka.md new file mode 100644 index 0000000000..cf3047977f --- /dev/null +++ b/Polish/ubranie/macasz/terrorysci/lyzka/lyzka.md @@ -0,0 +1,4 @@ +Oko bandyty byo podczone do detonatora i bomby umieszczonej w jego odb-, hmm, z tyu. +Bomba wybucha i rozrywa cie na kawaki. + +Koniec. \ No newline at end of file diff --git a/Polish/ubranie/macasz/terrorysci/siku/siku.md b/Polish/ubranie/macasz/terrorysci/siku/siku.md new file mode 100644 index 0000000000..d2f4c9d068 --- /dev/null +++ b/Polish/ubranie/macasz/terrorysci/siku/siku.md @@ -0,0 +1,4 @@ +Strumie moczu jest tak silny, e po 1 sekundzie pomieszczenie jest wypenione zot ciecz. +Kalafiory nie potrafi pywa, wic si topi. Ty te nie potrafisz pywa wic wypijasz mocz i yjesz + +DUGO I SZCZʌLIWIE. \ No newline at end of file diff --git a/Polish/ubranie/macasz/terrorysci/terrorysci.md b/Polish/ubranie/macasz/terrorysci/terrorysci.md index c45a5e00f5..2810eae1c5 100644 --- a/Polish/ubranie/macasz/terrorysci/terrorysci.md +++ b/Polish/ubranie/macasz/terrorysci/terrorysci.md @@ -1,2 +1,7 @@ Otwierasz kieszeń. Niestety jest tak jak myślałeś, to kalafior. -Nagle przenosisz się do przedszkola opanowanego przez niebezpieczną grupę kalafiorowych terrorystów. \ No newline at end of file +Nagle przenosisz się do przedszkola opanowanego przez niebezpieczną grupę kalafiorowych terrorystów. +Bandyci nie mają broni palnej, posługują się wyimaginowanymi pistoletami stworzonymi z palca i kciuka. +Jeden z nich podchodzi do ciebie i celuje w twoją głowę. + +[Wbijasz mu łyżkę w oko](lyzka/lyzka.md) +[Zsikujesz się ze strachu](siku/siku.md) \ No newline at end of file From 73e64b8a94ef433a0732e6935530de4a66276dc3 Mon Sep 17 00:00:00 2001 From: Pawel Date: Thu, 3 Dec 2015 13:53:51 +0100 Subject: [PATCH 1795/5486] dodaj odstep miedzy opcjami --- Polish/ubranie/macasz/terrorysci/terrorysci.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Polish/ubranie/macasz/terrorysci/terrorysci.md b/Polish/ubranie/macasz/terrorysci/terrorysci.md index 2810eae1c5..ea9963ff21 100644 --- a/Polish/ubranie/macasz/terrorysci/terrorysci.md +++ b/Polish/ubranie/macasz/terrorysci/terrorysci.md @@ -4,4 +4,5 @@ Bandyci nie mają broni palnej, posługują się wyimaginowanymi pistoletami stw Jeden z nich podchodzi do ciebie i celuje w twoją głowę. [Wbijasz mu łyżkę w oko](lyzka/lyzka.md) + [Zsikujesz się ze strachu](siku/siku.md) \ No newline at end of file From 55a7dc595ceea757ee9a1ab516573b88ea2c263a Mon Sep 17 00:00:00 2001 From: nagmak Date: Thu, 3 Dec 2015 10:15:29 -0500 Subject: [PATCH 1796/5486] Broken into multiple lines --- english/robofriend/AIRobot.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/robofriend/AIRobot.md b/english/robofriend/AIRobot.md index afaf3fbbfe..6ca28f86a3 100644 --- a/english/robofriend/AIRobot.md +++ b/english/robofriend/AIRobot.md @@ -1 +1,4 @@ -You've been thinking of adopting one of those new AI robofriends. Yes, that's right. I know you've been lonely of late. [Here's an early present then.](AIattacks.md) +You've been thinking of adopting one of those new AI robofriends. +Yes, that's right. +I know you've been lonely of late. +[Here's an early present then.](AIattacks.md) From 300f566483c3371400eaf747db41fd0a93705214 Mon Sep 17 00:00:00 2001 From: nagmak Date: Thu, 3 Dec 2015 10:16:43 -0500 Subject: [PATCH 1797/5486] Broken into multiple lines --- english/robofriend/AIattacks.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/english/robofriend/AIattacks.md b/english/robofriend/AIattacks.md index 158cd857ef..f0a9ee245b 100644 --- a/english/robofriend/AIattacks.md +++ b/english/robofriend/AIattacks.md @@ -1,5 +1,9 @@ You've unpacked a CloneFriend! -You feel uneasy, holding this little robot in your hand, knowing it's capabilities. It begins a countdown to activate: 5 - 4 - 3 - 2 - 1 .... +You feel uneasy, +holding this little robot in your hand, +knowing it's capabilities. +It begins a countdown to activate: +5 - 4 - 3 - 2 - 1 .... AND YOU'VE BEEN CUDDLE-ATTACKED BY YOUR CloneFriend! *hugs* -You'll never be alone again. [(If that doesn't scare you, better go back)](../marshmallow.md) \ No newline at end of file +You'll never be alone again. [(If that doesn't scare you, better go back)](../marshmallow.md) From 18b34d70284f13742173289bfdbc1958f07d55db Mon Sep 17 00:00:00 2001 From: NAGMA KAPOOR Date: Thu, 3 Dec 2015 10:38:21 -0500 Subject: [PATCH 1798/5486] Moved AIattacks into cuddleattacks dir --- english/robofriend/{ => cuddleattack}/AIattacks.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/robofriend/{ => cuddleattack}/AIattacks.md (100%) diff --git a/english/robofriend/AIattacks.md b/english/robofriend/cuddleattack/AIattacks.md similarity index 100% rename from english/robofriend/AIattacks.md rename to english/robofriend/cuddleattack/AIattacks.md From cc1061be856f799c5a54da4df03b7235c6e98ae2 Mon Sep 17 00:00:00 2001 From: Ordinateur Date: Thu, 3 Dec 2015 16:41:29 +0100 Subject: [PATCH 1799/5486] ajout d'option "je ne fais rien" --- french/feu-de-camp.md | 2 ++ french/rien/rien.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 french/rien/rien.md diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 0a80cb504e..3fe77b81e5 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -29,3 +29,5 @@ Que faites-vous ? [J'appelle le genie](appelle-genie/appelle-genie.md) [Je me lève et me dirige vers la sortie](sortie/pousser-porte/pousser-porte.md) + +[Je ne fais rien](rien/rien.md) \ No newline at end of file diff --git a/french/rien/rien.md b/french/rien/rien.md new file mode 100644 index 0000000000..7911de7dfb --- /dev/null +++ b/french/rien/rien.md @@ -0,0 +1,3 @@ +Je ne fais rien. Il ne se passe rien. + +[Je revois mes autres options](../feu-de-camp.md) \ No newline at end of file From 0c16b23825e7b50d84c41094dc425ba9ef2a6f4d Mon Sep 17 00:00:00 2001 From: nagmak Date: Thu, 3 Dec 2015 10:42:10 -0500 Subject: [PATCH 1800/5486] Updated broken link to specify new directory --- english/robofriend/AIRobot.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/robofriend/AIRobot.md b/english/robofriend/AIRobot.md index 6ca28f86a3..12e9d84b4e 100644 --- a/english/robofriend/AIRobot.md +++ b/english/robofriend/AIRobot.md @@ -1,4 +1,4 @@ You've been thinking of adopting one of those new AI robofriends. Yes, that's right. I know you've been lonely of late. -[Here's an early present then.](AIattacks.md) +[Here's an early present then.](cuddleattack/AIattacks.md) From c5f536622c6fb12a4772746de1e640c53a93c1a3 Mon Sep 17 00:00:00 2001 From: Stano V Date: Thu, 3 Dec 2015 17:02:42 +0100 Subject: [PATCH 1801/5486] Enhanced slovak story --- slovak/flasa/nikdy-viac.md | 3 +++ slovak/marsmelaci.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 slovak/flasa/nikdy-viac.md diff --git a/slovak/flasa/nikdy-viac.md b/slovak/flasa/nikdy-viac.md new file mode 100644 index 0000000000..b9fabeb141 --- /dev/null +++ b/slovak/flasa/nikdy-viac.md @@ -0,0 +1,3 @@ +Glgneš si, ponúkneš aj rybke a skúsiš si spomenúť, s kým si strávil noc. + + \ No newline at end of file diff --git a/slovak/marsmelaci.md b/slovak/marsmelaci.md index befefcf45f..976a4eec7c 100644 --- a/slovak/marsmelaci.md +++ b/slovak/marsmelaci.md @@ -4,4 +4,6 @@ Jedno nevšedné ráno sa zobudíš v divnej miestnosti, ktorá má steny z mars [Raňajky](ranajky/koniec-rybky.md) -[Pokúsiš sa zachrániť rybku](zachrana/zachrana-rybky.md) \ No newline at end of file +[Pokúsiš sa zachrániť rybku](zachrana/zachrana-rybky.md) + +[Siahneš opäť po fľaši](flasa/nikdy-viac.md) From 97d59790f89e6cd68dd590d7cf7f9dfae5a511ac Mon Sep 17 00:00:00 2001 From: Pablo Contreras Date: Thu, 3 Dec 2015 23:18:45 -0500 Subject: [PATCH 1802/5486] Add a new option Artefacto --- espanol/artefacto/artefacto.md | 3 +++ espanol/canudos.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 espanol/artefacto/artefacto.md diff --git a/espanol/artefacto/artefacto.md b/espanol/artefacto/artefacto.md new file mode 100644 index 0000000000..541ab5c25c --- /dev/null +++ b/espanol/artefacto/artefacto.md @@ -0,0 +1,3 @@ +Beatito asombrado cogió el artefacto, mientras el Consejero le decia "Ya no tenemos tiempo, ahora solo nos queda activarlo". A lo que Beatito +asintio con su cabeza a la vez que accionaba el artefacto, entonces se oyo una gran explosión en la habitacion y: + diff --git a/espanol/canudos.md b/espanol/canudos.md index 635c0cf537..bbf55aefb0 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -85,3 +85,5 @@ el Consejero: [Abrió los ojos. ¿Era todo una cruel pesadilla?](pesadilla/pesadilla.md) [Como siempre, aquel terrible dia terminó y otro lo sucedió](termino/termino.md) + +[Saco de su bolsillo un extraño artefacto y se lo dio a Beatito](artefacto/artefacto.md) From d10430e21b4246bf394181ad70f689e8dfcb1f36 Mon Sep 17 00:00:00 2001 From: Pablo Contreras Date: Fri, 4 Dec 2015 00:05:07 -0500 Subject: [PATCH 1803/5486] Fix large of line --- espanol/artefacto/artefacto.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/espanol/artefacto/artefacto.md b/espanol/artefacto/artefacto.md index 541ab5c25c..ebe7e3eb75 100644 --- a/espanol/artefacto/artefacto.md +++ b/espanol/artefacto/artefacto.md @@ -1,3 +1,5 @@ -Beatito asombrado cogió el artefacto, mientras el Consejero le decia "Ya no tenemos tiempo, ahora solo nos queda activarlo". A lo que Beatito -asintio con su cabeza a la vez que accionaba el artefacto, entonces se oyo una gran explosión en la habitacion y: +Beatito asombrado cogió el artefacto, mientras el Consejero le decia +"Ya no tenemos tiempo, ahora solo nos queda activarlo". A lo que Beatito +asintio con su cabeza a la vez que accionaba el artefacto, +entonces se oyo una gran explosión en la habitacion y: From af2d331cd471da8fbfd35a9cd6099a607acca24e Mon Sep 17 00:00:00 2001 From: matosb2 Date: Fri, 4 Dec 2015 17:39:56 -0500 Subject: [PATCH 1804/5486] Add my-adventure directory, and updated story --- english/marshmallow.md | 10 ++++++++++ english/my-adventure/my-adventure.md | 3 +++ 2 files changed, 13 insertions(+) create mode 100644 english/my-adventure/my-adventure.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 1dfa55b226..8405540d23 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -652,3 +652,13 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) +Despite the little conundrum that you resolved, you realize that it's now +Friday, December 4th. + +"Wait a minute", you gasped, "The English Premier League is on tomorrow!!" + +With that new revelation in mind, you quickly make like David Hasselhoff +and wiggle your wrist to show off a nice particular watch that even listens +to you when you speak to it. + +["Ahem!"](my-adventure/my-adventure.md) \ No newline at end of file diff --git a/english/my-adventure/my-adventure.md b/english/my-adventure/my-adventure.md new file mode 100644 index 0000000000..48dcc1fe50 --- /dev/null +++ b/english/my-adventure/my-adventure.md @@ -0,0 +1,3 @@ +"Hey Kitt I need you here yesterday!!", you scream loudly. + +Then you hear the sound of a loud exhaust with some familiar [music blaring out](https://youtu.be/Mo8Qls0HnWo) \ No newline at end of file From a7c69740e49ab9e7edcafcd2a97e29a4938e8ce9 Mon Sep 17 00:00:00 2001 From: countrockula Date: Sat, 5 Dec 2015 01:59:40 -0500 Subject: [PATCH 1805/5486] Add marshmallow-eating-contest option to robots-everywhere --- .../marshmallow-eating-contest.md | 3 +++ english/robot-army/robots-everywhere.md | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 english/robot-army/marshmallow-eating-contest/marshmallow-eating-contest.md diff --git a/english/robot-army/marshmallow-eating-contest/marshmallow-eating-contest.md b/english/robot-army/marshmallow-eating-contest/marshmallow-eating-contest.md new file mode 100644 index 0000000000..50355adad6 --- /dev/null +++ b/english/robot-army/marshmallow-eating-contest/marshmallow-eating-contest.md @@ -0,0 +1,3 @@ +You and your minons go in to an eating frenzy. Marshmallow bits are flying all +over the place. In the end, you are declared victor!! + diff --git a/english/robot-army/robots-everywhere.md b/english/robot-army/robots-everywhere.md index f0ae8ed19d..491b4147cb 100644 --- a/english/robot-army/robots-everywhere.md +++ b/english/robot-army/robots-everywhere.md @@ -7,3 +7,11 @@ minions and summon them with haste. Done, you sit down and relax as your [minions](https://www.youtube.com/watch?v=IS0-MVYAVZs) cut the marshmallow into conveniently sized pieces for a party you've decided to hold. + +Do you now: + +[Have a marshmallow eating contest?](marshmallow-eating-contest/marshmallow-eating-contest.md) + +or + +[Practice your breathing?](../yoga/yoga.md) \ No newline at end of file From 5050e5a91ade3e7b46b25daefc2881d6682874ca Mon Sep 17 00:00:00 2001 From: Ramon Date: Sat, 5 Dec 2015 13:41:39 +0100 Subject: [PATCH 1806/5486] Add funny hammer video --- english/hammertime/hammertime.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/hammertime/hammertime.md b/english/hammertime/hammertime.md index e8c3044d25..e0e28f4d4c 100644 --- a/english/hammertime/hammertime.md +++ b/english/hammertime/hammertime.md @@ -2,3 +2,5 @@ You break into the hammertime-dance, but quickly realize that this doesn't help you at all. Stop......IT'S HAMMERTIME - WHOOA-O, WHOOA-O! WHOOA-O, WHOOA-O! + +[Except when it is not](https://www.youtube.com/watch?v=dKv6Yco0Lzg) From ac89ab6d0bf6dc63aa15b7762e6b4785f85bad79 Mon Sep 17 00:00:00 2001 From: Jason Squires Date: Sat, 5 Dec 2015 20:07:04 -0600 Subject: [PATCH 1807/5486] add more about jumpsuits --- english/jumpsuit/jumpsuit-review.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/jumpsuit/jumpsuit-review.md b/english/jumpsuit/jumpsuit-review.md index fe2feae72c..0ed048fbc0 100644 --- a/english/jumpsuit/jumpsuit-review.md +++ b/english/jumpsuit/jumpsuit-review.md @@ -1,3 +1,4 @@ That jumpsuit you're wearing looks stupid. It's right here in your [file](jumpsuit-review.md) Hi, Tim here. Yes, that jumpsuit is awful. Please see the link above. Jumpsuits are underrated. I love a jumpsuit. +Why are jumpsuits so great? You're right, I do love them. From bc8c33874df90355b99648050de1ebb42aff99ec Mon Sep 17 00:00:00 2001 From: justchells Date: Sun, 6 Dec 2015 14:20:41 +0530 Subject: [PATCH 1808/5486] update story with new link to the justice league (dc comics) --- english/justice-league/justice-league.md | 19 +++++++++++++++++++ english/marshmallow.md | 10 ++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 english/justice-league/justice-league.md diff --git a/english/justice-league/justice-league.md b/english/justice-league/justice-league.md new file mode 100644 index 0000000000..880d907186 --- /dev/null +++ b/english/justice-league/justice-league.md @@ -0,0 +1,19 @@ +The world is under attack! + +You fight hard, but then realize the enemy is too strong. + +You need reinforcements. + +You send out a distress signal. + +Who will answer the call? + + - Superman? + - Batman? + - Wonder Woman? + - Flash? + - Green Lantern? + - Aquaman? + - Martian Manhunter? + - Cyborg? + - Shazam? diff --git a/english/marshmallow.md b/english/marshmallow.md index 8405540d23..6073762ae9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -79,6 +79,8 @@ capacity for good, I have sent them you... my only son." [Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) +Call in the [Justice League!](./justice-league/justice-league.md) + [Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) [That sure sounds familiar...](./sounds-familiar/sounds-familiar.md) @@ -652,13 +654,13 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now -Friday, December 4th. +Despite the little conundrum that you resolved, you realize that it's now +Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" With that new revelation in mind, you quickly make like David Hasselhoff and wiggle your wrist to show off a nice particular watch that even listens -to you when you speak to it. +to you when you speak to it. -["Ahem!"](my-adventure/my-adventure.md) \ No newline at end of file +["Ahem!"](my-adventure/my-adventure.md) From 9ac5cbfe916b9c812d516ff454eecc962d9969a3 Mon Sep 17 00:00:00 2001 From: justchells Date: Sun, 6 Dec 2015 14:36:25 +0530 Subject: [PATCH 1809/5486] fix missing lines --- english/marshmallow.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6073762ae9..2ae6f52c44 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -654,13 +654,13 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now -Friday, December 4th. +Despite the little conundrum that you resolved, you realize that it's now +Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" With that new revelation in mind, you quickly make like David Hasselhoff and wiggle your wrist to show off a nice particular watch that even listens -to you when you speak to it. +to you when you speak to it. ["Ahem!"](my-adventure/my-adventure.md) From 7d15632d0417fb51f5485cb9eb8173dd015c68cc Mon Sep 17 00:00:00 2001 From: Leonardo Valle Camacho Date: Sun, 6 Dec 2015 11:03:29 -0500 Subject: [PATCH 1810/5486] Add a new adventure --- espanol/canudos.md | 2 ++ espanol/duda/duda.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 espanol/duda/duda.md diff --git a/espanol/canudos.md b/espanol/canudos.md index bbf55aefb0..1495a63602 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -87,3 +87,5 @@ el Consejero: [Como siempre, aquel terrible dia terminó y otro lo sucedió](termino/termino.md) [Saco de su bolsillo un extraño artefacto y se lo dio a Beatito](artefacto/artefacto.md) + +Al ojearlo, una duda lo emabargó...[¿Qué hago?](duda/duda.md) diff --git a/espanol/duda/duda.md b/espanol/duda/duda.md new file mode 100644 index 0000000000..d0c0e40b2b --- /dev/null +++ b/espanol/duda/duda.md @@ -0,0 +1 @@ +Será mejor tomar un descanso, para mirar el artefacto con nuevos ojos From 65ba91a3a52cc2d50d070b9668e6b476049428ea Mon Sep 17 00:00:00 2001 From: Nihal Date: Mon, 7 Dec 2015 00:55:24 +0530 Subject: [PATCH 1811/5486] You can send distress signal to Spidey! --- english/justice-league/justice-league.md | 1 + english/justice-league/spiderman/spiderman.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 english/justice-league/spiderman/spiderman.md diff --git a/english/justice-league/justice-league.md b/english/justice-league/justice-league.md index 880d907186..0f0538f74e 100644 --- a/english/justice-league/justice-league.md +++ b/english/justice-league/justice-league.md @@ -17,3 +17,4 @@ Who will answer the call? - Martian Manhunter? - Cyborg? - Shazam? + - [Spiderman](./spiderman/spiderman.md)? diff --git a/english/justice-league/spiderman/spiderman.md b/english/justice-league/spiderman/spiderman.md new file mode 100644 index 0000000000..969092cf0e --- /dev/null +++ b/english/justice-league/spiderman/spiderman.md @@ -0,0 +1 @@ +Your friendly neighbourhood spiderman is here to help!! From 32d1812554a26578ec0c4e4fde2e389ef0543de5 Mon Sep 17 00:00:00 2001 From: Jason Tiet Date: Sun, 6 Dec 2015 18:41:46 -0800 Subject: [PATCH 1812/5486] Add 'meltmarshmallows' story --- english/marshmallow.md | 4 ++++ english/meltmarshmallows/meltmarshmallows.md | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 english/meltmarshmallows/meltmarshmallows.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 2ae6f52c44..10fdc26fbb 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -427,6 +427,8 @@ Do you: [Become the One?](matrix/matrix.md) +[Melt all the marshmallows to make s'mores?[meltmarshmallows/meltmarshmallows.md] + [Want to cook boneless pork shoulder roast?](pork/roast.md) [Take a selfie?](selfie/selfie.md) @@ -664,3 +666,5 @@ and wiggle your wrist to show off a nice particular watch that even listens to you when you speak to it. ["Ahem!"](my-adventure/my-adventure.md) + + diff --git a/english/meltmarshmallows/meltmarshmallows.md b/english/meltmarshmallows/meltmarshmallows.md new file mode 100644 index 0000000000..e406cdf081 --- /dev/null +++ b/english/meltmarshmallows/meltmarshmallows.md @@ -0,0 +1,5 @@ +You conjure up a flamethrower, and the sadistic side of you comes out. +You begin melting the marshmallow walls, and the screams of the marshmallows +bring you this feeling of intense joy that you cannot explain. +As you step out of the hole you've produced, a great idea sparks you: +"What if I melt ALL these marshmallows for my smores?? :)" From c9a21e7107a1dce5b4ce985c146df2f793e21568 Mon Sep 17 00:00:00 2001 From: chels Date: Sun, 6 Dec 2015 20:03:27 -0700 Subject: [PATCH 1813/5486] Add advice line --- english/swami-vivekananda/swami-vivekananda.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/swami-vivekananda/swami-vivekananda.md b/english/swami-vivekananda/swami-vivekananda.md index 075ba8a509..be74e460d5 100644 --- a/english/swami-vivekananda/swami-vivekananda.md +++ b/english/swami-vivekananda/swami-vivekananda.md @@ -13,6 +13,8 @@ But, whatever you do, be curious... But, whatever you do, do things that you're afraid of... +But, really, whatever you do, CLEAN ALL THE THINGS! + Do what you love. [OK, now back to the issue at hand-- I just woke up in a marshmallow house.](../marshmallow.md) From b1049a08385bc538195595e809583336470dd116 Mon Sep 17 00:00:00 2001 From: chels Date: Sun, 6 Dec 2015 20:18:42 -0700 Subject: [PATCH 1814/5486] Add advice line --- english/swami-vivekananda/swami-vivekananda.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/swami-vivekananda/swami-vivekananda.md b/english/swami-vivekananda/swami-vivekananda.md index be74e460d5..cdcebe36f5 100644 --- a/english/swami-vivekananda/swami-vivekananda.md +++ b/english/swami-vivekananda/swami-vivekananda.md @@ -17,5 +17,7 @@ But, really, whatever you do, CLEAN ALL THE THINGS! Do what you love. +Or do who you love. + [OK, now back to the issue at hand-- I just woke up in a marshmallow house.](../marshmallow.md) From c668a180a39981156f2673b65b4e7413bfe6b597 Mon Sep 17 00:00:00 2001 From: rudydev Date: Mon, 7 Dec 2015 01:17:18 -0600 Subject: [PATCH 1815/5486] Adding: The story of the Epic Sax Guy who saved the day, link to youtube --- english/TheEpicSax/111_TheEpicSaxGuyArrives.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/TheEpicSax/111_TheEpicSaxGuyArrives.md diff --git a/english/TheEpicSax/111_TheEpicSaxGuyArrives.md b/english/TheEpicSax/111_TheEpicSaxGuyArrives.md new file mode 100644 index 0000000000..e5d61935c5 --- /dev/null +++ b/english/TheEpicSax/111_TheEpicSaxGuyArrives.md @@ -0,0 +1,3 @@ +So to continue with the story, the situation was tense, but suddenly everything got solved on it's own. +The Epic Sexy Sax Guy appeared at the scene and with his powerful skills with the sax, he calmed even the most affected +by the catastrophe... [Click here to receive the epic sax guy music] (https://www.youtube.com/watch?v=BYEFv6sgKrM) \ No newline at end of file From 924e00a6cac7690f6350b0eeeec4d32ee3bf8a1b Mon Sep 17 00:00:00 2001 From: rudydev Date: Mon, 7 Dec 2015 02:09:11 -0600 Subject: [PATCH 1816/5486] Updating marshmallow.ma, so that #2952 goes through ... --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 2ae6f52c44..f07caee962 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -664,3 +664,5 @@ and wiggle your wrist to show off a nice particular watch that even listens to you when you speak to it. ["Ahem!"](my-adventure/my-adventure.md) + +So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... From dd6cde69d08d6296af99aada10260d70d27519a7 Mon Sep 17 00:00:00 2001 From: Mateusz Widuch Date: Mon, 7 Dec 2015 17:28:00 +0000 Subject: [PATCH 1817/5486] Update bazgroly.md Add random drawings event description --- .../zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md index e69de29bb2..0bcd36db5f 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md @@ -0,0 +1 @@ +Cała tablica pokryta jest Twoimi bazgrołami i szczerze mowiąc, nie przyniosło to żadnego efektu. Co dalej? From 515ac16e34053001089c80227e9e5d9ada5ad910 Mon Sep 17 00:00:00 2001 From: Mateusz Widuch Date: Mon, 7 Dec 2015 17:35:38 +0000 Subject: [PATCH 1818/5486] Update spodnie.md Add draw trousers event description --- .../zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md index e69de29bb2..2771a4b562 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md @@ -0,0 +1,2 @@ +Niczym Picasso, zabierasz się do rysowania. Nie wiedzieć czemu, narysował-eś/aś spodnie Alladyna zrobione z tysiąca złotych cekinów! +Co robisz ze spodniami? From e240cf218c03a5dffa956b570a66407bd6e983fa Mon Sep 17 00:00:00 2001 From: Mateusz Widuch Date: Mon, 7 Dec 2015 17:37:21 +0000 Subject: [PATCH 1819/5486] Add draw fastener event description --- .../gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md index e69de29bb2..13929429ad 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md @@ -0,0 +1 @@ +Próbujesz narysować zamek błyskawiczny ale absolutnie Ci nie wychodzi. Tak jak by ktoś lub coś chciało żeby Ci nie udało... From feee1887389429e1fc4c792ba7a518b4fb05b863 Mon Sep 17 00:00:00 2001 From: Mateusz Widuch Date: Mon, 7 Dec 2015 18:07:13 +0000 Subject: [PATCH 1820/5486] Fix line length in spodnie.md --- .../zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md index 2771a4b562..4da3f253ac 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md @@ -1,2 +1,2 @@ -Niczym Picasso, zabierasz się do rysowania. Nie wiedzieć czemu, narysował-eś/aś spodnie Alladyna zrobione z tysiąca złotych cekinów! -Co robisz ze spodniami? +Niczym Picasso, zabierasz się do rysowania. Nie wiedzieć czemu, narysował-eś/aś +spodnie Alladyna zrobione z tysiąca złotych cekinów! Co robisz ze spodniami? From 13df53371e6e5c8d68410770e871d43591a82b01 Mon Sep 17 00:00:00 2001 From: Mateusz Widuch Date: Mon, 7 Dec 2015 18:07:45 +0000 Subject: [PATCH 1821/5486] Fix line length in zamek.md --- .../gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md index 13929429ad..8d33a4180c 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md @@ -1 +1,2 @@ -Próbujesz narysować zamek błyskawiczny ale absolutnie Ci nie wychodzi. Tak jak by ktoś lub coś chciało żeby Ci nie udało... +Próbujesz narysować zamek błyskawiczny ale absolutnie Ci nie wychodzi. Tak jak +by ktoś lub coś chciało żeby Ci nie udało... From 50aae343469f9894adda1ba6d4e7cc4272972628 Mon Sep 17 00:00:00 2001 From: Neuvenen Date: Mon, 7 Dec 2015 21:00:28 +0100 Subject: [PATCH 1822/5486] Create choices for what to do with Alladins trousers --- .../zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md index 4da3f253ac..33ccda0c3c 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md @@ -1,2 +1,7 @@ Niczym Picasso, zabierasz się do rysowania. Nie wiedzieć czemu, narysował-eś/aś spodnie Alladyna zrobione z tysiąca złotych cekinów! Co robisz ze spodniami? + +[Spróbuj założyć](zalozyc.md) +[Przyjrzyj się spodniom](przyjrzyj/przyjrzyj.md) +[Podrzyj swój rysunek](podrzyj/podrzyj.md)) + From 4a239b64b49383d5c140b5c8e7f680603e7bee46 Mon Sep 17 00:00:00 2001 From: Neuvenen Date: Mon, 7 Dec 2015 21:04:43 +0100 Subject: [PATCH 1823/5486] Add 'zalozyc' choice to the story. --- .../zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc.md diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc.md new file mode 100644 index 0000000000..1a38ec065c --- /dev/null +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc.md @@ -0,0 +1,3 @@ +Próbujesz załozyć rysunek spodni Alladyna jak spodnie. Nie udaje Ci się to i zastanawiasz się dlaczego ... + +[Zastanow sie co zrobic dalej](spodnie.md) From 4b87b44ca7a776032fc4661d73892201fd8eb5d5 Mon Sep 17 00:00:00 2001 From: Neuvenen Date: Mon, 7 Dec 2015 21:07:51 +0100 Subject: [PATCH 1824/5486] Fix new lines in spodnie.md --- .../zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md index 33ccda0c3c..2f6a30b548 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md @@ -1,7 +1,7 @@ Niczym Picasso, zabierasz się do rysowania. Nie wiedzieć czemu, narysował-eś/aś spodnie Alladyna zrobione z tysiąca złotych cekinów! Co robisz ze spodniami? -[Spróbuj założyć](zalozyc.md) -[Przyjrzyj się spodniom](przyjrzyj/przyjrzyj.md) -[Podrzyj swój rysunek](podrzyj/podrzyj.md)) +[Spróbuj założyć](zalozyc.md)\n +[Przyjrzyj się spodniom](przyjrzyj/przyjrzyj.md)\n +[Podrzyj swój rysunek](podrzyj/podrzyj.md))\n From edb7d4200d113ce8ce4748a64314c7e06dc5f919 Mon Sep 17 00:00:00 2001 From: Neuvenen Date: Mon, 7 Dec 2015 21:09:41 +0100 Subject: [PATCH 1825/5486] Try fix new lines. --- .../zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md index 2f6a30b548..4f1e4da8aa 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md @@ -1,7 +1,9 @@ Niczym Picasso, zabierasz się do rysowania. Nie wiedzieć czemu, narysował-eś/aś spodnie Alladyna zrobione z tysiąca złotych cekinów! Co robisz ze spodniami? -[Spróbuj założyć](zalozyc.md)\n -[Przyjrzyj się spodniom](przyjrzyj/przyjrzyj.md)\n -[Podrzyj swój rysunek](podrzyj/podrzyj.md))\n +[Spróbuj założyć](zalozyc.md) + +[Przyjrzyj się spodniom](przyjrzyj/przyjrzyj.md) + +[Podrzyj swój rysunek](podrzyj/podrzyj.md) From 8ee0b505932e3ed6b0235e3c3976cfc924741ec1 Mon Sep 17 00:00:00 2001 From: Neuvenen Date: Mon, 7 Dec 2015 21:12:33 +0100 Subject: [PATCH 1826/5486] Move zalozyc into its own directory. --- .../zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md | 2 +- .../zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc.md | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc.md diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md index 2f6a30b548..a42f87b747 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md @@ -1,7 +1,7 @@ Niczym Picasso, zabierasz się do rysowania. Nie wiedzieć czemu, narysował-eś/aś spodnie Alladyna zrobione z tysiąca złotych cekinów! Co robisz ze spodniami? -[Spróbuj założyć](zalozyc.md)\n +[Spróbuj założyć](zalozyc/zalozyc.md)\n [Przyjrzyj się spodniom](przyjrzyj/przyjrzyj.md)\n [Podrzyj swój rysunek](podrzyj/podrzyj.md))\n diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc.md deleted file mode 100644 index 1a38ec065c..0000000000 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc.md +++ /dev/null @@ -1,3 +0,0 @@ -Próbujesz załozyć rysunek spodni Alladyna jak spodnie. Nie udaje Ci się to i zastanawiasz się dlaczego ... - -[Zastanow sie co zrobic dalej](spodnie.md) From 750e817d63fdf6d97c635c999fe6ab43ab6d4528 Mon Sep 17 00:00:00 2001 From: Neuvenen Date: Mon, 7 Dec 2015 21:16:39 +0100 Subject: [PATCH 1827/5486] Add przyjrzyj choice & fix zalozyc choice --- .../zagwizdaj/zmarkerem/spodnie/przyjrzyj/przyjrzyj.md | 3 +++ .../zagwizdaj/zmarkerem/spodnie/zalozyc/zalozyc.md | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/przyjrzyj/przyjrzyj.md create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc/zalozyc.md diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/przyjrzyj/przyjrzyj.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/przyjrzyj/przyjrzyj.md new file mode 100644 index 0000000000..959ed3bd67 --- /dev/null +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/przyjrzyj/przyjrzyj.md @@ -0,0 +1,3 @@ +Przyglądasz się spodniom z każdej strony próbując dostrzec coś interesującego. Jedyne czego się dowiadujesz to, że żaden z Ciebie artysta ... + +[Zastanow sie dalej co zrobic ze spodniami](../spodnie.md) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc/zalozyc.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc/zalozyc.md new file mode 100644 index 0000000000..7c2cb05788 --- /dev/null +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/zalozyc/zalozyc.md @@ -0,0 +1,3 @@ +Próbujesz załozyć rysunek spodni Alladyna jak spodnie. Nie udaje Ci się to i zastanawiasz się dlaczego ... + +[Zastanow sie co zrobic dalej](../spodnie.md) From ab408f697ab043592e93b7c3f9246c3c74f5d3da Mon Sep 17 00:00:00 2001 From: Neuvenen Date: Mon, 7 Dec 2015 21:22:52 +0100 Subject: [PATCH 1828/5486] Add podrzyj choice. --- .../zagwizdaj/zmarkerem/spodnie/podrzyj/podrzyj.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/podrzyj/podrzyj.md diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/podrzyj/podrzyj.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/podrzyj/podrzyj.md new file mode 100644 index 0000000000..6f9343f349 --- /dev/null +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/podrzyj/podrzyj.md @@ -0,0 +1,4 @@ +Drzesz swój rysunek spodni i stwierdzasz, że i tak Ci się nie podobały. + +[Zastanawiasz się co dalej zrobić z markerem](../../zmarkerem.md) + From 037aaf8f13795b0414ed244b1e1062bcd6752afe Mon Sep 17 00:00:00 2001 From: Neuvenen Date: Mon, 7 Dec 2015 21:29:44 +0100 Subject: [PATCH 1829/5486] Fix line length in przyjrzyj.md --- .../zagwizdaj/zmarkerem/spodnie/przyjrzyj/przyjrzyj.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/przyjrzyj/przyjrzyj.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/przyjrzyj/przyjrzyj.md index 959ed3bd67..e911402e7c 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/przyjrzyj/przyjrzyj.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/przyjrzyj/przyjrzyj.md @@ -1,3 +1,4 @@ -Przyglądasz się spodniom z każdej strony próbując dostrzec coś interesującego. Jedyne czego się dowiadujesz to, że żaden z Ciebie artysta ... +Przyglądasz się spodniom z każdej strony próbując dostrzec coś interesującego. +Jedyne czego się dowiadujesz to, że żaden z Ciebie artysta ... [Zastanow sie dalej co zrobic ze spodniami](../spodnie.md) From 35ad331eb249370aa88339e6172f7a9f2dd95813 Mon Sep 17 00:00:00 2001 From: Elizabeth Kipp Date: Mon, 7 Dec 2015 15:28:17 -0600 Subject: [PATCH 1830/5486] added my silly sentence --- english/utilize-wand/fork-rope-wand.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/utilize-wand/fork-rope-wand.md b/english/utilize-wand/fork-rope-wand.md index a6611ce2bb..16c2852261 100644 --- a/english/utilize-wand/fork-rope-wand.md +++ b/english/utilize-wand/fork-rope-wand.md @@ -7,3 +7,6 @@ you point your rope and fork wand to the door and firmly encant "Alohomora!" fills your nostrels and makes you gag. The door jars opens with a creak as the locking mechanism breaks. + + + I cannot be happier that this github lesson is OVER!!! From eb5765fbce95fa1835ac0e2be856b9b61476f202 Mon Sep 17 00:00:00 2001 From: Reagan Wood Date: Mon, 7 Dec 2015 19:17:56 -0600 Subject: [PATCH 1831/5486] added cchange to falkor.md --- english/appear-on-falkors-back/falkor.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/appear-on-falkors-back/falkor.md b/english/appear-on-falkors-back/falkor.md index aae2234304..e5f7027d27 100644 --- a/english/appear-on-falkors-back/falkor.md +++ b/english/appear-on-falkors-back/falkor.md @@ -10,3 +10,5 @@ Just click on the link. [Yell of exhilaration](../yearg/yearg.md) [Make a Marshmallow Cake](https://www.youtube.com/watch?v=3l1SY3QREv4) + +[Declare your allegiance to your favorite team](../nfl-chiefs/nfl-chiefs.md) From daced706b949c4c8b1fc7ab7c9647f9ee0205120 Mon Sep 17 00:00:00 2001 From: Reagan Wood Date: Mon, 7 Dec 2015 19:18:54 -0600 Subject: [PATCH 1832/5486] added nfl-chiefs.md --- english/nfl-chiefs/nfl-chiefs.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/nfl-chiefs/nfl-chiefs.md diff --git a/english/nfl-chiefs/nfl-chiefs.md b/english/nfl-chiefs/nfl-chiefs.md new file mode 100644 index 0000000000..72b8589e13 --- /dev/null +++ b/english/nfl-chiefs/nfl-chiefs.md @@ -0,0 +1,5 @@ +The Kansas City Chiefs are your favorite Football team. + +Click [here](../dance/dance.md) for yes + +Click here for no (not a possible choice - you were warned, that’s more than a Denver Broncos fan would have done) From 436f8cf987d4f430a1d598fbc7abe1bf5ea63c68 Mon Sep 17 00:00:00 2001 From: hyperov Date: Tue, 8 Dec 2015 05:52:46 +0100 Subject: [PATCH 1833/5486] add links to learn.md --- arabic/salamoAlikom.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 608b654448..1fb53ea384 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -15,3 +15,7 @@ [وظيفة](Job/Job.md) [أريد أن أحصل على Nanodegree](https://www.udacity.com/nanodegree) + + [online](earn/learn.md) عايز اعرف اسماء مواقع كورسات + + [freelancer](earn/learn.md) عايز اعرف اسماء مواقع كورسات فرى لانس From 7495f1e22bf4fd6d797cb41b5ed3c5a5754a3afc Mon Sep 17 00:00:00 2001 From: hyperov Date: Tue, 8 Dec 2015 06:01:42 +0100 Subject: [PATCH 1834/5486] add links to websites links for online courses websites as udacity and udemy links for freelancing websites --- arabic/learn/learn.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arabic/learn/learn.md b/arabic/learn/learn.md index bee5fc7d98..ffabdea52c 100644 --- a/arabic/learn/learn.md +++ b/arabic/learn/learn.md @@ -2,3 +2,19 @@ لانه يجب عليك الاستفاده من السياق الماضي وتطوير قدراتك فيه لذا ماذا تتوقع ان تفعل الان؟ قال صلى الله عليه وسلم من سلك طريقاً يلتمس فيه علماً سهل الله له طريقاً الى الجنة [و لماذا التعلم ](whylearning/speculate.md) + + امثلة مواقع الكورسات اونلاين : + +-Udacity +-coursera +-Udemy + +وفيه كتير بس انت عليك تدور + +freelancing اشهر مواقع العمل الحر + +-[UpWork](https://www.upwork.com/) + +-[freelancer](https://www.freelancer.com/) + + From c073e55ca5c72cfd112e43f8122414c85814ca2d Mon Sep 17 00:00:00 2001 From: hyperov Date: Tue, 8 Dec 2015 06:13:13 +0100 Subject: [PATCH 1835/5486] fix link --- arabic/salamoAlikom.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 1fb53ea384..94010687b7 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -16,6 +16,6 @@ [أريد أن أحصل على Nanodegree](https://www.udacity.com/nanodegree) - [online](earn/learn.md) عايز اعرف اسماء مواقع كورسات + [online](learn/learn.md) عايز اعرف اسماء مواقع كورسات - [freelancer](earn/learn.md) عايز اعرف اسماء مواقع كورسات فرى لانس + [freelancer](learn/learn.md) عايز اعرف اسماء مواقع كورسات فرى لانس From bc1edb051039900eb1ae6494de08e41f225e11da Mon Sep 17 00:00:00 2001 From: Brian Sanders Date: Mon, 7 Dec 2015 22:43:45 -0700 Subject: [PATCH 1836/5486] Add yoga statement --- english/yoga/yoga.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/yoga/yoga.md b/english/yoga/yoga.md index 7c50f20ab1..a7152914bd 100644 --- a/english/yoga/yoga.md +++ b/english/yoga/yoga.md @@ -1,6 +1,8 @@ Yoga originated in India. Starting out in child pose, you start to zoom out from the environment and take focus on your breathing. +Yoga is good for the boy and soul. + There are many types of yoga - Ashtanga, Bikram, Sivananda, Iyengar etc. Going through the poses, you feel your body warm up and you feel the energy flowing through your body. From 7622927ca161bbd63780a3058e6e9ec215184a8c Mon Sep 17 00:00:00 2001 From: woogii Date: Wed, 9 Dec 2015 12:21:12 +0900 Subject: [PATCH 1837/5486] Add an pinch option and its story --- korean/marshmallow.md | 4 +++- korean/pinch/pinch.md | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 korean/pinch/pinch.md diff --git a/korean/marshmallow.md b/korean/marshmallow.md index 5535a546b3..ef2db22242 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -32,4 +32,6 @@ [책을 읽는다] (read/read.md)? -[벽으로 돌진한다](rush/rush.md) \ No newline at end of file +[벽으로 돌진한다](rush/rush.md) + +[볼을 꼬집어 본다](pinch/pinch.md) diff --git a/korean/pinch/pinch.md b/korean/pinch/pinch.md new file mode 100644 index 0000000000..7f231156f7 --- /dev/null +++ b/korean/pinch/pinch.md @@ -0,0 +1,3 @@ +혹시 꿈을 꾸는 것은 아닌가 하는 생각에 볼을 꼬집어 봤지만 꿈이 아니었어요. + +당황하기도 잠시, 당신은 서둘러 스마트폰이 놓여 있는 책상으로 향합니다. From 9fcee00cb1dc969e577e431c0341462bfd0b221c Mon Sep 17 00:00:00 2001 From: AvivZa Date: Wed, 9 Dec 2015 11:05:23 +0200 Subject: [PATCH 1838/5486] Add details to the storty --- hebrew/sane-option/eating_marshmelow/eating.md | 2 ++ hebrew/sane-option/fresh-start.md | 5 ++++- hebrew/sane-option/run2street/run2street | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 hebrew/sane-option/eating_marshmelow/eating.md create mode 100644 hebrew/sane-option/run2street/run2street diff --git a/hebrew/sane-option/eating_marshmelow/eating.md b/hebrew/sane-option/eating_marshmelow/eating.md new file mode 100644 index 0000000000..0d22afb592 --- /dev/null +++ b/hebrew/sane-option/eating_marshmelow/eating.md @@ -0,0 +1,2 @@ +אחרי שאכלת חלק מהמרשמלו אתה מגלה שמאחורי המרשמלו באחד הקירות יש דלת סתרים, אתה דוחף אותה קלות ורואה שמבפנים בוקע אור חזק... + diff --git a/hebrew/sane-option/fresh-start.md b/hebrew/sane-option/fresh-start.md index 93aa37a259..53dc974310 100644 --- a/hebrew/sane-option/fresh-start.md +++ b/hebrew/sane-option/fresh-start.md @@ -1,3 +1,6 @@ אתה מתעורר בבוקר, ורואה קירות עשויים ממרשמלו. -ברגע הראשון, לא ברור לך מה לעשות, אבל אתה מתעשת ומחליט לעשות משהו. \ No newline at end of file +ברגע הראשון, לא ברור לך מה לעשות, אבל אתה מתעשת ומחליט לעשות משהו. + +[מתחיל לאכול את הקירות](eating_marshmelow/eating.md) +[בורח מהבית](run2street/run2dstreet.md) \ No newline at end of file diff --git a/hebrew/sane-option/run2street/run2street b/hebrew/sane-option/run2street/run2street new file mode 100644 index 0000000000..fe5d945dc9 --- /dev/null +++ b/hebrew/sane-option/run2street/run2street @@ -0,0 +1,3 @@ +אתה יוצא לרחוב ומגלה שכל השכונה נהפכה להיות עשויה ממתמקים +הבניין השכן עשוי מסוכריות +וזה שאחריו משוקולד, שכבל החל להינמס בחום היום... \ No newline at end of file From 0a21d86cc289fd341e938dd10247c26921a09135 Mon Sep 17 00:00:00 2001 From: AvivZa Date: Wed, 9 Dec 2015 11:17:20 +0200 Subject: [PATCH 1839/5486] fixed problems --- hebrew/sane-option/fresh-start.md | 3 ++- hebrew/sane-option/run2street/{run2street => run2street.md} | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) rename hebrew/sane-option/run2street/{run2street => run2street.md} (90%) diff --git a/hebrew/sane-option/fresh-start.md b/hebrew/sane-option/fresh-start.md index 53dc974310..b4d8191bf9 100644 --- a/hebrew/sane-option/fresh-start.md +++ b/hebrew/sane-option/fresh-start.md @@ -3,4 +3,5 @@ ברגע הראשון, לא ברור לך מה לעשות, אבל אתה מתעשת ומחליט לעשות משהו. [מתחיל לאכול את הקירות](eating_marshmelow/eating.md) -[בורח מהבית](run2street/run2dstreet.md) \ No newline at end of file + +[בורח מהבית](run2street/run2dstreet.md) diff --git a/hebrew/sane-option/run2street/run2street b/hebrew/sane-option/run2street/run2street.md similarity index 90% rename from hebrew/sane-option/run2street/run2street rename to hebrew/sane-option/run2street/run2street.md index fe5d945dc9..184dc0fbd9 100644 --- a/hebrew/sane-option/run2street/run2street +++ b/hebrew/sane-option/run2street/run2street.md @@ -1,3 +1,4 @@ אתה יוצא לרחוב ומגלה שכל השכונה נהפכה להיות עשויה ממתמקים הבניין השכן עשוי מסוכריות -וזה שאחריו משוקולד, שכבל החל להינמס בחום היום... \ No newline at end of file +וזה שאחריו משוקולד, שכבל החל להינמס בחום היום... + From 705335d9a633c742d5ab42497f82bddb799f78ac Mon Sep 17 00:00:00 2001 From: AvivZa Date: Wed, 9 Dec 2015 11:30:49 +0200 Subject: [PATCH 1840/5486] fixed bugs that I got from the bot --- hebrew/sane-option/eating_marshmelow/eating.md | 4 +++- hebrew/sane-option/fresh-start.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hebrew/sane-option/eating_marshmelow/eating.md b/hebrew/sane-option/eating_marshmelow/eating.md index 0d22afb592..d21e5d27c8 100644 --- a/hebrew/sane-option/eating_marshmelow/eating.md +++ b/hebrew/sane-option/eating_marshmelow/eating.md @@ -1,2 +1,4 @@ -אחרי שאכלת חלק מהמרשמלו אתה מגלה שמאחורי המרשמלו באחד הקירות יש דלת סתרים, אתה דוחף אותה קלות ורואה שמבפנים בוקע אור חזק... +אחרי שאכלת חלק מהמרשמלו אתה מגלה שמאחורי המרשמלו באחד הקירות יש דלת סתרים, אתה דוחף + +אותה קלות ורואה שמבפנים בוקע אור חזק... diff --git a/hebrew/sane-option/fresh-start.md b/hebrew/sane-option/fresh-start.md index b4d8191bf9..f10b940df5 100644 --- a/hebrew/sane-option/fresh-start.md +++ b/hebrew/sane-option/fresh-start.md @@ -4,4 +4,4 @@ [מתחיל לאכול את הקירות](eating_marshmelow/eating.md) -[בורח מהבית](run2street/run2dstreet.md) +[בורח מהבית](run2street/run2street.md) From 699d8f2cdecb07ddad20d71518478128bf51c966 Mon Sep 17 00:00:00 2001 From: Pablo Osinaga Date: Wed, 9 Dec 2015 13:40:38 +0100 Subject: [PATCH 1841/5486] Add dormir.md file to the spanish story --- espanol/cocinero/cocinero.md | 2 ++ espanol/cocinero/dormir/dormir.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 espanol/cocinero/dormir/dormir.md diff --git a/espanol/cocinero/cocinero.md b/espanol/cocinero/cocinero.md index 42e36a6e96..b35d5d1cdf 100644 --- a/espanol/cocinero/cocinero.md +++ b/espanol/cocinero/cocinero.md @@ -5,3 +5,5 @@ Beatito encontro al cocinero con cara de preocupado. [El cocinero le dijo a Beatito que no encontraba las llaves de la despensa](despensa/despensa.md) [El cocinero le dijo a Beatito que había cometido un grave error](error/error.md) + +[El cocinero se puso a dormir](dormir/dormir.md) diff --git a/espanol/cocinero/dormir/dormir.md b/espanol/cocinero/dormir/dormir.md new file mode 100644 index 0000000000..edc0e6bfc4 --- /dev/null +++ b/espanol/cocinero/dormir/dormir.md @@ -0,0 +1 @@ +Beatito deperto al cocinero \ No newline at end of file From aa7a5f6af9f23f62138fac30ae528eea682dda62 Mon Sep 17 00:00:00 2001 From: tdixon1 Date: Thu, 10 Dec 2015 15:01:00 -0500 Subject: [PATCH 1842/5486] Add line about supermarket --- english/breakfast/breakfast.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/breakfast/breakfast.md b/english/breakfast/breakfast.md index e3c1637465..8cb1b1fbfc 100644 --- a/english/breakfast/breakfast.md +++ b/english/breakfast/breakfast.md @@ -5,3 +5,6 @@ your flavoured coffee and got out from marshmallows-walled room. It is a beautif Suddenly, you start to sing your favorite song from childhood: "It's a Beautiful Day in the Neighborhood". Thereafter, you remembered the hole you made in the wall and started thinking of going back to fix it. + +You realize that the only way to fix the whole in the wall is to buy additional marshmellows. In order to do this you +have to go to the supermarket. That same supermarket that you vowed you would never return to. From e2ab1747698233c675f43505a8ffed4abe0342c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81rp=C3=A1d=20Marinovszki?= Date: Fri, 11 Dec 2015 02:23:53 +0100 Subject: [PATCH 1843/5486] Nem sikerul a reggeli --- hungarian/reggeli/reggeli.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hungarian/reggeli/reggeli.md b/hungarian/reggeli/reggeli.md index 43ee259955..d8481ee3c3 100644 --- a/hungarian/reggeli/reggeli.md +++ b/hungarian/reggeli/reggeli.md @@ -1 +1,3 @@ -Kimész a konyhába, megpróbálod elfelejteni a sok cukrot, és csinálsz egy kolbászos rántottát. \ No newline at end of file +Kimész a konyhába, megpróbálod elfelejteni a sok cukrot, és csinálsz egy kolbászos rántottát. + +Ám a hűtőben csak mályvacukorkolbászt találsz, és a tojásokat feltörve azokból mályvacukor folyik ki. \ No newline at end of file From d029016ff6a97690e8e42cfdb4bd3cb9ad4b524f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81rp=C3=A1d=20Marinovszki?= Date: Fri, 11 Dec 2015 02:50:17 +0100 Subject: [PATCH 1844/5486] Adding story to the hungarian version --- hungarian/zuhanyzas/torulkozo/torulkozo.md | 1 + 1 file changed, 1 insertion(+) diff --git a/hungarian/zuhanyzas/torulkozo/torulkozo.md b/hungarian/zuhanyzas/torulkozo/torulkozo.md index 4739108472..5472fad2e5 100644 --- a/hungarian/zuhanyzas/torulkozo/torulkozo.md +++ b/hungarian/zuhanyzas/torulkozo/torulkozo.md @@ -1,3 +1,4 @@ Megpróbálod magadról letörölni a szirupot egy törülközővel. De a törülköző hírtelen eltűnik a kezedből, és egy féreglyuk jelenik meg előtted. +A féreglyukból távoli univerzumból jött mályvacukoremberek potyognak ki. From 0cf9ee342cdedd71d960820a2cd382b7bbd04d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81rp=C3=A1d=20Marinovszki?= Date: Fri, 11 Dec 2015 02:55:00 +0100 Subject: [PATCH 1845/5486] fixing error --- hungarian/reggeli/reggeli.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hungarian/reggeli/reggeli.md b/hungarian/reggeli/reggeli.md index d8481ee3c3..43ee259955 100644 --- a/hungarian/reggeli/reggeli.md +++ b/hungarian/reggeli/reggeli.md @@ -1,3 +1 @@ -Kimész a konyhába, megpróbálod elfelejteni a sok cukrot, és csinálsz egy kolbászos rántottát. - -Ám a hűtőben csak mályvacukorkolbászt találsz, és a tojásokat feltörve azokból mályvacukor folyik ki. \ No newline at end of file +Kimész a konyhába, megpróbálod elfelejteni a sok cukrot, és csinálsz egy kolbászos rántottát. \ No newline at end of file From d6711d4a90b4e75f7abbafae779d941c7b4dc510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81rp=C3=A1d=20Marinovszki?= Date: Fri, 11 Dec 2015 02:57:05 +0100 Subject: [PATCH 1846/5486] fixing another error... - hungarian --- hungarian/zuhanyzas/torulkozo/torulkozo.md | 1 + 1 file changed, 1 insertion(+) diff --git a/hungarian/zuhanyzas/torulkozo/torulkozo.md b/hungarian/zuhanyzas/torulkozo/torulkozo.md index 5472fad2e5..d0b8377e3d 100644 --- a/hungarian/zuhanyzas/torulkozo/torulkozo.md +++ b/hungarian/zuhanyzas/torulkozo/torulkozo.md @@ -2,3 +2,4 @@ Megpróbálod magadról letörölni a szirupot egy törülközővel. De a törülköző hírtelen eltűnik a kezedből, és egy féreglyuk jelenik meg előtted. A féreglyukból távoli univerzumból jött mályvacukoremberek potyognak ki. + From 9f90dc1707117724a1269be5d97a56a02d28631f Mon Sep 17 00:00:00 2001 From: nathansnider Date: Thu, 10 Dec 2015 19:36:08 -0800 Subject: [PATCH 1847/5486] Add the impossible adventure --- english/impossible-adventure/bleep.md | 3 +++ english/impossible-adventure/bloop.md | 3 +++ english/impossible-adventure/bwetap.md | 3 +++ english/impossible-adventure/destroy.md | 5 +++++ english/impossible-adventure/start.md | 5 +++++ english/impossible-adventure/tapbwe.md | 3 +++ english/impossible-adventure/tapbwetap.md | 5 +++++ english/marshmallow.md | 2 ++ 8 files changed, 29 insertions(+) create mode 100644 english/impossible-adventure/bleep.md create mode 100644 english/impossible-adventure/bloop.md create mode 100644 english/impossible-adventure/bwetap.md create mode 100644 english/impossible-adventure/destroy.md create mode 100644 english/impossible-adventure/start.md create mode 100644 english/impossible-adventure/tapbwe.md create mode 100644 english/impossible-adventure/tapbwetap.md diff --git a/english/impossible-adventure/bleep.md b/english/impossible-adventure/bleep.md new file mode 100644 index 0000000000..5ade71f28c --- /dev/null +++ b/english/impossible-adventure/bleep.md @@ -0,0 +1,3 @@ +bleep bloop bleep... bleep bloop bleep... bleep bloop bleep... + +[...tap tap tap tap tap tap...](tapbwe.md) \ No newline at end of file diff --git a/english/impossible-adventure/bloop.md b/english/impossible-adventure/bloop.md new file mode 100644 index 0000000000..85c486f7dc --- /dev/null +++ b/english/impossible-adventure/bloop.md @@ -0,0 +1,3 @@ +bloop bleep bloop... bloop bleep bloop... bloop bleep bloop... + +[...tap tap tap tap tap tap...](bwetap.md) \ No newline at end of file diff --git a/english/impossible-adventure/bwetap.md b/english/impossible-adventure/bwetap.md new file mode 100644 index 0000000000..b8fcb936d9 --- /dev/null +++ b/english/impossible-adventure/bwetap.md @@ -0,0 +1,3 @@ +[BWEEEEEEEEEEEEEUW](tapbwe.md) + +[...tap tap tap tap tap tap...](destroy.md) \ No newline at end of file diff --git a/english/impossible-adventure/destroy.md b/english/impossible-adventure/destroy.md new file mode 100644 index 0000000000..ecab667beb --- /dev/null +++ b/english/impossible-adventure/destroy.md @@ -0,0 +1,5 @@ +DESTROY HIM, MY ROBOTS! + +bloop bleep bloop... bleep bloop bleep... bloop bleep bloop... + +[...tap tap tap tap tap tap...](tapbwetap.md) \ No newline at end of file diff --git a/english/impossible-adventure/start.md b/english/impossible-adventure/start.md new file mode 100644 index 0000000000..2ba13aebbf --- /dev/null +++ b/english/impossible-adventure/start.md @@ -0,0 +1,5 @@ +[STAY FOREVER!](https://youtu.be/i1_fDwX1VVY) + +[BWEEEEEEEEEEEEEUW](tapbwe.md) + +[...tap tap tap tap tap tap...](bloop.md) \ No newline at end of file diff --git a/english/impossible-adventure/tapbwe.md b/english/impossible-adventure/tapbwe.md new file mode 100644 index 0000000000..cd6bc698e4 --- /dev/null +++ b/english/impossible-adventure/tapbwe.md @@ -0,0 +1,3 @@ +[...tap tap tap tap tap tap...](bloop.md) + +[BWEEEEEEEEEEEEEUW](tapbwetap.md) \ No newline at end of file diff --git a/english/impossible-adventure/tapbwetap.md b/english/impossible-adventure/tapbwetap.md new file mode 100644 index 0000000000..dce9d4caae --- /dev/null +++ b/english/impossible-adventure/tapbwetap.md @@ -0,0 +1,5 @@ +[...tap tap tap tap tap tap...](bloop.md) + +[BWEEEEEEEEEEEEEUW](bwetap.md) + +[...tap tap tap tap tap tap...](bleep.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 2e7d3eae1f..1296edccf9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,5 @@ +Another visitor! [Stay a while...](impossible-adventure/start.md) + [I am the one who knocks](say-my-name/say-my-name.md) [The Secret to Life...Seriously](https://www.youtube.com/watch?v=dQw4w9WgXcQ) From e401236588d40bbb23afc845f583146e8631e869 Mon Sep 17 00:00:00 2001 From: nathansnider Date: Thu, 10 Dec 2015 19:39:16 -0800 Subject: [PATCH 1848/5486] Add a longer elevator... --- english/impossible-adventure/tapbwe.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/impossible-adventure/tapbwe.md b/english/impossible-adventure/tapbwe.md index cd6bc698e4..9e5d8d609a 100644 --- a/english/impossible-adventure/tapbwe.md +++ b/english/impossible-adventure/tapbwe.md @@ -1,3 +1,3 @@ [...tap tap tap tap tap tap...](bloop.md) -[BWEEEEEEEEEEEEEUW](tapbwetap.md) \ No newline at end of file +[BWEEEEEEEEEEEEEEEEEEEUW](tapbwetap.md) \ No newline at end of file From 125e62ba873abf5c51ab6d770b6375c20c2ff91a Mon Sep 17 00:00:00 2001 From: nathansnider Date: Thu, 10 Dec 2015 19:54:08 -0800 Subject: [PATCH 1849/5486] Fix directory structure --- english/impossible-adventure/bleep/bleep.md | 3 +++ english/impossible-adventure/bloop/bloop.md | 3 +++ english/impossible-adventure/bwetap/bwetap.md | 3 +++ english/impossible-adventure/destroy/destroy.md | 5 +++++ english/impossible-adventure/start/start.md | 5 +++++ english/impossible-adventure/tapbwe/tapbwe.md | 3 +++ english/impossible-adventure/tapbwetap/tapbwetap.md | 5 +++++ english/marshmallow.md | 2 +- 8 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 english/impossible-adventure/bleep/bleep.md create mode 100644 english/impossible-adventure/bloop/bloop.md create mode 100644 english/impossible-adventure/bwetap/bwetap.md create mode 100644 english/impossible-adventure/destroy/destroy.md create mode 100644 english/impossible-adventure/start/start.md create mode 100644 english/impossible-adventure/tapbwe/tapbwe.md create mode 100644 english/impossible-adventure/tapbwetap/tapbwetap.md diff --git a/english/impossible-adventure/bleep/bleep.md b/english/impossible-adventure/bleep/bleep.md new file mode 100644 index 0000000000..4356e949cb --- /dev/null +++ b/english/impossible-adventure/bleep/bleep.md @@ -0,0 +1,3 @@ +bleep bloop bleep... bleep bloop bleep... bleep bloop bleep... + +[...tap tap tap tap tap tap...](../tapbwe/tapbwe.md) \ No newline at end of file diff --git a/english/impossible-adventure/bloop/bloop.md b/english/impossible-adventure/bloop/bloop.md new file mode 100644 index 0000000000..6dabf79dc1 --- /dev/null +++ b/english/impossible-adventure/bloop/bloop.md @@ -0,0 +1,3 @@ +bloop bleep bloop... bloop bleep bloop... bloop bleep bloop... + +[...tap tap tap tap tap tap...](../bwetap/bwetap.md) \ No newline at end of file diff --git a/english/impossible-adventure/bwetap/bwetap.md b/english/impossible-adventure/bwetap/bwetap.md new file mode 100644 index 0000000000..6363d20a64 --- /dev/null +++ b/english/impossible-adventure/bwetap/bwetap.md @@ -0,0 +1,3 @@ +[BWEEEEEEEEEEEEEUW](../tapbwe/tapbwe.md) + +[...tap tap tap tap tap tap...](../destroy/destroy.md) \ No newline at end of file diff --git a/english/impossible-adventure/destroy/destroy.md b/english/impossible-adventure/destroy/destroy.md new file mode 100644 index 0000000000..a3ccf511a7 --- /dev/null +++ b/english/impossible-adventure/destroy/destroy.md @@ -0,0 +1,5 @@ +DESTROY HIM, MY ROBOTS! + +bloop bleep bloop... bleep bloop bleep... bloop bleep bloop... + +[...tap tap tap tap tap tap...](../tapbwetap/tapbwetap.md) \ No newline at end of file diff --git a/english/impossible-adventure/start/start.md b/english/impossible-adventure/start/start.md new file mode 100644 index 0000000000..a388b56fdd --- /dev/null +++ b/english/impossible-adventure/start/start.md @@ -0,0 +1,5 @@ +[STAY FOREVER!](https://youtu.be/i1_fDwX1VVY) + +[BWEEEEEEEEEEEEEUW](../tapbwe/tapbwe.md) + +[...tap tap tap tap tap tap...](../bloop/bloop.md) \ No newline at end of file diff --git a/english/impossible-adventure/tapbwe/tapbwe.md b/english/impossible-adventure/tapbwe/tapbwe.md new file mode 100644 index 0000000000..8c910e395b --- /dev/null +++ b/english/impossible-adventure/tapbwe/tapbwe.md @@ -0,0 +1,3 @@ +[...tap tap tap tap tap tap...](../bloop/bloop.md) + +[BWEEEEEEEEEEEEEEEEEEEUW](../tapbwetap/tapbwetap.md) \ No newline at end of file diff --git a/english/impossible-adventure/tapbwetap/tapbwetap.md b/english/impossible-adventure/tapbwetap/tapbwetap.md new file mode 100644 index 0000000000..c9dcf6d9f8 --- /dev/null +++ b/english/impossible-adventure/tapbwetap/tapbwetap.md @@ -0,0 +1,5 @@ +[...tap tap tap tap tap tap...](../bloop/bloop.md) + +[BWEEEEEEEEEEEEEUW](../bwetap/bwetap.md) + +[...tap tap tap tap tap tap...](../bleep/bleep.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 1296edccf9..940d8d182e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -Another visitor! [Stay a while...](impossible-adventure/start.md) +Another visitor! [Stay a while...](impossible-adventure/start/start.md) [I am the one who knocks](say-my-name/say-my-name.md) From 98110c2460802c7eb90f2b372ea6ec8efea7ca16 Mon Sep 17 00:00:00 2001 From: nathansnider Date: Thu, 10 Dec 2015 19:56:01 -0800 Subject: [PATCH 1850/5486] Fixing directory structure some more --- english/impossible-adventure/bleep.md | 3 --- english/impossible-adventure/bloop.md | 3 --- english/impossible-adventure/bwetap.md | 3 --- english/impossible-adventure/destroy.md | 5 ----- english/impossible-adventure/start.md | 5 ----- english/impossible-adventure/tapbwe.md | 3 --- english/impossible-adventure/tapbwetap.md | 5 ----- 7 files changed, 27 deletions(-) delete mode 100644 english/impossible-adventure/bleep.md delete mode 100644 english/impossible-adventure/bloop.md delete mode 100644 english/impossible-adventure/bwetap.md delete mode 100644 english/impossible-adventure/destroy.md delete mode 100644 english/impossible-adventure/start.md delete mode 100644 english/impossible-adventure/tapbwe.md delete mode 100644 english/impossible-adventure/tapbwetap.md diff --git a/english/impossible-adventure/bleep.md b/english/impossible-adventure/bleep.md deleted file mode 100644 index 5ade71f28c..0000000000 --- a/english/impossible-adventure/bleep.md +++ /dev/null @@ -1,3 +0,0 @@ -bleep bloop bleep... bleep bloop bleep... bleep bloop bleep... - -[...tap tap tap tap tap tap...](tapbwe.md) \ No newline at end of file diff --git a/english/impossible-adventure/bloop.md b/english/impossible-adventure/bloop.md deleted file mode 100644 index 85c486f7dc..0000000000 --- a/english/impossible-adventure/bloop.md +++ /dev/null @@ -1,3 +0,0 @@ -bloop bleep bloop... bloop bleep bloop... bloop bleep bloop... - -[...tap tap tap tap tap tap...](bwetap.md) \ No newline at end of file diff --git a/english/impossible-adventure/bwetap.md b/english/impossible-adventure/bwetap.md deleted file mode 100644 index b8fcb936d9..0000000000 --- a/english/impossible-adventure/bwetap.md +++ /dev/null @@ -1,3 +0,0 @@ -[BWEEEEEEEEEEEEEUW](tapbwe.md) - -[...tap tap tap tap tap tap...](destroy.md) \ No newline at end of file diff --git a/english/impossible-adventure/destroy.md b/english/impossible-adventure/destroy.md deleted file mode 100644 index ecab667beb..0000000000 --- a/english/impossible-adventure/destroy.md +++ /dev/null @@ -1,5 +0,0 @@ -DESTROY HIM, MY ROBOTS! - -bloop bleep bloop... bleep bloop bleep... bloop bleep bloop... - -[...tap tap tap tap tap tap...](tapbwetap.md) \ No newline at end of file diff --git a/english/impossible-adventure/start.md b/english/impossible-adventure/start.md deleted file mode 100644 index 2ba13aebbf..0000000000 --- a/english/impossible-adventure/start.md +++ /dev/null @@ -1,5 +0,0 @@ -[STAY FOREVER!](https://youtu.be/i1_fDwX1VVY) - -[BWEEEEEEEEEEEEEUW](tapbwe.md) - -[...tap tap tap tap tap tap...](bloop.md) \ No newline at end of file diff --git a/english/impossible-adventure/tapbwe.md b/english/impossible-adventure/tapbwe.md deleted file mode 100644 index 9e5d8d609a..0000000000 --- a/english/impossible-adventure/tapbwe.md +++ /dev/null @@ -1,3 +0,0 @@ -[...tap tap tap tap tap tap...](bloop.md) - -[BWEEEEEEEEEEEEEEEEEEEUW](tapbwetap.md) \ No newline at end of file diff --git a/english/impossible-adventure/tapbwetap.md b/english/impossible-adventure/tapbwetap.md deleted file mode 100644 index dce9d4caae..0000000000 --- a/english/impossible-adventure/tapbwetap.md +++ /dev/null @@ -1,5 +0,0 @@ -[...tap tap tap tap tap tap...](bloop.md) - -[BWEEEEEEEEEEEEEUW](bwetap.md) - -[...tap tap tap tap tap tap...](bleep.md) \ No newline at end of file From d87dddf5b7970ef0128511c5809a1a70422d13ce Mon Sep 17 00:00:00 2001 From: ikosan Date: Fri, 11 Dec 2015 10:20:14 +0100 Subject: [PATCH 1851/5486] add story --- .../aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/finger-ins-loch/hoelzernes-Paddel/aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md b/german/finger-ins-loch/hoelzernes-Paddel/aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md index bd4a39a95f..0079cfaef1 100644 --- a/german/finger-ins-loch/hoelzernes-Paddel/aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md +++ b/german/finger-ins-loch/hoelzernes-Paddel/aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md @@ -1 +1,3 @@ -Sie werden herzlich aufgenommen, als Held gefeiert und eingeladen mitzutanzen. \ No newline at end of file +Sie werden herzlich aufgenommen, als Held gefeiert und eingeladen mitzutanzen. +Nach ein paar Tänzen sind Sie selber so in Ekstase, dass Sie sich auf +der Stelle ein Boot, mit einem Loch, auf den Bauch tätowieren lassen. \ No newline at end of file From 54de43dbeb85704b668e851202845a3cfd1f2f9c Mon Sep 17 00:00:00 2001 From: D E Li Date: Fri, 11 Dec 2015 08:07:57 -0800 Subject: [PATCH 1852/5486] Add third option to bikeride adventure --- english/sanfran/bikeride/bikeride.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/sanfran/bikeride/bikeride.md b/english/sanfran/bikeride/bikeride.md index ac7e3d993c..5f48b265d2 100644 --- a/english/sanfran/bikeride/bikeride.md +++ b/english/sanfran/bikeride/bikeride.md @@ -7,3 +7,5 @@ and I snap a few pictures. Then I realize that biking has made me slightly hungry. Shall I purchase a [burrito](burrito/burrito.md)? Or should I continue riding? + +Go to Cafe Europa for some pork schnitzel \ No newline at end of file From 41a77605468734c000812d9dbb49863ad94f73d6 Mon Sep 17 00:00:00 2001 From: nagmak Date: Fri, 11 Dec 2015 14:14:46 -0500 Subject: [PATCH 1853/5486] Updated broken link to marshmellow.md --- english/robofriend/cuddleattack/AIattacks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/robofriend/cuddleattack/AIattacks.md b/english/robofriend/cuddleattack/AIattacks.md index f0a9ee245b..fc6b98ee68 100644 --- a/english/robofriend/cuddleattack/AIattacks.md +++ b/english/robofriend/cuddleattack/AIattacks.md @@ -6,4 +6,4 @@ It begins a countdown to activate: 5 - 4 - 3 - 2 - 1 .... AND YOU'VE BEEN CUDDLE-ATTACKED BY YOUR CloneFriend! *hugs* -You'll never be alone again. [(If that doesn't scare you, better go back)](../marshmallow.md) +You'll never be alone again. [(If that doesn't scare you, better go back)](english/marshmallow.md) From 752cf3e16f21b3b428ca425ae7a572e48cd0a796 Mon Sep 17 00:00:00 2001 From: nagmak Date: Fri, 11 Dec 2015 14:21:07 -0500 Subject: [PATCH 1854/5486] Wait, I actually fixed the broken link this time! --- english/robofriend/cuddleattack/AIattacks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/robofriend/cuddleattack/AIattacks.md b/english/robofriend/cuddleattack/AIattacks.md index fc6b98ee68..32af34c12f 100644 --- a/english/robofriend/cuddleattack/AIattacks.md +++ b/english/robofriend/cuddleattack/AIattacks.md @@ -6,4 +6,4 @@ It begins a countdown to activate: 5 - 4 - 3 - 2 - 1 .... AND YOU'VE BEEN CUDDLE-ATTACKED BY YOUR CloneFriend! *hugs* -You'll never be alone again. [(If that doesn't scare you, better go back)](english/marshmallow.md) +You'll never be alone again. [(If that doesn't scare you, better go back)](../../marshmallow.md) From 614b1b059ed5e4541e76d7c444cf5b57ebb22847 Mon Sep 17 00:00:00 2001 From: AliGhahraei Date: Fri, 11 Dec 2015 16:10:42 -0600 Subject: [PATCH 1855/5486] Add "listen to tales of the inexpressable" option to marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 4bc9387cf9..cb54a06495 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -209,6 +209,8 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: +[Listen to Tales of the Inexpressable (By Shpongle)](https://www.youtube.com/watch?v=6WTxC8wnXQo) + [Watch the new Star Wars trailer](https://www.youtube.com/watch?v=sGbxmsDFVnE) [Watch the second new Star Wars trailer](https://www.youtube.com/watch?v=ngElkyQ6Rhs) From d3aa2779f8761ec45fdcbf39df63f606106ea3d1 Mon Sep 17 00:00:00 2001 From: Samantha Britney Date: Fri, 11 Dec 2015 16:46:31 -0800 Subject: [PATCH 1856/5486] Add parliment reference to London --- english/soar/fly-to-london/fly-to-london.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/soar/fly-to-london/fly-to-london.md b/english/soar/fly-to-london/fly-to-london.md index 0a9a2ba875..54d123e666 100644 --- a/english/soar/fly-to-london/fly-to-london.md +++ b/english/soar/fly-to-london/fly-to-london.md @@ -2,6 +2,8 @@ You fly all the way to London, which is quite a distance. So you decide to take a break and sit down on Big Ben. +Hey look! It's the Parliment! + Just then, you realize that you have forgotten your pint. You choose to: From 5e156a15e613a9f3b6e0cadd975def3614a95aad Mon Sep 17 00:00:00 2001 From: Chambito Date: Sat, 12 Dec 2015 00:28:44 -0500 Subject: [PATCH 1857/5486] Agregando mi aventura, y entonces decidio bailar salsa --- espanol/bailar/bailar.md | 4 +++- espanol/bailar/salsa/salsa.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 espanol/bailar/salsa/salsa.md diff --git a/espanol/bailar/bailar.md b/espanol/bailar/bailar.md index ea71af8f25..d3a528e90a 100644 --- a/espanol/bailar/bailar.md +++ b/espanol/bailar/bailar.md @@ -6,4 +6,6 @@ Saco la guitarra y empezo a charanguear mientras saltaba en una pata al grito de [Beatito sacó una pandereta y le acompañó cantando](musica/pandereta.md) -[Beatito decidió matar al consejero](matar/matar.md) \ No newline at end of file +[Beatito decidió matar al consejero](matar/matar.md) + +[Beatito muy feliz decidió que su cuerpo exprese su alegría bailando](salsa/salsa.md) \ No newline at end of file diff --git a/espanol/bailar/salsa/salsa.md b/espanol/bailar/salsa/salsa.md new file mode 100644 index 0000000000..04af3bd811 --- /dev/null +++ b/espanol/bailar/salsa/salsa.md @@ -0,0 +1 @@ +Alegre por librarse del imprudente consejero, saco a bailar a su esposa una salsita de Frankie Ruiz, el papá de la salsa Ok. \ No newline at end of file From 820506af2d94511325177ca28bec04f5a168e15d Mon Sep 17 00:00:00 2001 From: Chambito Date: Sat, 12 Dec 2015 00:44:52 -0500 Subject: [PATCH 1858/5486] Cada linea de tener como maximo 120 caracteres --- espanol/bailar/salsa/salsa.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/bailar/salsa/salsa.md b/espanol/bailar/salsa/salsa.md index 04af3bd811..47bb57d766 100644 --- a/espanol/bailar/salsa/salsa.md +++ b/espanol/bailar/salsa/salsa.md @@ -1 +1,2 @@ -Alegre por librarse del imprudente consejero, saco a bailar a su esposa una salsita de Frankie Ruiz, el papá de la salsa Ok. \ No newline at end of file +Alegre por librarse del imprudente consejero, saco a bailar a su esposa una salsita de Frankie Ruiz, +el papá de la salsa Ok, Amor y Paz para todos. \ No newline at end of file From a8070b5fd9c9b809626e6ee61aac28b1cb3e8a9f Mon Sep 17 00:00:00 2001 From: Thomas Grusz Date: Sat, 12 Dec 2015 09:46:36 +0100 Subject: [PATCH 1859/5486] =?UTF-8?q?Kehre=20von=20der=20Meerjungfrau=20zu?= =?UTF-8?q?r=C3=BCck=20ins=20Boot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Korallen/Hoehle/Meerjungfrau/meerjungfrau.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Korallen/Hoehle/Meerjungfrau/meerjungfrau.md b/german/Korallen/Hoehle/Meerjungfrau/meerjungfrau.md index 96be15ad92..e66697ff55 100644 --- a/german/Korallen/Hoehle/Meerjungfrau/meerjungfrau.md +++ b/german/Korallen/Hoehle/Meerjungfrau/meerjungfrau.md @@ -5,4 +5,6 @@ auf Sie zu. Es ist eine Frau! Nein, ein Fisch! Halb Frau, halb Fisch! Die Meerjungfrau schwimmt auf Sie zu und gibt Ihnen zu verstehen, dass Sie Ihnen Luft zum atmen geben will. Sie kommt auf Sie zu und legt Ihre Lippen sanft auf Ihre und... -Wie geht es weiter? \ No newline at end of file +Wie geht es weiter? + +...und sie gibt Ihnen eine Lunge voll Luft, die ausreicht, um wieder zurück ins Boot zu kehren. \ No newline at end of file From cf5f145525c57734e671e7fb248149eca464deba Mon Sep 17 00:00:00 2001 From: ashok Date: Sat, 12 Dec 2015 12:06:59 -0600 Subject: [PATCH 1860/5486] Added story for travel destinations --- english/marshmallow.md | 4 ++++ english/travel-destinations/spring/spring.md | 2 ++ english/travel-destinations/travel-destinations.md | 7 +++++++ 3 files changed, 13 insertions(+) create mode 100644 english/travel-destinations/spring/spring.md create mode 100644 english/travel-destinations/travel-destinations.md diff --git a/english/marshmallow.md b/english/marshmallow.md index cb54a06495..1df6f819ce 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,7 @@ +You are are man (or woman) for all seasons but need help in choosing +your travel destinations.. Of course we are happy to help you with these +[suggestions](travel-destinations/travel-destinations.md) + Another visitor! [Stay a while...](impossible-adventure/start/start.md) [I am the one who knocks](say-my-name/say-my-name.md) diff --git a/english/travel-destinations/spring/spring.md b/english/travel-destinations/spring/spring.md new file mode 100644 index 0000000000..f54099bbb7 --- /dev/null +++ b/english/travel-destinations/spring/spring.md @@ -0,0 +1,2 @@ +Awaken your spirits by going to [Yosemite National Park](http://www.yosemitepark.com/) + diff --git a/english/travel-destinations/travel-destinations.md b/english/travel-destinations/travel-destinations.md new file mode 100644 index 0000000000..1ec6e5a640 --- /dev/null +++ b/english/travel-destinations/travel-destinations.md @@ -0,0 +1,7 @@ +It's glorious Spring! Here are some great [destinations](spring/spring.md): + +It's Summer! Time to explore these places: + +Fall is a great season to take a vacation in any of these spots: + +It's frosty winter.. but these places can be excitng: \ No newline at end of file From 5a514938fa60db444dddc17f30130b1ca2633ad8 Mon Sep 17 00:00:00 2001 From: Passionate Androiden Date: Mon, 14 Dec 2015 00:31:05 +0530 Subject: [PATCH 1861/5486] Added one more line to the malayalam story --- Malayalam/malayalam.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index a2421d5adf..1f7dd2f11b 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -1,3 +1,5 @@ ഞാൻ ഒരു മലയാളി. ഒരു സാഹസിക യാത്രയുടെ തുടക്കം. -ഇത് ഒരു നല്ല [കുട്ടിയുടെ](boy/life.md) കഥയാണ് \ No newline at end of file +ഇത് ഒരു നല്ല [കുട്ടിയുടെ](boy/life.md) കഥയാണ് + +ആ കുട്ടിയുടെ പേരാണു ടിന്റു മോൻ \ No newline at end of file From 7392e0678d570e38939125a731dbcff4486a7804 Mon Sep 17 00:00:00 2001 From: Passionate Androiden Date: Mon, 14 Dec 2015 00:43:14 +0530 Subject: [PATCH 1862/5486] Added boy's character details --- Malayalam/malayalam.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index a2421d5adf..fe064a5e37 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -1,3 +1,5 @@ ഞാൻ ഒരു മലയാളി. ഒരു സാഹസിക യാത്രയുടെ തുടക്കം. -ഇത് ഒരു നല്ല [കുട്ടിയുടെ](boy/life.md) കഥയാണ് \ No newline at end of file +ഇത് ഒരു നല്ല [കുട്ടിയുടെ](boy/life.md) കഥയാണ് + +ടിന്റു മോൻ മിടുമിടുക്കനായിരുന്നു \ No newline at end of file From d5c8cb8e848a1a9c876a8fe4e6ccf0b6c4446ca4 Mon Sep 17 00:00:00 2001 From: Ari Chasnoff Date: Sun, 13 Dec 2015 12:28:38 -0800 Subject: [PATCH 1863/5486] Add sentence about feeling overwhelmed. --- english/soar/fly-to-london/fly-to-london.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/soar/fly-to-london/fly-to-london.md b/english/soar/fly-to-london/fly-to-london.md index 54d123e666..91727fa5bc 100644 --- a/english/soar/fly-to-london/fly-to-london.md +++ b/english/soar/fly-to-london/fly-to-london.md @@ -1,5 +1,7 @@ You fly all the way to London, which is quite a distance. +You have never been to this city before and feel overwhelmed. + So you decide to take a break and sit down on Big Ben. Hey look! It's the Parliment! From 22c463595fcfb5671c17e9efced6b96be6f5c441 Mon Sep 17 00:00:00 2001 From: Ben Stewart Date: Mon, 14 Dec 2015 20:15:19 +1300 Subject: [PATCH 1864/5486] Add GoT reference --- english/magic/magic.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/magic/magic.md b/english/magic/magic.md index 590550f7f4..bca709b8fa 100644 --- a/english/magic/magic.md +++ b/english/magic/magic.md @@ -7,4 +7,5 @@ Voldemort hates smores -- knowledge is power [Wave your magic wand](../movie-ripoffs/hogwarts/hogwarts.md) You are now in the Kings Landing, looking at the Mad King on the Iron throne. -I am coming for you mad king. For I am the mother of dragons \ No newline at end of file +I am coming for you mad king. For I am the mother of dragons +What is dead may never die! From e078107be184c528453c726047f4522ca7106e90 Mon Sep 17 00:00:00 2001 From: unknown <2218607244@qq.com> Date: Mon, 14 Dec 2015 17:59:06 +0800 Subject: [PATCH 1865/5486] NotaVirgin's story --- Chinese/NotaVirgin/NotaVirgin.md | 4 ++++ "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 Chinese/NotaVirgin/NotaVirgin.md diff --git a/Chinese/NotaVirgin/NotaVirgin.md b/Chinese/NotaVirgin/NotaVirgin.md new file mode 100644 index 0000000000..eb47d546e2 --- /dev/null +++ b/Chinese/NotaVirgin/NotaVirgin.md @@ -0,0 +1,4 @@ +马特达萌，曾经是一个孤儿，在多个家庭间不停寄养，心理有了阴影，却有着惊人的数学能力。被心理老师治愈后却放弃了天赋去找小苹果，没找到后痛心疾首去参军。 +多个兄弟在战争中丧生，米国政府不得不派出一队人前往救援，救援成功。 +达萌同学发挥了自己的数学才能，读成了物理博士。并率队寻找殖民星球拯救地球。却因为怕死欺骗了NASA的科学家，最终因为操作失误被甩出飞船，掉落至火星。 +咦，这不是他前世练出火眼金睛的地方嘛。最终在地球新人类的帮助下成功回到了地球，将种土豆的技术传给了只会种玉米的地球人。 \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 37adef021e..daa35afe0a 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -65,3 +65,5 @@ [三體人](CK/CK.md) [胡八一](摸金校尉/摸金校尉.md) + +[马特达萌](NotaVirgin/NotaVirgin.md) From 556ef8ae2f3ee6cc3c3240f48df431a626dac819 Mon Sep 17 00:00:00 2001 From: michaelsandahl Date: Mon, 14 Dec 2015 06:59:15 -0500 Subject: [PATCH 1866/5486] Add new line to description --- english/soar/soar.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/soar/soar.md b/english/soar/soar.md index 968e35d49d..01c378ff46 100644 --- a/english/soar/soar.md +++ b/english/soar/soar.md @@ -1,5 +1,6 @@ You feel a rush of excitement as you soar through the air like a bird. No, not like a bird, like a jet! +Maybe not quite like a jet. More like a twin prop floatplane. With the ground moving rapidly past you. From 168970bf5b12a1c0c4d50139c6fda3dd5f82aae0 Mon Sep 17 00:00:00 2001 From: D E Li Date: Mon, 14 Dec 2015 06:41:57 -0800 Subject: [PATCH 1867/5486] Replace F-Troop with Meet the Press --- english/watch-movie/Up.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/watch-movie/Up.md b/english/watch-movie/Up.md index 3b0ab9789e..88fccdbace 100644 --- a/english/watch-movie/Up.md +++ b/english/watch-movie/Up.md @@ -1,4 +1,4 @@ You decided to asked the marshmallow to watch your favourite movie Up with you. Halfway through the movie, the marshmallow walks out. -You change the TV to F-Troop and it comes back in and sits down. +You change the TV to Meet the Press and it comes back in and sits down. Turns out it loves Agarn! \ No newline at end of file From ac91c7897dc33c12189daa1a0c5d91fc19b34c31 Mon Sep 17 00:00:00 2001 From: Jose Pria Date: Mon, 14 Dec 2015 13:42:16 -0800 Subject: [PATCH 1868/5486] add my part of story --- espanol/canudos.md | 2 ++ espanol/explosion/explosion.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 espanol/explosion/explosion.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 1495a63602..41014c9530 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -89,3 +89,5 @@ el Consejero: [Saco de su bolsillo un extraño artefacto y se lo dio a Beatito](artefacto/artefacto.md) Al ojearlo, una duda lo emabargó...[¿Qué hago?](duda/duda.md) + +Al despertar y enfocar la vista vió lo que había sucedido tras la explosión [que pasó?](explosion/explosion.md) diff --git a/espanol/explosion/explosion.md b/espanol/explosion/explosion.md new file mode 100644 index 0000000000..e3d2a7f8f8 --- /dev/null +++ b/espanol/explosion/explosion.md @@ -0,0 +1 @@ +El cuarto había quedado en escombros y el consejero había desaparecido, el propio Beatito fue el único que no sufrió ningún cambio. \ No newline at end of file From ef439d4ad692a48f523ae39cfd47468ae8288e58 Mon Sep 17 00:00:00 2001 From: Jose Pria Date: Mon, 14 Dec 2015 15:03:52 -0800 Subject: [PATCH 1869/5486] edit to 120 characters per line --- espanol/canudos.md | 3 ++- espanol/explosion/explosion.md | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 41014c9530..6b96cb6e1a 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -90,4 +90,5 @@ el Consejero: Al ojearlo, una duda lo emabargó...[¿Qué hago?](duda/duda.md) -Al despertar y enfocar la vista vió lo que había sucedido tras la explosión [que pasó?](explosion/explosion.md) +Al despertar y enfocar la vista vió lo que había sucedido tras la +explosión [que pasó?](explosion/explosion.md) diff --git a/espanol/explosion/explosion.md b/espanol/explosion/explosion.md index e3d2a7f8f8..e8823e0b68 100644 --- a/espanol/explosion/explosion.md +++ b/espanol/explosion/explosion.md @@ -1 +1,3 @@ -El cuarto había quedado en escombros y el consejero había desaparecido, el propio Beatito fue el único que no sufrió ningún cambio. \ No newline at end of file +El cuarto había quedado en escombros y el consejero +había desaparecido, el propio Beatito fue el único +que no sufrió ningún cambio. \ No newline at end of file From 27787c290a3d59bfe6de6f2ce37bcc62cf7ef393 Mon Sep 17 00:00:00 2001 From: Dioscuri Date: Mon, 14 Dec 2015 23:41:28 -0800 Subject: [PATCH 1870/5486] Add sentence to 2spooky.md --- english/2spooky/2spooky.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index 1cb88ef9fc..856e8cd5bf 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -1,5 +1,7 @@ "doot doot!" - mr. skeltal +good bones and calcium are in your future! + plz updoot mr. skeltal is nice! From 446d0103b671ddd0f062a6e0d324f11bbaa517b4 Mon Sep 17 00:00:00 2001 From: kriss Date: Tue, 15 Dec 2015 15:53:49 +0100 Subject: [PATCH 1871/5486] Add krawat choice --- Polish/przygoda/jedzenie/korwin/korwin.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Polish/przygoda/jedzenie/korwin/korwin.md b/Polish/przygoda/jedzenie/korwin/korwin.md index a27dc008a5..afa93d5cbf 100644 --- a/Polish/przygoda/jedzenie/korwin/korwin.md +++ b/Polish/przygoda/jedzenie/korwin/korwin.md @@ -4,4 +4,6 @@ Wygrałeś Niedługo koronacja Korwina na krula wszechświata. Jaki prezent podarujesz swojemu monarsze? -[Złoty rewolwer](prezent/rewolwer.md) \ No newline at end of file +[Złoty rewolwer](prezent/rewolwer.md) + +[Złoty krawat](prezent2/krawat.md) \ No newline at end of file From 4819c2f42f8150bbe49b784acf3b6aaf8537fd17 Mon Sep 17 00:00:00 2001 From: kriss Date: Tue, 15 Dec 2015 15:57:33 +0100 Subject: [PATCH 1872/5486] Add prezent2 story --- Polish/przygoda/jedzenie/korwin/prezent2/krawat.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Polish/przygoda/jedzenie/korwin/prezent2/krawat.md diff --git a/Polish/przygoda/jedzenie/korwin/prezent2/krawat.md b/Polish/przygoda/jedzenie/korwin/prezent2/krawat.md new file mode 100644 index 0000000000..98eec0acc8 --- /dev/null +++ b/Polish/przygoda/jedzenie/korwin/prezent2/krawat.md @@ -0,0 +1 @@ +Prezent nie przypadł do gustu suwerenowi. Odzyskujesz przytomność w celi. \ No newline at end of file From 3f1e63d57d470967152d10a61afd28fd42b26436 Mon Sep 17 00:00:00 2001 From: Jeremiah Richter Date: Tue, 15 Dec 2015 11:53:04 -0500 Subject: [PATCH 1873/5486] Add story branch to eatmarshmallow.md in bird-salvation/bird.md --- english/bird-salvation/bird.md | 6 ++++++ english/eatmarshmallow/eatmarshmallow.md | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 english/bird-salvation/bird.md diff --git a/english/bird-salvation/bird.md b/english/bird-salvation/bird.md new file mode 100644 index 0000000000..c976c10146 --- /dev/null +++ b/english/bird-salvation/bird.md @@ -0,0 +1,6 @@ + All of a sudden, a bird swoops down, big as a bus, and snatches the +marshmallow right off of you. + + Amazed, you sit in silence at the mythical animal you just witnessed ... +as well as trying to catch your breath...and, in the distance, glimpse +what appears to be a horse with a horn sprouting from its forehead... diff --git a/english/eatmarshmallow/eatmarshmallow.md b/english/eatmarshmallow/eatmarshmallow.md index 64b5d8a65a..dbf89d8a2c 100644 --- a/english/eatmarshmallow/eatmarshmallow.md +++ b/english/eatmarshmallow/eatmarshmallow.md @@ -1,3 +1,5 @@ You charge the Marshmallows with your mouth wide open, ready to eat them. They decide to simply jump you and pin you to the ground, suffocating you. The End. + +[Or is it?](../bird-salvation/bird.md) From 948058cafe3ebe8937e500284eea583382f91db0 Mon Sep 17 00:00:00 2001 From: Kelly Loyd Date: Wed, 16 Dec 2015 10:48:56 +1100 Subject: [PATCH 1874/5486] Add train-ride --- english/marshmallow.md | 3 +++ english/train-ride/train-ride.md | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 english/train-ride/train-ride.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 1df6f819ce..48b9bb56a0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -680,3 +680,6 @@ to you when you speak to it. So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... >>>>>>> deb66146d3bd0481a4c19d27b8ef289b939d4156 + +["Train Ride!"] (train-ride/train-ride.md) + diff --git a/english/train-ride/train-ride.md b/english/train-ride/train-ride.md new file mode 100644 index 0000000000..1cae34f6da --- /dev/null +++ b/english/train-ride/train-ride.md @@ -0,0 +1,5 @@ +You are standing in front of a fire breathing, steam spitting locomotive. The Engineer grabs you by the collar and whisks you into the cab. + +"Grab that shovel and start loading the fire with coal!", he bellows at you. "Keep your eye on the water gauge and work the injector! All right? Let's go!" + +The Engineer hauls back on the throttle, gives a blast on the whistle and before you know it, you're feeding the beast with black gold as it accelerates in a cloud of smoke and steam vapor, rolling along the country side flowing past in a blur of speed. From ea46ce5946863bc7fdace97df80d71fe2d3b69d1 Mon Sep 17 00:00:00 2001 From: Kelly Loyd Date: Wed, 16 Dec 2015 11:29:51 +1100 Subject: [PATCH 1875/5486] Corrected line lengths to be in line with story standards. --- english/train-ride/train-ride.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/english/train-ride/train-ride.md b/english/train-ride/train-ride.md index 1cae34f6da..d5fdb767bd 100644 --- a/english/train-ride/train-ride.md +++ b/english/train-ride/train-ride.md @@ -1,5 +1,10 @@ -You are standing in front of a fire breathing, steam spitting locomotive. The Engineer grabs you by the collar and whisks you into the cab. +You are standing in front of a fire breathing, steam spitting locomotive. +The Engineer grabs you by the collar and whisks you into the cab. -"Grab that shovel and start loading the fire with coal!", he bellows at you. "Keep your eye on the water gauge and work the injector! All right? Let's go!" +"Grab that shovel and start loading the fire with coal!", he bellows at you. +"Keep your eye on the water gauge and work the injector! All right? Let's go!" -The Engineer hauls back on the throttle, gives a blast on the whistle and before you know it, you're feeding the beast with black gold as it accelerates in a cloud of smoke and steam vapor, rolling along the country side flowing past in a blur of speed. +The Engineer hauls back on the throttle, gives a blast on the whistle and +before you know it, you're feeding the beast with black gold as it accelerates +in a cloud of smoke and steam vapor, rolling along the country side flowing +past in a blur of speed. From eba39d35e1db389147b4b57306cff08042c74ddd Mon Sep 17 00:00:00 2001 From: Dale Crane Date: Tue, 15 Dec 2015 20:07:18 -0800 Subject: [PATCH 1876/5486] Add bathtub filled with hot chocolate to pillow-problems --- .../pillow-problems/pillow-problems.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/count-the-marshmellows/eat-all-the-marshmellows/pillow-problems/pillow-problems.md b/english/count-the-marshmellows/eat-all-the-marshmellows/pillow-problems/pillow-problems.md index 6e644875ee..e6059b6643 100644 --- a/english/count-the-marshmellows/eat-all-the-marshmellows/pillow-problems/pillow-problems.md +++ b/english/count-the-marshmellows/eat-all-the-marshmellows/pillow-problems/pillow-problems.md @@ -9,4 +9,6 @@ itself, now reduced to shards? You fumble through its remnants and find the tag: experimental material. Not for consumption. If swallowed, call 1-888-285-20" Wait, "experimental?" You've chewed off the last 2 digits, and your stomach isn't feeling so right suddenly. Now what? You recall that California is in the midst of a drought, so what will help is a nice large glass -of water. You survey the room again, looking for something cool and refreshing. \ No newline at end of file +of water. You survey the room again, looking for something cool and refreshing. + +You spot a bathtub filled with hot chocolate. It won't be cool or refreshing, but you don't have time. You lean over it, cup your hand, and drink rapidly. Your buddy looks at you incredulously. "What?" you ask nervously. \ No newline at end of file From c7adb9f3f4502943b63a44cda3e72178594a9aeb Mon Sep 17 00:00:00 2001 From: Dale Crane Date: Tue, 15 Dec 2015 20:16:07 -0800 Subject: [PATCH 1877/5486] Change line size to less than 120 characters --- .../pillow-problems/pillow-problems.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/count-the-marshmellows/eat-all-the-marshmellows/pillow-problems/pillow-problems.md b/english/count-the-marshmellows/eat-all-the-marshmellows/pillow-problems/pillow-problems.md index e6059b6643..e96fcdfc75 100644 --- a/english/count-the-marshmellows/eat-all-the-marshmellows/pillow-problems/pillow-problems.md +++ b/english/count-the-marshmellows/eat-all-the-marshmellows/pillow-problems/pillow-problems.md @@ -11,4 +11,5 @@ You've chewed off the last 2 digits, and your stomach isn't feeling so right sud You recall that California is in the midst of a drought, so what will help is a nice large glass of water. You survey the room again, looking for something cool and refreshing. -You spot a bathtub filled with hot chocolate. It won't be cool or refreshing, but you don't have time. You lean over it, cup your hand, and drink rapidly. Your buddy looks at you incredulously. "What?" you ask nervously. \ No newline at end of file +You spot a bathtub filled with hot chocolate. It won't be cool or refreshing, but you don't have time. +You lean over it, cup your hand, and drink rapidly. Your buddy looks at you incredulously. "What?" you ask nervously. \ No newline at end of file From f11dffcc3c040ed5877be3034b73b25ce8bc3c20 Mon Sep 17 00:00:00 2001 From: Daniel Shao Date: Wed, 16 Dec 2015 00:17:58 -0800 Subject: [PATCH 1878/5486] Updated 'start-licking-yourself' story to introduce marshmellow dog. --- .../start-licking-yourself/Alba/alba.md | 2 ++ .../start-licking-yourself/Betsy/betsy.md | 2 ++ .../start-licking-yourself/Charlene/charlene.md | 2 ++ .../start-licking-yourself/start-licking-yourself.md | 12 ++++++++++++ 4 files changed, 18 insertions(+) create mode 100644 english/light-fire/stop-drop-roll/start-licking-yourself/Alba/alba.md create mode 100644 english/light-fire/stop-drop-roll/start-licking-yourself/Betsy/betsy.md create mode 100644 english/light-fire/stop-drop-roll/start-licking-yourself/Charlene/charlene.md diff --git a/english/light-fire/stop-drop-roll/start-licking-yourself/Alba/alba.md b/english/light-fire/stop-drop-roll/start-licking-yourself/Alba/alba.md new file mode 100644 index 0000000000..f3015059fd --- /dev/null +++ b/english/light-fire/stop-drop-roll/start-licking-yourself/Alba/alba.md @@ -0,0 +1,2 @@ + +You decide to call the marshmellow dog Alba. \ No newline at end of file diff --git a/english/light-fire/stop-drop-roll/start-licking-yourself/Betsy/betsy.md b/english/light-fire/stop-drop-roll/start-licking-yourself/Betsy/betsy.md new file mode 100644 index 0000000000..1170bdfc23 --- /dev/null +++ b/english/light-fire/stop-drop-roll/start-licking-yourself/Betsy/betsy.md @@ -0,0 +1,2 @@ + +You decide to name the marshmellow dog Betsy. \ No newline at end of file diff --git a/english/light-fire/stop-drop-roll/start-licking-yourself/Charlene/charlene.md b/english/light-fire/stop-drop-roll/start-licking-yourself/Charlene/charlene.md new file mode 100644 index 0000000000..7a76587272 --- /dev/null +++ b/english/light-fire/stop-drop-roll/start-licking-yourself/Charlene/charlene.md @@ -0,0 +1,2 @@ + +You decide to name the marshmellow dog Charlene. \ No newline at end of file diff --git a/english/light-fire/stop-drop-roll/start-licking-yourself/start-licking-yourself.md b/english/light-fire/stop-drop-roll/start-licking-yourself/start-licking-yourself.md index 0371a33aa9..b09cbcfeb4 100644 --- a/english/light-fire/stop-drop-roll/start-licking-yourself/start-licking-yourself.md +++ b/english/light-fire/stop-drop-roll/start-licking-yourself/start-licking-yourself.md @@ -1,2 +1,14 @@ You are covered in thick marshmallow and stuck to the floor. You make an attempt to lick-your-way-out. + +Out of the goop emerges a marshmellow dog. The dog apparently has better licking skills than you. She licks you clean in no time. + +Free from the floor at last, you rise to your feet and gaze appreciatively at the dog. You decide it's probably best not to risk petting her, seeing as she's made out of marshmellow and all. + +You decide you want to name her. Do you call her: + +[Alba](./alba/alba.md)? + +[Betsy](./betsy/betsy.md)? + +[Charlene](./charlene/charlene.md)? \ No newline at end of file From e29989350eaf127299e4a43d71324ff586ba9986 Mon Sep 17 00:00:00 2001 From: Daniel Shao Date: Wed, 16 Dec 2015 00:24:45 -0800 Subject: [PATCH 1879/5486] Fixed formatting and link errors based on feedback from Casey --- .../start-licking-yourself/start-licking-yourself.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/english/light-fire/stop-drop-roll/start-licking-yourself/start-licking-yourself.md b/english/light-fire/stop-drop-roll/start-licking-yourself/start-licking-yourself.md index b09cbcfeb4..92d2bec2d8 100644 --- a/english/light-fire/stop-drop-roll/start-licking-yourself/start-licking-yourself.md +++ b/english/light-fire/stop-drop-roll/start-licking-yourself/start-licking-yourself.md @@ -1,14 +1,16 @@ You are covered in thick marshmallow and stuck to the floor. You make an attempt to lick-your-way-out. -Out of the goop emerges a marshmellow dog. The dog apparently has better licking skills than you. She licks you clean in no time. +Out of the goop emerges a marshmellow dog. +The dog apparently has better licking skills than you. She licks you clean in no time. -Free from the floor at last, you rise to your feet and gaze appreciatively at the dog. You decide it's probably best not to risk petting her, seeing as she's made out of marshmellow and all. +Free from the floor at last, you rise to your feet and gaze appreciatively at the dog. +You decide it's probably best not to risk petting her, seeing as she's made out of marshmellow and all. You decide you want to name her. Do you call her: -[Alba](./alba/alba.md)? +[Alba](../Alba/alba.md)? -[Betsy](./betsy/betsy.md)? +[Betsy](../Betsy/betsy.md)? -[Charlene](./charlene/charlene.md)? \ No newline at end of file +[Charlene](../Charlene/charlene.md)? \ No newline at end of file From f3f6a3b593c01de927355ebba5d567ef9fd4b477 Mon Sep 17 00:00:00 2001 From: Daniel Shao Date: Wed, 16 Dec 2015 00:25:40 -0800 Subject: [PATCH 1880/5486] Referenced the wrong directory --- .../start-licking-yourself/start-licking-yourself.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/light-fire/stop-drop-roll/start-licking-yourself/start-licking-yourself.md b/english/light-fire/stop-drop-roll/start-licking-yourself/start-licking-yourself.md index 92d2bec2d8..2255b06d0b 100644 --- a/english/light-fire/stop-drop-roll/start-licking-yourself/start-licking-yourself.md +++ b/english/light-fire/stop-drop-roll/start-licking-yourself/start-licking-yourself.md @@ -9,8 +9,8 @@ You decide it's probably best not to risk petting her, seeing as she's made out You decide you want to name her. Do you call her: -[Alba](../Alba/alba.md)? +[Alba](./Alba/alba.md)? -[Betsy](../Betsy/betsy.md)? +[Betsy](./Betsy/betsy.md)? -[Charlene](../Charlene/charlene.md)? \ No newline at end of file +[Charlene](./Charlene/charlene.md)? \ No newline at end of file From 4bdd7359bbb7659d4b3f13dc13ea448e0b3b1830 Mon Sep 17 00:00:00 2001 From: Xiaofan Date: Wed, 16 Dec 2015 13:45:47 -0800 Subject: [PATCH 1881/5486] added ginger peachy keen at bean there cafe to bikeride.md --- english/sanfran/bikeride/ginger-peachy-keen.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 english/sanfran/bikeride/ginger-peachy-keen.md diff --git a/english/sanfran/bikeride/ginger-peachy-keen.md b/english/sanfran/bikeride/ginger-peachy-keen.md new file mode 100644 index 0000000000..d4caac18ca --- /dev/null +++ b/english/sanfran/bikeride/ginger-peachy-keen.md @@ -0,0 +1,9 @@ +It's deliriously delicious! + +Let's try something else. + +What about some Morning Jade? + +Or some Explosive Euphoria? + +Let's continue our [bike ride](bikeride.md). \ No newline at end of file From de7f32018c9bd9815c54f1d33a917737f12bb56d Mon Sep 17 00:00:00 2001 From: Xiaofan Date: Wed, 16 Dec 2015 13:46:22 -0800 Subject: [PATCH 1882/5486] forgot to commit 1 of the 2 updated files --- english/sanfran/bikeride/bikeride.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/sanfran/bikeride/bikeride.md b/english/sanfran/bikeride/bikeride.md index 5f48b265d2..9705add727 100644 --- a/english/sanfran/bikeride/bikeride.md +++ b/english/sanfran/bikeride/bikeride.md @@ -8,4 +8,8 @@ Then I realize that biking has made me slightly hungry. Shall I purchase a [burrito](burrito/burrito.md)? Or should I continue riding? +Let's ride to the wonderful intersection of Haight and Fillmore. + +Go to Bean There Cafe for some [Ginger Peachy Keen](bikeride.md). + Go to Cafe Europa for some pork schnitzel \ No newline at end of file From 0572063cb982cca5f39583b9ad057d1194c9cd8b Mon Sep 17 00:00:00 2001 From: Xiaofan Date: Wed, 16 Dec 2015 13:48:47 -0800 Subject: [PATCH 1883/5486] fixed the link to ginger peachy keen --- english/sanfran/bikeride/bikeride.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sanfran/bikeride/bikeride.md b/english/sanfran/bikeride/bikeride.md index 9705add727..578c51a3bb 100644 --- a/english/sanfran/bikeride/bikeride.md +++ b/english/sanfran/bikeride/bikeride.md @@ -10,6 +10,6 @@ Or should I continue riding? Let's ride to the wonderful intersection of Haight and Fillmore. -Go to Bean There Cafe for some [Ginger Peachy Keen](bikeride.md). +Go to Bean There Cafe for some [Ginger Peachy Keen](ginger-peachy-keen.md). Go to Cafe Europa for some pork schnitzel \ No newline at end of file From 8be08c4ca0f8ebd531440de2e1449c542578a121 Mon Sep 17 00:00:00 2001 From: Xiaofan Date: Wed, 16 Dec 2015 13:52:43 -0800 Subject: [PATCH 1884/5486] added two more teas: jade and euphoria --- english/sanfran/bikeride/explosive-euphoria.md | 1 + english/sanfran/bikeride/ginger-peachy-keen.md | 6 ++---- english/sanfran/bikeride/morning-jade.md | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 english/sanfran/bikeride/explosive-euphoria.md create mode 100644 english/sanfran/bikeride/morning-jade.md diff --git a/english/sanfran/bikeride/explosive-euphoria.md b/english/sanfran/bikeride/explosive-euphoria.md new file mode 100644 index 0000000000..abfbab2d59 --- /dev/null +++ b/english/sanfran/bikeride/explosive-euphoria.md @@ -0,0 +1 @@ +The world is turning n I'm exploding...Hush-hush I think I've had enough tea for now. Let's continue our [bike ride](bikeride.md). \ No newline at end of file diff --git a/english/sanfran/bikeride/ginger-peachy-keen.md b/english/sanfran/bikeride/ginger-peachy-keen.md index d4caac18ca..7e003c2f6b 100644 --- a/english/sanfran/bikeride/ginger-peachy-keen.md +++ b/english/sanfran/bikeride/ginger-peachy-keen.md @@ -2,8 +2,6 @@ It's deliriously delicious! Let's try something else. -What about some Morning Jade? +What about some Morning Jade[morning-jade.md]? -Or some Explosive Euphoria? - -Let's continue our [bike ride](bikeride.md). \ No newline at end of file +Or some Explosive Euphoria[explosive-euphoria.md]? \ No newline at end of file diff --git a/english/sanfran/bikeride/morning-jade.md b/english/sanfran/bikeride/morning-jade.md new file mode 100644 index 0000000000..b393807035 --- /dev/null +++ b/english/sanfran/bikeride/morning-jade.md @@ -0,0 +1,3 @@ +Hmmmmmmm YUM!!! + +I think I've had enough tea for now. Let's continue our [bike ride](bikeride.md). \ No newline at end of file From 88cc6d1f943da0759b96a69d0d45c4486589db52 Mon Sep 17 00:00:00 2001 From: Xiaofan Date: Wed, 16 Dec 2015 13:54:33 -0800 Subject: [PATCH 1885/5486] fixed the links to jade and euphoria --- english/sanfran/bikeride/ginger-peachy-keen.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/sanfran/bikeride/ginger-peachy-keen.md b/english/sanfran/bikeride/ginger-peachy-keen.md index 7e003c2f6b..5607f34a65 100644 --- a/english/sanfran/bikeride/ginger-peachy-keen.md +++ b/english/sanfran/bikeride/ginger-peachy-keen.md @@ -2,6 +2,6 @@ It's deliriously delicious! Let's try something else. -What about some Morning Jade[morning-jade.md]? +What about some [Morning Jade](morning-jade.md)? -Or some Explosive Euphoria[explosive-euphoria.md]? \ No newline at end of file +Or some Explosive [Euphoria](explosive-euphoria.md)? \ No newline at end of file From 34e2e6a4aaca1ea8c89e44d4e52309b58f1beeb8 Mon Sep 17 00:00:00 2001 From: Xiaofan Date: Wed, 16 Dec 2015 14:03:33 -0800 Subject: [PATCH 1886/5486] fix directory structure --- english/sanfran/bikeride/explosive-euphoria.md | 1 - .../ginger-peachy-keen/drink-more-teas/explosive-euphoria.md | 2 ++ .../{ => ginger-peachy-keen/drink-more-teas}/morning-jade.md | 0 .../bikeride/{ => ginger-peachy-keen}/ginger-peachy-keen.md | 0 4 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 english/sanfran/bikeride/explosive-euphoria.md create mode 100644 english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria.md rename english/sanfran/bikeride/{ => ginger-peachy-keen/drink-more-teas}/morning-jade.md (100%) rename english/sanfran/bikeride/{ => ginger-peachy-keen}/ginger-peachy-keen.md (100%) diff --git a/english/sanfran/bikeride/explosive-euphoria.md b/english/sanfran/bikeride/explosive-euphoria.md deleted file mode 100644 index abfbab2d59..0000000000 --- a/english/sanfran/bikeride/explosive-euphoria.md +++ /dev/null @@ -1 +0,0 @@ -The world is turning n I'm exploding...Hush-hush I think I've had enough tea for now. Let's continue our [bike ride](bikeride.md). \ No newline at end of file diff --git a/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria.md b/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria.md new file mode 100644 index 0000000000..72a6fba1f9 --- /dev/null +++ b/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria.md @@ -0,0 +1,2 @@ +The world is turning n I'm exploding...Hush-hush I think I've had enough tea for now. +Let's continue our [bike ride](bikeride.md). \ No newline at end of file diff --git a/english/sanfran/bikeride/morning-jade.md b/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/morning-jade.md similarity index 100% rename from english/sanfran/bikeride/morning-jade.md rename to english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/morning-jade.md diff --git a/english/sanfran/bikeride/ginger-peachy-keen.md b/english/sanfran/bikeride/ginger-peachy-keen/ginger-peachy-keen.md similarity index 100% rename from english/sanfran/bikeride/ginger-peachy-keen.md rename to english/sanfran/bikeride/ginger-peachy-keen/ginger-peachy-keen.md From eacacb1ad5f9cb98b65045ec6810d7254dd73fd1 Mon Sep 17 00:00:00 2001 From: Xiaofan Date: Wed, 16 Dec 2015 14:05:34 -0800 Subject: [PATCH 1887/5486] fix links to reflect new dir structure --- english/sanfran/bikeride/bikeride.md | 2 +- .../sanfran/bikeride/ginger-peachy-keen/ginger-peachy-keen.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/english/sanfran/bikeride/bikeride.md b/english/sanfran/bikeride/bikeride.md index 578c51a3bb..6b853dd33a 100644 --- a/english/sanfran/bikeride/bikeride.md +++ b/english/sanfran/bikeride/bikeride.md @@ -10,6 +10,6 @@ Or should I continue riding? Let's ride to the wonderful intersection of Haight and Fillmore. -Go to Bean There Cafe for some [Ginger Peachy Keen](ginger-peachy-keen.md). +Go to Bean There Cafe for some [Ginger Peachy Keen](ginger-peachy-keen/ginger-peachy-keen.md). Go to Cafe Europa for some pork schnitzel \ No newline at end of file diff --git a/english/sanfran/bikeride/ginger-peachy-keen/ginger-peachy-keen.md b/english/sanfran/bikeride/ginger-peachy-keen/ginger-peachy-keen.md index 5607f34a65..b8857df2d2 100644 --- a/english/sanfran/bikeride/ginger-peachy-keen/ginger-peachy-keen.md +++ b/english/sanfran/bikeride/ginger-peachy-keen/ginger-peachy-keen.md @@ -2,6 +2,6 @@ It's deliriously delicious! Let's try something else. -What about some [Morning Jade](morning-jade.md)? +What about some [Morning Jade](drink-more-teas/morning-jade.md)? -Or some Explosive [Euphoria](explosive-euphoria.md)? \ No newline at end of file +Or some Explosive [Euphoria](drink-more-teas/explosive-euphoria.md)? \ No newline at end of file From e0d27e9d4675c30157dd2b65c2c0f14249f0f924 Mon Sep 17 00:00:00 2001 From: Xiaofan Date: Wed, 16 Dec 2015 14:06:51 -0800 Subject: [PATCH 1888/5486] fix MORE links to reflect new dir structure --- .../ginger-peachy-keen/drink-more-teas/explosive-euphoria.md | 2 +- .../bikeride/ginger-peachy-keen/drink-more-teas/morning-jade.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria.md b/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria.md index 72a6fba1f9..09eaceef78 100644 --- a/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria.md +++ b/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria.md @@ -1,2 +1,2 @@ The world is turning n I'm exploding...Hush-hush I think I've had enough tea for now. -Let's continue our [bike ride](bikeride.md). \ No newline at end of file +Let's continue our [bike ride](../../bikeride.md). \ No newline at end of file diff --git a/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/morning-jade.md b/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/morning-jade.md index b393807035..a7690b6761 100644 --- a/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/morning-jade.md +++ b/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/morning-jade.md @@ -1,3 +1,3 @@ Hmmmmmmm YUM!!! -I think I've had enough tea for now. Let's continue our [bike ride](bikeride.md). \ No newline at end of file +I think I've had enough tea for now. Let's continue our [bike ride](../../bikeride.md). \ No newline at end of file From 084b4252e56d7c6fefe078c1f0032c0771b77f37 Mon Sep 17 00:00:00 2001 From: Xiaofan Date: Wed, 16 Dec 2015 14:12:43 -0800 Subject: [PATCH 1889/5486] put teas jade and euphoria under their own dirs --- .../{ => explosive-euphoria}/explosive-euphoria.md | 2 +- .../drink-more-teas/{ => morning-jade}/morning-jade.md | 2 +- .../sanfran/bikeride/ginger-peachy-keen/ginger-peachy-keen.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/{ => explosive-euphoria}/explosive-euphoria.md (62%) rename english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/{ => morning-jade}/morning-jade.md (75%) diff --git a/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria.md b/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria/explosive-euphoria.md similarity index 62% rename from english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria.md rename to english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria/explosive-euphoria.md index 09eaceef78..60cf93f30f 100644 --- a/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria.md +++ b/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/explosive-euphoria/explosive-euphoria.md @@ -1,2 +1,2 @@ The world is turning n I'm exploding...Hush-hush I think I've had enough tea for now. -Let's continue our [bike ride](../../bikeride.md). \ No newline at end of file +Let's continue our [bike ride](../../../bikeride.md). \ No newline at end of file diff --git a/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/morning-jade.md b/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/morning-jade/morning-jade.md similarity index 75% rename from english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/morning-jade.md rename to english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/morning-jade/morning-jade.md index a7690b6761..b394cf498a 100644 --- a/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/morning-jade.md +++ b/english/sanfran/bikeride/ginger-peachy-keen/drink-more-teas/morning-jade/morning-jade.md @@ -1,3 +1,3 @@ Hmmmmmmm YUM!!! -I think I've had enough tea for now. Let's continue our [bike ride](../../bikeride.md). \ No newline at end of file +I think I've had enough tea for now. Let's continue our [bike ride](../../../bikeride.md). \ No newline at end of file diff --git a/english/sanfran/bikeride/ginger-peachy-keen/ginger-peachy-keen.md b/english/sanfran/bikeride/ginger-peachy-keen/ginger-peachy-keen.md index b8857df2d2..f49f179e0d 100644 --- a/english/sanfran/bikeride/ginger-peachy-keen/ginger-peachy-keen.md +++ b/english/sanfran/bikeride/ginger-peachy-keen/ginger-peachy-keen.md @@ -2,6 +2,6 @@ It's deliriously delicious! Let's try something else. -What about some [Morning Jade](drink-more-teas/morning-jade.md)? +What about some [Morning Jade](drink-more-teas/morning-jade/morning-jade.md)? -Or some Explosive [Euphoria](drink-more-teas/explosive-euphoria.md)? \ No newline at end of file +Or some Explosive [Euphoria](drink-more-teas/explosive-euphoria/explosive-euphoria.md)? \ No newline at end of file From 37ee6952691be058c591ead33fa904fe9f95feed Mon Sep 17 00:00:00 2001 From: D E Li Date: Thu, 17 Dec 2015 04:24:45 -0800 Subject: [PATCH 1890/5486] Add another channel to watch Add Marshmallow's reaction to the new channel --- english/watch-movie/Up.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/english/watch-movie/Up.md b/english/watch-movie/Up.md index 88fccdbace..dbccee5418 100644 --- a/english/watch-movie/Up.md +++ b/english/watch-movie/Up.md @@ -1,4 +1,6 @@ You decided to asked the marshmallow to watch your favourite movie Up with you. Halfway through the movie, the marshmallow walks out. -You change the TV to Meet the Press and it comes back in and sits down. -Turns out it loves Agarn! \ No newline at end of file +You change the TV to F-Troop and it comes back in and sits down. +Turns out it loves Agarn! +You then change the channel to meet the press +Marshmallow gets even more fascinated \ No newline at end of file From 920bd73d09086c794b2c0c0c8fdea05966280da5 Mon Sep 17 00:00:00 2001 From: Alex Abdo Date: Fri, 18 Dec 2015 20:40:09 -0500 Subject: [PATCH 1891/5486] Add new file read-a-book.md --- english/read-a-book/read-a-book.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/read-a-book/read-a-book.md diff --git a/english/read-a-book/read-a-book.md b/english/read-a-book/read-a-book.md new file mode 100644 index 0000000000..9f5f48e2ad --- /dev/null +++ b/english/read-a-book/read-a-book.md @@ -0,0 +1 @@ +Or you could just read a book! From 305aa2590b4b05e01ea99fa45b7dac5ea8956d17 Mon Sep 17 00:00:00 2001 From: Alex Abdo Date: Fri, 18 Dec 2015 20:51:46 -0500 Subject: [PATCH 1892/5486] Add link to read-a-book page to love page --- english/love/love.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/love/love.md b/english/love/love.md index ba6d0dc5a1..37bcbc7569 100644 --- a/english/love/love.md +++ b/english/love/love.md @@ -13,4 +13,6 @@ out of love, make the best of now while being aware of the worst of before. Of course, there is no substitute for the experince of it. It must be lived in order to be understood. All the words there are in the world cannot make you understand the feeling of it. Anyways, [here's -something comepletely different.](../marshmallow.md) \ No newline at end of file +something comepletely different.](../marshmallow.md) + +If all else fails, you could [try this.](english/read-a-book/read-a-book.md) From cc21364a6b421de97b436af7799e8ec252dc2b09 Mon Sep 17 00:00:00 2001 From: Alex Abdo Date: Fri, 18 Dec 2015 20:55:01 -0500 Subject: [PATCH 1893/5486] Fix link to read-a-book page from love page --- english/love/love.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/love/love.md b/english/love/love.md index 37bcbc7569..4974eafb49 100644 --- a/english/love/love.md +++ b/english/love/love.md @@ -15,4 +15,4 @@ lived in order to be understood. All the words there are in the world cannot make you understand the feeling of it. Anyways, [here's something comepletely different.](../marshmallow.md) -If all else fails, you could [try this.](english/read-a-book/read-a-book.md) +If all else fails, you could [try this.](../read-a-book/read-a-book.md) From 29813d455cc2469a6ebf7c87f500a72c7638bcc1 Mon Sep 17 00:00:00 2001 From: Cody Orantes Flies Date: Fri, 18 Dec 2015 20:54:57 -0800 Subject: [PATCH 1894/5486] add instructions title --- english/weed/weed.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/weed/weed.md b/english/weed/weed.md index a8a72aa51f..e60b8f2dc1 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -1,3 +1,4 @@ +THESE ARE THE INSTRUCTIONS FOR MAKING WEED OK!!!!!!!!! DONT TRY THIS AT HOME!! UNLESS YOUR IN CALIFORNIA!! well weed contains THC which will make you high. To get it out and add to your cookies, use a fat to extract it. Butter, Milk, cream can be used. From cb6683559980332e76f07246e54f01bfa16c701a Mon Sep 17 00:00:00 2001 From: ahmadelmorshedy Date: Sat, 19 Dec 2015 08:15:48 +0200 Subject: [PATCH 1895/5486] modifying the story --- arabic/learn/learn.md | 14 ++++++++++++++ arabic/learn/whattolearn/cooking.md | 1 + arabic/learn/whattolearn/drawing.md | 1 + arabic/learn/whattolearn/other.md | 1 + arabic/learn/whattolearn/photography.md | 1 + arabic/learn/whattolearn/programming.md | 1 + 6 files changed, 19 insertions(+) create mode 100644 arabic/learn/whattolearn/cooking.md create mode 100644 arabic/learn/whattolearn/drawing.md create mode 100644 arabic/learn/whattolearn/other.md create mode 100644 arabic/learn/whattolearn/photography.md create mode 100644 arabic/learn/whattolearn/programming.md diff --git a/arabic/learn/learn.md b/arabic/learn/learn.md index ffabdea52c..da0095338a 100644 --- a/arabic/learn/learn.md +++ b/arabic/learn/learn.md @@ -17,4 +17,18 @@ freelancing اشهر مواقع العمل الحر -[freelancer](https://www.freelancer.com/) +ولكن قبل ذلك، عليك أن تحدد ماذا تريد أن تتعلم: + +- [البرمجة](whattolearn/programming) + +- [الرسم](whattolearn/drawing) + +- [التصوير](whattolearn/photography) + +- [الطهي](whattolearn/cooking) + +- [أخرى](whattolearn/other) + + + diff --git a/arabic/learn/whattolearn/cooking.md b/arabic/learn/whattolearn/cooking.md new file mode 100644 index 0000000000..71556347fe --- /dev/null +++ b/arabic/learn/whattolearn/cooking.md @@ -0,0 +1 @@ +ممكن أن تبدأ [بهذا](http://www.allrecipes.com) diff --git a/arabic/learn/whattolearn/drawing.md b/arabic/learn/whattolearn/drawing.md new file mode 100644 index 0000000000..51692f2314 --- /dev/null +++ b/arabic/learn/whattolearn/drawing.md @@ -0,0 +1 @@ +ممكن أن تبدأ [بهذا](http://www.learn-to-draw.com/) diff --git a/arabic/learn/whattolearn/other.md b/arabic/learn/whattolearn/other.md new file mode 100644 index 0000000000..07eeb7b9bd --- /dev/null +++ b/arabic/learn/whattolearn/other.md @@ -0,0 +1 @@ +حدد ما تريد أن تتعلم، واعرف عنه المزيد من [هنا](www.google.com) diff --git a/arabic/learn/whattolearn/photography.md b/arabic/learn/whattolearn/photography.md new file mode 100644 index 0000000000..9a7435b82a --- /dev/null +++ b/arabic/learn/whattolearn/photography.md @@ -0,0 +1 @@ +ممكن أن تبدأ [بهذا](http://learnbasicphotography.com/) diff --git a/arabic/learn/whattolearn/programming.md b/arabic/learn/whattolearn/programming.md new file mode 100644 index 0000000000..0c9e0643fe --- /dev/null +++ b/arabic/learn/whattolearn/programming.md @@ -0,0 +1 @@ +ممكن أن تبدأ [بهذا](https://www.udacity.com) From 7b245f3ba27d78c9176619eb187634780b6419a5 Mon Sep 17 00:00:00 2001 From: ahmadelmorshedy Date: Sat, 19 Dec 2015 08:23:06 +0200 Subject: [PATCH 1896/5486] add .md to whattolearn file references in learn.md (fixing a bug) --- arabic/learn/learn.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arabic/learn/learn.md b/arabic/learn/learn.md index da0095338a..95586a0e13 100644 --- a/arabic/learn/learn.md +++ b/arabic/learn/learn.md @@ -19,15 +19,15 @@ freelancing اشهر مواقع العمل الحر ولكن قبل ذلك، عليك أن تحدد ماذا تريد أن تتعلم: -- [البرمجة](whattolearn/programming) +- [البرمجة](whattolearn/programming.md) -- [الرسم](whattolearn/drawing) +- [الرسم](whattolearn/drawing.md) -- [التصوير](whattolearn/photography) +- [التصوير](whattolearn/photography.md) -- [الطهي](whattolearn/cooking) +- [الطهي](whattolearn/cooking.md) -- [أخرى](whattolearn/other) +- [أخرى](whattolearn/other.md) From a7e14d4d702cda3707c9c62bf69ecb155313ab41 Mon Sep 17 00:00:00 2001 From: ahmadelmorshedy Date: Sat, 19 Dec 2015 08:25:49 +0200 Subject: [PATCH 1897/5486] i --- arabic/learn/whattolearn/other.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arabic/learn/whattolearn/other.md b/arabic/learn/whattolearn/other.md index 07eeb7b9bd..a4f2d51219 100644 --- a/arabic/learn/whattolearn/other.md +++ b/arabic/learn/whattolearn/other.md @@ -1 +1 @@ -حدد ما تريد أن تتعلم، واعرف عنه المزيد من [هنا](www.google.com) +حدد ما تريد أن تتعلم، واعرف عنه المزيد من [هنا](https://www.google.com) From de222be1f7ad45ea51f1e24a19e5e61e6eaedafe Mon Sep 17 00:00:00 2001 From: ahmadelmorshedy Date: Sat, 19 Dec 2015 08:49:49 +0200 Subject: [PATCH 1898/5486] Separating each .md file in a single directory --- arabic/learn/learn.md | 10 +++++----- arabic/learn/whattolearn/{ => cooking}/cooking.md | 0 arabic/learn/whattolearn/{ => drawing}/drawing.md | 0 arabic/learn/whattolearn/{ => other}/other.md | 0 .../learn/whattolearn/{ => photography}/photography.md | 0 .../learn/whattolearn/{ => programming}/programming.md | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename arabic/learn/whattolearn/{ => cooking}/cooking.md (100%) rename arabic/learn/whattolearn/{ => drawing}/drawing.md (100%) rename arabic/learn/whattolearn/{ => other}/other.md (100%) rename arabic/learn/whattolearn/{ => photography}/photography.md (100%) rename arabic/learn/whattolearn/{ => programming}/programming.md (100%) diff --git a/arabic/learn/learn.md b/arabic/learn/learn.md index 95586a0e13..94bd28ceff 100644 --- a/arabic/learn/learn.md +++ b/arabic/learn/learn.md @@ -19,15 +19,15 @@ freelancing اشهر مواقع العمل الحر ولكن قبل ذلك، عليك أن تحدد ماذا تريد أن تتعلم: -- [البرمجة](whattolearn/programming.md) +- [البرمجة](whattolearn/programming/programming.md) -- [الرسم](whattolearn/drawing.md) +- [الرسم](whattolearn/drawing/drawing.md) -- [التصوير](whattolearn/photography.md) +- [التصوير](whattolearn/photography/photography.md) -- [الطهي](whattolearn/cooking.md) +- [الطهي](whattolearn/cooking/cooking.md) -- [أخرى](whattolearn/other.md) +- [أخرى](whattolearn/other/other.md) diff --git a/arabic/learn/whattolearn/cooking.md b/arabic/learn/whattolearn/cooking/cooking.md similarity index 100% rename from arabic/learn/whattolearn/cooking.md rename to arabic/learn/whattolearn/cooking/cooking.md diff --git a/arabic/learn/whattolearn/drawing.md b/arabic/learn/whattolearn/drawing/drawing.md similarity index 100% rename from arabic/learn/whattolearn/drawing.md rename to arabic/learn/whattolearn/drawing/drawing.md diff --git a/arabic/learn/whattolearn/other.md b/arabic/learn/whattolearn/other/other.md similarity index 100% rename from arabic/learn/whattolearn/other.md rename to arabic/learn/whattolearn/other/other.md diff --git a/arabic/learn/whattolearn/photography.md b/arabic/learn/whattolearn/photography/photography.md similarity index 100% rename from arabic/learn/whattolearn/photography.md rename to arabic/learn/whattolearn/photography/photography.md diff --git a/arabic/learn/whattolearn/programming.md b/arabic/learn/whattolearn/programming/programming.md similarity index 100% rename from arabic/learn/whattolearn/programming.md rename to arabic/learn/whattolearn/programming/programming.md From 6955e32ef83e6a65110cac54c62a31525c916429 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Sat, 19 Dec 2015 11:28:58 +0200 Subject: [PATCH 1899/5486] Add "oferta orbit". --- romanian/magazin/oferta-speciala.md | 3 +++ romanian/nalba.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 romanian/magazin/oferta-speciala.md diff --git a/romanian/magazin/oferta-speciala.md b/romanian/magazin/oferta-speciala.md new file mode 100644 index 0000000000..a525a80f84 --- /dev/null +++ b/romanian/magazin/oferta-speciala.md @@ -0,0 +1,3 @@ +Auzise ea ca acolo ar fi fost o oferta la Orbit. Fericita ca oferta era inca +valabila, cumpara 7 pachete. Dar cand da sa iasa pe usa magazinului, pe loc un +gand o loveste: dincolo oare, nu era mai ieftin? diff --git a/romanian/nalba.md b/romanian/nalba.md index 3951c81a59..c9d4b1aceb 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -48,6 +48,8 @@ Si ii dadu zanei nalbele, iar zana se puse pe treaba, sa faca potiunea cea ferme Plictisita, Gina pleca sa-si cumpere Orbit. +Si merse, merse, cale lunga pana la [magazinul cel mare](magazin/oferta-speciala.md). + Ginel continua sa se holbeze la zana cand, dintr-odata, puhhh! Un nor rosu cuprinse zana de la genunchi pana peste cap, asa incat inca i se mai vedeau pantofi albastrii... From db5cad066ea46b37d7185dde5885c49bea0ffd22 Mon Sep 17 00:00:00 2001 From: Brett Freese Date: Sat, 19 Dec 2015 11:52:52 -0500 Subject: [PATCH 1900/5486] Added a line to coffee.md in the English directory. --- english/coffee/coffee.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/coffee/coffee.md b/english/coffee/coffee.md index 079fc468c9..6fc68396c5 100644 --- a/english/coffee/coffee.md +++ b/english/coffee/coffee.md @@ -9,6 +9,8 @@ Nothing like a cup of coffee to start your day when you wake up. Can you feel the caffeine rush inside of you? It's taking hold, controlling you. You're so high. +You settle into the table for a good long drink before you consider your next steps. + After having your coffee do you want to: [Have another cup of coffee?](another-coffee/another-coffee.md) From fb8eaa5796aa5c10b4c11e8e07b35d6f083b6696 Mon Sep 17 00:00:00 2001 From: dxin93 Date: Sun, 20 Dec 2015 01:01:44 -0500 Subject: [PATCH 1901/5486] Add history of the Marshmallow Chief --- english/chief-history.md | 21 +++++++++++++++++++++ english/references/references.md | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 english/chief-history.md diff --git a/english/chief-history.md b/english/chief-history.md new file mode 100644 index 0000000000..2d3c1abc06 --- /dev/null +++ b/english/chief-history.md @@ -0,0 +1,21 @@ +The Chief looks at you questionably. + +"Well that's an interesting request..." he ponders. + +He takes out two foldable chairs and unfolds them. +"Make yourself comfortable, I will tell you my tale." + +You discover that the Marshmallow Chief earned his title through an +annual competition held throughout the Marshmallow Kingdom. Before +being bestowed with Marshmallow-y powers, he was just a normal +human. He attributes his success to his previous experience +as a U.S. Marine. + +"Wow, that's fascinating. I would have never guessed that you +used to be human." You say. + +However, there is still one more question lingering on the +tip of your tongue. + +"But if what you say is true, then you must have had +a name before all of this. So what was your [name](https://www.youtube.com/watch?v=Am4oKAmc2To)?" diff --git a/english/references/references.md b/english/references/references.md index 3b60b4a544..153b9ba05e 100644 --- a/english/references/references.md +++ b/english/references/references.md @@ -5,3 +5,5 @@ Then while making a gradual motion with 3 fingers on your right hand, you say Because 'the Force' is strong in you, the Chief Marshmallow agrees. Then with the same motion you say "Be on your way". The Chief Marshmallow looks at you and waves you on saying ["Be on your way"](../marshmallow.md) + +Before you go, you decide to ask the Chief Marshmallow for HIS [references](../chief-history). \ No newline at end of file From fee85022a1399160cef72a6e9f435bfd2bec1110 Mon Sep 17 00:00:00 2001 From: dxin93 Date: Sun, 20 Dec 2015 01:04:29 -0500 Subject: [PATCH 1902/5486] Fixed broken link --- english/references/references.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/references/references.md b/english/references/references.md index 153b9ba05e..889623bd38 100644 --- a/english/references/references.md +++ b/english/references/references.md @@ -6,4 +6,4 @@ Then while making a gradual motion with 3 fingers on your right hand, you say Because 'the Force' is strong in you, the Chief Marshmallow agrees. Then with the same motion you say "Be on your way". The Chief Marshmallow looks at you and waves you on saying ["Be on your way"](../marshmallow.md) -Before you go, you decide to ask the Chief Marshmallow for HIS [references](../chief-history). \ No newline at end of file +Before you go, you decide to ask the Chief Marshmallow for HIS [references](../chief-history/chief-history.md). \ No newline at end of file From 2195a35843ad4e576ed8b6c96bd0fecacc5eb546 Mon Sep 17 00:00:00 2001 From: dxin93 Date: Sun, 20 Dec 2015 01:06:37 -0500 Subject: [PATCH 1903/5486] Fix broken link and create necessary .md file --- english/chief-history/chief-history.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 english/chief-history/chief-history.md diff --git a/english/chief-history/chief-history.md b/english/chief-history/chief-history.md new file mode 100644 index 0000000000..2d3c1abc06 --- /dev/null +++ b/english/chief-history/chief-history.md @@ -0,0 +1,21 @@ +The Chief looks at you questionably. + +"Well that's an interesting request..." he ponders. + +He takes out two foldable chairs and unfolds them. +"Make yourself comfortable, I will tell you my tale." + +You discover that the Marshmallow Chief earned his title through an +annual competition held throughout the Marshmallow Kingdom. Before +being bestowed with Marshmallow-y powers, he was just a normal +human. He attributes his success to his previous experience +as a U.S. Marine. + +"Wow, that's fascinating. I would have never guessed that you +used to be human." You say. + +However, there is still one more question lingering on the +tip of your tongue. + +"But if what you say is true, then you must have had +a name before all of this. So what was your [name](https://www.youtube.com/watch?v=Am4oKAmc2To)?" From c2e691e64671cb5f26131a2e368e0269a6745905 Mon Sep 17 00:00:00 2001 From: dxin93 Date: Sun, 20 Dec 2015 01:07:35 -0500 Subject: [PATCH 1904/5486] Remove file in wrong location --- english/chief-history.md | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 english/chief-history.md diff --git a/english/chief-history.md b/english/chief-history.md deleted file mode 100644 index 2d3c1abc06..0000000000 --- a/english/chief-history.md +++ /dev/null @@ -1,21 +0,0 @@ -The Chief looks at you questionably. - -"Well that's an interesting request..." he ponders. - -He takes out two foldable chairs and unfolds them. -"Make yourself comfortable, I will tell you my tale." - -You discover that the Marshmallow Chief earned his title through an -annual competition held throughout the Marshmallow Kingdom. Before -being bestowed with Marshmallow-y powers, he was just a normal -human. He attributes his success to his previous experience -as a U.S. Marine. - -"Wow, that's fascinating. I would have never guessed that you -used to be human." You say. - -However, there is still one more question lingering on the -tip of your tongue. - -"But if what you say is true, then you must have had -a name before all of this. So what was your [name](https://www.youtube.com/watch?v=Am4oKAmc2To)?" From bb7181b16b0d52efda140e6b8d7597226dc45507 Mon Sep 17 00:00:00 2001 From: arpit731992 Date: Mon, 21 Dec 2015 01:43:46 +0530 Subject: [PATCH 1905/5486] Add another-story --- english/destiny/destiny.md | 17 +++++++++++++++++ english/fight-out/fight-out.md | 11 +++++++++++ english/marshmallow.md | 3 +++ 3 files changed, 31 insertions(+) create mode 100644 english/destiny/destiny.md create mode 100644 english/fight-out/fight-out.md diff --git a/english/destiny/destiny.md b/english/destiny/destiny.md new file mode 100644 index 0000000000..f1e5fde996 --- /dev/null +++ b/english/destiny/destiny.md @@ -0,0 +1,17 @@ +you have decided to persue your destiny. + +before you start you must have forgotten to pee so [go now](../eating-walls/find-a-toilet/find-a-toilet.md). + +now that you are relieved of the pressure underneath. + +you look so hard on the screen, the rooms seems colder and strange with something in it, + +but it's too much to take on. + +so you [go back to sleep](../sleep/marshmallow.md). + +But you wake up and chose to find your way to know the [real life](../real-life/real-life.md). + +see destiny isn't so hard when you try for it. + +and now you will be the [protagonist of the story](../marshmallow.md) diff --git a/english/fight-out/fight-out.md b/english/fight-out/fight-out.md new file mode 100644 index 0000000000..6a1d5fed0b --- /dev/null +++ b/english/fight-out/fight-out.md @@ -0,0 +1,11 @@ +You don't want the story. + +But the thrill is just [outside](../marshmallow.md) your door. + +It's just waiting there with tons of stories. + +but it seems you have chosen your path. + +You can go now, wake up with a litle [memory of this story in your life](../memories/memories.md). + +or you can still make your own [destiny](../destiny/destiny.md). diff --git a/english/marshmallow.md b/english/marshmallow.md index 48b9bb56a0..cd579fff3d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,6 @@ +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +and search for your [destiny](destiny/destiny.md). + You are are man (or woman) for all seasons but need help in choosing your travel destinations.. Of course we are happy to help you with these [suggestions](travel-destinations/travel-destinations.md) From 71150e7b56bef1eaa9884de124371e3235b99595 Mon Sep 17 00:00:00 2001 From: blueark Date: Mon, 21 Dec 2015 07:12:06 +0000 Subject: [PATCH 1906/5486] Add Star Wars spoiler --- english/marshmallow.md | 4 +--- english/star-wars-spoiler/star-wars.md | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 english/star-wars-spoiler/star-wars.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 48b9bb56a0..fddeaab0ad 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -660,9 +660,8 @@ you realize that the story is about you! This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) -<<<<<<< HEAD You must be lonely. [Want a friend?](robofriend/AIRobot.md) -======= + When I code over my weekend, I feel that this becomes my [whole life](code-my-life/code-my-life.md). Suddenly you feel a strong craving for [something.](craving/craving.md) @@ -679,7 +678,6 @@ to you when you speak to it. ["Ahem!"](my-adventure/my-adventure.md) So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... ->>>>>>> deb66146d3bd0481a4c19d27b8ef289b939d4156 ["Train Ride!"] (train-ride/train-ride.md) diff --git a/english/star-wars-spoiler/star-wars.md b/english/star-wars-spoiler/star-wars.md new file mode 100644 index 0000000000..5bca31dbc7 --- /dev/null +++ b/english/star-wars-spoiler/star-wars.md @@ -0,0 +1,3 @@ +Bad idea. The internet destroyed you for even contemplating such a thing. + +[Go Back...](../marshmallow.md). \ No newline at end of file From 82d5d05098a4940addaa42b9975423ebd17706ef Mon Sep 17 00:00:00 2001 From: blueark Date: Mon, 21 Dec 2015 07:20:18 +0000 Subject: [PATCH 1907/5486] Link to Star Wars spoiler from main file --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index fddeaab0ad..c33c30e60c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -681,3 +681,4 @@ So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyAr ["Train Ride!"] (train-ride/train-ride.md) +I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/star-wars.md) From 583eb64894a9586199644de711c0818f62eadb9b Mon Sep 17 00:00:00 2001 From: blueark Date: Mon, 21 Dec 2015 07:27:55 +0000 Subject: [PATCH 1908/5486] Replace deleted lines --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index c33c30e60c..690f022a6f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -660,8 +660,9 @@ you realize that the story is about you! This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) +<<<<<<< HEAD You must be lonely. [Want a friend?](robofriend/AIRobot.md) - +======= When I code over my weekend, I feel that this becomes my [whole life](code-my-life/code-my-life.md). Suddenly you feel a strong craving for [something.](craving/craving.md) @@ -678,6 +679,7 @@ to you when you speak to it. ["Ahem!"](my-adventure/my-adventure.md) So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... +>>>>>>> deb66146d3bd0481a4c19d27b8ef289b939d4156 ["Train Ride!"] (train-ride/train-ride.md) From 1db55654d5a36302509b9697067fa4e6dc6d85e0 Mon Sep 17 00:00:00 2001 From: blueark Date: Mon, 21 Dec 2015 07:52:38 +0000 Subject: [PATCH 1909/5486] Ask about Heffelumps --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 690f022a6f..c64c0979a9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -684,3 +684,5 @@ So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyAr ["Train Ride!"] (train-ride/train-ride.md) I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/star-wars.md) + +"What's a Heffelump?" asked Sheffield inquisitively. \ No newline at end of file From cb85382b1ef78608e1a56eb39764b663e200922a Mon Sep 17 00:00:00 2001 From: Kirill Strelkov Date: Mon, 21 Dec 2015 12:33:52 +0100 Subject: [PATCH 1910/5486] added russian action --- next_room/next_room.md | 1 + russian/zefir.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 next_room/next_room.md diff --git a/next_room/next_room.md b/next_room/next_room.md new file mode 100644 index 0000000000..cdcadc21b5 --- /dev/null +++ b/next_room/next_room.md @@ -0,0 +1 @@ +Здесь пустота. diff --git a/russian/zefir.md b/russian/zefir.md index 59c360e2a6..f3ba048f64 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -51,3 +51,5 @@ [Попробую отщипнуть кусочек зефирной стены.](nip-off/nip-off.md) [Почесать в подмышечной впадине.](scratch/scratch.md) + +[Пойду в другую комнату](next_room/next_room.md) From 9ff571b5d342ce7045e9fc6cbc9531889b09e7b0 Mon Sep 17 00:00:00 2001 From: Kirill Strelkov Date: Mon, 21 Dec 2015 12:36:07 +0100 Subject: [PATCH 1911/5486] moved ./next_room to ./russian --- {next_room => russian/next_room}/next_room.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {next_room => russian/next_room}/next_room.md (100%) diff --git a/next_room/next_room.md b/russian/next_room/next_room.md similarity index 100% rename from next_room/next_room.md rename to russian/next_room/next_room.md From 3d8f40841ac6da2f51bdd1006cc4a95a388b2f63 Mon Sep 17 00:00:00 2001 From: Jacob Date: Mon, 21 Dec 2015 20:53:41 +0100 Subject: [PATCH 1912/5486] Add option to investigate as team in ghoststory story --- .../ghost-stories/check_source_team/check_source_team.md | 6 ++++++ .../invite-friends/camp_fire/ghost-stories/ghost-stories.md | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 english/invite-friends/camp_fire/ghost-stories/check_source_team/check_source_team.md diff --git a/english/invite-friends/camp_fire/ghost-stories/check_source_team/check_source_team.md b/english/invite-friends/camp_fire/ghost-stories/check_source_team/check_source_team.md new file mode 100644 index 0000000000..68ec6c511f --- /dev/null +++ b/english/invite-friends/camp_fire/ghost-stories/check_source_team/check_source_team.md @@ -0,0 +1,6 @@ +You and your friends go to the next room. Because you were the one to suggest this, you enter the room first. Inside, +you see that a huge part of the marshmallow wall has been torn down. A trail of blood leads through the hole and your +grandmother who had been watching tv is missing. + +You think to yourself: "Grandmother, no! What should I do now!?" + diff --git a/english/invite-friends/camp_fire/ghost-stories/ghost-stories.md b/english/invite-friends/camp_fire/ghost-stories/ghost-stories.md index d93e8d3407..99f35f1a37 100644 --- a/english/invite-friends/camp_fire/ghost-stories/ghost-stories.md +++ b/english/invite-friends/camp_fire/ghost-stories/ghost-stories.md @@ -8,3 +8,5 @@ Do you: [Become the hero and tell everyone that you are going to see where the scream comes from](check_source/check_source.md) [Scare yourself to death and ask someone to go check where the scream came from](scared/scared.md) + +[Suggest to your friends that you had better go to the next room together to find out what happened](check_source_team/check_source.md) From 29a45f0466b26abbee3dfe79b18665bbfbeff392 Mon Sep 17 00:00:00 2001 From: Jacob Date: Mon, 21 Dec 2015 20:58:24 +0100 Subject: [PATCH 1913/5486] Fix link --- english/invite-friends/camp_fire/ghost-stories/ghost-stories.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/invite-friends/camp_fire/ghost-stories/ghost-stories.md b/english/invite-friends/camp_fire/ghost-stories/ghost-stories.md index 99f35f1a37..0369ecaa68 100644 --- a/english/invite-friends/camp_fire/ghost-stories/ghost-stories.md +++ b/english/invite-friends/camp_fire/ghost-stories/ghost-stories.md @@ -9,4 +9,4 @@ Do you: [Scare yourself to death and ask someone to go check where the scream came from](scared/scared.md) -[Suggest to your friends that you had better go to the next room together to find out what happened](check_source_team/check_source.md) +[Suggest to your friends that you had better go to the next room together to find out what happened](check_source_team/check_source_team.md) From 39cecd8b953971597c0589959c2a4deb1f0da140 Mon Sep 17 00:00:00 2001 From: Jacob Date: Mon, 21 Dec 2015 21:15:29 +0100 Subject: [PATCH 1914/5486] Shorten lines to comply with 120 char limit --- .../invite-friends/camp_fire/ghost-stories/ghost-stories.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/invite-friends/camp_fire/ghost-stories/ghost-stories.md b/english/invite-friends/camp_fire/ghost-stories/ghost-stories.md index 0369ecaa68..52f4c0c7ac 100644 --- a/english/invite-friends/camp_fire/ghost-stories/ghost-stories.md +++ b/english/invite-friends/camp_fire/ghost-stories/ghost-stories.md @@ -9,4 +9,5 @@ Do you: [Scare yourself to death and ask someone to go check where the scream came from](scared/scared.md) -[Suggest to your friends that you had better go to the next room together to find out what happened](check_source_team/check_source_team.md) +[Suggest to your friends to go investigate together to see what happened](check_source_team/check_source_team.md) + From e159d9adb33b2e3317f6e76709f73f3580e9af8a Mon Sep 17 00:00:00 2001 From: Jacob Date: Mon, 21 Dec 2015 22:15:29 +0100 Subject: [PATCH 1915/5486] Add the grab-battle-axe choice to check_source_team --- .../ghost-stories/check_source_team/check_source_team.md | 4 +++- .../check_source_team/grab-battle-axe/grab-battle-axe.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/invite-friends/camp_fire/ghost-stories/check_source_team/grab-battle-axe/grab-battle-axe.md diff --git a/english/invite-friends/camp_fire/ghost-stories/check_source_team/check_source_team.md b/english/invite-friends/camp_fire/ghost-stories/check_source_team/check_source_team.md index 68ec6c511f..6f2a041b56 100644 --- a/english/invite-friends/camp_fire/ghost-stories/check_source_team/check_source_team.md +++ b/english/invite-friends/camp_fire/ghost-stories/check_source_team/check_source_team.md @@ -2,5 +2,7 @@ You and your friends go to the next room. Because you were the one to suggest th you see that a huge part of the marshmallow wall has been torn down. A trail of blood leads through the hole and your grandmother who had been watching tv is missing. -You think to yourself: "Grandmother, no! What should I do now!?" +Do you: + +[Grab your late grandfathers (God rest his soul) sturdy battle axe](grab-battle-axe/grab-battle-axe.md) diff --git a/english/invite-friends/camp_fire/ghost-stories/check_source_team/grab-battle-axe/grab-battle-axe.md b/english/invite-friends/camp_fire/ghost-stories/check_source_team/grab-battle-axe/grab-battle-axe.md new file mode 100644 index 0000000000..3c360dba10 --- /dev/null +++ b/english/invite-friends/camp_fire/ghost-stories/check_source_team/grab-battle-axe/grab-battle-axe.md @@ -0,0 +1 @@ +As you pick up the battle axe, you feel frenzied and invigorated \ No newline at end of file From 23bf1bf870c916b171fd19aacafb55edd5eb24c8 Mon Sep 17 00:00:00 2001 From: Jacob Date: Mon, 21 Dec 2015 22:20:32 +0100 Subject: [PATCH 1916/5486] Reinsert think to yourself line --- .../ghost-stories/check_source_team/check_source_team.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/invite-friends/camp_fire/ghost-stories/check_source_team/check_source_team.md b/english/invite-friends/camp_fire/ghost-stories/check_source_team/check_source_team.md index 6f2a041b56..8189f25d42 100644 --- a/english/invite-friends/camp_fire/ghost-stories/check_source_team/check_source_team.md +++ b/english/invite-friends/camp_fire/ghost-stories/check_source_team/check_source_team.md @@ -2,6 +2,8 @@ You and your friends go to the next room. Because you were the one to suggest th you see that a huge part of the marshmallow wall has been torn down. A trail of blood leads through the hole and your grandmother who had been watching tv is missing. +You think to yourself: "Grandmother, no! What should I do now!?" + Do you: [Grab your late grandfathers (God rest his soul) sturdy battle axe](grab-battle-axe/grab-battle-axe.md) From 0bae8f4c146fb281b275d55a25cb60a4c4bb3e07 Mon Sep 17 00:00:00 2001 From: Danny Neumann Date: Mon, 21 Dec 2015 15:34:23 -1000 Subject: [PATCH 1917/5486] Add line in Spanish story --- espanol/canudos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index 6b96cb6e1a..5f561b3574 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -10,6 +10,8 @@ el Consejero: [Llegó el periodista miope con noticias importantes.](noticias/noticias.md) +[Suddenly realized he was far from home and doesn't know how to speak Spanish.](../TheEpicSax/111_TheEpicSaxGuyArrives.md) + [Se dirigió a la muralla exterior del pueblo.](muralla/muralla.md) [Empaquetó sus cosas e intentó salir por la puerta trasera.](huida/puerta.md) From d736dfe93ffe33fbac5628c8b306a43041ebb8b8 Mon Sep 17 00:00:00 2001 From: Danny Neumann Date: Mon, 21 Dec 2015 15:37:15 -1000 Subject: [PATCH 1918/5486] Fix error in previous link --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 5f561b3574..6506e313ad 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -10,7 +10,7 @@ el Consejero: [Llegó el periodista miope con noticias importantes.](noticias/noticias.md) -[Suddenly realized he was far from home and doesn't know how to speak Spanish.](../TheEpicSax/111_TheEpicSaxGuyArrives.md) +[Suddenly realized he was far from home and doesn't know how to speak Spanish.](../English/TheEpicSax/111_TheEpicSaxGuyArrives.md) [Se dirigió a la muralla exterior del pueblo.](muralla/muralla.md) From a20ba8737e1b7cf35f3f425203d1ab6599e51e63 Mon Sep 17 00:00:00 2001 From: Danny Neumann Date: Mon, 21 Dec 2015 15:38:36 -1000 Subject: [PATCH 1919/5486] Fix link again - "English" is in lower case! --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 6506e313ad..c7daf272bc 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -10,7 +10,7 @@ el Consejero: [Llegó el periodista miope con noticias importantes.](noticias/noticias.md) -[Suddenly realized he was far from home and doesn't know how to speak Spanish.](../English/TheEpicSax/111_TheEpicSaxGuyArrives.md) +[Suddenly realized he was far from home and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyArrives.md) [Se dirigió a la muralla exterior del pueblo.](muralla/muralla.md) From 0b548fc36c13aefb69eb134c26e9fc986169ce9a Mon Sep 17 00:00:00 2001 From: Danny Neumann Date: Mon, 21 Dec 2015 16:22:50 -1000 Subject: [PATCH 1920/5486] Break last change into two lines because casey-collab doesn't like lines over 120 characters. --- espanol/canudos.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index c7daf272bc..e9c0d1db16 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -10,7 +10,8 @@ el Consejero: [Llegó el periodista miope con noticias importantes.](noticias/noticias.md) -[Suddenly realized he was far from home and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyArrives.md) +[Suddenly realized he was far from home +and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyArrives.md) [Se dirigió a la muralla exterior del pueblo.](muralla/muralla.md) From 0462e75e4e8ae74e42457c74b4addd3e6b77190d Mon Sep 17 00:00:00 2001 From: Stanley Pan Date: Tue, 22 Dec 2015 12:52:16 +0900 Subject: [PATCH 1921/5486] Add geometrydash --- english/marshmallow.md | 2 ++ english/play-geometrydash/play-geometrydash.md | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 english/play-geometrydash/play-geometrydash.md diff --git a/english/marshmallow.md b/english/marshmallow.md index b7a5a83895..dd0d52d1c4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -556,6 +556,8 @@ Do you: [Play some DotA 2](play-dota2/play-dota2.md) +[Play some Geometry Dash](play-geometrydash/play-geometrydash.md) + [See if there is a Udacity course on the subject](udacity/udacity.md) Click [here](young/young.md) to listen to music. diff --git a/english/play-geometrydash/play-geometrydash.md b/english/play-geometrydash/play-geometrydash.md new file mode 100644 index 0000000000..084fcc4dc8 --- /dev/null +++ b/english/play-geometrydash/play-geometrydash.md @@ -0,0 +1,7 @@ +You fire up Geometry Dash on your smartphone. + +You find out you unlocked a new level, DEADLOCKED. + +You beat it first try like a boss. + +You pat yourself on the back, for you win at life. From c8021ac532dda5cfa985d291015c1d86f1986d1f Mon Sep 17 00:00:00 2001 From: arpit731992 Date: Tue, 22 Dec 2015 16:18:26 +0530 Subject: [PATCH 1922/5486] add a blank line --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index cd579fff3d..da213cbce6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,5 @@ This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down + and search for your [destiny](destiny/destiny.md). You are are man (or woman) for all seasons but need help in choosing From d6939b1ca45bb351e54df2484ffc2d74c3b41248 Mon Sep 17 00:00:00 2001 From: achuthpv Date: Tue, 22 Dec 2015 19:49:41 +0530 Subject: [PATCH 1923/5486] added sasi --- Malayalam/malayalam.md | 1 + Malayalam/sasi/pling.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 Malayalam/sasi/pling.md diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index 617cdd2acf..39fa7a73b1 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -5,3 +5,4 @@ ആ കുട്ടിയുടെ പേരാണു ടിന്റു മോൻ ടിന്റു മോൻ മിടുമിടുക്കനായിരുന്നു +sasiyude [Pling](sasi/pling.md) story diff --git a/Malayalam/sasi/pling.md b/Malayalam/sasi/pling.md new file mode 100644 index 0000000000..0973dcf510 --- /dev/null +++ b/Malayalam/sasi/pling.md @@ -0,0 +1 @@ +Pling ennal chammuka, allathe enthu From 57247693f594fb69f7b76ed0d4ecc6575666281b Mon Sep 17 00:00:00 2001 From: achuthpv Date: Tue, 22 Dec 2015 19:52:52 +0530 Subject: [PATCH 1924/5486] Update malayalam.md --- Malayalam/malayalam.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index 39fa7a73b1..63b4a4f9c3 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -5,4 +5,4 @@ ആ കുട്ടിയുടെ പേരാണു ടിന്റു മോൻ ടിന്റു മോൻ മിടുമിടുക്കനായിരുന്നു -sasiyude [Pling](sasi/pling.md) story +ശശിയുടെ [പ്ലിംഗ്](sasi/pling.md) കഥ From 01dc822c2d3e9a833f909eab4262e19500cef25d Mon Sep 17 00:00:00 2001 From: achuthpv Date: Tue, 22 Dec 2015 19:53:04 +0530 Subject: [PATCH 1925/5486] Update malayalam.md --- Malayalam/malayalam.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index 63b4a4f9c3..791a5dcb46 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -5,4 +5,5 @@ ആ കുട്ടിയുടെ പേരാണു ടിന്റു മോൻ ടിന്റു മോൻ മിടുമിടുക്കനായിരുന്നു + ശശിയുടെ [പ്ലിംഗ്](sasi/pling.md) കഥ From e7851819c515cd9a0106cb13c225222bea49ea47 Mon Sep 17 00:00:00 2001 From: achuthpv Date: Tue, 22 Dec 2015 19:55:10 +0530 Subject: [PATCH 1926/5486] Update pling.md --- Malayalam/sasi/pling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Malayalam/sasi/pling.md b/Malayalam/sasi/pling.md index 0973dcf510..8f27dc8312 100644 --- a/Malayalam/sasi/pling.md +++ b/Malayalam/sasi/pling.md @@ -1 +1 @@ -Pling ennal chammuka, allathe enthu +പ്ലിംഗ് എന്നാൽ ചമ്മുക , അല്ലാതെ എന്ത് . ചുരുക്കി പറഞ്ഞാൽ ശശി എന്ന് നാമമുള്ളവൻ എന്നും പ്ലിങ്ങും From c5b541635062571d17bcfaddf4b94f7ddd5b7ff3 Mon Sep 17 00:00:00 2001 From: Thomas Enderle Date: Tue, 22 Dec 2015 17:37:25 +0100 Subject: [PATCH 1927/5486] =?UTF-8?q?Erz=C3=A4hlfaden=20"Oktoberfest"=20er?= =?UTF-8?q?weitern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Einladen/Schule/schule.md | 2 ++ german/Einladen/einladen.md | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 german/Einladen/Schule/schule.md diff --git a/german/Einladen/Schule/schule.md b/german/Einladen/Schule/schule.md new file mode 100644 index 0000000000..75182eb10a --- /dev/null +++ b/german/Einladen/Schule/schule.md @@ -0,0 +1,2 @@ +Die schne Blonde bemerkt, dass Sie sie angelogen haben. +Sie dreht sich um und geht mit den Worten "Lgner!" davon. \ No newline at end of file diff --git a/german/Einladen/einladen.md b/german/Einladen/einladen.md index 8c53cbaee0..0e77f07a5f 100644 --- a/german/Einladen/einladen.md +++ b/german/Einladen/einladen.md @@ -3,4 +3,6 @@ Sie beantwortet: "Ja, ich w [Sie stellen sich vor](Vorstellen/vorstellen.md) -[Sie wachen aus diesem Alptraum auf](../ruderboot.md) \ No newline at end of file +[Sie wachen aus diesem Alptraum auf](../ruderboot.md) + +[Sie erzhlen, dass sie gemeinsam zur Schule gegangen sind](Schule/schule.md) \ No newline at end of file From c0fc5e6f31f954ce4079d0232df3b6fb3ca9946e Mon Sep 17 00:00:00 2001 From: bluepoplar Date: Wed, 23 Dec 2015 00:56:46 -0800 Subject: [PATCH 1928/5486] =?UTF-8?q?=E5=AD=99=E6=82=9F=E7=A9=BA=E5=8F=98?= =?UTF-8?q?=E6=88=90=E4=BA=86=E5=B0=8F=E5=B2=B3=E5=B2=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/xiaoyueyue/xiaoyueyue.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Chinese/xiaoyueyue/xiaoyueyue.md diff --git a/Chinese/xiaoyueyue/xiaoyueyue.md b/Chinese/xiaoyueyue/xiaoyueyue.md new file mode 100644 index 0000000000..04b2f8c2e8 --- /dev/null +++ b/Chinese/xiaoyueyue/xiaoyueyue.md @@ -0,0 +1 @@ +孙悟空变成了小岳岳下井挖煤，结果被吓的哭鼻子了。变身的时候估计把自己的胆子给变没了。 \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 37008402a3..c2f6fdceb7 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -81,3 +81,5 @@ [xidada](xidada/xidada.md) [Kobe](Kobe/Kobe.md) + +[小岳岳](xiaoyueyue/xiaoyueyue.md) From 58464aa532ae8ff195def110b8306dcd91eddffb Mon Sep 17 00:00:00 2001 From: Ryan Connor Date: Wed, 23 Dec 2015 22:37:34 +0700 Subject: [PATCH 1929/5486] conan or pretty girl? --- english/play-geometrydash/conan/conan.md | 3 +++ english/play-geometrydash/play-geometrydash.md | 3 +++ english/play-geometrydash/pretty-girl/pretty-girl.md | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 english/play-geometrydash/conan/conan.md create mode 100644 english/play-geometrydash/pretty-girl/pretty-girl.md diff --git a/english/play-geometrydash/conan/conan.md b/english/play-geometrydash/conan/conan.md new file mode 100644 index 0000000000..54a6ba4d61 --- /dev/null +++ b/english/play-geometrydash/conan/conan.md @@ -0,0 +1,3 @@ +Your phone, overworked by your Geometry Wars +performance, explodes. The pretty girl across the room +laughs as you wipe the smoke from your eyes. \ No newline at end of file diff --git a/english/play-geometrydash/play-geometrydash.md b/english/play-geometrydash/play-geometrydash.md index 084fcc4dc8..ef2b18cd95 100644 --- a/english/play-geometrydash/play-geometrydash.md +++ b/english/play-geometrydash/play-geometrydash.md @@ -5,3 +5,6 @@ You find out you unlocked a new level, DEADLOCKED. You beat it first try like a boss. You pat yourself on the back, for you win at life. + +[You feel great, so you open YouTube to watch some Conan O'Brien clips.](/conan) +[You feel AMAZING, so you walk up to the pretty girl across the room.](/pretty-girl) \ No newline at end of file diff --git a/english/play-geometrydash/pretty-girl/pretty-girl.md b/english/play-geometrydash/pretty-girl/pretty-girl.md new file mode 100644 index 0000000000..026844d801 --- /dev/null +++ b/english/play-geometrydash/pretty-girl/pretty-girl.md @@ -0,0 +1,2 @@ +You walk up to the pretty girl and say "Well, I DO know +much about Geometry." Against all odds, she smiles. \ No newline at end of file From 41fef6384489faf8a6b8ee52f7f86d0df9ad0647 Mon Sep 17 00:00:00 2001 From: Ryan Connor Date: Wed, 23 Dec 2015 22:42:38 +0700 Subject: [PATCH 1930/5486] fix broken links --- english/play-geometrydash/play-geometrydash.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/play-geometrydash/play-geometrydash.md b/english/play-geometrydash/play-geometrydash.md index ef2b18cd95..45ace9efcb 100644 --- a/english/play-geometrydash/play-geometrydash.md +++ b/english/play-geometrydash/play-geometrydash.md @@ -6,5 +6,6 @@ You beat it first try like a boss. You pat yourself on the back, for you win at life. -[You feel great, so you open YouTube to watch some Conan O'Brien clips.](/conan) -[You feel AMAZING, so you walk up to the pretty girl across the room.](/pretty-girl) \ No newline at end of file +[You feel great, so you open YouTube to watch some Conan O'Brien clips.](../conan/conan.md) + +[You feel AMAZING, so you walk up to the pretty girl across the room.](../pretty-girl/pretty-girl.md) \ No newline at end of file From 6e89f8be057c1d0455393546d8cee439787dc103 Mon Sep 17 00:00:00 2001 From: Ryan Connor Date: Wed, 23 Dec 2015 22:47:33 +0700 Subject: [PATCH 1931/5486] fix broken links. really. --- english/play-geometrydash/play-geometrydash.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/play-geometrydash/play-geometrydash.md b/english/play-geometrydash/play-geometrydash.md index 45ace9efcb..fb04ddb2ee 100644 --- a/english/play-geometrydash/play-geometrydash.md +++ b/english/play-geometrydash/play-geometrydash.md @@ -6,6 +6,6 @@ You beat it first try like a boss. You pat yourself on the back, for you win at life. -[You feel great, so you open YouTube to watch some Conan O'Brien clips.](../conan/conan.md) +[You feel great, so you open YouTube to watch some Conan O'Brien clips.](conan/conan.md) -[You feel AMAZING, so you walk up to the pretty girl across the room.](../pretty-girl/pretty-girl.md) \ No newline at end of file +[You feel AMAZING, so you walk up to the pretty girl across the room.](pretty-girl/pretty-girl.md) \ No newline at end of file From 0a4bc98540fe00c7869fa4bfbe49b2fd350179ee Mon Sep 17 00:00:00 2001 From: Test User Date: Thu, 24 Dec 2015 19:12:30 +0530 Subject: [PATCH 1932/5486] Modify story --- english/lighter/grab-lighter.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/lighter/grab-lighter.md b/english/lighter/grab-lighter.md index 640e2c5653..07d80c2f33 100644 --- a/english/lighter/grab-lighter.md +++ b/english/lighter/grab-lighter.md @@ -2,6 +2,7 @@ You swipe the lighter off the floor as your hand shakes. You try feverishly to hide it in your pant pocket as the hand grabs wildly at your leg. +You look around nervously. An omnious feeling creeps in. You start to worry. You place it carefully in you pocket and take a deep breath. The marshmallow hand scurries away and huddles in a corner of the room, From a19e470a98f05159d118c3d5510db5119d42f81d Mon Sep 17 00:00:00 2001 From: Alexandru Simonescu Date: Thu, 24 Dec 2015 16:09:06 +0100 Subject: [PATCH 1933/5486] Added my part of story. Spanish --- espanol/pensamiento/guerra.md | 3 ++- espanol/pensamiento/meditacion/meditar.md | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 espanol/pensamiento/meditacion/meditar.md diff --git a/espanol/pensamiento/guerra.md b/espanol/pensamiento/guerra.md index a145ab94fa..ed7ff86e22 100644 --- a/espanol/pensamiento/guerra.md +++ b/espanol/pensamiento/guerra.md @@ -5,4 +5,5 @@ Ser Tras terminar con sus lamentaciones: -[Una reflexin de gran importancia le asalt](estoicismo/estoicismo.md) \ No newline at end of file +[Una reflexin de gran importancia le asalt](estoicismo/estoicismo.md) +[Se sentó en el suelo y se puso a meditar](meditacion/meditar.md) diff --git a/espanol/pensamiento/meditacion/meditar.md b/espanol/pensamiento/meditacion/meditar.md new file mode 100644 index 0000000000..4353099933 --- /dev/null +++ b/espanol/pensamiento/meditacion/meditar.md @@ -0,0 +1,6 @@ +En aquel momento todo lo empezó a percibir de otra forma. De una forma mucho mas profunda y conectada +con el universo. + +Después de mucho rato llegó a una conclusión: + +El universo lo somos TODOS. From 0757aaf0ffad12d24cfee29d6d19381615112c48 Mon Sep 17 00:00:00 2001 From: Alexandru Simonescu Date: Thu, 24 Dec 2015 16:55:34 +0100 Subject: [PATCH 1934/5486] Fixed blank line between lines --- espanol/pensamiento/guerra.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/pensamiento/guerra.md b/espanol/pensamiento/guerra.md index ed7ff86e22..ee6269f4ce 100644 --- a/espanol/pensamiento/guerra.md +++ b/espanol/pensamiento/guerra.md @@ -6,4 +6,5 @@ Ser Tras terminar con sus lamentaciones: [Una reflexin de gran importancia le asalt](estoicismo/estoicismo.md) + [Se sentó en el suelo y se puso a meditar](meditacion/meditar.md) From 3bfe2fdc89026a97900661d854fe730541503fe3 Mon Sep 17 00:00:00 2001 From: Hammad Khalid Date: Fri, 25 Dec 2015 17:31:32 -0500 Subject: [PATCH 1935/5486] Add Donald Trump's reply --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 58254b07d5..c31b9b4403 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -691,4 +691,6 @@ So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyAr I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/star-wars.md) -"What's a Heffelump?" asked Sheffield inquisitively. \ No newline at end of file +"What's a Heffelump?" asked Sheffield inquisitively. + +"I dont't know! Why should I care?" replied Donald Trump. From 8e3cbf115b38fde7644534c14e131dc9d48ea4be Mon Sep 17 00:00:00 2001 From: Mohammad Khan Date: Fri, 25 Dec 2015 22:36:45 -0500 Subject: [PATCH 1936/5486] Add option to play DOTA song in play-dota2.md --- english/play-dota2/play-dota2.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/play-dota2/play-dota2.md b/english/play-dota2/play-dota2.md index a0fa1bbb6d..b1d5dbb1e9 100644 --- a/english/play-dota2/play-dota2.md +++ b/english/play-dota2/play-dota2.md @@ -4,4 +4,6 @@ You wonder what hero to pick, then you picked Techies in the end. You dominated so hard that the enemy started flaming you. -You won the game and didn't care in the end though. \ No newline at end of file +You won the game and didn't care in the end though. + +After winning you decide to [play the DOTA song by Basshunter.](https://www.youtube.com/watch?v=8d44ykdKvCw) \ No newline at end of file From 9a9adadc975eea5c39a4f869987e8cc0d0240690 Mon Sep 17 00:00:00 2001 From: Marcelo Volta Date: Sat, 26 Dec 2015 08:35:07 -0300 Subject: [PATCH 1937/5486] Merge upstream/master into change --- espanol/canudos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index e9c0d1db16..726b54bf34 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -95,3 +95,5 @@ Al ojearlo, una duda lo emabargó...[¿Qué hago?](duda/duda.md) Al despertar y enfocar la vista vió lo que había sucedido tras la explosión [que pasó?](explosion/explosion.md) + +Salió corriendo y no se lo vio nunca más en el reino From fb59acd6f485065ad1fb666a7b3c00d725b88c6d Mon Sep 17 00:00:00 2001 From: Marcelo Volta Date: Sat, 26 Dec 2015 09:04:50 -0300 Subject: [PATCH 1938/5486] Add Pappo's reference to the Spanish version --- espanol/canudos.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index 726b54bf34..0726bef323 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -97,3 +97,6 @@ Al despertar y enfocar la vista vió lo que había sucedido tras la explosión [que pasó?](explosion/explosion.md) Salió corriendo y no se lo vio nunca más en el reino + +Conectó su guitarra al amplificador y se puso a tocar una versión de "Siempre es lo mismo, nena", pero sin distorsión + From 9f62ff64c405760c858bcfa62724cdd65a96cbc4 Mon Sep 17 00:00:00 2001 From: Salil Jayachandran Date: Sat, 26 Dec 2015 19:48:45 +0530 Subject: [PATCH 1939/5486] modify malayalam.md --- Malayalam/malayalam.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index 791a5dcb46..0ce1610c4f 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -7,3 +7,7 @@ ടിന്റു മോൻ മിടുമിടുക്കനായിരുന്നു ശശിയുടെ [പ്ലിംഗ്](sasi/pling.md) കഥ + +ടിന്റുമോന്റെ ചങ്ങതിആയിരുന്നു ശശി + +hahaha From 0301a0b705c171df8e671b3297cb8bad3d261b38 Mon Sep 17 00:00:00 2001 From: Salil Jayachandran Date: Sat, 26 Dec 2015 19:50:33 +0530 Subject: [PATCH 1940/5486] malayalam.md fix typo error --- Malayalam/malayalam.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index 0ce1610c4f..ff7e65769d 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -10,4 +10,4 @@ ടിന്റുമോന്റെ ചങ്ങതിആയിരുന്നു ശശി -hahaha + From 4d6c16553becfdf4b23f50887a03e30716765140 Mon Sep 17 00:00:00 2001 From: jcgdev Date: Sat, 26 Dec 2015 16:47:45 -0800 Subject: [PATCH 1941/5486] Add a line of dialogue for the rat in fire.md --- english/light-fire/fire.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/light-fire/fire.md b/english/light-fire/fire.md index 42e933a422..c23c72e242 100644 --- a/english/light-fire/fire.md +++ b/english/light-fire/fire.md @@ -15,6 +15,8 @@ walls for you to squeeze through. But then you notice a rat entering that opening too. +The rat smiles and says, "Come on, let's go!" + [Enter that opening](magic-world/alice.md) [Start screaming seeing the rat](fire/alone.md) From 73f6bca751ac0e4fc508a6353feb96aab80270ae Mon Sep 17 00:00:00 2001 From: csgray Date: Sat, 26 Dec 2015 16:39:19 -0900 Subject: [PATCH 1942/5486] Create transform.md --- english/transform/transform.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 english/transform/transform.md diff --git a/english/transform/transform.md b/english/transform/transform.md new file mode 100644 index 0000000000..c7330bf824 --- /dev/null +++ b/english/transform/transform.md @@ -0,0 +1,8 @@ +Suddenly, everything around you grows larger. The walls seem to move away then rise and rise until they can no longer be +distinguished from the ceiling. There's just the dome of the 'sky.' The items that you had previously set aside likewise +tower over you. Clearly, you have shrunk. + +You feel... spongy. Squishy, even. You try to hold up your hands, but you don't have any! Looking down, you see the +golden ring around your waist like a belt. The rest of you is white, soft, and cylindrical. + +You have turned into a marshmallow! The fear of chocolate and graham crackers fills you. From 02f130f3d409b653b9eb2205aef67063480b002c Mon Sep 17 00:00:00 2001 From: csgray Date: Sat, 26 Dec 2015 16:41:23 -0900 Subject: [PATCH 1943/5486] Add transform option. --- english/alchemy/alchemy.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index 1145097c5b..a3726dba11 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -32,6 +32,8 @@ You slip the ring over your finger and ... [you close you eyes and recite Buzz Lightyear's "To infinity and beyond!"](../my-story/my-story.md) +[Transform!](../transform/transform.md) + [quickly decide to take the ring off and try using its unknown powers later](../android-v6/use-android-v6.md) -[Congratulations!](../marshmallow.md) \ No newline at end of file +[Congratulations!](../marshmallow.md) From adb13309fd1b654df9e3bf5e0320d505f78ca37b Mon Sep 17 00:00:00 2001 From: csgray Date: Sat, 26 Dec 2015 16:46:02 -0900 Subject: [PATCH 1944/5486] Moved transform option to not delete lines --- english/alchemy/alchemy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index a3726dba11..57e02db639 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -32,8 +32,8 @@ You slip the ring over your finger and ... [you close you eyes and recite Buzz Lightyear's "To infinity and beyond!"](../my-story/my-story.md) -[Transform!](../transform/transform.md) - [quickly decide to take the ring off and try using its unknown powers later](../android-v6/use-android-v6.md) [Congratulations!](../marshmallow.md) + +[Transform!](../transform/transform.md) From 36d5f64448ac9b70647e960ae8cdf5e1cbcc6d5b Mon Sep 17 00:00:00 2001 From: Swati Kamtar Date: Sun, 27 Dec 2015 00:20:44 -0800 Subject: [PATCH 1945/5486] Add new folder (kannada_kali) to kannada --- kannada/kannada_kali/kannada_kali.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 kannada/kannada_kali/kannada_kali.md diff --git a/kannada/kannada_kali/kannada_kali.md b/kannada/kannada_kali/kannada_kali.md new file mode 100644 index 0000000000..d0c89ef653 --- /dev/null +++ b/kannada/kannada_kali/kannada_kali.md @@ -0,0 +1 @@ +ಕನ್ನಡ ಕಲಿಯಲು [ಇದು](https://play.google.com/store/apps/details?id=com.pgjpb.learnkannada&hl=en) ಒಳ್ಳೆಯ ಸಾಧನ. \ No newline at end of file From fca95e80e184af01d20a8f218c481a0aad7c31f4 Mon Sep 17 00:00:00 2001 From: Swati Kamtar Date: Sun, 27 Dec 2015 00:29:19 -0800 Subject: [PATCH 1946/5486] Add the link to README.md (soochike) --- kannada/soochike.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kannada/soochike.md b/kannada/soochike.md index 8b16d62b82..487b93b984 100644 --- a/kannada/soochike.md +++ b/kannada/soochike.md @@ -1,4 +1,5 @@ ಇದು ಕನ್ನಡ ಬರಹಗಳ ಸೂಚಿಕೆ. ಲೇಖನಗಳು: -1. ರೋಮಾಂಚನವೀ ಕನ್ನಡ! ಓದಲು, [ಇಲ್ಲಿ ಒತ್ತಿ](romaanchanavee_kannada/romaanchanavee_kannada.md). \ No newline at end of file +1. ರೋಮಾಂಚನವೀ ಕನ್ನಡ! ಓದಲು, [ಇಲ್ಲಿ ಒತ್ತಿ](romaanchanavee_kannada/romaanchanavee_kannada.md). +2. ಕನ್ನಡ ಕಲಿಯಲು [ಇಲ್ಲಿ](kannada_kali/kannada_kali.md). \ No newline at end of file From 65716b2b39f0ea37f721850573f186d79540cc3b Mon Sep 17 00:00:00 2001 From: Swati Kamtar Date: Sun, 27 Dec 2015 00:33:21 -0800 Subject: [PATCH 1947/5486] Add a line break between links --- kannada/soochike.md | 1 + 1 file changed, 1 insertion(+) diff --git a/kannada/soochike.md b/kannada/soochike.md index 487b93b984..d0e910d27c 100644 --- a/kannada/soochike.md +++ b/kannada/soochike.md @@ -2,4 +2,5 @@ ಲೇಖನಗಳು: 1. ರೋಮಾಂಚನವೀ ಕನ್ನಡ! ಓದಲು, [ಇಲ್ಲಿ ಒತ್ತಿ](romaanchanavee_kannada/romaanchanavee_kannada.md). + 2. ಕನ್ನಡ ಕಲಿಯಲು [ಇಲ್ಲಿ](kannada_kali/kannada_kali.md). \ No newline at end of file From 85481052cf1edda933beabfc3a05da61a37892ea Mon Sep 17 00:00:00 2001 From: shiva Date: Sun, 27 Dec 2015 14:17:22 +0530 Subject: [PATCH 1948/5486] Add to extinguish-fire.md --- english/light-fire/extinguish-fire/extinguish-fire.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/light-fire/extinguish-fire/extinguish-fire.md b/english/light-fire/extinguish-fire/extinguish-fire.md index 6bbe8b4974..a76fa33379 100644 --- a/english/light-fire/extinguish-fire/extinguish-fire.md +++ b/english/light-fire/extinguish-fire/extinguish-fire.md @@ -5,3 +5,7 @@ You spray the extinguisher over the roaring flames and put them out quickly. To your amazement and horror the chemicals from the extinguisher cause a terrible reaction. The marshmallow hardens around your feet leaving you with limited movement. + +You have a chainsaw nearby but you cant cut through marshmallow. + +You have only one option left. From 8458b66d3d0e242a47315d160c890f3ed957dde8 Mon Sep 17 00:00:00 2001 From: DDRitter Date: Sun, 27 Dec 2015 12:05:58 +0100 Subject: [PATCH 1949/5486] Add option to eat the chocolate --- english/poke-the-wall/eat-way-out/eat-way-out.md | 11 +++++++++++ english/poke-the-wall/poke-the-wall.md | 15 +++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 english/poke-the-wall/eat-way-out/eat-way-out.md diff --git a/english/poke-the-wall/eat-way-out/eat-way-out.md b/english/poke-the-wall/eat-way-out/eat-way-out.md new file mode 100644 index 0000000000..1058947835 --- /dev/null +++ b/english/poke-the-wall/eat-way-out/eat-way-out.md @@ -0,0 +1,11 @@ +You turn your body with some difficulty to the door and start eating the chocolate +while trying to advance. + +It's delicious! + +If the door is locked at least you will have a sweet death. + +But, please, let the door be unlocked. + +5.300 calories later you manage to get closer to the door and reach the knob +with your hand. \ No newline at end of file diff --git a/english/poke-the-wall/poke-the-wall.md b/english/poke-the-wall/poke-the-wall.md index dd29579caf..f611dd62b1 100644 --- a/english/poke-the-wall/poke-the-wall.md +++ b/english/poke-the-wall/poke-the-wall.md @@ -1,3 +1,18 @@ A thick layer of gooey (or GUI) delicious-looking chocolate syrup begins oozing out of the wall! + +Suddenly, the poked wall pops a couple marsmallows around the breach and the flow +speeds up. + +While you wait contemplating the brown cascade of calories with a dropped jaw +the room fills quickly. + +The liquid chocolate rises and covers you up until the chest. +You realize that now you can barely move and the + +You see a marsmallow-shaped door made of marshmallows a few meters to your left. + +You wonder if it would be wise to [eat your way out.](eat-way-out/eat-way-out.md). + +Or perhaps you should think a little more for an alternative solution. \ No newline at end of file From 52a48e2ee25289a989294638850ee3b076c2a7f0 Mon Sep 17 00:00:00 2001 From: RIdotCOM Date: Sun, 27 Dec 2015 12:15:18 +0100 Subject: [PATCH 1950/5486] Start of a creative story --- .../coffee/cookie/Walk/creative-writing/creative-writing.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/coffee/cookie/Walk/creative-writing/creative-writing.md b/english/coffee/cookie/Walk/creative-writing/creative-writing.md index e2a043ab86..aa0fb622ab 100644 --- a/english/coffee/cookie/Walk/creative-writing/creative-writing.md +++ b/english/coffee/cookie/Walk/creative-writing/creative-writing.md @@ -4,4 +4,6 @@ You immedately start to write all the thoughts flowing through your head. Your penmanship is impressive, but it is too messy for the world to see, so you grab your laptop. -You begin to transpose your story onto a word processor. You write: \ No newline at end of file +You begin to transpose your story onto a word processor. You write: + +I thought it is a terrible idea! \ No newline at end of file From 48058fe40faeedaf91f2deeff372094f78145ebc Mon Sep 17 00:00:00 2001 From: Sam Brow Date: Sun, 27 Dec 2015 11:52:23 -0500 Subject: [PATCH 1951/5486] Add explanation for the roar after leaving the marshmallow house --- english/lightsaber/wampa/wampa.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/english/lightsaber/wampa/wampa.md b/english/lightsaber/wampa/wampa.md index 2f35a18940..be764f8e7c 100644 --- a/english/lightsaber/wampa/wampa.md +++ b/english/lightsaber/wampa/wampa.md @@ -5,4 +5,9 @@ from the melting marshmallow mansion, you hear a blood-curdling roar. You smell lilac and it reminds you of summering in the hamptons with your good friends the Millers. I wonder what they are up to now? -You run into something, and it's not just the cold. \ No newline at end of file +You run into something, and it's not just the cold. + +You stumble over a small metalic box in the stubby grass. Upon closer inspection, you find that +the roar is actually coming from this box. It has some kind of proximity sensor that triggers it. +Now why would someone have left this lying here? + From 9726909d15831abbcd5c1a0aab148db7be08e6d0 Mon Sep 17 00:00:00 2001 From: James McCarthy-Price Date: Mon, 28 Dec 2015 23:10:39 +0800 Subject: [PATCH 1952/5486] Add new line to references file --- english/references/references.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/references/references.md b/english/references/references.md index 889623bd38..e1b9b8f179 100644 --- a/english/references/references.md +++ b/english/references/references.md @@ -6,4 +6,6 @@ Then while making a gradual motion with 3 fingers on your right hand, you say Because 'the Force' is strong in you, the Chief Marshmallow agrees. Then with the same motion you say "Be on your way". The Chief Marshmallow looks at you and waves you on saying ["Be on your way"](../marshmallow.md) -Before you go, you decide to ask the Chief Marshmallow for HIS [references](../chief-history/chief-history.md). \ No newline at end of file +Before you go, you decide to ask the Chief Marshmallow for HIS [references](../chief-history/chief-history.md). + +You see that the Chief Marshmellow is looking a little pale, and note that Chief Marshmellow's really look their best when golden brown. So you ["Lunch for a lighter to make him golden brown."](../lunge-for-the-lighter/lunge-for-the-lighter.md) \ No newline at end of file From 1c474fdae4985d0fb697e0a0b3e8d809f07fbe09 Mon Sep 17 00:00:00 2001 From: James McCarthy-Price Date: Mon, 28 Dec 2015 23:15:30 +0800 Subject: [PATCH 1953/5486] Break story addition into two seperate lines --- english/references/references.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/references/references.md b/english/references/references.md index e1b9b8f179..f449745798 100644 --- a/english/references/references.md +++ b/english/references/references.md @@ -8,4 +8,5 @@ The Chief Marshmallow looks at you and waves you on saying ["Be on your way"](.. Before you go, you decide to ask the Chief Marshmallow for HIS [references](../chief-history/chief-history.md). -You see that the Chief Marshmellow is looking a little pale, and note that Chief Marshmellow's really look their best when golden brown. So you ["Lunch for a lighter to make him golden brown."](../lunge-for-the-lighter/lunge-for-the-lighter.md) \ No newline at end of file +You know Chief Marshmellow's really look their best when golden brown. +So you ["Lunch for a lighter to make him golden brown."](../lunge-for-the-lighter/lunge-for-the-lighter.md) \ No newline at end of file From 9348301ae880c10f5e081ecef99cce856a99b2c2 Mon Sep 17 00:00:00 2001 From: jmspessot Date: Mon, 28 Dec 2015 17:49:03 -0300 Subject: [PATCH 1954/5486] Agregado de info sobre asesinato del alcalde --- espanol/torre/alarma/asustado/asustado.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/torre/alarma/asustado/asustado.md b/espanol/torre/alarma/asustado/asustado.md index fa3b5703d2..e08a2116d2 100644 --- a/espanol/torre/alarma/asustado/asustado.md +++ b/espanol/torre/alarma/asustado/asustado.md @@ -1,2 +1,4 @@ Empezando un escándalo, entonces el consejero fue corriendo hacia donde estaba el alcalde del pueblo. Y aprovechado la confusión del pueblo saco una daga y le apuñalo en el corazon. +El alcalde alcanzó a vociferar: "Qué haz hecho? Ahora todos sabrán la verdad acerca de tus propositos" y al decir esto +cayó muerto dejando caer un sobre. El consejero intentó hacerse con el sobre pero el mismo fue impulsado por el viento. \ No newline at end of file From cab924c7406930cbd64c9640a112cdb50d08fb86 Mon Sep 17 00:00:00 2001 From: Andre Coleman Date: Mon, 28 Dec 2015 14:16:45 -0800 Subject: [PATCH 1955/5486] add line to adipose --- english/adipose/adipose.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/adipose/adipose.md b/english/adipose/adipose.md index 636960daf6..3e255aa030 100644 --- a/english/adipose/adipose.md +++ b/english/adipose/adipose.md @@ -13,4 +13,6 @@ was a human?" I must resolve this marshmallow dream. -[Wake Up](awake/awake.md) \ No newline at end of file +[Wake Up](awake/awake.md) + +You realize you can't wake up. Or you are already awake. But you must continue because \ No newline at end of file From 2d8f7cb96172ef66b08b34c5aa8e5d9cd30011d0 Mon Sep 17 00:00:00 2001 From: green Date: Mon, 28 Dec 2015 15:11:28 -0800 Subject: [PATCH 1956/5486] Add link for kitchen --- english/memories/ground-hog/wakeup.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/memories/ground-hog/wakeup.md b/english/memories/ground-hog/wakeup.md index 5f40b8ab91..f8f338c5fa 100644 --- a/english/memories/ground-hog/wakeup.md +++ b/english/memories/ground-hog/wakeup.md @@ -8,3 +8,5 @@ Do you ever get [deja vu](wakeup.md) Mrs. Lancaster?. Mrs. Lancaster's reply, 'I don't know let me check with the kitchen. +You go to the [kitchen](../../kitchen/vegetables.md). + From 20b3a084317dedef214efb63b36c6e1ead15811d Mon Sep 17 00:00:00 2001 From: green Date: Mon, 28 Dec 2015 15:14:49 -0800 Subject: [PATCH 1957/5486] Create kitchen directory and file vegetables.md --- english/kitchen/vegetables.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 english/kitchen/vegetables.md diff --git a/english/kitchen/vegetables.md b/english/kitchen/vegetables.md new file mode 100644 index 0000000000..064afa33c2 --- /dev/null +++ b/english/kitchen/vegetables.md @@ -0,0 +1,9 @@ +"We need more veggies," the Chef said with a sigh, "will you fetch some in the garden?" + +You go to the [garden](../garden/choose.md). + +You want to [fight](../fight-out/fight-out.md) instead. + +You can't [remember](../memories/memories.md). + +You are dreaming, [wake up](../memories/ground-hog/wakeup.md)! \ No newline at end of file From 586e4b3812a1da14fb3a865813be2ffea2d0cb1c Mon Sep 17 00:00:00 2001 From: green Date: Mon, 28 Dec 2015 15:16:44 -0800 Subject: [PATCH 1958/5486] Create directory garden and add files --- english/garden/beans.md | 7 +++++++ english/garden/carrots.md | 6 ++++++ english/garden/choose.md | 11 +++++++++++ english/garden/tomatoes.md | 6 ++++++ 4 files changed, 30 insertions(+) create mode 100644 english/garden/beans.md create mode 100644 english/garden/carrots.md create mode 100644 english/garden/choose.md create mode 100644 english/garden/tomatoes.md diff --git a/english/garden/beans.md b/english/garden/beans.md new file mode 100644 index 0000000000..b454e70dfc --- /dev/null +++ b/english/garden/beans.md @@ -0,0 +1,7 @@ +Ah! Good choice. +Beans are high in protein and have virtually no fat. +They also have more fiber than most whole grain foods. + +[Go to the kitchen.](../kitchen/vegetables.md) + +[Go back to the garden.](choose.md) \ No newline at end of file diff --git a/english/garden/carrots.md b/english/garden/carrots.md new file mode 100644 index 0000000000..62824e0e03 --- /dev/null +++ b/english/garden/carrots.md @@ -0,0 +1,6 @@ +What's up doc? Carrots contain beta-carotene. +They are important for eyesight, skin health, and normal growth. + +[Go to the kitchen.](../kitchen/vegetables.md) + +[Go back to the garden.](choose.md) \ No newline at end of file diff --git a/english/garden/choose.md b/english/garden/choose.md new file mode 100644 index 0000000000..cb6321ab5f --- /dev/null +++ b/english/garden/choose.md @@ -0,0 +1,11 @@ +The garden is beautiful. +There is a light breeze and you see the rows of vegetables sway. +You can smell the damp earth and hear crickets in the distance. +You bend over and inspect the plants. +You decide to choose: + +[Beans](beans.md). + +[Carrots](carrots.md) + +[Tomatoes](tomatoes.md) diff --git a/english/garden/tomatoes.md b/english/garden/tomatoes.md new file mode 100644 index 0000000000..302eb989aa --- /dev/null +++ b/english/garden/tomatoes.md @@ -0,0 +1,6 @@ +What a treat! +Tomatoes are known for their outstanding antioxidant content. + +[Go to the kitchen.](../kitchen/vegetables.md) + +[Go back to the garden.](choose.md) \ No newline at end of file From 22b687184c544b166425adc03f7d26f8a7abcce3 Mon Sep 17 00:00:00 2001 From: green Date: Mon, 28 Dec 2015 15:28:50 -0800 Subject: [PATCH 1959/5486] Move vegetables to seperate folders and update links --- english/garden/beans/beans.md | 7 +++++++ english/garden/carrots/carrots.md | 6 ++++++ english/garden/choose.md | 6 +++--- english/garden/tomatoes/tomatoes.md | 6 ++++++ 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 english/garden/beans/beans.md create mode 100644 english/garden/carrots/carrots.md create mode 100644 english/garden/tomatoes/tomatoes.md diff --git a/english/garden/beans/beans.md b/english/garden/beans/beans.md new file mode 100644 index 0000000000..ec25a59593 --- /dev/null +++ b/english/garden/beans/beans.md @@ -0,0 +1,7 @@ +Ah! Good choice. +Beans are high in protein and have virtually no fat. +They also have more fiber than most whole grain foods. + +[Go to the kitchen.](../kitchen/vegetables.md) + +[Go back to the garden.](../choose.md) \ No newline at end of file diff --git a/english/garden/carrots/carrots.md b/english/garden/carrots/carrots.md new file mode 100644 index 0000000000..8b2d15c334 --- /dev/null +++ b/english/garden/carrots/carrots.md @@ -0,0 +1,6 @@ +What's up doc? Carrots contain beta-carotene. +They are important for eyesight, skin health, and normal growth. + +[Go to the kitchen.](../kitchen/vegetables.md) + +[Go back to the garden.](../choose.md) \ No newline at end of file diff --git a/english/garden/choose.md b/english/garden/choose.md index cb6321ab5f..6e2b7c34e3 100644 --- a/english/garden/choose.md +++ b/english/garden/choose.md @@ -4,8 +4,8 @@ You can smell the damp earth and hear crickets in the distance. You bend over and inspect the plants. You decide to choose: -[Beans](beans.md). +[Beans](beans/beans.md). -[Carrots](carrots.md) +[Carrots](carrots/carrots.md) -[Tomatoes](tomatoes.md) +[Tomatoes](tomatoes/tomatoes.md) diff --git a/english/garden/tomatoes/tomatoes.md b/english/garden/tomatoes/tomatoes.md new file mode 100644 index 0000000000..12d1482167 --- /dev/null +++ b/english/garden/tomatoes/tomatoes.md @@ -0,0 +1,6 @@ +What a treat! +Tomatoes are known for their outstanding antioxidant content. + +[Go to the kitchen.](../kitchen/vegetables.md) + +[Go back to the garden.](../choose.md) \ No newline at end of file From d1423ee61d8d41544c1c9c2cad5ae7ec49de323e Mon Sep 17 00:00:00 2001 From: green Date: Mon, 28 Dec 2015 15:32:42 -0800 Subject: [PATCH 1960/5486] Update kitchen links for vegetables pages --- english/garden/beans/beans.md | 2 +- english/garden/carrots/carrots.md | 2 +- english/garden/tomatoes/tomatoes.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/english/garden/beans/beans.md b/english/garden/beans/beans.md index ec25a59593..d1400d7b50 100644 --- a/english/garden/beans/beans.md +++ b/english/garden/beans/beans.md @@ -2,6 +2,6 @@ Ah! Good choice. Beans are high in protein and have virtually no fat. They also have more fiber than most whole grain foods. -[Go to the kitchen.](../kitchen/vegetables.md) +[Go to the kitchen.](../../kitchen/vegetables.md) [Go back to the garden.](../choose.md) \ No newline at end of file diff --git a/english/garden/carrots/carrots.md b/english/garden/carrots/carrots.md index 8b2d15c334..bc8de4d890 100644 --- a/english/garden/carrots/carrots.md +++ b/english/garden/carrots/carrots.md @@ -1,6 +1,6 @@ What's up doc? Carrots contain beta-carotene. They are important for eyesight, skin health, and normal growth. -[Go to the kitchen.](../kitchen/vegetables.md) +[Go to the kitchen.](../../kitchen/vegetables.md) [Go back to the garden.](../choose.md) \ No newline at end of file diff --git a/english/garden/tomatoes/tomatoes.md b/english/garden/tomatoes/tomatoes.md index 12d1482167..7534c3f69d 100644 --- a/english/garden/tomatoes/tomatoes.md +++ b/english/garden/tomatoes/tomatoes.md @@ -1,6 +1,6 @@ What a treat! Tomatoes are known for their outstanding antioxidant content. -[Go to the kitchen.](../kitchen/vegetables.md) +[Go to the kitchen.](../../kitchen/vegetables.md) [Go back to the garden.](../choose.md) \ No newline at end of file From 44e27b23e6d656619a6e5f21037220880ec9d654 Mon Sep 17 00:00:00 2001 From: M Date: Mon, 28 Dec 2015 15:41:05 -0800 Subject: [PATCH 1961/5486] Delete beans.md --- english/garden/beans.md | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 english/garden/beans.md diff --git a/english/garden/beans.md b/english/garden/beans.md deleted file mode 100644 index b454e70dfc..0000000000 --- a/english/garden/beans.md +++ /dev/null @@ -1,7 +0,0 @@ -Ah! Good choice. -Beans are high in protein and have virtually no fat. -They also have more fiber than most whole grain foods. - -[Go to the kitchen.](../kitchen/vegetables.md) - -[Go back to the garden.](choose.md) \ No newline at end of file From 3619a4e7e74afa15f7cf5ccda44b9fc21c6a2d17 Mon Sep 17 00:00:00 2001 From: M Date: Mon, 28 Dec 2015 15:41:14 -0800 Subject: [PATCH 1962/5486] Delete carrots.md --- english/garden/carrots.md | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 english/garden/carrots.md diff --git a/english/garden/carrots.md b/english/garden/carrots.md deleted file mode 100644 index 62824e0e03..0000000000 --- a/english/garden/carrots.md +++ /dev/null @@ -1,6 +0,0 @@ -What's up doc? Carrots contain beta-carotene. -They are important for eyesight, skin health, and normal growth. - -[Go to the kitchen.](../kitchen/vegetables.md) - -[Go back to the garden.](choose.md) \ No newline at end of file From 1d7f4e34258d5e774361df939150ecdcee32ef7e Mon Sep 17 00:00:00 2001 From: M Date: Mon, 28 Dec 2015 15:41:20 -0800 Subject: [PATCH 1963/5486] Delete tomatoes.md --- english/garden/tomatoes.md | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 english/garden/tomatoes.md diff --git a/english/garden/tomatoes.md b/english/garden/tomatoes.md deleted file mode 100644 index 302eb989aa..0000000000 --- a/english/garden/tomatoes.md +++ /dev/null @@ -1,6 +0,0 @@ -What a treat! -Tomatoes are known for their outstanding antioxidant content. - -[Go to the kitchen.](../kitchen/vegetables.md) - -[Go back to the garden.](choose.md) \ No newline at end of file From 3d2fbeef5bafdf051ed4d37f9479f2d209eec08c Mon Sep 17 00:00:00 2001 From: farsyd Date: Mon, 28 Dec 2015 18:19:53 -0600 Subject: [PATCH 1964/5486] Add options for work or play --- english/marshmallow.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index c31b9b4403..07dd7280cf 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -694,3 +694,8 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "What's a Heffelump?" asked Sheffield inquisitively. "I dont't know! Why should I care?" replied Donald Trump. + +When faced with a lot of work and impending deadlines in the (not so near) future, +there are two options you must choose from. You may either do [this](gtd/gtd.md), or [that](procrastinate). + + From 50f2a1a15986c7cceed0625c19a477f601399ea6 Mon Sep 17 00:00:00 2001 From: farsyd Date: Mon, 28 Dec 2015 18:23:39 -0600 Subject: [PATCH 1965/5486] Create gtd.md --- english/gtd/gtd.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 english/gtd/gtd.md diff --git a/english/gtd/gtd.md b/english/gtd/gtd.md new file mode 100644 index 0000000000..7804843fe8 --- /dev/null +++ b/english/gtd/gtd.md @@ -0,0 +1,13 @@ +Good, seems like you really want to get some work done. +Open a new tab in your browser, and do a Google +search for "Getting Things Done". + +Or if you really, really need to work, +just close this window and everything else you +opened while trying to finish the udacity course +and just get to work. + +Come back to the marshmallow file and choose the +"that" option when you're done with your work. + +Cheers! From d1707a5781d26e6f709a443076ffcdcd989ceb28 Mon Sep 17 00:00:00 2001 From: farsyd Date: Mon, 28 Dec 2015 18:28:50 -0600 Subject: [PATCH 1966/5486] Create procrastinate.md --- english/procrastinate/procrastinate.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 english/procrastinate/procrastinate.md diff --git a/english/procrastinate/procrastinate.md b/english/procrastinate/procrastinate.md new file mode 100644 index 0000000000..b9008013d4 --- /dev/null +++ b/english/procrastinate/procrastinate.md @@ -0,0 +1,13 @@ +Aha, you don't seem like the one +that wants to get any work done right now, +do you? + +Or maybe you wanted to do some work initially, +but then curiosity killed the cat? + +Great! Open a new tab in your browser and +do a search for "Wait but why". + +Read the articles on procrastination. + +Have (pseudo) fun in your Dark Playground! From f8a917d2977de9528212b30f008ab81340e7fd6a Mon Sep 17 00:00:00 2001 From: farsyd Date: Mon, 28 Dec 2015 19:02:54 -0600 Subject: [PATCH 1967/5486] Add procrastinate option to work-or-play branch --- english/procrastinate/procrastinate.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 english/procrastinate/procrastinate.md diff --git a/english/procrastinate/procrastinate.md b/english/procrastinate/procrastinate.md new file mode 100644 index 0000000000..b9008013d4 --- /dev/null +++ b/english/procrastinate/procrastinate.md @@ -0,0 +1,13 @@ +Aha, you don't seem like the one +that wants to get any work done right now, +do you? + +Or maybe you wanted to do some work initially, +but then curiosity killed the cat? + +Great! Open a new tab in your browser and +do a search for "Wait but why". + +Read the articles on procrastination. + +Have (pseudo) fun in your Dark Playground! From c7706fa5ebff669c091944f98bb962a9f71ec6ba Mon Sep 17 00:00:00 2001 From: Farhan Syed Date: Mon, 28 Dec 2015 19:09:48 -0600 Subject: [PATCH 1968/5486] Fix broken link to procrastinate in marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 07dd7280cf..30607e8370 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -696,6 +696,6 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. You may either do [this](gtd/gtd.md), or [that](procrastinate). +there are two options you must choose from. You may either do [this](gtd/gtd.md), or [that](procrastinate/procrastinate.md). From 077e14323d3a45839400f9734423d51605826973 Mon Sep 17 00:00:00 2001 From: Farhan Syed Date: Mon, 28 Dec 2015 19:19:28 -0600 Subject: [PATCH 1969/5486] Fix changes in marshmallow.md to makes sure 1- All lines are < 120 characters 2- Only one option per line --- english/marshmallow.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 30607e8370..3857abd69f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -695,7 +695,12 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. You may either do [this](gtd/gtd.md), or [that](procrastinate/procrastinate.md). +When faced with a lot of work and impending deadlines +in the (not so near) future, +there are two options you must choose from. + +You may either do [this](gtd/gtd.md), + + or [that](procrastinate/procrastinate.md). From 5e7fa3c0469a34e1d9d946fd5c99906e4ada7b3b Mon Sep 17 00:00:00 2001 From: jmspessot Date: Mon, 28 Dec 2015 23:54:14 -0300 Subject: [PATCH 1970/5486] =?UTF-8?q?Ampliaci=C3=B3n=20de=20la=20historia?= =?UTF-8?q?=20del=20almirante=20Tiger=20Woods?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/comandante/almirante/almirante.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/comandante/almirante/almirante.md b/espanol/comandante/almirante/almirante.md index 23a4827915..3886c32008 100644 --- a/espanol/comandante/almirante/almirante.md +++ b/espanol/comandante/almirante/almirante.md @@ -1 +1,3 @@ El almirate tiger woods estaba muy feliz por la recomendacion de chuck asi que le dedico un hoyo en uno en su honor!! +Luego de dedicarle un hoyo en uno, tomó su smartphone, lentamente buscó en su agenda de contactos y decidió contactar a +Fatmagul a lo que el consejero replicó: Qué culpa tiene Fatmagul? \ No newline at end of file From 291c3b92bb620e1a89a1fb17582d37c213ef8c67 Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 28 Dec 2015 19:09:26 -0800 Subject: [PATCH 1971/5486] added a bit about flan to the story --- english/flan/flan.md | 1 + english/flann-o-brien/truth-is-odd.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/flan/flan.md diff --git a/english/flan/flan.md b/english/flan/flan.md new file mode 100644 index 0000000000..1ee48b6acb --- /dev/null +++ b/english/flan/flan.md @@ -0,0 +1 @@ +Do you want some flan? diff --git a/english/flann-o-brien/truth-is-odd.md b/english/flann-o-brien/truth-is-odd.md index 389fdeeff1..7dbbac8652 100644 --- a/english/flann-o-brien/truth-is-odd.md +++ b/english/flann-o-brien/truth-is-odd.md @@ -4,4 +4,6 @@ Becoming increasingly aware that the situation where you find the following: "there is safety in a triad, chastity is truth and truth is an odd number. And your statement that kangaroos are not human is highly -debatable." \ No newline at end of file +debatable." + +choose to eat [flan] (../flan/flan.md) \ No newline at end of file From 0ce968d1def0035f5b46db69411df8f01e70850f Mon Sep 17 00:00:00 2001 From: dyabmo Date: Tue, 29 Dec 2015 04:29:33 +0100 Subject: [PATCH 1972/5486] Add line: Je parle un peu arabe --- french/feu-de-camp.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 3fe77b81e5..747d993c1f 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -22,6 +22,8 @@ Que faites-vous ? [Je ne parle pas francais](../english/marshmallow.md) +[Je parle un peu arabe](../arabic/salamoAlikom.md) + [J'appelle ma mère immédiatement](appel-maman/appeler-maman.md) [Je demande de l'aide a Google](google/google.md) From 9681d2ceb756ab7432da2d13274678be9e6c90d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BC=80=EB=B9=88?= Date: Tue, 29 Dec 2015 15:28:01 +0900 Subject: [PATCH 1973/5486] added a story --- korean/marshmallow.md | 2 ++ korean/yoga/yoga.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 korean/yoga/yoga.md diff --git a/korean/marshmallow.md b/korean/marshmallow.md index ef2db22242..fb4d4c93f4 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -35,3 +35,5 @@ [벽으로 돌진한다](rush/rush.md) [볼을 꼬집어 본다](pinch/pinch.md) + +라고 고민하지만 선택하기 위해서 [요가를 한다](yoga/yoga.md) diff --git a/korean/yoga/yoga.md b/korean/yoga/yoga.md new file mode 100644 index 0000000000..578b7e80f4 --- /dev/null +++ b/korean/yoga/yoga.md @@ -0,0 +1,2 @@ +요가를 하면서 어떻게 해야할지 고민을 하다가[마시멜로를 먹는다](../eating-walls/eating-marshmallows.md)? + From 87e2ed377db6198d2fc51618b14f6489ac28b430 Mon Sep 17 00:00:00 2001 From: harry treble Date: Tue, 29 Dec 2015 14:57:12 +0000 Subject: [PATCH 1974/5486] found a cat lady in nepal --- english/nepal/nepal.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/nepal/nepal.md b/english/nepal/nepal.md index 526df9cf88..e871eb600c 100644 --- a/english/nepal/nepal.md +++ b/english/nepal/nepal.md @@ -1,3 +1,6 @@ You arrive in Nepal. You help Nepal to recover from earthquake. You remove the rubbles and pull out people who were stuck. +You find an upset lady who has lost one of her cats, +You try to shake her off but she insists on telling you about her [cat](../animal/animal.md) + From 1229943c88a275dd5107195d903f80a305585241 Mon Sep 17 00:00:00 2001 From: Greg Sweeney Date: Tue, 29 Dec 2015 10:22:22 -0500 Subject: [PATCH 1975/5486] add more detail to ladder vs. stairs decision. --- .../castle-route/narnia.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/challenge-marshmellow-to-rock-off/castle-route/narnia.md b/english/challenge-marshmellow-to-rock-off/castle-route/narnia.md index 5ea19430d4..1130d85ca8 100644 --- a/english/challenge-marshmellow-to-rock-off/castle-route/narnia.md +++ b/english/challenge-marshmellow-to-rock-off/castle-route/narnia.md @@ -24,4 +24,10 @@ disgust under its dark hood as it scurries to the stairs and vanishes in the dar cryptic language written on the hilt of the sword, you need to decide. Will it be the ladder? or the Stairs? -Despite the fact that you were the tri-state bronze medallist in the Stairmaster competition, \ No newline at end of file +Despite the fact that you were the tri-state bronze medallist in the Stairmaster competition, +you question the power of your beefy legs. Egads! The shadowy figure is upon you now. You must quickly +make your next decision. + +You examine both possible routes available to you. The ladder looks old and rickety, but stable enough to +climb. Descending the stairs are tiny hot-chocolate marshmallows armed with steel toothpick swords. They +are taunting you, singing in unison some indecipherable marshmallow battle hymn. \ No newline at end of file From ec0721d16960fd3ad68776e026aa451541fa30d8 Mon Sep 17 00:00:00 2001 From: harry treble Date: Tue, 29 Dec 2015 15:29:15 +0000 Subject: [PATCH 1976/5486] suddenly nepal --- english/malaria/scream/scream.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/malaria/scream/scream.md b/english/malaria/scream/scream.md index 2891f5f47d..649cc5cf9c 100644 --- a/english/malaria/scream/scream.md +++ b/english/malaria/scream/scream.md @@ -1,3 +1,6 @@ The high pitched baby scream that comes out of your mouth is muffled by the enclosing marshmallows. You keep screaming but with every second your scream gets weaker, and weaker. Then suddenly the -its bright again. The marshmallows have gone! But to where? \ No newline at end of file +its bright again. The marshmallows have gone! But to where? +Looking around you realise you are in a strange place and there is rubble everywhere and smoke, +You begin to [help out others](../nepal/nepal.md) + From a1d9d776c952b20d91ea23b7965a199699e1a428 Mon Sep 17 00:00:00 2001 From: htreb Date: Tue, 29 Dec 2015 15:32:49 +0000 Subject: [PATCH 1977/5486] Update scream.md --- english/malaria/scream/scream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/malaria/scream/scream.md b/english/malaria/scream/scream.md index 649cc5cf9c..237163cdb8 100644 --- a/english/malaria/scream/scream.md +++ b/english/malaria/scream/scream.md @@ -2,5 +2,5 @@ The high pitched baby scream that comes out of your mouth is muffled by the encl You keep screaming but with every second your scream gets weaker, and weaker. Then suddenly the its bright again. The marshmallows have gone! But to where? Looking around you realise you are in a strange place and there is rubble everywhere and smoke, -You begin to [help out others](../nepal/nepal.md) +You begin to [help out others](../../nepal/nepal.md) From ad9f0f46648d2f1371fe8b0f458979193636c60a Mon Sep 17 00:00:00 2001 From: harry treble Date: Tue, 29 Dec 2015 15:41:35 +0000 Subject: [PATCH 1978/5486] screaming at my missing fingernails. in hands/hands.md --- english/hands/hands.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/hands/hands.md b/english/hands/hands.md index 2ba8dd78b6..fa420ed151 100644 --- a/english/hands/hands.md +++ b/english/hands/hands.md @@ -7,4 +7,6 @@ Do you: [Dig at the walls with a fork](../dig/dig.md) -[Use the rope and the lighter to build up a door?](door/door.md) \ No newline at end of file +[Use the rope and the lighter to build up a door?](door/door.md) + +[scream appropriately at the fresh absence of your nails](../scream/scream.md) \ No newline at end of file From 3e780b4484575dfd670c66899d8af939139cd127 Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 29 Dec 2015 13:52:55 -0500 Subject: [PATCH 1979/5486] I added a little blurb to the Justice-League/Spiderman branch of the story. --- english/justice-league/spiderman/spiderman.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/justice-league/spiderman/spiderman.md b/english/justice-league/spiderman/spiderman.md index 969092cf0e..c3b25ab3bb 100644 --- a/english/justice-league/spiderman/spiderman.md +++ b/english/justice-league/spiderman/spiderman.md @@ -1 +1,7 @@ Your friendly neighbourhood spiderman is here to help!! + +"GET DOWN!" + +Spiderman lunges forward and tackles you to the ground. +A dark figure darts from building to building, but it's moving so fast you +can barely keep track of it. \ No newline at end of file From 5e1530fd0f0854ac65fb40c17caf32fc083ea72d Mon Sep 17 00:00:00 2001 From: Kevin Palencia Date: Tue, 29 Dec 2015 15:00:12 -0500 Subject: [PATCH 1980/5486] Add question about the story --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 3857abd69f..360916540e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -703,4 +703,4 @@ You may either do [this](gtd/gtd.md), or [that](procrastinate/procrastinate.md). - +This is one weird story. Did anybody read the whole page? From 11546a57c2dc629e115b2e2a92b491da9fc53963 Mon Sep 17 00:00:00 2001 From: Kevin Palencia Date: Tue, 29 Dec 2015 15:28:20 -0500 Subject: [PATCH 1981/5486] Re-add lines so my story will be automatically posted --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 360916540e..b4a5e6b6b4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -703,4 +703,6 @@ You may either do [this](gtd/gtd.md), or [that](procrastinate/procrastinate.md). -This is one weird story. Did anybody read the whole page? + This is one weird story. Did anybody read the whole page? + + From f8a6460e4c0972141d1ecdbda76063372799422e Mon Sep 17 00:00:00 2001 From: ilearnsofast Date: Wed, 30 Dec 2015 01:17:12 -0800 Subject: [PATCH 1982/5486] This is weird --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index b4a5e6b6b4..2c5d0b7c31 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -705,4 +705,6 @@ You may either do [this](gtd/gtd.md), This is one weird story. Did anybody read the whole page? + I sure did not. This is as weird as it gets. + From 7a1f2fcb202d0abd986847e86afa9a0b587e0a9b Mon Sep 17 00:00:00 2001 From: nikosstais Date: Wed, 30 Dec 2015 11:47:56 +0200 Subject: [PATCH 1983/5486] use-the-rope --- greek/use_the_rope/use_the_rope.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 greek/use_the_rope/use_the_rope.md diff --git a/greek/use_the_rope/use_the_rope.md b/greek/use_the_rope/use_the_rope.md new file mode 100644 index 0000000000..1863dfa131 --- /dev/null +++ b/greek/use_the_rope/use_the_rope.md @@ -0,0 +1,11 @@ +Παίρνεις την μια άκρη από το σχοινί και το τυλίγεις στη μέση σου. + +Κάνεις ένα κόμπο και δοκιμάζεις να δεις ότι είναι σταθερά δεμένο πάνω σου + +Τραβάς την το υπόλοιπο για να βρεις την άλλη άκρη και διαπιστώνεις ότι το υπόλοιπο σχοινί έρχεται μέσα από το ζαχαρωτό. + +[Βγάζεις την κάλτσα σου](../put_socks_off/put-socks-off.md) + +[Παίρνεις το πιρούνι](../take_the_fork/take-the-fork.md) + + From c9d9827f3f18cb9e5b0fd84b9bb7114df4dd9b40 Mon Sep 17 00:00:00 2001 From: nikosstais Date: Wed, 30 Dec 2015 11:50:11 +0200 Subject: [PATCH 1984/5486] use-the-rope2 --- greek/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/greek/marshmallow.md b/greek/marshmallow.md index e77e279ff3..0cff788df6 100644 --- a/greek/marshmallow.md +++ b/greek/marshmallow.md @@ -20,6 +20,8 @@ [Προσφέρεις στο ζαχαρωτό τσιγάρο](offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md) +[Πιάνεις το σχοινί](use_the_rope/use_the_rope.md) + Τελικά συνειδητοποιείς ότι ο Stay Puft Marshmallow Man από το Ghostbusters ήταν στη πραγματικότητα το ζαχαρωτό και σε πιάνει τρόμος ... μπου α χα χα... From 12ce89160b736cee3da736e749589f71665522dc Mon Sep 17 00:00:00 2001 From: Glenn Whiting Date: Wed, 30 Dec 2015 14:39:56 -0800 Subject: [PATCH 1985/5486] Add new Crazy line --- english/crazy/crazy.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/crazy/crazy.md diff --git a/english/crazy/crazy.md b/english/crazy/crazy.md new file mode 100644 index 0000000000..ffe0cc5509 --- /dev/null +++ b/english/crazy/crazy.md @@ -0,0 +1,2 @@ +Crazy man! + From 64144563d0da3b251362e2dd2dd45e7365b2e1e6 Mon Sep 17 00:00:00 2001 From: Brandon Wu Date: Wed, 30 Dec 2015 18:09:24 -0500 Subject: [PATCH 1986/5486] Add winter adventure destination page list, starting with Glacier National Park --- english/travel-destinations/winter/winter.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/travel-destinations/winter/winter.md diff --git a/english/travel-destinations/winter/winter.md b/english/travel-destinations/winter/winter.md new file mode 100644 index 0000000000..a83d3acebe --- /dev/null +++ b/english/travel-destinations/winter/winter.md @@ -0,0 +1,5 @@ +Winter can be a cold and bitter time. However, it is hard to find more +beauty outdoors than the snow capped peaks of [Glacier National Park] +(http://www.nps.gov/glac/index.htm)! Great adventure awaits there. You can +camp and hike. If you are adventurous, you can try some winter wilderness +treks in the [backcountry](http://www.nps.gov/glac/planyourvisit/backcountry.htm). From 1b7d98ebcb119fe84a0d43760032dcda56e9c5bf Mon Sep 17 00:00:00 2001 From: Brandon Wu Date: Wed, 30 Dec 2015 18:13:46 -0500 Subject: [PATCH 1987/5486] Add link to winter destinations in travel parent --- english/travel-destinations/travel-destinations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/travel-destinations/travel-destinations.md b/english/travel-destinations/travel-destinations.md index 1ec6e5a640..0b1fdab35b 100644 --- a/english/travel-destinations/travel-destinations.md +++ b/english/travel-destinations/travel-destinations.md @@ -4,4 +4,4 @@ It's Summer! Time to explore these places: Fall is a great season to take a vacation in any of these spots: -It's frosty winter.. but these places can be excitng: \ No newline at end of file +It's frosty winter.. but these [places](winter/winter.md) can be excitng. \ No newline at end of file From fae0e37a6c941d416ac94f0469020f742f09cc14 Mon Sep 17 00:00:00 2001 From: Brandon Wu Date: Wed, 30 Dec 2015 18:17:42 -0500 Subject: [PATCH 1988/5486] Modify winter destinations to add a new line rather than hyperlink a word --- english/travel-destinations/travel-destinations.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/travel-destinations/travel-destinations.md b/english/travel-destinations/travel-destinations.md index 0b1fdab35b..1ded76ddb6 100644 --- a/english/travel-destinations/travel-destinations.md +++ b/english/travel-destinations/travel-destinations.md @@ -4,4 +4,5 @@ It's Summer! Time to explore these places: Fall is a great season to take a vacation in any of these spots: -It's frosty winter.. but these [places](winter/winter.md) can be excitng. \ No newline at end of file +It's frosty winter.. but these places can be excitng: +[winter destinations](winter/winter.md) \ No newline at end of file From f247992fceadd436da499cdcfb4237159b3cdabc Mon Sep 17 00:00:00 2001 From: Glenn Whiting Date: Wed, 30 Dec 2015 15:20:58 -0800 Subject: [PATCH 1989/5486] Add new Crazy line --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 2c5d0b7c31..578e0d7624 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -707,4 +707,5 @@ You may either do [this](gtd/gtd.md), I sure did not. This is as weird as it gets. +[Get Crazy!](crazy/crazy.md) From 5561c83d420310eccba93f263ca92014a74204f4 Mon Sep 17 00:00:00 2001 From: Brandon Wu Date: Wed, 30 Dec 2015 18:35:17 -0500 Subject: [PATCH 1990/5486] Add good luck statement --- english/travel-destinations/winter/winter.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/travel-destinations/winter/winter.md b/english/travel-destinations/winter/winter.md index a83d3acebe..da73c1327f 100644 --- a/english/travel-destinations/winter/winter.md +++ b/english/travel-destinations/winter/winter.md @@ -2,4 +2,5 @@ Winter can be a cold and bitter time. However, it is hard to find more beauty outdoors than the snow capped peaks of [Glacier National Park] (http://www.nps.gov/glac/index.htm)! Great adventure awaits there. You can camp and hike. If you are adventurous, you can try some winter wilderness -treks in the [backcountry](http://www.nps.gov/glac/planyourvisit/backcountry.htm). +treks in the [backcountry](http://www.nps.gov/glac/planyourvisit/backcountry.htm). +Hope you have winter navigation skills! From 09c74252c422eedc60977829fb6f2c6076aec60d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20S=C3=A1enz=20de=20Quiroz?= Date: Wed, 30 Dec 2015 20:40:39 -0300 Subject: [PATCH 1991/5486] =?UTF-8?q?add:=20Se=20agrega=20a=20continu?= =?UTF-8?q?=C3=A1r=20con=20la=20hu=C3=ADda=20sin=20pagar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/huida/rechazar/arrastra/arrastra.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/huida/rechazar/arrastra/arrastra.md b/espanol/huida/rechazar/arrastra/arrastra.md index c7a81d13a5..829d4a567b 100644 --- a/espanol/huida/rechazar/arrastra/arrastra.md +++ b/espanol/huida/rechazar/arrastra/arrastra.md @@ -1,2 +1,4 @@ Al no poder mover las piernas, no queda más remedio que moverse con las manos. -Saca fuerzas de donde no tiene y comienza a arrastrarase con sus brazos. Todos esos años de natación valieron la pena. \ No newline at end of file +Saca fuerzas de donde no tiene y comienza a arrastrarase con sus brazos. Todos esos años de natación valieron la pena. +El tunel que te lleva fuera de la ciudad es largo y húmedo, pero la perspectiva de libertad, y sobre todo, seguir +resistiento a la Tiranía te obsequia las fuerzas para salir al exterior. From 13283ae31e52ddce9e538e88d1bcd1dc3994e94a Mon Sep 17 00:00:00 2001 From: Brandon Wu Date: Wed, 30 Dec 2015 18:44:53 -0500 Subject: [PATCH 1992/5486] Modify last line to not remote lines from winter --- english/travel-destinations/winter/winter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/travel-destinations/winter/winter.md b/english/travel-destinations/winter/winter.md index da73c1327f..e79e20f91b 100644 --- a/english/travel-destinations/winter/winter.md +++ b/english/travel-destinations/winter/winter.md @@ -2,5 +2,5 @@ Winter can be a cold and bitter time. However, it is hard to find more beauty outdoors than the snow capped peaks of [Glacier National Park] (http://www.nps.gov/glac/index.htm)! Great adventure awaits there. You can camp and hike. If you are adventurous, you can try some winter wilderness -treks in the [backcountry](http://www.nps.gov/glac/planyourvisit/backcountry.htm). +treks in the [backcountry](http://www.nps.gov/glac/planyourvisit/backcountry.htm). Hope you have winter navigation skills! From b11037a98cfb8f914ffb640f47fa6759acb6814d Mon Sep 17 00:00:00 2001 From: PeteAJ Date: Wed, 30 Dec 2015 20:00:15 -0500 Subject: [PATCH 1993/5486] Add a Star Wars reference, why not --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 2c5d0b7c31..b7a2dd32d6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -64,6 +64,8 @@ Or a [memory](memories/memories.md)? Or is it just boring old [real-life](real-life/real-life.md)? +Or [The Force](https://www.youtube.com/watch?v=cFn-NobVaoI&feature=youtu.be)! + Maybe it's a dream within a dream? Maybe dreaming and reality are one and the same. Maybe reality is an oxymoron when considering multiple dimensions. From bed58c9bd9d2ac2bf60dad8a6225b20930ed694a Mon Sep 17 00:00:00 2001 From: Taiwo Date: Wed, 30 Dec 2015 20:05:22 -0500 Subject: [PATCH 1994/5486] Update the avatar page --- english/avatar/air.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/avatar/air.md b/english/avatar/air.md index e91936fcee..bb08c86928 100644 --- a/english/avatar/air.md +++ b/english/avatar/air.md @@ -2,6 +2,8 @@ [Fire Lord Ozai](http://avatar.wikia.com/wiki/Ozai) wanted to conquer the other nations and rule the world. +[Aang the last air bender](http://avatar.wikia.com/wiki/Aang) But there was one who stood in his way. + The next step is other planets. From 769dab838cc9604b3a78126d63d8ed8747683645 Mon Sep 17 00:00:00 2001 From: phoyt1 Date: Thu, 31 Dec 2015 12:35:50 -0500 Subject: [PATCH 1995/5486] Updating train-ride section of the story --- english/train-ride/train-ride.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/train-ride/train-ride.md b/english/train-ride/train-ride.md index d5fdb767bd..064a2d44de 100644 --- a/english/train-ride/train-ride.md +++ b/english/train-ride/train-ride.md @@ -8,3 +8,9 @@ The Engineer hauls back on the throttle, gives a blast on the whistle and before you know it, you're feeding the beast with black gold as it accelerates in a cloud of smoke and steam vapor, rolling along the country side flowing past in a blur of speed. + +Hogwarts castle is in sight! It won't be long now! You have been waiting for this day your whole life. + +You hope your experience will be different from [others...](../magic/magic.md) + +But all of a sudden.... \ No newline at end of file From beff95da30bb84b3da9459d612afced9e44f16d3 Mon Sep 17 00:00:00 2001 From: Xu Liang Date: Fri, 1 Jan 2016 10:41:56 +0900 Subject: [PATCH 1996/5486] add a new floder named little_prince On branch little-prince Changes to be committed: new file: this_is_a_story_about_a_boy.md --- Chinese/little_prince/this_is_a_story_about_a_boy.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/little_prince/this_is_a_story_about_a_boy.md diff --git a/Chinese/little_prince/this_is_a_story_about_a_boy.md b/Chinese/little_prince/this_is_a_story_about_a_boy.md new file mode 100644 index 0000000000..558c980641 --- /dev/null +++ b/Chinese/little_prince/this_is_a_story_about_a_boy.md @@ -0,0 +1 @@ +The Little Prince is a play based on the book of the same name by Antoine de Saint-Exupéry, adapted by Rick Cummins and John Scoullar before 2000. Rick Cummins wrote the music, and John Scoullar wrote the script and lyrics. There are several changes from the book, including the omission of the drunkard (tippler), switchman and merchant characters; the removal of a great deal of the narration from the aviator; significant changes to the rose scenes; and a large change in the order of events. \ No newline at end of file From 9ab9199d8d9236ae5b99a57c8aae82af15e2183d Mon Sep 17 00:00:00 2001 From: Xu Liang Date: Fri, 1 Jan 2016 11:05:22 +0900 Subject: [PATCH 1997/5486] modified language.md adding little-prince --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index c2f6fdceb7..cf55c15d4e 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -83,3 +83,5 @@ [Kobe](Kobe/Kobe.md) [小岳岳](xiaoyueyue/xiaoyueyue.md) + +[little_prince](little_prince/this_is_a_story_about_a_boy.md) \ No newline at end of file From 7bf6585f91925e4484f32e5e67b8027944c5fa94 Mon Sep 17 00:00:00 2001 From: Xu Liang Date: Fri, 1 Jan 2016 11:10:37 +0900 Subject: [PATCH 1998/5486] delete some lines. Because the bot say it's longer than 120 characters --- Chinese/little_prince/this_is_a_story_about_a_boy.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/little_prince/this_is_a_story_about_a_boy.md b/Chinese/little_prince/this_is_a_story_about_a_boy.md index 558c980641..a8ec1ab3ff 100644 --- a/Chinese/little_prince/this_is_a_story_about_a_boy.md +++ b/Chinese/little_prince/this_is_a_story_about_a_boy.md @@ -1 +1,3 @@ -The Little Prince is a play based on the book of the same name by Antoine de Saint-Exupéry, adapted by Rick Cummins and John Scoullar before 2000. Rick Cummins wrote the music, and John Scoullar wrote the script and lyrics. There are several changes from the book, including the omission of the drunkard (tippler), switchman and merchant characters; the removal of a great deal of the narration from the aviator; significant changes to the rose scenes; and a large change in the order of events. \ No newline at end of file +The Little Prince is a play based on the book of the same name by Antoine de Saint-Exupéry, adapted by Rick Cummins and John Scoullar before 2000. + +Rick Cummins wrote the music, and John Scoullar wrote the script and lyrics. From 7c661d67e7e9df7dd11468f00b4a41815ebfdb08 Mon Sep 17 00:00:00 2001 From: Xu Liang Date: Fri, 1 Jan 2016 11:15:31 +0900 Subject: [PATCH 1999/5486] still longer than 120 :( --- Chinese/little_prince/this_is_a_story_about_a_boy.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/little_prince/this_is_a_story_about_a_boy.md b/Chinese/little_prince/this_is_a_story_about_a_boy.md index a8ec1ab3ff..b3b1676346 100644 --- a/Chinese/little_prince/this_is_a_story_about_a_boy.md +++ b/Chinese/little_prince/this_is_a_story_about_a_boy.md @@ -1,3 +1,5 @@ -The Little Prince is a play based on the book of the same name by Antoine de Saint-Exupéry, adapted by Rick Cummins and John Scoullar before 2000. +The Little Prince is a play based on the book of the same name by Antoine de Saint-Exupéry, + +adapted by Rick Cummins and John Scoullar before 2000. Rick Cummins wrote the music, and John Scoullar wrote the script and lyrics. From 6e901ac9e2718d79b588f76f98c2181764f59cdb Mon Sep 17 00:00:00 2001 From: Jihan Kim Date: Fri, 1 Jan 2016 23:00:21 +0900 Subject: [PATCH 2000/5486] Deleted duplicated line. --- korean/marshmallow.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/korean/marshmallow.md b/korean/marshmallow.md index fb4d4c93f4..6bd4cf7179 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -2,8 +2,6 @@ 어떻게 할까요? -벽을 먹는다. - [벽을 먹는다](eating-walls/eating-marshmallows.md)? [불을 지핀다](light-fire/fire.md)? From f7caae61548c96275a9fe39054fdf15449ac2594 Mon Sep 17 00:00:00 2001 From: lbrgriffith Date: Fri, 1 Jan 2016 16:22:03 -0400 Subject: [PATCH 2001/5486] Add a new option to the marshmellow attack file. --- english/marshmallow-attack/marsh-attack.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow-attack/marsh-attack.md b/english/marshmallow-attack/marsh-attack.md index 94bc5ae51f..f6080c89f9 100644 --- a/english/marshmallow-attack/marsh-attack.md +++ b/english/marshmallow-attack/marsh-attack.md @@ -21,3 +21,5 @@ Do you [Run back and forth?](../indigestion/indigestion.md) [Decide you're hungry for s'mores](make-smores/make-smores.md) + +[Light Up](../light-up/light-up.md) From 520aae4adc701ca527a88faf7b23575e50bf69d4 Mon Sep 17 00:00:00 2001 From: coder-neo Date: Fri, 1 Jan 2016 16:24:42 -0500 Subject: [PATCH 2002/5486] Add wiki on Naruto Uzumaki --- english/naruto/naruto_wiki.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/naruto/naruto_wiki.md diff --git a/english/naruto/naruto_wiki.md b/english/naruto/naruto_wiki.md new file mode 100644 index 0000000000..161c5ece91 --- /dev/null +++ b/english/naruto/naruto_wiki.md @@ -0,0 +1,3 @@ +Naruto Uzumaki (うずまきナルト, Uzumaki Naruto) is a shinobi of Konohagakure. He became the jinchūriki of the Nine-Tails on the day of his birth — a fate that caused him to be ostracised by most of Konoha throughout his childhood. After joining Team Kakashi, Naruto worked hard to gain the village's acknowledgement all the while chasing his dream to become Hokage. In the following years, through many hardships and ordeals, he became a capable ninja regarded as a hero both by the villagers, and soon after, the rest of the world. He soon proved to be one of the main factors in winning the Fourth Shinobi World War, leading him to achieve his dream and become the village's Seventh Hokage (七代目火影, Nanadaime Hokage, Literally meaning: Seventh Fire Shadow). + +Click [here](http://naruto.wikia.com/wiki/Naruto_Uzumaki) for more info. From 2b0fbc7b0a4f2842f5e81fdf9e88ec7aeee1823a Mon Sep 17 00:00:00 2001 From: coder-neo Date: Fri, 1 Jan 2016 16:33:49 -0500 Subject: [PATCH 2003/5486] Rename wiki file --- english/naruto/{naruto_wiki.md => seventh-hokage.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/naruto/{naruto_wiki.md => seventh-hokage.md} (100%) diff --git a/english/naruto/naruto_wiki.md b/english/naruto/seventh-hokage.md similarity index 100% rename from english/naruto/naruto_wiki.md rename to english/naruto/seventh-hokage.md From b71db70bf443bb915933cd511e02b36b7daf76a0 Mon Sep 17 00:00:00 2001 From: coder-neo Date: Fri, 1 Jan 2016 16:43:22 -0500 Subject: [PATCH 2004/5486] Change to maintain 120 characters --- english/naruto/seventh-hokage.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/english/naruto/seventh-hokage.md b/english/naruto/seventh-hokage.md index 161c5ece91..38aaa8b70b 100644 --- a/english/naruto/seventh-hokage.md +++ b/english/naruto/seventh-hokage.md @@ -1,3 +1,14 @@ -Naruto Uzumaki (うずまきナルト, Uzumaki Naruto) is a shinobi of Konohagakure. He became the jinchūriki of the Nine-Tails on the day of his birth — a fate that caused him to be ostracised by most of Konoha throughout his childhood. After joining Team Kakashi, Naruto worked hard to gain the village's acknowledgement all the while chasing his dream to become Hokage. In the following years, through many hardships and ordeals, he became a capable ninja regarded as a hero both by the villagers, and soon after, the rest of the world. He soon proved to be one of the main factors in winning the Fourth Shinobi World War, leading him to achieve his dream and become the village's Seventh Hokage (七代目火影, Nanadaime Hokage, Literally meaning: Seventh Fire Shadow). +Naruto Uzumaki (うずまきナルト, Uzumaki Naruto) is a shinobi of +Konohagakure.He became the jinchūriki of the Nine-Tails on +the day of his birth — a fate that caused him to be ostracised +by most of Konoha throughout his childhood. After joining +Team Kakashi, Naruto worked hard to gain the village's +acknowledgement all the while chasing his dream to become Hokage. +In the following years, through many hardships and ordeals, +he became a capable ninja regarded as a hero both by the villagers, +and soon after, the rest of the world. He soon proved to be one of +the main factors in winning the Fourth Shinobi World War, leading +him to achieve his dream and become the village's Seventh Hokage +(七代目火影, Nanadaime Hokage, Literally meaning: Seventh Fire Shadow). Click [here](http://naruto.wikia.com/wiki/Naruto_Uzumaki) for more info. From efc9aaab20bca6ef0bf8d5cd85856cb3671dcfed Mon Sep 17 00:00:00 2001 From: coder-neo Date: Fri, 1 Jan 2016 17:11:46 -0500 Subject: [PATCH 2005/5486] Add reference to adventure naruto --- english/ninja/ninja.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/ninja/ninja.md b/english/ninja/ninja.md index b8decf29be..61b479121c 100644 --- a/english/ninja/ninja.md +++ b/english/ninja/ninja.md @@ -34,3 +34,5 @@ No way! I don't have the guts to follow my dreams like that! Knees weak, arms spaghetti, vomit on spaghetti already [Back to reality](../marshmallow.md) ohp there goes spaghetti + +[Seventh Hokage](../naruto/seventh-hokage.md) From b1f9865881169c02e4b063d52d8e24125919c2dd Mon Sep 17 00:00:00 2001 From: Rick Kober Date: Fri, 1 Jan 2016 19:36:46 -0600 Subject: [PATCH 2006/5486] add quote about luck --- english/quote-of-the-day/luck/luck.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/quote-of-the-day/luck/luck.md diff --git a/english/quote-of-the-day/luck/luck.md b/english/quote-of-the-day/luck/luck.md new file mode 100644 index 0000000000..a3ff920bce --- /dev/null +++ b/english/quote-of-the-day/luck/luck.md @@ -0,0 +1,3 @@ +The harder I work the luckier I get + +[Go back](../quote.md) From f59f0ef8a4c30a30e6fe4c8918397344c015e4aa Mon Sep 17 00:00:00 2001 From: Rick Kober Date: Fri, 1 Jan 2016 19:38:15 -0600 Subject: [PATCH 2007/5486] link to the new quote --- english/quote-of-the-day/quote.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/quote-of-the-day/quote.md b/english/quote-of-the-day/quote.md index d3040b8fd9..509225aacc 100644 --- a/english/quote-of-the-day/quote.md +++ b/english/quote-of-the-day/quote.md @@ -17,6 +17,8 @@ Quote for [life](life/life.md) Quote for [inspiration](inspiration/inspiration.md) +Quote for [luck](luck/luck.md) + [Go back to marshmallow](../marshmallow.md) From fe87c2dcef76ec12cf7ef775ce07adb72dceded6 Mon Sep 17 00:00:00 2001 From: Matthew Magee Date: Fri, 1 Jan 2016 18:37:43 -0800 Subject: [PATCH 2008/5486] added more options to run left right or straight --- english/new-movie/new-movie.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/english/new-movie/new-movie.md b/english/new-movie/new-movie.md index 85415c8f1f..1002cc92ea 100644 --- a/english/new-movie/new-movie.md +++ b/english/new-movie/new-movie.md @@ -27,3 +27,11 @@ Clues, clues, everywhere clues that don't connect! Dammit! No way you're going to miss this movie, it's been years you've been waiting for it. Time to run! +Do you: + +[run left?](../super-man/save-the-word.md) + +[run right?](../suprise/suprise.md) + +[run straight?](../undending-story/undending-story.md) + From b3503d70bbb3923e3e3c3ffd24bb201f625d8866 Mon Sep 17 00:00:00 2001 From: Matthew Magee Date: Fri, 1 Jan 2016 18:47:14 -0800 Subject: [PATCH 2009/5486] fixed broken links --- english/new-movie/new-movie.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/new-movie/new-movie.md b/english/new-movie/new-movie.md index 1002cc92ea..0f61c5407c 100644 --- a/english/new-movie/new-movie.md +++ b/english/new-movie/new-movie.md @@ -31,7 +31,7 @@ Do you: [run left?](../super-man/save-the-word.md) -[run right?](../suprise/suprise.md) +[run right?](../surprise!/suprise.md) -[run straight?](../undending-story/undending-story.md) +[run straight?](../unending-story/unending-story.md) From ec4516ea66a1b2a9ebbac3a608935b6d5610bc90 Mon Sep 17 00:00:00 2001 From: Matthew Magee Date: Fri, 1 Jan 2016 18:49:13 -0800 Subject: [PATCH 2010/5486] fixed broken link --- english/new-movie/new-movie.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/new-movie/new-movie.md b/english/new-movie/new-movie.md index 0f61c5407c..0a858a4b35 100644 --- a/english/new-movie/new-movie.md +++ b/english/new-movie/new-movie.md @@ -31,7 +31,7 @@ Do you: [run left?](../super-man/save-the-word.md) -[run right?](../surprise!/suprise.md) +[run right?](../surprise!/surprise.md) [run straight?](../unending-story/unending-story.md) From 80d3a58b081440932a7de0a9dbe903b327740a72 Mon Sep 17 00:00:00 2001 From: PaulVandenberg Date: Fri, 1 Jan 2016 23:03:44 -0600 Subject: [PATCH 2011/5486] add option to light fire --- english/lightsoff/lightsoff.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/lightsoff/lightsoff.md b/english/lightsoff/lightsoff.md index dcc63a69d6..72d4a3191b 100644 --- a/english/lightsoff/lightsoff.md +++ b/english/lightsoff/lightsoff.md @@ -1 +1,3 @@ -It is pitch black. You are likely to be eaten by a grue. \ No newline at end of file +It is pitch black. You are likely to be eaten by a grue. + +Out of a combination of fear, and the perseverance that the story must go on, you [light a fire.](../light-fire/light-fire.md) \ No newline at end of file From 8035f6849a13b4a1aba9b172e0640e80e07aab4f Mon Sep 17 00:00:00 2001 From: Paul Vandenberg Date: Fri, 1 Jan 2016 23:09:28 -0600 Subject: [PATCH 2012/5486] Update lightsoff.md --- english/lightsoff/lightsoff.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/lightsoff/lightsoff.md b/english/lightsoff/lightsoff.md index 72d4a3191b..0f7ecd60a2 100644 --- a/english/lightsoff/lightsoff.md +++ b/english/lightsoff/lightsoff.md @@ -1,3 +1,3 @@ It is pitch black. You are likely to be eaten by a grue. -Out of a combination of fear, and the perseverance that the story must go on, you [light a fire.](../light-fire/light-fire.md) \ No newline at end of file +Out of a combination of fear, and the perseverance that the story must go on, you [light a fire.](../light-fire/fire.md) From fc7926bd5598b487560cb581027b786bfb0e4c57 Mon Sep 17 00:00:00 2001 From: Nikolai Date: Sat, 2 Jan 2016 02:22:01 -0500 Subject: [PATCH 2013/5486] added the best city yet --- english/boston/boston.md | 5 +++++ english/marshmallow.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 english/boston/boston.md diff --git a/english/boston/boston.md b/english/boston/boston.md new file mode 100644 index 0000000000..788e529ce8 --- /dev/null +++ b/english/boston/boston.md @@ -0,0 +1,5 @@ +# Moving to Boston + +"This city is the life! Though now that I'm here, I think I'll take a vacation..." + +[Go on vacation](../licked-cat/vacation.md) diff --git a/english/marshmallow.md b/english/marshmallow.md index bbb30ae4ce..c66e9c9aaf 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -711,3 +711,5 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." + From d727a9cef61fe125f4ade62039a0cf6149eb4818 Mon Sep 17 00:00:00 2001 From: Nikolai Date: Sat, 2 Jan 2016 02:24:53 -0500 Subject: [PATCH 2014/5486] changed line length to less than 120 --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index c66e9c9aaf..6fb05d4741 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -711,5 +711,6 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +[move to Boston](boston/boston.md)." From 2bd7a79533e1c9f23c904fc5119a7ea0ada0fb1a Mon Sep 17 00:00:00 2001 From: adriantat Date: Sat, 2 Jan 2016 15:36:36 +0800 Subject: [PATCH 2015/5486] Add Eason Chan to Chinese section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes to be committed: new file: Eason_Chan/Eason_Chan.md modified: 大话西游.md --- Chinese/Eason_Chan/Eason_Chan.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Chinese/Eason_Chan/Eason_Chan.md diff --git a/Chinese/Eason_Chan/Eason_Chan.md b/Chinese/Eason_Chan/Eason_Chan.md new file mode 100644 index 0000000000..f9d8269cdb --- /dev/null +++ b/Chinese/Eason_Chan/Eason_Chan.md @@ -0,0 +1 @@ +誰人又相信，一世一生這膚淺對白？ \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index cf55c15d4e..3553c9ee65 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -84,4 +84,6 @@ [小岳岳](xiaoyueyue/xiaoyueyue.md) -[little_prince](little_prince/this_is_a_story_about_a_boy.md) \ No newline at end of file +[little_prince](little_prince/this_is_a_story_about_a_boy.md) + +[陳奕迅](Eason_Chan/Eason_Chan.md) \ No newline at end of file From bda6be744d50e8cd170a6f5473f438918d61627c Mon Sep 17 00:00:00 2001 From: stge4code Date: Sat, 2 Jan 2016 16:46:16 +0300 Subject: [PATCH 2016/5486] The Story Continues --- russian/eating-walls/police/call-police.md | 6 +++++- russian/eating-walls/police/potracheno/wanted.md | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 russian/eating-walls/police/potracheno/wanted.md diff --git a/russian/eating-walls/police/call-police.md b/russian/eating-walls/police/call-police.md index e11b5c4c35..c73c1333cc 100644 --- a/russian/eating-walls/police/call-police.md +++ b/russian/eating-walls/police/call-police.md @@ -1 +1,5 @@ - . \ No newline at end of file + . + , , . + , : + +[ ](potracheno/wanted.md) \ No newline at end of file diff --git a/russian/eating-walls/police/potracheno/wanted.md b/russian/eating-walls/police/potracheno/wanted.md new file mode 100644 index 0000000000..ec053ec238 --- /dev/null +++ b/russian/eating-walls/police/potracheno/wanted.md @@ -0,0 +1 @@ +Полиция схватывает вас и заковывает в зефирные наручники \ No newline at end of file From 53b9f1dda212c4c0bb24fc1a7d9254b7ccd91380 Mon Sep 17 00:00:00 2001 From: Gail Harris Date: Sat, 2 Jan 2016 10:42:23 -0600 Subject: [PATCH 2017/5486] Removed link to utube video because video was removed from utube and added response to name question to be Bruce Wayne with link to batman/batman.md --- english/chief-history/chief-history.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/chief-history/chief-history.md b/english/chief-history/chief-history.md index 2d3c1abc06..6e01512d1f 100644 --- a/english/chief-history/chief-history.md +++ b/english/chief-history/chief-history.md @@ -18,4 +18,5 @@ However, there is still one more question lingering on the tip of your tongue. "But if what you say is true, then you must have had -a name before all of this. So what was your [name](https://www.youtube.com/watch?v=Am4oKAmc2To)?" +a name before all of this. So what was your name? +He answers [Bruce Wayne](../batman.md)" From 2a4a8ed34c645c2a7247499fba8a0cc163af0fd3 Mon Sep 17 00:00:00 2001 From: Gail Harris Date: Sat, 2 Jan 2016 10:47:56 -0600 Subject: [PATCH 2018/5486] Corrected relative path reference to ../batman/batman.md --- english/chief-history/chief-history.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/chief-history/chief-history.md b/english/chief-history/chief-history.md index 6e01512d1f..e3c267a27c 100644 --- a/english/chief-history/chief-history.md +++ b/english/chief-history/chief-history.md @@ -19,4 +19,4 @@ tip of your tongue. "But if what you say is true, then you must have had a name before all of this. So what was your name? -He answers [Bruce Wayne](../batman.md)" +He answers [Bruce Wayne](../batman/batman.md)" From cd43f51ff47cd562e86aa0bd6ffa452cf883f42e Mon Sep 17 00:00:00 2001 From: Gail Harris Date: Sat, 2 Jan 2016 10:51:16 -0600 Subject: [PATCH 2019/5486] Returned original line of name with deadend utube link so that the merge will not cause a conflict. My new edits are on a new line at the end of the file --- english/chief-history/chief-history.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/chief-history/chief-history.md b/english/chief-history/chief-history.md index e3c267a27c..9372a901d7 100644 --- a/english/chief-history/chief-history.md +++ b/english/chief-history/chief-history.md @@ -18,5 +18,5 @@ However, there is still one more question lingering on the tip of your tongue. "But if what you say is true, then you must have had -a name before all of this. So what was your name? -He answers [Bruce Wayne](../batman/batman.md)" +a name before all of this. So what was your [name](https://www.youtube.com/watch?v=Am4oKAmc2To)?" +He answers [Bruce Wayne](../batman/batman.md) \ No newline at end of file From 9e705c09c95b8b1f7bb1f99eb4e1b5b29228bff3 Mon Sep 17 00:00:00 2001 From: Gail Harris Date: Sat, 2 Jan 2016 10:54:40 -0600 Subject: [PATCH 2020/5486] Added blank line before Bruce Wayne answer --- english/chief-history/chief-history.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/chief-history/chief-history.md b/english/chief-history/chief-history.md index 9372a901d7..94b6333dfd 100644 --- a/english/chief-history/chief-history.md +++ b/english/chief-history/chief-history.md @@ -19,4 +19,5 @@ tip of your tongue. "But if what you say is true, then you must have had a name before all of this. So what was your [name](https://www.youtube.com/watch?v=Am4oKAmc2To)?" + He answers [Bruce Wayne](../batman/batman.md) \ No newline at end of file From b6d1e843cc0389be2cd04795bcead1ce4ed97c5a Mon Sep 17 00:00:00 2001 From: Evin1- Date: Sat, 2 Jan 2016 21:54:01 -0500 Subject: [PATCH 2021/5486] Added Queen's Bohemian Rhapsody reference --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6fb05d4741..05565c3974 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -66,6 +66,8 @@ Or is it just boring old [real-life](real-life/real-life.md)? Or [The Force](https://www.youtube.com/watch?v=cFn-NobVaoI&feature=youtu.be)! +Or is this just [fantasy](https://www.youtube.com/watch?v=fJ9rUzIMcZQ)? + Maybe it's a dream within a dream? Maybe dreaming and reality are one and the same. Maybe reality is an oxymoron when considering multiple dimensions. From 3bbd9bfabb4ec57ac7ab7fb99e666fd67d09446b Mon Sep 17 00:00:00 2001 From: "T.Tsuji" Date: Sun, 3 Jan 2016 13:07:16 +0900 Subject: [PATCH 2022/5486] Add newyear message in Japanese folder --- japanese/newyear/newyear.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 japanese/newyear/newyear.md diff --git a/japanese/newyear/newyear.md b/japanese/newyear/newyear.md new file mode 100644 index 0000000000..89c40dd000 --- /dev/null +++ b/japanese/newyear/newyear.md @@ -0,0 +1 @@ +明けましておめでとうございます。今年もよろしくお願いします。 \ No newline at end of file From cd3fbae3f02f421509766ae6e7ddd95621f8ec6c Mon Sep 17 00:00:00 2001 From: "T.Tsuji" Date: Sun, 3 Jan 2016 13:18:21 +0900 Subject: [PATCH 2023/5486] delete created folder "nearyear" in japanese folder --- japanese/newyear/newyear.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 japanese/newyear/newyear.md diff --git a/japanese/newyear/newyear.md b/japanese/newyear/newyear.md deleted file mode 100644 index 89c40dd000..0000000000 --- a/japanese/newyear/newyear.md +++ /dev/null @@ -1 +0,0 @@ -明けましておめでとうございます。今年もよろしくお願いします。 \ No newline at end of file From b3fc52c122714064f63027cf7a4c4eace0771bec Mon Sep 17 00:00:00 2001 From: "T.Tsuji" Date: Sun, 3 Jan 2016 13:30:42 +0900 Subject: [PATCH 2024/5486] Add newyear message in japanese folder --- japanese/newyear/newyear | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 japanese/newyear/newyear diff --git a/japanese/newyear/newyear b/japanese/newyear/newyear new file mode 100644 index 0000000000..30b113838a --- /dev/null +++ b/japanese/newyear/newyear @@ -0,0 +1,2 @@ +あけましておめでとうございます。今年もよろしくお願いします。 +新年の抱負がまだできていない人は[こちら](http://sketch-life.com/newyear/)をご覧ください。 From 67add9e5f47e9375765ad5e650355c466c0944ea Mon Sep 17 00:00:00 2001 From: "T.Tsuji" Date: Sun, 3 Jan 2016 13:37:17 +0900 Subject: [PATCH 2025/5486] Correct error in filename and URL --- japanese/newyear/{newyear => newyear.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename japanese/newyear/{newyear => newyear.md} (100%) diff --git a/japanese/newyear/newyear b/japanese/newyear/newyear.md similarity index 100% rename from japanese/newyear/newyear rename to japanese/newyear/newyear.md From fe2004a0509c2276213c3c0c2e3004fd97a815dc Mon Sep 17 00:00:00 2001 From: "T.Tsuji" Date: Sun, 3 Jan 2016 13:43:44 +0900 Subject: [PATCH 2026/5486] Add URL to beer.md file and linked with new year file --- japanese/beer/beer.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/japanese/beer/beer.md b/japanese/beer/beer.md index 62dfd2cab2..8e713673be 100644 --- a/japanese/beer/beer.md +++ b/japanese/beer/beer.md @@ -6,3 +6,5 @@ [掛け軸を拝見する](../kakejiku/kakejiku.md) [ソフトドリンクに変更する](../softdrink/softdrink.md) + +[新年の抱負を語る](../newyear/newyear.md) From 1fed021d207da86923e05e5070aaee9f02e34c0f Mon Sep 17 00:00:00 2001 From: Frat Date: Sun, 3 Jan 2016 02:04:29 -0500 Subject: [PATCH 2027/5486] Contribute to story in espanol and created ...espanol/cuco/cuco.md --- espanol/canudos.md | 2 ++ espanol/cuco/cuco.md | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 espanol/cuco/cuco.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 0726bef323..0d58d55ed1 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -100,3 +100,5 @@ Salió corriendo y no se lo vio nunca más en el reino Conectó su guitarra al amplificador y se puso a tocar una versión de "Siempre es lo mismo, nena", pero sin distorsión +[Así comenzó el cuento del cuco en el pueblo, para que los niños temieran a los dioses] (cuco/cuco.md) + diff --git a/espanol/cuco/cuco.md b/espanol/cuco/cuco.md new file mode 100644 index 0000000000..c4634c41ce --- /dev/null +++ b/espanol/cuco/cuco.md @@ -0,0 +1,19 @@ +La luz de la puerta de Elías +se reduce a una fila +mientras su madre cierra la puerta +pensando que el niño dormía. + +Poco ella sabía +que el pequeño miraba aterrado +el cuco que estaba amarrado +al espaldar de la silla. + +¡Quién diría que el cuco temía +más a la luz de la rendija +que el niño a la sombra en la silla! + +Pero su madre no oiría +los gritos de terror de su cría +mientras el cuco desaparecía... + +junto al pequeño Elías. \ No newline at end of file From fa10e879320de2fa9c9a6b01320b74ca015ff0f4 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Sun, 3 Jan 2016 02:01:32 -0800 Subject: [PATCH 2028/5486] Add hot dog to animal.md --- english/animal/animal.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/animal/animal.md b/english/animal/animal.md index e87b709d69..bf069cb0ce 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -7,4 +7,7 @@ I remember my last meal, oh it was a dead dog 3 days ago. We are stepping to the verge of eating each other, human flesh oh what does it taste. OMG WHAT SHOULD I DO?? -I NEED HELP... \ No newline at end of file +I NEED HELP... + +I wonder what the cat would do if I gave it a hot dog. I know +what I would do. \ No newline at end of file From 8593e705f23a95906adcf181474ef2306e730bd5 Mon Sep 17 00:00:00 2001 From: ysmintor Date: Sun, 3 Jan 2016 19:35:13 +0800 Subject: [PATCH 2029/5486] add Orascom --- Chinese/Orascom/Orascom.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Chinese/Orascom/Orascom.md diff --git a/Chinese/Orascom/Orascom.md b/Chinese/Orascom/Orascom.md new file mode 100644 index 0000000000..53224a9893 --- /dev/null +++ b/Chinese/Orascom/Orascom.md @@ -0,0 +1,12 @@ +曾拿下四年唯一运营权 +Orascom电信控股公司1998年成立。在世界各地的扩张始终围绕一个核心策略：就是获得新兴市场的先发优势。1999年落地邻国约旦。又一年之后，Orascom拓展到11个撒哈拉以南的非洲国家，2003年美伊战争爆发后进入伊拉克。其结果也十分显著，一跃成为中东、非洲、巴基斯坦三地规模最大、业务种类最全的网络运营商。 +2007年，Orascom在朝鲜如法炮制了之前的成功经验。投资4000万美元在朝鲜的首都平壤创办了分公司“Koryolink”（高丽电信公司），这也是朝鲜唯一的3G运营商。Orascom与朝鲜政府分别占75%和25%的股份。 +Orascom最初在朝鲜启动业务时，朝鲜方面授予Koryolink在朝鲜运营其唯一移动网络的权利，时间期限为2008年末到2012年末。此后，该公司在朝鲜的业务拓展至银行和多个建筑项目。 +“为朝鲜提供商业移动电话网络，这件事情听起来更像一段故事，但是却实实在在发生在尼罗河的岸边。”当时有媒体如此评价Orascom在朝鲜开展通讯业务。 +据悉，其中85%的利润来自Koryolink，目前，Koryolink用户约有300万人。 +失势 +2014年11月，Orascom将朝鲜业务从综合收益中剔除，在提交的相关文件中不再出现Koryolink的资产负债表并抹去了价值数亿美元的资产，显然在运营6个月后，Orascom失去了对Koryolink的控制。 +在2015年第一季度，由于与朝鲜方面就解决股息、汇率以及近来经营问题等事项的会谈推后，公司第一财季财报的董事会会议退后了一个月。 +由于朝鲜政府对外汇的严格管控，Orascom不能将现金收入兑换成外汇，无法向埃及汇款，只能以朝鲜货币保存。在2012年有2.72亿美元现金账滞留在朝鲜，而截至去年6月30日，该项目的金额已是当时这一数字的两倍。 +除资金滞留之外，据日本共同社报在6月份报道，朝鲜成立了从事国内手机业务的新的国营通信公司，Orascom试图将Koryolink合并给该国营公司，并与朝鲜政府暂时达成了协议。 +总之，Orascom或将退出朝鲜市场，Koryolink很有可能由朝鲜政府接管。 \ No newline at end of file From 332fbbc2c496610d5f126b3de759724058a3ece2 Mon Sep 17 00:00:00 2001 From: ysmintor Date: Sun, 3 Jan 2016 19:37:48 +0800 Subject: [PATCH 2030/5486] modify introduce --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index cf55c15d4e..460e6840be 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -1,5 +1,7 @@ 在1994年大话西游之月光宝盒的电影中，主角周星驰饰演的孙悟空在500年后转世成为： +[Orascom](Orascom/Orascom.md) + [雪人](snowman/story.md) [白雪公主](snow_white/story.md) From ce5226f96dc3f508f04ed73f3dfecf57e8e117c9 Mon Sep 17 00:00:00 2001 From: ysmintor Date: Sun, 3 Jan 2016 19:42:46 +0800 Subject: [PATCH 2031/5486] slove 120 charactars ! --- Chinese/Orascom/Orascom.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Chinese/Orascom/Orascom.md b/Chinese/Orascom/Orascom.md index 53224a9893..e9a0d29805 100644 --- a/Chinese/Orascom/Orascom.md +++ b/Chinese/Orascom/Orascom.md @@ -1,12 +1,29 @@ 曾拿下四年唯一运营权 -Orascom电信控股公司1998年成立。在世界各地的扩张始终围绕一个核心策略：就是获得新兴市场的先发优势。1999年落地邻国约旦。又一年之后，Orascom拓展到11个撒哈拉以南的非洲国家，2003年美伊战争爆发后进入伊拉克。其结果也十分显著，一跃成为中东、非洲、巴基斯坦三地规模最大、业务种类最全的网络运营商。 + +Orascom电信控股公司1998年成立。在世界各地的扩张始终围绕一个核心策略：就是获得新兴市场的先发优势。1999年落地邻国约旦。又一年之后， + +Orascom拓展到11个撒哈拉以南的非洲国家，2003年美伊战争爆发后进入伊拉克。其结果也十分显著，一跃成为中东、非洲、巴基斯坦三地规模最大、业务种类最全的网络运营商。 2007年，Orascom在朝鲜如法炮制了之前的成功经验。投资4000万美元在朝鲜的首都平壤创办了分公司“Koryolink”（高丽电信公司），这也是朝鲜唯一的3G运营商。Orascom与朝鲜政府分别占75%和25%的股份。 + + Orascom最初在朝鲜启动业务时，朝鲜方面授予Koryolink在朝鲜运营其唯一移动网络的权利，时间期限为2008年末到2012年末。此后，该公司在朝鲜的业务拓展至银行和多个建筑项目。 + + “为朝鲜提供商业移动电话网络，这件事情听起来更像一段故事，但是却实实在在发生在尼罗河的岸边。”当时有媒体如此评价Orascom在朝鲜开展通讯业务。 据悉，其中85%的利润来自Koryolink，目前，Koryolink用户约有300万人。 失势 + + 2014年11月，Orascom将朝鲜业务从综合收益中剔除，在提交的相关文件中不再出现Koryolink的资产负债表并抹去了价值数亿美元的资产，显然在运营6个月后，Orascom失去了对Koryolink的控制。 + + 在2015年第一季度，由于与朝鲜方面就解决股息、汇率以及近来经营问题等事项的会谈推后，公司第一财季财报的董事会会议退后了一个月。 + + 由于朝鲜政府对外汇的严格管控，Orascom不能将现金收入兑换成外汇，无法向埃及汇款，只能以朝鲜货币保存。在2012年有2.72亿美元现金账滞留在朝鲜，而截至去年6月30日，该项目的金额已是当时这一数字的两倍。 + + 除资金滞留之外，据日本共同社报在6月份报道，朝鲜成立了从事国内手机业务的新的国营通信公司，Orascom试图将Koryolink合并给该国营公司，并与朝鲜政府暂时达成了协议。 + + 总之，Orascom或将退出朝鲜市场，Koryolink很有可能由朝鲜政府接管。 \ No newline at end of file From 40e95dc4b82d8d040fdf7ee31d1a80447303d7ff Mon Sep 17 00:00:00 2001 From: ysmintor Date: Sun, 3 Jan 2016 19:46:54 +0800 Subject: [PATCH 2032/5486] add new experience --- Chinese/Orascom/Orascom.md | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/Chinese/Orascom/Orascom.md b/Chinese/Orascom/Orascom.md index e9a0d29805..0998048eef 100644 --- a/Chinese/Orascom/Orascom.md +++ b/Chinese/Orascom/Orascom.md @@ -1,26 +1,47 @@ 曾拿下四年唯一运营权 -Orascom电信控股公司1998年成立。在世界各地的扩张始终围绕一个核心策略：就是获得新兴市场的先发优势。1999年落地邻国约旦。又一年之后， +Orascom电信控股公司1998年成立。 -Orascom拓展到11个撒哈拉以南的非洲国家，2003年美伊战争爆发后进入伊拉克。其结果也十分显著，一跃成为中东、非洲、巴基斯坦三地规模最大、业务种类最全的网络运营商。 -2007年，Orascom在朝鲜如法炮制了之前的成功经验。投资4000万美元在朝鲜的首都平壤创办了分公司“Koryolink”（高丽电信公司），这也是朝鲜唯一的3G运营商。Orascom与朝鲜政府分别占75%和25%的股份。 +在世界各地的扩张始终围绕一个核心策略：就是获得新兴市场的先发优势。1999年落地邻国约旦。又一年之后， +Orascom拓展到11个撒哈拉以南的非洲国家，2003年美伊战争爆发后进入伊拉克。 -Orascom最初在朝鲜启动业务时，朝鲜方面授予Koryolink在朝鲜运营其唯一移动网络的权利，时间期限为2008年末到2012年末。此后，该公司在朝鲜的业务拓展至银行和多个建筑项目。 +其结果也十分显著，一跃成为中东、非洲、巴基斯坦三地规模最大、业务种类最全的网络运营商。 -“为朝鲜提供商业移动电话网络，这件事情听起来更像一段故事，但是却实实在在发生在尼罗河的岸边。”当时有媒体如此评价Orascom在朝鲜开展通讯业务。 + +2007年，Orascom在朝鲜如法炮制了之前的成功经验。 + + +投资4000万美元在朝鲜的首都平壤创办了分公司“Koryolink”（高丽电信公司），这也是朝鲜唯一的3G运营商。Orascom与朝鲜政府分别占75%和25%的股份。 + + +Orascom最初在朝鲜启动业务时，朝鲜方面授予Koryolink在朝鲜运营其唯一移动网络的权利，时间期限为2008年末到2012年末。 + + +此后，该公司在朝鲜的业务拓展至银行和多个建筑项目。 + + +“为朝鲜提供商业移动电话网络，这件事情听起来更像一段故事，但是却实实在在发生在尼罗河的岸边。 + +”当时有媒体如此评价Orascom在朝鲜开展通讯业务。 据悉，其中85%的利润来自Koryolink，目前，Koryolink用户约有300万人。 失势 -2014年11月，Orascom将朝鲜业务从综合收益中剔除，在提交的相关文件中不再出现Koryolink的资产负债表并抹去了价值数亿美元的资产，显然在运营6个月后，Orascom失去了对Koryolink的控制。 +2014年11月，Orascom将朝鲜业务从综合收益中剔除， + + +在提交的相关文件中不再出现Koryolink的资产负债表并抹去了价值数亿美元的资产，显然在运营6个月后，Orascom失去了对Koryolink的控制。 在2015年第一季度，由于与朝鲜方面就解决股息、汇率以及近来经营问题等事项的会谈推后，公司第一财季财报的董事会会议退后了一个月。 -由于朝鲜政府对外汇的严格管控，Orascom不能将现金收入兑换成外汇，无法向埃及汇款，只能以朝鲜货币保存。在2012年有2.72亿美元现金账滞留在朝鲜，而截至去年6月30日，该项目的金额已是当时这一数字的两倍。 +由于朝鲜政府对外汇的严格管控，Orascom不能将现金收入兑换成外汇， + + +无法向埃及汇款，只能以朝鲜货币保存。在2012年有2.72亿美元现金账滞留在朝鲜，而截至去年6月30日，该项目的金额已是当时这一数字的两倍。 除资金滞留之外，据日本共同社报在6月份报道，朝鲜成立了从事国内手机业务的新的国营通信公司，Orascom试图将Koryolink合并给该国营公司，并与朝鲜政府暂时达成了协议。 From b32f915ebf5b74a372935b30fbf9e4383e461885 Mon Sep 17 00:00:00 2001 From: Umang Agarwal Date: Sun, 3 Jan 2016 22:10:14 +0530 Subject: [PATCH 2033/5486] add story to bollywood.md --- hindi/bollywood.md | 1 + 1 file changed, 1 insertion(+) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 74e9f804bb..103327396d 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -3,6 +3,7 @@ बॉलीवुड में आपका स्वागत है ! आपका पसंदीदा अभिनेता कौन है? +मुझे बोर मत करो SRK ,[go here](actor1/srk.md) From 874168d9386a98b20ee25968d26a293fd787616e Mon Sep 17 00:00:00 2001 From: UtkarshBehre Date: Mon, 4 Jan 2016 00:00:14 +0530 Subject: [PATCH 2034/5486] wait and sleep --- .../find-a-toilet/door/run-in/go-sleep/go-sleep.md | 4 ++++ .../eating-walls/find-a-toilet/door/run-in/run-into-room.md | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 english/eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md diff --git a/english/eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md b/english/eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md new file mode 100644 index 0000000000..1320612702 --- /dev/null +++ b/english/eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md @@ -0,0 +1,4 @@ +You feel like this cant be happening. Is this real? Suddenly all the +escapeoptions dissapear and room is just a block of big 10x10x10 white +marshmallow and you are inside of it. And you just fall asleep in its +comfy soft surface. Then you wake up.[wake up](../../../../../../marshmallow.md) \ No newline at end of file diff --git a/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md b/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md index e70d386e47..37200aac87 100644 --- a/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md +++ b/english/eating-walls/find-a-toilet/door/run-in/run-into-room.md @@ -13,3 +13,5 @@ Do you: [Push the lever](push-lever/bear.md) [Break the window](break-window/coldroom.md) + +[Wait a while](go-sleep/go-sleep.md) From 780956ce4e7e6fe50d4920d142a0047253aa72ac Mon Sep 17 00:00:00 2001 From: UtkarshBehre Date: Mon, 4 Jan 2016 00:06:09 +0530 Subject: [PATCH 2035/5486] fix type escape options --- .../eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md b/english/eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md index 1320612702..3ff0c58ed1 100644 --- a/english/eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md +++ b/english/eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md @@ -1,4 +1,4 @@ You feel like this cant be happening. Is this real? Suddenly all the -escapeoptions dissapear and room is just a block of big 10x10x10 white +escape options dissapear and room is just a block of big 10x10x10 white marshmallow and you are inside of it. And you just fall asleep in its comfy soft surface. Then you wake up.[wake up](../../../../../../marshmallow.md) \ No newline at end of file From 0fc5f6a2fed437163cb54dd6bdb67608734d83a1 Mon Sep 17 00:00:00 2001 From: UtkarshBehre Date: Mon, 4 Jan 2016 00:12:53 +0530 Subject: [PATCH 2036/5486] fix return page link --- .../find-a-toilet/door/run-in/go-sleep/go-sleep.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md b/english/eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md index 3ff0c58ed1..3854ed8390 100644 --- a/english/eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md +++ b/english/eating-walls/find-a-toilet/door/run-in/go-sleep/go-sleep.md @@ -1,4 +1,5 @@ You feel like this cant be happening. Is this real? Suddenly all the escape options dissapear and room is just a block of big 10x10x10 white marshmallow and you are inside of it. And you just fall asleep in its -comfy soft surface. Then you wake up.[wake up](../../../../../../marshmallow.md) \ No newline at end of file +comfy soft surface. Then you +[wake up](../../../../../marshmallow.md) \ No newline at end of file From b023208f33f7d2f218598286b0de8b2bd6fe5abd Mon Sep 17 00:00:00 2001 From: TJEDII Date: Sun, 3 Jan 2016 13:09:10 -0800 Subject: [PATCH 2037/5486] Add torch option to strangle.md --- english/lasso-hand/strangle/strangle.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/lasso-hand/strangle/strangle.md b/english/lasso-hand/strangle/strangle.md index 3e4846b7de..3db0a023fb 100644 --- a/english/lasso-hand/strangle/strangle.md +++ b/english/lasso-hand/strangle/strangle.md @@ -5,4 +5,8 @@ You realise your foolish mistake. A hand does not have a throat and therefore cannot be strangled. -A very angry hand suddenly turns towards you and leaps. \ No newline at end of file +A very angry hand suddenly turns towards you and leaps. + +You: + +[Grab the torch from the sconce?](../strangle/torch/torch.md) From 917fcefe57dec750e1889587230ccd383917b12c Mon Sep 17 00:00:00 2001 From: TJEDII Date: Sun, 3 Jan 2016 13:10:08 -0800 Subject: [PATCH 2038/5486] Create dead end for torch option in strangle --- english/lasso-hand/strangle/torch/torch.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 english/lasso-hand/strangle/torch/torch.md diff --git a/english/lasso-hand/strangle/torch/torch.md b/english/lasso-hand/strangle/torch/torch.md new file mode 100644 index 0000000000..ae2d06d592 --- /dev/null +++ b/english/lasso-hand/strangle/torch/torch.md @@ -0,0 +1,13 @@ +You grab a torch from a sconce floating below an open area in the ceiling and raise it above your head + +just as the marshmallow hand bears down on you. You close you eyes and... silence. Reminiscent odors + +waft warmly into your nostrils. Campfire. Wire Hangers. It's roasted marsmallows! You open your eyes + +and the marshmallow hand hangs carmalized above you. It's covered in a shell of, not too burnt, crust. + +In fact it looks as if it is perfectly roasted. A feat that had previoulsy eluded in all other roasting + +attempts with unanimated marshmallows. + +You: From 27b5d4b4161a68db03de1c346c8ac73dc0b38be9 Mon Sep 17 00:00:00 2001 From: Fan Xiao Date: Mon, 4 Jan 2016 16:07:10 -0700 Subject: [PATCH 2039/5486] Add a new Story named deserthell --- Chinese/DesertHell/NewWorld.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Chinese/DesertHell/NewWorld.txt diff --git a/Chinese/DesertHell/NewWorld.txt b/Chinese/DesertHell/NewWorld.txt new file mode 100644 index 0000000000..dfad2c7f3d --- /dev/null +++ b/Chinese/DesertHell/NewWorld.txt @@ -0,0 +1,4 @@ +This is a new world +"新的世界“ +Let’s start from beginning +end From 3adf6b4730c561ed2830b99ee32be22d0b85989d Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 4 Jan 2016 19:26:30 -0500 Subject: [PATCH 2040/5486] Add text about Colorado --- english/lighter/grab-lighter.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/lighter/grab-lighter.md b/english/lighter/grab-lighter.md index 07d80c2f33..a48f0470b3 100644 --- a/english/lighter/grab-lighter.md +++ b/english/lighter/grab-lighter.md @@ -11,6 +11,9 @@ trembling. The marshmallow returns from the corner and offers you a freshly rolled doobie. +(Being as you are currently in Colorado, and thus this action +is perfectly legal.) + Do you: From 30b7e6611b748312eff51343ab798d6febe2dd58 Mon Sep 17 00:00:00 2001 From: Soumya Ranjan Bhuyan Date: Mon, 4 Jan 2016 20:25:19 -0700 Subject: [PATCH 2041/5486] Add high hopes --- english/destiny/destiny.md | 2 ++ english/hope/hope.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/hope/hope.md diff --git a/english/destiny/destiny.md b/english/destiny/destiny.md index f1e5fde996..1dc1b26a71 100644 --- a/english/destiny/destiny.md +++ b/english/destiny/destiny.md @@ -15,3 +15,5 @@ But you wake up and chose to find your way to know the [real life](../real-life/ see destiny isn't so hard when you try for it. and now you will be the [protagonist of the story](../marshmallow.md) + +and I have [high hopes](../hope/hope.md) for you. diff --git a/english/hope/hope.md b/english/hope/hope.md new file mode 100644 index 0000000000..e5b9c8dec9 --- /dev/null +++ b/english/hope/hope.md @@ -0,0 +1 @@ +[High Hopes](https://youtu.be/7jMlFXouPk8) From 043ba76cf6778d8c45ff0eda5466837b38fa0492 Mon Sep 17 00:00:00 2001 From: JayneJacobs Date: Tue, 5 Jan 2016 19:05:21 -0500 Subject: [PATCH 2042/5486] added livethe dream --- english/dream/dream.md | 2 ++ english/dream/livethedream/livethedream.md | 1 + "english/dream/livethedream/live\357\200\252" | 1 + 3 files changed, 4 insertions(+) create mode 100644 english/dream/livethedream/livethedream.md create mode 100644 "english/dream/livethedream/live\357\200\252" diff --git a/english/dream/dream.md b/english/dream/dream.md index 8fa870c44c..0248a15799 100644 --- a/english/dream/dream.md +++ b/english/dream/dream.md @@ -2,8 +2,10 @@ You understand that it's difficult to wake up from a dream if you think this is You attempt to point out things that are around you that cannot possibly occur in real life such the marshmallow walls and hand. You start to feel excted about the possibilities of this unique world. +In your dream you remember all of your earlier dreams and then the dreams seem more real than reality. You feel that there will be no consequence in your dream and you attempt to manipulate your dream away, but how... Afterwards, you decide to: +[livethedream](../livethedream/livethedream.md) [scream](../scream/scream.md) diff --git a/english/dream/livethedream/livethedream.md b/english/dream/livethedream/livethedream.md new file mode 100644 index 0000000000..dc3de5378d --- /dev/null +++ b/english/dream/livethedream/livethedream.md @@ -0,0 +1 @@ +Which is real if I remember all of the times in my childhood when I flew in my dreams. I would decide the dream is more real and reality is a dream. It would be more fun to live where I can fly so I would stay in the dream. diff --git "a/english/dream/livethedream/live\357\200\252" "b/english/dream/livethedream/live\357\200\252" new file mode 100644 index 0000000000..dc3de5378d --- /dev/null +++ "b/english/dream/livethedream/live\357\200\252" @@ -0,0 +1 @@ +Which is real if I remember all of the times in my childhood when I flew in my dreams. I would decide the dream is more real and reality is a dream. It would be more fun to live where I can fly so I would stay in the dream. From da1faa2a95e07622b210ab6d6a8c531b43ed3a94 Mon Sep 17 00:00:00 2001 From: JayneJacobs Date: Tue, 5 Jan 2016 19:22:02 -0500 Subject: [PATCH 2043/5486] corrected the link --- english/dream/dream.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/dream/dream.md b/english/dream/dream.md index 0248a15799..d9b490a9dd 100644 --- a/english/dream/dream.md +++ b/english/dream/dream.md @@ -5,7 +5,8 @@ You start to feel excted about the possibilities of this unique world. In your dream you remember all of your earlier dreams and then the dreams seem more real than reality. You feel that there will be no consequence in your dream and you attempt to manipulate your dream away, but how... Afterwards, you decide to: -[livethedream](../livethedream/livethedream.md) + +[livethedream](../dream/livethedream/livethedream.md) [scream](../scream/scream.md) From b2f035ea04cf0dc218fe3682029af271390083eb Mon Sep 17 00:00:00 2001 From: JayneJacobs Date: Tue, 5 Jan 2016 19:33:36 -0500 Subject: [PATCH 2044/5486] Fixed the link Please enter the commit message for your changes. Lines starting --- english/dream/livethedream.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 english/dream/livethedream.md diff --git a/english/dream/livethedream.md b/english/dream/livethedream.md new file mode 100644 index 0000000000..e69de29bb2 From 64c9ba93af747970d63a5d69eb6a9ce4fda4bc6e Mon Sep 17 00:00:00 2001 From: Joshua Park Date: Wed, 6 Jan 2016 18:30:03 +0900 Subject: [PATCH 2045/5486] Add philosophy option --- korean/marshmallow.md | 2 ++ korean/philosophy/imalnyun/imalnyun.md | 1 + korean/philosophy/philosophy.md | 10 ++++++++++ 3 files changed, 13 insertions(+) create mode 100644 korean/philosophy/imalnyun/imalnyun.md create mode 100644 korean/philosophy/philosophy.md diff --git a/korean/marshmallow.md b/korean/marshmallow.md index 6bd4cf7179..26d8522f51 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -35,3 +35,5 @@ [볼을 꼬집어 본다](pinch/pinch.md) 라고 고민하지만 선택하기 위해서 [요가를 한다](yoga/yoga.md) + +[내가 나비인지 나비가 나인지 철학적인 고민을 한다](philosophy/philosophy.md) \ No newline at end of file diff --git a/korean/philosophy/imalnyun/imalnyun.md b/korean/philosophy/imalnyun/imalnyun.md new file mode 100644 index 0000000000..ddfa5fe50f --- /dev/null +++ b/korean/philosophy/imalnyun/imalnyun.md @@ -0,0 +1 @@ +그만 좀 해 미친 놈아! \ No newline at end of file diff --git a/korean/philosophy/philosophy.md b/korean/philosophy/philosophy.md new file mode 100644 index 0000000000..8c9a8a34f8 --- /dev/null +++ b/korean/philosophy/philosophy.md @@ -0,0 +1,10 @@ +원래 생각 없이 사는 내가 이런 고민을 하다니... +... +아 어느새 잠이 들었군. +근데.. 여기는 어디지? + +알게 뭐냐. 다시 [내가 나비인지 나비가 나인지 철학적인 고민을 한다](imalnyun/imalnyun.md) + +더 열심히 [내가 나비인지 나비가 나인지 철학적인 고민을 한다](imalnyun/imalnyun.md) + +[이만하면 GitHub 사용법은 깨쳤다고 생각하고 그만한다](../marshmallow.md) \ No newline at end of file From a1a2ca7df60dd07f650cc8d45ba23c46b738388d Mon Sep 17 00:00:00 2001 From: JayneJacobs Date: Wed, 6 Jan 2016 10:44:41 -0500 Subject: [PATCH 2046/5486] =?UTF-8?q?Delete=20live=EF=80=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "english/dream/livethedream/live\357\200\252" | 1 - 1 file changed, 1 deletion(-) delete mode 100644 "english/dream/livethedream/live\357\200\252" diff --git "a/english/dream/livethedream/live\357\200\252" "b/english/dream/livethedream/live\357\200\252" deleted file mode 100644 index dc3de5378d..0000000000 --- "a/english/dream/livethedream/live\357\200\252" +++ /dev/null @@ -1 +0,0 @@ -Which is real if I remember all of the times in my childhood when I flew in my dreams. I would decide the dream is more real and reality is a dream. It would be more fun to live where I can fly so I would stay in the dream. From c2739ab17c9a2c7ddbf0aee114b366c4004c5168 Mon Sep 17 00:00:00 2001 From: Michael Walls Date: Wed, 6 Jan 2016 10:39:39 -0600 Subject: [PATCH 2047/5486] add joshua 24:15 to the story --- english/joshua_24_15/joshua_24_15.md | 5 +++++ english/marshmallow.md | 1 + 2 files changed, 6 insertions(+) create mode 100644 english/joshua_24_15/joshua_24_15.md diff --git a/english/joshua_24_15/joshua_24_15.md b/english/joshua_24_15/joshua_24_15.md new file mode 100644 index 0000000000..b7429c586e --- /dev/null +++ b/english/joshua_24_15/joshua_24_15.md @@ -0,0 +1,5 @@ +And if it seem evil unto you to serve the LORD, choose you this day whom ye will serve; + +whether the gods which your fathers served that were on the other side of the flood, or the gods of the Amorites, + +in whose land ye dwell: but as for me and my house, we will serve the LORD. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 05565c3974..25c0c4f76f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -716,3 +716,4 @@ You may either do [this](gtd/gtd.md), "I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" \ No newline at end of file From 0d006bf41af3bed4966904417e84f8862ca24299 Mon Sep 17 00:00:00 2001 From: Michael Walls Date: Wed, 6 Jan 2016 10:46:05 -0600 Subject: [PATCH 2048/5486] add blank line at the end --- english/joshua_24_15/joshua_24_15.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/joshua_24_15/joshua_24_15.md b/english/joshua_24_15/joshua_24_15.md index b7429c586e..0f5f43624c 100644 --- a/english/joshua_24_15/joshua_24_15.md +++ b/english/joshua_24_15/joshua_24_15.md @@ -2,4 +2,4 @@ And if it seem evil unto you to serve the LORD, choose you this day whom ye will whether the gods which your fathers served that were on the other side of the flood, or the gods of the Amorites, -in whose land ye dwell: but as for me and my house, we will serve the LORD. \ No newline at end of file +in whose land ye dwell: but as for me and my house, we will serve the LORD. From 6586bd32d054fe14358220fc3cdb1d7f45500a42 Mon Sep 17 00:00:00 2001 From: ramana reddy sane Date: Thu, 7 Jan 2016 04:05:43 +0530 Subject: [PATCH 2049/5486] Add line to killing rats --- english/kill-rats/kill-rats.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/kill-rats/kill-rats.md b/english/kill-rats/kill-rats.md index 44f84aa594..13595c88ac 100644 --- a/english/kill-rats/kill-rats.md +++ b/english/kill-rats/kill-rats.md @@ -1,2 +1,3 @@ You start to smash the rats with your feets and to punch the ones who jump to you, -but no matter how bravely you fight they start to eat your body until your end... \ No newline at end of file +but no matter how bravely you fight they start to eat your body until your end... +Wow that's... interesting. \ No newline at end of file From 77654473429e8bf68d7ba6e62567a80cc15e35f5 Mon Sep 17 00:00:00 2001 From: Jonathan Warshaw Date: Wed, 6 Jan 2016 17:25:54 -0600 Subject: [PATCH 2050/5486] Add attack folder and attack file for attack option. Add attack link in duel file. --- .../ask-person-about-mission/duel/attack/attack.md | 8 ++++++++ .../ask-person-about-mission/duel/duel.md | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/attack/attack.md diff --git a/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/attack/attack.md b/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/attack/attack.md new file mode 100644 index 0000000000..14f76ec114 --- /dev/null +++ b/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/attack/attack.md @@ -0,0 +1,8 @@ +You charge the roaring KitKat. His huge, wafer body sits atop two thin pretzellegs. He is top heavy. You decide to +knock him off balance, but he lunges forward and catches you mid-stride. You fly face first into his chocolatey belly. +You try to push away. Your fingers are sticky with fluff from the marshmallow room. The KitKat pushes his weight on top +of you, and pins you to the ground. You feel your lungs collapse. The few small breaths you manage are filled with the +scent of milk-chocolatey goodness. The heat of your body begins to slowly melt the KitKat's exterior. The liquid +chocolate mixes with the marshmallow stuck between your fingers. + +Your stomach grumbles. \ No newline at end of file diff --git a/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/duel.md b/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/duel.md index 9fd4a01440..05331a7787 100644 --- a/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/duel.md +++ b/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/duel.md @@ -6,4 +6,8 @@ you in the least. to stop me and I'll prove that I'm the most powerful warrior in Chocosnackland!", you shout. -He instantly leaps to his feet and lets out a roar. \ No newline at end of file +He instantly leaps to his feet and lets out a roar. + +Do you? + +[Attack!](../attack/attack.md) \ No newline at end of file From f2320a9a16ed464f0d88e43643e8cfee17ee9a08 Mon Sep 17 00:00:00 2001 From: Jonathan Warshaw Date: Wed, 6 Jan 2016 17:44:10 -0600 Subject: [PATCH 2051/5486] Correct spelling of pretzel legs --- .../ask-person-about-mission/duel/attack/attack.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/attack/attack.md b/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/attack/attack.md index 14f76ec114..967e43c2eb 100644 --- a/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/attack/attack.md +++ b/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/attack/attack.md @@ -1,4 +1,4 @@ -You charge the roaring KitKat. His huge, wafer body sits atop two thin pretzellegs. He is top heavy. You decide to +You charge the roaring KitKat. His huge, wafer body sits atop two thin pretzel legs. He is top heavy. You decide to knock him off balance, but he lunges forward and catches you mid-stride. You fly face first into his chocolatey belly. You try to push away. Your fingers are sticky with fluff from the marshmallow room. The KitKat pushes his weight on top of you, and pins you to the ground. You feel your lungs collapse. The few small breaths you manage are filled with the From 19d24da6a2b53b310772a401cdd133c35e45c8f0 Mon Sep 17 00:00:00 2001 From: Daniel-at-github Date: Thu, 7 Jan 2016 02:52:15 +0100 Subject: [PATCH 2052/5486] Gamified git --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 05565c3974..9905b7c457 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,5 +1,7 @@ This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +[play](http://pcottle.github.io/learnGitBranching/) with the (git) branches + and search for your [destiny](destiny/destiny.md). You are are man (or woman) for all seasons but need help in choosing From 9a1d5b71e4ba5800cb1c993bb840d705c489a093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20M=C3=BCller?= Date: Thu, 7 Jan 2016 10:12:53 +0100 Subject: [PATCH 2053/5486] Add new optioins for solarbetriebener-Motor --- .../solarbetriebener-Motor/solarbetriebener-Motor.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/german/finger-ins-loch/solarbetriebener-Motor/solarbetriebener-Motor.md b/german/finger-ins-loch/solarbetriebener-Motor/solarbetriebener-Motor.md index 0a7c66f5a5..555c2617e5 100644 --- a/german/finger-ins-loch/solarbetriebener-Motor/solarbetriebener-Motor.md +++ b/german/finger-ins-loch/solarbetriebener-Motor/solarbetriebener-Motor.md @@ -6,3 +6,10 @@ Android-Smartphone, welches allerdings nicht Ihnen gehört. Es hat noch 10 % Akk Sie versuchen eine Notfallnummer zu wählen doch ohjee, sie haben kein Signal. Sie werden wohl noch warten müssen bis sie in der Nähe von Land sind oder die Sonne wieder scheint. Als Sie damit beschäftigt waren bemerken Sie auf einmal dass noch ein Tiger auf dem Bot ist und Sie ein Inder sind... +...zumindest für einen kurzen Moment. Als sich Ihre Gedanken wieder beruhigt haben, ist das Boot leer. +Sie würden gerne länger darüber nachdenken, wie es zu dieser Halluzination kommen konnte, aber das Boot läuft +weiter voll Wasser. Um zum Land zu kommen beschließen Sie ... + +... das [hoelzerne Paddel](../hoelzernes-Paddel/hoelzernes-Paddel.md) zu benutzen. + +... [ins Wasser](../ins-Wasser/ins-Wasser.md) zu springen und das Boot zu schieben. \ No newline at end of file From b373b126de85f3683c391b5015f97d834fadef6b Mon Sep 17 00:00:00 2001 From: Mattia Cantono Date: Thu, 7 Jan 2016 16:04:14 +0100 Subject: [PATCH 2054/5486] added colazione --- Italian/caramelle.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Italian/caramelle.md b/Italian/caramelle.md index acb9af3887..d9230595bd 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -12,3 +12,5 @@ Che fai? [Mi conto le dita per vedere se sono veramente sveglio](verifica/verifica.md) [Cerco aiuto ulrando c'è qualcuno?](aiuto/aiuto.md) + +[Cerco qualcosa per fare colazione](https://www.youtube.com/watch?v=sN6opoE0iZk) \ No newline at end of file From 6d72a87727bc7eeb666df0684821cc099e98738d Mon Sep 17 00:00:00 2001 From: Mattia Cantono Date: Thu, 7 Jan 2016 16:09:15 +0100 Subject: [PATCH 2055/5486] fix structure --- Italian/caramelle.md | 2 +- Italian/colazione/colazione.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Italian/colazione/colazione.md diff --git a/Italian/caramelle.md b/Italian/caramelle.md index d9230595bd..e63f60dc2b 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -13,4 +13,4 @@ Che fai? [Cerco aiuto ulrando c'è qualcuno?](aiuto/aiuto.md) -[Cerco qualcosa per fare colazione](https://www.youtube.com/watch?v=sN6opoE0iZk) \ No newline at end of file +[Cerco qualcosa per fare colazione](colazione/colazione.md) \ No newline at end of file diff --git a/Italian/colazione/colazione.md b/Italian/colazione/colazione.md new file mode 100644 index 0000000000..ab05cfffc0 --- /dev/null +++ b/Italian/colazione/colazione.md @@ -0,0 +1 @@ +[Si mangia](https://www.youtube.com/watch?v=sN6opoE0iZk) \ No newline at end of file From b5a768fdeee761ada69c12489b99944394fc0504 Mon Sep 17 00:00:00 2001 From: Nont Date: Thu, 7 Jan 2016 22:32:00 +0700 Subject: [PATCH 2056/5486] Add a jedi element --- english/magic/magic.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/magic/magic.md b/english/magic/magic.md index bca709b8fa..d82e1fd3e4 100644 --- a/english/magic/magic.md +++ b/english/magic/magic.md @@ -9,3 +9,5 @@ Voldemort hates smores -- knowledge is power You are now in the Kings Landing, looking at the Mad King on the Iron throne. I am coming for you mad king. For I am the mother of dragons What is dead may never die! +With my green light saber, I'll deal with this sithlord madness! + From 4d142d2ac8d460516ea0bc119755c0cf5758b572 Mon Sep 17 00:00:00 2001 From: alch3m1st Date: Thu, 7 Jan 2016 23:01:29 +0200 Subject: [PATCH 2057/5486] Suddenly you feel something on your feet --- .../set_it_on_fire/brave_guy/brave_guy.md | 1 + 1 file changed, 1 insertion(+) diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md index eaf37ae19b..2e3795d886 100644 --- a/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md @@ -1,3 +1,4 @@ Δεν τα παρατάς. Σε διακρίνει γενναιότητα και τόλμη. Δένεις το σχοινί στον τοίχο, το πετάς στο κενό απο την τρύπα που άνοιξες και προσπαθείς να κατέβεις το κενό. +Ξαφνικά ο αισθάνεσαι κάτι στα πόδια σου. From b869317ba502dfef4a9438a07e5f6d1db7aaae6e Mon Sep 17 00:00:00 2001 From: versatgrant Date: Thu, 7 Jan 2016 16:11:27 -0500 Subject: [PATCH 2058/5486] 'Bored' additions to the adventure --- english/bored/bored.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/bored/bored.md diff --git a/english/bored/bored.md b/english/bored/bored.md new file mode 100644 index 0000000000..f52bd87e48 --- /dev/null +++ b/english/bored/bored.md @@ -0,0 +1,5 @@ +"I'm bored." + +"Imma go to [sleep](../dream/dream.md)." + +"Or should I just go over [there](../forest/forest.md)?" From 02184337203dfa1640c151c3e0c464b448817ff5 Mon Sep 17 00:00:00 2001 From: versatgrant Date: Thu, 7 Jan 2016 16:21:46 -0500 Subject: [PATCH 2059/5486] Make 'Bored' addition reachable --- english/chess/chess.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/chess/chess.md b/english/chess/chess.md index 3ecef024d1..d0357c901d 100644 --- a/english/chess/chess.md +++ b/english/chess/chess.md @@ -6,4 +6,6 @@ An image appears in your mind. White to move. You decide the best response is Qf8+, then Ra8 with mate to follow -And you go back to reality. \ No newline at end of file +And you go back to reality. + +This game is getting [boring](../bored/bored.md). \ No newline at end of file From 805f1963867703d8bff8231e1220574d164e357a Mon Sep 17 00:00:00 2001 From: David Olsen Date: Thu, 7 Jan 2016 16:48:38 -0500 Subject: [PATCH 2060/5486] Add 2 lines about your reaction to meeting Leonardo di Caprio --- english/go-back-to-sleep/go-back-to-sleep.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/go-back-to-sleep/go-back-to-sleep.md b/english/go-back-to-sleep/go-back-to-sleep.md index a21c2fe7a8..b987d0cf0d 100644 --- a/english/go-back-to-sleep/go-back-to-sleep.md +++ b/english/go-back-to-sleep/go-back-to-sleep.md @@ -7,4 +7,8 @@ You roll over, let your eyes close shut, and drift off into [dreamland](../dream You wonder, idly, what happens if you start dreaming from within a dream.. -When suddenly you are face to face with [Leonardo DiCaprio](./dream-ception/dream-ception.md) \ No newline at end of file +When suddenly you are face to face with [Leonardo DiCaprio](./dream-ception/dream-ception.md) + +You want to say something to him but you draw a blank. + +The only movie you can think of that he was in is "Basketball Diaries". \ No newline at end of file From 006550d522aeaef0122052e10d963a4f55152087 Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 7 Jan 2016 22:49:32 +0100 Subject: [PATCH 2061/5486] continue story with person in Unterwasserstation --- german/Korallen/Hoehle/Unterwasserstation/Person/Person.md | 1 + 1 file changed, 1 insertion(+) diff --git a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md index 3c51609920..8ff4121901 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md +++ b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md @@ -1,2 +1,3 @@ Sie reicht Ihnen die Hand um Ihnen aus dem Wasser zu helfen. Erst jetzt gelingt es Ihnen einen Blick auf den Fremden zu werfen. Er guckt Sie mit einer gewissen Skepsis aber nicht unfreundlich an. +Er drückt Ihnen einen Stein in die Hand und sagt "Hier mein Junge, bring das in Sicherheit". From 88208f18cb9f3010d28928b021390c46904c1689 Mon Sep 17 00:00:00 2001 From: David Olsen Date: Thu, 7 Jan 2016 16:59:01 -0500 Subject: [PATCH 2062/5486] Add line about keep going --- english/go-back-to-sleep/go-back-to-sleep.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/go-back-to-sleep/go-back-to-sleep.md b/english/go-back-to-sleep/go-back-to-sleep.md index b987d0cf0d..2a866e5d4c 100644 --- a/english/go-back-to-sleep/go-back-to-sleep.md +++ b/english/go-back-to-sleep/go-back-to-sleep.md @@ -11,4 +11,6 @@ When suddenly you are face to face with [Leonardo DiCaprio](./dream-ception/drea You want to say something to him but you draw a blank. -The only movie you can think of that he was in is "Basketball Diaries". \ No newline at end of file +The only movie you can think of that he was in is "Basketball Diaries". + +So you just smile and keep going. \ No newline at end of file From 4db669b60593969c39877fd2cc0e674ea91a71e1 Mon Sep 17 00:00:00 2001 From: Fan Xiao Date: Thu, 7 Jan 2016 15:47:18 -0700 Subject: [PATCH 2063/5486] Change the file format from .txt to .md --- Chinese/DesertHell/NewWorld.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Chinese/DesertHell/NewWorld.md diff --git a/Chinese/DesertHell/NewWorld.md b/Chinese/DesertHell/NewWorld.md new file mode 100644 index 0000000000..dfad2c7f3d --- /dev/null +++ b/Chinese/DesertHell/NewWorld.md @@ -0,0 +1,4 @@ +This is a new world +"新的世界“ +Let’s start from beginning +end From c8d8a1b7fac21362c5adc57a6123ef8a28b67045 Mon Sep 17 00:00:00 2001 From: Fan Xiao Date: Thu, 7 Jan 2016 15:47:58 -0700 Subject: [PATCH 2064/5486] add a link to New World --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index 4a04ea52b2..5cb511ed97 100644 --- a/language.md +++ b/language.md @@ -18,6 +18,8 @@ If you speak Punjabi, [go here](punjabi/punjabi.md). 如果你说中文，[点击这里](Chinese/大话西游.md). +如果你说中文而且想要了解一个新的世界，[请点击这里](Chinese/DesertHell/NewWorld.md). + Si hablas español, pasa [por aquí](espanol/canudos.md). اذا كنت تتحدث العربية، [اضغط هنا](arabic/salamoAlikom.md) From e100a4625bb157987d2310c99b531586d0dd20cf Mon Sep 17 00:00:00 2001 From: Fan Xiao Date: Thu, 7 Jan 2016 15:49:25 -0700 Subject: [PATCH 2065/5486] File is deleted and recreted as NewWorld.md --- Chinese/DesertHell/NewWorld.txt | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 Chinese/DesertHell/NewWorld.txt diff --git a/Chinese/DesertHell/NewWorld.txt b/Chinese/DesertHell/NewWorld.txt deleted file mode 100644 index dfad2c7f3d..0000000000 --- a/Chinese/DesertHell/NewWorld.txt +++ /dev/null @@ -1,4 +0,0 @@ -This is a new world -"新的世界“ -Let’s start from beginning -end From f50c1450aa15a1cb6f8632249cf11c954c2245a4 Mon Sep 17 00:00:00 2001 From: Isabella Yuen Date: Fri, 8 Jan 2016 11:04:55 +0000 Subject: [PATCH 2066/5486] test2 --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 25c0c4f76f..8e26ab59b0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -2,6 +2,8 @@ This is a story to look for your own, to [fight your way out of this](fight-out/ and search for your [destiny](destiny/destiny.md). +Before we begin, do you need a [warm-up?](warm-up/warm-up.md) + You are are man (or woman) for all seasons but need help in choosing your travel destinations.. Of course we are happy to help you with these [suggestions](travel-destinations/travel-destinations.md) From 77f114327e4c83e6b5402fd773e6baca436a4ee6 Mon Sep 17 00:00:00 2001 From: Isabella Yuen Date: Fri, 8 Jan 2016 11:06:39 +0000 Subject: [PATCH 2067/5486] add warm-up scripts --- english/warm-up/Blood_flow/vigorous.md | 7 +++++++ english/warm-up/break/break.md | 5 +++++ english/warm-up/eyes/eyes.md | 7 +++++++ english/warm-up/warm-up.md | 9 +++++++++ 4 files changed, 28 insertions(+) create mode 100644 english/warm-up/Blood_flow/vigorous.md create mode 100644 english/warm-up/break/break.md create mode 100644 english/warm-up/eyes/eyes.md create mode 100644 english/warm-up/warm-up.md diff --git a/english/warm-up/Blood_flow/vigorous.md b/english/warm-up/Blood_flow/vigorous.md new file mode 100644 index 0000000000..4bc563a8f8 --- /dev/null +++ b/english/warm-up/Blood_flow/vigorous.md @@ -0,0 +1,7 @@ +Do 10 jumping jacks. + +Do 10 burpies. + +Run on the spot or 10 (long) seconds. + +Now go [back to the warm-up.](../warm-up.md) \ No newline at end of file diff --git a/english/warm-up/break/break.md b/english/warm-up/break/break.md new file mode 100644 index 0000000000..758a77237a --- /dev/null +++ b/english/warm-up/break/break.md @@ -0,0 +1,5 @@ +Go away from any screen (computer, phone, tv...) for at least 10 minutes! + +Done? + +Now go [back to the warm-up.](../warm-up.md) \ No newline at end of file diff --git a/english/warm-up/eyes/eyes.md b/english/warm-up/eyes/eyes.md new file mode 100644 index 0000000000..bafd077fd8 --- /dev/null +++ b/english/warm-up/eyes/eyes.md @@ -0,0 +1,7 @@ +Look over your left shoulder for 5 seconds. + +Loook over your right shoulder for 5 seconds. + +Look up at the ceiling for 5 seocnds. + +Now [return to the warm-up.](../warm-up.md) \ No newline at end of file diff --git a/english/warm-up/warm-up.md b/english/warm-up/warm-up.md new file mode 100644 index 0000000000..14bb094f95 --- /dev/null +++ b/english/warm-up/warm-up.md @@ -0,0 +1,9 @@ +Close and take a deep breath. + +Have you been sitting down for a while? Then do [blood flow exercises.](Blood_flow/vigorous.md) + +Have you spent more than 4 hours looking at your screen today? Then do [these exercises.](eyes/eyes.md) + +Have you spent more than 12 hours looking a a screen today? Then take a [break.](break/break.md) + +Done with the warm up? Then [go back to the story.](../marshmallow.md) \ No newline at end of file From 64d81244f91291bc783ce6e4cb28431a29eff15c Mon Sep 17 00:00:00 2001 From: ballen Date: Fri, 8 Jan 2016 09:34:37 -0600 Subject: [PATCH 2068/5486] Corrected some typos and added a live tweet option --- english/poke-the-wall/poke-the-wall.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/english/poke-the-wall/poke-the-wall.md b/english/poke-the-wall/poke-the-wall.md index f611dd62b1..e0326e5edc 100644 --- a/english/poke-the-wall/poke-the-wall.md +++ b/english/poke-the-wall/poke-the-wall.md @@ -1,18 +1,18 @@ -A thick layer of gooey (or GUI) delicious-looking chocolate syrup begins oozing +A thick layer of gooey (or GUI) delicious-looking chocolate syrup begins oozing out of the wall! -out of the wall! - -Suddenly, the poked wall pops a couple marsmallows around the breach and the flow -speeds up. +Suddenly, the poked wall pops a couple marshmallows around the breach and the flow speeds up. While you wait contemplating the brown cascade of calories with a dropped jaw the room fills quickly. The liquid chocolate rises and covers you up until the chest. -You realize that now you can barely move and the -You see a marsmallow-shaped door made of marshmallows a few meters to your left. +You realize that now you can barely move. + +You see a marshmallow-shaped door made of marshmallows a few meters to your left. You wonder if it would be wise to [eat your way out.](eat-way-out/eat-way-out.md). +Or [live tweet](../tweet-it/tweet-it.md) this chocolate and marshmallow shenanigans. + Or perhaps you should think a little more for an alternative solution. \ No newline at end of file From 3b1b025c4ebf8b5084d48573ac467faddfea67e0 Mon Sep 17 00:00:00 2001 From: Itay Taragano Date: Fri, 8 Jan 2016 17:53:22 +0200 Subject: [PATCH 2069/5486] Add a new line --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 8e26ab59b0..3024da6166 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -718,4 +718,6 @@ You may either do [this](gtd/gtd.md), "I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" \ No newline at end of file +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" + +Yourself? \ No newline at end of file From 91d9249407a8f068bcbe1c23ca3fb3894c064e7a Mon Sep 17 00:00:00 2001 From: ballen Date: Fri, 8 Jan 2016 10:15:24 -0600 Subject: [PATCH 2070/5486] Revert "Corrected some typos and added a live tweet option" This reverts commit 64d81244f91291bc783ce6e4cb28431a29eff15c. --- english/poke-the-wall/poke-the-wall.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/english/poke-the-wall/poke-the-wall.md b/english/poke-the-wall/poke-the-wall.md index e0326e5edc..f611dd62b1 100644 --- a/english/poke-the-wall/poke-the-wall.md +++ b/english/poke-the-wall/poke-the-wall.md @@ -1,18 +1,18 @@ -A thick layer of gooey (or GUI) delicious-looking chocolate syrup begins oozing out of the wall! +A thick layer of gooey (or GUI) delicious-looking chocolate syrup begins oozing -Suddenly, the poked wall pops a couple marshmallows around the breach and the flow speeds up. +out of the wall! + +Suddenly, the poked wall pops a couple marsmallows around the breach and the flow +speeds up. While you wait contemplating the brown cascade of calories with a dropped jaw the room fills quickly. The liquid chocolate rises and covers you up until the chest. +You realize that now you can barely move and the -You realize that now you can barely move. - -You see a marshmallow-shaped door made of marshmallows a few meters to your left. +You see a marsmallow-shaped door made of marshmallows a few meters to your left. You wonder if it would be wise to [eat your way out.](eat-way-out/eat-way-out.md). -Or [live tweet](../tweet-it/tweet-it.md) this chocolate and marshmallow shenanigans. - Or perhaps you should think a little more for an alternative solution. \ No newline at end of file From c758a3724f61311dc5336dc8e1bf1d4641063ae6 Mon Sep 17 00:00:00 2001 From: ballen Date: Fri, 8 Jan 2016 10:20:54 -0600 Subject: [PATCH 2071/5486] Added live tweet option back. This commit only includes additions --- english/poke-the-wall/poke-the-wall.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/poke-the-wall/poke-the-wall.md b/english/poke-the-wall/poke-the-wall.md index f611dd62b1..2a11f9ae03 100644 --- a/english/poke-the-wall/poke-the-wall.md +++ b/english/poke-the-wall/poke-the-wall.md @@ -15,4 +15,6 @@ You see a marsmallow-shaped door made of marshmallows a few meters to your left. You wonder if it would be wise to [eat your way out.](eat-way-out/eat-way-out.md). +Or [live tweet](../tweet-it/tweet-it.md) this chocolate and marshmallow shenanigans. + Or perhaps you should think a little more for an alternative solution. \ No newline at end of file From 88bf795934472053add45f877b9b741f3466c79d Mon Sep 17 00:00:00 2001 From: Patty Date: Fri, 8 Jan 2016 16:36:07 +0000 Subject: [PATCH 2072/5486] Adicionei uma imaginacao no qual fazia uma nova app --- portugues/amigo/incomodar/reinventar/reinventar-app.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 portugues/amigo/incomodar/reinventar/reinventar-app.md diff --git a/portugues/amigo/incomodar/reinventar/reinventar-app.md b/portugues/amigo/incomodar/reinventar/reinventar-app.md new file mode 100644 index 0000000000..1847fc5729 --- /dev/null +++ b/portugues/amigo/incomodar/reinventar/reinventar-app.md @@ -0,0 +1 @@ +Procuro um amigo "geek" para colaborar comigo e fazemos uma versão melhorada sem o bug :) From db41608a8f325dcd6e4f6f67567229281a9f2668 Mon Sep 17 00:00:00 2001 From: Patty Date: Fri, 8 Jan 2016 18:39:36 +0000 Subject: [PATCH 2073/5486] Added link to portuguese page --- portugues/colaborando.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index b2cda5d41c..33769eeba3 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -13,6 +13,8 @@ Você: [Cria um aplicativo melhor](cria/melhor.md) +[Procura um amigo geek e reinventa um app bem melhor!](reinventar-app.md) + [Levanta-se a vai buscar o spray mata insetos](spray/matainsetos.md) [Mas esse navio não pode ter bugs!](titanic/iceberg.md) From 3492111847423f1b4fb25f075a542e07f1ed7fb2 Mon Sep 17 00:00:00 2001 From: Patty Date: Fri, 8 Jan 2016 18:53:17 +0000 Subject: [PATCH 2074/5486] Fixed broken link --- portugues/colaborando.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 33769eeba3..24506508d5 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -13,7 +13,7 @@ Você: [Cria um aplicativo melhor](cria/melhor.md) -[Procura um amigo geek e reinventa um app bem melhor!](reinventar-app.md) +[Procura um amigo geek e reinventa um app bem melhor!](amigo/incomodar/reinventar/reinventar-app.md) [Levanta-se a vai buscar o spray mata insetos](spray/matainsetos.md) From a48248c575b1b0ca6a3543bae82a4aed32ae4819 Mon Sep 17 00:00:00 2001 From: Bryn Perkins Date: Fri, 8 Jan 2016 23:37:07 +0100 Subject: [PATCH 2075/5486] Add description to warm-up page --- english/warm-up/warm-up.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/warm-up/warm-up.md b/english/warm-up/warm-up.md index 14bb094f95..7a418bf166 100644 --- a/english/warm-up/warm-up.md +++ b/english/warm-up/warm-up.md @@ -1,5 +1,9 @@ Close and take a deep breath. +Take another deep breath, then another. + +When you're ready, open your eyes and consider: + Have you been sitting down for a while? Then do [blood flow exercises.](Blood_flow/vigorous.md) Have you spent more than 4 hours looking at your screen today? Then do [these exercises.](eyes/eyes.md) From 048d10a9c8aeb98368c1bf3f9673c7375c5eef59 Mon Sep 17 00:00:00 2001 From: gnuffer Date: Sat, 9 Jan 2016 00:14:41 +0100 Subject: [PATCH 2076/5486] Add Lambda to Lisp --- english/lisp/lisp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/lisp/lisp.md b/english/lisp/lisp.md index ab0952e7a6..4908bc19cf 100644 --- a/english/lisp/lisp.md +++ b/english/lisp/lisp.md @@ -1,5 +1,5 @@ The LISP interpreter starts with a flash of blue-green flame! -It thunders, "We hold the path of the Righteous. Blessed be he who follows the s-expression. Woe to the nonbelievers!" +It thunders, "We hold the path of the Righteous. Blessed be he who follows the s-expression. Woe to the nonbelievers! Long live the lambda!" The prompt pops up. From 5729443e156446e7d221a3f5388647d28ed01009 Mon Sep 17 00:00:00 2001 From: gnuffer Date: Sat, 9 Jan 2016 00:19:43 +0100 Subject: [PATCH 2077/5486] Moved Lambda to a line of its own --- english/lisp/lisp.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/lisp/lisp.md b/english/lisp/lisp.md index 4908bc19cf..e0b4569495 100644 --- a/english/lisp/lisp.md +++ b/english/lisp/lisp.md @@ -1,5 +1,6 @@ The LISP interpreter starts with a flash of blue-green flame! -It thunders, "We hold the path of the Righteous. Blessed be he who follows the s-expression. Woe to the nonbelievers! Long live the lambda!" +It thunders, "We hold the path of the Righteous. Blessed be he who follows the s-expression. Woe to the nonbelievers!" The prompt pops up. +"Long live the lambda!" From c8f5b94d0cad299e55b17379b5135c0a719228e4 Mon Sep 17 00:00:00 2001 From: Christopher Trow Date: Fri, 8 Jan 2016 19:22:52 -0500 Subject: [PATCH 2078/5486] Add shake hands option after screaming. --- english/eating-walls/find-a-toilet/door/scream/scream.md | 2 ++ .../find-a-toilet/door/shake-hands/shake-hands.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 english/eating-walls/find-a-toilet/door/shake-hands/shake-hands.md diff --git a/english/eating-walls/find-a-toilet/door/scream/scream.md b/english/eating-walls/find-a-toilet/door/scream/scream.md index 740e2c998a..3ed8969403 100644 --- a/english/eating-walls/find-a-toilet/door/scream/scream.md +++ b/english/eating-walls/find-a-toilet/door/scream/scream.md @@ -17,4 +17,6 @@ soon it turns into screaming competition. But you realize [Run...](../run-in/run-into-room.md) [Fight that thing](fight/fight.md) + + [Reach out to shake hands](../shake-hands/shake-hands.md) diff --git a/english/eating-walls/find-a-toilet/door/shake-hands/shake-hands.md b/english/eating-walls/find-a-toilet/door/shake-hands/shake-hands.md new file mode 100644 index 0000000000..7e488ccd3b --- /dev/null +++ b/english/eating-walls/find-a-toilet/door/shake-hands/shake-hands.md @@ -0,0 +1,4 @@ +You reach out to shake the things hand in an attempt to be cordial, but you +realize the thing has no hands. + +You beging to feel light-headed and pass-out. \ No newline at end of file From aa212d2a8842249e3103a0a7ff67203ab800722c Mon Sep 17 00:00:00 2001 From: Chinmay-Kalmane Date: Sat, 9 Jan 2016 13:14:52 +0530 Subject: [PATCH 2079/5486] =?UTF-8?q?=E0=B2=A8=E0=B2=BF=E0=B2=AE=E0=B3=8D?= =?UTF-8?q?=E0=B2=AE=20=E0=B2=95=E0=B2=A8=E0=B3=8D=E0=B2=A8=E0=B2=A1=20?= =?UTF-8?q?=E0=B2=AA=E0=B3=8D=E0=B2=B0=E0=B3=87=E0=B2=AE=E0=B2=B5=E0=B2=A8?= =?UTF-8?q?=E0=B3=8D=E0=B2=A8=E0=B3=81=20=E0=B2=AE=E0=B3=86=E0=B2=9A?= =?UTF-8?q?=E0=B3=8D=E0=B2=9A=E0=B2=BF=E0=B2=A6=E0=B3=86=E0=B2=A8=E0=B3=81?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kannada/romaanchanavee_kannada/romaanchanavee_kannada.md | 1 + 1 file changed, 1 insertion(+) diff --git a/kannada/romaanchanavee_kannada/romaanchanavee_kannada.md b/kannada/romaanchanavee_kannada/romaanchanavee_kannada.md index 4555351faa..71dbe0281d 100644 --- a/kannada/romaanchanavee_kannada/romaanchanavee_kannada.md +++ b/kannada/romaanchanavee_kannada/romaanchanavee_kannada.md @@ -29,3 +29,4 @@ ೭೦,೦೦೦ಕ್ಕೂ ಅಧಿಕ ಕನ್ನಡ ಪದಗಳನ್ನು ಒಳಗೊಂಡಿದೆ. ರೆವರೆಂಡ್ ಫರ್ಡಿನಾಂಡ್ ಕಿಟ್ಟೆಲ್ ಕನ್ನಡ ಭಾಷೆಯ ಮೂರು ಉಪಭಾಷೆಗಳನ್ನೊಳಗೊಂಡ ಪ್ರಧಾನ ವ್ಯಾಕರಣವನ್ನು ವಿವರಿಸುವ ಗ್ರಂಥವೊಂದನ್ನೂ ರಚಿಸಿದ್ದಾರೆ. +ಎಲ್ಲಾದರೂ ಇರು ಎಂತಾದರು ಇರು, ಎಂದೆಂದಿಗೂ ನೀ ಕನ್ನಡವಾಗಿರು. From 64d3191a76de8cf611942ad86abdfa427fa4a9fa Mon Sep 17 00:00:00 2001 From: Jose Villaverde Date: Sat, 9 Jan 2016 10:18:17 +0100 Subject: [PATCH 2080/5486] Add dixital.md --- galician/dixital/dixital.md | 1 + galician/lua.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 galician/dixital/dixital.md diff --git a/galician/dixital/dixital.md b/galician/dixital/dixital.md new file mode 100644 index 0000000000..df8beec80f --- /dev/null +++ b/galician/dixital/dixital.md @@ -0,0 +1 @@ +Polas rañuras da porta alumeaman alternativamente raiolas de luz artificial, as veces vermellas, outras azuis. A viaxe espacial a través do canal dixital comezara, a información recollida dos cúmulos estelares iniciaba unha nova era. diff --git a/galician/lua.md b/galician/lua.md index fd6bf2062a..addfbe13d8 100644 --- a/galician/lua.md +++ b/galician/lua.md @@ -1,2 +1,3 @@ Un día máis, Lúa achegouse con ledicia á porta tras a que os seus donos (e amigos) durmían. Coma sempre, comezou a miar e rañar na porta para que espertasen. Porén, a diferenza do resto dos días, esa vez: +[Era distinto](dixital/dixital.md) From 99f2060fe1816377fc0526dfbfd78831545eb771 Mon Sep 17 00:00:00 2001 From: Jose Villaverde Date: Sat, 9 Jan 2016 10:57:03 +0100 Subject: [PATCH 2081/5486] Break in multiple lines --- galician/dixital/dixital.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/galician/dixital/dixital.md b/galician/dixital/dixital.md index df8beec80f..5ec572f142 100644 --- a/galician/dixital/dixital.md +++ b/galician/dixital/dixital.md @@ -1 +1,3 @@ -Polas rañuras da porta alumeaman alternativamente raiolas de luz artificial, as veces vermellas, outras azuis. A viaxe espacial a través do canal dixital comezara, a información recollida dos cúmulos estelares iniciaba unha nova era. +Polas rañuras da porta alumeaman alternativamente raiolas de luz artificial, as veces vermellas, outras azuis. + + A viaxe espacial a través do canal dixital comezara, a información recollida dos cúmulos estelares iniciaba unha nova era. From c5b524abfa747b5a89260fe843d2f52c75fc1308 Mon Sep 17 00:00:00 2001 From: Jose Villaverde Date: Sat, 9 Jan 2016 11:40:43 +0100 Subject: [PATCH 2082/5486] Break it up into multiple lines second time --- galician/dixital/dixital.md | 4 +++- galician/lua.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/galician/dixital/dixital.md b/galician/dixital/dixital.md index 5ec572f142..b66e3b1517 100644 --- a/galician/dixital/dixital.md +++ b/galician/dixital/dixital.md @@ -1,3 +1,5 @@ Polas rañuras da porta alumeaman alternativamente raiolas de luz artificial, as veces vermellas, outras azuis. - A viaxe espacial a través do canal dixital comezara, a información recollida dos cúmulos estelares iniciaba unha nova era. +A viaxe espacial a través do canal dixital comezara. + +A información recollida dos cúmulos estelares iniciaba unha nova era. diff --git a/galician/lua.md b/galician/lua.md index addfbe13d8..c60825e49d 100644 --- a/galician/lua.md +++ b/galician/lua.md @@ -1,3 +1,4 @@ Un día máis, Lúa achegouse con ledicia á porta tras a que os seus donos (e amigos) durmían. Coma sempre, comezou a miar e rañar na porta para que espertasen. Porén, a diferenza do resto dos días, esa vez: + [Era distinto](dixital/dixital.md) From f2712f441aa75731f2e425e1f0851e9df9d16436 Mon Sep 17 00:00:00 2001 From: aersh Date: Sat, 9 Jan 2016 16:30:46 +0200 Subject: [PATCH 2083/5486] Add visit-owl option --- russian/eating-walls/breakfast/breakfast-marshmallows.md | 1 + russian/eating-walls/breakfast/visit-owl/visit-owl.md | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 russian/eating-walls/breakfast/visit-owl/visit-owl.md diff --git a/russian/eating-walls/breakfast/breakfast-marshmallows.md b/russian/eating-walls/breakfast/breakfast-marshmallows.md index fa206d1bb2..66132f5f15 100644 --- a/russian/eating-walls/breakfast/breakfast-marshmallows.md +++ b/russian/eating-walls/breakfast/breakfast-marshmallows.md @@ -5,3 +5,4 @@ Кого бы посетить? [Конечно, Кролика!](visit-rabbit/visit-rabbit.md) +[У Совы давно не были. Побежали к ней!](visit-owl/visit-owl.md) diff --git a/russian/eating-walls/breakfast/visit-owl/visit-owl.md b/russian/eating-walls/breakfast/visit-owl/visit-owl.md new file mode 100644 index 0000000000..dab200f2af --- /dev/null +++ b/russian/eating-walls/breakfast/visit-owl/visit-owl.md @@ -0,0 +1,4 @@ +Сова выкладывает из мармеладок карту леса. +Она очень рада нежданным гостям, +предлагает им чашечку ароматного кофе и +вспоминает один забавный случай, приключившийся с ее тётушкой. From b8a4889dcfe8483c59aa60dfa00529150d139118 Mon Sep 17 00:00:00 2001 From: aersh Date: Sat, 9 Jan 2016 16:40:04 +0200 Subject: [PATCH 2084/5486] Add a blank line between links to keep options visually separated --- russian/eating-walls/breakfast/breakfast-marshmallows.md | 1 + 1 file changed, 1 insertion(+) diff --git a/russian/eating-walls/breakfast/breakfast-marshmallows.md b/russian/eating-walls/breakfast/breakfast-marshmallows.md index 66132f5f15..5b63c6c84a 100644 --- a/russian/eating-walls/breakfast/breakfast-marshmallows.md +++ b/russian/eating-walls/breakfast/breakfast-marshmallows.md @@ -5,4 +5,5 @@ Кого бы посетить? [Конечно, Кролика!](visit-rabbit/visit-rabbit.md) + [У Совы давно не были. Побежали к ней!](visit-owl/visit-owl.md) From 7558ef4a22816e8f029c1414048438052e30cc49 Mon Sep 17 00:00:00 2001 From: "Brett G. Giles" Date: Sat, 9 Jan 2016 11:09:21 -0700 Subject: [PATCH 2085/5486] Add a recommendation to stand up --- english/warm-up/warm-up.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/warm-up/warm-up.md b/english/warm-up/warm-up.md index 7a418bf166..a91bc97d60 100644 --- a/english/warm-up/warm-up.md +++ b/english/warm-up/warm-up.md @@ -6,8 +6,12 @@ When you're ready, open your eyes and consider: Have you been sitting down for a while? Then do [blood flow exercises.](Blood_flow/vigorous.md) +Alternatively, you could just stand up for a little while. + +It is a great idea to stand up for a couple of minutes every hour. + Have you spent more than 4 hours looking at your screen today? Then do [these exercises.](eyes/eyes.md) Have you spent more than 12 hours looking a a screen today? Then take a [break.](break/break.md) -Done with the warm up? Then [go back to the story.](../marshmallow.md) \ No newline at end of file +Done with the warm up? Then [go back to the story.](../marshmallow.md) From b26f1e1b4dcc713ccaf2ece6d803083bcae6bc1e Mon Sep 17 00:00:00 2001 From: "Brett G. Giles" Date: Sat, 9 Jan 2016 11:13:08 -0700 Subject: [PATCH 2086/5486] Add newline --- english/warm-up/warm-up.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/warm-up/warm-up.md b/english/warm-up/warm-up.md index a91bc97d60..0d58b1e7bb 100644 --- a/english/warm-up/warm-up.md +++ b/english/warm-up/warm-up.md @@ -15,3 +15,4 @@ Have you spent more than 4 hours looking at your screen today? Then do [these ex Have you spent more than 12 hours looking a a screen today? Then take a [break.](break/break.md) Done with the warm up? Then [go back to the story.](../marshmallow.md) + From 70d06f997e648392cf0ddd64623999c4bbb9b1b6 Mon Sep 17 00:00:00 2001 From: Nelitza Martinez Date: Sat, 9 Jan 2016 15:43:01 -0400 Subject: [PATCH 2087/5486] Update angeles.md Add a line for angeles. --- espanol/angeles/angeles.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/angeles/angeles.md b/espanol/angeles/angeles.md index 756ad1a0de..e3ba694b79 100644 --- a/espanol/angeles/angeles.md +++ b/espanol/angeles/angeles.md @@ -5,3 +5,5 @@ En eso el Consejero se levanta y agradece a los ángeles por toda la ayuda que han brindado. Betito se llenó de fuerzas también y animó a todos los guerreros. La voz de un ángel te llama, pero estas distraído con la tecnología! + +El progreso no mide tiempo. From 17f2031bb714e0299c9cb239486044c1a26567c7 Mon Sep 17 00:00:00 2001 From: Mark Davey Date: Sat, 9 Jan 2016 17:46:54 -0500 Subject: [PATCH 2088/5486] Need more AIs --- english/turing-test/Cortarna/ask_Cortana.md | 13 +++++++++++++ english/turing-test/OkGoogle/ask_OkGoogle.md | 13 +++++++++++++ english/turing-test/turing-test.md | 6 +++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 english/turing-test/Cortarna/ask_Cortana.md create mode 100644 english/turing-test/OkGoogle/ask_OkGoogle.md diff --git a/english/turing-test/Cortarna/ask_Cortana.md b/english/turing-test/Cortarna/ask_Cortana.md new file mode 100644 index 0000000000..87ce0ad931 --- /dev/null +++ b/english/turing-test/Cortarna/ask_Cortana.md @@ -0,0 +1,13 @@ +Repeat You launch Cortana + + Cortana: Hey You! What can I help you with today? + + You: Cortana, how do I battle a wall made of giant marshmallows that are attacking me? + + Cortana: Flame throwers are good for melting giant marshmallows. + +You: Hmmm....That smells sweet… + +Do you: + +[Wait](../ghostbusters/ghostbusters.md) diff --git a/english/turing-test/OkGoogle/ask_OkGoogle.md b/english/turing-test/OkGoogle/ask_OkGoogle.md new file mode 100644 index 0000000000..290d81ee8d --- /dev/null +++ b/english/turing-test/OkGoogle/ask_OkGoogle.md @@ -0,0 +1,13 @@ +You: Ok Google + + OK Google: Hey You! What can I help you with today? + + You: OK Google, how do I battle a wall made of giant marshmallows that are attacking me? + + OK Google: Here is a map of the wall of giant marshmallows, just walk around it. + +You: Hmmm....I need the walk anyway + +Do you: + +[Wait](../ghostbusters/ghostbusters.md) diff --git a/english/turing-test/turing-test.md b/english/turing-test/turing-test.md index 8b1733331f..aa24ab79f9 100644 --- a/english/turing-test/turing-test.md +++ b/english/turing-test/turing-test.md @@ -24,4 +24,8 @@ Do you: [Forget ELIZA, ask Siri](siri/ask_siri.md) -[Wear the one ring and turn invisible](ring/one_ring.md) \ No newline at end of file +[Wear the one ring and turn invisible](ring/one_ring.md) + +[Forget Siri, asks Cortana](Cortana/ask_Cortana.md) + +[If you really want to know something, ask OkGoogle](OkGoogle/ask_OkGoogle.md) \ No newline at end of file From a96e6561967fe9cbd9e7124c7107bc972dde31f3 Mon Sep 17 00:00:00 2001 From: Mark Davey Date: Sat, 9 Jan 2016 18:00:18 -0500 Subject: [PATCH 2089/5486] typo --- english/turing-test/Cortana/ask_Cortana.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 english/turing-test/Cortana/ask_Cortana.md diff --git a/english/turing-test/Cortana/ask_Cortana.md b/english/turing-test/Cortana/ask_Cortana.md new file mode 100644 index 0000000000..87ce0ad931 --- /dev/null +++ b/english/turing-test/Cortana/ask_Cortana.md @@ -0,0 +1,13 @@ +Repeat You launch Cortana + + Cortana: Hey You! What can I help you with today? + + You: Cortana, how do I battle a wall made of giant marshmallows that are attacking me? + + Cortana: Flame throwers are good for melting giant marshmallows. + +You: Hmmm....That smells sweet… + +Do you: + +[Wait](../ghostbusters/ghostbusters.md) From 0ca87172a8f8c79a0ab96f6469e8318814e1e0c0 Mon Sep 17 00:00:00 2001 From: Mark Davey Date: Sat, 9 Jan 2016 18:05:19 -0500 Subject: [PATCH 2090/5486] Error Error --- english/turing-test/Cortarna/ask_Cortana.md | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 english/turing-test/Cortarna/ask_Cortana.md diff --git a/english/turing-test/Cortarna/ask_Cortana.md b/english/turing-test/Cortarna/ask_Cortana.md deleted file mode 100644 index 87ce0ad931..0000000000 --- a/english/turing-test/Cortarna/ask_Cortana.md +++ /dev/null @@ -1,13 +0,0 @@ -Repeat You launch Cortana - - Cortana: Hey You! What can I help you with today? - - You: Cortana, how do I battle a wall made of giant marshmallows that are attacking me? - - Cortana: Flame throwers are good for melting giant marshmallows. - -You: Hmmm....That smells sweet… - -Do you: - -[Wait](../ghostbusters/ghostbusters.md) From ac3b882a18179013298dc7d1799dc11118cd512d Mon Sep 17 00:00:00 2001 From: Mike Barile Date: Sat, 9 Jan 2016 15:31:55 -0800 Subject: [PATCH 2091/5486] Added some helpful text to this file :) --- english/matrix/matrix.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/matrix/matrix.md b/english/matrix/matrix.md index 8e759ba3f8..f97322c3cc 100644 --- a/english/matrix/matrix.md +++ b/english/matrix/matrix.md @@ -3,6 +3,7 @@ As the marshmallow reaches to grab the fork and rope you notice something strange. The hand is moving slower than normal, as if it was in slo-mo. +In fact, it is much, much slower than normal. You merely walk over it and grab your rope and fork before the marshmallow can achieve your doom. From d141f62fddcdc07ca43fda48b1a932d6ae379470 Mon Sep 17 00:00:00 2001 From: alex hanson Date: Sat, 9 Jan 2016 16:09:23 -0800 Subject: [PATCH 2092/5486] Add escape route from padded room --- english/bite-the-marshmallow/padded-room/escape/escape.md | 3 +++ english/bite-the-marshmallow/padded-room/first-blackout.md | 1 + 2 files changed, 4 insertions(+) create mode 100644 english/bite-the-marshmallow/padded-room/escape/escape.md diff --git a/english/bite-the-marshmallow/padded-room/escape/escape.md b/english/bite-the-marshmallow/padded-room/escape/escape.md new file mode 100644 index 0000000000..8e6c02e415 --- /dev/null +++ b/english/bite-the-marshmallow/padded-room/escape/escape.md @@ -0,0 +1,3 @@ +After a brief testing of your restraints you realize that when you shift your weight to your right side +you can wiggle your wrist in the restraints and might just make it free. +You notice the distant hum growing louder. \ No newline at end of file diff --git a/english/bite-the-marshmallow/padded-room/first-blackout.md b/english/bite-the-marshmallow/padded-room/first-blackout.md index cded767255..5688969875 100644 --- a/english/bite-the-marshmallow/padded-room/first-blackout.md +++ b/english/bite-the-marshmallow/padded-room/first-blackout.md @@ -17,3 +17,4 @@ are white and spotlessly clean. The floor... well, you can't see the floor. In t distance you can hear a faint humming sound, but you appear to be all alone at the moment. Well, now what? Perhaps you could [call out](call-out/calling.md)? +You could also quietly [struggle](escape/escape.md) against your restraints. From 107c35d581179be2e2b7cdadbaba73e5665585e6 Mon Sep 17 00:00:00 2001 From: xalerons Date: Sun, 10 Jan 2016 08:18:11 -0600 Subject: [PATCH 2093/5486] Fixed dead end in the shoulder check scenario to continue on to the tower --- .../start-running/shoulder-check/shoulder-check.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md b/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md index fba0bafa77..adbdf95b95 100644 --- a/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md +++ b/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md @@ -7,3 +7,7 @@ whirls through the air, a frown on its face. Its last words before it breaks upon the rock-candy ground are, "I can't catch you, I'm the Gingerbread Man." + +After the creature has been destroyed, you decide to + +[Head back towards the tower](../keep-running/keep-running.md) From 28244f13bc82ce458e75a2d61714beb86057a904 Mon Sep 17 00:00:00 2001 From: mancoi Date: Sun, 10 Jan 2016 22:03:07 +0700 Subject: [PATCH 2094/5486] update vietnamese/kechuyen.md --- vietnamese/kechuyen.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index 585bcbbcd9..a816e8bc7d 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -12,4 +12,6 @@ Tôi cũng thích truyện cười, nhưng ngoài ra tôi thích [ẩm thực](h Tôi biết Tiền Giang rất đẹp, Quê tôi thì ở [Đà Nẵng](DaNang/DaNang.md) -Nhưng hiện tại thì tôi rời xa Đà Nẵng từ nhỏ và đang sống ở [Sài Gòn](SaiGon/SaiGon.md) \ No newline at end of file +Nhưng hiện tại thì tôi rời xa Đà Nẵng từ nhỏ và đang sống ở [Sài Gòn](SaiGon/SaiGon.md) + +Nhắc tới Sài Gòn, không thể không nhắc tới [Cà phê bệt](https://www.youtube.com/watch?v=avJk5KnEpaY) nhỉ? \ No newline at end of file From d830b262e8756e0b097580c2c1214931107f8f1d Mon Sep 17 00:00:00 2001 From: norisg Date: Sun, 10 Jan 2016 21:41:24 +0100 Subject: [PATCH 2095/5486] new file: Sonnenbrand/vor-sonne-schutzen.md --- german/Sonnenbrand/vor-sonne-schutzen.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 german/Sonnenbrand/vor-sonne-schutzen.md diff --git a/german/Sonnenbrand/vor-sonne-schutzen.md b/german/Sonnenbrand/vor-sonne-schutzen.md new file mode 100644 index 0000000000..a31008f1e6 --- /dev/null +++ b/german/Sonnenbrand/vor-sonne-schutzen.md @@ -0,0 +1,3 @@ +Sie sind aus dem Schlaf erwacht und merken das Brennen der Haut in ihrem Gesicht. Es ist Ihnen nicht möglich die Gesichtszüge zu verändern ohne höllichen Schmerz wahrzunehmen. Einen solchen Sonnenbrand hatten Sie das letzte mal, als Sie besoffen am Pool in Mallorca eingeschlafen sind. Sie ziehen das nasse T-shirt aus und wickeln es zur Kühlung um den Kopf. + +Was werden Sie jetzt nun tun? \ No newline at end of file From 4570c4588adb9ab1415a20238d4cfda76a86f0fa Mon Sep 17 00:00:00 2001 From: norisg Date: Sun, 10 Jan 2016 21:44:50 +0100 Subject: [PATCH 2096/5486] Add a new Option point to Directory: Sonnenbrand --- german/ruderboot.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/ruderboot.md b/german/ruderboot.md index f50e376f29..35483b0417 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -22,4 +22,6 @@ Werden Sie: [Versuchen, mit Ihrer Kleidung das Loch zu stopfen](Stopfen/stopfen.md) -[Durchlcherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) \ No newline at end of file +[Durchlcherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) + +[Sie spren einen hllischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) \ No newline at end of file From 99f984bf211ddb1ae568b36389d583d75fd5e5d3 Mon Sep 17 00:00:00 2001 From: Arjun Chhabra Date: Mon, 11 Jan 2016 23:40:24 +0530 Subject: [PATCH 2097/5486] Add line on starbucks --- english/bite-the-marshmallow/tasty-marshmallow.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/bite-the-marshmallow/tasty-marshmallow.md b/english/bite-the-marshmallow/tasty-marshmallow.md index a120a361a7..77a879ea7f 100644 --- a/english/bite-the-marshmallow/tasty-marshmallow.md +++ b/english/bite-the-marshmallow/tasty-marshmallow.md @@ -4,6 +4,9 @@ You close your eyes. +You smell your favorite Starbucks Latte and you take a sip. +Then you take a bite of marshmallow. + Suddenly there is a horrible pain in your mouth! Who would have thought marshmallows, so white, so innocent, could cause such excruciating pain! But come to think of it, you've never gone From 3dd40d4ca06ae25ee9ca2c079e2628df11b02ef3 Mon Sep 17 00:00:00 2001 From: xalerons Date: Mon, 11 Jan 2016 12:18:03 -0600 Subject: [PATCH 2098/5486] Updated shoulder-check scenario with a way to continue the story --- .../start-running/shoulder-check/shoulder-check.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md b/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md index adbdf95b95..77989fc73a 100644 --- a/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md +++ b/english/explore-outside/journey-to-flaming-tower/start-running/shoulder-check/shoulder-check.md @@ -10,4 +10,4 @@ you, I'm the Gingerbread Man." After the creature has been destroyed, you decide to -[Head back towards the tower](../keep-running/keep-running.md) +[Head back towards the tower.](../keep-running/keep-running.md) From e45015b1bc5c27aa88bcb15efc527f8e07356bd7 Mon Sep 17 00:00:00 2001 From: norisg Date: Mon, 11 Jan 2016 23:30:40 +0100 Subject: [PATCH 2099/5486] Update vor-sonne-schutzen.md --- german/Sonnenbrand/vor-sonne-schutzen.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/german/Sonnenbrand/vor-sonne-schutzen.md b/german/Sonnenbrand/vor-sonne-schutzen.md index a31008f1e6..30b601e3a9 100644 --- a/german/Sonnenbrand/vor-sonne-schutzen.md +++ b/german/Sonnenbrand/vor-sonne-schutzen.md @@ -1,3 +1,4 @@ -Sie sind aus dem Schlaf erwacht und merken das Brennen der Haut in ihrem Gesicht. Es ist Ihnen nicht möglich die Gesichtszüge zu verändern ohne höllichen Schmerz wahrzunehmen. Einen solchen Sonnenbrand hatten Sie das letzte mal, als Sie besoffen am Pool in Mallorca eingeschlafen sind. Sie ziehen das nasse T-shirt aus und wickeln es zur Kühlung um den Kopf. +Sie sind aus dem Schlaf erwacht und merken das Brennen der Haut in ihrem Gesicht. Es ist Ihnen nicht möglich die Gesichtszüge zu verändern ohne höllichen Schmerz wahrzunehmen. +Einen solchen Sonnenbrand hatten Sie das letzte mal, als Sie besoffen am Pool in Mallorca eingeschlafen sind. Sie ziehen das nasse T-shirt aus und wickeln es zur Kühlung um den Kopf. -Was werden Sie jetzt nun tun? \ No newline at end of file +Was werden Sie jetzt nun tun? From 728566d79053881f4325d824dcc0f42a4a404f29 Mon Sep 17 00:00:00 2001 From: norisg Date: Mon, 11 Jan 2016 23:38:23 +0100 Subject: [PATCH 2100/5486] Update vor-sonne-schutzen.md --- german/Sonnenbrand/vor-sonne-schutzen.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/german/Sonnenbrand/vor-sonne-schutzen.md b/german/Sonnenbrand/vor-sonne-schutzen.md index 30b601e3a9..68a379d3f7 100644 --- a/german/Sonnenbrand/vor-sonne-schutzen.md +++ b/german/Sonnenbrand/vor-sonne-schutzen.md @@ -1,4 +1,7 @@ -Sie sind aus dem Schlaf erwacht und merken das Brennen der Haut in ihrem Gesicht. Es ist Ihnen nicht möglich die Gesichtszüge zu verändern ohne höllichen Schmerz wahrzunehmen. -Einen solchen Sonnenbrand hatten Sie das letzte mal, als Sie besoffen am Pool in Mallorca eingeschlafen sind. Sie ziehen das nasse T-shirt aus und wickeln es zur Kühlung um den Kopf. +Sie sind aus dem Schlaf erwacht und merken das Brennen der Haut in ihrem Gesicht. +Es ist Ihnen nicht möglich die Gesichtszüge zu verändern ohne höllichen Schmerz wahrzunehmen. +Einen solchen Sonnenbrand hatten Sie das letzte mal, +als Sie besoffen am Pool in Mallorca eingeschlafen sind. +Sie ziehen das nasse T-shirt aus und wickeln es zur Kühlung um den Kopf. Was werden Sie jetzt nun tun? From 36cac4b2e50881a54bb9bbc9390db8ae58ae52b2 Mon Sep 17 00:00:00 2001 From: Joey Date: Mon, 11 Jan 2016 17:41:33 -0500 Subject: [PATCH 2101/5486] Add line to marshmallow --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index dc4fd2576a..d122f2b22c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -722,4 +722,6 @@ You may either do [this](gtd/gtd.md), "Who will you [serve] (joshua_24_15/joshua_24_15.md)?" -Yourself? \ No newline at end of file +Yourself? + +Instead of reading this entire story, you decide to go see the new star wars! From e344292ddfd691e39cf102d36dde22cb9d0b5b37 Mon Sep 17 00:00:00 2001 From: bruno Date: Mon, 11 Jan 2016 21:18:02 -0200 Subject: [PATCH 2102/5486] =?UTF-8?q?Adiciona=20uma=20nova=20op=C3=A7?= =?UTF-8?q?=C3=A3o=20de=20desist=C3=AAncia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/revisa/revisar.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/revisa/revisar.md b/portugues/revisa/revisar.md index de151c9d27..7610e2bee4 100644 --- a/portugues/revisa/revisar.md +++ b/portugues/revisa/revisar.md @@ -9,3 +9,5 @@ Você: [Consegue reproduzir o bug no seu smartphone](tenta-consegue/reproduz.md) [Não está com saco pra isso, e deixa pra lá](desiste/desistir.md) + +[Simplesmente desiste e baixa um app melhor](desiste/desistir.md) From daee336d0e11d332e4c8f4fc3710682a6ca8fd51 Mon Sep 17 00:00:00 2001 From: bruno Date: Mon, 11 Jan 2016 21:21:56 -0200 Subject: [PATCH 2103/5486] =?UTF-8?q?Adiciona=20uma=20nova=20dire=C3=A7?= =?UTF-8?q?=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/revisa/novo-app/novo-app.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 portugues/revisa/novo-app/novo-app.md diff --git a/portugues/revisa/novo-app/novo-app.md b/portugues/revisa/novo-app/novo-app.md new file mode 100644 index 0000000000..f0457fb5e6 --- /dev/null +++ b/portugues/revisa/novo-app/novo-app.md @@ -0,0 +1 @@ +Vá ao Google Play e baixe um novo app, pare de sofrer :) \ No newline at end of file From e85fa192c0ae09e65cb86d429a8b8fa586be46da Mon Sep 17 00:00:00 2001 From: bruno Date: Mon, 11 Jan 2016 21:35:42 -0200 Subject: [PATCH 2104/5486] Corrige link --- portugues/revisa/revisar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/revisa/revisar.md b/portugues/revisa/revisar.md index 7610e2bee4..c7b6858c17 100644 --- a/portugues/revisa/revisar.md +++ b/portugues/revisa/revisar.md @@ -10,4 +10,4 @@ Você: [Não está com saco pra isso, e deixa pra lá](desiste/desistir.md) -[Simplesmente desiste e baixa um app melhor](desiste/desistir.md) +[Simplesmente desiste e baixa um app melhor](novo-app/novo-app.md) From 8556f30b80c9fc11a05146f3fa92374ffa52439c Mon Sep 17 00:00:00 2001 From: Matthew Waller Date: Mon, 11 Jan 2016 20:22:29 -0600 Subject: [PATCH 2105/5486] Add a Star Wars reference --- english/fight-out/fight-out.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/fight-out/fight-out.md b/english/fight-out/fight-out.md index 6a1d5fed0b..83bc329d32 100644 --- a/english/fight-out/fight-out.md +++ b/english/fight-out/fight-out.md @@ -9,3 +9,5 @@ but it seems you have chosen your path. You can go now, wake up with a litle [memory of this story in your life](../memories/memories.md). or you can still make your own [destiny](../destiny/destiny.md). + +And step out to the light side. \ No newline at end of file From 5f78e111e391e7417d4fd6e4539924ab7ad2b158 Mon Sep 17 00:00:00 2001 From: Rodrick Musser Date: Mon, 11 Jan 2016 21:48:46 -0800 Subject: [PATCH 2106/5486] Changes to Marshmallow.md --- english/marshmallow.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index d122f2b22c..51af219fd3 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down [play](http://pcottle.github.io/learnGitBranching/) with the (git) branches @@ -114,6 +114,8 @@ You also seem to be wearing an uncomfortable and restrictive jacket made of leat You don't own any uncomfortable and restrictive leather jackets... How did you end up sleeping in one? +Suddenly, fuzzy memories of a tavern and an exotic woman...a house made of candy...closets full of umbrellas and leather. + An umbrella (closed) automagically appears in your left hand. You tentatively [poke the wall](./poke-the-wall/poke-the-wall.md) with it. @@ -681,7 +683,7 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now +Despite the little conundrum that you resolved, you realize that it's now Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" @@ -703,9 +705,9 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines +When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. +there are two options you must choose from. You may either do [this](gtd/gtd.md), @@ -717,10 +719,10 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? From e935de05499305743643bf1d7819b0aa8e60c279 Mon Sep 17 00:00:00 2001 From: Rodrick Musser Date: Mon, 11 Jan 2016 21:56:51 -0800 Subject: [PATCH 2107/5486] Changes to make casey happy --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 51af219fd3..dc13d1f916 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -114,7 +114,9 @@ You also seem to be wearing an uncomfortable and restrictive jacket made of leat You don't own any uncomfortable and restrictive leather jackets... How did you end up sleeping in one? -Suddenly, fuzzy memories of a tavern and an exotic woman...a house made of candy...closets full of umbrellas and leather. +Suddenly, fuzzy memories of a tavern and an exotic woman... +a house made of candy... +closets full of umbrellas and leather. An umbrella (closed) automagically appears in your left hand. You tentatively From cf4266a2ddfb6a06ed5f9d2153ee0a0fbaf5a518 Mon Sep 17 00:00:00 2001 From: Rodrick Musser Date: Mon, 11 Jan 2016 21:58:51 -0800 Subject: [PATCH 2108/5486] Changes to make casey happy --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index dc13d1f916..6cc397c9fe 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -724,7 +724,7 @@ You may either do [this](gtd/gtd.md), "I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? From 5dcbb289c8c563505f9fd9aa77b61e5b6e6453b6 Mon Sep 17 00:00:00 2001 From: Rodrick Musser Date: Mon, 11 Jan 2016 22:00:28 -0800 Subject: [PATCH 2109/5486] Changes to make casey happy --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6cc397c9fe..04d06dadf6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down [play](http://pcottle.github.io/learnGitBranching/) with the (git) branches @@ -724,7 +724,7 @@ You may either do [this](gtd/gtd.md), "I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? From a6f49f517fe0578723d339796cdbaab10a5a4402 Mon Sep 17 00:00:00 2001 From: Rodrick Musser Date: Mon, 11 Jan 2016 22:02:30 -0800 Subject: [PATCH 2110/5486] Changes to make casey happy --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 04d06dadf6..6cc397c9fe 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down [play](http://pcottle.github.io/learnGitBranching/) with the (git) branches @@ -724,7 +724,7 @@ You may either do [this](gtd/gtd.md), "I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? From dae95be24b2d61cf678dee24bec7174a2df07ae6 Mon Sep 17 00:00:00 2001 From: Rodrick Musser Date: Mon, 11 Jan 2016 22:03:38 -0800 Subject: [PATCH 2111/5486] Changes to make casey happy --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6cc397c9fe..bdfce7c98b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -722,9 +722,9 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) "I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim -[move to Boston](boston/boston.md)." +[move to Boston](boston/boston.md)." -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? From d0e16ccac15427a594d7bd4f8c5ac5c59996cc7a Mon Sep 17 00:00:00 2001 From: Rodrick Musser Date: Mon, 11 Jan 2016 22:05:42 -0800 Subject: [PATCH 2112/5486] Changes to make casey happy --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index bdfce7c98b..b9df4b7cc5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -707,7 +707,7 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines +When faced with a lot of work and impending deadlines in the (not so near) future, there are two options you must choose from. @@ -722,7 +722,7 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) "I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim -[move to Boston](boston/boston.md)." +[move to Boston](boston/boston.md)." "Who will you [serve] (joshua_24_15/joshua_24_15.md)?" From 4725e7eab8eb4d38800c8a9234e615db92fd3b17 Mon Sep 17 00:00:00 2001 From: JavaRod Date: Mon, 11 Jan 2016 22:07:52 -0800 Subject: [PATCH 2113/5486] Update marshmallow.md --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b9df4b7cc5..eafadd20a0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down [play](http://pcottle.github.io/learnGitBranching/) with the (git) branches @@ -685,7 +685,7 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now +Despite the little conundrum that you resolved, you realize that it's now Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" From 3558f8e87bb5d5c95d33cb9081c49851185d0616 Mon Sep 17 00:00:00 2001 From: JavaRod Date: Mon, 11 Jan 2016 22:08:31 -0800 Subject: [PATCH 2114/5486] Update marshmallow.md --- english/marshmallow.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index eafadd20a0..3613a5e413 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -709,7 +709,7 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. +there are two options you must choose from. You may either do [this](gtd/gtd.md), @@ -721,10 +721,10 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? From 25a49d28d77881a281d5dbfb56dcb5af6a030c91 Mon Sep 17 00:00:00 2001 From: Gil Binga Date: Tue, 12 Jan 2016 11:58:52 -0300 Subject: [PATCH 2115/5486] Altera a estrutura de pastas para refletir o arquivo fork.md --- portugues/colabora/{ => fork}/comdiferencas/comdiferencas.md | 0 portugues/colabora/{ => fork}/comdiferencas/diff/diff.md | 0 .../{ => fork}/comdiferencas/diff/pull/desisto/desistir.md | 0 portugues/colabora/{ => fork}/comdiferencas/diff/pull/pull.md | 0 .../{ => fork}/comdiferencas/diff/pull/reenvio/reenviar.md | 0 .../{ => fork}/comdiferencas/diff/pull/reenvio/star/star.md | 0 .../diff/pull/reenvio/watch/divulga/colaborador/colaborador.md | 0 .../comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md | 0 .../diff/pull/reenvio/watch/divulga/instrutor/instrutor.md | 0 .../comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md | 0 .../diff/pull/reenvio/watch/emprego/facebook/facebook.md | 0 .../diff/pull/reenvio/watch/emprego/google/google.md | 0 .../diff/pull/reenvio/watch/emprego/udacity/udacity.md | 0 .../{ => fork}/comdiferencas/diff/pull/reenvio/watch/watch.md | 0 .../colabora/{ => fork}/semdiferencas/pentefino/pentefino.md | 0 .../{ => fork}/semdiferencas/pentefino/sono/ajuda/ajuda.md | 0 .../{ => fork}/semdiferencas/pentefino/sono/cansado/cansado.md | 0 .../colabora/{ => fork}/semdiferencas/pentefino/sono/sono.md | 0 .../pentefino/sono/stackoverflow/resposta/resposta.md | 0 .../pentefino/sono/stackoverflow/semresposta/livros/livros.md | 0 .../pentefino/sono/stackoverflow/semresposta/pergunta/pergunta.md | 0 .../pentefino/sono/stackoverflow/semresposta/semresposta.md | 0 .../semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md | 0 portugues/colabora/{ => fork}/semdiferencas/semdiferencas.md | 0 24 files changed, 0 insertions(+), 0 deletions(-) rename portugues/colabora/{ => fork}/comdiferencas/comdiferencas.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/diff.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/pull/desisto/desistir.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/pull/pull.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/pull/reenvio/reenviar.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/pull/reenvio/star/star.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/pull/reenvio/watch/emprego/udacity/udacity.md (100%) rename portugues/colabora/{ => fork}/comdiferencas/diff/pull/reenvio/watch/watch.md (100%) rename portugues/colabora/{ => fork}/semdiferencas/pentefino/pentefino.md (100%) rename portugues/colabora/{ => fork}/semdiferencas/pentefino/sono/ajuda/ajuda.md (100%) rename portugues/colabora/{ => fork}/semdiferencas/pentefino/sono/cansado/cansado.md (100%) rename portugues/colabora/{ => fork}/semdiferencas/pentefino/sono/sono.md (100%) rename portugues/colabora/{ => fork}/semdiferencas/pentefino/sono/stackoverflow/resposta/resposta.md (100%) rename portugues/colabora/{ => fork}/semdiferencas/pentefino/sono/stackoverflow/semresposta/livros/livros.md (100%) rename portugues/colabora/{ => fork}/semdiferencas/pentefino/sono/stackoverflow/semresposta/pergunta/pergunta.md (100%) rename portugues/colabora/{ => fork}/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md (100%) rename portugues/colabora/{ => fork}/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md (100%) rename portugues/colabora/{ => fork}/semdiferencas/semdiferencas.md (100%) diff --git a/portugues/colabora/comdiferencas/comdiferencas.md b/portugues/colabora/fork/comdiferencas/comdiferencas.md similarity index 100% rename from portugues/colabora/comdiferencas/comdiferencas.md rename to portugues/colabora/fork/comdiferencas/comdiferencas.md diff --git a/portugues/colabora/comdiferencas/diff/diff.md b/portugues/colabora/fork/comdiferencas/diff/diff.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/diff.md rename to portugues/colabora/fork/comdiferencas/diff/diff.md diff --git a/portugues/colabora/comdiferencas/diff/pull/desisto/desistir.md b/portugues/colabora/fork/comdiferencas/diff/pull/desisto/desistir.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/pull/desisto/desistir.md rename to portugues/colabora/fork/comdiferencas/diff/pull/desisto/desistir.md diff --git a/portugues/colabora/comdiferencas/diff/pull/pull.md b/portugues/colabora/fork/comdiferencas/diff/pull/pull.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/pull/pull.md rename to portugues/colabora/fork/comdiferencas/diff/pull/pull.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/reenviar.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/reenviar.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/pull/reenvio/reenviar.md rename to portugues/colabora/fork/comdiferencas/diff/pull/reenvio/reenviar.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/star/star.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/star/star.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/pull/reenvio/star/star.md rename to portugues/colabora/fork/comdiferencas/diff/pull/reenvio/star/star.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md rename to portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/colaborador/colaborador.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md rename to portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/divulga.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md rename to portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md rename to portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/emprego/emprego.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md rename to portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/emprego/facebook/facebook.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md rename to portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/emprego/google/google.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/udacity/udacity.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/emprego/udacity/udacity.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/pull/reenvio/watch/emprego/udacity/udacity.md rename to portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/emprego/udacity/udacity.md diff --git a/portugues/colabora/comdiferencas/diff/pull/reenvio/watch/watch.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/watch.md similarity index 100% rename from portugues/colabora/comdiferencas/diff/pull/reenvio/watch/watch.md rename to portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/watch.md diff --git a/portugues/colabora/semdiferencas/pentefino/pentefino.md b/portugues/colabora/fork/semdiferencas/pentefino/pentefino.md similarity index 100% rename from portugues/colabora/semdiferencas/pentefino/pentefino.md rename to portugues/colabora/fork/semdiferencas/pentefino/pentefino.md diff --git a/portugues/colabora/semdiferencas/pentefino/sono/ajuda/ajuda.md b/portugues/colabora/fork/semdiferencas/pentefino/sono/ajuda/ajuda.md similarity index 100% rename from portugues/colabora/semdiferencas/pentefino/sono/ajuda/ajuda.md rename to portugues/colabora/fork/semdiferencas/pentefino/sono/ajuda/ajuda.md diff --git a/portugues/colabora/semdiferencas/pentefino/sono/cansado/cansado.md b/portugues/colabora/fork/semdiferencas/pentefino/sono/cansado/cansado.md similarity index 100% rename from portugues/colabora/semdiferencas/pentefino/sono/cansado/cansado.md rename to portugues/colabora/fork/semdiferencas/pentefino/sono/cansado/cansado.md diff --git a/portugues/colabora/semdiferencas/pentefino/sono/sono.md b/portugues/colabora/fork/semdiferencas/pentefino/sono/sono.md similarity index 100% rename from portugues/colabora/semdiferencas/pentefino/sono/sono.md rename to portugues/colabora/fork/semdiferencas/pentefino/sono/sono.md diff --git a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/resposta/resposta.md b/portugues/colabora/fork/semdiferencas/pentefino/sono/stackoverflow/resposta/resposta.md similarity index 100% rename from portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/resposta/resposta.md rename to portugues/colabora/fork/semdiferencas/pentefino/sono/stackoverflow/resposta/resposta.md diff --git a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/livros/livros.md b/portugues/colabora/fork/semdiferencas/pentefino/sono/stackoverflow/semresposta/livros/livros.md similarity index 100% rename from portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/livros/livros.md rename to portugues/colabora/fork/semdiferencas/pentefino/sono/stackoverflow/semresposta/livros/livros.md diff --git a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/pergunta/pergunta.md b/portugues/colabora/fork/semdiferencas/pentefino/sono/stackoverflow/semresposta/pergunta/pergunta.md similarity index 100% rename from portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/pergunta/pergunta.md rename to portugues/colabora/fork/semdiferencas/pentefino/sono/stackoverflow/semresposta/pergunta/pergunta.md diff --git a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md b/portugues/colabora/fork/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md similarity index 100% rename from portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md rename to portugues/colabora/fork/semdiferencas/pentefino/sono/stackoverflow/semresposta/semresposta.md diff --git a/portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md b/portugues/colabora/fork/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md similarity index 100% rename from portugues/colabora/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md rename to portugues/colabora/fork/semdiferencas/pentefino/sono/stackoverflow/stackoverflow.md diff --git a/portugues/colabora/semdiferencas/semdiferencas.md b/portugues/colabora/fork/semdiferencas/semdiferencas.md similarity index 100% rename from portugues/colabora/semdiferencas/semdiferencas.md rename to portugues/colabora/fork/semdiferencas/semdiferencas.md From 62715bc374eeee53cae086495d10ab532dc914d5 Mon Sep 17 00:00:00 2001 From: Gil Binga Date: Tue, 12 Jan 2016 12:04:48 -0300 Subject: [PATCH 2116/5486] =?UTF-8?q?Adiciona=20a=20op=C3=A7=C3=A3o=20CHOR?= =?UTF-8?q?AR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/colabora/colaborar.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/colabora/colaborar.md b/portugues/colabora/colaborar.md index 174d22fe0b..7f3d217557 100644 --- a/portugues/colabora/colaborar.md +++ b/portugues/colabora/colaborar.md @@ -6,4 +6,6 @@ Ao encontrar o repositório do GitHub o que você faz? [Dá uma estrela para o repositório.](star/star.md) -[Procura os contribuintes do código e começa a seguí-los.](follow/follow.md) \ No newline at end of file +[Procura os contribuintes do código e começa a seguí-los.](follow/follow.md) + +[Infelizmente, lê o código, não encontra erro algum e CHORA.](chora/chora.md) \ No newline at end of file From 4e6ae3d51a399bea550e1060bb147e62d9631d9a Mon Sep 17 00:00:00 2001 From: Gil Binga Date: Tue, 12 Jan 2016 12:06:08 -0300 Subject: [PATCH 2117/5486] =?UTF-8?q?Altera=20o=20caminho=20das=20op=C3=A7?= =?UTF-8?q?=C3=B5es=20para=20redirecionar=20ao=20local=20correto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/colabora/fork/fork.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portugues/colabora/fork/fork.md b/portugues/colabora/fork/fork.md index d34c3c80ab..40fc6fd855 100644 --- a/portugues/colabora/fork/fork.md +++ b/portugues/colabora/fork/fork.md @@ -2,6 +2,6 @@ Muito bem, agora mãos à massa. Faça um clone para seu computador e usando git diff encontre a diferença entre a versão funcional e a versão com bug. Tente corrigir... -[Não há diferenças entre as duas versões.](../semdiferencas/semdiferencas.md) +[Não há diferenças entre as duas versões.](semdiferencas/semdiferencas.md) -[Há uma diferença entre as duas versões.](../comdiferencas/comdiferencas.md) +[Há uma diferença entre as duas versões.](comdiferencas/comdiferencas.md) From 5cf8c33b91a51fe11ce97f1553b34e3935598d62 Mon Sep 17 00:00:00 2001 From: Gil Binga Date: Tue, 12 Jan 2016 12:18:58 -0300 Subject: [PATCH 2118/5486] =?UTF-8?q?Altera=20a=20refer=C3=AAncia=20relati?= =?UTF-8?q?va=20para=20redirecionar=20ao=20local=20correto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/colabora/fork/comdiferencas/comdiferencas.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portugues/colabora/fork/comdiferencas/comdiferencas.md b/portugues/colabora/fork/comdiferencas/comdiferencas.md index 5a5fb28ec2..dcafbe310a 100644 --- a/portugues/colabora/fork/comdiferencas/comdiferencas.md +++ b/portugues/colabora/fork/comdiferencas/comdiferencas.md @@ -3,8 +3,8 @@ Você então: [Encontra as alteracoes atraves de um **git diff**?](diff/diff.md) -[Nao sabe corrigir o bug, entao envia ao desenvolvedor as informacoes que conseguiu ate aqui?](../../revisa/revisar.md) +[Nao sabe corrigir o bug, entao envia ao desenvolvedor as informacoes que conseguiu ate aqui?](../../../revisa/revisar.md) [Senta, chora e tenta outra alternativa?](../colaborar.md) -[Desiste e vai pra praia tomar uma cerveja](../../revisa/desiste/desistir.md) \ No newline at end of file +[Desiste e vai pra praia tomar uma cerveja](../../../revisa/desiste/desistir.md) \ No newline at end of file From 677df797bb81ad0db3fe338c652f921d30713ba3 Mon Sep 17 00:00:00 2001 From: Gil Binga Date: Tue, 12 Jan 2016 12:23:57 -0300 Subject: [PATCH 2119/5486] =?UTF-8?q?Corrige=20o=20caminho=20relativo=20pa?= =?UTF-8?q?ra=20a=20op=C3=A7=C3=A3o=20CHORAR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/colabora/fork/comdiferencas/comdiferencas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/colabora/fork/comdiferencas/comdiferencas.md b/portugues/colabora/fork/comdiferencas/comdiferencas.md index dcafbe310a..b46abbb71a 100644 --- a/portugues/colabora/fork/comdiferencas/comdiferencas.md +++ b/portugues/colabora/fork/comdiferencas/comdiferencas.md @@ -5,6 +5,6 @@ Você então: [Nao sabe corrigir o bug, entao envia ao desenvolvedor as informacoes que conseguiu ate aqui?](../../../revisa/revisar.md) -[Senta, chora e tenta outra alternativa?](../colaborar.md) +[Senta, chora e tenta outra alternativa?](../../chora/chora.md) [Desiste e vai pra praia tomar uma cerveja](../../../revisa/desiste/desistir.md) \ No newline at end of file From 86bb480077274732042d668d001315c863370763 Mon Sep 17 00:00:00 2001 From: Gil Binga Date: Tue, 12 Jan 2016 12:26:46 -0300 Subject: [PATCH 2120/5486] =?UTF-8?q?Corrige=20link=20relativo=20da=20op?= =?UTF-8?q?=C3=A7=C3=A3o=20REVISAR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/colabora/fork/comdiferencas/diff/diff.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/colabora/fork/comdiferencas/diff/diff.md b/portugues/colabora/fork/comdiferencas/diff/diff.md index 2e1c446044..7d0d46e435 100644 --- a/portugues/colabora/fork/comdiferencas/diff/diff.md +++ b/portugues/colabora/fork/comdiferencas/diff/diff.md @@ -2,4 +2,4 @@ Certo, agora que encontrou as diferencas na versão que introduziu o bug você: [Corrige as alterações e realiza um "pull request" ao master branch](pull/pull.md) -[Nao sabe corrigir o bug, entao envia ao desenvolvedor as informacoes que conseguiu ate aqui?](../../../revisa/revisar.md) \ No newline at end of file +[Nao sabe corrigir o bug, entao envia ao desenvolvedor as informacoes que conseguiu ate aqui?](../../../../revisa/revisar.md) \ No newline at end of file From 30c0014b616ad2abedd4649b624573469f23ebf1 Mon Sep 17 00:00:00 2001 From: Gil Binga Date: Tue, 12 Jan 2016 12:37:43 -0300 Subject: [PATCH 2121/5486] Adiciona arquivo procura-amigos.md e adiciona referencia no arquivo instrutor.md --- .../diff/pull/reenvio/watch/divulga/instrutor/instrutor.md | 2 +- .../watch/divulga/instrutor/procura-amigos/procura-amigos.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/procura-amigos/procura-amigos.md diff --git a/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md index 8090cc976a..30f0a7601d 100644 --- a/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md +++ b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md @@ -1,6 +1,6 @@ Você desenvolve um curso de Git e GitHub a passa a ganhar uma boa grana com o novo trabalho, agora você deseja criar um grande projeto colaborativo no GitHub: -[Você procura por amigos conhecidos para ajudar] +[Você procura por amigos conhecidos para ajudar](/procura-amigos/procura-amigos.md) [Você procura por desenvolvedores de renome no GitHub para ajudar] diff --git a/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/procura-amigos/procura-amigos.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/procura-amigos/procura-amigos.md new file mode 100644 index 0000000000..5bc7a1f3f1 --- /dev/null +++ b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/procura-amigos/procura-amigos.md @@ -0,0 +1,2 @@ +Você encontra uns caras bem legais. Já gravaram cursos de desenho técnico mas +não sabem nem o que é Git. \ No newline at end of file From bdd934c692affd9f27ef42fe01a0d80668659cef Mon Sep 17 00:00:00 2001 From: Gil Binga Date: Tue, 12 Jan 2016 12:39:28 -0300 Subject: [PATCH 2122/5486] =?UTF-8?q?Corrige=20erro=20na=20refer=C3=AAncia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../diff/pull/reenvio/watch/divulga/instrutor/instrutor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md index 30f0a7601d..6dacc5081c 100644 --- a/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md +++ b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md @@ -1,6 +1,6 @@ Você desenvolve um curso de Git e GitHub a passa a ganhar uma boa grana com o novo trabalho, agora você deseja criar um grande projeto colaborativo no GitHub: -[Você procura por amigos conhecidos para ajudar](/procura-amigos/procura-amigos.md) +[Você procura por amigos conhecidos para ajudar](procura-amigos/procura-amigos.md) [Você procura por desenvolvedores de renome no GitHub para ajudar] From d7b6c52ccdbf6645727e11b344d1afd64171a362 Mon Sep 17 00:00:00 2001 From: Gil Binga Date: Tue, 12 Jan 2016 12:42:43 -0300 Subject: [PATCH 2123/5486] Adiciona arquivo procura-desenvolvedores.md e resolve link no arquivo instrutor.md --- .../diff/pull/reenvio/watch/divulga/instrutor/instrutor.md | 2 +- .../procura-desenvolvedores/procura-desenvolvedores.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/procura-desenvolvedores/procura-desenvolvedores.md diff --git a/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md index 6dacc5081c..343c369358 100644 --- a/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md +++ b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/instrutor.md @@ -3,4 +3,4 @@ o novo trabalho, agora você deseja criar um grande projeto colaborativo no GitH [Você procura por amigos conhecidos para ajudar](procura-amigos/procura-amigos.md) -[Você procura por desenvolvedores de renome no GitHub para ajudar] +[Você procura por desenvolvedores de renome no GitHub para ajudar](procura-desenvolvedores/procura-desenvolvedores.md) diff --git a/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/procura-desenvolvedores/procura-desenvolvedores.md b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/procura-desenvolvedores/procura-desenvolvedores.md new file mode 100644 index 0000000000..4c8408af6f --- /dev/null +++ b/portugues/colabora/fork/comdiferencas/diff/pull/reenvio/watch/divulga/instrutor/procura-desenvolvedores/procura-desenvolvedores.md @@ -0,0 +1,3 @@ +Você encontra um amigo que estudou durante o ensino médio. Porém a unica imagem +que vem em sua cabeça é de você zuando com a cara dele porque ele era nerd de +mais. \ No newline at end of file From b1abaf9099d7a58f5e71103c9857db4f32ac7df5 Mon Sep 17 00:00:00 2001 From: Gil Binga Date: Tue, 12 Jan 2016 13:27:16 -0300 Subject: [PATCH 2124/5486] =?UTF-8?q?Adiciona=20a=20op=C3=A7=C3=A3o=20sair?= =?UTF-8?q?=20ao=20arquivo=20oque.md=20e=20referencia=20ao=20arquivo=20sai?= =?UTF-8?q?.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/git/oque.md | 2 ++ portugues/git/sai/sai.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 portugues/git/sai/sai.md diff --git a/portugues/git/oque.md b/portugues/git/oque.md index fc5f4cc603..f5fb0febbd 100644 --- a/portugues/git/oque.md +++ b/portugues/git/oque.md @@ -4,3 +4,5 @@ Se você não sabe o que é Github e Git e deseja aprender, tente este curso inc Voce tambem pode conferir a pagina de treinamento do GitHub [aqui](https://training.github.com/) Caso você for uma pessoa mais "hardcore", pesquisa na raça clicando [aqui](./pesquisa/sites.md) + +Você não quer saber o que é git? Então [sai!](./sai/sai.md) \ No newline at end of file diff --git a/portugues/git/sai/sai.md b/portugues/git/sai/sai.md new file mode 100644 index 0000000000..1d34cd6411 --- /dev/null +++ b/portugues/git/sai/sai.md @@ -0,0 +1 @@ +Rapaz, era pra você sair. O que faz aqui ainda? \ No newline at end of file From eb880ca41866c1bb42f1a0eb55e891b9aa2f8adb Mon Sep 17 00:00:00 2001 From: Neven Hajder Date: Tue, 12 Jan 2016 12:42:23 -0500 Subject: [PATCH 2125/5486] Expand Hermione's adventure --- english/hermione/hermioneHere.md | 4 ++++ english/hogsmeade/hogsmeade.md | 6 ++++++ english/visit-hagrid/visit-hagrid.md | 4 ++++ 3 files changed, 14 insertions(+) create mode 100644 english/hogsmeade/hogsmeade.md create mode 100644 english/visit-hagrid/visit-hagrid.md diff --git a/english/hermione/hermioneHere.md b/english/hermione/hermioneHere.md index e9a486fe12..fe3201c468 100644 --- a/english/hermione/hermioneHere.md +++ b/english/hermione/hermioneHere.md @@ -1,2 +1,6 @@ Hermione is always getting into trouble with Ron and Harry. They could be at Hagrid's hut or in town having a butter beer. + +Today they decide to: +[Visit Hagrid](../visit-hagrid/visit-hagrid.md) +[Head into Hogsmeade](../hogsmeade/hogsmeade.md) diff --git a/english/hogsmeade/hogsmeade.md b/english/hogsmeade/hogsmeade.md new file mode 100644 index 0000000000..74511ec7ca --- /dev/null +++ b/english/hogsmeade/hogsmeade.md @@ -0,0 +1,6 @@ +Hermione, Harry, and Ron bundle up and start for Hogsmeade. +On their way they see some suspicious debris along the path, +but ignore it all because they're craving for Butterbeer is very real. +As they enter Hogsmeade the lights from The Three Broomsticks beckon, so they quicken their pace. +Once they've chosen a cozy spot near the fire, Madam Rosmerta brings them a bottle of Butterbeer each, +and they spend their afternoon in bliss. \ No newline at end of file diff --git a/english/visit-hagrid/visit-hagrid.md b/english/visit-hagrid/visit-hagrid.md new file mode 100644 index 0000000000..e52ad9eb33 --- /dev/null +++ b/english/visit-hagrid/visit-hagrid.md @@ -0,0 +1,4 @@ +Hermione, Harry, and Ron saunter down to Hagrid's hut. +Before they even knock they are greeted by Fang's loud barking, prompting Hagrid to come to the door. +The gang is glad to see Hagrid's friendly face after a tough week. +They sit together drinking tea and politely nibbling on Hagrid's over-baked snacks. \ No newline at end of file From 37e9b31b01066e79df278b26f47d867c8746148c Mon Sep 17 00:00:00 2001 From: Neven Hajder Date: Tue, 12 Jan 2016 12:53:10 -0500 Subject: [PATCH 2126/5486] Fix formatting --- english/hermione/hermioneHere.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/hermione/hermioneHere.md b/english/hermione/hermioneHere.md index fe3201c468..dffa336458 100644 --- a/english/hermione/hermioneHere.md +++ b/english/hermione/hermioneHere.md @@ -2,5 +2,7 @@ Hermione is always getting into trouble with Ron and Harry. They could be at Hagrid's hut or in town having a butter beer. Today they decide to: + [Visit Hagrid](../visit-hagrid/visit-hagrid.md) + [Head into Hogsmeade](../hogsmeade/hogsmeade.md) From 64a1dcacb5c8fd3dee298dfb73a91a4277bf3c85 Mon Sep 17 00:00:00 2001 From: MGH Date: Tue, 12 Jan 2016 11:10:02 -0800 Subject: [PATCH 2127/5486] Add action (mirar al cielo), thought (malos auspicios), and resolution (no estar de brazos cruzados). --- espanol/pensamiento/guerra.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/espanol/pensamiento/guerra.md b/espanol/pensamiento/guerra.md index ee6269f4ce..a5c7779a83 100644 --- a/espanol/pensamiento/guerra.md +++ b/espanol/pensamiento/guerra.md @@ -8,3 +8,7 @@ Tras terminar con sus lamentaciones: [Una reflexin de gran importancia le asalt](estoicismo/estoicismo.md) [Se sentó en el suelo y se puso a meditar](meditacion/meditar.md) + +Cuando volvi a mirar al cielo, se dio cuenta de que estaba cubierto de nubes. Con tan malos auspicios comenzara la batalla? + +[No poda quedarse de brazos cruzados.](soluciones/soluciones.md) \ No newline at end of file From 830b6a5abb70c37c77ed3c70416e93874c5b3de2 Mon Sep 17 00:00:00 2001 From: MGH Date: Tue, 12 Jan 2016 11:37:12 -0800 Subject: [PATCH 2128/5486] Add solutions file with first solution (negociar). --- espanol/pensamiento/soluciones/soluciones.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/pensamiento/soluciones/soluciones.md diff --git a/espanol/pensamiento/soluciones/soluciones.md b/espanol/pensamiento/soluciones/soluciones.md new file mode 100644 index 0000000000..c12eee4ca2 --- /dev/null +++ b/espanol/pensamiento/soluciones/soluciones.md @@ -0,0 +1 @@ +Tal vez podría negociar una tregua. Pero, ¿cómo? Nunca había sido un consejero influyente. La mayoría de los miembros de la asamblea lo consideraban demasiado joven e inexperto. \ No newline at end of file From 9b67fb5dd01c2b88be1c0f1397cbe0a76f6b8356 Mon Sep 17 00:00:00 2001 From: MattSmith Date: Tue, 12 Jan 2016 16:39:57 -0500 Subject: [PATCH 2129/5486] Add dig_down_more option --- english/you-are-in-minecraft/dig_down/dig_down.md | 2 ++ .../dig_down/dig_down_more/dig_down_more.md | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 english/you-are-in-minecraft/dig_down/dig_down_more/dig_down_more.md diff --git a/english/you-are-in-minecraft/dig_down/dig_down.md b/english/you-are-in-minecraft/dig_down/dig_down.md index ed479295ed..fd7ff07f75 100644 --- a/english/you-are-in-minecraft/dig_down/dig_down.md +++ b/english/you-are-in-minecraft/dig_down/dig_down.md @@ -24,4 +24,6 @@ Do you go [left?](goleft/goleft.md) Or maybe go [right?](goright/goright.md) +Do you continue to [dig down] (dig_down_more) + Or [dig yourself out and return to collecting wood?](../gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md) \ No newline at end of file diff --git a/english/you-are-in-minecraft/dig_down/dig_down_more/dig_down_more.md b/english/you-are-in-minecraft/dig_down/dig_down_more/dig_down_more.md new file mode 100644 index 0000000000..44d50c59a7 --- /dev/null +++ b/english/you-are-in-minecraft/dig_down/dig_down_more/dig_down_more.md @@ -0,0 +1,13 @@ +Against your better judgment, you continue to dig straight down. + +You find a vein of iron ore and mine it. + +After digging a little more, you find coal and mine it. + +Things are going well, so you try to dig down for diamonds. + +You did it! At height 9, you found diamonds! + +You dig straight down into your first diamond and land in lava. + +The lava kills you. \ No newline at end of file From 1ebc54377b55b73112db8a96b973f210d17e658e Mon Sep 17 00:00:00 2001 From: Ziad Baroudi Date: Wed, 13 Jan 2016 10:25:58 +1100 Subject: [PATCH 2130/5486] Add suggestion to "hungry" page --- english/hungry/hungry.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/hungry/hungry.md b/english/hungry/hungry.md index 4e50359d07..ac51e92889 100644 --- a/english/hungry/hungry.md +++ b/english/hungry/hungry.md @@ -1,2 +1,3 @@ When ur hungry, wat do you eat ? Maggi is outdated, so i would eat potato chips +Why not try 2-minute noodles? \ No newline at end of file From a18fc2f46aec62878d4ab2ba45b3777f8ab75d0f Mon Sep 17 00:00:00 2001 From: mike miller Date: Tue, 12 Jan 2016 20:11:12 -0500 Subject: [PATCH 2131/5486] Add Powerball storyline. --- english/marshmallow.md | 2 ++ english/powerball/lost/lost.md | 1 + english/powerball/powerball.md | 7 +++++++ english/powerball/won/won.md | 1 + 4 files changed, 11 insertions(+) create mode 100644 english/powerball/lost/lost.md create mode 100644 english/powerball/powerball.md create mode 100644 english/powerball/won/won.md diff --git a/english/marshmallow.md b/english/marshmallow.md index d122f2b22c..891471ea5b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -725,3 +725,5 @@ You may either do [this](gtd/gtd.md), Yourself? Instead of reading this entire story, you decide to go see the new star wars! + +You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). diff --git a/english/powerball/lost/lost.md b/english/powerball/lost/lost.md new file mode 100644 index 0000000000..2d0c0c77b9 --- /dev/null +++ b/english/powerball/lost/lost.md @@ -0,0 +1 @@ +Guess you gotta get up for [work tomorrow](http://i.giphy.com/pFwRzOLfuGHok.gif). \ No newline at end of file diff --git a/english/powerball/powerball.md b/english/powerball/powerball.md new file mode 100644 index 0000000000..d3e0d0a89a --- /dev/null +++ b/english/powerball/powerball.md @@ -0,0 +1,7 @@ +And the winning numbers are: + +14... 32... 8... 45... 29... 22! + +[I won, I won!](won/won.md) + +[I'm a loser, baby.](lost/lost.md) \ No newline at end of file diff --git a/english/powerball/won/won.md b/english/powerball/won/won.md new file mode 100644 index 0000000000..97d19e2f8d --- /dev/null +++ b/english/powerball/won/won.md @@ -0,0 +1 @@ +[Cha-ching!](http://i.giphy.com/k8AR3ns2qfwl2.gif) From f06c4bd808a47b58d227ed70a8419c9e2814ce79 Mon Sep 17 00:00:00 2001 From: Verena Date: Wed, 13 Jan 2016 11:24:03 +0100 Subject: [PATCH 2132/5486] ergaenze gloeckchen und klingele nochmals --- german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/gloeckchen.md | 4 +++- .../Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md diff --git a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/gloeckchen.md b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/gloeckchen.md index be61f599bc..751d9cb082 100644 --- a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/gloeckchen.md +++ b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/gloeckchen.md @@ -2,4 +2,6 @@ Mistrauisch betrachtest du das Glöckchen. Es sieht gar nicht magisch aus, eher gewöhnlich. Du läutest trozdem. Der Kobold lacht verschlagen und verschwindet indem er sich unsichtbar macht. -Unbehaglich kommt dir der Gedanke das der Kobold Schabernack mit dir treibt. \ No newline at end of file +Unbehaglich kommt dir der Gedanke das der Kobold Schabernack mit dir treibt. + +[Du klingelst das Glöckchen nochmals](klingeln/klingeln.md) \ No newline at end of file diff --git a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md new file mode 100644 index 0000000000..dc9f1303b9 --- /dev/null +++ b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md @@ -0,0 +1 @@ +Du klingelst das Glöckchen nochmals und der Wal muss plötzlich niesen. \ No newline at end of file From 0016ae58fc1eea8a2fd2dc38bca9cb458e283d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20de=20Landa?= Date: Wed, 13 Jan 2016 12:21:03 -0600 Subject: [PATCH 2133/5486] To add miedo.md file and update canudos.md according to the guidelines --- espanol/canudos.md | 2 ++ espanol/miedo/miedo.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 espanol/miedo/miedo.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 0d58d55ed1..1e2a3786bd 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -102,3 +102,5 @@ Conectó su guitarra al amplificador y se puso a tocar una versión de "Siempre [Así comenzó el cuento del cuco en el pueblo, para que los niños temieran a los dioses] (cuco/cuco.md) +A pero si no leiste el cuento del cuco, entonces significa que no tienes [miedo] (miedo/miedo.md) + diff --git a/espanol/miedo/miedo.md b/espanol/miedo/miedo.md new file mode 100644 index 0000000000..62483cda7b --- /dev/null +++ b/espanol/miedo/miedo.md @@ -0,0 +1,2 @@ + +Eres entonces una persona muy valiente y como tal deberas demostrarlo. From 85019fd2de1cc8b56b953c7d4d81d571b1dcdc17 Mon Sep 17 00:00:00 2001 From: Ferrera Date: Wed, 13 Jan 2016 22:19:56 +0000 Subject: [PATCH 2134/5486] Adding sentence to telefono --- espanol/telefono/telefono.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/telefono/telefono.md b/espanol/telefono/telefono.md index d80d3a17d2..d18ee491ae 100644 --- a/espanol/telefono/telefono.md +++ b/espanol/telefono/telefono.md @@ -1,2 +1,3 @@ El Consejero tomó rapidamente su teléfono inteligente y realizó una llamada que solo duró cinco segundos, diciendo: +- "Esto no tiene ningun sentido" From ea2c94715241898f26368b9aee011ee22243c56e Mon Sep 17 00:00:00 2001 From: Adrian Herzog Date: Wed, 13 Jan 2016 23:21:39 +0100 Subject: [PATCH 2135/5486] First attempt to expand the story --- german/Sonnenbrand/vor-sonne-schutzen.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/german/Sonnenbrand/vor-sonne-schutzen.md b/german/Sonnenbrand/vor-sonne-schutzen.md index 68a379d3f7..1f3511b415 100644 --- a/german/Sonnenbrand/vor-sonne-schutzen.md +++ b/german/Sonnenbrand/vor-sonne-schutzen.md @@ -5,3 +5,13 @@ als Sie besoffen am Pool in Mallorca eingeschlafen sind. Sie ziehen das nasse T-shirt aus und wickeln es zur Kühlung um den Kopf. Was werden Sie jetzt nun tun? + +... was zu Essen suchen, denn nach dem Sonnenbad hat man immer Hunger +[Hunger](../schwimmen/hunger.md) + + +... im leicht fiebrigen Zustand noch ein wenig +[dösen](../schwimmen/insel/schlafen/schlafen.md) + + + From 883480bd16a700660b507c7909080b13646d6bb3 Mon Sep 17 00:00:00 2001 From: Adrian Herzog Date: Wed, 13 Jan 2016 23:25:17 +0100 Subject: [PATCH 2136/5486] Correct the wrong path of the hunger action --- german/Sonnenbrand/vor-sonne-schutzen.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/german/Sonnenbrand/vor-sonne-schutzen.md b/german/Sonnenbrand/vor-sonne-schutzen.md index 1f3511b415..fd808fe3be 100644 --- a/german/Sonnenbrand/vor-sonne-schutzen.md +++ b/german/Sonnenbrand/vor-sonne-schutzen.md @@ -6,12 +6,9 @@ Sie ziehen das nasse T-shirt aus und wickeln es zur Kühlung um den Kopf. Was werden Sie jetzt nun tun? -... was zu Essen suchen, denn nach dem Sonnenbad hat man immer Hunger -[Hunger](../schwimmen/hunger.md) +... was zu Essen suchen, denn nach dem Sonnenbad hat man immer +[Hunger](../schwimmen/hunger/hunger.md) ... im leicht fiebrigen Zustand noch ein wenig [dösen](../schwimmen/insel/schlafen/schlafen.md) - - - From 2a48e1fbf6d2bfe67bfe01a688e64d7d34aa79c6 Mon Sep 17 00:00:00 2001 From: Amza Ionut Catalin Date: Thu, 14 Jan 2016 11:46:00 +0200 Subject: [PATCH 2137/5486] euphoria --- romanian/euforie/euforie.md | 1 + romanian/nalba.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 romanian/euforie/euforie.md diff --git a/romanian/euforie/euforie.md b/romanian/euforie/euforie.md new file mode 100644 index 0000000000..2aa05be53a --- /dev/null +++ b/romanian/euforie/euforie.md @@ -0,0 +1 @@ +Vedea curcani cu unicorn \ No newline at end of file diff --git a/romanian/nalba.md b/romanian/nalba.md index c9d4b1aceb..05081dadc0 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -75,3 +75,5 @@ Subit se simtea usor si isi imagina ca zboara - buna [potiunea](potiune_fermecat Parea ca devenise un [pitigoi lustragiu](pitigoi/pitigoi.md) pentru incisivii [crocobalaurului](padurea_violet/croco/croco.md). + +Si se simtea atat de [euforic] (euforie/euforie.md) incat nu-i mai pasa. From 18894b7df95fcb0f153e786ab5ec4ddee80bdb75 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 14 Jan 2016 01:55:11 -0800 Subject: [PATCH 2138/5486] Add one more destiny scenario --- english/destiny/destiny.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/destiny/destiny.md b/english/destiny/destiny.md index 1dc1b26a71..f15f8a8064 100644 --- a/english/destiny/destiny.md +++ b/english/destiny/destiny.md @@ -17,3 +17,5 @@ see destiny isn't so hard when you try for it. and now you will be the [protagonist of the story](../marshmallow.md) and I have [high hopes](../hope/hope.md) for you. + +and you might be someone [who knocks](../say-my-name/say-my-name.md). \ No newline at end of file From 91484d934c6e942523a5de2055f8e6c1cc76780e Mon Sep 17 00:00:00 2001 From: sofia Date: Thu, 14 Jan 2016 14:21:08 +0200 Subject: [PATCH 2139/5486] new line in the basic story --- greek/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/greek/marshmallow.md b/greek/marshmallow.md index 0cff788df6..d68a7bb5e6 100644 --- a/greek/marshmallow.md +++ b/greek/marshmallow.md @@ -12,6 +12,8 @@ Ξαφνικά συνειδητοποιείς ότι το ζαχαρωτό έχει αυτογνωσία! +Και εκει που δεν το περιμενεις ετοιμαζεται να σου μιλησει... + Συγκράτησε την εικόνα του ζαχαρωτού και ... [Βγάζεις την κάλτσα σου](put_socks_off/put-socks-off.md) From ccf3b9cd63a385067851e5be776becbf4aedd53a Mon Sep 17 00:00:00 2001 From: pavan Date: Thu, 14 Jan 2016 16:14:32 +0100 Subject: [PATCH 2140/5486] Continue eating marshmellows --- english/dentist/ouch.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/dentist/ouch.md b/english/dentist/ouch.md index c38b49ffb5..bca3d820cf 100644 --- a/english/dentist/ouch.md +++ b/english/dentist/ouch.md @@ -2,3 +2,4 @@ Uh-oh, you feel a dull pain in an a upper molar on the right side of your mouth. Shouldn't have eaten all those marshmallows. It's better to eat fruits and vegetables. But who can resist for marchmallows?! +So, dont worry. Continue eating marshmellows. If you loose all you teeth, you can replace them with the artificial ones. From 79bbb15294b42e6cd7012c3760557fed347e1bda Mon Sep 17 00:00:00 2001 From: mikel Date: Thu, 14 Jan 2016 17:00:57 -0430 Subject: [PATCH 2141/5486] add new history --- espanol/locura/locura.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/locura/locura.md diff --git a/espanol/locura/locura.md b/espanol/locura/locura.md new file mode 100644 index 0000000000..ab986d90cf --- /dev/null +++ b/espanol/locura/locura.md @@ -0,0 +1 @@ +esta historia es tan loca que yo mismo quisiera estar en ella \ No newline at end of file From f67824dc2dd86dfd1ed4b44dca68e1cde9aaabc3 Mon Sep 17 00:00:00 2001 From: mikel Date: Thu, 14 Jan 2016 17:20:54 -0430 Subject: [PATCH 2142/5486] fixing --- espanol/perro/perro.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/perro/perro.md b/espanol/perro/perro.md index bfd0e771b0..9bb2360442 100644 --- a/espanol/perro/perro.md +++ b/espanol/perro/perro.md @@ -3,3 +3,5 @@ El perro se llama Dago. A Dago le gustaba bailar porque al bailar recordaba a su antiguo dueño Dago a sido fiel con su dueño porque siempre le da los juecitos de gallina, su favorito. +[yupi](../locura/locura.md) + From f06ff5699dfe11c858f3396cffed076a7f6d46d7 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 14 Jan 2016 15:15:26 -0800 Subject: [PATCH 2143/5486] Add guess about DKER. --- english/DKER/DKER.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/DKER/DKER.md b/english/DKER/DKER.md index c905893a75..f4f2e3ff19 100644 --- a/english/DKER/DKER.md +++ b/english/DKER/DKER.md @@ -1 +1,3 @@ There is a very successful story called DKER ! + +Could you guess what's all about? \ No newline at end of file From 3fee47120da7f576130eb87985e43053f0fd8a7c Mon Sep 17 00:00:00 2001 From: jhair Date: Thu, 14 Jan 2016 22:10:57 -0500 Subject: [PATCH 2144/5486] Add pelea_epica --- espanol/pelea_epica/pelea_epica.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/pelea_epica/pelea_epica.md diff --git a/espanol/pelea_epica/pelea_epica.md b/espanol/pelea_epica/pelea_epica.md new file mode 100644 index 0000000000..fa61b57f80 --- /dev/null +++ b/espanol/pelea_epica/pelea_epica.md @@ -0,0 +1 @@ +Puso su mano derecha en su frente y se teletransportó al medio del ejército enemigo. La épica batalla estaba apunto de empezar. \ No newline at end of file From 7de91d28cb83779dae51e7d5ae387088b7922077 Mon Sep 17 00:00:00 2001 From: turnipsundae Date: Thu, 14 Jan 2016 19:15:48 -0800 Subject: [PATCH 2145/5486] Create goosebumps directory and md --- english/goosebumps/goosebumps.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/goosebumps/goosebumps.md diff --git a/english/goosebumps/goosebumps.md b/english/goosebumps/goosebumps.md new file mode 100644 index 0000000000..a7e2d9736b --- /dev/null +++ b/english/goosebumps/goosebumps.md @@ -0,0 +1,3 @@ +The blue eyes seem so familiar. They remind you of your brother's eyes. + +Give him a hug. From f386e389181f88eee4e03d9ec8891c52e83edc38 Mon Sep 17 00:00:00 2001 From: turnipsundae Date: Thu, 14 Jan 2016 19:21:11 -0800 Subject: [PATCH 2146/5486] Hug Batman --- english/goosebumps/goosebumps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/goosebumps/goosebumps.md b/english/goosebumps/goosebumps.md index a7e2d9736b..657d1afb07 100644 --- a/english/goosebumps/goosebumps.md +++ b/english/goosebumps/goosebumps.md @@ -1,3 +1,3 @@ The blue eyes seem so familiar. They remind you of your brother's eyes. -Give him a hug. +Give him a [hug] (../batman/batman.md). From 38f1879ce382f0533d1f886f5363f5f0e4ba60bf Mon Sep 17 00:00:00 2001 From: jhair Date: Thu, 14 Jan 2016 22:24:55 -0500 Subject: [PATCH 2147/5486] Change master to create the merge conflict --- espanol/pelea_epica/pelea_epica.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/pelea_epica/pelea_epica.md diff --git a/espanol/pelea_epica/pelea_epica.md b/espanol/pelea_epica/pelea_epica.md new file mode 100644 index 0000000000..baa393ce82 --- /dev/null +++ b/espanol/pelea_epica/pelea_epica.md @@ -0,0 +1 @@ +comenzó la pelea epica \ No newline at end of file From efbede9467ac90a61879cdf7bcc55350d2bc409a Mon Sep 17 00:00:00 2001 From: turnipsundae Date: Thu, 14 Jan 2016 19:30:30 -0800 Subject: [PATCH 2148/5486] Link to marshmallow --- english/goosebumps/goosebumps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/goosebumps/goosebumps.md b/english/goosebumps/goosebumps.md index 657d1afb07..fc885f82c5 100644 --- a/english/goosebumps/goosebumps.md +++ b/english/goosebumps/goosebumps.md @@ -1,3 +1,3 @@ -The blue eyes seem so familiar. They remind you of your brother's eyes. +The blue eyes seem so familiar. They remind you of your brother's [eyes] (..marshmallow.md). Give him a [hug] (../batman/batman.md). From f08696b53b2aa05d7a6cf1c4264355928cbbfb1c Mon Sep 17 00:00:00 2001 From: turnipsundae Date: Thu, 14 Jan 2016 19:31:45 -0800 Subject: [PATCH 2149/5486] Fix link to marshmallow --- english/goosebumps/goosebumps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/goosebumps/goosebumps.md b/english/goosebumps/goosebumps.md index fc885f82c5..4b9156f287 100644 --- a/english/goosebumps/goosebumps.md +++ b/english/goosebumps/goosebumps.md @@ -1,3 +1,3 @@ -The blue eyes seem so familiar. They remind you of your brother's [eyes] (..marshmallow.md). +The blue eyes seem so familiar. They remind you of your brother's [eyes] (../marshmallow.md). Give him a [hug] (../batman/batman.md). From 7182d30e5903f71a7999e8b0a6c17849cd9e0d1f Mon Sep 17 00:00:00 2001 From: turnipsundae Date: Thu, 14 Jan 2016 19:38:48 -0800 Subject: [PATCH 2150/5486] Add link to goosebump.md --- english/ghostbusters/ghostbusters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/ghostbusters/ghostbusters.md b/english/ghostbusters/ghostbusters.md index 6e915e053d..cd6ceef930 100644 --- a/english/ghostbusters/ghostbusters.md +++ b/english/ghostbusters/ghostbusters.md @@ -44,7 +44,7 @@ and sparkle as your body and mind are sent reeling. You awaken to bluriness and a numbing headache as you wonder -WHERE AM I ??? +WHERE AM I ??? You sense a cloaked figure with electric [blue eyes] (../goosebumps/goosebumps.md) appraoch you from the side. a voice calls out from your right From 2c288ee6292f6f99d476419f2375a710bc111f3e Mon Sep 17 00:00:00 2001 From: turnipsundae Date: Thu, 14 Jan 2016 19:42:18 -0800 Subject: [PATCH 2151/5486] Break into several lines --- english/ghostbusters/ghostbusters.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/ghostbusters/ghostbusters.md b/english/ghostbusters/ghostbusters.md index cd6ceef930..ec936d3ed5 100644 --- a/english/ghostbusters/ghostbusters.md +++ b/english/ghostbusters/ghostbusters.md @@ -44,10 +44,14 @@ and sparkle as your body and mind are sent reeling. You awaken to bluriness and a numbing headache as you wonder -WHERE AM I ??? You sense a cloaked figure with electric [blue eyes] (../goosebumps/goosebumps.md) appraoch you from the side. +WHERE AM I ??? a voice calls out from your right +You sense a cloaked figure with + +electric [blue eyes] (../goosebumps/goosebumps.md) approach. + From e5462eef570902caf880045fb77e5f8bf6dbf57c Mon Sep 17 00:00:00 2001 From: turnipsundae Date: Thu, 14 Jan 2016 19:43:32 -0800 Subject: [PATCH 2152/5486] Delete white space --- english/ghostbusters/ghostbusters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/ghostbusters/ghostbusters.md b/english/ghostbusters/ghostbusters.md index ec936d3ed5..8809bfc259 100644 --- a/english/ghostbusters/ghostbusters.md +++ b/english/ghostbusters/ghostbusters.md @@ -44,7 +44,7 @@ and sparkle as your body and mind are sent reeling. You awaken to bluriness and a numbing headache as you wonder -WHERE AM I ??? +WHERE AM I ??? a voice calls out from your right From 62e0a12067732a88001359de7fd87bc89da36ec3 Mon Sep 17 00:00:00 2001 From: jhair Date: Thu, 14 Jan 2016 22:43:49 -0500 Subject: [PATCH 2153/5486] Add some changes recommended by the bot --- espanol/canudos.md | 3 +++ espanol/pelea_epica/pelea_epica.md | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 1e2a3786bd..30e2c33d07 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -102,5 +102,8 @@ Conectó su guitarra al amplificador y se puso a tocar una versión de "Siempre [Así comenzó el cuento del cuco en el pueblo, para que los niños temieran a los dioses] (cuco/cuco.md) +[Puso su mano derecha en su frente y se teletransportó al +centro del ejército enemigo](pelea_epica/pelea_epica.md) + A pero si no leiste el cuento del cuco, entonces significa que no tienes [miedo] (miedo/miedo.md) diff --git a/espanol/pelea_epica/pelea_epica.md b/espanol/pelea_epica/pelea_epica.md index ec8d74c07f..68398b6401 100644 --- a/espanol/pelea_epica/pelea_epica.md +++ b/espanol/pelea_epica/pelea_epica.md @@ -1 +1,2 @@ -Puso su mano derecha en su frente y se teletransportó al medio del ejército enemigo. La épica batalla estaba apunto de empezar. +Puso su mano derecha en su frente y se teletransportó al medio del ejército enemigo. +La épica batalla estaba apunto de empezar. From 725d3a61930767ec78b63208ab95c174f2f5ed71 Mon Sep 17 00:00:00 2001 From: JayneJacobs Date: Thu, 14 Jan 2016 22:47:55 -0500 Subject: [PATCH 2154/5486] Shortened lines lines --- english/dream/livethedream/livethedream.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/dream/livethedream/livethedream.md b/english/dream/livethedream/livethedream.md index dc3de5378d..d21a0e6cf7 100644 --- a/english/dream/livethedream/livethedream.md +++ b/english/dream/livethedream/livethedream.md @@ -1 +1,4 @@ -Which is real if I remember all of the times in my childhood when I flew in my dreams. I would decide the dream is more real and reality is a dream. It would be more fun to live where I can fly so I would stay in the dream. +Which is real if I remember all of the times in my childhood +when I flew in my dreams. I would decide the dream is more real +and reality is a dream. It would be more fun to live where I can +fly so I would stay in the dream. From dbd2e74ed184e6b18a5d73287befc651775e164f Mon Sep 17 00:00:00 2001 From: JayneJacobs Date: Thu, 14 Jan 2016 22:50:15 -0500 Subject: [PATCH 2155/5486] Deleted empty file --- english/dream/livethedream.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 english/dream/livethedream.md diff --git a/english/dream/livethedream.md b/english/dream/livethedream.md deleted file mode 100644 index e69de29bb2..0000000000 From 44f68753e674dca463bc467630f46e94e586b080 Mon Sep 17 00:00:00 2001 From: jhair Date: Thu, 14 Jan 2016 23:00:41 -0500 Subject: [PATCH 2156/5486] Fix some issues --- espanol/canudos.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 30e2c33d07..5362b6b3af 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -102,8 +102,6 @@ Conectó su guitarra al amplificador y se puso a tocar una versión de "Siempre [Así comenzó el cuento del cuco en el pueblo, para que los niños temieran a los dioses] (cuco/cuco.md) -[Puso su mano derecha en su frente y se teletransportó al -centro del ejército enemigo](pelea_epica/pelea_epica.md) - A pero si no leiste el cuento del cuco, entonces significa que no tienes [miedo] (miedo/miedo.md) +[Puso su mano derecha en su frente y se teletransportó al centro del ejército enemigo](pelea_epica/pelea_epica.md) From 683a1209a1a0e4c636f75d1ac9636e782e31f1a9 Mon Sep 17 00:00:00 2001 From: Quiz42 Date: Fri, 15 Jan 2016 13:27:38 +0800 Subject: [PATCH 2157/5486] Add the old story recursively in Chinese --- Chinese/DesertHell/NewWorld.md | 2 ++ Chinese/DesertHell/OldStory/Story.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 Chinese/DesertHell/OldStory/Story.md diff --git a/Chinese/DesertHell/NewWorld.md b/Chinese/DesertHell/NewWorld.md index dfad2c7f3d..b397e8898a 100644 --- a/Chinese/DesertHell/NewWorld.md +++ b/Chinese/DesertHell/NewWorld.md @@ -2,3 +2,5 @@ This is a new world "新的世界“ Let’s start from beginning end + +[一个白胡子老头正在讲故事 ...](OldStory/Story.md) diff --git a/Chinese/DesertHell/OldStory/Story.md b/Chinese/DesertHell/OldStory/Story.md new file mode 100644 index 0000000000..efa32b7aef --- /dev/null +++ b/Chinese/DesertHell/OldStory/Story.md @@ -0,0 +1,4 @@ +从前有座山， +山上有座庙， +庙里有个白胡子老头正在讲故事, +[他讲的什么？](../Story.md) From 508c61f415826c039443c222552e99f045c13693 Mon Sep 17 00:00:00 2001 From: Quiz42 Date: Fri, 15 Jan 2016 13:29:48 +0800 Subject: [PATCH 2158/5486] Revert "Add the old story recursively in Chinese" This reverts commit 683a1209a1a0e4c636f75d1ac9636e782e31f1a9. --- Chinese/DesertHell/NewWorld.md | 2 -- Chinese/DesertHell/OldStory/Story.md | 4 ---- 2 files changed, 6 deletions(-) delete mode 100644 Chinese/DesertHell/OldStory/Story.md diff --git a/Chinese/DesertHell/NewWorld.md b/Chinese/DesertHell/NewWorld.md index b397e8898a..dfad2c7f3d 100644 --- a/Chinese/DesertHell/NewWorld.md +++ b/Chinese/DesertHell/NewWorld.md @@ -2,5 +2,3 @@ This is a new world "新的世界“ Let’s start from beginning end - -[一个白胡子老头正在讲故事 ...](OldStory/Story.md) diff --git a/Chinese/DesertHell/OldStory/Story.md b/Chinese/DesertHell/OldStory/Story.md deleted file mode 100644 index efa32b7aef..0000000000 --- a/Chinese/DesertHell/OldStory/Story.md +++ /dev/null @@ -1,4 +0,0 @@ -从前有座山， -山上有座庙， -庙里有个白胡子老头正在讲故事, -[他讲的什么？](../Story.md) From 99f907f52f1e4dde6f021bb25352b586add72f9b Mon Sep 17 00:00:00 2001 From: Quiz42 Date: Fri, 15 Jan 2016 13:33:50 +0800 Subject: [PATCH 2159/5486] Add the old story recursively with correct link in Chinese --- Chinese/DesertHell/NewWorld.md | 2 ++ Chinese/DesertHell/OldStory/Story.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 Chinese/DesertHell/OldStory/Story.md diff --git a/Chinese/DesertHell/NewWorld.md b/Chinese/DesertHell/NewWorld.md index dfad2c7f3d..7932a80228 100644 --- a/Chinese/DesertHell/NewWorld.md +++ b/Chinese/DesertHell/NewWorld.md @@ -2,3 +2,5 @@ This is a new world "新的世界“ Let’s start from beginning end +一个白胡子老头正在讲故事， +[他讲的什么？](./OldStory/Story.md) diff --git a/Chinese/DesertHell/OldStory/Story.md b/Chinese/DesertHell/OldStory/Story.md new file mode 100644 index 0000000000..fef333ff28 --- /dev/null +++ b/Chinese/DesertHell/OldStory/Story.md @@ -0,0 +1,4 @@ +从前有座山， +山上有座庙， +庙里有个白胡子老头正在讲故事， +[他讲的什么？](./Story.md) From 1dfc6e30b314434007cd6db2dd8c1adb675ce7e7 Mon Sep 17 00:00:00 2001 From: Jaime Rios Date: Thu, 14 Jan 2016 22:30:21 -0800 Subject: [PATCH 2160/5486] add a 'save the world' option --- english/exercise/exercise.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/exercise/exercise.md b/english/exercise/exercise.md index b5db6b3c94..2ba42efd21 100644 --- a/english/exercise/exercise.md +++ b/english/exercise/exercise.md @@ -8,3 +8,5 @@ What do you do? Do you: [Seek Vegetables](./seek_veg/seek_veg.md) [Say, "Fuck it" and continue eating marshmallows](./fuck_it/fuck_it.md) + +[Burn off those calories by saving the world](../justice-league/justice-league.md) \ No newline at end of file From 1cf9e6b116bd32c83128ac8bce4452f353fc387e Mon Sep 17 00:00:00 2001 From: Harshit Date: Fri, 15 Jan 2016 16:45:00 +0530 Subject: [PATCH 2161/5486] Modified --- hindi/actor1/srk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/hindi/actor1/srk.md b/hindi/actor1/srk.md index 97295e841a..88659581ae 100644 --- a/hindi/actor1/srk.md +++ b/hindi/actor1/srk.md @@ -3,4 +3,5 @@ तुम उसके साथ एक फिल्म देखने का मौका मिला । दीपिका की [ यहाँ ](../actor4/aamir.md) दबाइए +its fine From 4e59872c98f5188b1f8f3471a084e798c387fe47 Mon Sep 17 00:00:00 2001 From: Guillermo Date: Fri, 15 Jan 2016 14:25:30 +0100 Subject: [PATCH 2162/5486] Add sentence to ejercito --- espanol/ejercito/ejercito.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/ejercito/ejercito.md b/espanol/ejercito/ejercito.md index f11f6f92f6..ddaa63ae49 100644 --- a/espanol/ejercito/ejercito.md +++ b/espanol/ejercito/ejercito.md @@ -1 +1,3 @@ -Y vinieron un ejército de ángeles y se pusieron a tocar el violín \ No newline at end of file +Y vinieron un ejército de ángeles y se pusieron a tocar el violín + +Las notas transmitían la paz del lugar From a7343e93e59209c50d1d88e8125e2f282cf8396d Mon Sep 17 00:00:00 2001 From: s21malaz Date: Fri, 15 Jan 2016 10:36:02 -0500 Subject: [PATCH 2163/5486] added-option-alice --- english/bird-salvation/bird.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/bird-salvation/bird.md b/english/bird-salvation/bird.md index c976c10146..8e4dc4d21a 100644 --- a/english/bird-salvation/bird.md +++ b/english/bird-salvation/bird.md @@ -4,3 +4,7 @@ marshmallow right off of you. Amazed, you sit in silence at the mythical animal you just witnessed ... as well as trying to catch your breath...and, in the distance, glimpse what appears to be a horse with a horn sprouting from its forehead... + +You really have only one option +[Go ask Alice](..ask-to-alice/ask-to-alice.md) +I think she'll know ... \ No newline at end of file From f62b2f39b73d41c0029a5ce9187fd4eadaf1ee56 Mon Sep 17 00:00:00 2001 From: s21malaz Date: Fri, 15 Jan 2016 10:52:00 -0500 Subject: [PATCH 2164/5486] added-option-alice --- english/bird-salvation/bird.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bird-salvation/bird.md b/english/bird-salvation/bird.md index 8e4dc4d21a..b4566d9e2d 100644 --- a/english/bird-salvation/bird.md +++ b/english/bird-salvation/bird.md @@ -6,5 +6,5 @@ as well as trying to catch your breath...and, in the distance, glimpse what appears to be a horse with a horn sprouting from its forehead... You really have only one option -[Go ask Alice](..ask-to-alice/ask-to-alice.md) +[Go ask Alice](../ask-to-alice/ask-to-alice.md) I think she'll know ... \ No newline at end of file From 1d119103f031d56f941eb7ade322fa319cad4a42 Mon Sep 17 00:00:00 2001 From: SparkyMcCode Date: Fri, 15 Jan 2016 14:59:44 -0600 Subject: [PATCH 2165/5486] add useless police --- english/light-up/grab_tools_and_jump/grab_and_jump.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/light-up/grab_tools_and_jump/grab_and_jump.md b/english/light-up/grab_tools_and_jump/grab_and_jump.md index ace19576ec..eef137035b 100644 --- a/english/light-up/grab_tools_and_jump/grab_and_jump.md +++ b/english/light-up/grab_tools_and_jump/grab_and_jump.md @@ -11,6 +11,8 @@ The mayor said the Mr. Sugarfix's marshmallow factory is at the top of hill and it is making the marshmallow 24 hours a day. The marshmallow ooz flows into the river and down to the towns. +The police and fire depts. are also comepletely submerged in goo. Its up to you. + The mayor said you must go and destroy the factory. He has a box of tools. Do you: From 8ff2bbf0fb80447df098e3f94db52262b79a3f99 Mon Sep 17 00:00:00 2001 From: MattSmith Date: Fri, 15 Jan 2016 16:41:38 -0500 Subject: [PATCH 2166/5486] Fix link to dig_down_more option --- english/you-are-in-minecraft/dig_down/dig_down.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/you-are-in-minecraft/dig_down/dig_down.md b/english/you-are-in-minecraft/dig_down/dig_down.md index fd7ff07f75..03fd425d2a 100644 --- a/english/you-are-in-minecraft/dig_down/dig_down.md +++ b/english/you-are-in-minecraft/dig_down/dig_down.md @@ -24,6 +24,6 @@ Do you go [left?](goleft/goleft.md) Or maybe go [right?](goright/goright.md) -Do you continue to [dig down] (dig_down_more) +Do you continue to [dig down] (dig_down_more/dig_down_more.md) Or [dig yourself out and return to collecting wood?](../gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md) \ No newline at end of file From 469f4cf751fedbb79c7348e8fb1e994a46a61011 Mon Sep 17 00:00:00 2001 From: Nathan Gaw Date: Sat, 16 Jan 2016 00:59:24 +0000 Subject: [PATCH 2167/5486] added line to shelter.md --- english/forest/shelter/shelter.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/forest/shelter/shelter.md b/english/forest/shelter/shelter.md index f689dab3d4..0bf7c93c13 100644 --- a/english/forest/shelter/shelter.md +++ b/english/forest/shelter/shelter.md @@ -1,4 +1,7 @@ You break down some branches and make a frame. You put your parachute over the top of it, tying it down securely with palm leaves. Luckily you did it because as you make yourself comfortable for the night the heaven's open. -There's a terrible storm brewing... \ No newline at end of file +There's a terrible storm brewing... + +This will be the worst storm to hit this +area in over a century. \ No newline at end of file From 542214195f201b7518392db7fcd02024e19a115f Mon Sep 17 00:00:00 2001 From: stubz Date: Sat, 16 Jan 2016 16:57:08 +0900 Subject: [PATCH 2168/5486] Add a line about mattake katsudon --- japanese/mattake/mattake.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/japanese/mattake/mattake.md b/japanese/mattake/mattake.md index 15fa339c94..2281136c8a 100644 --- a/japanese/mattake/mattake.md +++ b/japanese/mattake/mattake.md @@ -1,5 +1,5 @@ 松茸は思っているより小さかった。 -あなたは: +あなたは:[松茸カツ丼](../katsudon/katsudon.md)を注文しにおもむろにiPhoneを取り出し、ボブ他５０名を予約できる店を検索した。 From 09815ea1ac9b54d434de5a7db2ec0a7a509ce1a4 Mon Sep 17 00:00:00 2001 From: stubz Date: Sat, 16 Jan 2016 17:17:25 +0900 Subject: [PATCH 2169/5486] Add a line about mattake katsudon --- japanese/mattake/mattake.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/japanese/mattake/mattake.md b/japanese/mattake/mattake.md index 2281136c8a..987828f7db 100644 --- a/japanese/mattake/mattake.md +++ b/japanese/mattake/mattake.md @@ -1,5 +1,6 @@ 松茸は思っているより小さかった。 -あなたは:[松茸カツ丼](../katsudon/katsudon.md)を注文しにおもむろにiPhoneを取り出し、ボブ他５０名を予約できる店を検索した。 +あなたは: +[松茸カツ丼](../katsudon/katsudon.md)を注文しにおもむろにiPhoneを取り出し、ボブ他５０名を予約できる店を検索した。 From 3b6b613fa4c1f0382f0b54d2e166bf0d0de9c505 Mon Sep 17 00:00:00 2001 From: stubz Date: Sat, 16 Jan 2016 17:25:05 +0900 Subject: [PATCH 2170/5486] Add a line about mattake --- japanese/beanus/beanus.md | 1 + 1 file changed, 1 insertion(+) diff --git a/japanese/beanus/beanus.md b/japanese/beanus/beanus.md index 9ac29205ab..bee024e32f 100644 --- a/japanese/beanus/beanus.md +++ b/japanese/beanus/beanus.md @@ -4,3 +4,4 @@ お前が落としたのは、 この[プラスチック製のiPhoneか?](../smartphone/iphone-plastic.md) +それとも[この松茸か？](../mattake/mattake.md) From ab9b1ab3af4641cabc848a45b97583f6fb68369d Mon Sep 17 00:00:00 2001 From: stubz Date: Sat, 16 Jan 2016 17:26:25 +0900 Subject: [PATCH 2171/5486] Add a line about mattake --- japanese/beanus/beanus.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/japanese/beanus/beanus.md b/japanese/beanus/beanus.md index bee024e32f..62e7976987 100644 --- a/japanese/beanus/beanus.md +++ b/japanese/beanus/beanus.md @@ -4,4 +4,6 @@ お前が落としたのは、 この[プラスチック製のiPhoneか?](../smartphone/iphone-plastic.md) + + それとも[この松茸か？](../mattake/mattake.md) From 126a14b02848f5e6810b12faee831badfa21d8e1 Mon Sep 17 00:00:00 2001 From: stubz Date: Sat, 16 Jan 2016 17:29:27 +0900 Subject: [PATCH 2172/5486] add a new line --- japanese/mattake/mattake.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/japanese/mattake/mattake.md b/japanese/mattake/mattake.md index 987828f7db..b1f5d61485 100644 --- a/japanese/mattake/mattake.md +++ b/japanese/mattake/mattake.md @@ -1,6 +1,8 @@ 松茸は思っているより小さかった。 あなたは: + + [松茸カツ丼](../katsudon/katsudon.md)を注文しにおもむろにiPhoneを取り出し、ボブ他５０名を予約できる店を検索した。 From b079dd5f7abbe21717e03361f740ddd6f7073073 Mon Sep 17 00:00:00 2001 From: Raja Mukesh Date: Sat, 16 Jan 2016 21:07:46 +0530 Subject: [PATCH 2173/5486] added a line on pain of love --- english/love/love.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/love/love.md b/english/love/love.md index 4974eafb49..3a4c980705 100644 --- a/english/love/love.md +++ b/english/love/love.md @@ -16,3 +16,5 @@ cannot make you understand the feeling of it. Anyways, [here's something comepletely different.](../marshmallow.md) If all else fails, you could [try this.](../read-a-book/read-a-book.md) + +Love feels eternal but the pain it adds to your heart is painful [The Pain] (https://www.quora.com/What-is-it-like-when-you-feel-the-pain-of-loving-someone-when-its-one-sided) to see how people manage the pain From 70b411ed1dad834fada7d6d81f5a1b0fabb41d47 Mon Sep 17 00:00:00 2001 From: Raja Mukesh Date: Sat, 16 Jan 2016 21:13:14 +0530 Subject: [PATCH 2174/5486] added the comment of breaking into multiple lines --- english/love/love.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/love/love.md b/english/love/love.md index 3a4c980705..9f0c1d97fe 100644 --- a/english/love/love.md +++ b/english/love/love.md @@ -17,4 +17,7 @@ something comepletely different.](../marshmallow.md) If all else fails, you could [try this.](../read-a-book/read-a-book.md) -Love feels eternal but the pain it adds to your heart is painful [The Pain] (https://www.quora.com/What-is-it-like-when-you-feel-the-pain-of-loving-someone-when-its-one-sided) to see how people manage the pain +Love feels eternal but the +pain it adds to your heart is painful +[The Pain] (https://www.quora.com/What-is-it-like-when-you-feel-the-pain-of-loving-someone-when-its-one-sided) +to see how people manage the pain From 024d21f29328119dd6e796e02f9f49dcec83456d Mon Sep 17 00:00:00 2001 From: Linda Allen Date: Sat, 16 Jan 2016 14:44:49 -0500 Subject: [PATCH 2175/5486] My story --- english/marshmallow.md | 2 ++ english/stapler/no.md | 1 + english/stapler/yes.md | 1 + 3 files changed, 4 insertions(+) create mode 100644 english/stapler/no.md create mode 100644 english/stapler/yes.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 3c9c2e917d..d037753f5f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -731,3 +731,5 @@ Yourself? Instead of reading this entire story, you decide to go see the new star wars! You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). + +Do you have my stapler? [yes](stapler/yes.md) [no](stapler/no.md) \ No newline at end of file diff --git a/english/stapler/no.md b/english/stapler/no.md new file mode 100644 index 0000000000..c8d599e9b5 --- /dev/null +++ b/english/stapler/no.md @@ -0,0 +1 @@ +![Burning Building](https://media.giphy.com/media/7XqRXKYV9odtm/giphy.gif) \ No newline at end of file diff --git a/english/stapler/yes.md b/english/stapler/yes.md new file mode 100644 index 0000000000..a8226f9315 --- /dev/null +++ b/english/stapler/yes.md @@ -0,0 +1 @@ +![My Stapler](https://media.giphy.com/media/11eVHR0KqaWWRO/giphy.gif) \ No newline at end of file From a5f04d9df473e60ab99dbb3b10c6032111848c34 Mon Sep 17 00:00:00 2001 From: Linda Allen Date: Sat, 16 Jan 2016 14:58:00 -0500 Subject: [PATCH 2176/5486] updated for pull request --- english/marshmallow.md | 2 +- english/stapler/{ => no}/no.md | 0 english/stapler/stapler.md | 0 english/stapler/{ => yes}/yes.md | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename english/stapler/{ => no}/no.md (100%) create mode 100644 english/stapler/stapler.md rename english/stapler/{ => yes}/yes.md (100%) diff --git a/english/marshmallow.md b/english/marshmallow.md index d037753f5f..413654420a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -732,4 +732,4 @@ Instead of reading this entire story, you decide to go see the new star wars! You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). -Do you have my stapler? [yes](stapler/yes.md) [no](stapler/no.md) \ No newline at end of file +[Do you have my stapler?](stapler/stapler.md) \ No newline at end of file diff --git a/english/stapler/no.md b/english/stapler/no/no.md similarity index 100% rename from english/stapler/no.md rename to english/stapler/no/no.md diff --git a/english/stapler/stapler.md b/english/stapler/stapler.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/english/stapler/yes.md b/english/stapler/yes/yes.md similarity index 100% rename from english/stapler/yes.md rename to english/stapler/yes/yes.md From 691110b4dcb396aac71503a798c8451513b950b6 Mon Sep 17 00:00:00 2001 From: Linda Allen Date: Sat, 16 Jan 2016 15:00:18 -0500 Subject: [PATCH 2177/5486] fixing lost page --- english/stapler/stapler.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/english/stapler/stapler.md b/english/stapler/stapler.md index e69de29bb2..c79e1c51c3 100644 --- a/english/stapler/stapler.md +++ b/english/stapler/stapler.md @@ -0,0 +1,5 @@ +Do you have my stapler? + +[yes](stapler/yes/yes.md) + +[no](stapler/no/no.md) \ No newline at end of file From 93e3710dd77e476700b1a50a6b493e0967931076 Mon Sep 17 00:00:00 2001 From: Linda Allen Date: Sat, 16 Jan 2016 15:01:17 -0500 Subject: [PATCH 2178/5486] fixes --- english/stapler/stapler.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/stapler/stapler.md b/english/stapler/stapler.md index c79e1c51c3..9cd2d0ac99 100644 --- a/english/stapler/stapler.md +++ b/english/stapler/stapler.md @@ -1,5 +1,5 @@ Do you have my stapler? -[yes](stapler/yes/yes.md) +[yes](yes/yes.md) -[no](stapler/no/no.md) \ No newline at end of file +[no](no/no.md) \ No newline at end of file From e406a71508b1a8d3c4df41178c665200453e9482 Mon Sep 17 00:00:00 2001 From: davecampbell Date: Sat, 16 Jan 2016 16:14:13 -0500 Subject: [PATCH 2179/5486] add obamacare --- english/candyland/diabetes.md | 2 ++ english/candyland/obamacare/signup.md | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 english/candyland/obamacare/signup.md diff --git a/english/candyland/diabetes.md b/english/candyland/diabetes.md index 7d3d399ab1..ca05bdaee4 100644 --- a/english/candyland/diabetes.md +++ b/english/candyland/diabetes.md @@ -21,3 +21,5 @@ just realize you have diabetes. [Taste The Rainbow](rainbow/rainbow.md) [Inspect The Melted Marshmallow](swim/swim.md) + +[Sign Up For Obamacare](obamamcare/signup.md) diff --git a/english/candyland/obamacare/signup.md b/english/candyland/obamacare/signup.md new file mode 100644 index 0000000000..6ca3cb3f1c --- /dev/null +++ b/english/candyland/obamacare/signup.md @@ -0,0 +1,9 @@ +Thank goodness that Obamacare covers pre-existing conditions! + +You have spent your whole life eating junk food and not taking care of yourself, but that's not your fault! + +The system was always fixed - the little guy always gets screwed. + +But now's your chance to get back at the man! Free Health Care! Paid for by...oh, the little guy again. + +Go ahead, eat all the marshmallow stuff, it's too late anyway. From 5658bbbb9cace238584a95641e3a542ad0d01663 Mon Sep 17 00:00:00 2001 From: davecampbell Date: Sat, 16 Jan 2016 16:21:18 -0500 Subject: [PATCH 2180/5486] fix misspelled link --- english/candyland/diabetes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/candyland/diabetes.md b/english/candyland/diabetes.md index ca05bdaee4..64632ed75a 100644 --- a/english/candyland/diabetes.md +++ b/english/candyland/diabetes.md @@ -22,4 +22,4 @@ just realize you have diabetes. [Inspect The Melted Marshmallow](swim/swim.md) -[Sign Up For Obamacare](obamamcare/signup.md) +[Sign Up For Obamacare](obamacare/signup.md) From c474bf9f09593bce12a99c9c6394cd3cfc9ed400 Mon Sep 17 00:00:00 2001 From: Lenny Szubowicz Date: Sat, 16 Jan 2016 22:20:40 -0500 Subject: [PATCH 2181/5486] Embellish forest story --- english/forest/forest.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/forest/forest.md b/english/forest/forest.md index 88193b9091..449f14ee98 100644 --- a/english/forest/forest.md +++ b/english/forest/forest.md @@ -15,6 +15,12 @@ Suddenly it all comes back to you. The plane, the fight, panic, the pilot getting knocked out. There was only one option. You managed to grab a parachute and jumped into the unknown. You're lucky to have made it alive. But now what? +Instinctively, you want to reach for your back pocket. You can't feel the +reassuring thin rectangular shape pressing into you. But that's probably +because the pain pulsing up your leg is hiding it. Then you remember what +Caroline said. You're in the forest. There is no internet here. You are offline. +Google can't help you right now. You are on your own. + [Drag yourself further into the woods](drag/drag.md) [Try to gather materials for a signal fire](fire/fire.md) From 5ad59a39eb19aec3bdc9f30b53c2821b1c0ae926 Mon Sep 17 00:00:00 2001 From: "[solus]" <[dsolus@gmail.com]> Date: Sun, 17 Jan 2016 09:43:47 -0600 Subject: [PATCH 2182/5486] add new files fight, stay, and woods to fire --- english/forest/fire/fight/fight.md | 8 ++++++++ english/forest/fire/fire.md | 20 ++++++++++++++++++++ english/forest/fire/stay/stay.md | 6 ++++++ english/forest/fire/woods/woods.md | 13 +++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 english/forest/fire/fight/fight.md create mode 100644 english/forest/fire/stay/stay.md create mode 100644 english/forest/fire/woods/woods.md diff --git a/english/forest/fire/fight/fight.md b/english/forest/fire/fight/fight.md new file mode 100644 index 0000000000..b0f3b2f65c --- /dev/null +++ b/english/forest/fire/fight/fight.md @@ -0,0 +1,8 @@ +You grab a long sharp branch off the ground next to your fire. Bloodlust pulses +through your veins as you stalk the bear. You find him sitting next to a tree +stump digging honey out of a poor bees nest. Running at the bear, spear in hand, +you sink the sharp end into his back and the bear cries out in pain. + +Victory achieved, you march triumphntly back to your camp. + + diff --git a/english/forest/fire/fire.md b/english/forest/fire/fire.md index 115a11b1c1..cb76756e3c 100644 --- a/english/forest/fire/fire.md +++ b/english/forest/fire/fire.md @@ -13,3 +13,23 @@ It is very hot and you're sweating a lot. You haven't eaten for days. It was a bad dream, but you're still stuck on that island. You see a huge cruise ship in the distance, way out in the ocean. + +Blood clouds your vision and the cruise ship starts to flicker on and off. +Like someone turning the channel in your brain. A loud ringing in your ears with +a sharp pain in your leg and face welcome you back to the forest. + +After the bear becomes bored of your limp body he begins to rummage through your +backpack. After chomping down the sweet candy bars in the front pocket he +shambles of into the forest. + +So this is where you decided to kick ass. That bear is food and he ate all of +yours. However your fire is still lite and your wounds are aching. Also, it may +just be the brain damage, but you think you hear a stream off in the darkest +part of the woods. What should you do? + +[Drag yourself further into the woods](woods/woods.md) + +[Stay by the fire](stay/stay.md) + +[Fight the bear](fight/fight.md) + diff --git a/english/forest/fire/stay/stay.md b/english/forest/fire/stay/stay.md new file mode 100644 index 0000000000..8a4a631423 --- /dev/null +++ b/english/forest/fire/stay/stay.md @@ -0,0 +1,6 @@ + +You stay and do nothing for a few days. Your wounds are healing but you are +hungry. So you being to eat your cloths. A group of boy scouts finds your corpse +after several months. + +Sorry, you died. diff --git a/english/forest/fire/woods/woods.md b/english/forest/fire/woods/woods.md new file mode 100644 index 0000000000..287a4cd7c4 --- /dev/null +++ b/english/forest/fire/woods/woods.md @@ -0,0 +1,13 @@ + +Bravely you drag your wounded body into the woods leaving a trail of blood +behind you. Soon you find a stream. The water is crystal clear and the moonlight +reflects cleanly from the surface, illuminating the woods around you. After a +few drinks and washing your wounds you beging to feel amazing. The stream has +completely healed you. It must be magic! + +Turning around, to head back to camp, you find yourself face to face with an +ancient shawman. He tells you that after one has drank from the stream of dreams +they are welcome to join the tribe of ancient warlocks. + +Maybe you decided to follow the shawman deeper into the forest? + From 841123510cf3326f2726e17fb0733a9c936bf837 Mon Sep 17 00:00:00 2001 From: oCakeBn Date: Sun, 17 Jan 2016 17:01:16 +0100 Subject: [PATCH 2183/5486] Dodaj twist plot --- serbian/burekMeso/burekMeso.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/serbian/burekMeso/burekMeso.md b/serbian/burekMeso/burekMeso.md index 74e2d38c33..09b67a5b20 100644 --- a/serbian/burekMeso/burekMeso.md +++ b/serbian/burekMeso/burekMeso.md @@ -1 +1,2 @@ -"Ne, samo burek" - uzvratio je, jedva čekajući da zagrize. \ No newline at end of file +"Ne, samo burek" - uzvratio je, jedva čekajući da zagrize. +I tada joj je ispao jogurt. \ No newline at end of file From 589c4b82b7e81bdc4e7a39b4961acef89dce0eea Mon Sep 17 00:00:00 2001 From: Julien Granier Date: Sun, 17 Jan 2016 18:44:55 +0200 Subject: [PATCH 2184/5486] Adding new story branch about a chocolate door --- french/dessine/chocolat/essayer-ouvrir-chocolat.md | 4 ++++ french/dessine/porte.md | 1 + 2 files changed, 5 insertions(+) create mode 100644 french/dessine/chocolat/essayer-ouvrir-chocolat.md diff --git a/french/dessine/chocolat/essayer-ouvrir-chocolat.md b/french/dessine/chocolat/essayer-ouvrir-chocolat.md new file mode 100644 index 0000000000..9bf117e610 --- /dev/null +++ b/french/dessine/chocolat/essayer-ouvrir-chocolat.md @@ -0,0 +1,4 @@ +Vous essayez de toutes vos forces mais en vain... La port en chocolat ne bouge pas ! +Et comme il fallait s'y attendre la poignée commence même à fondre. + +[Vous décidez de retourner manger cette porte en miel](miel/manger-du-miel.md) \ No newline at end of file diff --git a/french/dessine/porte.md b/french/dessine/porte.md index bfc987abbd..4b5bf8604b 100644 --- a/french/dessine/porte.md +++ b/french/dessine/porte.md @@ -3,5 +3,6 @@ La porte qui m'a attire le plus est la porte dessinee avec du miel. Elle brillai Donc je decide de [Manger un peu de miel](miel/manger-du-miel.md) +[Essayer d'ouvrir la porte faite de chocolat](chocolat/essayer-ouvrir-chocolat.md) From 32e793c48f2cfeaa409d79fd13a76658e05292cf Mon Sep 17 00:00:00 2001 From: oCakeBn Date: Sun, 17 Jan 2016 17:45:34 +0100 Subject: [PATCH 2185/5486] Plot twist it is 1 --- serbian/burekMeso/burekMeso.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/serbian/burekMeso/burekMeso.md b/serbian/burekMeso/burekMeso.md index 09b67a5b20..3791858b43 100644 --- a/serbian/burekMeso/burekMeso.md +++ b/serbian/burekMeso/burekMeso.md @@ -1,2 +1 @@ -"Ne, samo burek" - uzvratio je, jedva čekajući da zagrize. -I tada joj je ispao jogurt. \ No newline at end of file +"Ne, samo burek" - uzvratio je, jedva čekajući da zagrize.I tada joj je ispao jogurt. \ No newline at end of file From 07481bb68e2527925fcbf822a2bde6950148cc1a Mon Sep 17 00:00:00 2001 From: oCakeBn Date: Sun, 17 Jan 2016 17:50:40 +0100 Subject: [PATCH 2186/5486] plot twist --- serbian/start.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/serbian/start.md b/serbian/start.md index a976fda059..1abb5d2c32 100644 --- a/serbian/start.md +++ b/serbian/start.md @@ -7,3 +7,5 @@ Mlada radnica ga je ljubazno gledala. Rekla je: "Nažalost nemamo s mesom ali ima odličan sa sirom" [klikni ovde](burekSir/burekSir.md) "Želite li i jogurt ?" [klikni ovde](burekMeso/burekMeso.md) + +"Ili mozda dva ?" \ No newline at end of file From 5bcd5325bde00b5f25223856edccdc8caa76adc3 Mon Sep 17 00:00:00 2001 From: oCakeBn Date: Sun, 17 Jan 2016 17:56:56 +0100 Subject: [PATCH 2187/5486] Ispravka --- serbian/burekMeso/burekMeso.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serbian/burekMeso/burekMeso.md b/serbian/burekMeso/burekMeso.md index 3791858b43..3aaa0d5645 100644 --- a/serbian/burekMeso/burekMeso.md +++ b/serbian/burekMeso/burekMeso.md @@ -1 +1 @@ -"Ne, samo burek" - uzvratio je, jedva čekajući da zagrize.I tada joj je ispao jogurt. \ No newline at end of file +"Ne, samo burek" - uzvratio je, jedva čekajući da zagrize. From adb7d1a37b31f8064ddc388824cdc487a3b0d6e1 Mon Sep 17 00:00:00 2001 From: oCakeBn Date: Sun, 17 Jan 2016 18:15:39 +0100 Subject: [PATCH 2188/5486] Ostavi mogucnost novog dodavanja --- serbian/start.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serbian/start.md b/serbian/start.md index 1abb5d2c32..5e18a56eca 100644 --- a/serbian/start.md +++ b/serbian/start.md @@ -8,4 +8,4 @@ Mlada radnica ga je ljubazno gledala. Rekla je: "Želite li i jogurt ?" [klikni ovde](burekMeso/burekMeso.md) -"Ili mozda dva ?" \ No newline at end of file +"Ili mozda dva ?" From 85850607dd687754791a53b5555f676b210b0c95 Mon Sep 17 00:00:00 2001 From: oCakeBn Date: Sun, 17 Jan 2016 18:25:01 +0100 Subject: [PATCH 2189/5486] Ostavi praznu liniju kad zavrsis! --- serbian/noveIdeje/noveIdeje.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 serbian/noveIdeje/noveIdeje.txt diff --git a/serbian/noveIdeje/noveIdeje.txt b/serbian/noveIdeje/noveIdeje.txt new file mode 100644 index 0000000000..ba39116aa5 --- /dev/null +++ b/serbian/noveIdeje/noveIdeje.txt @@ -0,0 +1 @@ +"Ali vec sam ti rekao"-uzviknuo sam ljutito. From a2b51fca99473dfd7d94903b19206d8b2960d7fa Mon Sep 17 00:00:00 2001 From: oCakeBn Date: Sun, 17 Jan 2016 18:32:13 +0100 Subject: [PATCH 2190/5486] Uvek stavi .md fajl --- serbian/noveIdeje/{noveIdeje.txt => noveIdeje.md} | 1 + 1 file changed, 1 insertion(+) rename serbian/noveIdeje/{noveIdeje.txt => noveIdeje.md} (97%) diff --git a/serbian/noveIdeje/noveIdeje.txt b/serbian/noveIdeje/noveIdeje.md similarity index 97% rename from serbian/noveIdeje/noveIdeje.txt rename to serbian/noveIdeje/noveIdeje.md index ba39116aa5..9437993984 100644 --- a/serbian/noveIdeje/noveIdeje.txt +++ b/serbian/noveIdeje/noveIdeje.md @@ -1 +1,2 @@ "Ali vec sam ti rekao"-uzviknuo sam ljutito. + From edae3d85e7e3dac5d10cbc7d76c91dee3ec71974 Mon Sep 17 00:00:00 2001 From: oCakeBn Date: Sun, 17 Jan 2016 18:34:17 +0100 Subject: [PATCH 2191/5486] Ostavi praznu liniju --- serbian/start.md | 1 + 1 file changed, 1 insertion(+) diff --git a/serbian/start.md b/serbian/start.md index 5e18a56eca..431be50168 100644 --- a/serbian/start.md +++ b/serbian/start.md @@ -9,3 +9,4 @@ Mlada radnica ga je ljubazno gledala. Rekla je: "Želite li i jogurt ?" [klikni ovde](burekMeso/burekMeso.md) "Ili mozda dva ?" +"Ili mozda tri?"[klikni ovde](noveIdeje/noveIdeje.md) From 94f5cadb7852107a31857f4ce3973969178b4039 Mon Sep 17 00:00:00 2001 From: Michal Lutoborski Date: Sun, 17 Jan 2016 21:19:26 +0100 Subject: [PATCH 2192/5486] =?UTF-8?q?docs:=20Luti=20tu=20by=C5=82=20;)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Polish/przygoda/jedzenie/wiedzmin/placki/placki.md | 2 ++ Polish/przygoda/jedzenie/wiedzmin/polska/polska.md | 2 ++ Polish/przygoda/jedzenie/wiedzmin/popus/popus.md | 2 ++ Polish/przygoda/jedzenie/wiedzmin/wiedzmin.md | 5 +++++ 4 files changed, 11 insertions(+) create mode 100644 Polish/przygoda/jedzenie/wiedzmin/placki/placki.md create mode 100644 Polish/przygoda/jedzenie/wiedzmin/polska/polska.md create mode 100644 Polish/przygoda/jedzenie/wiedzmin/popus/popus.md diff --git a/Polish/przygoda/jedzenie/wiedzmin/placki/placki.md b/Polish/przygoda/jedzenie/wiedzmin/placki/placki.md new file mode 100644 index 0000000000..0c3b16f82e --- /dev/null +++ b/Polish/przygoda/jedzenie/wiedzmin/placki/placki.md @@ -0,0 +1,2 @@ +Nie pytajac Cie o zdanie, nerd z nadludzka sila ciagnie Cie w strone ciemnego pomieszczenia. +Nie masz wiele czasu, a opcji niewiele. Co robisz?? diff --git a/Polish/przygoda/jedzenie/wiedzmin/polska/polska.md b/Polish/przygoda/jedzenie/wiedzmin/polska/polska.md new file mode 100644 index 0000000000..b4fdb29c57 --- /dev/null +++ b/Polish/przygoda/jedzenie/wiedzmin/polska/polska.md @@ -0,0 +1,2 @@ +Uradowany podskakujesz z radosci i razem idziecie na wybory zaglosowac na Kukiza. +W glebi duszy wiesz, ze to jedyny sluszny wybor w dzisiejszych czasach. \ No newline at end of file diff --git a/Polish/przygoda/jedzenie/wiedzmin/popus/popus.md b/Polish/przygoda/jedzenie/wiedzmin/popus/popus.md new file mode 100644 index 0000000000..24fff0616a --- /dev/null +++ b/Polish/przygoda/jedzenie/wiedzmin/popus/popus.md @@ -0,0 +1,2 @@ +Nagle jak przy porodzie z pizdy wyskakuje Alibaba, a za nim biegnie Popus krzyczac +"Szehrem ehrem ergu myszke, turbany z glw!". Przygladasz sie tej scenie spokojnie: \ No newline at end of file diff --git a/Polish/przygoda/jedzenie/wiedzmin/wiedzmin.md b/Polish/przygoda/jedzenie/wiedzmin/wiedzmin.md index 52153747f5..1454d02bcf 100644 --- a/Polish/przygoda/jedzenie/wiedzmin/wiedzmin.md +++ b/Polish/przygoda/jedzenie/wiedzmin/wiedzmin.md @@ -10,3 +10,8 @@ odwracasz się na pięcie i wchodzisz się do księgarni. Sprzedawca, cybernetyczny, zasuszony hipernerd wita cię tymi słowami: +[Lubię placki! Masz ochotę na placka?] (placki/placki.md) + +[Razem zmienimy Polskę!] (polska/polska.md) + +[Popuś to Ty?] (popus/popus.md) \ No newline at end of file From 7f51c365f6aef2f02474ea20701d23c4a6f8e7d0 Mon Sep 17 00:00:00 2001 From: Michal Lutoborski Date: Sun, 17 Jan 2016 21:35:27 +0100 Subject: [PATCH 2193/5486] docs: Check out spaces for casey --- Polish/przygoda/jedzenie/wiedzmin/wiedzmin.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Polish/przygoda/jedzenie/wiedzmin/wiedzmin.md b/Polish/przygoda/jedzenie/wiedzmin/wiedzmin.md index 1454d02bcf..4814ae30ba 100644 --- a/Polish/przygoda/jedzenie/wiedzmin/wiedzmin.md +++ b/Polish/przygoda/jedzenie/wiedzmin/wiedzmin.md @@ -10,6 +10,7 @@ odwracasz się na pięcie i wchodzisz się do księgarni. Sprzedawca, cybernetyczny, zasuszony hipernerd wita cię tymi słowami: + [Lubię placki! Masz ochotę na placka?] (placki/placki.md) [Razem zmienimy Polskę!] (polska/polska.md) From 65dd843bbbd2cd1521edded93648c990ed15dcb4 Mon Sep 17 00:00:00 2001 From: Angie Kollmer Date: Sun, 17 Jan 2016 14:02:48 -0800 Subject: [PATCH 2194/5486] Add some travel destinations for fall --- english/travel-destinations/fall/fall.md | 5 +++++ english/travel-destinations/travel-destinations.md | 1 + 2 files changed, 6 insertions(+) create mode 100644 english/travel-destinations/fall/fall.md diff --git a/english/travel-destinations/fall/fall.md b/english/travel-destinations/fall/fall.md new file mode 100644 index 0000000000..c58a1adc26 --- /dev/null +++ b/english/travel-destinations/fall/fall.md @@ -0,0 +1,5 @@ +Fall is the time to enjoy nature's amazing color displays known as "fall foliage"! + +Two great national parks for leaf peeping are +the [Blue Ridge Parkway](http://www.nps.gov/blri/index.htm) +and [Acadia](http://www.nps.gov/acad/index.htm) \ No newline at end of file diff --git a/english/travel-destinations/travel-destinations.md b/english/travel-destinations/travel-destinations.md index 1ded76ddb6..403644ba9c 100644 --- a/english/travel-destinations/travel-destinations.md +++ b/english/travel-destinations/travel-destinations.md @@ -3,6 +3,7 @@ It's glorious Spring! Here are some great [destinations](spring/spring.md): It's Summer! Time to explore these places: Fall is a great season to take a vacation in any of these spots: +[fall destinations](fall/fall.md) It's frosty winter.. but these places can be excitng: [winter destinations](winter/winter.md) \ No newline at end of file From 0192f574ca7537c566e8b679e15c8977a5cca256 Mon Sep 17 00:00:00 2001 From: Angie Kollmer Date: Sun, 17 Jan 2016 14:18:01 -0800 Subject: [PATCH 2195/5486] Add blank line between two lines with links --- english/travel-destinations/fall/fall.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/travel-destinations/fall/fall.md b/english/travel-destinations/fall/fall.md index c58a1adc26..8179bd4b11 100644 --- a/english/travel-destinations/fall/fall.md +++ b/english/travel-destinations/fall/fall.md @@ -2,4 +2,5 @@ Fall is the time to enjoy nature's amazing color displays known as "fall foliage Two great national parks for leaf peeping are the [Blue Ridge Parkway](http://www.nps.gov/blri/index.htm) + and [Acadia](http://www.nps.gov/acad/index.htm) \ No newline at end of file From d150993416f5c5a6546684c1fb3e7a498edf149e Mon Sep 17 00:00:00 2001 From: Thomas Weitzel Date: Mon, 18 Jan 2016 10:17:51 +0100 Subject: [PATCH 2196/5486] docs: add text for possible simulation (that's not reality) --- german/Leichen/Leichen.md | 2 ++ german/Leichen/Simulation/Simulation.md | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 german/Leichen/Simulation/Simulation.md diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 4d5a6a83a0..fda398fcfd 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -9,6 +9,8 @@ Schnell, aber unbemerkt versuchen Sie an Land zu kommen, aber es scheint nicht n Was tun Sie? +Ich suche verzweifelt (aber gründlich und systematisch) nach Anzeichen, die darauf hindeuten, dass ich mich in einer [Simulation](Simulation/Simulation.md) befinde. + Ich halte nach etwas [Ausschau](Ausschau/Ausschau.md), an dass ich mich klammern könnte. All meine Kraft geht in meine zunehmend panischen [Schwimmbewegungen](Schwimmbewegungen/Schwimmbewegungen.md). diff --git a/german/Leichen/Simulation/Simulation.md b/german/Leichen/Simulation/Simulation.md new file mode 100644 index 0000000000..242c75ea55 --- /dev/null +++ b/german/Leichen/Simulation/Simulation.md @@ -0,0 +1,7 @@ +Das Ganze ist so abgedreht, dass ich die Mglichkeit in Betracht ziehen muss, es ist nicht real. + +Also versuche ich heraus zu finden, ob ich mich in einer Simulation befinde. Die Mglichkeit, dass es sich um einen Traum handelt habe ich schon ausgeschlossen, indem ich mir krftig ins Gesicht schlug. + +Nachdem ich vergeblich auf krperlich wahrnehmbares Feedback von mglicherweise an meinem Krper angebrachten Gegenstnden - wie einer VR-Brille oder verkabelten Handschuhen - gewartet habe, muss ich mich nach anderen Hinweisen umschauen. + +Deshalb erwge ich folgende Optionen: From 0e61e3858c19597095717974fef4c1c57f765834 Mon Sep 17 00:00:00 2001 From: Jackie CT CHAN Date: Mon, 18 Jan 2016 17:21:17 +0800 Subject: [PATCH 2197/5486] =?UTF-8?q?=E9=82=A3=E4=B8=80=E4=BD=8D=E7=95=B6?= =?UTF-8?q?=E5=AE=B6=E5=96=9C=E6=AD=A1=E8=87=B3=E5=B0=8A=E5=AF=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/ZZB/zzb.md | 2 ++ ...26\234\346\255\241\350\207\263\345\260\212\345\257\266.md" | 4 ++++ ...26\234\346\255\241\350\207\263\345\260\212\345\257\266.md" | 4 ++++ 3 files changed, 10 insertions(+) create mode 100644 "Chinese/ZZB/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266.md" create mode 100644 "Chinese/ZZB/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\266\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\266\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266.md" diff --git a/Chinese/ZZB/zzb.md b/Chinese/ZZB/zzb.md index 1dc116e97a..9137a735db 100644 --- a/Chinese/ZZB/zzb.md +++ b/Chinese/ZZB/zzb.md @@ -12,3 +12,5 @@ 紫霞仙子说： 人都是失去了才懂得珍惜。 + +[那一位當定喜歡至尊寶?](那一位當定喜歡至尊寶/那一位當定喜歡至尊寶.md) diff --git "a/Chinese/ZZB/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266.md" "b/Chinese/ZZB/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266.md" new file mode 100644 index 0000000000..7f27a52c2d --- /dev/null +++ "b/Chinese/ZZB/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266.md" @@ -0,0 +1,4 @@ +那一位當定喜歡至尊寶? +1) 盲丙 +2) 二當家 +3) 三當家 \ No newline at end of file diff --git "a/Chinese/ZZB/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\266\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\266\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266.md" "b/Chinese/ZZB/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\266\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\266\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266.md" new file mode 100644 index 0000000000..99c995193c --- /dev/null +++ "b/Chinese/ZZB/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\266\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\266\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266.md" @@ -0,0 +1,4 @@ +那一位當家喜歡至尊寶? +1) 盲丙 +2) 二當家 +3) 三當家 \ No newline at end of file From 3f00cf422a8e6233eaaa870b3883e0b0db9674da Mon Sep 17 00:00:00 2001 From: Thomas Weitzel Date: Mon, 18 Jan 2016 10:31:31 +0100 Subject: [PATCH 2198/5486] docs: add line breaks for lines longer than 120 characters --- german/Leichen/Leichen.md | 3 ++- german/Leichen/Simulation/Simulation.md | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index fda398fcfd..02fd00b7c3 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -9,7 +9,8 @@ Schnell, aber unbemerkt versuchen Sie an Land zu kommen, aber es scheint nicht n Was tun Sie? -Ich suche verzweifelt (aber gründlich und systematisch) nach Anzeichen, die darauf hindeuten, dass ich mich in einer [Simulation](Simulation/Simulation.md) befinde. +Ich suche verzweifelt (aber gründlich und systematisch) nach Anzeichen, die darauf hindeuten, +dass ich mich in einer [Simulation](Simulation/Simulation.md) befinde. Ich halte nach etwas [Ausschau](Ausschau/Ausschau.md), an dass ich mich klammern könnte. diff --git a/german/Leichen/Simulation/Simulation.md b/german/Leichen/Simulation/Simulation.md index 242c75ea55..1c43cb4b08 100644 --- a/german/Leichen/Simulation/Simulation.md +++ b/german/Leichen/Simulation/Simulation.md @@ -1,7 +1,11 @@ Das Ganze ist so abgedreht, dass ich die Mglichkeit in Betracht ziehen muss, es ist nicht real. -Also versuche ich heraus zu finden, ob ich mich in einer Simulation befinde. Die Mglichkeit, dass es sich um einen Traum handelt habe ich schon ausgeschlossen, indem ich mir krftig ins Gesicht schlug. +Also versuche ich heraus zu finden, ob ich mich in einer Simulation befinde. +Die Mglichkeit, dass es sich um einen Traum handelt habe ich schon ausgeschlossen, +indem ich mir krftig ins Gesicht schlug. -Nachdem ich vergeblich auf krperlich wahrnehmbares Feedback von mglicherweise an meinem Krper angebrachten Gegenstnden - wie einer VR-Brille oder verkabelten Handschuhen - gewartet habe, muss ich mich nach anderen Hinweisen umschauen. +Nachdem ich vergeblich auf krperlich wahrnehmbares Feedback von mglicherweise an meinem Krper +angebrachten Gegenstnden - wie einer VR-Brille oder verkabelten Handschuhen - gewartet habe, +muss ich mich nach anderen Hinweisen umschauen. Deshalb erwge ich folgende Optionen: From 8084998a7f7209ededfdb8282fabef155ffdd94b Mon Sep 17 00:00:00 2001 From: Jackie CT CHAN Date: Mon, 18 Jan 2016 17:43:54 +0800 Subject: [PATCH 2199/5486] =?UTF-8?q?deleted=20file=20=E9=82=A3=E4=B8=80?= =?UTF-8?q?=E4=BD=8D=E7=95=B6=E5=AE=9A=E5=96=9C=E6=AD=A1=E8=87=B3=E5=B0=8A?= =?UTF-8?q?=E5=AF=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...26\234\346\255\241\350\207\263\345\260\212\345\257\266.md" | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 "Chinese/ZZB/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266.md" diff --git "a/Chinese/ZZB/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266.md" "b/Chinese/ZZB/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266.md" deleted file mode 100644 index 7f27a52c2d..0000000000 --- "a/Chinese/ZZB/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266/\351\202\243\344\270\200\344\275\215\347\225\266\345\256\232\345\226\234\346\255\241\350\207\263\345\260\212\345\257\266.md" +++ /dev/null @@ -1,4 +0,0 @@ -那一位當定喜歡至尊寶? -1) 盲丙 -2) 二當家 -3) 三當家 \ No newline at end of file From 0c3ba864358b068432c228dfe4fd12979ddbd20f Mon Sep 17 00:00:00 2001 From: Jackie CT CHAN Date: Mon, 18 Jan 2016 17:50:15 +0800 Subject: [PATCH 2200/5486] fix typo in zzb.md --- Chinese/ZZB/zzb.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/ZZB/zzb.md b/Chinese/ZZB/zzb.md index 9137a735db..d54a0b5df7 100644 --- a/Chinese/ZZB/zzb.md +++ b/Chinese/ZZB/zzb.md @@ -13,4 +13,4 @@ 紫霞仙子说： 人都是失去了才懂得珍惜。 -[那一位當定喜歡至尊寶?](那一位當定喜歡至尊寶/那一位當定喜歡至尊寶.md) +那一位當家喜歡至尊寶?按[此](那一位當家喜歡至尊寶/那一位當家喜歡至尊寶.md)選擇 From 580c5155f6e5d6a3b306bd145f9bb48ae738a68f Mon Sep 17 00:00:00 2001 From: Jessica Miles Date: Mon, 18 Jan 2016 06:34:25 -0500 Subject: [PATCH 2201/5486] feat: Add knitting option to English --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 413654420a..094482830d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -239,6 +239,8 @@ Do you: [Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) +Take out your [knitting project](knit/knit.md) and finish your sock heel turn. + [Realize you are in the ...](in-matrix/matrix.md) [Realize you better call Saul](better-call-saul/saul.md) From 1c1ab2b829284c9f8003d8186f085317f52cfabc Mon Sep 17 00:00:00 2001 From: Jessica Miles Date: Mon, 18 Jan 2016 06:41:44 -0500 Subject: [PATCH 2202/5486] fix: fixed broken knit link --- english/knit/knit.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/knit/knit.md diff --git a/english/knit/knit.md b/english/knit/knit.md new file mode 100644 index 0000000000..cd58af5abc --- /dev/null +++ b/english/knit/knit.md @@ -0,0 +1,3 @@ +There, that's more like it. Nothing like rutning a sock heel to make one feel much better. + +Now to [return to reality](../marshmallow.md) \ No newline at end of file From 71a5bc5b5732fb83cd8424d9d2852debbf59106d Mon Sep 17 00:00:00 2001 From: Jessica Miles Date: Mon, 18 Jan 2016 06:51:45 -0500 Subject: [PATCH 2203/5486] fix: fix spelling mistake in knit --- english/knit/knit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/knit/knit.md b/english/knit/knit.md index cd58af5abc..e83dd35d60 100644 --- a/english/knit/knit.md +++ b/english/knit/knit.md @@ -1,3 +1,3 @@ -There, that's more like it. Nothing like rutning a sock heel to make one feel much better. +There, that's more like it. Nothing like turning a sock heel to make one feel much better. Now to [return to reality](../marshmallow.md) \ No newline at end of file From 467ef3eae7249bb275af03ebdd249824b3f6ce11 Mon Sep 17 00:00:00 2001 From: Jessica Miles Date: Mon, 18 Jan 2016 06:56:39 -0500 Subject: [PATCH 2204/5486] fix: Update spelling mistake to not delete --- english/knit/knit.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/knit/knit.md b/english/knit/knit.md index e83dd35d60..acc86b779c 100644 --- a/english/knit/knit.md +++ b/english/knit/knit.md @@ -1,3 +1,4 @@ -There, that's more like it. Nothing like turning a sock heel to make one feel much better. +There, that's more like it. Nothing like rutning a sock heel to make one feel much better. +And by rutning, I meant turning. Now to [return to reality](../marshmallow.md) \ No newline at end of file From b9ebe7d64a989cc6c3cbcbde700823bd2cbb4a8e Mon Sep 17 00:00:00 2001 From: MGH Date: Mon, 18 Jan 2016 11:22:14 -0800 Subject: [PATCH 2205/5486] Break lines to keep their length <= 80 characters --- espanol/pensamiento/guerra.md | 3 ++- espanol/pensamiento/soluciones/soluciones.md | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/espanol/pensamiento/guerra.md b/espanol/pensamiento/guerra.md index a5c7779a83..eedeac8e42 100644 --- a/espanol/pensamiento/guerra.md +++ b/espanol/pensamiento/guerra.md @@ -9,6 +9,7 @@ Tras terminar con sus lamentaciones: [Se sentó en el suelo y se puso a meditar](meditacion/meditar.md) -Cuando volvi a mirar al cielo, se dio cuenta de que estaba cubierto de nubes. Con tan malos auspicios comenzara la batalla? +Cuando volvi a mirar al cielo, se dio cuenta de que estaba cubierto de nubes. +Con tan malos auspicios comenzara la batalla? [No poda quedarse de brazos cruzados.](soluciones/soluciones.md) \ No newline at end of file diff --git a/espanol/pensamiento/soluciones/soluciones.md b/espanol/pensamiento/soluciones/soluciones.md index c12eee4ca2..8de371014f 100644 --- a/espanol/pensamiento/soluciones/soluciones.md +++ b/espanol/pensamiento/soluciones/soluciones.md @@ -1 +1,3 @@ -Tal vez podría negociar una tregua. Pero, ¿cómo? Nunca había sido un consejero influyente. La mayoría de los miembros de la asamblea lo consideraban demasiado joven e inexperto. \ No newline at end of file +Tal vez podría negociar una tregua. Pero, ¿cómo? Nunca había sido un consejero +influyente. La mayoría de los miembros de la asamblea lo consideraban +demasiado joven e inexperto. \ No newline at end of file From e21f0d6163746a115ffaea8125de2b0e40c7a694 Mon Sep 17 00:00:00 2001 From: biaspoint Date: Mon, 18 Jan 2016 12:16:22 -0800 Subject: [PATCH 2206/5486] add motor oil option to anaylse --- english/analyze/analysis.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/analyze/analysis.md b/english/analyze/analysis.md index d530f9b361..e11f798897 100644 --- a/english/analyze/analysis.md +++ b/english/analyze/analysis.md @@ -1,2 +1,4 @@ Surprisingly, this is not really marshmallow. It only looks like it but in reality it is made out of... -Let me guess, your favorite flavor of marshmallow is avocado; mixed with some [coffee](../coffee/coffee.md) \ No newline at end of file +Let me guess, your favorite flavor of marshmallow is avocado; mixed with some [coffee](../coffee/coffee.md) + +[motor oil](../motor_oil/motor_oil.md) From 0cd5f982075b0657cf8bf3bab85ffe9264de1aab Mon Sep 17 00:00:00 2001 From: biaspoint Date: Mon, 18 Jan 2016 12:17:23 -0800 Subject: [PATCH 2207/5486] add motor oil folder and text --- english/motor_oil/motor_oil.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/motor_oil/motor_oil.md diff --git a/english/motor_oil/motor_oil.md b/english/motor_oil/motor_oil.md new file mode 100644 index 0000000000..702cd228a3 --- /dev/null +++ b/english/motor_oil/motor_oil.md @@ -0,0 +1 @@ +Humans are unable to digest motor oil at this time. We humbly suggest that you do not endeavour to ingest motor oil for the forseable future... including future lives. Your princess is in another castle, you have failed... Good bye. From 3d5e9f915f1cfe3b4b7e432c07e0701af98b83c8 Mon Sep 17 00:00:00 2001 From: biaspoint Date: Mon, 18 Jan 2016 12:25:50 -0800 Subject: [PATCH 2208/5486] changed text to 120 char or less --- english/motor_oil/motor_oil.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/motor_oil/motor_oil.md b/english/motor_oil/motor_oil.md index 702cd228a3..0da1252680 100644 --- a/english/motor_oil/motor_oil.md +++ b/english/motor_oil/motor_oil.md @@ -1 +1,3 @@ -Humans are unable to digest motor oil at this time. We humbly suggest that you do not endeavour to ingest motor oil for the forseable future... including future lives. Your princess is in another castle, you have failed... Good bye. +Humans are unable to digest motor oil at this time. +We humbly suggest that you do not endeavour to ingest motor oil for the forseable future... including future lives. +Your princess is in another castle, you have failed... Good bye. From 5cf47a9ac798a7f0b0bf9a698687153da38d7b6e Mon Sep 17 00:00:00 2001 From: dvdmon Date: Mon, 18 Jan 2016 21:50:34 -0500 Subject: [PATCH 2209/5486] Add Grue page (I'm hungry) --- english/procrastinate/grue/grue.md | 1 + english/procrastinate/procrastinate.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 english/procrastinate/grue/grue.md diff --git a/english/procrastinate/grue/grue.md b/english/procrastinate/grue/grue.md new file mode 100644 index 0000000000..6eefc83894 --- /dev/null +++ b/english/procrastinate/grue/grue.md @@ -0,0 +1 @@ +It is pitch black. You are likely to be eaten by a [grue](http://www.web-adventures.org/cgi-bin/webfrotz?s=ZorkDungeon). \ No newline at end of file diff --git a/english/procrastinate/procrastinate.md b/english/procrastinate/procrastinate.md index b9008013d4..ee16c62746 100644 --- a/english/procrastinate/procrastinate.md +++ b/english/procrastinate/procrastinate.md @@ -10,4 +10,4 @@ do a search for "Wait but why". Read the articles on procrastination. -Have (pseudo) fun in your Dark Playground! +Have (pseudo) fun in your [Dark Playground](grue/grue.md)! From 34a3b57b17ea2143f351887b5bd99f9e70a8a2f7 Mon Sep 17 00:00:00 2001 From: Matthias Ludwig Date: Tue, 19 Jan 2016 08:55:53 -0800 Subject: [PATCH 2210/5486] Added new introduction for someone coming from Saarland --- german/Einladen/Vorstellen/Saarland/aus_dem_Saarland.md | 3 +++ german/Einladen/Vorstellen/vorstellen.md | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 german/Einladen/Vorstellen/Saarland/aus_dem_Saarland.md diff --git a/german/Einladen/Vorstellen/Saarland/aus_dem_Saarland.md b/german/Einladen/Vorstellen/Saarland/aus_dem_Saarland.md new file mode 100644 index 0000000000..7ca14506b0 --- /dev/null +++ b/german/Einladen/Vorstellen/Saarland/aus_dem_Saarland.md @@ -0,0 +1,3 @@ +"Wie wäre es mit einem Schwenker und einem Stubbi?" + +Sie wissen sofort, Sie kommt aus dem Saarland! \ No newline at end of file diff --git a/german/Einladen/Vorstellen/vorstellen.md b/german/Einladen/Vorstellen/vorstellen.md index 82aa4a5243..1f517448b1 100644 --- a/german/Einladen/Vorstellen/vorstellen.md +++ b/german/Einladen/Vorstellen/vorstellen.md @@ -1,8 +1,12 @@ -Sie antworten "Ich bin ... jetzt kennst Du mich ja. Magst Du ein Bier oder etwas anderes?". Sie lacht. +Sie antworten "Ich bin ... jetzt kennst Du mich ja. Magst Du ein Bier oder etwas anderes?". +Sie lacht. Sie schlgt vor: [Kuchen essen dann Wodka trinken und dann Bier.](MeckPomm/aus_Meckpomm.md) -[Wodka trinken and Currywurst essen.](Berlin/aus_Berlin.md) \ No newline at end of file +[Wodka trinken and Currywurst essen.](Berlin/aus_Berlin.md) + + +[Schwenker essen und Stubbi trinken.](Saarland/aus_dem_Saarland.md) \ No newline at end of file From 8dd427b622b5a205aaead324fd476cf3df96bb22 Mon Sep 17 00:00:00 2001 From: Glauber Vaz Date: Tue, 19 Jan 2016 15:21:18 -0200 Subject: [PATCH 2211/5486] Add choice line --- portugues_pt/mundo/voltaaomundo.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues_pt/mundo/voltaaomundo.md b/portugues_pt/mundo/voltaaomundo.md index 74b42110a8..17548aa67d 100644 --- a/portugues_pt/mundo/voltaaomundo.md +++ b/portugues_pt/mundo/voltaaomundo.md @@ -11,4 +11,6 @@ O que seria este algo faltando? [Invertar](inventar/inventar.md) algo que mudasse a vida de todos para melhor! -[Fundava uma nova Startup](startup/startup.md) \ No newline at end of file +[Fundava uma nova Startup](startup/startup.md) + +Mas no daria para fazer tudo isso. Teria que escolher. From 435ea20091c26d1fd206dc011f336131576a76f7 Mon Sep 17 00:00:00 2001 From: Ian Garmaise Date: Tue, 19 Jan 2016 13:52:46 -0500 Subject: [PATCH 2212/5486] Added single line as part of test --- english/amnesia/amnesia.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/amnesia/amnesia.md b/english/amnesia/amnesia.md index 8abc12006f..135448fdfb 100644 --- a/english/amnesia/amnesia.md +++ b/english/amnesia/amnesia.md @@ -13,3 +13,6 @@ But where am I? I do not know. [Wait, something's coming back to me!](../I'm-batman/batman.md) Amnesia can be freaking awesome sometimes :) + +Or it can be highly disturbing. + From e644859afdcd5df268b23938497476d5a8a19036 Mon Sep 17 00:00:00 2001 From: Martin Wilter Date: Tue, 19 Jan 2016 11:25:45 -0800 Subject: [PATCH 2213/5486] Add link to /habit/yoga-habit.md --- english/yoga/yoga.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/yoga/yoga.md b/english/yoga/yoga.md index a7152914bd..4216877f68 100644 --- a/english/yoga/yoga.md +++ b/english/yoga/yoga.md @@ -24,3 +24,5 @@ You start becoming transcendent. [Set your mind free](../yoga/mind/yoga_mind.md) [Learn to breathe](../yoga/breathe/breathe.md) + +[Building the habit](../yoga/habit/yoga-habit.md) From acd4870d742e2a6ac5edd7a7dc47cf416d0a9860 Mon Sep 17 00:00:00 2001 From: Martin Wilter Date: Tue, 19 Jan 2016 11:43:10 -0800 Subject: [PATCH 2214/5486] Add "Building the habit" ../yoga/habit/yoga-habit.md --- english/yoga/habit/yoga-habit.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/yoga/habit/yoga-habit.md diff --git a/english/yoga/habit/yoga-habit.md b/english/yoga/habit/yoga-habit.md new file mode 100644 index 0000000000..fbfd3c52b4 --- /dev/null +++ b/english/yoga/habit/yoga-habit.md @@ -0,0 +1,2 @@ +It's hard to build a habit of doing yoga on a regular basis. Here are some ways +to make it easier to get going: From ad71d0ec0f7df6006bd9d2afdb38a5fbcb931cbd Mon Sep 17 00:00:00 2001 From: Martin Wilter Date: Tue, 19 Jan 2016 13:12:28 -0800 Subject: [PATCH 2215/5486] Add content --- english/yoga/habit/yoga-habit.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/yoga/habit/yoga-habit.md b/english/yoga/habit/yoga-habit.md index fbfd3c52b4..7737a6f693 100644 --- a/english/yoga/habit/yoga-habit.md +++ b/english/yoga/habit/yoga-habit.md @@ -1,2 +1,4 @@ It's hard to build a habit of doing yoga on a regular basis. Here are some ways to make it easier to get going: + +1. Just do it! \ No newline at end of file From 0a24e5d46dfbc30f264b4fbbcc0324e8a28720d8 Mon Sep 17 00:00:00 2001 From: Julien Granier Date: Wed, 20 Jan 2016 10:24:57 +0200 Subject: [PATCH 2216/5486] Fixing link --- french/dessine/chocolat/essayer-ouvrir-chocolat.md | 2 +- french/dessine/porte.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/french/dessine/chocolat/essayer-ouvrir-chocolat.md b/french/dessine/chocolat/essayer-ouvrir-chocolat.md index 9bf117e610..30ebd02f37 100644 --- a/french/dessine/chocolat/essayer-ouvrir-chocolat.md +++ b/french/dessine/chocolat/essayer-ouvrir-chocolat.md @@ -1,4 +1,4 @@ Vous essayez de toutes vos forces mais en vain... La port en chocolat ne bouge pas ! Et comme il fallait s'y attendre la poignée commence même à fondre. -[Vous décidez de retourner manger cette porte en miel](miel/manger-du-miel.md) \ No newline at end of file +[Vous décidez de retourner manger cette porte en miel](../miel/manger-du-miel.md) \ No newline at end of file diff --git a/french/dessine/porte.md b/french/dessine/porte.md index 4b5bf8604b..9985873031 100644 --- a/french/dessine/porte.md +++ b/french/dessine/porte.md @@ -3,6 +3,7 @@ La porte qui m'a attire le plus est la porte dessinee avec du miel. Elle brillai Donc je decide de [Manger un peu de miel](miel/manger-du-miel.md) + [Essayer d'ouvrir la porte faite de chocolat](chocolat/essayer-ouvrir-chocolat.md) From b9ad2cb55cb1a1dba2c283cd7fdef093eeeaa29a Mon Sep 17 00:00:00 2001 From: Stella Jiang Date: Wed, 20 Jan 2016 12:26:45 -0500 Subject: [PATCH 2217/5486] Add my own story --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 0227134d67..5840ef3a58 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -88,4 +88,6 @@ [little_prince](little_prince/this_is_a_story_about_a_boy.md) -[陳奕迅](Eason_Chan/Eason_Chan.md) \ No newline at end of file +[陳奕迅](Eason_Chan/Eason_Chan.md) + +[鹿晗] （luhan／luhan.md) \ No newline at end of file From 3089b1ff66d64e0bb5df82512a317dee0180074c Mon Sep 17 00:00:00 2001 From: Stella Jiang Date: Wed, 20 Jan 2016 12:28:35 -0500 Subject: [PATCH 2218/5486] Add the file of my story, luhan.md --- Chinese/luhan/luhan.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/luhan/luhan.md diff --git a/Chinese/luhan/luhan.md b/Chinese/luhan/luhan.md new file mode 100644 index 0000000000..85ed2984a6 --- /dev/null +++ b/Chinese/luhan/luhan.md @@ -0,0 +1 @@ +孙悟空变成了鹿晗，参加了跑男，萌萌哒的样子迷遍万千少女。 \ No newline at end of file From c0ecba69cca8e1bb505c98cd1576dde90bbe81c1 Mon Sep 17 00:00:00 2001 From: Stella Jiang Date: Wed, 20 Jan 2016 12:33:02 -0500 Subject: [PATCH 2219/5486] =?UTF-8?q?Update=20=E5=A4=A7=E8=AF=9D=E8=A5=BF?= =?UTF-8?q?=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 5840ef3a58..c0eb635444 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -90,4 +90,4 @@ [陳奕迅](Eason_Chan/Eason_Chan.md) -[鹿晗] （luhan／luhan.md) \ No newline at end of file +[鹿晗](luhan/luhan.md) \ No newline at end of file From 11ee0014338b2ddfe8feca6bcdb19114c67121c5 Mon Sep 17 00:00:00 2001 From: Stella Jiang Date: Wed, 20 Jan 2016 12:44:08 -0500 Subject: [PATCH 2220/5486] Try to create a conflict --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 -- 1 file changed, 2 deletions(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index c0eb635444..355ae01839 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -88,6 +88,4 @@ [little_prince](little_prince/this_is_a_story_about_a_boy.md) -[陳奕迅](Eason_Chan/Eason_Chan.md) - [鹿晗](luhan/luhan.md) \ No newline at end of file From 17de4cb583748424d6f74ebe456948b10ebdb2aa Mon Sep 17 00:00:00 2001 From: Stella Jiang Date: Wed, 20 Jan 2016 12:48:15 -0500 Subject: [PATCH 2221/5486] Fix the conflict --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 355ae01839..c0eb635444 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -88,4 +88,6 @@ [little_prince](little_prince/this_is_a_story_about_a_boy.md) +[陳奕迅](Eason_Chan/Eason_Chan.md) + [鹿晗](luhan/luhan.md) \ No newline at end of file From 507d453355ece0475777236b155e295bf62b06d7 Mon Sep 17 00:00:00 2001 From: Alexey Volovikov Date: Wed, 20 Jan 2016 23:12:47 +0200 Subject: [PATCH 2222/5486] Add a new russian story page --- russian/draw-curtain/drawing-curtain.md | 5 +++++ russian/next_room/next_room.md | 6 +++++- russian/zefir.md | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 russian/draw-curtain/drawing-curtain.md diff --git a/russian/draw-curtain/drawing-curtain.md b/russian/draw-curtain/drawing-curtain.md new file mode 100644 index 0000000000..77036df068 --- /dev/null +++ b/russian/draw-curtain/drawing-curtain.md @@ -0,0 +1,5 @@ +Вы задергиваете занавеску на окне. В комнате стало темно. Ваши действия: + +[Вернуться ко сну](../sleep/zefir.md) + +[Пойти в другую комнату](../next_room/next_room.md) diff --git a/russian/next_room/next_room.md b/russian/next_room/next_room.md index cdcadc21b5..e09a88286b 100644 --- a/russian/next_room/next_room.md +++ b/russian/next_room/next_room.md @@ -1 +1,5 @@ -Здесь пустота. +Здесь пустота. Ваши действия: + +[Почесать в подмышечной впадине](../scratch/scratch.md) + +[Попытаться проснуться](../awaken/awaken.md) diff --git a/russian/zefir.md b/russian/zefir.md index f3ba048f64..8d1333ad5d 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -12,6 +12,8 @@ [Открыть окно](window/window.md) +[Задернуть занавеску](draw-curtain/drawing-curtain.md) + [Поразмышляете о причинах вашей неожиданной смерти и природе сознания.](thinking-about/thinking.md) [Начнёте есть стены.](eating-walls/eating-marshmallows.md) From 268fc49a64db81e0afcce3d989b549ff2fcf25c2 Mon Sep 17 00:00:00 2001 From: Alexey Volovikov Date: Wed, 20 Jan 2016 23:26:34 +0200 Subject: [PATCH 2223/5486] Fix typos --- russian/next_room/next_room.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/next_room/next_room.md b/russian/next_room/next_room.md index e09a88286b..bd0b57d060 100644 --- a/russian/next_room/next_room.md +++ b/russian/next_room/next_room.md @@ -1,4 +1,6 @@ -Здесь пустота. Ваши действия: +Здесь пустота. + +Ваши действия: [Почесать в подмышечной впадине](../scratch/scratch.md) From dc2a063969d7d1fab42487e9e4ccbceffccc508d Mon Sep 17 00:00:00 2001 From: Fredrik Wegelid Date: Thu, 21 Jan 2016 01:49:46 +0100 Subject: [PATCH 2224/5486] Add new options to the Swedish storyline --- swedish/titta-ut/macka/macka.md | 1 + swedish/titta-ut/titta-ut.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 swedish/titta-ut/macka/macka.md diff --git a/swedish/titta-ut/macka/macka.md b/swedish/titta-ut/macka/macka.md new file mode 100644 index 0000000000..f53ea37846 --- /dev/null +++ b/swedish/titta-ut/macka/macka.md @@ -0,0 +1 @@ +Du går till köket för att göra dig en macka. Väl där hittar du samtliga ingredienser som behövs och äter din nyligen förberedda delikatess i lugn och ro. \ No newline at end of file diff --git a/swedish/titta-ut/titta-ut.md b/swedish/titta-ut/titta-ut.md index 99c3b3194c..eef227b930 100644 --- a/swedish/titta-ut/titta-ut.md +++ b/swedish/titta-ut/titta-ut.md @@ -6,3 +6,5 @@ Efter att ha övervägt din situation väljer du att [lägga dig och sova igen](../start.md) +[göra dig en macka](..macka.md) + From fd549d75fb3212a99273af970a2f20ccb0735126 Mon Sep 17 00:00:00 2001 From: Fredrik Wegelid Date: Thu, 21 Jan 2016 01:53:13 +0100 Subject: [PATCH 2225/5486] Fix wrong link --- swedish/titta-ut/titta-ut.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swedish/titta-ut/titta-ut.md b/swedish/titta-ut/titta-ut.md index eef227b930..7c8bdee707 100644 --- a/swedish/titta-ut/titta-ut.md +++ b/swedish/titta-ut/titta-ut.md @@ -6,5 +6,5 @@ Efter att ha övervägt din situation väljer du att [lägga dig och sova igen](../start.md) -[göra dig en macka](..macka.md) +[göra dig en macka](macka/macka.md) From a338242dfedea35230695c042762a76bc9308149 Mon Sep 17 00:00:00 2001 From: Fredrik Wegelid Date: Thu, 21 Jan 2016 02:00:00 +0100 Subject: [PATCH 2226/5486] Add line break to avoid more than 120 characters in one line. --- swedish/titta-ut/macka/macka.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/swedish/titta-ut/macka/macka.md b/swedish/titta-ut/macka/macka.md index f53ea37846..67d391b58e 100644 --- a/swedish/titta-ut/macka/macka.md +++ b/swedish/titta-ut/macka/macka.md @@ -1 +1,3 @@ -Du går till köket för att göra dig en macka. Väl där hittar du samtliga ingredienser som behövs och äter din nyligen förberedda delikatess i lugn och ro. \ No newline at end of file +Du går till köket för att göra dig en macka. Väl där hittar du +samtliga ingredienser som behövs och äter din nyligen förberedda +delikatess i lugn och ro. \ No newline at end of file From 1b205d28301d41c8c931d33125383fd817a9268d Mon Sep 17 00:00:00 2001 From: dhpdx Date: Wed, 20 Jan 2016 19:26:49 -0800 Subject: [PATCH 2227/5486] Added a room for the Titanic fans. --- english/go-back-to-sleep/go-back-to-sleep.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/go-back-to-sleep/go-back-to-sleep.md b/english/go-back-to-sleep/go-back-to-sleep.md index 2a866e5d4c..319ba85da0 100644 --- a/english/go-back-to-sleep/go-back-to-sleep.md +++ b/english/go-back-to-sleep/go-back-to-sleep.md @@ -13,4 +13,6 @@ You want to say something to him but you draw a blank. The only movie you can think of that he was in is "Basketball Diaries". -So you just smile and keep going. \ No newline at end of file +So you just smile and keep going. + +But suddenly, you're on a boat. A huge boat. A [doomed](./imflying/titanic.md) boat? \ No newline at end of file From 4ddb6692e286f37f85f0ae7ba264c28021a7fdfd Mon Sep 17 00:00:00 2001 From: Posto1 Date: Thu, 21 Jan 2016 03:33:57 +0000 Subject: [PATCH 2228/5486] add 'sup?' --- english/2spooky/2spooky.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index 856e8cd5bf..05e3c9b12e 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -8,6 +8,8 @@ mr. skeltal is nice! hahahaha +'sup? + no your face! [Go back to sleep.](../sleep/marshmallow.md) From 72942d0053126f526cbf3cc2e28273a99ecec3db Mon Sep 17 00:00:00 2001 From: dhpdx Date: Wed, 20 Jan 2016 19:46:51 -0800 Subject: [PATCH 2229/5486] Add Titanic file. --- english/go-back-to-sleep/imflying/titanic.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/go-back-to-sleep/imflying/titanic.md diff --git a/english/go-back-to-sleep/imflying/titanic.md b/english/go-back-to-sleep/imflying/titanic.md new file mode 100644 index 0000000000..da3c160827 --- /dev/null +++ b/english/go-back-to-sleep/imflying/titanic.md @@ -0,0 +1,5 @@ +The smell of the ocean water. + +The sounds of the lapping waves. + +You have nothing to fear; it's unsinkable! \ No newline at end of file From cc94d9d0d13d9f2411d6d1edc42227f40998929d Mon Sep 17 00:00:00 2001 From: Max Budziak II Date: Wed, 20 Jan 2016 20:31:58 -0800 Subject: [PATCH 2230/5486] Add Build a Car --- english/build-a-car/build-a-car.md | 5 +++++ english/marshmallow.md | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/build-a-car/build-a-car.md diff --git a/english/build-a-car/build-a-car.md b/english/build-a-car/build-a-car.md new file mode 100644 index 0000000000..62847aa58c --- /dev/null +++ b/english/build-a-car/build-a-car.md @@ -0,0 +1,5 @@ +Make the body. Make the frame. Add some paint. +Build the interior. Build the chassis. +Add a motor. Add the wheels. + +[Drive your new car back to the story](../marshmallow.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 094482830d..81b0a34802 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -734,4 +734,6 @@ Instead of reading this entire story, you decide to go see the new star wars! You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). -[Do you have my stapler?](stapler/stapler.md) \ No newline at end of file +[Do you have my stapler?](stapler/stapler.md) + +[Build a car](build-a-car/build-a-car.md) \ No newline at end of file From d5f23e39e4a4a831598d7aa20ba2a9ce631dbfac Mon Sep 17 00:00:00 2001 From: smashzen Date: Thu, 21 Jan 2016 09:47:24 -0600 Subject: [PATCH 2231/5486] Add penguins --- english/private-party-island/island.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/private-party-island/island.md b/english/private-party-island/island.md index 8038119086..6abfdd23b4 100644 --- a/english/private-party-island/island.md +++ b/english/private-party-island/island.md @@ -1,5 +1,7 @@ Toronto wins, the 1992 flashback payed off. +Forty-four penguins frolic on the rocky outcrop. + After many nights of partying you find yourself worn out by the game and are ready to go back to work. [Before you leave, you should really relieve yourself](../eating-walls/find-a-toilet/find-a-toilet.md) From 8f9a56d3fce3646270c1783bed488ae5139d3fec Mon Sep 17 00:00:00 2001 From: Recvec Date: Thu, 21 Jan 2016 21:26:17 +0200 Subject: [PATCH 2232/5486] Add sequel of conspiracy --- ukrainian/old-photo/conspiracy/call/call.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 ukrainian/old-photo/conspiracy/call/call.md diff --git a/ukrainian/old-photo/conspiracy/call/call.md b/ukrainian/old-photo/conspiracy/call/call.md new file mode 100644 index 0000000000..d0817999cf --- /dev/null +++ b/ukrainian/old-photo/conspiracy/call/call.md @@ -0,0 +1 @@ +Після кількасекундних гудків ви почули свій власний голос по ту сторону. From ad800e5ada591122917af20ac4826c112cb650ce Mon Sep 17 00:00:00 2001 From: Recvec Date: Thu, 21 Jan 2016 21:28:23 +0200 Subject: [PATCH 2233/5486] Add options to conspiracy.md --- ukrainian/old-photo/conspiracy/conspiracy.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ukrainian/old-photo/conspiracy/conspiracy.md b/ukrainian/old-photo/conspiracy/conspiracy.md index 587f025b98..194bbc0b60 100644 --- a/ukrainian/old-photo/conspiracy/conspiracy.md +++ b/ukrainian/old-photo/conspiracy/conspiracy.md @@ -1 +1,5 @@ -На звороті номер телефону ... \ No newline at end of file +На звороті номер телефону ... + +[Лягти спати](ukrainian/marshmallow.md) + +[Подзвонити на номер](call/call.md ) From 5657239dba090910733912cbbd14b653b5e28ebe Mon Sep 17 00:00:00 2001 From: Recvec Date: Thu, 21 Jan 2016 21:32:18 +0200 Subject: [PATCH 2234/5486] Delete one of options --- ukrainian/old-photo/conspiracy/conspiracy.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/ukrainian/old-photo/conspiracy/conspiracy.md b/ukrainian/old-photo/conspiracy/conspiracy.md index 194bbc0b60..d7fb01c279 100644 --- a/ukrainian/old-photo/conspiracy/conspiracy.md +++ b/ukrainian/old-photo/conspiracy/conspiracy.md @@ -1,5 +1,3 @@ На звороті номер телефону ... -[Лягти спати](ukrainian/marshmallow.md) - [Подзвонити на номер](call/call.md ) From d176e0985a94cdbcb1336ecd43180da85b7bf475 Mon Sep 17 00:00:00 2001 From: Michael Overman Date: Thu, 21 Jan 2016 14:57:21 -0500 Subject: [PATCH 2235/5486] add tiger interaction --- english/forest/scream/run/run.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/forest/scream/run/run.md b/english/forest/scream/run/run.md index 9352234e92..5524dfe638 100644 --- a/english/forest/scream/run/run.md +++ b/english/forest/scream/run/run.md @@ -1,2 +1,4 @@ Since you know you cannot outrun a tiger. You decide to run toward it -making as much noise as possible in a way to scare it off!! \ No newline at end of file +making as much noise as possible in a way to scare it off!! +The tiger tilts its head slightly to the left and watches you with that +curious expression so typical of three year olds. When you reach the tiger it lifts an expectant paw, and.... \ No newline at end of file From b715d5155a260717df71dd8ab7d2ea8d6387f039 Mon Sep 17 00:00:00 2001 From: Martin Wilter Date: Thu, 21 Jan 2016 15:59:14 -0800 Subject: [PATCH 2236/5486] Add content --- english/yoga/habit/yoga-habit.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/yoga/habit/yoga-habit.md b/english/yoga/habit/yoga-habit.md index 7737a6f693..0e375cc081 100644 --- a/english/yoga/habit/yoga-habit.md +++ b/english/yoga/habit/yoga-habit.md @@ -1,4 +1,5 @@ It's hard to build a habit of doing yoga on a regular basis. Here are some ways to make it easier to get going: -1. Just do it! \ No newline at end of file +1. Just do it! +2. Get a yoga partner From 42741ddf599aa33dc91c2387a6a51469dae6fde5 Mon Sep 17 00:00:00 2001 From: Martin Wilter Date: Thu, 21 Jan 2016 16:32:52 -0800 Subject: [PATCH 2237/5486] Change wording --- english/yoga/habit/yoga-habit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/yoga/habit/yoga-habit.md b/english/yoga/habit/yoga-habit.md index 0e375cc081..11e1e4e02b 100644 --- a/english/yoga/habit/yoga-habit.md +++ b/english/yoga/habit/yoga-habit.md @@ -1,5 +1,5 @@ It's hard to build a habit of doing yoga on a regular basis. Here are some ways to make it easier to get going: -1. Just do it! +1. Just do it!!! 2. Get a yoga partner From fa03a8e79e97c568bb713baee9f3e748c422824d Mon Sep 17 00:00:00 2001 From: Martin Wilter Date: Thu, 21 Jan 2016 16:36:33 -0800 Subject: [PATCH 2238/5486] Undo change of wording Tried to update wording of "1. Just do it!" by adding additional exclamation marks. This was rejected by Casey Collaborator. Resolves: #3339 --- english/yoga/habit/yoga-habit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/yoga/habit/yoga-habit.md b/english/yoga/habit/yoga-habit.md index 11e1e4e02b..0e375cc081 100644 --- a/english/yoga/habit/yoga-habit.md +++ b/english/yoga/habit/yoga-habit.md @@ -1,5 +1,5 @@ It's hard to build a habit of doing yoga on a regular basis. Here are some ways to make it easier to get going: -1. Just do it!!! +1. Just do it! 2. Get a yoga partner From 5dcea7910e182877d0118ec802dcd8c5f8d21f2c Mon Sep 17 00:00:00 2001 From: Alessandro Luongo Date: Fri, 22 Jan 2016 03:50:25 +0100 Subject: [PATCH 2239/5486] add a refreshing sentence --- english/pokemon/pikachu_wins.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/pokemon/pikachu_wins.md b/english/pokemon/pikachu_wins.md index 4c6724e54d..12192ae676 100644 --- a/english/pokemon/pikachu_wins.md +++ b/english/pokemon/pikachu_wins.md @@ -1,6 +1,6 @@ You bring out your Pikachu and Pikachu uses thunderbolt on the marshmallow! You win! To celebrate, you take a moment to pull out some graham crackers and chocolate -and make smores. +and make smores. You feel refreshed and everything is ok. However, you don't get to enjoy your victory for long. You awake from your dream and realize that Pikachu isn't real but the marshmallow nightmare is still a problem. What will you do next? @@ -15,4 +15,4 @@ Hint: you're a lyrical wordsmith [Write a hit song](../hit-song/hit-song.md) -[buy a gameboy] (../buy-gameboy/buy-gameboy.md) \ No newline at end of file +[buy a gameboy] (../buy-gameboy/buy-gameboy.md) From 1f6b3a3bec1e5aa94a39ca5d7280c963adc6bc08 Mon Sep 17 00:00:00 2001 From: Alessandro Luongo Date: Fri, 22 Jan 2016 03:54:36 +0100 Subject: [PATCH 2240/5486] add a refreshing sentence, on a new line --- english/pokemon/pikachu_wins.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/pokemon/pikachu_wins.md b/english/pokemon/pikachu_wins.md index 12192ae676..16469da677 100644 --- a/english/pokemon/pikachu_wins.md +++ b/english/pokemon/pikachu_wins.md @@ -1,6 +1,7 @@ You bring out your Pikachu and Pikachu uses thunderbolt on the marshmallow! You win! To celebrate, you take a moment to pull out some graham crackers and chocolate -and make smores. You feel refreshed and everything is ok. +and make smores. +You feel refreshed and everything is ok. However, you don't get to enjoy your victory for long. You awake from your dream and realize that Pikachu isn't real but the marshmallow nightmare is still a problem. What will you do next? From 86264e6238ecce64ff710b2b7bb1f994c13ed5d6 Mon Sep 17 00:00:00 2001 From: Alessandro Luongo Date: Fri, 22 Jan 2016 03:57:20 +0100 Subject: [PATCH 2241/5486] add a refreshing sentence, on a new line 3 --- english/pokemon/pikachu_wins.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/pokemon/pikachu_wins.md b/english/pokemon/pikachu_wins.md index 16469da677..7fac84e64b 100644 --- a/english/pokemon/pikachu_wins.md +++ b/english/pokemon/pikachu_wins.md @@ -1,6 +1,6 @@ You bring out your Pikachu and Pikachu uses thunderbolt on the marshmallow! You win! To celebrate, you take a moment to pull out some graham crackers and chocolate -and make smores. +and make smores. You feel refreshed and everything is ok. However, you don't get to enjoy your victory for long. You awake from your dream and From 2805ac1e32b41dfd4ab8ae44d10980f0bca7e92e Mon Sep 17 00:00:00 2001 From: Titus Faber Date: Fri, 22 Jan 2016 01:36:55 -0800 Subject: [PATCH 2242/5486] Add additional link on yoa_mind.md --- english/yoga/mind/yoga_mind.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/yoga/mind/yoga_mind.md b/english/yoga/mind/yoga_mind.md index 4c9f197736..b143239fc8 100644 --- a/english/yoga/mind/yoga_mind.md +++ b/english/yoga/mind/yoga_mind.md @@ -7,3 +7,9 @@ Want to know about Yoga lifestyle? Click [here](../lifestyle/yoga_lifestyle.md) Most people have discovered that exercising can lift their mood. Meditation is simply training your mind to focus and concentrate + +However, you are now calm and just as you begin to meditate you notice you are suddenly in a strange room with marshmallows for walls. + +Marshmallows smell funny. What is a marshmallow anyway? + +Unexpectedly, the Chief Marshmallow demands to see your [references](../../references/references.md) \ No newline at end of file From 19558aff3bd177331ac0daad5e4bee330bc2c769 Mon Sep 17 00:00:00 2001 From: Joy Date: Fri, 22 Jan 2016 22:00:46 +0800 Subject: [PATCH 2243/5486] =?UTF-8?q?add=20an=20option=20"the=20right=20wa?= =?UTF-8?q?y"=20for=20=E6=96=97=E6=88=98=E8=83=9C=E4=BD=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../\346\226\227\346\210\230\350\203\234\344\275\233.md" | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git "a/Chinese/\346\226\227\346\210\230\350\203\234\344\275\233/\346\226\227\346\210\230\350\203\234\344\275\233.md" "b/Chinese/\346\226\227\346\210\230\350\203\234\344\275\233/\346\226\227\346\210\230\350\203\234\344\275\233.md" index 21ada5b27d..9d543e3549 100644 --- "a/Chinese/\346\226\227\346\210\230\350\203\234\344\275\233/\346\226\227\346\210\230\350\203\234\344\275\233.md" +++ "b/Chinese/\346\226\227\346\210\230\350\203\234\344\275\233/\346\226\227\346\210\230\350\203\234\344\275\233.md" @@ -1 +1,4 @@ -孙悟空取经回来后，就变成了斗战胜佛！他从一个叛逆者，历经千辛万苦终于成了一个体制内的人，可是沿途的妖怪那么轻松就成仙成佛了，这个世界跟对人十分重要啊！ \ No newline at end of file +孙悟空取经回来后，就变成了斗战胜佛！他从一个叛逆者，历经千辛万苦终于成了一个体制内的人，可是沿途的妖怪那么轻松就成仙成佛了，这个世界跟对人十分重要啊！ + +转瞬千年，沧海桑田。2016年是猴年，悟空在这千年中又悟出了一个新的道理： +［这个世界做事选对方向也很重要啊！］(../the-right-way/to_be_a_coder.md) \ No newline at end of file From 72b68532193ad833cd884285467dc44b7386b17e Mon Sep 17 00:00:00 2001 From: Joy Date: Fri, 22 Jan 2016 22:10:42 +0800 Subject: [PATCH 2244/5486] =?UTF-8?q?=E6=82=9F=E7=A9=BA=E5=BD=93=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=8C=BF=E5=A5=BD=E4=B8=8D=E5=A5=BD=EF=BC=9F=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E8=BF=9B=E5=85=A5=E7=94=9F=E7=89=A9=E8=A1=8C=E4=B8=9A?= =?UTF-8?q?=E5=91=A2=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/the-right-way/to_be_a_coder.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Chinese/the-right-way/to_be_a_coder.md diff --git a/Chinese/the-right-way/to_be_a_coder.md b/Chinese/the-right-way/to_be_a_coder.md new file mode 100644 index 0000000000..b882c7e8ca --- /dev/null +++ b/Chinese/the-right-way/to_be_a_coder.md @@ -0,0 +1,7 @@ +悟空在天庭当斗战胜佛当了很多年，这个体制内的差事一直稳定有油水，然而近些年的反贪腐运 +动轰轰烈烈地开展着，日子渐渐变得不好过起来。 + +悟空听人说二十一世纪是生物的时代，但又看到互联网的风口中八戒都能飞起来，一时拿不定主 +意是转行进入 +[生物行业]()， +[还是成为程序猿]()。 \ No newline at end of file From e0d9158947ca0507b70e90d81eb32a1a2588eef0 Mon Sep 17 00:00:00 2001 From: Joy Date: Fri, 22 Jan 2016 22:15:33 +0800 Subject: [PATCH 2245/5486] =?UTF-8?q?fix=20link=20bug=20in=20=E6=96=97?= =?UTF-8?q?=E6=88=98=E8=83=9C=E4=BD=9B.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../\346\226\227\346\210\230\350\203\234\344\275\233.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Chinese/\346\226\227\346\210\230\350\203\234\344\275\233/\346\226\227\346\210\230\350\203\234\344\275\233.md" "b/Chinese/\346\226\227\346\210\230\350\203\234\344\275\233/\346\226\227\346\210\230\350\203\234\344\275\233.md" index 9d543e3549..1c04cdb543 100644 --- "a/Chinese/\346\226\227\346\210\230\350\203\234\344\275\233/\346\226\227\346\210\230\350\203\234\344\275\233.md" +++ "b/Chinese/\346\226\227\346\210\230\350\203\234\344\275\233/\346\226\227\346\210\230\350\203\234\344\275\233.md" @@ -1,4 +1,4 @@ 孙悟空取经回来后，就变成了斗战胜佛！他从一个叛逆者，历经千辛万苦终于成了一个体制内的人，可是沿途的妖怪那么轻松就成仙成佛了，这个世界跟对人十分重要啊！ 转瞬千年，沧海桑田。2016年是猴年，悟空在这千年中又悟出了一个新的道理： -［这个世界做事选对方向也很重要啊！］(../the-right-way/to_be_a_coder.md) \ No newline at end of file +[这个世界做事选对方向也很重要啊！](../the-right-way/to_be_a_coder.md) \ No newline at end of file From 174c11e9f1d1d4130bbce287985e473cbb30a267 Mon Sep 17 00:00:00 2001 From: Joy Date: Fri, 22 Jan 2016 22:29:13 +0800 Subject: [PATCH 2246/5486] remove links in to_be_a_coder.md --- Chinese/the-right-way/to_be_a_coder.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Chinese/the-right-way/to_be_a_coder.md b/Chinese/the-right-way/to_be_a_coder.md index b882c7e8ca..3a0848e210 100644 --- a/Chinese/the-right-way/to_be_a_coder.md +++ b/Chinese/the-right-way/to_be_a_coder.md @@ -2,6 +2,4 @@ 动轰轰烈烈地开展着，日子渐渐变得不好过起来。 悟空听人说二十一世纪是生物的时代，但又看到互联网的风口中八戒都能飞起来，一时拿不定主 -意是转行进入 -[生物行业]()， -[还是成为程序猿]()。 \ No newline at end of file +意是转行进入生物行业，还是成为程序猿。（新作者可以在这里添加新选项） \ No newline at end of file From 00b33d62005ff8f5d708cff30a08ca23bb119f36 Mon Sep 17 00:00:00 2001 From: Joy Date: Fri, 22 Jan 2016 23:17:20 +0800 Subject: [PATCH 2247/5486] add an option of becoming a coder --- Chinese/the-right-way/to_be_a_coder.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/the-right-way/to_be_a_coder.md b/Chinese/the-right-way/to_be_a_coder.md index 3a0848e210..a9b8ec7f79 100644 --- a/Chinese/the-right-way/to_be_a_coder.md +++ b/Chinese/the-right-way/to_be_a_coder.md @@ -2,4 +2,6 @@ 动轰轰烈烈地开展着，日子渐渐变得不好过起来。 悟空听人说二十一世纪是生物的时代，但又看到互联网的风口中八戒都能飞起来，一时拿不定主 -意是转行进入生物行业，还是成为程序猿。（新作者可以在这里添加新选项） \ No newline at end of file +意是转行进入生物行业，还是成为程序猿。（新作者可以在这里添加新选项） + +[成为程序猿，猴——>猿](../monkey-to-coder/monkey_coder.md) \ No newline at end of file From 31477ff050e01c44f60a2eba6167d6eb75d33454 Mon Sep 17 00:00:00 2001 From: Joy Date: Fri, 22 Jan 2016 23:23:13 +0800 Subject: [PATCH 2248/5486] create monkey_coder.md, in which Sun Wukong becomes a coder --- Chinese/monkey-to-coder/monkey_coder.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/monkey-to-coder/monkey_coder.md diff --git a/Chinese/monkey-to-coder/monkey_coder.md b/Chinese/monkey-to-coder/monkey_coder.md new file mode 100644 index 0000000000..8c5e58355b --- /dev/null +++ b/Chinese/monkey-to-coder/monkey_coder.md @@ -0,0 +1 @@ +悟空成为了程序猿。假如当初他选了生物呢？ \ No newline at end of file From bb8239ffef68c90788419fb7664832db69b72af8 Mon Sep 17 00:00:00 2001 From: Garen Hartunian Date: Fri, 22 Jan 2016 11:34:41 -0500 Subject: [PATCH 2249/5486] Add link to the song on youtube --- english/music/add_music.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/music/add_music.md b/english/music/add_music.md index 582ec68a7d..82c2a674ae 100644 --- a/english/music/add_music.md +++ b/english/music/add_music.md @@ -9,3 +9,4 @@ For Kruschev and Kennedy At anytime an invitation You can't decline +[And listen to it too!](https://www.youtube.com/watch?v=2ZBtPf7FOoM) From e10669e71dfe4d2d50c5260313f2689a3da862b9 Mon Sep 17 00:00:00 2001 From: Marcia Schulman Date: Fri, 22 Jan 2016 14:02:47 -0500 Subject: [PATCH 2250/5486] Add option to pray for help --- english/light-fire/succumb/game-over.md | 2 ++ english/light-fire/succumb/get-help/help.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 english/light-fire/succumb/get-help/help.md diff --git a/english/light-fire/succumb/game-over.md b/english/light-fire/succumb/game-over.md index 3542c542dc..4502fd6d0f 100644 --- a/english/light-fire/succumb/game-over.md +++ b/english/light-fire/succumb/game-over.md @@ -8,3 +8,5 @@ help but think about everything you're leaving behind. [Fight the sensation. Claw back to life.](../../marshmallow.md) [Time to find out what heaven is like](../../marshmallow.md) + +[Pray for help](/get-help/help.md) \ No newline at end of file diff --git a/english/light-fire/succumb/get-help/help.md b/english/light-fire/succumb/get-help/help.md new file mode 100644 index 0000000000..ac1d3b7846 --- /dev/null +++ b/english/light-fire/succumb/get-help/help.md @@ -0,0 +1,5 @@ +You pray to your chosen deity for help. + +Unfortunately, you forgot that some time ago, you decided to become an atheist. + +Your prayer goes unanswered, and you perish in the gooey, sticky flames. \ No newline at end of file From d7f1e86ced31d78a5b7b75b0b5c354998e3ecc46 Mon Sep 17 00:00:00 2001 From: Marcia Schulman Date: Fri, 22 Jan 2016 14:16:43 -0500 Subject: [PATCH 2251/5486] Fix link to end of story --- english/light-fire/succumb/game-over.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/light-fire/succumb/game-over.md b/english/light-fire/succumb/game-over.md index 4502fd6d0f..57154e9ea1 100644 --- a/english/light-fire/succumb/game-over.md +++ b/english/light-fire/succumb/game-over.md @@ -9,4 +9,4 @@ help but think about everything you're leaving behind. [Time to find out what heaven is like](../../marshmallow.md) -[Pray for help](/get-help/help.md) \ No newline at end of file +[Pray for help](/help.md) \ No newline at end of file From 851468d743e18c38e96b3ecce8a80d2d30747d8f Mon Sep 17 00:00:00 2001 From: Fred Lawton Date: Fri, 22 Jan 2016 11:18:15 -0800 Subject: [PATCH 2252/5486] feat: Add Bayes' Theorem --- english/BayesTheorem/BayesTheorem.md | 1 + english/marshmallow.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/BayesTheorem/BayesTheorem.md diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md new file mode 100644 index 0000000000..46bd72756f --- /dev/null +++ b/english/BayesTheorem/BayesTheorem.md @@ -0,0 +1 @@ +Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 81b0a34802..8c786cb70f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -736,4 +736,6 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic [Do you have my stapler?](stapler/stapler.md) -[Build a car](build-a-car/build-a-car.md) \ No newline at end of file +[Build a car](build-a-car/build-a-car.md) + +What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? \ No newline at end of file From 89186b2067c7f8476e6d37c100e839e50a93e6e4 Mon Sep 17 00:00:00 2001 From: Marcia Schulman Date: Fri, 22 Jan 2016 14:22:03 -0500 Subject: [PATCH 2253/5486] Fix path --- english/light-fire/succumb/game-over.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/light-fire/succumb/game-over.md b/english/light-fire/succumb/game-over.md index 57154e9ea1..280c7ce8d5 100644 --- a/english/light-fire/succumb/game-over.md +++ b/english/light-fire/succumb/game-over.md @@ -9,4 +9,4 @@ help but think about everything you're leaving behind. [Time to find out what heaven is like](../../marshmallow.md) -[Pray for help](/help.md) \ No newline at end of file +[Pray for help](./get-help/help.md ) \ No newline at end of file From 06f49b67ee7e64ef3842dd2eec1665da3a6aea19 Mon Sep 17 00:00:00 2001 From: Philipp Knoepfle Date: Fri, 22 Jan 2016 11:56:18 -0800 Subject: [PATCH 2254/5486] Add goto port and ship --- english/magic/magic.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/magic/magic.md b/english/magic/magic.md index d82e1fd3e4..8436288c5e 100644 --- a/english/magic/magic.md +++ b/english/magic/magic.md @@ -11,3 +11,5 @@ I am coming for you mad king. For I am the mother of dragons What is dead may never die! With my green light saber, I'll deal with this sithlord madness! +Continue on to the port and get on the big ship. + From e5c3e73b43027674caa962a7cc617d22eb0f3475 Mon Sep 17 00:00:00 2001 From: Alexander Rapp Date: Fri, 22 Jan 2016 15:33:26 -0500 Subject: [PATCH 2255/5486] Adding choice spek_to_neighbor --- russian/speak_to_neighbor/speak_to_neighbor.md | 2 ++ russian/speak_to_neighbor/upstairs/upstairs.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 russian/speak_to_neighbor/speak_to_neighbor.md create mode 100644 russian/speak_to_neighbor/upstairs/upstairs.md diff --git a/russian/speak_to_neighbor/speak_to_neighbor.md b/russian/speak_to_neighbor/speak_to_neighbor.md new file mode 100644 index 0000000000..8953ee61a9 --- /dev/null +++ b/russian/speak_to_neighbor/speak_to_neighbor.md @@ -0,0 +1,2 @@ +Я вышел на лестничную площадку и позвонил соседям. +Если ни ни кого из соседей на площадке не оказалось дома, то я [поднимусь этажом выше] (upstairs/upstairs.md) diff --git a/russian/speak_to_neighbor/upstairs/upstairs.md b/russian/speak_to_neighbor/upstairs/upstairs.md new file mode 100644 index 0000000000..61760820fc --- /dev/null +++ b/russian/speak_to_neighbor/upstairs/upstairs.md @@ -0,0 +1 @@ +Надеюсь, что здесь кто-то из соседей окажется дома. From 3af5f6c11b8d31deba198863df9159294aa0641a Mon Sep 17 00:00:00 2001 From: Alexander Rapp Date: Fri, 22 Jan 2016 15:55:12 -0500 Subject: [PATCH 2256/5486] Changes to zefir.md file --- russian/speak_to_neighbor/speak_to_neighbor.md | 2 +- russian/zefir.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/speak_to_neighbor/speak_to_neighbor.md b/russian/speak_to_neighbor/speak_to_neighbor.md index 8953ee61a9..d0b92fdf96 100644 --- a/russian/speak_to_neighbor/speak_to_neighbor.md +++ b/russian/speak_to_neighbor/speak_to_neighbor.md @@ -1,2 +1,2 @@ Я вышел на лестничную площадку и позвонил соседям. -Если ни ни кого из соседей на площадке не оказалось дома, то я [поднимусь этажом выше] (upstairs/upstairs.md) +Если ни ни кого из соседей на площадке не оказалось дома, то я [поднимусь этажом выше](upstairs/upstairs.md) diff --git a/russian/zefir.md b/russian/zefir.md index f3ba048f64..898b8b5c1b 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -53,3 +53,5 @@ [Почесать в подмышечной впадине.](scratch/scratch.md) [Пойду в другую комнату](next_room/next_room.md) + +[Поговорю с соседями](speak_to_neighbor) From dfcb46ca25ccb59afc932c19f7a3d49b95891f9c Mon Sep 17 00:00:00 2001 From: Alexander Rapp Date: Fri, 22 Jan 2016 15:59:45 -0500 Subject: [PATCH 2257/5486] Another chages to zefir.md --- russian/zefir.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/zefir.md b/russian/zefir.md index 898b8b5c1b..cd368a6591 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -54,4 +54,4 @@ [Пойду в другую комнату](next_room/next_room.md) -[Поговорю с соседями](speak_to_neighbor) +[Поговорю с соседями](speak_to_neighbor/speak_to_neighbor.md) From d9514970dba671a2934bd059f3c5e0dd4783d496 Mon Sep 17 00:00:00 2001 From: EJ Date: Fri, 22 Jan 2016 20:32:55 -0800 Subject: [PATCH 2258/5486] Add oh --- english/amnesia/amnesia.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/amnesia/amnesia.md b/english/amnesia/amnesia.md index 135448fdfb..948d2c5090 100644 --- a/english/amnesia/amnesia.md +++ b/english/amnesia/amnesia.md @@ -16,3 +16,4 @@ Amnesia can be freaking awesome sometimes :) Or it can be highly disturbing. +Or, it can be highly... oh, I forgot what I was going to say. From 635246ffbc221a5e51fc95b18c5afe5818ea7ea9 Mon Sep 17 00:00:00 2001 From: Peter Date: Sat, 23 Jan 2016 11:52:53 -0500 Subject: [PATCH 2259/5486] Added a story about eating all the food. Its pretty funny, or at least I think so. =) --- english/forest/eat/eat.md | 3 +++ english/forest/forest.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/forest/eat/eat.md diff --git a/english/forest/eat/eat.md b/english/forest/eat/eat.md new file mode 100644 index 0000000000..b7fb675289 --- /dev/null +++ b/english/forest/eat/eat.md @@ -0,0 +1,3 @@ +In a panic, you stuff your face full of all the airplane pretzels and peanuts they gave you and slurp the last drop of the Coke. There were exactly 12 peanuts and 7 pretzels. You wonder if you should have rationed them out over the course of a week or so, one pretzel and two peanuts per day. But it is too late, and you're still hungry. + +You see a squirrel on a tree branch and wonder how much meat is on it... \ No newline at end of file diff --git a/english/forest/forest.md b/english/forest/forest.md index 449f14ee98..6ff52620b3 100644 --- a/english/forest/forest.md +++ b/english/forest/forest.md @@ -29,4 +29,6 @@ Google can't help you right now. You are on your own. [Check pockets](pockets/pockets.md) -[Make a shelter from the parachute](shelter/shelter.md) \ No newline at end of file +[Make a shelter from the parachute](shelter/shelter.md) + +[Eat all of your rations in a panic](eat/eat.md) \ No newline at end of file From eade1665d0661fae01128bc823aa48f6cef079a4 Mon Sep 17 00:00:00 2001 From: Titus Date: Sat, 23 Jan 2016 10:10:25 -0800 Subject: [PATCH 2260/5486] Split line for length --- english/yoga/mind/yoga_mind.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/yoga/mind/yoga_mind.md b/english/yoga/mind/yoga_mind.md index b143239fc8..88c3e2b900 100644 --- a/english/yoga/mind/yoga_mind.md +++ b/english/yoga/mind/yoga_mind.md @@ -8,8 +8,9 @@ Most people have discovered that exercising can lift their mood. Meditation is simply training your mind to focus and concentrate -However, you are now calm and just as you begin to meditate you notice you are suddenly in a strange room with marshmallows for walls. +However, you are now calm and just as you begin to meditate you notice you +are suddenly in a strange room with marshmallows for walls. Marshmallows smell funny. What is a marshmallow anyway? -Unexpectedly, the Chief Marshmallow demands to see your [references](../../references/references.md) \ No newline at end of file +Unexpectedly, the Chief Marshmallow demands to see your [references](../../references/references.md) From f834b069912eed9afb5a71ea8b56a99c2c9e9d15 Mon Sep 17 00:00:00 2001 From: Peter Date: Sat, 23 Jan 2016 17:35:17 -0500 Subject: [PATCH 2261/5486] Put the story on multiple lines --- english/forest/eat/eat.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/english/forest/eat/eat.md b/english/forest/eat/eat.md index b7fb675289..ee19bc1ca1 100644 --- a/english/forest/eat/eat.md +++ b/english/forest/eat/eat.md @@ -1,3 +1,9 @@ -In a panic, you stuff your face full of all the airplane pretzels and peanuts they gave you and slurp the last drop of the Coke. There were exactly 12 peanuts and 7 pretzels. You wonder if you should have rationed them out over the course of a week or so, one pretzel and two peanuts per day. But it is too late, and you're still hungry. +In a panic, you stuff your face full of all the airplane +pretzels and peanuts they gave you and slurp the last drop of +the Coke. There were exactly 12 peanuts and 7 pretzels. You +wonder if you should have rationed them out over the course +of a week or so, one pretzel and two peanuts per day. But +it is too late, and you're still hungry. -You see a squirrel on a tree branch and wonder how much meat is on it... \ No newline at end of file +You see a squirrel on a tree branch and wonder how much meat +is on it... \ No newline at end of file From 3ea85a9e29ccb6f2453fd6db5bb4d24a1c7dfd7e Mon Sep 17 00:00:00 2001 From: devrayne Date: Sat, 23 Jan 2016 17:55:33 -0500 Subject: [PATCH 2262/5486] Add new 'Under Malt' option --- english/search_for_chocolate/search_for_chocolate.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/search_for_chocolate/search_for_chocolate.md b/english/search_for_chocolate/search_for_chocolate.md index af3af866e2..8b6fc1dbf3 100644 --- a/english/search_for_chocolate/search_for_chocolate.md +++ b/english/search_for_chocolate/search_for_chocolate.md @@ -1,3 +1,5 @@ You don't find any chocolate, but you find a small package of Tums. -[Take a couple of Tums](../take_tums/take_tums.md) \ No newline at end of file +[Take a couple of Tums](../take_tums/take_tums.md) + +[Keep looking](../keep_looking_for_chocolate/keep_looking_for_chocolate.md) \ No newline at end of file From e5f7081797ce307a6439441cad527f6c1c3f3b81 Mon Sep 17 00:00:00 2001 From: devrayne Date: Sat, 23 Jan 2016 17:56:14 -0500 Subject: [PATCH 2263/5486] Add 'find malt ball' scene --- .../keep_looking_for_chocolate/keep_looking_for_chocolate.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/keep_looking_for_chocolate/keep_looking_for_chocolate.md diff --git a/english/keep_looking_for_chocolate/keep_looking_for_chocolate.md b/english/keep_looking_for_chocolate/keep_looking_for_chocolate.md new file mode 100644 index 0000000000..3fc728756b --- /dev/null +++ b/english/keep_looking_for_chocolate/keep_looking_for_chocolate.md @@ -0,0 +1,3 @@ +Underneath the Tums you find a single, faintly glowing malt ball. + +[Take the malt ball](../take-malt/take-malt.md) \ No newline at end of file From 6d2e941add436602c1b564127d7895e468fe3099 Mon Sep 17 00:00:00 2001 From: devrayne Date: Sat, 23 Jan 2016 17:56:55 -0500 Subject: [PATCH 2264/5486] Add 'take malt' scene --- english/take-malt/take-malt.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 english/take-malt/take-malt.md diff --git a/english/take-malt/take-malt.md b/english/take-malt/take-malt.md new file mode 100644 index 0000000000..59d34cb95b --- /dev/null +++ b/english/take-malt/take-malt.md @@ -0,0 +1,12 @@ +Nothing happens. But...you feel a strange sensation rippling through your +body. You begin to change. Energy and malted milk course through your veins, +while your skin transforms before your very eyes into milk chocolate. +You fall to the ground, unconscious. + +... + +You awake to discover that, through some strange magic, +you have become THE ASTOUNDING MALT-BALL, protector of the innocent +and improver of milk-shakes. + +[Use your powers for good.](../use-powers/use-powers.md) \ No newline at end of file From 446fc78b2b65573472e9769fdf3d54c794fbba90 Mon Sep 17 00:00:00 2001 From: devrayne Date: Sat, 23 Jan 2016 17:57:38 -0500 Subject: [PATCH 2265/5486] Add 'use powers' scene --- english/use-powers/use-powers.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/use-powers/use-powers.md diff --git a/english/use-powers/use-powers.md b/english/use-powers/use-powers.md new file mode 100644 index 0000000000..39e97d03e2 --- /dev/null +++ b/english/use-powers/use-powers.md @@ -0,0 +1,3 @@ +You are not the hero the world needed right now. Malt balls, while delicious, +are not particularly effective against global hunger, racism, or religious intolerance. +You sigh, resignedly. \ No newline at end of file From c329b40797e1f66fb6a5572ad0480d9de45dadf4 Mon Sep 17 00:00:00 2001 From: Shelly Davis Date: Sat, 23 Jan 2016 19:37:00 -0800 Subject: [PATCH 2266/5486] Add line from The Night Before Christmas --- english/night-night/tale.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/night-night/tale.md b/english/night-night/tale.md index 5517b6450a..13c3288ff0 100644 --- a/english/night-night/tale.md +++ b/english/night-night/tale.md @@ -1,4 +1,7 @@ Twas the night before Christmas when all through the house, not a creature was stirring, -not even a mouse... \ No newline at end of file +not even a mouse... + +The stockings were hung by the chimney with care, +in hopes that St. Nicholas soon would be there. . . \ No newline at end of file From 5c26b695bf58cad5e4fce8a7d6ae119f4caa99e2 Mon Sep 17 00:00:00 2001 From: Janie Wong Date: Sun, 24 Jan 2016 16:23:16 +0800 Subject: [PATCH 2267/5486] Added new choice option - Divergence --- english/divergence/divergence.md | 1 + english/marshmallow.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/divergence/divergence.md diff --git a/english/divergence/divergence.md b/english/divergence/divergence.md new file mode 100644 index 0000000000..512026bca0 --- /dev/null +++ b/english/divergence/divergence.md @@ -0,0 +1 @@ +Suddenly everything thing around vanishes into this air, and you start to feel really dizzy... diff --git a/english/marshmallow.md b/english/marshmallow.md index 8c786cb70f..aba5512c0a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -738,4 +738,6 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic [Build a car](build-a-car/build-a-car.md) -What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? \ No newline at end of file +What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? + +The divergence is coming, survive or perish? (Divergence/Divergence.md) \ No newline at end of file From f9eb43471260dbf22e28e3119662702e3c944f30 Mon Sep 17 00:00:00 2001 From: foosun Date: Sun, 24 Jan 2016 16:30:09 +0800 Subject: [PATCH 2268/5486] Update marshmallow.md Attempt to fix link for MD format --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index aba5512c0a..b54fc0c77e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -740,4 +740,4 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, survive or perish? (Divergence/Divergence.md) \ No newline at end of file +The divergence is coming, [survive] or perish? (Divergence/Divergence.md) From 70539274fe2ac88d8399e5a464cb6a58c94b3c11 Mon Sep 17 00:00:00 2001 From: Alex Guzey Date: Sun, 24 Jan 2016 11:34:33 +0300 Subject: [PATCH 2269/5486] Add priors quesiton --- english/BayesTheorem/BayesTheorem.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md index 46bd72756f..2cf9d8eb21 100644 --- a/english/BayesTheorem/BayesTheorem.md +++ b/english/BayesTheorem/BayesTheorem.md @@ -1 +1,3 @@ -Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) \ No newline at end of file +Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) + +[Daddy, but where do priors come from](priors/priors.md)? \ No newline at end of file From 176bb0dbe883da4dfeb68330f3b3db2b832ddf0e Mon Sep 17 00:00:00 2001 From: foosun Date: Sun, 24 Jan 2016 16:35:17 +0800 Subject: [PATCH 2270/5486] Update marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b54fc0c77e..33f874130e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -740,4 +740,4 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive] or perish? (Divergence/Divergence.md) +The divergence is coming, [survive](Divergence/Divergence.md) or perish? From fd07c5be8583094ed95336ec9f2a93f569b4345a Mon Sep 17 00:00:00 2001 From: Alex Guzey Date: Sun, 24 Jan 2016 11:36:05 +0300 Subject: [PATCH 2271/5486] Add priors storyline --- english/BayesTheorem/priors/priors.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/BayesTheorem/priors/priors.md diff --git a/english/BayesTheorem/priors/priors.md b/english/BayesTheorem/priors/priors.md new file mode 100644 index 0000000000..16ea1b06da --- /dev/null +++ b/english/BayesTheorem/priors/priors.md @@ -0,0 +1 @@ +Don't you dare ask me such things, son! \ No newline at end of file From 55fa7414efb7caae518e9b8e4d8b8446de452c68 Mon Sep 17 00:00:00 2001 From: foosun Date: Sun, 24 Jan 2016 16:37:52 +0800 Subject: [PATCH 2272/5486] Fixed link to Divergence Case sensitive - change all to lower caps --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 33f874130e..0cfe475353 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -740,4 +740,4 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive](Divergence/Divergence.md) or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? From 8b0d1497120776a3544f2dc6aa673bc4f56b2b64 Mon Sep 17 00:00:00 2001 From: Eras Botha Date: Sun, 24 Jan 2016 11:01:31 +0200 Subject: [PATCH 2273/5486] Add conversation to coffee --- english/coffee/coffee.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/coffee/coffee.md b/english/coffee/coffee.md index 6fc68396c5..3c96b95b5e 100644 --- a/english/coffee/coffee.md +++ b/english/coffee/coffee.md @@ -40,3 +40,5 @@ After having your coffee do you want to: [Procrastinate?](procrastinate/procrastinate.md) . + +Coffee creates a great medium for people to have conversations about ideas and visions. From eeccfbe9b75c8e7d2aa96beb8acf17beffff3bfd Mon Sep 17 00:00:00 2001 From: Federica73 Date: Sun, 24 Jan 2016 12:20:17 +0100 Subject: [PATCH 2274/5486] Add how to defeat the t-rex --- .../cadi/tappeto-volante/sopra-t-rex/sopra-t-rex.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Italian/finestra/cadi/tappeto-volante/sopra-t-rex/sopra-t-rex.md b/Italian/finestra/cadi/tappeto-volante/sopra-t-rex/sopra-t-rex.md index 2d3882b709..500af64cce 100644 --- a/Italian/finestra/cadi/tappeto-volante/sopra-t-rex/sopra-t-rex.md +++ b/Italian/finestra/cadi/tappeto-volante/sopra-t-rex/sopra-t-rex.md @@ -1 +1,6 @@ -Vedi il possente animale ruggire verso di te... \ No newline at end of file +Vedi il possente animale ruggire verso di te... + +...quindi sorridi al lucertolone e viri col tappeto verso +il Marshmellow gigante, che si rivela una colazione molto piu gradita di te. +Il t-rex ti saluta mentre tu ti allontani verso una montagna che si staglia +all'orizzonte. From db04b7243aa8ef53b1437802836cc72fc5607b1d Mon Sep 17 00:00:00 2001 From: Jingcheng Xu Date: Sun, 24 Jan 2016 22:19:39 +0800 Subject: [PATCH 2275/5486] Update to include Fermat --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index c0eb635444..4b3082fc00 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -90,4 +90,6 @@ [陳奕迅](Eason_Chan/Eason_Chan.md) -[鹿晗](luhan/luhan.md) \ No newline at end of file +[鹿晗](luhan/luhan.md) + +[Fermat] (Fermat/Fermat.md) From a6cf2fb677a08c91eeb8e329dc8a80ab777d505a Mon Sep 17 00:00:00 2001 From: Jingcheng Xu Date: Sun, 24 Jan 2016 22:26:17 +0800 Subject: [PATCH 2276/5486] Create Fermat.md --- Chinese/Fermat/Fermat.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/Fermat/Fermat.md diff --git a/Chinese/Fermat/Fermat.md b/Chinese/Fermat/Fermat.md new file mode 100644 index 0000000000..db9d56be9e --- /dev/null +++ b/Chinese/Fermat/Fermat.md @@ -0,0 +1 @@ +孙悟空变成了Fermat，顺手在页边上写下自己找到了绝佳的证明，但是地方太小写不下了。 From bc973e84948a807ca8d19a99ef40e35ee977c344 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 24 Jan 2016 13:20:20 -0600 Subject: [PATCH 2277/5486] add roar scenario --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0cfe475353..ad9250496a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -741,3 +741,5 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? The divergence is coming, [survive](divergence/divergence.md) or perish? + +[Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) From 21f84bc6820c594bceca057e473a16360edd5502 Mon Sep 17 00:00:00 2001 From: dmck Date: Sun, 24 Jan 2016 14:52:23 -0500 Subject: [PATCH 2278/5486] Add Dublin to spring travel destinations --- english/travel-destinations/spring/spring.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/travel-destinations/spring/spring.md b/english/travel-destinations/spring/spring.md index f54099bbb7..c58cd402ea 100644 --- a/english/travel-destinations/spring/spring.md +++ b/english/travel-destinations/spring/spring.md @@ -1,2 +1,3 @@ Awaken your spirits by going to [Yosemite National Park](http://www.yosemitepark.com/) +Find your luck in [Ireland](http://www.stpatricksfestival.ie/). From 494187a5754c6479a5a7a249ca63d8a0effd7665 Mon Sep 17 00:00:00 2001 From: Jordi Ferrer Date: Sun, 24 Jan 2016 23:41:37 +0100 Subject: [PATCH 2279/5486] Added a new link to a dead way in sortir.md --- catala/sortir/sortir.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/catala/sortir/sortir.md b/catala/sortir/sortir.md index 84955ecad4..1c50829ac8 100644 --- a/catala/sortir/sortir.md +++ b/catala/sortir/sortir.md @@ -6,3 +6,7 @@ uns peus que es belluguen amb impaciència... aquestes sabates et sonen... Ets tu! Tanques els ulls de nou, amb força, i dessitges que tot el que has vist sigui fruit de la teva imaginació. + +Però veus que no pots agafar son i t'acabes despertant. + +Clica [aquí](../catala.md) per tornar a començar... From cc99afc11b372289ed2ef650da6b8e5d80b8333d Mon Sep 17 00:00:00 2001 From: christopher Henningsen Date: Mon, 25 Jan 2016 00:37:20 -0400 Subject: [PATCH 2280/5486] added dialogue about resurrecting dobby --- english/hogsmeade/hogsmeade.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/hogsmeade/hogsmeade.md b/english/hogsmeade/hogsmeade.md index 74511ec7ca..8f7b04a8f4 100644 --- a/english/hogsmeade/hogsmeade.md +++ b/english/hogsmeade/hogsmeade.md @@ -3,4 +3,7 @@ On their way they see some suspicious debris along the path, but ignore it all because they're craving for Butterbeer is very real. As they enter Hogsmeade the lights from The Three Broomsticks beckon, so they quicken their pace. Once they've chosen a cozy spot near the fire, Madam Rosmerta brings them a bottle of Butterbeer each, -and they spend their afternoon in bliss. \ No newline at end of file +and they spend their afternoon in bliss. + +"You know", Harry says after some time, "I bet I could totally bring dobby back if I learned elven magic" +Ron's eyes widen comically. \ No newline at end of file From 224fb10d8700ddaec4ec683e4c15bb44b18a2045 Mon Sep 17 00:00:00 2001 From: lestergo Date: Sun, 24 Jan 2016 23:35:29 -0800 Subject: [PATCH 2281/5486] added liquid on marshmallow --- english/liquid/liquid.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/liquid/liquid.md diff --git a/english/liquid/liquid.md b/english/liquid/liquid.md new file mode 100644 index 0000000000..ff8542e1a1 --- /dev/null +++ b/english/liquid/liquid.md @@ -0,0 +1 @@ +You can check him out on [Twitch](http://www.twitch.tv/liquidneo) diff --git a/english/marshmallow.md b/english/marshmallow.md index ad9250496a..ef4be8edb2 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,5 +1,7 @@ This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +Vist the master [liquid](liquid/liquid.md). + [play](http://pcottle.github.io/learnGitBranching/) with the (git) branches and search for your [destiny](destiny/destiny.md). From 02a9789e3ebfe8f4496b7ae43602361be146bc27 Mon Sep 17 00:00:00 2001 From: Mike Middleton Date: Mon, 25 Jan 2016 11:55:53 +0000 Subject: [PATCH 2282/5486] Add edits as per Contribution Guidelines --- english/crazy/crazy.md | 5 +++++ english/dig/dig.md | 4 +++- english/dragons/fire-everywhere.md | 2 ++ english/dream/dream.md | 2 ++ english/tea/tea.md | 7 +++++++ 5 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 english/tea/tea.md diff --git a/english/crazy/crazy.md b/english/crazy/crazy.md index ffe0cc5509..35dc31adbe 100644 --- a/english/crazy/crazy.md +++ b/english/crazy/crazy.md @@ -1,2 +1,7 @@ Crazy man! +Do you... + +[Run](../run/run.md) +[Hide](..hide/hide-chk.md) + diff --git a/english/dig/dig.md b/english/dig/dig.md index 10aa2e83a9..34e847ef40 100644 --- a/english/dig/dig.md +++ b/english/dig/dig.md @@ -8,7 +8,7 @@ It says "hello" "Hello, Mr Bird!", you say, and spot a collar with a tag on it. -Upon inspecting the tag, you see it reads: "Nevermore". Turning over the tag, you see: "If found, please return to: +Upon inspecting the tag, you see it reads: "Nevermore: Rub me three times". Turning over the tag, you see: "If found, please return to: Outis, 13 West Range, U. Virginia". "Well, Nevermore, shall we return you to your owner?" @@ -17,6 +17,8 @@ Do you: [Go to the University of Virginia, to find Outis the owner?](uva/uva.md) +[Rub the tag three times](../dragons/fire-everywhere.md) + [Sit back down, and go to sleep?](../sleep/more-sleep/more-sleep.md) [Go exploring outside?](../explore-outside/explore-outside.md) diff --git a/english/dragons/fire-everywhere.md b/english/dragons/fire-everywhere.md index 05d0be4fbb..39b1ff3595 100644 --- a/english/dragons/fire-everywhere.md +++ b/english/dragons/fire-everywhere.md @@ -21,6 +21,8 @@ Who knew that one day you will have to use Valyrian tongue for survival... The biggest of the dragon - [Drogon](http://gameofthrones.wikia.com/wiki/Drogon) - stares at you with his big eyes... +His penetrating gaze holds me transfixed... + You wonder if he understood the situation... He comes closer and bends....You realize that he is asking you to ride on him...You hop on without any diff --git a/english/dream/dream.md b/english/dream/dream.md index d9b490a9dd..297ed014ca 100644 --- a/english/dream/dream.md +++ b/english/dream/dream.md @@ -19,3 +19,5 @@ Afterwards, you decide to: [dance](../dance/dance.md) [karaoke](../karaoke/nope.md) + +[Drink a nice cup of tea](../tea/tea.md) diff --git a/english/tea/tea.md b/english/tea/tea.md new file mode 100644 index 0000000000..dbf9005d2c --- /dev/null +++ b/english/tea/tea.md @@ -0,0 +1,7 @@ +Ummm... + +Such a nice cup of tea. Just a little milk. No sugar. Perfect. + +Now, you think to yourself... + +"What I need is a link." But, to where? \ No newline at end of file From dc332205dc16a29e5cfc75d7d744fb0520f75361 Mon Sep 17 00:00:00 2001 From: Alexander Rapp Date: Mon, 25 Jan 2016 08:31:39 -0500 Subject: [PATCH 2283/5486] Changes to inglish version --- english/marshmallow.md | 2 ++ english/talk_to_neighbour/talk_to_neighbour.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/talk_to_neighbour/talk_to_neighbour.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 094482830d..e41adcf930 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,5 +1,7 @@ This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) + [play](http://pcottle.github.io/learnGitBranching/) with the (git) branches and search for your [destiny](destiny/destiny.md). diff --git a/english/talk_to_neighbour/talk_to_neighbour.md b/english/talk_to_neighbour/talk_to_neighbour.md new file mode 100644 index 0000000000..918ad80efc --- /dev/null +++ b/english/talk_to_neighbour/talk_to_neighbour.md @@ -0,0 +1 @@ +I hear you \ No newline at end of file From 8f83e753efd2ed0e81f103afd88fb546bb1de7c5 Mon Sep 17 00:00:00 2001 From: Rob L Date: Mon, 25 Jan 2016 12:01:38 -0800 Subject: [PATCH 2284/5486] Make line less than 120 chars --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index e250e6f385..fc99ba6caa 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -747,3 +747,5 @@ What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) + +You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) From 3ec385f574a5eb841a40a010a6fa0431b9b9f666 Mon Sep 17 00:00:00 2001 From: Paulo Peixoto Date: Mon, 25 Jan 2016 21:21:21 +0000 Subject: [PATCH 2285/5486] Adiciona linha 19 --- portugues_pt/colaborar.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index 0ed6000ace..087e233552 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -15,3 +15,5 @@ Contribuía para [obras de caridade](caridade/caridade.md) Compraria [componentes eletronicos](componentes/componentes.md) Usava um repositorio privado. + +Ia ao Japão driftar em Tsukuba. \ No newline at end of file From e19bdd383a24b5b97b5faa8135d8122fa6d7a0a0 Mon Sep 17 00:00:00 2001 From: Kevin Lym Date: Mon, 25 Jan 2016 14:00:31 -0800 Subject: [PATCH 2286/5486] Added Pink Unicorn story sentence --- english/weed/weed.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/weed/weed.md b/english/weed/weed.md index e60b8f2dc1..5d6575b1aa 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -9,6 +9,7 @@ See you - Love Pink Unicorn Then you wonder why you're taking advice from a Love Pink Unicorn (after all, these are known to be the most untrustworthy breed of unicorn, far worse, even, than the Grim Charcoal Unicorns of Strawgoh). +However, the Love Pink Unicorn brings happiness to everyone. How can anyone not have a smile on their face after eating one of those yummy pot cookies? You decide to take a new path. Do you: From 205ba68224d675541f87896a52478cc0f946b7ce Mon Sep 17 00:00:00 2001 From: kevlym Date: Mon, 25 Jan 2016 14:27:08 -0800 Subject: [PATCH 2287/5486] Update weed.md --- english/weed/weed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/weed/weed.md b/english/weed/weed.md index 5d6575b1aa..0a9ecd8f19 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -9,7 +9,7 @@ See you - Love Pink Unicorn Then you wonder why you're taking advice from a Love Pink Unicorn (after all, these are known to be the most untrustworthy breed of unicorn, far worse, even, than the Grim Charcoal Unicorns of Strawgoh). -However, the Love Pink Unicorn brings happiness to everyone. How can anyone not have a smile on their face after eating one of those yummy pot cookies? +However, the Love Pink Unicorn brings happiness to everyone by handing out those yummy pot cookies. You decide to take a new path. Do you: From bce68e3500eace260ac128df0456b3c09a357556 Mon Sep 17 00:00:00 2001 From: Syed M Hasnain Kazmi Date: Tue, 26 Jan 2016 10:16:17 +1000 Subject: [PATCH 2288/5486] Add a joke in story --- english/joke/joke.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/joke/joke.md diff --git a/english/joke/joke.md b/english/joke/joke.md new file mode 100644 index 0000000000..27c44ee240 --- /dev/null +++ b/english/joke/joke.md @@ -0,0 +1 @@ +"What a joke?" \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index fc99ba6caa..5b5d2d3d25 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -749,3 +749,5 @@ The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) + +"What a joke?", he said, after looking at the [news](joke/joke.md) From d489b45aa3336480b23d31c0de61b30587bb7651 Mon Sep 17 00:00:00 2001 From: Jonathan Melin Date: Tue, 26 Jan 2016 00:36:14 -0500 Subject: [PATCH 2289/5486] Add line to liquid.md --- english/liquid/liquid.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/liquid/liquid.md b/english/liquid/liquid.md index ff8542e1a1..4013c3025d 100644 --- a/english/liquid/liquid.md +++ b/english/liquid/liquid.md @@ -1 +1,3 @@ You can check him out on [Twitch](http://www.twitch.tv/liquidneo) + +Or not. From d7a7c0aa2f232c1d42bf6e5c3139b0d2f49fa66d Mon Sep 17 00:00:00 2001 From: Manish Date: Mon, 25 Jan 2016 22:22:08 -0800 Subject: [PATCH 2290/5486] commit1 --- english/kindness/acts-of-kindness.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/kindness/acts-of-kindness.md b/english/kindness/acts-of-kindness.md index 49f874201c..ba8cbfc7aa 100644 --- a/english/kindness/acts-of-kindness.md +++ b/english/kindness/acts-of-kindness.md @@ -8,3 +8,5 @@ could eat. The extra was donated to a local food bank. He also gave some zucchinis to our family. Mom cut them up and cooked zucchini pie for dinner. My favorite vegetable is zucchini and my sister's favorite dish is zucchini pie, so you can imagine how happy we were. + +testing commit From 989aa00ad795fa9e16fb8aafe1ff3d618d47d44c Mon Sep 17 00:00:00 2001 From: atriyu Date: Mon, 25 Jan 2016 22:30:55 -0800 Subject: [PATCH 2291/5486] Revert "commit1" --- english/kindness/acts-of-kindness.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/kindness/acts-of-kindness.md b/english/kindness/acts-of-kindness.md index ba8cbfc7aa..49f874201c 100644 --- a/english/kindness/acts-of-kindness.md +++ b/english/kindness/acts-of-kindness.md @@ -8,5 +8,3 @@ could eat. The extra was donated to a local food bank. He also gave some zucchinis to our family. Mom cut them up and cooked zucchini pie for dinner. My favorite vegetable is zucchini and my sister's favorite dish is zucchini pie, so you can imagine how happy we were. - -testing commit From 24765685c9397ce131f632f1055de9f092ba12d9 Mon Sep 17 00:00:00 2001 From: Manish Date: Mon, 25 Jan 2016 22:36:32 -0800 Subject: [PATCH 2292/5486] commit2 --- english/kindness/acts-of-kindness.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/kindness/acts-of-kindness.md b/english/kindness/acts-of-kindness.md index ba8cbfc7aa..63bb4f6ca1 100644 --- a/english/kindness/acts-of-kindness.md +++ b/english/kindness/acts-of-kindness.md @@ -10,3 +10,4 @@ He also gave some zucchinis to our family. Mom cut them up and cooked zucchini p My favorite vegetable is zucchini and my sister's favorite dish is zucchini pie, so you can imagine how happy we were. testing commit +test revert of revert From c49540afd96b43e314e7485ea3602b992c7be879 Mon Sep 17 00:00:00 2001 From: Manish Date: Mon, 25 Jan 2016 22:42:18 -0800 Subject: [PATCH 2293/5486] commit2 --- english/kindness/acts-of-kindness.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/english/kindness/acts-of-kindness.md b/english/kindness/acts-of-kindness.md index 63bb4f6ca1..49f874201c 100644 --- a/english/kindness/acts-of-kindness.md +++ b/english/kindness/acts-of-kindness.md @@ -8,6 +8,3 @@ could eat. The extra was donated to a local food bank. He also gave some zucchinis to our family. Mom cut them up and cooked zucchini pie for dinner. My favorite vegetable is zucchini and my sister's favorite dish is zucchini pie, so you can imagine how happy we were. - -testing commit -test revert of revert From b3b0f7b644ac4465d47d096f3f9b62192c0e2375 Mon Sep 17 00:00:00 2001 From: Manish Date: Mon, 25 Jan 2016 22:43:23 -0800 Subject: [PATCH 2294/5486] commit2 --- english/kindness/acts-of-kindness.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/kindness/acts-of-kindness.md b/english/kindness/acts-of-kindness.md index 49f874201c..98ddfd62b9 100644 --- a/english/kindness/acts-of-kindness.md +++ b/english/kindness/acts-of-kindness.md @@ -8,3 +8,4 @@ could eat. The extra was donated to a local food bank. He also gave some zucchinis to our family. Mom cut them up and cooked zucchini pie for dinner. My favorite vegetable is zucchini and my sister's favorite dish is zucchini pie, so you can imagine how happy we were. +test1 From 550c3c8ec32a8278a0b29f8fcca7cc70b3ca51c7 Mon Sep 17 00:00:00 2001 From: Ninzu Date: Tue, 26 Jan 2016 15:32:30 +0200 Subject: [PATCH 2295/5486] add lines to talk_to_neighbour --- english/talk_to_neighbour/talk_to_neighbour.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/talk_to_neighbour/talk_to_neighbour.md b/english/talk_to_neighbour/talk_to_neighbour.md index 918ad80efc..751b9ddc78 100644 --- a/english/talk_to_neighbour/talk_to_neighbour.md +++ b/english/talk_to_neighbour/talk_to_neighbour.md @@ -1 +1,2 @@ -I hear you \ No newline at end of file +I hear you, I see you. +I'm Listening. \ No newline at end of file From b91e98a4b035a174c46a7bc1dc42c46ef00a6831 Mon Sep 17 00:00:00 2001 From: Ninzu Date: Tue, 26 Jan 2016 15:36:29 +0200 Subject: [PATCH 2296/5486] remove edit from first line --- english/talk_to_neighbour/talk_to_neighbour.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/talk_to_neighbour/talk_to_neighbour.md b/english/talk_to_neighbour/talk_to_neighbour.md index 751b9ddc78..97fc20ba02 100644 --- a/english/talk_to_neighbour/talk_to_neighbour.md +++ b/english/talk_to_neighbour/talk_to_neighbour.md @@ -1,2 +1,3 @@ -I hear you, I see you. -I'm Listening. \ No newline at end of file +I hear you +I see you +I'm Listening \ No newline at end of file From 27726dffe4047f6c210f25ee8286e24774ce3f5e Mon Sep 17 00:00:00 2001 From: "Dr. Paul R. Zahrl" Date: Tue, 26 Jan 2016 16:04:14 +0100 Subject: [PATCH 2297/5486] Call a random number --- english/call-a-random-number/answer.md | 9 +++++++++ .../ask-for-a-date/cant-find-time/ohno.md | 1 + english/call-a-random-number/ask-for-a-date/time.md | 7 +++++++ .../ask-for-a-date/will-be-there/meeting.md | 1 + .../call-a-random-number/dont-say-anything/silence.md | 1 + english/call-a-random-number/hang-up/regret.md | 1 + english/marshmallow.md | 2 ++ 7 files changed, 22 insertions(+) create mode 100644 english/call-a-random-number/answer.md create mode 100644 english/call-a-random-number/ask-for-a-date/cant-find-time/ohno.md create mode 100644 english/call-a-random-number/ask-for-a-date/time.md create mode 100644 english/call-a-random-number/ask-for-a-date/will-be-there/meeting.md create mode 100644 english/call-a-random-number/dont-say-anything/silence.md create mode 100644 english/call-a-random-number/hang-up/regret.md diff --git a/english/call-a-random-number/answer.md b/english/call-a-random-number/answer.md new file mode 100644 index 0000000000..37b78657d9 --- /dev/null +++ b/english/call-a-random-number/answer.md @@ -0,0 +1,9 @@ +A seductive voice answers your call. + +You + +[Hang up](hang-up/regret.md) + +[Ask for a date](ask-for-a-date/time.md) + +[Don't say anything](dont-say-anything/silence.md) diff --git a/english/call-a-random-number/ask-for-a-date/cant-find-time/ohno.md b/english/call-a-random-number/ask-for-a-date/cant-find-time/ohno.md new file mode 100644 index 0000000000..378620d73b --- /dev/null +++ b/english/call-a-random-number/ask-for-a-date/cant-find-time/ohno.md @@ -0,0 +1 @@ +Finding time is a question of setting priorities. diff --git a/english/call-a-random-number/ask-for-a-date/time.md b/english/call-a-random-number/ask-for-a-date/time.md new file mode 100644 index 0000000000..e482b7579a --- /dev/null +++ b/english/call-a-random-number/ask-for-a-date/time.md @@ -0,0 +1,7 @@ +At 6 PM? + +You say + +[I can't find time](cant-find-time/ohno.md) + +[Of course, I will be there](will-be-there/meeting.md) diff --git a/english/call-a-random-number/ask-for-a-date/will-be-there/meeting.md b/english/call-a-random-number/ask-for-a-date/will-be-there/meeting.md new file mode 100644 index 0000000000..f1cde70c98 --- /dev/null +++ b/english/call-a-random-number/ask-for-a-date/will-be-there/meeting.md @@ -0,0 +1 @@ +Both of you meet! diff --git a/english/call-a-random-number/dont-say-anything/silence.md b/english/call-a-random-number/dont-say-anything/silence.md new file mode 100644 index 0000000000..1d8ee13b0f --- /dev/null +++ b/english/call-a-random-number/dont-say-anything/silence.md @@ -0,0 +1 @@ +There is silence on both sides. diff --git a/english/call-a-random-number/hang-up/regret.md b/english/call-a-random-number/hang-up/regret.md new file mode 100644 index 0000000000..8ddbfb03dd --- /dev/null +++ b/english/call-a-random-number/hang-up/regret.md @@ -0,0 +1 @@ +You may regret this decision for the rest of your life. diff --git a/english/marshmallow.md b/english/marshmallow.md index 5b5d2d3d25..8aec34ecb9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -684,6 +684,8 @@ you realize that the story is about you! This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) +[Call a random number](call-a-random-number) + <<<<<<< HEAD You must be lonely. [Want a friend?](robofriend/AIRobot.md) ======= From a79d509d0f1f620058afa8087a40d7bf1b4ea7d2 Mon Sep 17 00:00:00 2001 From: "Dr. Paul R. Zahrl" Date: Tue, 26 Jan 2016 16:05:53 +0100 Subject: [PATCH 2298/5486] Update link --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 8aec34ecb9..21547a68e2 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -684,7 +684,7 @@ you realize that the story is about you! This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) -[Call a random number](call-a-random-number) +[Call a random number](call-a-random-number/answer.md) <<<<<<< HEAD You must be lonely. [Want a friend?](robofriend/AIRobot.md) From b3a169c7e746c8095c78c66fe1be812e859fdb6f Mon Sep 17 00:00:00 2001 From: Dean Hendrix Date: Tue, 26 Jan 2016 10:38:14 -0600 Subject: [PATCH 2299/5486] Add option to open the door to destiny --- english/destiny/destiny.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/destiny/destiny.md b/english/destiny/destiny.md index f15f8a8064..1d0dd377f8 100644 --- a/english/destiny/destiny.md +++ b/english/destiny/destiny.md @@ -18,4 +18,6 @@ and now you will be the [protagonist of the story](../marshmallow.md) and I have [high hopes](../hope/hope.md) for you. -and you might be someone [who knocks](../say-my-name/say-my-name.md). \ No newline at end of file +and you might be someone [who knocks](../say-my-name/say-my-name.md). + +or perhaps you are someone [who opens](https://www.biblegateway.com/passage/?search=Revelation+3%3A20). From d0a3e4611170643313d3721000d41c7198a8318f Mon Sep 17 00:00:00 2001 From: Jeremie Carpentier-Roy Date: Tue, 26 Jan 2016 14:14:57 -0500 Subject: [PATCH 2300/5486] fixed typo in prof_musique.md --- french/telephone/prof_musique.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/french/telephone/prof_musique.md b/french/telephone/prof_musique.md index adbfaa84f1..11a7c4d757 100644 --- a/french/telephone/prof_musique.md +++ b/french/telephone/prof_musique.md @@ -1,3 +1,3 @@ -Comme c'est le weekend, sa mere repond et me demande d'aller lui acheter du pain. +Comme c'est le weekend, sa mère repond et me demande d'aller lui acheter du pain. -[Returner](../feu-de-camp.md) +[Retourner](../feu-de-camp.md) From e7748201193aacc0112cf2822275684a82dcbf7d Mon Sep 17 00:00:00 2001 From: Nathan Merris Date: Tue, 26 Jan 2016 16:27:55 -0500 Subject: [PATCH 2301/5486] Add option to eat a chocolate power pill. --- english/poke-the-wall/choco-power-pill/choco-power-pill.md | 1 + english/poke-the-wall/poke-the-wall.md | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 english/poke-the-wall/choco-power-pill/choco-power-pill.md diff --git a/english/poke-the-wall/choco-power-pill/choco-power-pill.md b/english/poke-the-wall/choco-power-pill/choco-power-pill.md new file mode 100644 index 0000000000..1a83666780 --- /dev/null +++ b/english/poke-the-wall/choco-power-pill/choco-power-pill.md @@ -0,0 +1 @@ +As expected, eating the small blue pill transformed your arms into blow torches. diff --git a/english/poke-the-wall/poke-the-wall.md b/english/poke-the-wall/poke-the-wall.md index 2a11f9ae03..afb41db5e7 100644 --- a/english/poke-the-wall/poke-the-wall.md +++ b/english/poke-the-wall/poke-the-wall.md @@ -17,4 +17,7 @@ You wonder if it would be wise to [eat your way out.](eat-way-out/eat-way-out.md Or [live tweet](../tweet-it/tweet-it.md) this chocolate and marshmallow shenanigans. -Or perhaps you should think a little more for an alternative solution. \ No newline at end of file +Or perhaps you should think a little more for an alternative solution. + +Of course, if you are going to eat your way out, be sure to first take a +[choco-marshmallow power pill](choco-power-pill/choco-power-pill.md), as the resultant super powers will be useful. \ No newline at end of file From 0c16144b070b56a70cdad57631a5800b67112ee3 Mon Sep 17 00:00:00 2001 From: Tom Hutchinson Date: Tue, 26 Jan 2016 21:58:01 +0000 Subject: [PATCH 2302/5486] Added a bit of Lewis Hamilton --- english/hammertime/hammertime.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/hammertime/hammertime.md b/english/hammertime/hammertime.md index e0e28f4d4c..3aeb56335a 100644 --- a/english/hammertime/hammertime.md +++ b/english/hammertime/hammertime.md @@ -4,3 +4,7 @@ that this doesn't help you at all. Stop......IT'S HAMMERTIME - WHOOA-O, WHOOA-O! WHOOA-O, WHOOA-O! [Except when it is not](https://www.youtube.com/watch?v=dKv6Yco0Lzg) + +Then you see Lewis Hamilton speeding past on his last lap on those +super soft tires, his mechanic telling him its Hammertime over the +radio. From 9b7ac8840a4ca0b8f34d55217090a271f09a93bb Mon Sep 17 00:00:00 2001 From: Michael Reynolds Date: Tue, 26 Jan 2016 17:11:29 -0500 Subject: [PATCH 2303/5486] add to crazy --- english/crazy/crazy.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/english/crazy/crazy.md b/english/crazy/crazy.md index ffe0cc5509..d03e11ad6e 100644 --- a/english/crazy/crazy.md +++ b/english/crazy/crazy.md @@ -1,2 +1,7 @@ Crazy man! +Or not. What is sane? + +Where has sanity ended or begun? + +[We all dance.](../dance/dance.md) \ No newline at end of file From cdad985a9bc5cf16ccb050f84381f8b0da96575a Mon Sep 17 00:00:00 2001 From: Mike Middleton Date: Tue, 26 Jan 2016 22:46:45 +0000 Subject: [PATCH 2304/5486] Fix errors identified by Casey Collaborator --- english/crazy/crazy.md | 3 ++- english/dig/dig.md | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/english/crazy/crazy.md b/english/crazy/crazy.md index 35dc31adbe..2080cdad7d 100644 --- a/english/crazy/crazy.md +++ b/english/crazy/crazy.md @@ -3,5 +3,6 @@ Crazy man! Do you... [Run](../run/run.md) -[Hide](..hide/hide-chk.md) + +[Hide](../hide/hide-chk.md) diff --git a/english/dig/dig.md b/english/dig/dig.md index 34e847ef40..879d9a6222 100644 --- a/english/dig/dig.md +++ b/english/dig/dig.md @@ -8,9 +8,12 @@ It says "hello" "Hello, Mr Bird!", you say, and spot a collar with a tag on it. -Upon inspecting the tag, you see it reads: "Nevermore: Rub me three times". Turning over the tag, you see: "If found, please return to: +Upon inspecting the tag, you see it reads: "Nevermore". Turning over the tag, you see: "If found, please return to: + Outis, 13 West Range, U. Virginia". +Below this it reads, "Rub me three times". + "Well, Nevermore, shall we return you to your owner?" Do you: From 7a9c5a76e41b1778203af6f00d84c4c6d28f2d2f Mon Sep 17 00:00:00 2001 From: Jethro Bodine Date: Tue, 26 Jan 2016 17:21:03 -0600 Subject: [PATCH 2305/5486] Add princessnell.md and modify turingtest.md --- english/turing-test/princessnell/princessnell.md | 3 +++ english/turing-test/turing-test.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/turing-test/princessnell/princessnell.md diff --git a/english/turing-test/princessnell/princessnell.md b/english/turing-test/princessnell/princessnell.md new file mode 100644 index 0000000000..51bf0305de --- /dev/null +++ b/english/turing-test/princessnell/princessnell.md @@ -0,0 +1,3 @@ +Princess Nell has learned about the world via a nearly-magical book entitled "A Young Lady's Illustrated Primer". +In this book, she has learned that the best Turing Test involves romantic subtleties. +She advises you to see if the marshmallow responds to courthsip practices. diff --git a/english/turing-test/turing-test.md b/english/turing-test/turing-test.md index aa24ab79f9..108c7a9616 100644 --- a/english/turing-test/turing-test.md +++ b/english/turing-test/turing-test.md @@ -28,4 +28,6 @@ Do you: [Forget Siri, asks Cortana](Cortana/ask_Cortana.md) -[If you really want to know something, ask OkGoogle](OkGoogle/ask_OkGoogle.md) \ No newline at end of file +[If you really want to know something, ask OkGoogle](OkGoogle/ask_OkGoogle.md) + +[Ask Princess Nell to help you decide if the marshmallow is a just a machine](princessnell/princessnell.md) From 3c32b2081a11f6080788b59973c73e9e52f2a416 Mon Sep 17 00:00:00 2001 From: Jethro Bodine Date: Tue, 26 Jan 2016 17:25:23 -0600 Subject: [PATCH 2306/5486] Fixed no newline at end of turing_test.md --- english/turing-test/turing-test.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/turing-test/turing-test.md b/english/turing-test/turing-test.md index 108c7a9616..b350649874 100644 --- a/english/turing-test/turing-test.md +++ b/english/turing-test/turing-test.md @@ -28,6 +28,6 @@ Do you: [Forget Siri, asks Cortana](Cortana/ask_Cortana.md) -[If you really want to know something, ask OkGoogle](OkGoogle/ask_OkGoogle.md) - [Ask Princess Nell to help you decide if the marshmallow is a just a machine](princessnell/princessnell.md) + +[If you really want to know something, ask OkGoogle](OkGoogle/ask_OkGoogle.md) From 67f0a462435609d627ec64455eac87af9002e44b Mon Sep 17 00:00:00 2001 From: Jethro Bodine Date: Tue, 26 Jan 2016 17:26:40 -0600 Subject: [PATCH 2307/5486] Trying to fix turing_test.md --- english/turing-test/turing-test.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/turing-test/turing-test.md b/english/turing-test/turing-test.md index b350649874..5e2d4a9235 100644 --- a/english/turing-test/turing-test.md +++ b/english/turing-test/turing-test.md @@ -8,6 +8,8 @@ At first you hear no response. And then, a deep rumble comes from all around. Do you: +[Ask Princess Nell to help you decide if the marshmallow is a just a machine](princessnell/princessnell.md) + [Realize that someone has poured a bucket of water on you.](bucket/water.md) [Realize that you are in the ghostbusters movie and wait for the marshmallow to explode](ghostbusters/ghostbusters.md) @@ -28,6 +30,5 @@ Do you: [Forget Siri, asks Cortana](Cortana/ask_Cortana.md) -[Ask Princess Nell to help you decide if the marshmallow is a just a machine](princessnell/princessnell.md) - [If you really want to know something, ask OkGoogle](OkGoogle/ask_OkGoogle.md) + From 5771da1ede226129208741b920b7c1a8469bb5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Matwiejczuk?= Date: Wed, 27 Jan 2016 00:34:21 +0100 Subject: [PATCH 2308/5486] Fix: Add option to sleep forever --- Polish/spanie/spaniee.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Polish/spanie/spaniee.md b/Polish/spanie/spaniee.md index 7f2bf2d809..067032a17f 100644 --- a/Polish/spanie/spaniee.md +++ b/Polish/spanie/spaniee.md @@ -2,4 +2,5 @@ Po obudzeniu się sytuacja się nie zmieniła! Co robisz? -[Start](../ptasieMleczko.md) \ No newline at end of file +[Start](../ptasieMleczko.md) +[Idziesz dalej spać](./spaniee.md) \ No newline at end of file From 2889f2cf545eab6ee373818faf6c8590277e6e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Matwiejczuk?= Date: Wed, 27 Jan 2016 00:38:12 +0100 Subject: [PATCH 2309/5486] Fix: Add newline --- Polish/spanie/spaniee.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Polish/spanie/spaniee.md b/Polish/spanie/spaniee.md index 067032a17f..33024a8b81 100644 --- a/Polish/spanie/spaniee.md +++ b/Polish/spanie/spaniee.md @@ -3,4 +3,5 @@ Po obudzeniu się sytuacja się nie zmieniła! Co robisz? [Start](../ptasieMleczko.md) + [Idziesz dalej spać](./spaniee.md) \ No newline at end of file From 95b74c59f7be2bfc7aa7d2c430a323b24239ccec Mon Sep 17 00:00:00 2001 From: pullart Date: Tue, 26 Jan 2016 19:04:30 -0800 Subject: [PATCH 2310/5486] Promote Mauritius as a vacation destination --- english/licked-cat/vacation.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/licked-cat/vacation.md b/english/licked-cat/vacation.md index 639d76a9af..b21bd9d9d9 100644 --- a/english/licked-cat/vacation.md +++ b/english/licked-cat/vacation.md @@ -1,3 +1,6 @@ It's time to take a vacation [here] (http://freguesiariofrio.pt/) Enjoy the trip! + +Once you're ready for your next vacation, +go to [Mauritius] (http://www.lonelyplanet.com/mauritius) From 10b01543117fecb8c4d79cb087c1f4ce880e151a Mon Sep 17 00:00:00 2001 From: Cody Metz Date: Tue, 26 Jan 2016 22:47:47 -0600 Subject: [PATCH 2311/5486] Add bake cookies link to free lunch file --- english/free-lunch/free-lunch.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/free-lunch/free-lunch.md b/english/free-lunch/free-lunch.md index 7ea8f6b152..cb17977d7c 100644 --- a/english/free-lunch/free-lunch.md +++ b/english/free-lunch/free-lunch.md @@ -2,3 +2,5 @@ Things that are offered for free always have a hidden cost. Sometimes somebody else pays that hidden cost, but usually it's you. + +Hey, all this talk about lunch makes me want to [bake cookies](../bake-cookies/bake-cookies.md) \ No newline at end of file From 2db6051c7490ff1529ce1feb5232267207e9a290 Mon Sep 17 00:00:00 2001 From: Cody Metz Date: Tue, 26 Jan 2016 22:50:42 -0600 Subject: [PATCH 2312/5486] Fix bake cookies link --- english/free-lunch/free-lunch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/free-lunch/free-lunch.md b/english/free-lunch/free-lunch.md index cb17977d7c..605a986dfc 100644 --- a/english/free-lunch/free-lunch.md +++ b/english/free-lunch/free-lunch.md @@ -3,4 +3,4 @@ Things that are offered for free always have a hidden cost. Sometimes somebody else pays that hidden cost, but usually it's you. -Hey, all this talk about lunch makes me want to [bake cookies](../bake-cookies/bake-cookies.md) \ No newline at end of file +Hey, all this talk about lunch makes me want to [bake cookies](/bake-cookies/bake-cookies.md) \ No newline at end of file From 9d16a8e152ec406947211331e16fb72049d3ec3f Mon Sep 17 00:00:00 2001 From: Cody Metz Date: Tue, 26 Jan 2016 22:52:58 -0600 Subject: [PATCH 2313/5486] Fix link for real this time --- english/free-lunch/free-lunch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/free-lunch/free-lunch.md b/english/free-lunch/free-lunch.md index 605a986dfc..a50c6a8a42 100644 --- a/english/free-lunch/free-lunch.md +++ b/english/free-lunch/free-lunch.md @@ -3,4 +3,4 @@ Things that are offered for free always have a hidden cost. Sometimes somebody else pays that hidden cost, but usually it's you. -Hey, all this talk about lunch makes me want to [bake cookies](/bake-cookies/bake-cookies.md) \ No newline at end of file +Hey, all this talk about lunch makes me want to [bake cookies](/bake-cookies/cookies.md) \ No newline at end of file From dd3b4331df680f6f690f5ecfc0faf8fee8c49fab Mon Sep 17 00:00:00 2001 From: Cody Metz Date: Tue, 26 Jan 2016 22:57:25 -0600 Subject: [PATCH 2314/5486] Fix the link eventually --- english/free-lunch/free-lunch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/free-lunch/free-lunch.md b/english/free-lunch/free-lunch.md index a50c6a8a42..d2611bf7b6 100644 --- a/english/free-lunch/free-lunch.md +++ b/english/free-lunch/free-lunch.md @@ -3,4 +3,4 @@ Things that are offered for free always have a hidden cost. Sometimes somebody else pays that hidden cost, but usually it's you. -Hey, all this talk about lunch makes me want to [bake cookies](/bake-cookies/cookies.md) \ No newline at end of file +Hey, all this talk about lunch makes me want to [bake cookies](../bake-cookies/cookies.md) \ No newline at end of file From d615464be42cb7ef58f75a336b5d199a87335696 Mon Sep 17 00:00:00 2001 From: fernando_luz Date: Wed, 27 Jan 2016 08:25:44 -0200 Subject: [PATCH 2315/5486] duvida do tijolo --- portugues/colaborando.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 24506508d5..cdc251f249 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -34,4 +34,6 @@ Mas te bateu uma fome danada e você não tem nada na geladeira e nenhum tostão Vende seu PC? [SIM](venda/sim.md) -[NÃO](nvenda/nao.md) \ No newline at end of file +[NÃO](nvenda/nao.md) + +Um tijolo pesa 1 quilo mais meio tijolo. Quanto pesa 1 tijolo e meio? From a84e7366b53cf2858502688d20c9d631d15f55c0 Mon Sep 17 00:00:00 2001 From: Mike Middleton Date: Wed, 27 Jan 2016 10:40:56 +0000 Subject: [PATCH 2316/5486] Edit to dig.md --- english/dig/dig.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/english/dig/dig.md b/english/dig/dig.md index 879d9a6222..fd2551612d 100644 --- a/english/dig/dig.md +++ b/english/dig/dig.md @@ -9,7 +9,6 @@ It says "hello" "Hello, Mr Bird!", you say, and spot a collar with a tag on it. Upon inspecting the tag, you see it reads: "Nevermore". Turning over the tag, you see: "If found, please return to: - Outis, 13 West Range, U. Virginia". Below this it reads, "Rub me three times". @@ -20,8 +19,6 @@ Do you: [Go to the University of Virginia, to find Outis the owner?](uva/uva.md) -[Rub the tag three times](../dragons/fire-everywhere.md) - [Sit back down, and go to sleep?](../sleep/more-sleep/more-sleep.md) [Go exploring outside?](../explore-outside/explore-outside.md) @@ -36,4 +33,6 @@ Do you: [sing-song "how do you do" back to the black bird](sing-greet/sing-greet.md) -[teach the bird how to worship lord](worship/worship.md) \ No newline at end of file +[teach the bird how to worship lord](worship/worship.md) + +[Rub the tag three times](../dragons/fire-everywhere.md) \ No newline at end of file From 0bb5975f7454f7655f090bdd1077e03df8f04a73 Mon Sep 17 00:00:00 2001 From: Jutta Braun Date: Wed, 27 Jan 2016 14:51:08 +0100 Subject: [PATCH 2317/5486] New choice in ruderboot.md --- german/ruderboot.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/ruderboot.md b/german/ruderboot.md index 35483b0417..a89ab7246c 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -24,4 +24,6 @@ Werden Sie: [Durchlcherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) -[Sie spren einen hllischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) \ No newline at end of file +[Sie spren einen hllischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) + +[Kopfber ins Wasser springen](Kopfsprung/Kopfsprung.md) \ No newline at end of file From 879f42a62af81945c3dd4cc4944896c60644f725 Mon Sep 17 00:00:00 2001 From: chilito11 Date: Wed, 27 Jan 2016 09:01:42 -0500 Subject: [PATCH 2318/5486] Add strange-room/room.md --- english/strange-room/room.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 english/strange-room/room.md diff --git a/english/strange-room/room.md b/english/strange-room/room.md new file mode 100644 index 0000000000..090686845a --- /dev/null +++ b/english/strange-room/room.md @@ -0,0 +1,10 @@ +You hear a strange noise then turn and see a large, wooden door. + +You knock, hear nothing and decide to enter. + +Upon entering, you see a sparsely furnished room with just a table, with a lit candle, and two chairs. + +It's obvious someone has been here recently but who? + + + From 78ce4c6fda66f5bd3a1ce30fec76e98f987c6beb Mon Sep 17 00:00:00 2001 From: chilito11 Date: Wed, 27 Jan 2016 09:27:52 -0500 Subject: [PATCH 2319/5486] add reference to room.md in marshmallow.md --- english/marshmallow.md | 4 ++++ english/strange-room/room.md | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 21547a68e2..886db2b9c5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -174,6 +174,10 @@ Something lightly brushes the back of your neck, sending a chill down your spine Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. +You hear a strange noise then turn and see a large, wooden door. + +You knock, hear nothing and decide to [enter](./strange-room/room.md). + Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air for alien life forms. diff --git a/english/strange-room/room.md b/english/strange-room/room.md index 090686845a..4d84b6c863 100644 --- a/english/strange-room/room.md +++ b/english/strange-room/room.md @@ -1,7 +1,3 @@ -You hear a strange noise then turn and see a large, wooden door. - -You knock, hear nothing and decide to enter. - Upon entering, you see a sparsely furnished room with just a table, with a lit candle, and two chairs. It's obvious someone has been here recently but who? From 1774d9fc241ae6346ff27979c88d8045414caea8 Mon Sep 17 00:00:00 2001 From: Haresh Shah Date: Wed, 27 Jan 2016 21:43:29 +0530 Subject: [PATCH 2320/5486] New line added to craving --- english/craving/craving.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/craving/craving.md b/english/craving/craving.md index aa7e3778c6..9e64126b44 100644 --- a/english/craving/craving.md +++ b/english/craving/craving.md @@ -3,3 +3,4 @@ You can't believe how powerful the craving is! You must have them now! You quickly put some in a bowl and cover them with Chocolate. [You begin eating!](../eating-walls/eating-marshmallows.md) +Really, try it...trust me...! \ No newline at end of file From ab8342f2ca239b3e3d99bc1611591846e4f85bc5 Mon Sep 17 00:00:00 2001 From: se000ra Date: Wed, 27 Jan 2016 18:17:31 +0100 Subject: [PATCH 2321/5486] Add option to dance on hands to dance --- russian/dance/dance-on-hands/dance-on-hands.md | 1 + russian/dance/dance.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 russian/dance/dance-on-hands/dance-on-hands.md diff --git a/russian/dance/dance-on-hands/dance-on-hands.md b/russian/dance/dance-on-hands/dance-on-hands.md new file mode 100644 index 0000000000..0b0da1bf86 --- /dev/null +++ b/russian/dance/dance-on-hands/dance-on-hands.md @@ -0,0 +1 @@ +Решение очевидно. Не двигаются ноги - будем танцевать на руках. diff --git a/russian/dance/dance.md b/russian/dance/dance.md index c29375dc90..78716f2553 100644 --- a/russian/dance/dance.md +++ b/russian/dance/dance.md @@ -8,3 +8,4 @@ [Когда вам страшно, вы всегда поете.](../light-fire/sing/sing.md) +[Танцуем на руках.](../dance/dance-on-hands/dance-on-hands.md) From ad323b1cf976f5c02e2bb10b1d337ff053035715 Mon Sep 17 00:00:00 2001 From: Victor Dorofeyev Date: Wed, 27 Jan 2016 21:08:36 +0300 Subject: [PATCH 2322/5486] Add new option for russian/zefir.md: away from this awful room --- russian/flowers/flowers.md | 6 ++++++ russian/zefir.md | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 russian/flowers/flowers.md diff --git a/russian/flowers/flowers.md b/russian/flowers/flowers.md new file mode 100644 index 0000000000..00588d5c60 --- /dev/null +++ b/russian/flowers/flowers.md @@ -0,0 +1,6 @@ +В порыве негодования вы выбежали из зефирной комнаты и очутились в ухоженном саду. С фиолетового неба приветливо +улыбается неизвестное светило из мермелада - кажется ваша жизнь начинает налаживаться. И вот вы уже радостно хлюпаете +по садовой дорожке, вымощенной взбитыми сливками. Вокруг столько красивых цветов! И все они такие необычные... А этот +странный аромат! Вот бы рассмотреть поближе тот голубой цветок, похожий на выдру! Ммм... Какой удивительный запах! У +вас кружится голова. От аромата чудесных растений вас клонит в сон. Вы лежите, уютно свернувшись калачиком... +[Ваши веки тяжелеют...](../zefir.md) \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index 38d2f08cba..d46d6ab04c 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -10,6 +10,8 @@ Ваши действия: +[Ненавижу зефир... Прочь из этой ужасной комнаты!](flowers/flowers.md) + [Открыть окно](window/window.md) [Задернуть занавеску](draw-curtain/drawing-curtain.md) From 4d595b25d4464a84d36ac7ff77e7499cfd57ffc7 Mon Sep 17 00:00:00 2001 From: se000ra Date: Wed, 27 Jan 2016 20:46:27 +0100 Subject: [PATCH 2323/5486] Change trombone on balalaika --- russian/gusli/gusli.md | 8 ++++++++ russian/zefir.md | 2 ++ 2 files changed, 10 insertions(+) create mode 100644 russian/gusli/gusli.md diff --git a/russian/gusli/gusli.md b/russian/gusli/gusli.md new file mode 100644 index 0000000000..970b4f6a7e --- /dev/null +++ b/russian/gusli/gusli.md @@ -0,0 +1,8 @@ +Невероятным усилем воли вам удается импортозаместить бездуховный трамбон на ладные гусли. +Звучание тлетворного джаза сменяет задорное треньканье балалайки. + +Но едва заметная щекотка в подмышечной впадине внезапно сменяется невыносимой чесоткой по всему телу. + +И запах. Исчез запах marshmallow. И возникает этот новый, резкий запах. + «Здесь русский дух, здесь Русью пахнет…» + diff --git a/russian/zefir.md b/russian/zefir.md index 38d2f08cba..6ced08644e 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -10,6 +10,8 @@ Ваши действия: +[Импортозаместить тромбон на гусли](gusli/gusli.md) + [Открыть окно](window/window.md) [Задернуть занавеску](draw-curtain/drawing-curtain.md) From 31846cfed7ec5c9798987d4926ade34378ff542d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20M=C3=A4der?= Date: Wed, 27 Jan 2016 21:28:42 +0100 Subject: [PATCH 2324/5486] Fix german - alkohol spelling mistakes, added Bier --- german/Alkohol/alkohol.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/german/Alkohol/alkohol.md b/german/Alkohol/alkohol.md index 8a48ed78d7..8eb9087e02 100644 --- a/german/Alkohol/alkohol.md +++ b/german/Alkohol/alkohol.md @@ -1,5 +1,6 @@ -Sie versuchen die letzte Nach zu rekonstruieren. Sie erinnern sich daran, -dass Sie angetrunken mit Ihren 3 besten Freunde ins Boot gestiegen sind, -können sich jedoch seitdem an nichts mehr erinnern. Schließlich hatten Sie acht Tequila. +Sie versuchen die letzte Nacht zu rekonstruieren. Sie erinnern sich daran, +dass Sie angetrunken mit Ihren 3 besten Freunden ins Boot gestiegen sind, +können sich jedoch seitdem an nichts mehr erinnern. Schließlich hatten Sie acht Tequila +und 5 Bier. Was ist passiert? From 2984bb58263a21ed0d3106611efc068ef900afa6 Mon Sep 17 00:00:00 2001 From: maederp Date: Wed, 27 Jan 2016 21:39:27 +0100 Subject: [PATCH 2325/5486] updated alcohol.md remove fixes --- german/Alkohol/alkohol.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/german/Alkohol/alkohol.md b/german/Alkohol/alkohol.md index 8eb9087e02..e77c79f976 100644 --- a/german/Alkohol/alkohol.md +++ b/german/Alkohol/alkohol.md @@ -1,5 +1,5 @@ -Sie versuchen die letzte Nacht zu rekonstruieren. Sie erinnern sich daran, -dass Sie angetrunken mit Ihren 3 besten Freunden ins Boot gestiegen sind, +Sie versuchen die letzte Nach zu rekonstruieren. Sie erinnern sich daran, +dass Sie angetrunken mit Ihren 3 besten Freunde ins Boot gestiegen sind, können sich jedoch seitdem an nichts mehr erinnern. Schließlich hatten Sie acht Tequila und 5 Bier. From 4e539a44c66e7cfa23baf68e153e269b289a2313 Mon Sep 17 00:00:00 2001 From: maederp Date: Wed, 27 Jan 2016 21:40:48 +0100 Subject: [PATCH 2326/5486] Updated alcohol.md --- german/Alkohol/alkohol.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/german/Alkohol/alkohol.md b/german/Alkohol/alkohol.md index e77c79f976..79e7c2df01 100644 --- a/german/Alkohol/alkohol.md +++ b/german/Alkohol/alkohol.md @@ -1,6 +1,6 @@ Sie versuchen die letzte Nach zu rekonstruieren. Sie erinnern sich daran, dass Sie angetrunken mit Ihren 3 besten Freunde ins Boot gestiegen sind, -können sich jedoch seitdem an nichts mehr erinnern. Schließlich hatten Sie acht Tequila -und 5 Bier. +können sich jedoch seitdem an nichts mehr erinnern. Schließlich hatten Sie acht Tequila. +Vorab tranken sie bereits 5 Bier. Was ist passiert? From 1606b9e1cbba274f3d6efd63e27269dd208fa29b Mon Sep 17 00:00:00 2001 From: R M Date: Thu, 28 Jan 2016 00:04:03 -0500 Subject: [PATCH 2327/5486] Add fortune/fortune.md with link in marshmallow.md --- english/fortune/fortune.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/fortune/fortune.md diff --git a/english/fortune/fortune.md b/english/fortune/fortune.md new file mode 100644 index 0000000000..6e633ecca3 --- /dev/null +++ b/english/fortune/fortune.md @@ -0,0 +1 @@ +Whoever wants to reach a distant goal must make small steps. diff --git a/english/marshmallow.md b/english/marshmallow.md index 886db2b9c5..6b10d24308 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -757,3 +757,5 @@ The divergence is coming, [survive](divergence/divergence.md) or perish? You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) "What a joke?", he said, after looking at the [news](joke/joke.md) + +Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... From fb937ae9cc2b09635bf187d9547e87d71ab4b884 Mon Sep 17 00:00:00 2001 From: Mitesh Vartak Date: Thu, 28 Jan 2016 12:31:25 +0530 Subject: [PATCH 2328/5486] Added comment in Marathi. --- Marathi/marathi.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marathi/marathi.md b/Marathi/marathi.md index e2544ae6f9..8bbe9bd128 100644 --- a/Marathi/marathi.md +++ b/Marathi/marathi.md @@ -1,3 +1,4 @@ मराठी विश्वात आपले स्वागत आहे चार प्राइवेट ड्राइव पत्त्यावर राहणार्‍या श्री. आणि सौ. डर्सलीना आपण सामान्य असल्याचा अतिशय अभिमान होता. -गणपती उत्सवात आपले हार्दिक स्वागत. \ No newline at end of file +गणपती उत्सवात आपले हार्दिक स्वागत. +मराठी विश्व खुप सुंदर आहे. \ No newline at end of file From 9439d317436a511d1fa36510debfbeb15c8a469c Mon Sep 17 00:00:00 2001 From: rcyl Date: Thu, 28 Jan 2016 08:52:40 +0100 Subject: [PATCH 2329/5486] Add line after "one option left" --- english/light-fire/extinguish-fire/extinguish-fire.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/light-fire/extinguish-fire/extinguish-fire.md b/english/light-fire/extinguish-fire/extinguish-fire.md index a76fa33379..134bdd2339 100644 --- a/english/light-fire/extinguish-fire/extinguish-fire.md +++ b/english/light-fire/extinguish-fire/extinguish-fire.md @@ -9,3 +9,5 @@ The marshmallow hardens around your feet leaving you with limited movement. You have a chainsaw nearby but you cant cut through marshmallow. You have only one option left. + +But you won't like it. From 6c2bf90e629b1c94c3d8855e9b1b557817f5a68a Mon Sep 17 00:00:00 2001 From: amh Date: Thu, 28 Jan 2016 19:06:06 +0800 Subject: [PATCH 2330/5486] Added option another option to "choose pills" --- english/choose-pill/choose-pill.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/choose-pill/choose-pill.md b/english/choose-pill/choose-pill.md index 7bc1a4f99a..8628e7388d 100644 --- a/english/choose-pill/choose-pill.md +++ b/english/choose-pill/choose-pill.md @@ -6,4 +6,6 @@ Just get me out of this marshmellow! This is your last chance. After this, there is no turning back. You take the blue pill—the story ends, you wake up in your bed and believe whatever you want to believe. -You take the red pill—you stay in Wonderland, and I show you how deep the rabbit hole goes. \ No newline at end of file +You take the red pill—you stay in Wonderland, and I show you how deep the rabbit hole goes. + +One last option is you take both pills and whichever is more potent wins. (not recommended) \ No newline at end of file From 30645bd80c32ef4aac2e17ef764ffb477455aad8 Mon Sep 17 00:00:00 2001 From: Sabin Maharjan Date: Thu, 28 Jan 2016 17:13:59 +0545 Subject: [PATCH 2331/5486] my commit --- nepali/aalchi lagyo/alchi.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 nepali/aalchi lagyo/alchi.md diff --git a/nepali/aalchi lagyo/alchi.md b/nepali/aalchi lagyo/alchi.md new file mode 100644 index 0000000000..16c8d895c6 --- /dev/null +++ b/nepali/aalchi lagyo/alchi.md @@ -0,0 +1,7 @@ +Yo k k ho description ma padnai alchi lagyo + +euta link halnu re ani... + +haha + +lata google ko [link] (www.google.com) \ No newline at end of file From 29bb2ba75f9a838a94cdb10d1008dbaf25048c95 Mon Sep 17 00:00:00 2001 From: Sabin Maharjan Date: Thu, 28 Jan 2016 17:17:00 +0545 Subject: [PATCH 2332/5486] my commit1 --- nepali/aalchi lagyo/alchi.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nepali/aalchi lagyo/alchi.md b/nepali/aalchi lagyo/alchi.md index 16c8d895c6..747f8e5f34 100644 --- a/nepali/aalchi lagyo/alchi.md +++ b/nepali/aalchi lagyo/alchi.md @@ -4,4 +4,4 @@ euta link halnu re ani... haha -lata google ko [link] (www.google.com) \ No newline at end of file +lata google ko [link] (https://www.google.com) \ No newline at end of file From 3dbe4b76d5da41856f8ce590236d32f0a5d012bf Mon Sep 17 00:00:00 2001 From: mehanelson Date: Thu, 28 Jan 2016 15:21:47 +0000 Subject: [PATCH 2333/5486] Add two lines First line links to an existing link Next line links to a new link Both lines added at the end of file --- english/marshmallow.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6b10d24308..8c8224e379 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -759,3 +759,7 @@ You decide to work on one of your [big projects...](https://www.youtube.com/watc "What a joke?", he said, after looking at the [news](joke/joke.md) Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... + +The [news](joke/joke.md) says it all my people! + +Bible says... As you sow, so shall you [reap](think/growrich.md) From 23b9f0913bfafbfb756fccb5b14aa40fca9634ba Mon Sep 17 00:00:00 2001 From: mehanelson Date: Thu, 28 Jan 2016 15:26:27 +0000 Subject: [PATCH 2334/5486] Add new file New file with two lines of text and no links A dead-end page --- english/think/growrich.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/think/growrich.md diff --git a/english/think/growrich.md b/english/think/growrich.md new file mode 100644 index 0000000000..2ba73e93b2 --- /dev/null +++ b/english/think/growrich.md @@ -0,0 +1,2 @@ +Success is not an elusive, esoteric, god-like feature that only the special amongst us can have. It truly exists! +And each one of us is capable of achieving it. From f7234e90ed0b447fe4fdf7e7c05232d9ea343410 Mon Sep 17 00:00:00 2001 From: mehanelson Date: Thu, 28 Jan 2016 15:31:28 +0000 Subject: [PATCH 2335/5486] Add options and their respective links Added links to the dead-end page to existing pages --- english/think/growrich.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/think/growrich.md b/english/think/growrich.md index 2ba73e93b2..500f42ea91 100644 --- a/english/think/growrich.md +++ b/english/think/growrich.md @@ -1,2 +1,4 @@ Success is not an elusive, esoteric, god-like feature that only the special amongst us can have. It truly exists! And each one of us is capable of achieving it. +Love your [neighbour](talk_to_neighbour/talk_to_neighbour.md) as you love yourself. +That [fire](light-fire/fire.md) is present in each one of us. Never let it burn out! From 736d96392cf10a3a023e723368da00c329ca736e Mon Sep 17 00:00:00 2001 From: mehanelson Date: Thu, 28 Jan 2016 15:35:23 +0000 Subject: [PATCH 2336/5486] Debug previous link paths Previous links were directing to 404 error So find out the bug and made that direct to pages that exist --- english/think/growrich.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/think/growrich.md b/english/think/growrich.md index 500f42ea91..edac4e6d02 100644 --- a/english/think/growrich.md +++ b/english/think/growrich.md @@ -1,4 +1,4 @@ Success is not an elusive, esoteric, god-like feature that only the special amongst us can have. It truly exists! And each one of us is capable of achieving it. -Love your [neighbour](talk_to_neighbour/talk_to_neighbour.md) as you love yourself. -That [fire](light-fire/fire.md) is present in each one of us. Never let it burn out! +Love your [neighbour](loveneighbour/neighbour.md) as you love yourself. +That [fire](fire/lightfire.md) is present in each one of us. Never let it burn out! From 7b361da9a92ca70d77c3ac79cfde1c7063502986 Mon Sep 17 00:00:00 2001 From: mehanelson Date: Thu, 28 Jan 2016 15:38:00 +0000 Subject: [PATCH 2337/5486] Create new file that connect to a link --- english/think/loveneighbour/neighbour.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/think/loveneighbour/neighbour.md diff --git a/english/think/loveneighbour/neighbour.md b/english/think/loveneighbour/neighbour.md new file mode 100644 index 0000000000..362568ae9b --- /dev/null +++ b/english/think/loveneighbour/neighbour.md @@ -0,0 +1,2 @@ +If you cannot love your neighbour, why do you say you love me? +Every being on this earth has been made in the image and likeness of God From f4c64d6ebb65225db99e272de67fcdd9268c24cd Mon Sep 17 00:00:00 2001 From: mehanelson Date: Thu, 28 Jan 2016 15:41:06 +0000 Subject: [PATCH 2338/5486] Add another file to connect to second link --- english/think/fire/lightfire.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/think/fire/lightfire.md diff --git a/english/think/fire/lightfire.md b/english/think/fire/lightfire.md new file mode 100644 index 0000000000..d27e743df4 --- /dev/null +++ b/english/think/fire/lightfire.md @@ -0,0 +1,3 @@ +You are not the avatars you create, you are the light that shines through you. +And as you walk past these door, remember that you will have just two choices: +love and fear. Choose love and never let fear stop you! From d1a90e089d3cf8d2a39a5393fa0811279ef8aaf0 Mon Sep 17 00:00:00 2001 From: mehanelson Date: Thu, 28 Jan 2016 15:43:51 +0000 Subject: [PATCH 2339/5486] Add blank lines between options --- english/think/growrich.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/think/growrich.md b/english/think/growrich.md index edac4e6d02..a546f2249e 100644 --- a/english/think/growrich.md +++ b/english/think/growrich.md @@ -1,4 +1,8 @@ Success is not an elusive, esoteric, god-like feature that only the special amongst us can have. It truly exists! And each one of us is capable of achieving it. + + Love your [neighbour](loveneighbour/neighbour.md) as you love yourself. + + That [fire](fire/lightfire.md) is present in each one of us. Never let it burn out! From b78544b5d93444b19851dcd860097f4fcd1aed17 Mon Sep 17 00:00:00 2001 From: Long Tran Date: Thu, 28 Jan 2016 11:28:33 -0500 Subject: [PATCH 2340/5486] add more info for vn --- vietnamese/SaiGon/SaiGon.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vietnamese/SaiGon/SaiGon.md b/vietnamese/SaiGon/SaiGon.md index c84e54a0dd..fd6cfbeaa5 100644 --- a/vietnamese/SaiGon/SaiGon.md +++ b/vietnamese/SaiGon/SaiGon.md @@ -1 +1,3 @@ -Sài Gòn là 1 trong 2 thành phố nổi tiếng nhất ở Việt Nam ngoài Hà Nội. Sài Gòn thành phố rất nhộn nhịp và phát triển. \ No newline at end of file +Sài Gòn là 1 trong 2 thành phố nổi tiếng nhất ở Việt Nam ngoài Hà Nội. Sài Gòn thành phố rất nhộn nhịp và phát triển. + +Sai Gon duoc vi nhu thanh pho Toronto o Canada \ No newline at end of file From 308e797c583e28d3694275e584f8224d5dab4572 Mon Sep 17 00:00:00 2001 From: anukalp14 Date: Fri, 29 Jan 2016 00:53:10 +0530 Subject: [PATCH 2341/5486] Added link for gujarati --- language.md | 1 + 1 file changed, 1 insertion(+) diff --git a/language.md b/language.md index 5cb511ed97..5cf31d676e 100644 --- a/language.md +++ b/language.md @@ -130,3 +130,4 @@ Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) ======= Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) +If you speak Gujarati, go [here](Gujarati/gujarati.md) From ca7793e4aa2b4cb9f1160be36a6992c1a3738199 Mon Sep 17 00:00:00 2001 From: anukalp14 Date: Fri, 29 Jan 2016 01:00:44 +0530 Subject: [PATCH 2342/5486] Added Gujarati directory and gujarati.md page --- Gujarati/gujarati.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Gujarati/gujarati.md diff --git a/Gujarati/gujarati.md b/Gujarati/gujarati.md new file mode 100644 index 0000000000..0deedef950 --- /dev/null +++ b/Gujarati/gujarati.md @@ -0,0 +1,3 @@ +When object to be gained is sufficiently valued, +and efforts towards its attainment are persistently +followed without intermission, then the steadiness of mind is secured. From 6310d4998f06bcfe09b880fd940d9c2ace58c97a Mon Sep 17 00:00:00 2001 From: anukalp14 Date: Fri, 29 Jan 2016 01:01:38 +0530 Subject: [PATCH 2343/5486] Added period at the end of the sentence. --- language.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language.md b/language.md index 5cf31d676e..c7a714d2bb 100644 --- a/language.md +++ b/language.md @@ -130,4 +130,4 @@ Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) ======= Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) -If you speak Gujarati, go [here](Gujarati/gujarati.md) +If you speak Gujarati, go [here](Gujarati/gujarati.md). From 3dc5a573112e314953dcae4ce9305f18be3c04eb Mon Sep 17 00:00:00 2001 From: anukalp14 Date: Fri, 29 Jan 2016 01:04:39 +0530 Subject: [PATCH 2344/5486] Added newline --- language.md | 1 + 1 file changed, 1 insertion(+) diff --git a/language.md b/language.md index c7a714d2bb..a35f4918e1 100644 --- a/language.md +++ b/language.md @@ -130,4 +130,5 @@ Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) ======= Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) + If you speak Gujarati, go [here](Gujarati/gujarati.md). From fe77a3a65a6fec64be3ea59d6650a2fb2757ad5a Mon Sep 17 00:00:00 2001 From: Justin V Date: Thu, 28 Jan 2016 19:33:53 -0500 Subject: [PATCH 2345/5486] Bring some steeler love to udacity! --- english/marshmallow.md | 2 ++ english/steelers/steelers.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/steelers/steelers.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 8c8224e379..2e744c3eae 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -763,3 +763,5 @@ Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... The [news](joke/joke.md) says it all my people! Bible says... As you sow, so shall you [reap](think/growrich.md) + +So shall you reap, and the [steelers](steelers/steelers.md) know that all too well! diff --git a/english/steelers/steelers.md b/english/steelers/steelers.md new file mode 100644 index 0000000000..d4725d9d75 --- /dev/null +++ b/english/steelers/steelers.md @@ -0,0 +1 @@ +Hah, just a ruse to get someone else to join Steeler Nation, ZING! \ No newline at end of file From d3b231fd686ac919d21f9836291a112a6c3ad221 Mon Sep 17 00:00:00 2001 From: dvdmon Date: Thu, 28 Jan 2016 21:51:29 -0500 Subject: [PATCH 2346/5486] Change the modified file so that I was not altering a line, just adding a line. --- english/procrastinate/procrastinate.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/procrastinate/procrastinate.md b/english/procrastinate/procrastinate.md index ee16c62746..b5c008d6e1 100644 --- a/english/procrastinate/procrastinate.md +++ b/english/procrastinate/procrastinate.md @@ -10,4 +10,6 @@ do a search for "Wait but why". Read the articles on procrastination. -Have (pseudo) fun in your [Dark Playground](grue/grue.md)! +Have (pseudo) fun in your Dark Playground! + +But [be careful](grue/grue.md)! From 48fdc4611cd55374e53566f0a7a45c1d00111c9c Mon Sep 17 00:00:00 2001 From: darius boey Date: Thu, 28 Jan 2016 21:49:46 -0800 Subject: [PATCH 2347/5486] Add camelot path in english --- english/camelot/camelot.md | 3 +++ english/marshmallow.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 english/camelot/camelot.md diff --git a/english/camelot/camelot.md b/english/camelot/camelot.md new file mode 100644 index 0000000000..27415c9963 --- /dev/null +++ b/english/camelot/camelot.md @@ -0,0 +1,3 @@ +In the distance you see a grand castle on a hill. [Camelot!](https://www.youtube.com/watch?v=P8ghXxXyAuw) +On second thought, lets not go to Camelot. It is a silly place. +[You turn back and reconsider your options.](../marshmallow.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 6b10d24308..fbf069908b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -736,6 +736,8 @@ You may either do [this](gtd/gtd.md), "I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." +Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! + "Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? From 95cf0b8696e91b003d11e40c757d040f3b034ae0 Mon Sep 17 00:00:00 2001 From: Jason Hart Date: Fri, 29 Jan 2016 12:38:33 -0800 Subject: [PATCH 2348/5486] link to Marshmallow Overcoat cover of Love song. --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 2e744c3eae..17a78bd175 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -765,3 +765,5 @@ The [news](joke/joke.md) says it all my people! Bible says... As you sow, so shall you [reap](think/growrich.md) So shall you reap, and the [steelers](steelers/steelers.md) know that all too well! + +Until you realize that even marshmallows need [LOVE](https://www.youtube.com/watch?v=i5fZ__mnHbU). From 1e4475cc53f083055782b854a8b7cf63939baab4 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 30 Jan 2016 13:09:54 +0100 Subject: [PATCH 2349/5486] Somrius --- catala/somrius/somrius.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 catala/somrius/somrius.md diff --git a/catala/somrius/somrius.md b/catala/somrius/somrius.md new file mode 100644 index 0000000000..42ebe5565a --- /dev/null +++ b/catala/somrius/somrius.md @@ -0,0 +1,9 @@ +Somrius. Content i feliç com quan eres un nen. + +El somni de la teva vida de trobar una casa de núvols de sucre, com el d'en Hansel i la Gretel, s'ha complert! + +Prens un bocí de núvol i recordes que vols volar. unes ales t'apareixen a l'esquena. Ara tens un dilema, què fas? + +[Continues menjant núvols de sucre](create-your-own-adventure/catala/menjar/menjar.md) + +[Surts per la finestra i alces el vol](create-your-own-adventure/catala/somrius/icar/icar.md) From 13e1b5ecac82edcd0086bb9561922b8f2a893fd9 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 30 Jan 2016 13:15:02 +0100 Subject: [PATCH 2350/5486] Icar l'home ocell --- catala/somrius/icar/icar.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 catala/somrius/icar/icar.md diff --git a/catala/somrius/icar/icar.md b/catala/somrius/icar/icar.md new file mode 100644 index 0000000000..03e0a61914 --- /dev/null +++ b/catala/somrius/icar/icar.md @@ -0,0 +1,5 @@ +Emprens el vol, com un ocell! + +Puges als cims més alts. Sobrevoles rius i llacs, i mars + +L'aventura només a començat! \ No newline at end of file From 4e9b22579a0bf60a0ad40ebd50ab1c9ea7ded801 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 30 Jan 2016 13:17:53 +0100 Subject: [PATCH 2351/5486] =?UTF-8?q?Afegim=20una=20nova=20opci=C3=B3:=20s?= =?UTF-8?q?omrius?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- catala/catala.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/catala/catala.md b/catala/catala.md index cd3d0e4efa..a5fce5e9c6 100644 --- a/catala/catala.md +++ b/catala/catala.md @@ -19,3 +19,5 @@ Què fas? [T'aixeques del llit](aixecar/aixecar.md) [Comences a menjar sucre desesperadament](menjar/menjar.md) + +[somrius](somrius/somrius.md) \ No newline at end of file From 71d235f4843277f9b372dd96a3f100b01ec5ef49 Mon Sep 17 00:00:00 2001 From: Miguel Domingos Date: Sat, 30 Jan 2016 18:03:49 +0000 Subject: [PATCH 2352/5486] Added my contribution --- portugues_pt/ensino/alternativo.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 portugues_pt/ensino/alternativo.md diff --git a/portugues_pt/ensino/alternativo.md b/portugues_pt/ensino/alternativo.md new file mode 100644 index 0000000000..5389415d3a --- /dev/null +++ b/portugues_pt/ensino/alternativo.md @@ -0,0 +1 @@ +Lutar por um sistema de ensino alternativo, que reconhecesse as qualidades únicas de cada ser humano. From 15ad521824f71e9f3e494f7f8adb86b8b8244c2d Mon Sep 17 00:00:00 2001 From: Mike-Sundays Date: Sat, 30 Jan 2016 20:06:06 +0000 Subject: [PATCH 2353/5486] added a link to ensino --- portugues_pt/colaborar.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index 087e233552..2cb785a81a 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -14,6 +14,8 @@ Contribuía para [obras de caridade](caridade/caridade.md) Compraria [componentes eletronicos](componentes/componentes.md) +Revolucionava o sistema de ensino[ensino](ensino/alternativa.md) + Usava um repositorio privado. -Ia ao Japão driftar em Tsukuba. \ No newline at end of file +Ia ao Japão driftar em Tsukuba. From f61708b137bdc4dd1c7a66677a26c09e10a0fd35 Mon Sep 17 00:00:00 2001 From: Mike-Sundays Date: Sat, 30 Jan 2016 20:06:20 +0000 Subject: [PATCH 2354/5486] Update colaborar.md --- portugues_pt/colaborar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index 2cb785a81a..02779f87e8 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -14,7 +14,7 @@ Contribuía para [obras de caridade](caridade/caridade.md) Compraria [componentes eletronicos](componentes/componentes.md) -Revolucionava o sistema de ensino[ensino](ensino/alternativa.md) +Revolucionava o sistema de [ensino](ensino/alternativa.md) Usava um repositorio privado. From c9fa13127133eb51963369183e029cc4c3320d4d Mon Sep 17 00:00:00 2001 From: Mike-Sundays Date: Sat, 30 Jan 2016 20:10:23 +0000 Subject: [PATCH 2355/5486] Update colaborar.md --- portugues_pt/colaborar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index 02779f87e8..b3a488d5ad 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -14,7 +14,7 @@ Contribuía para [obras de caridade](caridade/caridade.md) Compraria [componentes eletronicos](componentes/componentes.md) -Revolucionava o sistema de [ensino](ensino/alternativa.md) +Revolucionava o sistema de [ensino](ensino/alternativo.md) Usava um repositorio privado. From c885da7b0557e88d5a592781ca1f8f23e91b565a Mon Sep 17 00:00:00 2001 From: abdullah al-rumih Date: Sat, 30 Jan 2016 14:33:23 -0600 Subject: [PATCH 2356/5486] contrbute to dream --- arabic/dream/dream.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arabic/dream/dream.md b/arabic/dream/dream.md index bcac1d2b8a..78972bd625 100644 --- a/arabic/dream/dream.md +++ b/arabic/dream/dream.md @@ -3,4 +3,5 @@ ولكن الاحلام لا تتحقق الا بالتوكل على الله والاخذ بالاسباب الان انت فى بداية الطريق ماذا ستفعل 1-[ستبدأ فى التعلم](../learn/learn.md) -لكل مخلوق حاجة ولكل حاجة غاية \ No newline at end of file +لكل مخلوق حاجة ولكل حاجة غاية +لكن لا تسرف بالاحلام فقد تصطدم بالواقع \ No newline at end of file From be53c106bb3a8dfdf2ee87f15926edaf0bf757b8 Mon Sep 17 00:00:00 2001 From: Magcox5 Date: Sat, 30 Jan 2016 12:39:05 -0800 Subject: [PATCH 2357/5486] Added a mermaid to the story --- english/marshmallow.md | 2 ++ english/mermaid/mermaid.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/mermaid/mermaid.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 8c8224e379..1d8e03cbbe 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -763,3 +763,5 @@ Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... The [news](joke/joke.md) says it all my people! Bible says... As you sow, so shall you [reap](think/growrich.md) + +You look up and out to the ocean. In the distance you see a [mermaid](mermaid/mermaid.md) \ No newline at end of file diff --git a/english/mermaid/mermaid.md b/english/mermaid/mermaid.md new file mode 100644 index 0000000000..a97965382d --- /dev/null +++ b/english/mermaid/mermaid.md @@ -0,0 +1,3 @@ +She calls to you on the shore, inviting you into the ocean. + +This will solve all your problems, you think... \ No newline at end of file From f1d8b28453202ac4097564caa020b1a71c3a124d Mon Sep 17 00:00:00 2001 From: toshiharutf Date: Sat, 30 Jan 2016 17:25:19 -0500 Subject: [PATCH 2358/5486] Add battle resolution with two different outputs --- espanol/canudos.md | 6 +++++- espanol/dark_side/dark_side.md | 2 ++ espanol/light_side/light_side.md | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 espanol/dark_side/dark_side.md create mode 100644 espanol/light_side/light_side.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 5362b6b3af..fe9bd60caa 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -1,4 +1,4 @@ -En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la +En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: @@ -105,3 +105,7 @@ Conectó su guitarra al amplificador y se puso a tocar una versión de "Siempre A pero si no leiste el cuento del cuco, entonces significa que no tienes [miedo] (miedo/miedo.md) [Puso su mano derecha en su frente y se teletransportó al centro del ejército enemigo](pelea_epica/pelea_epica.md) + +Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. +[Dark_side](dark_side/dark_side.md) +[Light_side](light_side/light_side.md) \ No newline at end of file diff --git a/espanol/dark_side/dark_side.md b/espanol/dark_side/dark_side.md new file mode 100644 index 0000000000..24f25e6889 --- /dev/null +++ b/espanol/dark_side/dark_side.md @@ -0,0 +1,2 @@ +Haciendo uso de la fuerza, desbord un ro de lava ardiente de un volcn cercano. +Ni siquiera quedaron los restos para ser velados... \ No newline at end of file diff --git a/espanol/light_side/light_side.md b/espanol/light_side/light_side.md new file mode 100644 index 0000000000..1af5652c84 --- /dev/null +++ b/espanol/light_side/light_side.md @@ -0,0 +1 @@ +De un ro cercano, el maestro desvi su cauce sobre el enemigo, obligndolos a retirarse. \ No newline at end of file From b942276fc6c324b9c57545cf57da069439a5a465 Mon Sep 17 00:00:00 2001 From: toshiharutf Date: Sat, 30 Jan 2016 17:30:47 -0500 Subject: [PATCH 2359/5486] Fix blank --- espanol/canudos.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index fe9bd60caa..1ac4effbf6 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -1,4 +1,5 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la + república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: From b13ef4060cab39643de8555b09c3be3f569fa081 Mon Sep 17 00:00:00 2001 From: toshiharutf Date: Sat, 30 Jan 2016 17:34:00 -0500 Subject: [PATCH 2360/5486] Restore with original file --- espanol/canudos.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 1ac4effbf6..5362b6b3af 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -1,5 +1,4 @@ -En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la - +En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: @@ -106,7 +105,3 @@ Conectó su guitarra al amplificador y se puso a tocar una versión de "Siempre A pero si no leiste el cuento del cuco, entonces significa que no tienes [miedo] (miedo/miedo.md) [Puso su mano derecha en su frente y se teletransportó al centro del ejército enemigo](pelea_epica/pelea_epica.md) - -Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. -[Dark_side](dark_side/dark_side.md) -[Light_side](light_side/light_side.md) \ No newline at end of file From 5d0edef032497abe0492db091af1fdc44dd1210d Mon Sep 17 00:00:00 2001 From: toshiharutf Date: Sat, 30 Jan 2016 17:38:51 -0500 Subject: [PATCH 2361/5486] Fix some issues 2 --- espanol/canudos.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index 5362b6b3af..1e7b24cd8e 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -105,3 +105,7 @@ Conectó su guitarra al amplificador y se puso a tocar una versión de "Siempre A pero si no leiste el cuento del cuco, entonces significa que no tienes [miedo] (miedo/miedo.md) [Puso su mano derecha en su frente y se teletransportó al centro del ejército enemigo](pelea_epica/pelea_epica.md) + +Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. +[Dark_side](dark_side/dark_side.md) +[Light_side](light_side/light_side.md) From 27a6f5875b74cf4a8602c375738a4a07f87cdcbf Mon Sep 17 00:00:00 2001 From: toshiharutf Date: Sat, 30 Jan 2016 17:42:47 -0500 Subject: [PATCH 2362/5486] Add blank line --- espanol/canudos.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 1e7b24cd8e..1121f4077b 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -107,5 +107,7 @@ A pero si no leiste el cuento del cuco, entonces significa que no tienes [miedo] [Puso su mano derecha en su frente y se teletransportó al centro del ejército enemigo](pelea_epica/pelea_epica.md) Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. -[Dark_side](dark_side/dark_side.md) -[Light_side](light_side/light_side.md) + +- [Dark_side](dark_side/dark_side.md) + +- [Light_side](light_side/light_side.md) From 703890b392684be3a3cb14567b4153525fe2973a Mon Sep 17 00:00:00 2001 From: conflictor Date: Sun, 31 Jan 2016 00:57:48 -0800 Subject: [PATCH 2363/5486] docs: Add line about inconsistent memory --- english/memories/memories.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/memories/memories.md b/english/memories/memories.md index bd6987fd32..58ffc9728c 100644 --- a/english/memories/memories.md +++ b/english/memories/memories.md @@ -4,8 +4,10 @@ Where do they come from? Why can I only remember the past and not the future? +Why do my memories seem so inconsistent? + The first thing I remember is the cold tile floor. The last thing I remember is the dark moment as my eyelids fell as sleep came over me. -Then went the [alarm](ground-hog/wakeup.md). \ No newline at end of file +Then went the [alarm](ground-hog/wakeup.md). From 6ea0d5af4b6ccfe902cc43bdf3e45fa0ff8e89fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domingo=20L=C3=B3pez=20Franco?= Date: Sun, 31 Jan 2016 10:26:48 +0100 Subject: [PATCH 2364/5486] O gato opta por masaxear cas patas dianteiras --- galician/costumes/costumes.md | 1 + galician/lua.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 galician/costumes/costumes.md diff --git a/galician/costumes/costumes.md b/galician/costumes/costumes.md new file mode 100644 index 0000000000..471033abeb --- /dev/null +++ b/galician/costumes/costumes.md @@ -0,0 +1 @@ +Esta vez tiria que subir a cama, pra masaxear os seus donos cas suas patas dianteiras ata que espertasen. \ No newline at end of file diff --git a/galician/lua.md b/galician/lua.md index c60825e49d..d29e2b3d0f 100644 --- a/galician/lua.md +++ b/galician/lua.md @@ -2,3 +2,5 @@ Un día máis, Lúa achegouse con ledicia á porta tras a que os seus donos (e a e rañar na porta para que espertasen. Porén, a diferenza do resto dos días, esa vez: [Era distinto](dixital/dixital.md) + +[Non espertaban](costumes/costumes.md) From 6df52e8ee0f4a28a64e1733124a11c31892f19af Mon Sep 17 00:00:00 2001 From: Spencer Hersom Date: Sun, 31 Jan 2016 02:16:17 -0800 Subject: [PATCH 2365/5486] docs: Add scenario with Mrs. Lancaster's father As an extra detail, this commit is meant to create a conflict in the memories file to be able to try out the last part of the Udacity lesson. --- english/memories/ground-hog/all-wrong/all-wrong.md | 12 ++++++++++++ english/memories/ground-hog/wakeup.md | 6 ++++++ english/memories/memories.md | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 english/memories/ground-hog/all-wrong/all-wrong.md diff --git a/english/memories/ground-hog/all-wrong/all-wrong.md b/english/memories/ground-hog/all-wrong/all-wrong.md new file mode 100644 index 0000000000..4477bd3fba --- /dev/null +++ b/english/memories/ground-hog/all-wrong/all-wrong.md @@ -0,0 +1,12 @@ +That voice... This can't be right. Not here. How could he know where to find +me. Not after all this time. Surely I'd have known if he was still alive. + +"You've grown into a fine lady," he said. He sounded genuinely happy, though +the remorse and sadness nearly overpowered that, "and married a fine man. He +has already been better to you than I could have been -- to you and your +mother." + +He was close. It was almost as if he materialized on the bench next to me in +the park. + +I'm [leaving](../wakeup.md). I can't listen to this. diff --git a/english/memories/ground-hog/wakeup.md b/english/memories/ground-hog/wakeup.md index f8f338c5fa..eeeb4196a4 100644 --- a/english/memories/ground-hog/wakeup.md +++ b/english/memories/ground-hog/wakeup.md @@ -6,6 +6,12 @@ I've been here before... Do you ever get [deja vu](wakeup.md) Mrs. Lancaster?. +Something is... strange, maybe, about the voice. + +[Give it some thought](all-wrong/all-wrong.md). + +Maybe just let it go. + Mrs. Lancaster's reply, 'I don't know let me check with the kitchen. You go to the [kitchen](../../kitchen/vegetables.md). diff --git a/english/memories/memories.md b/english/memories/memories.md index bd6987fd32..e03ab82194 100644 --- a/english/memories/memories.md +++ b/english/memories/memories.md @@ -4,8 +4,10 @@ Where do they come from? Why can I only remember the past and not the future? +Why are my memories so fuzzy and unclear sometimes, but not others? + The first thing I remember is the cold tile floor. The last thing I remember is the dark moment as my eyelids fell as sleep came over me. -Then went the [alarm](ground-hog/wakeup.md). \ No newline at end of file +Then went the [alarm](ground-hog/wakeup.md). From 1e28e44f1eab53c87b71132a6e52e4134ca0b584 Mon Sep 17 00:00:00 2001 From: x3bo Date: Sun, 31 Jan 2016 13:18:01 +0100 Subject: [PATCH 2366/5486] Update @casey-collab, It is now correct? Thank you --- catala/somrius/somrius.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catala/somrius/somrius.md b/catala/somrius/somrius.md index 42ebe5565a..ef8a81cfec 100644 --- a/catala/somrius/somrius.md +++ b/catala/somrius/somrius.md @@ -4,6 +4,6 @@ El somni de la teva vida de trobar una casa de núvols de sucre, com el d'en Han Prens un bocí de núvol i recordes que vols volar. unes ales t'apareixen a l'esquena. Ara tens un dilema, què fas? -[Continues menjant núvols de sucre](create-your-own-adventure/catala/menjar/menjar.md) +[Continues menjant núvols de sucre](menjar/menjar.md) -[Surts per la finestra i alces el vol](create-your-own-adventure/catala/somrius/icar/icar.md) +[Surts per la finestra i alces el vol](icar/icar.md) From c1c0d311e07e6b2091780d4639548908a2bf76ff Mon Sep 17 00:00:00 2001 From: x3bo Date: Sun, 31 Jan 2016 13:32:36 +0100 Subject: [PATCH 2367/5486] Update 2 @casey-collab , Hope this works now.... Please, if does, merge it : ) --- catala/somrius/somrius.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catala/somrius/somrius.md b/catala/somrius/somrius.md index ef8a81cfec..f8d1dd81e7 100644 --- a/catala/somrius/somrius.md +++ b/catala/somrius/somrius.md @@ -4,6 +4,6 @@ El somni de la teva vida de trobar una casa de núvols de sucre, com el d'en Han Prens un bocí de núvol i recordes que vols volar. unes ales t'apareixen a l'esquena. Ara tens un dilema, què fas? -[Continues menjant núvols de sucre](menjar/menjar.md) +[Continues menjant núvols de sucre](catala/menjar/menjar.md) [Surts per la finestra i alces el vol](icar/icar.md) From 8ffa81787d668cb79b030560ec2e9253ff678546 Mon Sep 17 00:00:00 2001 From: x3bo Date: Sun, 31 Jan 2016 13:39:35 +0100 Subject: [PATCH 2368/5486] Update 3 @cassey-collab Hope this change could work. Now, if there no more problems, please, merge it ; ) --- catala/somrius/somrius.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catala/somrius/somrius.md b/catala/somrius/somrius.md index f8d1dd81e7..3ab5c21983 100644 --- a/catala/somrius/somrius.md +++ b/catala/somrius/somrius.md @@ -4,6 +4,6 @@ El somni de la teva vida de trobar una casa de núvols de sucre, com el d'en Han Prens un bocí de núvol i recordes que vols volar. unes ales t'apareixen a l'esquena. Ara tens un dilema, què fas? -[Continues menjant núvols de sucre](catala/menjar/menjar.md) +[Continues menjant núvols de sucre](../menjar/menjar.md) [Surts per la finestra i alces el vol](icar/icar.md) From f04d1b547eb131358ba33ac3c96828b88c9d2fcc Mon Sep 17 00:00:00 2001 From: adityamanglik Date: Mon, 1 Feb 2016 02:42:14 +0530 Subject: [PATCH 2369/5486] Add hrithik --- hindi/bollywood.md | 4 +++- hindi/hrithik/hrithik.md | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 hindi/hrithik/hrithik.md diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 103327396d..600cb7cf46 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -11,6 +11,8 @@ Salman,[go here](actor2/salman.md) Amithab, [go here](actor3/amithab.md) +Hrithik Roshan, [यहाँ देखें](hrithik/hrithik.md) + आमीर खान को तो भूल ही गए थे ये लोग | [यहाँ दबाये ](./actor4/aamir.md) @@ -19,4 +21,4 @@ Amithab, [go here](actor3/amithab.md) Art of Living [Know More](art-of-living/art-of-living.md) -[Sunny Deol](Sunny_Deol/sunny.md) \ No newline at end of file +[Sunny Deol](Sunny_Deol/sunny.md) diff --git a/hindi/hrithik/hrithik.md b/hindi/hrithik/hrithik.md new file mode 100644 index 0000000000..cf4d4ac777 --- /dev/null +++ b/hindi/hrithik/hrithik.md @@ -0,0 +1,2 @@ +Yaha dekhne ke liye kuch nahi bacha, Suzanne sab kuch le gyi. +Ghar vapis jaane ke liye [यहाँ देखें](../bollywood.md) From 6d1895b13104e7de3cae5ed8864225c4e64b29ec Mon Sep 17 00:00:00 2001 From: TDbouk Date: Sun, 31 Jan 2016 18:08:39 +0200 Subject: [PATCH 2370/5486] Add new page (epic DC character) --- english/DC-Comics/epic_DC_Character.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 english/DC-Comics/epic_DC_Character.md diff --git a/english/DC-Comics/epic_DC_Character.md b/english/DC-Comics/epic_DC_Character.md new file mode 100644 index 0000000000..a4a8b7c82b --- /dev/null +++ b/english/DC-Comics/epic_DC_Character.md @@ -0,0 +1,8 @@ +Epic DC + +Once upon a time DC Comics made an EPIC vigilante who simple changes his voice to disguise. + +Give it a deep thouht and figure it out. + +Hint: A useless character :) + From 2c8a0c74285ae706392360255706c8e4a4c1af59 Mon Sep 17 00:00:00 2001 From: TDbouk Date: Sun, 31 Jan 2016 18:20:00 +0200 Subject: [PATCH 2371/5486] Add link to DC Comics. --- english/2spooky/2spooky.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index 05e3c9b12e..e8cdb29969 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -13,3 +13,5 @@ hahahaha no your face! [Go back to sleep.](../sleep/marshmallow.md) + +[Check DC Comics.](../DC-Comics/epic_DC_Character.md) From 4f0ec37d322785e5dcb189f27fbd9963b53491d0 Mon Sep 17 00:00:00 2001 From: Stefan Stoyanov Date: Sun, 31 Jan 2016 21:36:21 +0200 Subject: [PATCH 2372/5486] update save_her --- bulgarian/save_the_day/save_her/save_her.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bulgarian/save_the_day/save_her/save_her.md b/bulgarian/save_the_day/save_her/save_her.md index 66f5772acd..c224d8550d 100644 --- a/bulgarian/save_the_day/save_her/save_her.md +++ b/bulgarian/save_the_day/save_her/save_her.md @@ -1,2 +1,4 @@ Преминаваш бързо със скок през пламъците и стигаш до жената, но -вече всичко започва да се срутва от огъня и няма на къде да отидеш. \ No newline at end of file +вече всичко започва да се срутва от огъня и няма на къде да отидеш. +С цялата си уплаха я грабваш усещайки адреналинът във вените си. +Все пак тя е майка на децата ти, не можеш да я оставиш въпреки аферата и с Пабло Ескобар. \ No newline at end of file From 706cd2ea5785900c0888fdd6cbc164025e855a2c Mon Sep 17 00:00:00 2001 From: Krisjanis Nesenbergs Date: Sun, 31 Jan 2016 23:47:56 +0200 Subject: [PATCH 2373/5486] Add new line of events in sniegt_rogu page --- latvian/sniegt_roku/sniegt_roku.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/latvian/sniegt_roku/sniegt_roku.md b/latvian/sniegt_roku/sniegt_roku.md index 6fb3d63e5f..21ca657432 100644 --- a/latvian/sniegt_roku/sniegt_roku.md +++ b/latvian/sniegt_roku/sniegt_roku.md @@ -1,3 +1,5 @@ Kamēr zefīra roka mēģina sagrābt šķiltavu, -Tu izliec savu roku un saki "Čau!" \ No newline at end of file +Tu izliec savu roku un saki "Čau!" + +Zefīra roka maina virzienu un mēģina sagrābt Tavu roku. \ No newline at end of file From 46a9010ecfa04f418be1d242f34cda3cac0ffb17 Mon Sep 17 00:00:00 2001 From: Tamn Date: Mon, 1 Feb 2016 01:43:37 +0200 Subject: [PATCH 2374/5486] Add options to the story --- .../PassingThroughTheDoor/PassingThroughTheDoor.md | 1 + hebrew/sane-option/eating_marshmelow/eating.md | 4 ++++ hebrew/sane-option/eating_marshmelow/keepEating/keepEating.md | 1 + 3 files changed, 6 insertions(+) create mode 100644 hebrew/sane-option/eating_marshmelow/PassingThroughTheDoor/PassingThroughTheDoor.md create mode 100644 hebrew/sane-option/eating_marshmelow/keepEating/keepEating.md diff --git a/hebrew/sane-option/eating_marshmelow/PassingThroughTheDoor/PassingThroughTheDoor.md b/hebrew/sane-option/eating_marshmelow/PassingThroughTheDoor/PassingThroughTheDoor.md new file mode 100644 index 0000000000..c4a2cb3dab --- /dev/null +++ b/hebrew/sane-option/eating_marshmelow/PassingThroughTheDoor/PassingThroughTheDoor.md @@ -0,0 +1 @@ +אתה נכנס פנימה ומגלה חדר מלא במטבעות זהב כשבמרכז החדר כספת ענקית diff --git a/hebrew/sane-option/eating_marshmelow/eating.md b/hebrew/sane-option/eating_marshmelow/eating.md index d21e5d27c8..58d20c1bcd 100644 --- a/hebrew/sane-option/eating_marshmelow/eating.md +++ b/hebrew/sane-option/eating_marshmelow/eating.md @@ -2,3 +2,7 @@ אותה קלות ורואה שמבפנים בוקע אור חזק... +[ממשיך לאכול] (../keepEating/keepEating.md) + +[עובר דרך הדלת] (../PassingThroughTheDoor/PassingThroughTheDoor.md) + diff --git a/hebrew/sane-option/eating_marshmelow/keepEating/keepEating.md b/hebrew/sane-option/eating_marshmelow/keepEating/keepEating.md new file mode 100644 index 0000000000..838c2fe74d --- /dev/null +++ b/hebrew/sane-option/eating_marshmelow/keepEating/keepEating.md @@ -0,0 +1 @@ +בזמן שאתה ממשיך לאכול להנאתך אתה פתאום שומע קולות מעבר לקיר \ No newline at end of file From 9527a3ce5d259b05873d407a148df78e9b549563 Mon Sep 17 00:00:00 2001 From: Tamn Date: Mon, 1 Feb 2016 02:09:39 +0200 Subject: [PATCH 2375/5486] Fix links --- hebrew/sane-option/eating_marshmelow/eating.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hebrew/sane-option/eating_marshmelow/eating.md b/hebrew/sane-option/eating_marshmelow/eating.md index 58d20c1bcd..df284752a7 100644 --- a/hebrew/sane-option/eating_marshmelow/eating.md +++ b/hebrew/sane-option/eating_marshmelow/eating.md @@ -2,7 +2,7 @@ אותה קלות ורואה שמבפנים בוקע אור חזק... -[ממשיך לאכול] (../keepEating/keepEating.md) +[ממשיך לאכול] (keepEating/keepEating.md) -[עובר דרך הדלת] (../PassingThroughTheDoor/PassingThroughTheDoor.md) +[עובר דרך הדלת] (PassingThroughTheDoor/PassingThroughTheDoor.md) From f5654a0c56175c675ec1eebe3499f15ef1e0f9fb Mon Sep 17 00:00:00 2001 From: RK Date: Sun, 31 Jan 2016 19:44:34 -0500 Subject: [PATCH 2376/5486] Add vodka option --- russian/vodka/vodka.md | 2 ++ russian/zefir.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 russian/vodka/vodka.md diff --git a/russian/vodka/vodka.md b/russian/vodka/vodka.md new file mode 100644 index 0000000000..6c9e33bc4f --- /dev/null +++ b/russian/vodka/vodka.md @@ -0,0 +1,2 @@ +Живительная влага мягко разливается по измученному организму и невероятным +усилием воли получается наконец открыть глаза. diff --git a/russian/zefir.md b/russian/zefir.md index fa1303810a..b1c51b9666 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -8,8 +8,12 @@ От звука тромбона Вам становится щекотно. +Нащупав наконец, головой, недопитый ящик водки, вы пытаетесь открыть глаза. + Ваши действия: +[Смешать водку с пивом](vodka/vodka.md) + [Импортозаместить тромбон на гусли](gusli/gusli.md) [Ненавижу зефир... Прочь из этой ужасной комнаты!](flowers/flowers.md) From c8b4bf8db9dd0e15cb1b561aade56cd1288ca6a5 Mon Sep 17 00:00:00 2001 From: Julian Date: Mon, 1 Feb 2016 11:26:50 +0800 Subject: [PATCH 2377/5486] Add story about mermaid --- english/marshmallow.md | 3 +++ english/mermaid2/mermaid.md | 1 + 2 files changed, 4 insertions(+) create mode 100644 english/mermaid2/mermaid.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 611fe9c700..ba26dba840 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -772,3 +772,6 @@ Until you realize that even marshmallows need [LOVE](https://www.youtube.com/wat You look up and out to the ocean. In the distance you see a [mermaid](mermaid/mermaid.md) + +The mermaid above died, but [don't worry...](mermaid2/mermaid.md) + diff --git a/english/mermaid2/mermaid.md b/english/mermaid2/mermaid.md new file mode 100644 index 0000000000..51d4854f12 --- /dev/null +++ b/english/mermaid2/mermaid.md @@ -0,0 +1 @@ +There's plenty more fish in the sea. \ No newline at end of file From 658f8407364c86c97b27524561f928c400631fb4 Mon Sep 17 00:00:00 2001 From: Collin McCabe Date: Sun, 31 Jan 2016 23:16:19 -0500 Subject: [PATCH 2378/5486] Add new line to animal.md --- english/animal/animal.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/animal/animal.md b/english/animal/animal.md index bf069cb0ce..46ee3ef9ee 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -5,6 +5,8 @@ Even if it really start to drop tears or weep blood, it's the same to me ... no The hilarious thing is that i start thinking about making it my own meal. I remember my last meal, oh it was a dead dog 3 days ago. We are stepping to the verge of eating each other, human flesh oh what does it taste. +I've heard that it tastes like pork... + OMG WHAT SHOULD I DO?? I NEED HELP... From 2df91f053f1f6e53a56c47dadb4457eb6024e80b Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Sun, 31 Jan 2016 23:00:09 -0800 Subject: [PATCH 2379/5486] Add Casablanca --- english/watch-movie/Up.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/watch-movie/Up.md b/english/watch-movie/Up.md index dbccee5418..6e3c30cd04 100644 --- a/english/watch-movie/Up.md +++ b/english/watch-movie/Up.md @@ -3,4 +3,6 @@ Halfway through the movie, the marshmallow walks out. You change the TV to F-Troop and it comes back in and sits down. Turns out it loves Agarn! You then change the channel to meet the press -Marshmallow gets even more fascinated \ No newline at end of file +Marshmallow gets even more fascinated +You change the channel to Casablanca, +the marshmallow starts to cry. \ No newline at end of file From 122b8c81b7e92a34e74f63ef308d55459a41586f Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Sun, 31 Jan 2016 23:09:33 -0800 Subject: [PATCH 2380/5486] Fix typo --- english/watch-movie/Up.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/watch-movie/Up.md b/english/watch-movie/Up.md index 6e3c30cd04..e76bc74001 100644 --- a/english/watch-movie/Up.md +++ b/english/watch-movie/Up.md @@ -3,6 +3,6 @@ Halfway through the movie, the marshmallow walks out. You change the TV to F-Troop and it comes back in and sits down. Turns out it loves Agarn! You then change the channel to meet the press -Marshmallow gets even more fascinated +Marshmallow gets even more fascinated. You change the channel to Casablanca, the marshmallow starts to cry. \ No newline at end of file From f46527ad9b580f216e520d4b4105a9492feb10d2 Mon Sep 17 00:00:00 2001 From: Justin Date: Mon, 1 Feb 2016 02:22:37 -0500 Subject: [PATCH 2381/5486] You decide to dance randomly --- english/dance-randomly/dance-randomly.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 english/dance-randomly/dance-randomly.md diff --git a/english/dance-randomly/dance-randomly.md b/english/dance-randomly/dance-randomly.md new file mode 100644 index 0000000000..59156115a2 --- /dev/null +++ b/english/dance-randomly/dance-randomly.md @@ -0,0 +1,13 @@ +You decide to dance randomly. It seems like a good idea at the time. + +You get jiggy with it. + +You shake dem hips. + +You laugh and laugh and laugh some more. + +You catch yourself smiling, ever so brightly. + +And oh yeah... how could you have forgotten?... life... it's beautiful! + +It only makes sense that next, you... \ No newline at end of file From 5b4026609de56cc9b7dc86a47aff9c83f501585a Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Sun, 31 Jan 2016 23:23:59 -0800 Subject: [PATCH 2382/5486] Do not remove line --- english/watch-movie/Up.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/watch-movie/Up.md b/english/watch-movie/Up.md index e76bc74001..78108649ff 100644 --- a/english/watch-movie/Up.md +++ b/english/watch-movie/Up.md @@ -3,6 +3,7 @@ Halfway through the movie, the marshmallow walks out. You change the TV to F-Troop and it comes back in and sits down. Turns out it loves Agarn! You then change the channel to meet the press -Marshmallow gets even more fascinated. +Marshmallow gets even more fascinated + You change the channel to Casablanca, the marshmallow starts to cry. \ No newline at end of file From eeefdb2585f700ae1106689215faba62bb54c718 Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Sun, 31 Jan 2016 23:48:33 -0800 Subject: [PATCH 2383/5486] Drink water --- english/BayesTheorem/BayesTheorem.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md index 2cf9d8eb21..f958131102 100644 --- a/english/BayesTheorem/BayesTheorem.md +++ b/english/BayesTheorem/BayesTheorem.md @@ -1,3 +1,5 @@ Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) -[Daddy, but where do priors come from](priors/priors.md)? \ No newline at end of file +[Daddy, but where do priors come from](priors/priors.md)? + +[Daddy, can I have a glass of water](../../coffee/drink-water/drink.md)? \ No newline at end of file From 83ce05cc35fc32076380ae2e3f97411ce7c03cbc Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Sun, 31 Jan 2016 23:50:48 -0800 Subject: [PATCH 2384/5486] Drink water fix move back in directory --- english/BayesTheorem/BayesTheorem.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md index f958131102..3e91ce6b35 100644 --- a/english/BayesTheorem/BayesTheorem.md +++ b/english/BayesTheorem/BayesTheorem.md @@ -2,4 +2,4 @@ Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) [Daddy, but where do priors come from](priors/priors.md)? -[Daddy, can I have a glass of water](../../coffee/drink-water/drink.md)? \ No newline at end of file +[Daddy, can I have a glass of water](../coffee/drink-water/drink.md)? \ No newline at end of file From cbd772e6cc86bc9d62afaf809ae175e2314a7a82 Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 00:24:04 -0800 Subject: [PATCH 2385/5486] Add page --- english/BayesTheorem/BayesTheorem.md | 4 +++- english/BayesTheorem/priors/chocolateOrSleep.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/BayesTheorem/priors/chocolateOrSleep.md diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md index 3e91ce6b35..6ec45eea6e 100644 --- a/english/BayesTheorem/BayesTheorem.md +++ b/english/BayesTheorem/BayesTheorem.md @@ -2,4 +2,6 @@ Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) [Daddy, but where do priors come from](priors/priors.md)? -[Daddy, can I have a glass of water](../coffee/drink-water/drink.md)? \ No newline at end of file +[Daddy, can I have a glass of water](../coffee/drink-water/drink.md)? + +[Daddy, are there priors in my chocolate](priors/chocolate.md)? \ No newline at end of file diff --git a/english/BayesTheorem/priors/chocolateOrSleep.md b/english/BayesTheorem/priors/chocolateOrSleep.md new file mode 100644 index 0000000000..76e049cabb --- /dev/null +++ b/english/BayesTheorem/priors/chocolateOrSleep.md @@ -0,0 +1 @@ +Would you like some more [chocolate](../../search_for_chocolate/search_for_chocolate.md) or would you like to go to [sing](../../sing/sing.md)? \ No newline at end of file From eabf25c7fb099804efd260243cbf6b21dbd10fab Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 00:26:51 -0800 Subject: [PATCH 2386/5486] fix path --- english/BayesTheorem/BayesTheorem.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md index 6ec45eea6e..8fe9331907 100644 --- a/english/BayesTheorem/BayesTheorem.md +++ b/english/BayesTheorem/BayesTheorem.md @@ -4,4 +4,4 @@ Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) [Daddy, can I have a glass of water](../coffee/drink-water/drink.md)? -[Daddy, are there priors in my chocolate](priors/chocolate.md)? \ No newline at end of file +[Daddy, are there priors in my chocolate](priors/chocolateOrSleep.md)? \ No newline at end of file From c8c383bcc12dbfb8a9fc77c5130abfd8c3e2bfc1 Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 00:31:31 -0800 Subject: [PATCH 2387/5486] fix line length --- english/BayesTheorem/priors/chocolateOrSleep.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/BayesTheorem/priors/chocolateOrSleep.md b/english/BayesTheorem/priors/chocolateOrSleep.md index 76e049cabb..87a9995744 100644 --- a/english/BayesTheorem/priors/chocolateOrSleep.md +++ b/english/BayesTheorem/priors/chocolateOrSleep.md @@ -1 +1,2 @@ -Would you like some more [chocolate](../../search_for_chocolate/search_for_chocolate.md) or would you like to go to [sing](../../sing/sing.md)? \ No newline at end of file +Would you like some more [chocolate](../../search_for_chocolate/search_for_chocolate.md) or +would you like to go to [sing](../../sing/sing.md)? \ No newline at end of file From cfe9093ec1a0783f37a2e44dd0aeefcab356736b Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 00:39:27 -0800 Subject: [PATCH 2388/5486] one page per directory --- english/BayesTheorem/BayesTheorem.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md index 8fe9331907..bc5fbb8d95 100644 --- a/english/BayesTheorem/BayesTheorem.md +++ b/english/BayesTheorem/BayesTheorem.md @@ -4,4 +4,4 @@ Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) [Daddy, can I have a glass of water](../coffee/drink-water/drink.md)? -[Daddy, are there priors in my chocolate](priors/chocolateOrSleep.md)? \ No newline at end of file +[Daddy, are there priors in my chocolate](chocolateOrSleep/chocolateOrSleep.md)? \ No newline at end of file From ddd41018b61ad465a428336a854cdd56f1452afa Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 00:48:32 -0800 Subject: [PATCH 2389/5486] Fix dir --- english/BayesTheorem/chocolateOrSleep/chocolateOrSleep.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/BayesTheorem/chocolateOrSleep/chocolateOrSleep.md diff --git a/english/BayesTheorem/chocolateOrSleep/chocolateOrSleep.md b/english/BayesTheorem/chocolateOrSleep/chocolateOrSleep.md new file mode 100644 index 0000000000..0d25119d12 --- /dev/null +++ b/english/BayesTheorem/chocolateOrSleep/chocolateOrSleep.md @@ -0,0 +1,2 @@ +Would you like some more [chocolate](../../search_for_chocolate/search_for_chocolate.md) or +would you like to [sing](../../sing/sing.md)? \ No newline at end of file From f95d55cd36383ed6301fc1a90787d94065642646 Mon Sep 17 00:00:00 2001 From: Justin Date: Mon, 1 Feb 2016 03:54:04 -0500 Subject: [PATCH 2390/5486] Add dance-randomly link to amnesia page --- english/amnesia/amnesia.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/amnesia/amnesia.md b/english/amnesia/amnesia.md index 948d2c5090..6e09991dfe 100644 --- a/english/amnesia/amnesia.md +++ b/english/amnesia/amnesia.md @@ -10,6 +10,8 @@ But where am I? I do not know. [Sit back down, to get no sleep?](../sleep/marshmallow.md) +[I bet I could dance my memory back into place!](../dance-randomly/dance-randomly.md) + [Wait, something's coming back to me!](../I'm-batman/batman.md) Amnesia can be freaking awesome sometimes :) From e31881d7f08133ffb42256e5feb3189ace3e6ec1 Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 01:06:34 -0800 Subject: [PATCH 2391/5486] One per dir --- english/BayesTheorem/BayesTheorem.md | 2 +- english/chocolateOrSleep/chocolateOrSleep.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 english/chocolateOrSleep/chocolateOrSleep.md diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md index bc5fbb8d95..299ac63e8f 100644 --- a/english/BayesTheorem/BayesTheorem.md +++ b/english/BayesTheorem/BayesTheorem.md @@ -4,4 +4,4 @@ Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) [Daddy, can I have a glass of water](../coffee/drink-water/drink.md)? -[Daddy, are there priors in my chocolate](chocolateOrSleep/chocolateOrSleep.md)? \ No newline at end of file +[Daddy, are there priors in my chocolate](../../chocolateOrSleep/chocolateOrSleep.md)? \ No newline at end of file diff --git a/english/chocolateOrSleep/chocolateOrSleep.md b/english/chocolateOrSleep/chocolateOrSleep.md new file mode 100644 index 0000000000..5735b72ee4 --- /dev/null +++ b/english/chocolateOrSleep/chocolateOrSleep.md @@ -0,0 +1,2 @@ +Would you like some more [chocolate](../search_for_chocolate/search_for_chocolate.md) or +would you like to [sing](../sing/sing.md)? \ No newline at end of file From 5ec31017b1d96c04cc5d5c4ea9e12275c7fcf3e8 Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 01:18:27 -0800 Subject: [PATCH 2392/5486] still finding path --- english/BayesTheorem/BayesTheorem.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md index 299ac63e8f..b217935b67 100644 --- a/english/BayesTheorem/BayesTheorem.md +++ b/english/BayesTheorem/BayesTheorem.md @@ -4,4 +4,4 @@ Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) [Daddy, can I have a glass of water](../coffee/drink-water/drink.md)? -[Daddy, are there priors in my chocolate](../../chocolateOrSleep/chocolateOrSleep.md)? \ No newline at end of file +[Daddy, are there priors in my chocolate](../chocolateOrSleep/chocolateOrSleep.md)? \ No newline at end of file From 48354e7ee4db2fb93fc0d99f69afd1c5dec2dd63 Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 01:30:08 -0800 Subject: [PATCH 2393/5486] remove old dir --- english/BayesTheorem/.DS_Store | Bin 0 -> 6148 bytes english/BayesTheorem/.Rhistory | 0 .../chocolateOrSleep/chocolateOrSleep.md | 2 -- english/BayesTheorem/priors/.DS_Store | Bin 0 -> 6148 bytes english/BayesTheorem/priors/.Rhistory | 0 english/BayesTheorem/priors/chocolateOrSleep.md | 2 -- 6 files changed, 4 deletions(-) create mode 100644 english/BayesTheorem/.DS_Store create mode 100644 english/BayesTheorem/.Rhistory delete mode 100644 english/BayesTheorem/chocolateOrSleep/chocolateOrSleep.md create mode 100644 english/BayesTheorem/priors/.DS_Store create mode 100644 english/BayesTheorem/priors/.Rhistory delete mode 100644 english/BayesTheorem/priors/chocolateOrSleep.md diff --git a/english/BayesTheorem/.DS_Store b/english/BayesTheorem/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3b1e5aae823ad6aca92bb1b8a17e994935f0d8eb GIT binary patch literal 6148 zcmeHKOKJi^5Uoli2-&!F*;nuejpzyH0wEDZ7#tZ%*0b_lIa*$Q2n?ee!Hv9v>epRe zubY00sVNcB_4jTivJjCu+)yqyOwIPqC-#yNL-jLyIq%M2?Pu4ulkDpOA+-{}9xB(A6c6?iHIbhc?WYdk4y>*R4(YYY4XZaKejGt8ZW m!OJnw%P|&Kj+dSkdBx_~uZcsT(-C(%kUs;a3ylgqT7f@ZbQ`_^ literal 0 HcmV?d00001 diff --git a/english/BayesTheorem/.Rhistory b/english/BayesTheorem/.Rhistory new file mode 100644 index 0000000000..e69de29bb2 diff --git a/english/BayesTheorem/chocolateOrSleep/chocolateOrSleep.md b/english/BayesTheorem/chocolateOrSleep/chocolateOrSleep.md deleted file mode 100644 index 0d25119d12..0000000000 --- a/english/BayesTheorem/chocolateOrSleep/chocolateOrSleep.md +++ /dev/null @@ -1,2 +0,0 @@ -Would you like some more [chocolate](../../search_for_chocolate/search_for_chocolate.md) or -would you like to [sing](../../sing/sing.md)? \ No newline at end of file diff --git a/english/BayesTheorem/priors/.DS_Store b/english/BayesTheorem/priors/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Mon, 1 Feb 2016 01:34:58 -0800 Subject: [PATCH 2394/5486] line --- english/chocolateOrSleep/chocolateOrSleep.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/chocolateOrSleep/chocolateOrSleep.md b/english/chocolateOrSleep/chocolateOrSleep.md index 5735b72ee4..7c142be54d 100644 --- a/english/chocolateOrSleep/chocolateOrSleep.md +++ b/english/chocolateOrSleep/chocolateOrSleep.md @@ -1,2 +1,3 @@ Would you like some more [chocolate](../search_for_chocolate/search_for_chocolate.md) or + would you like to [sing](../sing/sing.md)? \ No newline at end of file From 72914dca41ef06c9d734b9132066432d04b5db72 Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 01:38:32 -0800 Subject: [PATCH 2395/5486] deleting --- english/BayesTheorem/.Rhistory | 0 english/BayesTheorem/BayesTheorem.md | 2 +- english/BayesTheorem/priors/.DS_Store | Bin 6148 -> 0 bytes english/BayesTheorem/priors/.Rhistory | 0 4 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 english/BayesTheorem/.Rhistory delete mode 100644 english/BayesTheorem/priors/.DS_Store delete mode 100644 english/BayesTheorem/priors/.Rhistory diff --git a/english/BayesTheorem/.Rhistory b/english/BayesTheorem/.Rhistory deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md index b217935b67..299ac63e8f 100644 --- a/english/BayesTheorem/BayesTheorem.md +++ b/english/BayesTheorem/BayesTheorem.md @@ -4,4 +4,4 @@ Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) [Daddy, can I have a glass of water](../coffee/drink-water/drink.md)? -[Daddy, are there priors in my chocolate](../chocolateOrSleep/chocolateOrSleep.md)? \ No newline at end of file +[Daddy, are there priors in my chocolate](../../chocolateOrSleep/chocolateOrSleep.md)? \ No newline at end of file diff --git a/english/BayesTheorem/priors/.DS_Store b/english/BayesTheorem/priors/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Mon, 1 Feb 2016 01:42:57 -0800 Subject: [PATCH 2396/5486] choco line --- english/chocolateOrSleep/chocolateOrSleep.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/chocolateOrSleep/chocolateOrSleep.md b/english/chocolateOrSleep/chocolateOrSleep.md index 7c142be54d..0d7b3468a6 100644 --- a/english/chocolateOrSleep/chocolateOrSleep.md +++ b/english/chocolateOrSleep/chocolateOrSleep.md @@ -1,3 +1,4 @@ Would you like some more [chocolate](../search_for_chocolate/search_for_chocolate.md) or + would you like to [sing](../sing/sing.md)? \ No newline at end of file From 651416e3861eae83f577eca1d6a91b9c7d0642f5 Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 01:53:16 -0800 Subject: [PATCH 2397/5486] add --- english/BayesTheorem/priors/.DS_Store | Bin 0 -> 6148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 english/BayesTheorem/priors/.DS_Store diff --git a/english/BayesTheorem/priors/.DS_Store b/english/BayesTheorem/priors/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Mon, 1 Feb 2016 01:55:47 -0800 Subject: [PATCH 2398/5486] Delete .DS_Store --- english/BayesTheorem/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 english/BayesTheorem/.DS_Store diff --git a/english/BayesTheorem/.DS_Store b/english/BayesTheorem/.DS_Store deleted file mode 100644 index 3b1e5aae823ad6aca92bb1b8a17e994935f0d8eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOKJi^5Uoli2-&!F*;nuejpzyH0wEDZ7#tZ%*0b_lIa*$Q2n?ee!Hv9v>epRe zubY00sVNcB_4jTivJjCu+)yqyOwIPqC-#yNL-jLyIq%M2?Pu4ulkDpOA+-{}9xB(A6c6?iHIbhc?WYdk4y>*R4(YYY4XZaKejGt8ZW m!OJnw%P|&Kj+dSkdBx_~uZcsT(-C(%kUs;a3ylgqT7f@ZbQ`_^ From 1b941031228869749373a7640932516fade58c8c Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 01:59:03 -0800 Subject: [PATCH 2399/5486] path again --- english/chocolateOrSleep/chocolateOrSleep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/chocolateOrSleep/chocolateOrSleep.md b/english/chocolateOrSleep/chocolateOrSleep.md index 0d7b3468a6..895b91ba21 100644 --- a/english/chocolateOrSleep/chocolateOrSleep.md +++ b/english/chocolateOrSleep/chocolateOrSleep.md @@ -1,4 +1,4 @@ -Would you like some more [chocolate](../search_for_chocolate/search_for_chocolate.md) or +Would you like some more [chocolate](../../search_for_chocolate/search_for_chocolate.md) or would you like to [sing](../sing/sing.md)? \ No newline at end of file From 95add13f2f71382a5f57861649747d1a29e3ab7a Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 02:02:00 -0800 Subject: [PATCH 2400/5486] again --- english/BayesTheorem/BayesTheorem.md | 2 +- english/chocolateOrSleep/chocolateOrSleep.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md index 299ac63e8f..db1539c224 100644 --- a/english/BayesTheorem/BayesTheorem.md +++ b/english/BayesTheorem/BayesTheorem.md @@ -4,4 +4,4 @@ Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) [Daddy, can I have a glass of water](../coffee/drink-water/drink.md)? -[Daddy, are there priors in my chocolate](../../chocolateOrSleep/chocolateOrSleep.md)? \ No newline at end of file +[Daddy, are there priors in my chocolate](../../chocolateOrSleep/chocolateOrSleep.md)? diff --git a/english/chocolateOrSleep/chocolateOrSleep.md b/english/chocolateOrSleep/chocolateOrSleep.md index 895b91ba21..ed743a7485 100644 --- a/english/chocolateOrSleep/chocolateOrSleep.md +++ b/english/chocolateOrSleep/chocolateOrSleep.md @@ -1,4 +1,4 @@ Would you like some more [chocolate](../../search_for_chocolate/search_for_chocolate.md) or -would you like to [sing](../sing/sing.md)? \ No newline at end of file +would you like to [sing](../sing/sing.md)? From d418490ffe4a6cc4dd33a230c78ce51a0b589502 Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 02:08:24 -0800 Subject: [PATCH 2401/5486] path --- english/chocolateOrSleep/chocolateOrSleep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/chocolateOrSleep/chocolateOrSleep.md b/english/chocolateOrSleep/chocolateOrSleep.md index ed743a7485..416a3382fd 100644 --- a/english/chocolateOrSleep/chocolateOrSleep.md +++ b/english/chocolateOrSleep/chocolateOrSleep.md @@ -1,4 +1,4 @@ -Would you like some more [chocolate](../../search_for_chocolate/search_for_chocolate.md) or +Would you like some more [chocolate](../search_for_chocolate/search_for_chocolate.md) or would you like to [sing](../sing/sing.md)? From 570e435ae7be46801700fb9a88676a5ef22cc39f Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 02:10:33 -0800 Subject: [PATCH 2402/5486] path2 --- english/BayesTheorem/BayesTheorem.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md index db1539c224..3737674721 100644 --- a/english/BayesTheorem/BayesTheorem.md +++ b/english/BayesTheorem/BayesTheorem.md @@ -4,4 +4,4 @@ Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) [Daddy, can I have a glass of water](../coffee/drink-water/drink.md)? -[Daddy, are there priors in my chocolate](../../chocolateOrSleep/chocolateOrSleep.md)? +[Daddy, are there priors in my chocolate](../chocolateOrSleep/chocolateOrSleep.md)? From 87b54659116363a36b9ae6c6dedb5007c148fb77 Mon Sep 17 00:00:00 2001 From: Bill Kapsalis Date: Mon, 1 Feb 2016 02:22:54 -0800 Subject: [PATCH 2403/5486] Delete .DS_Store --- english/BayesTheorem/priors/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 english/BayesTheorem/priors/.DS_Store diff --git a/english/BayesTheorem/priors/.DS_Store b/english/BayesTheorem/priors/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Mon, 1 Feb 2016 12:36:26 -0500 Subject: [PATCH 2404/5486] Add Afrikaans and inital story stub --- afrikaans/beskuit/beskuit.md | 10 ++++++++++ afrikaans/beskuit/ouma/ouma.md | 1 + afrikaans/beskuit/tuisgebakte/tuisgebakte.md | 1 + afrikaans/kos.md | 4 ++++ language.md | 4 +++- 5 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 afrikaans/beskuit/beskuit.md create mode 100644 afrikaans/beskuit/ouma/ouma.md create mode 100644 afrikaans/beskuit/tuisgebakte/tuisgebakte.md create mode 100644 afrikaans/kos.md diff --git a/afrikaans/beskuit/beskuit.md b/afrikaans/beskuit/beskuit.md new file mode 100644 index 0000000000..bb86a8503e --- /dev/null +++ b/afrikaans/beskuit/beskuit.md @@ -0,0 +1,10 @@ +Jy voel jy sal graag +- [Ouma](./ouma/ouma.md) winkel beskuit +- [Tuisgebakte] (/tuisgebakte/tuisgebakte.md) beskuit +eet. + +Of + +jy voel skielik lus vir [iets anders](../kos.md) + + diff --git a/afrikaans/beskuit/ouma/ouma.md b/afrikaans/beskuit/ouma/ouma.md new file mode 100644 index 0000000000..4c2e41b217 --- /dev/null +++ b/afrikaans/beskuit/ouma/ouma.md @@ -0,0 +1 @@ +Jy geniet die Ouma beskuit en jy mis jou ma. \ No newline at end of file diff --git a/afrikaans/beskuit/tuisgebakte/tuisgebakte.md b/afrikaans/beskuit/tuisgebakte/tuisgebakte.md new file mode 100644 index 0000000000..e9b5fd62f1 --- /dev/null +++ b/afrikaans/beskuit/tuisgebakte/tuisgebakte.md @@ -0,0 +1 @@ +Jy geniet die tuisgebake beskuit en jy mis jou ma. \ No newline at end of file diff --git a/afrikaans/kos.md b/afrikaans/kos.md new file mode 100644 index 0000000000..142b13e298 --- /dev/null +++ b/afrikaans/kos.md @@ -0,0 +1,4 @@ +Jy voel honger. Jy besluit om iets eg Afrikaans te eet. Jy besluit om een van die volgended te eet + +- [Beskuit] (./beskuit/beskuit.md) + diff --git a/language.md b/language.md index a35f4918e1..8c37b11c7c 100644 --- a/language.md +++ b/language.md @@ -128,7 +128,9 @@ Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) -======= + Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) If you speak Gujarati, go [here](Gujarati/gujarati.md). + +As jy Afrikaans kan praat, gaan [hier](afrikaans/kos.md) \ No newline at end of file From b0c0d9e2ae45803afb78c033f39298d0e66c745c Mon Sep 17 00:00:00 2001 From: Jasper Schellingerhout Date: Mon, 1 Feb 2016 12:38:34 -0500 Subject: [PATCH 2405/5486] Fix typo in relative link --- afrikaans/beskuit/beskuit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afrikaans/beskuit/beskuit.md b/afrikaans/beskuit/beskuit.md index bb86a8503e..b600af2d62 100644 --- a/afrikaans/beskuit/beskuit.md +++ b/afrikaans/beskuit/beskuit.md @@ -1,6 +1,6 @@ Jy voel jy sal graag - [Ouma](./ouma/ouma.md) winkel beskuit -- [Tuisgebakte] (/tuisgebakte/tuisgebakte.md) beskuit +- [Tuisgebakte] (./tuisgebakte/tuisgebakte.md) beskuit eet. Of From 8294e32b29ac51dc4cf9ae9761878b8560072aa2 Mon Sep 17 00:00:00 2001 From: Jasper Schellingerhout Date: Mon, 1 Feb 2016 12:39:10 -0500 Subject: [PATCH 2406/5486] Fix typo in "volgende" --- afrikaans/kos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afrikaans/kos.md b/afrikaans/kos.md index 142b13e298..fdc4c43ad2 100644 --- a/afrikaans/kos.md +++ b/afrikaans/kos.md @@ -1,4 +1,4 @@ -Jy voel honger. Jy besluit om iets eg Afrikaans te eet. Jy besluit om een van die volgended te eet +Jy voel honger. Jy besluit om iets eg Afrikaans te eet. Jy besluit om een van die volgende te eet - [Beskuit] (./beskuit/beskuit.md) From 11137d19b1540dd5a6c9f79cb364d09e8cb768f5 Mon Sep 17 00:00:00 2001 From: Jasper Schellingerhout Date: Mon, 1 Feb 2016 12:43:28 -0500 Subject: [PATCH 2407/5486] Add space between options as per guidlines --- afrikaans/beskuit/beskuit.md | 1 + 1 file changed, 1 insertion(+) diff --git a/afrikaans/beskuit/beskuit.md b/afrikaans/beskuit/beskuit.md index b600af2d62..4c964f1946 100644 --- a/afrikaans/beskuit/beskuit.md +++ b/afrikaans/beskuit/beskuit.md @@ -1,5 +1,6 @@ Jy voel jy sal graag - [Ouma](./ouma/ouma.md) winkel beskuit +- - [Tuisgebakte] (./tuisgebakte/tuisgebakte.md) beskuit eet. From 2400c7bf4244f33dc4ed2088d0edd661a759ac18 Mon Sep 17 00:00:00 2001 From: Jasper Schellingerhout Date: Mon, 1 Feb 2016 12:43:54 -0500 Subject: [PATCH 2408/5486] Removed empty list option --- afrikaans/beskuit/beskuit.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/afrikaans/beskuit/beskuit.md b/afrikaans/beskuit/beskuit.md index 4c964f1946..946ed85c31 100644 --- a/afrikaans/beskuit/beskuit.md +++ b/afrikaans/beskuit/beskuit.md @@ -1,6 +1,7 @@ Jy voel jy sal graag + - [Ouma](./ouma/ouma.md) winkel beskuit -- + - [Tuisgebakte] (./tuisgebakte/tuisgebakte.md) beskuit eet. From f92e93e7a3bb48b0625653ab647e1ef9b69b0563 Mon Sep 17 00:00:00 2001 From: Jasper Schellingerhout Date: Mon, 1 Feb 2016 12:45:07 -0500 Subject: [PATCH 2409/5486] Reverted change preventing automati merge we really should clean up the -======= line --- language.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/language.md b/language.md index 8c37b11c7c..1a91223031 100644 --- a/language.md +++ b/language.md @@ -128,9 +128,9 @@ Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) - -Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) - -If you speak Gujarati, go [here](Gujarati/gujarati.md). +-======= +Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) -As jy Afrikaans kan praat, gaan [hier](afrikaans/kos.md) \ No newline at end of file +If you speak Gujarati, go [here](Gujarati/gujarati.md). + +As jy Afrikaans kan praat, gaan [hier](afrikaans/kos.md) From c02856ecb73f44f9a33422adac3e9588f9b5c5a4 Mon Sep 17 00:00:00 2001 From: Jasper Schellingerhout Date: Mon, 1 Feb 2016 12:55:28 -0500 Subject: [PATCH 2410/5486] Added back ===== line for automated system --- language.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/language.md b/language.md index 1a91223031..7281332f95 100644 --- a/language.md +++ b/language.md @@ -128,7 +128,9 @@ Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) --======= + +======= + Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) If you speak Gujarati, go [here](Gujarati/gujarati.md). From a15b54b5bbb132ab4f0a67312dee66fa312b8a19 Mon Sep 17 00:00:00 2001 From: Jasper Schellingerhout Date: Mon, 1 Feb 2016 13:06:31 -0500 Subject: [PATCH 2411/5486] Revert language file by hand --- language.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language.md b/language.md index 1a91223031..746e6082b5 100644 --- a/language.md +++ b/language.md @@ -128,7 +128,7 @@ Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) --======= +======= Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) If you speak Gujarati, go [here](Gujarati/gujarati.md). From 624787a8ed60d4b44d1a9652769e615939c69a84 Mon Sep 17 00:00:00 2001 From: Bill Date: Mon, 1 Feb 2016 10:43:51 -0800 Subject: [PATCH 2412/5486] Added Story to the Story --- english/marshmallow.md | 1 + .../test-driven-development-rules/AccordingToUncleBob.md | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 english/test-driven-development-rules/AccordingToUncleBob.md diff --git a/english/marshmallow.md b/english/marshmallow.md index ba26dba840..c8326f5163 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -775,3 +775,4 @@ You look up and out to the ocean. In the distance you see a [mermaid](mermaid/me The mermaid above died, but [don't worry...](mermaid2/mermaid.md) +The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules\AccordingToUncleBob.md) \ No newline at end of file diff --git a/english/test-driven-development-rules/AccordingToUncleBob.md b/english/test-driven-development-rules/AccordingToUncleBob.md new file mode 100644 index 0000000000..54902af589 --- /dev/null +++ b/english/test-driven-development-rules/AccordingToUncleBob.md @@ -0,0 +1,8 @@ +Over the years I have come to describe Test Driven Development in terms of three simple rules. They are: + + +1) You are not allowed to write any production code unless it is to make a failing unit test pass. + +2) You are not allowed to write any more of a unit test than is sufficient to fail; and compilation failures are failures. + +3) You are not allowed to write any more production code than is sufficient to pass the one failing unit test. From a6b7410692745da05a8a4c3c801377f21a86da53 Mon Sep 17 00:00:00 2001 From: Bill Date: Mon, 1 Feb 2016 11:28:33 -0800 Subject: [PATCH 2413/5486] Code Review --- english/marshmallow.md | 2 +- .../AccordingToUncleBob.md | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index c8326f5163..a262ca3e49 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -775,4 +775,4 @@ You look up and out to the ocean. In the distance you see a [mermaid](mermaid/me The mermaid above died, but [don't worry...](mermaid2/mermaid.md) -The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules\AccordingToUncleBob.md) \ No newline at end of file +The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) \ No newline at end of file diff --git a/english/test-driven-development-rules/AccordingToUncleBob.md b/english/test-driven-development-rules/AccordingToUncleBob.md index 54902af589..44ed57ddfd 100644 --- a/english/test-driven-development-rules/AccordingToUncleBob.md +++ b/english/test-driven-development-rules/AccordingToUncleBob.md @@ -1,8 +1,11 @@ -Over the years I have come to describe Test Driven Development in terms of three simple rules. They are: +Test Driven Development in terms of three simple rules. They are: -1) You are not allowed to write any production code unless it is to make a failing unit test pass. +1) You are not allowed to write any production code +unless it is to make a failing unit test pass. -2) You are not allowed to write any more of a unit test than is sufficient to fail; and compilation failures are failures. +2) You are not allowed to write any more of a unit test +than is sufficient to fail; and compilation failures are failures. -3) You are not allowed to write any more production code than is sufficient to pass the one failing unit test. +3) You are not allowed to write any more production code +than is sufficient to pass the one failing unit test. From 1c327f6106ffd8c256096fe724a62002636471a1 Mon Sep 17 00:00:00 2001 From: user Date: Mon, 1 Feb 2016 16:05:59 -0500 Subject: [PATCH 2414/5486] add changes to read book --- english/read-a-book/read-a-book.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/read-a-book/read-a-book.md b/english/read-a-book/read-a-book.md index 9f5f48e2ad..95aabec7bd 100644 --- a/english/read-a-book/read-a-book.md +++ b/english/read-a-book/read-a-book.md @@ -1 +1,2 @@ Or you could just read a book! +Or you could just read a really big book! From d883798802ea08224a934cab2e6a2b781e723674 Mon Sep 17 00:00:00 2001 From: Jasper Schellingerhout Date: Mon, 1 Feb 2016 18:54:05 -0500 Subject: [PATCH 2415/5486] Add Afrikaans to CRLF section of file --- language.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/language.md b/language.md index 746e6082b5..d27c5067bc 100644 --- a/language.md +++ b/language.md @@ -128,9 +128,9 @@ Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) -======= -Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) -If you speak Gujarati, go [here](Gujarati/gujarati.md). - -As jy Afrikaans kan praat, gaan [hier](afrikaans/kos.md) +As jy Afrikaans kan praat, gaan [hier](afrikaans/kos.md) +======= +Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) + +If you speak Gujarati, go [here](Gujarati/gujarati.md). From 77b6db68e0e232ab395637f7180dc80d074bebf2 Mon Sep 17 00:00:00 2001 From: Jasper Schellingerhout Date: Mon, 1 Feb 2016 19:02:05 -0500 Subject: [PATCH 2416/5486] Added blank line in crlf section --- language.md | 1 + 1 file changed, 1 insertion(+) diff --git a/language.md b/language.md index d27c5067bc..7c4f36bfb3 100644 --- a/language.md +++ b/language.md @@ -130,6 +130,7 @@ Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) As jy Afrikaans kan praat, gaan [hier](afrikaans/kos.md) + ======= Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) From 931e27235718227ecc5c4ad9cf9d6a7dd115a944 Mon Sep 17 00:00:00 2001 From: Jasper Schellingerhout Date: Mon, 1 Feb 2016 19:04:55 -0500 Subject: [PATCH 2417/5486] Added blank line --- language.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/language.md b/language.md index d27c5067bc..d72f281571 100644 --- a/language.md +++ b/language.md @@ -130,7 +130,8 @@ Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) As jy Afrikaans kan praat, gaan [hier](afrikaans/kos.md) -======= -Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) - -If you speak Gujarati, go [here](Gujarati/gujarati.md). + +======= +Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) + +If you speak Gujarati, go [here](Gujarati/gujarati.md). From 9d8b6b9b29f23aadb98d3635b7852c8aaa0c2121 Mon Sep 17 00:00:00 2001 From: Your Actual Name Date: Mon, 1 Feb 2016 17:17:38 -0700 Subject: [PATCH 2418/5486] Add meet righteous babes. --- english/yoga/benefits/yoga_benefits.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/yoga/benefits/yoga_benefits.md b/english/yoga/benefits/yoga_benefits.md index e4e804af1b..72710819c2 100644 --- a/english/yoga/benefits/yoga_benefits.md +++ b/english/yoga/benefits/yoga_benefits.md @@ -16,3 +16,4 @@ Here we provide a list of benefits: 6. Weight reduction 7. Protection from injury 9. Increases happiness +10. Meet righteous babes. From 0d958e8d0242a0d28fe59a43acc2b4cb5cb10c47 Mon Sep 17 00:00:00 2001 From: QingyiWu Date: Mon, 1 Feb 2016 23:20:46 -0600 Subject: [PATCH 2419/5486] Add alibaba and his story --- Chinese/monk/alibaba/alibaba.md | 1 + Chinese/monk/monk.md | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 Chinese/monk/alibaba/alibaba.md diff --git a/Chinese/monk/alibaba/alibaba.md b/Chinese/monk/alibaba/alibaba.md new file mode 100644 index 0000000000..1fd5fbad8f --- /dev/null +++ b/Chinese/monk/alibaba/alibaba.md @@ -0,0 +1 @@ +很久以前，在波斯的一座城市里住着两兄弟：哥哥卡西姆娶了一个有钱的老婆，生活非常富有；弟弟阿里巴巴夫妻俩靠打柴为生，过着穷苦的生活。 \ No newline at end of file diff --git a/Chinese/monk/monk.md b/Chinese/monk/monk.md index 670c15e604..a90bff3b5d 100644 --- a/Chinese/monk/monk.md +++ b/Chinese/monk/monk.md @@ -25,3 +25,7 @@ Good story I like it + +这时候走过来一个小和尚，手里拿着一本书。 +老和尚看见了就问他：“你看的是什么书？” +小和尚回答道：”师傅你猜猜，是[阿里巴巴与四十大盗]（alibaba/alibaba.md), 还是别的？“ \ No newline at end of file From f90756c56df310c83b6fda393d5ffb48c26e1799 Mon Sep 17 00:00:00 2001 From: QingyiWu Date: Mon, 1 Feb 2016 23:32:52 -0600 Subject: [PATCH 2420/5486] Fix a typo --- Chinese/monk/monk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/monk/monk.md b/Chinese/monk/monk.md index a90bff3b5d..26d6cb940a 100644 --- a/Chinese/monk/monk.md +++ b/Chinese/monk/monk.md @@ -28,4 +28,4 @@ I like it 这时候走过来一个小和尚，手里拿着一本书。 老和尚看见了就问他：“你看的是什么书？” -小和尚回答道：”师傅你猜猜，是[阿里巴巴与四十大盗]（alibaba/alibaba.md), 还是别的？“ \ No newline at end of file +小和尚回答道：”师傅你猜猜，是[阿里巴巴与四十大盗](alibaba/alibaba.md), 还是别的？“ \ No newline at end of file From 85535deaa5b3ee985d52106cdda78812f7198d53 Mon Sep 17 00:00:00 2001 From: Nexii Date: Tue, 2 Feb 2016 11:44:17 +0530 Subject: [PATCH 2421/5486] Added link to git website --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index a262ca3e49..34bd20012a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -775,4 +775,6 @@ You look up and out to the ocean. In the distance you see a [mermaid](mermaid/me The mermaid above died, but [don't worry...](mermaid2/mermaid.md) -The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) \ No newline at end of file +The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) +[Link to Git Official Website] (git/git.md) + From d1043ab7ffc6f037528a3924ec19a035831e9626 Mon Sep 17 00:00:00 2001 From: Nexii Date: Tue, 2 Feb 2016 11:45:37 +0530 Subject: [PATCH 2422/5486] link to git website --- english/git/git.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/git/git.md diff --git a/english/git/git.md b/english/git/git.md new file mode 100644 index 0000000000..3ae09f1f33 --- /dev/null +++ b/english/git/git.md @@ -0,0 +1 @@ +This is the link to [git] (https://git-scm.com/) official website From 95d01bbb38efffff0a177982d886b504974320d2 Mon Sep 17 00:00:00 2001 From: Nexii Date: Tue, 2 Feb 2016 12:06:19 +0530 Subject: [PATCH 2423/5486] Add Space to git line --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 34bd20012a..e0af997db6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -776,5 +776,6 @@ You look up and out to the ocean. In the distance you see a [mermaid](mermaid/me The mermaid above died, but [don't worry...](mermaid2/mermaid.md) The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) + [Link to Git Official Website] (git/git.md) From fe1d3ab5d0bd700c8ecbc86082e76ca1f4243891 Mon Sep 17 00:00:00 2001 From: kumar Date: Tue, 2 Feb 2016 14:21:29 +0530 Subject: [PATCH 2424/5486] new file kumar.md added --- english/kumar/kumar.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/kumar/kumar.md diff --git a/english/kumar/kumar.md b/english/kumar/kumar.md new file mode 100644 index 0000000000..6e93fac89f --- /dev/null +++ b/english/kumar/kumar.md @@ -0,0 +1 @@ +to see google web site click [here] (www.google.com) From ac72f2c259e6c4c7a7ffb3adbbc380b9209760ef Mon Sep 17 00:00:00 2001 From: kumar Date: Tue, 2 Feb 2016 14:31:05 +0530 Subject: [PATCH 2425/5486] new line added to marshmallow.md --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index e0af997db6..fef67ad2f5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -779,3 +779,4 @@ The 3 Rules of Test Driven Development [Read the Rules](test-driven-development- [Link to Git Official Website] (git/git.md) +[link to google website] (kumar/kumar.md) From 562a2fd06b6d12e64625c604ee9d7bea16a43076 Mon Sep 17 00:00:00 2001 From: kumar Date: Tue, 2 Feb 2016 14:32:56 +0530 Subject: [PATCH 2426/5486] chnages made to kumar.md --- english/kumar/kumar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/kumar/kumar.md b/english/kumar/kumar.md index 6e93fac89f..05ad3b6bd5 100644 --- a/english/kumar/kumar.md +++ b/english/kumar/kumar.md @@ -1 +1 @@ -to see google web site click [here] (www.google.com) +for google web site click [here] (http://www.google.com) From 0c3ba4edab404b07446294844b17021cc88ede74 Mon Sep 17 00:00:00 2001 From: jamiedraper Date: Tue, 2 Feb 2016 16:55:23 +0000 Subject: [PATCH 2427/5486] Add more dialog to Better Call Saul page --- english/better-call-saul/saul.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/better-call-saul/saul.md b/english/better-call-saul/saul.md index d71a41e3cd..a98461a5e3 100644 --- a/english/better-call-saul/saul.md +++ b/english/better-call-saul/saul.md @@ -2,7 +2,11 @@ You dial Sauls number... "Hi, its Saul Goodman!" -"Saul, I'm really tired but I have so much to do. Can you help me?" you ask. +"Wise cracking "lawyer" with questionable ethics?" + +"That's the one!" + +"Great. Saul, I'm really tired but I have so much to do. Can you help me?" you ask. "Sure," he says, "Just use the [Cinco Face Time Party Snoozer](https://www.youtube.com/watch?v=Tvu2ZI329V4)." From a94c9ad5026110fc38953a854bd674720fca99b8 Mon Sep 17 00:00:00 2001 From: Ricardo Barbosa Pedro Date: Tue, 2 Feb 2016 17:30:15 -0200 Subject: [PATCH 2428/5486] CodFonte. --- portugues/colaborando.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index cdc251f249..70d3c126d4 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -5,6 +5,8 @@ Você: [Procura o repositório do aplicativo?](colabora/colaborar.md) +[Começa a pensar como solucionar o bug e resolve olhar no codigo fonte](colabora/codFonte.md) + [Não é um programador e decide enviar uma revisão do aplicativo para o desenvolvedor?](revisa/revisar.md) [Git o quê?](git/oque.md) From 9fc73c0b8cdf0f8d688dbec27d7a49cec1d9490c Mon Sep 17 00:00:00 2001 From: Ricardo Barbosa Pedro Date: Tue, 2 Feb 2016 17:49:24 -0200 Subject: [PATCH 2429/5486] Create codFonte.md --- portugues/colabora/codFonte.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 portugues/colabora/codFonte.md diff --git a/portugues/colabora/codFonte.md b/portugues/colabora/codFonte.md new file mode 100644 index 0000000000..1b989f6378 --- /dev/null +++ b/portugues/colabora/codFonte.md @@ -0,0 +1 @@ +E então... From c1466fccc54bdc2b4d98f10bd6b418df10554fd7 Mon Sep 17 00:00:00 2001 From: Cai Black Date: Tue, 2 Feb 2016 20:01:16 +0000 Subject: [PATCH 2430/5486] Add a paragraph about pushing the button, and the appearance of two new openings. Also adds choices for those openings. --- .../steep-slope/steep-slope.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/english/lunge-for-the-lighter/steep-slope/steep-slope.md b/english/lunge-for-the-lighter/steep-slope/steep-slope.md index fb377c0b08..a09097c0e9 100644 --- a/english/lunge-for-the-lighter/steep-slope/steep-slope.md +++ b/english/lunge-for-the-lighter/steep-slope/steep-slope.md @@ -5,3 +5,17 @@ this opening before...while being chased by marshmallow men who were shooting lasers. As you approach the opening, you see that the slope is much steeper than it first appeared, and you can't see where it leads. Just then, you notice a big red button above the opening. + +You decide against just diving blindly into the opening, and, in a flash of what could be called intuition, you +punch the button. This results in two other openings being revealed to the right of the steeply sloping one. You +pause. The first of these new openings reveals a tunnel that ascends slightly, and curves gently away to the right. +Oddly, it seems to made of stone, unlike the rest of what you have seen of this strange place. You can hear the +faint sound of dripping liquid coming from the tunnel. It is lit from above, every two meters or so, by small +lights with wires connecting each of them The second new opening reveals what appears to be a hallway, lit in the +same manner as the first, lined with pictures of various types of bird-like lizards wearing very ... um, unique +clothing. You can just barely hear odd animalistic noises from some point far down the hallway. + +[Walk into the stone tunnel](stone-tunnel) + +[Walk into the hallway](hallway) + From bde224394dfde2223ea8fb2ca833990728aaf35f Mon Sep 17 00:00:00 2001 From: Cai Black Date: Tue, 2 Feb 2016 20:02:21 +0000 Subject: [PATCH 2431/5486] Add directory, file and paragrph about the hallway. --- .../lunge-for-the-lighter/steep-slope/hallway/hallway.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/lunge-for-the-lighter/steep-slope/hallway/hallway.md diff --git a/english/lunge-for-the-lighter/steep-slope/hallway/hallway.md b/english/lunge-for-the-lighter/steep-slope/hallway/hallway.md new file mode 100644 index 0000000000..9a65ef0a1a --- /dev/null +++ b/english/lunge-for-the-lighter/steep-slope/hallway/hallway.md @@ -0,0 +1,7 @@ +With your first step into the hallway, you realize that the situation is about to become much more serious than you +had ever feared. You gave the first picture a once-over, and you can see that it is an image of a very intelligent +creature that, if you didn't know that dinosaurs were extinct, you would swear was the result of millions of years +of further evolution of raptor type dinosaurs. The image depicted what you interpret as a "hunt" with the "hunter", +the primary subject of the image, using a long, three-bladed weapon to kill an immense bear-like animal. A panic +begins to swell within you. + From 511f31a0f7e4648dd6c55bf482f946407fefa6fe Mon Sep 17 00:00:00 2001 From: Cai Black Date: Tue, 2 Feb 2016 20:03:10 +0000 Subject: [PATCH 2432/5486] Add directory, file and paragraph about the stone tunnel. --- .../steep-slope/stone-tunnel/stone-tunnel.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/lunge-for-the-lighter/steep-slope/stone-tunnel/stone-tunnel.md diff --git a/english/lunge-for-the-lighter/steep-slope/stone-tunnel/stone-tunnel.md b/english/lunge-for-the-lighter/steep-slope/stone-tunnel/stone-tunnel.md new file mode 100644 index 0000000000..086ceff94d --- /dev/null +++ b/english/lunge-for-the-lighter/steep-slope/stone-tunnel/stone-tunnel.md @@ -0,0 +1,7 @@ +As you enter the tunnel, you realize that what you thought was the sound of dripping liquid was the sound of two +grey, raccoon-like creatures "talking" to one another. The smaller of the two, at a meter-high, looks you in the +eye for a moment, and hands you a half-meter long, sharpened, metal rod with unintelligble markings on it. The +simplistic designs lead you to believe that the raccoons made these markings. Each of them has one of the rods +too. They "speak" to you, and they gesture down the tunnel. As they turn and walk away further into the tunnel, +you get teh feeling that they want you to follow them. + From be1217cb5e51de867bbc7106fa0c1e50ac17150b Mon Sep 17 00:00:00 2001 From: rupchap Date: Tue, 2 Feb 2016 22:58:58 +0000 Subject: [PATCH 2433/5486] extend introspective thought in front of the abyss --- english/watched/watched.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/watched/watched.md b/english/watched/watched.md index 5867f49f6a..afd8852d6d 100644 --- a/english/watched/watched.md +++ b/english/watched/watched.md @@ -1,4 +1,7 @@ You gaze into the abyss, and the abyss gazes into you. +You feel a chill enter your heart. +Does the abyss know that you're late with your tax return? + Perhaps you'd like to lighten up and [bake some cookies.](../bake-cookies/cookies.md) From 6e44304b2f54f9c0ab325d98ed410b12dea978c8 Mon Sep 17 00:00:00 2001 From: kumar Date: Wed, 3 Feb 2016 10:08:00 +0530 Subject: [PATCH 2434/5486] Telugu directory and Telugu file added --- language.md | 2 ++ telugu/Telugu/Telugu.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 telugu/Telugu/Telugu.md diff --git a/language.md b/language.md index 7c4f36bfb3..ced79cb08a 100644 --- a/language.md +++ b/language.md @@ -135,3 +135,5 @@ As jy Afrikaans kan praat, gaan [hier](afrikaans/kos.md) Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) If you speak Gujarati, go [here](Gujarati/gujarati.md). + +If you want learn Telugu, click [here](Telugu/Telugu.md). diff --git a/telugu/Telugu/Telugu.md b/telugu/Telugu/Telugu.md new file mode 100644 index 0000000000..1255afb7dd --- /dev/null +++ b/telugu/Telugu/Telugu.md @@ -0,0 +1 @@ +click [here](http://www.learningtelugu.org) to learn telugu From e34e81d102e02f1ee94f9312e7d586dc560ac0c9 Mon Sep 17 00:00:00 2001 From: eivak Date: Wed, 3 Feb 2016 12:48:55 +0200 Subject: [PATCH 2435/5486] Add page light-fire to take_the_fork --- greek/take_the_fork/light-fire/light-fire.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 greek/take_the_fork/light-fire/light-fire.md diff --git a/greek/take_the_fork/light-fire/light-fire.md b/greek/take_the_fork/light-fire/light-fire.md new file mode 100644 index 0000000000..fe9d36154f --- /dev/null +++ b/greek/take_the_fork/light-fire/light-fire.md @@ -0,0 +1,13 @@ +Τι έκπληξη! Απ'ότι φαίνεται στα ζαχαρωτά αρέσει η φωτιά. + +Μετά από ένα σύντομο συμβούλιο, σου προτείνουν μια συμφωνία: + +Αν κρατήσεις τον αναπτήρα αναμμένο, θα συγχωρέσουν το έγκλημά σου. + +Διαφορετικά, θα πέσουν όλα πάνω σου να σε πνίξουν, μέχρι να γίνεις + +κι εσύ ζαχαρωτό, και να αντικαταστήσεις τον χαμένο φίλο τους. + +Δέχεσαι την δημοκρατική τους απόφαση, ελπίζοντας πως ο αναπτήρας + +δε θα σβήσει σύντομα... \ No newline at end of file From fef71a50a7165f57783584438e75f6deff180e1e Mon Sep 17 00:00:00 2001 From: eivak Date: Wed, 3 Feb 2016 12:55:06 +0200 Subject: [PATCH 2436/5486] Add text and two options to existing page /take_the_fork/take-the-fork.md --- greek/take_the_fork/take-the-fork.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/greek/take_the_fork/take-the-fork.md b/greek/take_the_fork/take-the-fork.md index 563077fa43..c31e122251 100644 --- a/greek/take_the_fork/take-the-fork.md +++ b/greek/take_the_fork/take-the-fork.md @@ -1 +1,11 @@ Παίρνεις το πιρούνι και τρως το ζαχαρωτό, αφού δεν μπορούσες να αντισταθείς σε μια τέτοια λιχουδιά! + +Μεγάλο λάθος, λαίμαργο παρείσακτο πλάσμα. + +Τα υπόλοιπα ζαχαρωτά εξαγριώνονται που καταβρόχθισες τον φίλο τους, και ετοιμάζονται για επίθεση! + +Εσύ, πανικόβλητος ... + +[Βγάζεις την κάλτσα σου](../put_socks_off/put-socks-off.md) + +[Ανάβεις τον αναπτήρα](light-fire/light-fire.md) \ No newline at end of file From 9cbce57af423ca28cb353475e6a42bcaa53ee290 Mon Sep 17 00:00:00 2001 From: "S.P. Hoang" Date: Wed, 3 Feb 2016 03:45:30 -0800 Subject: [PATCH 2437/5486] Added new choices to the neighbor choice --- english/talk_to_neighbour/man/mulder.md | 1 + english/talk_to_neighbour/talk_to_neighbour.md | 8 +++++++- english/talk_to_neighbour/woman/scully.md | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 english/talk_to_neighbour/man/mulder.md create mode 100644 english/talk_to_neighbour/woman/scully.md diff --git a/english/talk_to_neighbour/man/mulder.md b/english/talk_to_neighbour/man/mulder.md new file mode 100644 index 0000000000..70a1823def --- /dev/null +++ b/english/talk_to_neighbour/man/mulder.md @@ -0,0 +1 @@ +"I'm FBI Special Agent Fox Mulder," the man says in a monotone voice. \ No newline at end of file diff --git a/english/talk_to_neighbour/talk_to_neighbour.md b/english/talk_to_neighbour/talk_to_neighbour.md index 97fc20ba02..953a4c71d7 100644 --- a/english/talk_to_neighbour/talk_to_neighbour.md +++ b/english/talk_to_neighbour/talk_to_neighbour.md @@ -1,3 +1,9 @@ I hear you I see you -I'm Listening \ No newline at end of file +I'm Listening + +As you speak to your neighbor, you see a dark car approach. Two figures emerge, a man and a woman. + +[Talk to the man](english/talk_to_neighbor/woman/scully.md) + +[Talk to the woman](english/talk_to_neighbor/man/mulder.md) \ No newline at end of file diff --git a/english/talk_to_neighbour/woman/scully.md b/english/talk_to_neighbour/woman/scully.md new file mode 100644 index 0000000000..0636dd156f --- /dev/null +++ b/english/talk_to_neighbour/woman/scully.md @@ -0,0 +1 @@ +"I'm Special Agent Dana Scully. You may also know me from The Fall or Hannibal." \ No newline at end of file From 48a6466365b43550e4066602309c62d9316d2379 Mon Sep 17 00:00:00 2001 From: Dmitriy Makhov Date: Wed, 3 Feb 2016 21:16:53 +0300 Subject: [PATCH 2438/5486] Add some incredible turn of story --- russian/break-me-completelly/break-me.md | 3 +++ russian/zefir.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 russian/break-me-completelly/break-me.md diff --git a/russian/break-me-completelly/break-me.md b/russian/break-me-completelly/break-me.md new file mode 100644 index 0000000000..794ba13118 --- /dev/null +++ b/russian/break-me-completelly/break-me.md @@ -0,0 +1,3 @@ +Внезапно в порыве безумия закричу: + +— Ломай меня полностью. Полностью ломай. Полностью ломай. Ломай меня полностью. \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index b1c51b9666..5273e7c4e6 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -65,3 +65,5 @@ [Пойду в другую комнату](next_room/next_room.md) [Поговорю с соседями](speak_to_neighbor/speak_to_neighbor.md) + +[Внезапно безумно начну просить сломать меня] (break-me-completelly/break-me.md) From 041adb79a9890e1ec58443b8163c3f9c21e0e9a6 Mon Sep 17 00:00:00 2001 From: JessicaPuebla Date: Wed, 3 Feb 2016 12:36:41 -0600 Subject: [PATCH 2439/5486] Update canudos.md --- espanol/canudos.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index 1121f4077b..d6edc607d3 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -111,3 +111,7 @@ Lo que nadie sabía, es que el consejero era un versado maestro instruído en la - [Dark_side](dark_side/dark_side.md) - [Light_side](light_side/light_side.md) + +No tuvo más opción que buscar refuerzos, luchadores incanzables que tuvieran las siguientes características: + +- [Características](caracteristicas/caracteristicas.md) From 80cfc76bf91fb54ba7bd0cbbfa8445768f03e159 Mon Sep 17 00:00:00 2001 From: Jessica Puebla Date: Wed, 3 Feb 2016 12:41:45 -0600 Subject: [PATCH 2440/5486] Add espanol/caracteristicas/caracteristicas.md --- espanol/caracteristicas/caracteristicas.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/caracteristicas/caracteristicas.md diff --git a/espanol/caracteristicas/caracteristicas.md b/espanol/caracteristicas/caracteristicas.md new file mode 100644 index 0000000000..3e2b9677d7 --- /dev/null +++ b/espanol/caracteristicas/caracteristicas.md @@ -0,0 +1 @@ +Fuerte, valeroso y con gran astucia. \ No newline at end of file From 4fde0b9cd853e85e52b5fa7c433e59e6d5fd8e09 Mon Sep 17 00:00:00 2001 From: Helen1987 Date: Wed, 3 Feb 2016 22:45:24 +0300 Subject: [PATCH 2441/5486] Update zefir.md --- russian/sleep/zefir.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/sleep/zefir.md b/russian/sleep/zefir.md index 531333c338..fbe54e77d6 100644 --- a/russian/sleep/zefir.md +++ b/russian/sleep/zefir.md @@ -7,4 +7,6 @@ [Вы начнете есть стены?](../eating-walls/eating-marshmallows.md) -[Вы идете чистить зубы](brushing/brushing.md) \ No newline at end of file +[Вы идете чистить зубы](brushing/brushing.md) + +[Попробую отщипнуть кусочек зефирной стены](../nip-off/nip-off.md) From 2d58f1e0dc8b0795077fdf03ea5059527b3e8916 Mon Sep 17 00:00:00 2001 From: Aubrey Blackburn Date: Wed, 3 Feb 2016 16:43:52 -0500 Subject: [PATCH 2442/5486] Add to the story --- english/robot-army/robots-everywhere.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/robot-army/robots-everywhere.md b/english/robot-army/robots-everywhere.md index 491b4147cb..277854f977 100644 --- a/english/robot-army/robots-everywhere.md +++ b/english/robot-army/robots-everywhere.md @@ -3,7 +3,9 @@ You laugh to yourself megalomaniacally at the audacity of this marshmallow. It seriously does not know who it's messing with, what foolishness... Throwing the lighter, rope and fork at the marshmallow hand, you find the connection to your -minions and summon them with haste. +minions and summon them with haste. Your minions run towards you with a fiery passion in their +eyes. It is in this moment you know that they truly care for you and would do anything for you. + Done, you sit down and relax as your [minions](https://www.youtube.com/watch?v=IS0-MVYAVZs) cut the marshmallow into conveniently sized pieces for a party you've decided to hold. From 303e373a76cf2f98b90ecbd6b469f62164fcd9ac Mon Sep 17 00:00:00 2001 From: Aubrey Blackburn Date: Wed, 3 Feb 2016 16:48:41 -0500 Subject: [PATCH 2443/5486] Add to the story --- english/robot-army/robots-everywhere.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/robot-army/robots-everywhere.md b/english/robot-army/robots-everywhere.md index 277854f977..bbb03f949b 100644 --- a/english/robot-army/robots-everywhere.md +++ b/english/robot-army/robots-everywhere.md @@ -3,7 +3,8 @@ You laugh to yourself megalomaniacally at the audacity of this marshmallow. It seriously does not know who it's messing with, what foolishness... Throwing the lighter, rope and fork at the marshmallow hand, you find the connection to your -minions and summon them with haste. Your minions run towards you with a fiery passion in their +minions and summon them with haste. +Your minions run towards you with a fiery passion in their eyes. It is in this moment you know that they truly care for you and would do anything for you. From 020345dbd1dbfb4657deed953eb9aa8c111f6916 Mon Sep 17 00:00:00 2001 From: Andres Villarreal Date: Wed, 3 Feb 2016 18:04:18 -0600 Subject: [PATCH 2444/5486] Snape enters, drunk --- english/visit-hagrid/visit-hagrid.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/visit-hagrid/visit-hagrid.md b/english/visit-hagrid/visit-hagrid.md index e52ad9eb33..25cde6d98b 100644 --- a/english/visit-hagrid/visit-hagrid.md +++ b/english/visit-hagrid/visit-hagrid.md @@ -1,4 +1,5 @@ Hermione, Harry, and Ron saunter down to Hagrid's hut. Before they even knock they are greeted by Fang's loud barking, prompting Hagrid to come to the door. The gang is glad to see Hagrid's friendly face after a tough week. -They sit together drinking tea and politely nibbling on Hagrid's over-baked snacks. \ No newline at end of file +They sit together drinking tea and politely nibbling on Hagrid's over-baked snacks. +Snape wanders in looking really drunk and smelling of whiskey. \ No newline at end of file From 030449086bd1d18ab2e51566417a0a771aebb157 Mon Sep 17 00:00:00 2001 From: APatton1247 Date: Wed, 3 Feb 2016 20:57:03 -0500 Subject: [PATCH 2445/5486] Add summer destinations Spectre (new page) and Sweden (new link) --- english/travel-destinations/spectre/spectre.md | 5 +++++ english/travel-destinations/travel-destinations.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 english/travel-destinations/spectre/spectre.md diff --git a/english/travel-destinations/spectre/spectre.md b/english/travel-destinations/spectre/spectre.md new file mode 100644 index 0000000000..db4da38ebb --- /dev/null +++ b/english/travel-destinations/spectre/spectre.md @@ -0,0 +1,5 @@ +The grass so green + +Skies so blue + +Spectre is really great! \ No newline at end of file diff --git a/english/travel-destinations/travel-destinations.md b/english/travel-destinations/travel-destinations.md index 403644ba9c..b2584c233b 100644 --- a/english/travel-destinations/travel-destinations.md +++ b/english/travel-destinations/travel-destinations.md @@ -1,6 +1,8 @@ It's glorious Spring! Here are some great [destinations](spring/spring.md): It's Summer! Time to explore these places: + [Spectre](spectre/spectre.md) + [Sweden](https://youtu.be/5KYm1UpXiq0?t=53s) Fall is a great season to take a vacation in any of these spots: [fall destinations](fall/fall.md) From 2e718a45e532c275d8072a0d36b75b31aa8c6371 Mon Sep 17 00:00:00 2001 From: APatton1247 Date: Wed, 3 Feb 2016 21:07:42 -0500 Subject: [PATCH 2446/5486] Edit spacing to make destinations more list-like --- english/travel-destinations/travel-destinations.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/english/travel-destinations/travel-destinations.md b/english/travel-destinations/travel-destinations.md index b2584c233b..1e6e736bf5 100644 --- a/english/travel-destinations/travel-destinations.md +++ b/english/travel-destinations/travel-destinations.md @@ -1,8 +1,10 @@ It's glorious Spring! Here are some great [destinations](spring/spring.md): It's Summer! Time to explore these places: - [Spectre](spectre/spectre.md) - [Sweden](https://youtu.be/5KYm1UpXiq0?t=53s) + +[ Spectre](spectre/spectre.md) + +[ Sweden](https://youtu.be/5KYm1UpXiq0?t=53s) Fall is a great season to take a vacation in any of these spots: [fall destinations](fall/fall.md) From 605d213fcc6073e500e5ee64734421d298b1bf65 Mon Sep 17 00:00:00 2001 From: apatton1247 Date: Wed, 3 Feb 2016 21:11:41 -0500 Subject: [PATCH 2447/5486] Add travel destinations for summer --- english/travel-destinations/travel-destinations.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/travel-destinations/travel-destinations.md b/english/travel-destinations/travel-destinations.md index 1e6e736bf5..4cdf7007f4 100644 --- a/english/travel-destinations/travel-destinations.md +++ b/english/travel-destinations/travel-destinations.md @@ -2,12 +2,12 @@ It's glorious Spring! Here are some great [destinations](spring/spring.md): It's Summer! Time to explore these places: -[ Spectre](spectre/spectre.md) +[Spectre](spectre/spectre.md) -[ Sweden](https://youtu.be/5KYm1UpXiq0?t=53s) +[Sweden](https://youtu.be/5KYm1UpXiq0?t=53s) Fall is a great season to take a vacation in any of these spots: [fall destinations](fall/fall.md) It's frosty winter.. but these places can be excitng: -[winter destinations](winter/winter.md) \ No newline at end of file +[winter destinations](winter/winter.md) From 01ef3ece8e17bd09b2e31bb2c515a7dd4ee5351a Mon Sep 17 00:00:00 2001 From: apatton1247 Date: Wed, 3 Feb 2016 21:23:52 -0500 Subject: [PATCH 2448/5486] Deleted blank line from end From 0ce66cc9be4c9650111706da826b795b9499861a Mon Sep 17 00:00:00 2001 From: Tadas Bitkevicius Date: Thu, 4 Feb 2016 13:16:39 +0200 Subject: [PATCH 2449/5486] Added my options for the story. --- lithuanian/apsiciupineti/apsiciupineti.md | 3 +++ lithuanian/startas.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 lithuanian/apsiciupineti/apsiciupineti.md diff --git a/lithuanian/apsiciupineti/apsiciupineti.md b/lithuanian/apsiciupineti/apsiciupineti.md new file mode 100644 index 0000000000..b102fe3bed --- /dev/null +++ b/lithuanian/apsiciupineti/apsiciupineti.md @@ -0,0 +1,3 @@ +Apsičiupinėjęs randa kažką kišenėje + +Ištraukęs pamato, jog tai žibintuvėlis \ No newline at end of file diff --git a/lithuanian/startas.md b/lithuanian/startas.md index 50c800e1c0..83d14491ab 100644 --- a/lithuanian/startas.md +++ b/lithuanian/startas.md @@ -9,3 +9,5 @@ Visiškoje tamsoje jis turėjo pasirinkti [Eiti miegoti](miegoti/miegas.md) [Apsisukti](apsisukti/apsisukti.md) + +[Apsičiupinėti](apsiciupineti/apsiciupineti.md) From 53a553eaeb672224d3d02abf8d28f7d1d50fa25a Mon Sep 17 00:00:00 2001 From: azakharchenko Date: Thu, 4 Feb 2016 13:28:20 +0200 Subject: [PATCH 2450/5486] add test story --- ukrainian/marshmallow.md | 2 ++ ukrainian/test/test.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 ukrainian/test/test.md diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index a5515318e7..86483ec2ce 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -22,4 +22,6 @@ [Просто трошки почекаю](wait-more/wait.md) +[Test!](test/test.md) + І, так, я теж не розумію, для чого мотузка, але в голову лізуть підозрілі думки! diff --git a/ukrainian/test/test.md b/ukrainian/test/test.md new file mode 100644 index 0000000000..6fac2586f0 --- /dev/null +++ b/ukrainian/test/test.md @@ -0,0 +1 @@ +That all! From a02da14a9242164b11ef758668878ed9f30569e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1ra=20Hl=C3=ADn=20Kristj=C3=A1nsd=C3=B3ttir?= Date: Thu, 4 Feb 2016 14:05:53 +0000 Subject: [PATCH 2451/5486] Add secrets of the universe to stacked rocks --- english/scarab/stack-rocks/stack-rocks.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/scarab/stack-rocks/stack-rocks.md b/english/scarab/stack-rocks/stack-rocks.md index a3f99f0b32..dcefcb017f 100644 --- a/english/scarab/stack-rocks/stack-rocks.md +++ b/english/scarab/stack-rocks/stack-rocks.md @@ -1 +1,4 @@ -You have chosen wisely. \ No newline at end of file +You have chosen wisely. + +The rocks are aligned in perfect symmetry. +The secrets of the universe reveal themselves to you. From c8b37b2de8beca92ecd2fa01f4c0f28e53dc81c9 Mon Sep 17 00:00:00 2001 From: sunny Date: Thu, 4 Feb 2016 13:49:09 -0500 Subject: [PATCH 2452/5486] Add Casey won't accept fix typo in Chinese folder --- Chinese/Casey/Casey.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Chinese/Casey/Casey.md b/Chinese/Casey/Casey.md index 1521bd9fcd..7a4e33c138 100644 --- a/Chinese/Casey/Casey.md +++ b/Chinese/Casey/Casey.md @@ -1,2 +1,3 @@ Casey现在为udacity工作，自动合并GitHub的pull request。 Casey is a help bot. +Casey won't accept a pull request that a fix typo. \ No newline at end of file From 7d9c44842b66a89c177e230a21dc649ad7e61589 Mon Sep 17 00:00:00 2001 From: Sodapoptimistic Date: Thu, 4 Feb 2016 16:19:10 -0500 Subject: [PATCH 2453/5486] add link to youtube video "say my name" --- english/say-my-name/say-my-name.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/say-my-name/say-my-name.md b/english/say-my-name/say-my-name.md index 33b2019e32..936c9e1d80 100644 --- a/english/say-my-name/say-my-name.md +++ b/english/say-my-name/say-my-name.md @@ -2,4 +2,6 @@ NOW... SAY MY NAME [Pizza toss](https://www.youtube.com/watch?v=K_GbFMtPF6I) -[Heisenberg](heisenberg/heisenberg.md) \ No newline at end of file +[Heisenberg](heisenberg/heisenberg.md) + +[You better..](https://www.youtube.com/watch?v=sQgd6MccwZc) \ No newline at end of file From a371a5289232149c4d8cd01482c2ad395e8d60e8 Mon Sep 17 00:00:00 2001 From: "S.P. Hoang" Date: Thu, 4 Feb 2016 14:02:33 -0800 Subject: [PATCH 2454/5486] Fix broken links --- english/talk_to_neighbour/talk_to_neighbour.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/talk_to_neighbour/talk_to_neighbour.md b/english/talk_to_neighbour/talk_to_neighbour.md index 953a4c71d7..6f07f74ffc 100644 --- a/english/talk_to_neighbour/talk_to_neighbour.md +++ b/english/talk_to_neighbour/talk_to_neighbour.md @@ -4,6 +4,6 @@ I'm Listening As you speak to your neighbor, you see a dark car approach. Two figures emerge, a man and a woman. -[Talk to the man](english/talk_to_neighbor/woman/scully.md) +[Talk to the woman](woman/scully.md) -[Talk to the woman](english/talk_to_neighbor/man/mulder.md) \ No newline at end of file +[Talk to the man](man/mulder.md) From 8b8c0a7e11e0da37edc7abf578e43aee53789ba6 Mon Sep 17 00:00:00 2001 From: Cameron Pappas Date: Fri, 5 Feb 2016 11:44:41 +1100 Subject: [PATCH 2455/5486] Add order pizza option to story --- english/marshmallow.md | 2 ++ english/order-pizza/order-pizza.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/order-pizza/order-pizza.md diff --git a/english/marshmallow.md b/english/marshmallow.md index fef67ad2f5..64687bd80b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -439,6 +439,8 @@ Take out your [knitting project](knit/knit.md) and finish your sock heel turn. [Come to Nepal](nepal/nepal.md) +[Order Pizza](order-pizza/order-pizza.md) + [Summon your robot army](robot-army/robots-everywhere.md) [Oh dear! You ended up in Candyland!](candyland/diabetes.md) diff --git a/english/order-pizza/order-pizza.md b/english/order-pizza/order-pizza.md new file mode 100644 index 0000000000..7b28516959 --- /dev/null +++ b/english/order-pizza/order-pizza.md @@ -0,0 +1,3 @@ +Your hungry and tired, pizza is the only thing that will cheer you up. +But you dont know what to order. +Suddenly a [menu](https://www.pizzahut.com.au/) appears! \ No newline at end of file From 01808bd43f08be898680183930afe742561acd66 Mon Sep 17 00:00:00 2001 From: Franklin Ludgood Date: Thu, 4 Feb 2016 23:33:55 -0600 Subject: [PATCH 2456/5486] Adding a new phrase to the story. --- english/Booyah/booyah.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/Booyah/booyah.md diff --git a/english/Booyah/booyah.md b/english/Booyah/booyah.md new file mode 100644 index 0000000000..a7ef5fa3b1 --- /dev/null +++ b/english/Booyah/booyah.md @@ -0,0 +1 @@ +I finally understand git and gitHub. I actually understand branches and merges. \ No newline at end of file From e376a2791d8fb0f9a828cfe52fd7f1eec4e29944 Mon Sep 17 00:00:00 2001 From: Ricardo Barbosa Pedro Date: Fri, 5 Feb 2016 11:27:31 -0200 Subject: [PATCH 2457/5486] Update colaborando.md --- portugues/colaborando.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 70d3c126d4..c594194bb2 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -5,7 +5,7 @@ Você: [Procura o repositório do aplicativo?](colabora/colaborar.md) -[Começa a pensar como solucionar o bug e resolve olhar no codigo fonte](colabora/codFonte.md) +[Começa a pensar como solucionar o bug e resolve olhar no codigo fonte](pesquisa/codFonte.md) [Não é um programador e decide enviar uma revisão do aplicativo para o desenvolvedor?](revisa/revisar.md) From 95bda422666572c53731aa567e31ff6183cb9b70 Mon Sep 17 00:00:00 2001 From: Dominic Paquette Date: Fri, 5 Feb 2016 08:29:31 -0500 Subject: [PATCH 2458/5486] add random sentence --- english/shrooms/never-again.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/shrooms/never-again.md b/english/shrooms/never-again.md index e5f591595e..aa706b604a 100644 --- a/english/shrooms/never-again.md +++ b/english/shrooms/never-again.md @@ -7,6 +7,8 @@ Then you notice a small, old man grinning toothlessly back at you from across th He seems somehow detached from reality, and his features appear to both move and stay still, like a statue in the shadows or a painting in the corner of your eye. +His face looks familiar although you cannot be sure. + As he begins to levitate, you realize that it's already too late. Do you: @@ -15,4 +17,4 @@ Do you: [Pinch yourself to make sure the man is real?](../pinch/pinch.md) -[Pinch the man to make sure your self is real?](../pinch/pinch.md) \ No newline at end of file +[Pinch the man to make sure your self is real?](../pinch/pinch.md) From 3ab83c662966554cb813403d6c13fc31bdec7e31 Mon Sep 17 00:00:00 2001 From: Ricardo Barbosa Pedro Date: Fri, 5 Feb 2016 11:35:00 -0200 Subject: [PATCH 2459/5486] Delete codFonte.md --- portugues/colabora/codFonte.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 portugues/colabora/codFonte.md diff --git a/portugues/colabora/codFonte.md b/portugues/colabora/codFonte.md deleted file mode 100644 index 1b989f6378..0000000000 --- a/portugues/colabora/codFonte.md +++ /dev/null @@ -1 +0,0 @@ -E então... From 91a0908c9edc2b00c0bbdbc08e6facefa35ccef7 Mon Sep 17 00:00:00 2001 From: Ricardo Barbosa Pedro Date: Fri, 5 Feb 2016 11:38:32 -0200 Subject: [PATCH 2460/5486] Create Pesquisa --- portugues/Pesquisa | 1 + 1 file changed, 1 insertion(+) create mode 100644 portugues/Pesquisa diff --git a/portugues/Pesquisa b/portugues/Pesquisa new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/portugues/Pesquisa @@ -0,0 +1 @@ + From 0aa593ea03d96e864b0e813562838c476f6df661 Mon Sep 17 00:00:00 2001 From: Ricardo Barbosa Pedro Date: Fri, 5 Feb 2016 11:38:44 -0200 Subject: [PATCH 2461/5486] Delete Pesquisa --- portugues/Pesquisa | 1 - 1 file changed, 1 deletion(-) delete mode 100644 portugues/Pesquisa diff --git a/portugues/Pesquisa b/portugues/Pesquisa deleted file mode 100644 index 8b13789179..0000000000 --- a/portugues/Pesquisa +++ /dev/null @@ -1 +0,0 @@ - From 65880123589d98d98cd6dc736856563f2fc3df5c Mon Sep 17 00:00:00 2001 From: Ricardo Barbosa Pedro Date: Fri, 5 Feb 2016 11:40:12 -0200 Subject: [PATCH 2462/5486] Create codFonte.md --- portugues/pesquisa/codFonte.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 portugues/pesquisa/codFonte.md diff --git a/portugues/pesquisa/codFonte.md b/portugues/pesquisa/codFonte.md new file mode 100644 index 0000000000..1b989f6378 --- /dev/null +++ b/portugues/pesquisa/codFonte.md @@ -0,0 +1 @@ +E então... From 537445fcf8581c6bd3491f66ffd092d294972507 Mon Sep 17 00:00:00 2001 From: sunny Date: Fri, 5 Feb 2016 09:58:55 -0500 Subject: [PATCH 2463/5486] Add link to dancing youtube video "say my name" --- english/say-my-name/say-my-name.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/say-my-name/say-my-name.md b/english/say-my-name/say-my-name.md index 33b2019e32..d571be4e3c 100644 --- a/english/say-my-name/say-my-name.md +++ b/english/say-my-name/say-my-name.md @@ -2,4 +2,6 @@ NOW... SAY MY NAME [Pizza toss](https://www.youtube.com/watch?v=K_GbFMtPF6I) -[Heisenberg](heisenberg/heisenberg.md) \ No newline at end of file +[Heisenberg](heisenberg/heisenberg.md) + +[Some dancing](https://www.youtube.com/watch?v=zBvPEmEkpkg) \ No newline at end of file From 8d5b4abeda4db81b8143837cef2c831fdb46b65a Mon Sep 17 00:00:00 2001 From: Dilpreet Johal Date: Fri, 5 Feb 2016 12:15:08 -0500 Subject: [PATCH 2464/5486] added new quote --- english/quote-of-the-day/career/career.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/quote-of-the-day/career/career.md b/english/quote-of-the-day/career/career.md index 51c3569bfd..914cf93649 100644 --- a/english/quote-of-the-day/career/career.md +++ b/english/quote-of-the-day/career/career.md @@ -1,5 +1,6 @@ Nothing is impossible, the word itself says 'I'm possible'! +The best preparation for tomorrow is doing your best today. [Go back](../quote.md) \ No newline at end of file From e47dae5ef6a9c40b3ca6a1f7bf328a977f674830 Mon Sep 17 00:00:00 2001 From: Kim Michael Date: Fri, 5 Feb 2016 21:47:40 +0300 Subject: [PATCH 2465/5486] Add one line to russian start text --- russian/zefir.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/zefir.md b/russian/zefir.md index 5273e7c4e6..ce660274b6 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -1,5 +1,7 @@ Вы просыпаетесь в комнате со стенами из зефира. +Пол покрыт шоколадной глазурью + Солнце светит и вы видите в окне цветы, цветущие в саду. Тихая музыка в джазовом стиле слышна, наверно она знакомая? From 2f2fa26fcf9b2bb77ecad0f05bc6f535e5af39df Mon Sep 17 00:00:00 2001 From: Evan Moore Date: Fri, 5 Feb 2016 22:48:39 -0700 Subject: [PATCH 2466/5486] introduce the starfish --- english/divergence/divergence.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/divergence/divergence.md b/english/divergence/divergence.md index 512026bca0..c460e82d51 100644 --- a/english/divergence/divergence.md +++ b/english/divergence/divergence.md @@ -1 +1,3 @@ Suddenly everything thing around vanishes into this air, and you start to feel really dizzy... +A purple starfish appears in front of you. +Hello, my friend. From 842d646e5790f1ba5e87e38774665c62787214a7 Mon Sep 17 00:00:00 2001 From: vinceenebuse Date: Sat, 6 Feb 2016 08:17:39 +0100 Subject: [PATCH 2467/5486] Add vinceenebuse loves udacity story --- english/love-udacity/love-udacity.md | 7 +++++++ english/marshmallow.md | 2 ++ 2 files changed, 9 insertions(+) create mode 100644 english/love-udacity/love-udacity.md diff --git a/english/love-udacity/love-udacity.md b/english/love-udacity/love-udacity.md new file mode 100644 index 0000000000..c47f24974e --- /dev/null +++ b/english/love-udacity/love-udacity.md @@ -0,0 +1,7 @@ +I have wanted to change careers for some years now. + +Getting books and buying courses didn't help until I met Udacity. + +She has been the difference and now I am confident I can be a developer. + +I am glad you also met [Udacity](http://www.udacity.com) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 64687bd80b..48f171b5c2 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -10,6 +10,8 @@ and search for your [destiny](destiny/destiny.md). Before we begin, do you need a [warm-up?](warm-up/warm-up.md) +After warming up, take a minute and reflect on your [love for udacity](love-udacity/love-udacity.md) + You are are man (or woman) for all seasons but need help in choosing your travel destinations.. Of course we are happy to help you with these [suggestions](travel-destinations/travel-destinations.md) From 45ff26c4e5a5741db0a205425a7cfeaa1b1484fc Mon Sep 17 00:00:00 2001 From: Tenzin Date: Sat, 6 Feb 2016 15:08:35 +0530 Subject: [PATCH 2468/5486] add confused.md --- english/confused.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/confused.md diff --git a/english/confused.md b/english/confused.md new file mode 100644 index 0000000000..37ff88e029 --- /dev/null +++ b/english/confused.md @@ -0,0 +1 @@ +i am confused! i hope i am doing it right! \ No newline at end of file From 16acc4d97ed0df774333fe91a15ac44be06756a7 Mon Sep 17 00:00:00 2001 From: Tenzin Date: Sat, 6 Feb 2016 15:15:41 +0530 Subject: [PATCH 2469/5486] Added confusion --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 48f171b5c2..79f8b6d0fb 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -784,3 +784,5 @@ The 3 Rules of Test Driven Development [Read the Rules](test-driven-development- [Link to Git Official Website] (git/git.md) [link to google website] (kumar/kumar.md) + +Hi i got this one for udacity team [confused](confused/confused.md) \ No newline at end of file From f05dc971b0f7a3f25effaad89cb894ff8bf8e7c2 Mon Sep 17 00:00:00 2001 From: Tenzin Choeden Date: Sat, 6 Feb 2016 15:18:41 +0530 Subject: [PATCH 2470/5486] Delete confused.md --- english/confused.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 english/confused.md diff --git a/english/confused.md b/english/confused.md deleted file mode 100644 index 37ff88e029..0000000000 --- a/english/confused.md +++ /dev/null @@ -1 +0,0 @@ -i am confused! i hope i am doing it right! \ No newline at end of file From 97c91734a755175810a7378788e43918b03c1163 Mon Sep 17 00:00:00 2001 From: Tenzin Date: Sat, 6 Feb 2016 15:27:18 +0530 Subject: [PATCH 2471/5486] link removed --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 79f8b6d0fb..3b5ad92ce8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -785,4 +785,4 @@ The 3 Rules of Test Driven Development [Read the Rules](test-driven-development- [link to google website] (kumar/kumar.md) -Hi i got this one for udacity team [confused](confused/confused.md) \ No newline at end of file +Hi i got this one for udacity team. \ No newline at end of file From 77f665d2e5a122c9bc68115f85aaa15d75aebba1 Mon Sep 17 00:00:00 2001 From: Herve Rochefort Date: Sat, 6 Feb 2016 11:46:43 +0100 Subject: [PATCH 2472/5486] Add option pencher-bord-nuage --- french/manger/trou/grimpe/haricot.md | 5 +++++ french/manger/trou/grimpe/pencher-bord-nuage/avion.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 french/manger/trou/grimpe/pencher-bord-nuage/avion.md diff --git a/french/manger/trou/grimpe/haricot.md b/french/manger/trou/grimpe/haricot.md index 4096305e2b..7ad69c5fd3 100644 --- a/french/manger/trou/grimpe/haricot.md +++ b/french/manger/trou/grimpe/haricot.md @@ -1,3 +1,8 @@ Vous arrivez en haut de l'haricot, tout en haut dans les nuages. Contrairement au conte du haricot magique, il n'y a ni ogre et ni tresor dans les nuages. + +Vous en profitez donc pour faire une petite sieste après toutes ces aventures. +Soudain vous êtes réveillé par un bruit assourdissant qui vient d'en dessous des nuages. + +[Je me penche sur le bord du nuage pour mieux voir](pencher-bord-nuage/avion.md) diff --git a/french/manger/trou/grimpe/pencher-bord-nuage/avion.md b/french/manger/trou/grimpe/pencher-bord-nuage/avion.md new file mode 100644 index 0000000000..12548ee6b5 --- /dev/null +++ b/french/manger/trou/grimpe/pencher-bord-nuage/avion.md @@ -0,0 +1,2 @@ +Vous voilà penché sur le bord du nuage à observer les alentours. +C'est là que vous apercevez l'avion responsable du bruit assourdissant. \ No newline at end of file From bb04a68ddde31f5b405e6a95ca049a9c6c16f16b Mon Sep 17 00:00:00 2001 From: gbermejo Date: Sat, 6 Feb 2016 12:07:36 +0100 Subject: [PATCH 2473/5486] =?UTF-8?q?A=C3=B1adir=20duraci=C3=B3n=20de=20la?= =?UTF-8?q?=20guerra.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/canudos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index d6edc607d3..e79ef901e5 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -115,3 +115,5 @@ Lo que nadie sabía, es que el consejero era un versado maestro instruído en la No tuvo más opción que buscar refuerzos, luchadores incanzables que tuvieran las siguientes características: - [Características](caracteristicas/caracteristicas.md) + +Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, la guerra no había hecho más que [comenzar](guerra/duracion.md). From 079b5398f59c3ce43878c5b4194e1accfb04ac10 Mon Sep 17 00:00:00 2001 From: gbermejo Date: Sat, 6 Feb 2016 12:18:50 +0100 Subject: [PATCH 2474/5486] Fixed story thanks to bot comments. --- espanol/canudos.md | 3 ++- espanol/guerra/duracion.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 espanol/guerra/duracion.md diff --git a/espanol/canudos.md b/espanol/canudos.md index e79ef901e5..1d5d8d1f37 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -116,4 +116,5 @@ No tuvo más opción que buscar refuerzos, luchadores incanzables que tuvieran l - [Características](caracteristicas/caracteristicas.md) -Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, la guerra no había hecho más que [comenzar](guerra/duracion.md). +Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, + la guerra no había hecho más que [comenzar](guerra/duracion.md). diff --git a/espanol/guerra/duracion.md b/espanol/guerra/duracion.md new file mode 100644 index 0000000000..8d0f4c9e5f --- /dev/null +++ b/espanol/guerra/duracion.md @@ -0,0 +1 @@ +Y muy a su pesar, an quedaran muchos aos hasta verla finalizar. \ No newline at end of file From 07acedbcebb698f4c43c0479453cdcd3e320392f Mon Sep 17 00:00:00 2001 From: Chih-Hong Pang Date: Sat, 6 Feb 2016 11:53:12 -0500 Subject: [PATCH 2475/5486] Add new story line to free-lunch --- english/free-lunch/free-lunch.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/free-lunch/free-lunch.md b/english/free-lunch/free-lunch.md index d2611bf7b6..ec8646790e 100644 --- a/english/free-lunch/free-lunch.md +++ b/english/free-lunch/free-lunch.md @@ -3,4 +3,6 @@ Things that are offered for free always have a hidden cost. Sometimes somebody else pays that hidden cost, but usually it's you. -Hey, all this talk about lunch makes me want to [bake cookies](../bake-cookies/cookies.md) \ No newline at end of file +Hey, all this talk about lunch makes me want to [bake cookies](../bake-cookies/cookies.md) + +And I'm really [hungry](../hungry/hungry.md) \ No newline at end of file From 72bd5a15b97d9e3d20b715a2d0a15569e4b2d3f6 Mon Sep 17 00:00:00 2001 From: Knox Key Date: Sat, 6 Feb 2016 15:10:05 -0600 Subject: [PATCH 2476/5486] Add option to Call Batman --- english/mushroom/eat/eat_mushroom.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/mushroom/eat/eat_mushroom.md b/english/mushroom/eat/eat_mushroom.md index 2f1f66a070..9752c3fafe 100644 --- a/english/mushroom/eat/eat_mushroom.md +++ b/english/mushroom/eat/eat_mushroom.md @@ -7,6 +7,8 @@ rich after they had ingested fly agaric. Anyways ... Do you: +[Call Batman?](../../batman/batman.md) + [Light a fire?](../../light-fire/fire.md) [eat them as raw?](../../super-man/save-the-word.md) From 9f8b34b87949990814bf28e642303f1beb44b051 Mon Sep 17 00:00:00 2001 From: Knox Key Date: Sat, 6 Feb 2016 15:16:21 -0600 Subject: [PATCH 2477/5486] Add blank line before batman option --- english/mushroom/eat/eat_mushroom.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/mushroom/eat/eat_mushroom.md b/english/mushroom/eat/eat_mushroom.md index 9752c3fafe..49eafd90d3 100644 --- a/english/mushroom/eat/eat_mushroom.md +++ b/english/mushroom/eat/eat_mushroom.md @@ -7,6 +7,7 @@ rich after they had ingested fly agaric. Anyways ... Do you: + [Call Batman?](../../batman/batman.md) [Light a fire?](../../light-fire/fire.md) From 6a8ce066ff75cd34aaee468155d6082973f61b46 Mon Sep 17 00:00:00 2001 From: Franklin Ludgood Date: Sat, 6 Feb 2016 21:08:54 -0600 Subject: [PATCH 2478/5486] modified: english/marshmallow.md added a link to my file --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 64687bd80b..110fd01b39 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -779,6 +779,8 @@ The mermaid above died, but [don't worry...](mermaid2/mermaid.md) The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) +The understanding of git [go here](Booyah/booyah.md) + [Link to Git Official Website] (git/git.md) [link to google website] (kumar/kumar.md) From 190399b6755ba2a302d73265bd18e43f41808898 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 7 Feb 2016 15:44:24 +0530 Subject: [PATCH 2479/5486] Add intro to IoT --- english/iot/intro.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/iot/intro.md diff --git a/english/iot/intro.md b/english/iot/intro.md new file mode 100644 index 0000000000..dbc898ec96 --- /dev/null +++ b/english/iot/intro.md @@ -0,0 +1 @@ +Internet of Things From 52c5ae3857c175f247b2c786c195f13e7a0db577 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 7 Feb 2016 15:56:02 +0530 Subject: [PATCH 2480/5486] Add link to my story --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index ced79cb08a..5dcdd5b6df 100644 --- a/language.md +++ b/language.md @@ -137,3 +137,5 @@ Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) If you speak Gujarati, go [here](Gujarati/gujarati.md). If you want learn Telugu, click [here](Telugu/Telugu.md). + +If you want to know more about IoT, click [here](english/iot/intro.md). From ca18a70a9a3d375b420d1c391fc3dc1ef82a40f1 Mon Sep 17 00:00:00 2001 From: James Duffy Date: Sun, 7 Feb 2016 13:34:15 +0000 Subject: [PATCH 2481/5486] Add Scully options --- english/talk_to_neighbour/woman/go-with-scully/talk-aside.md | 2 ++ english/talk_to_neighbour/woman/hop-into-car/drive.md | 2 ++ english/talk_to_neighbour/woman/scully.md | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/talk_to_neighbour/woman/go-with-scully/talk-aside.md create mode 100644 english/talk_to_neighbour/woman/hop-into-car/drive.md diff --git a/english/talk_to_neighbour/woman/go-with-scully/talk-aside.md b/english/talk_to_neighbour/woman/go-with-scully/talk-aside.md new file mode 100644 index 0000000000..2be24122dc --- /dev/null +++ b/english/talk_to_neighbour/woman/go-with-scully/talk-aside.md @@ -0,0 +1,2 @@ +Listen, I need you're help. The world is in grave danger. +Will you help me? \ No newline at end of file diff --git a/english/talk_to_neighbour/woman/hop-into-car/drive.md b/english/talk_to_neighbour/woman/hop-into-car/drive.md new file mode 100644 index 0000000000..f3feee8897 --- /dev/null +++ b/english/talk_to_neighbour/woman/hop-into-car/drive.md @@ -0,0 +1,2 @@ +You push Scully aside and hop into the car. +You drive off into the sunset leaving behind the smell of burning rubber. \ No newline at end of file diff --git a/english/talk_to_neighbour/woman/scully.md b/english/talk_to_neighbour/woman/scully.md index 0636dd156f..048228a699 100644 --- a/english/talk_to_neighbour/woman/scully.md +++ b/english/talk_to_neighbour/woman/scully.md @@ -1 +1,4 @@ -"I'm Special Agent Dana Scully. You may also know me from The Fall or Hannibal." \ No newline at end of file +"I'm Special Agent Dana Scully. You may also know me from The Fall or Hannibal. +I need your help. This man beside me is an Alien." +[Go with Scully](go-with-scully/talk-aside.md) +[Drive away](hop-into-car/drive.md) \ No newline at end of file From d0b213cf8aee5c680d620c7f77a1c2a7a454bc0d Mon Sep 17 00:00:00 2001 From: James Duffy Date: Sun, 7 Feb 2016 13:38:49 +0000 Subject: [PATCH 2482/5486] Update quote from scully and make sure options are on new lines --- english/talk_to_neighbour/woman/go-with-scully/talk-aside.md | 4 ++-- english/talk_to_neighbour/woman/scully.md | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/english/talk_to_neighbour/woman/go-with-scully/talk-aside.md b/english/talk_to_neighbour/woman/go-with-scully/talk-aside.md index 2be24122dc..e7b19e7ebc 100644 --- a/english/talk_to_neighbour/woman/go-with-scully/talk-aside.md +++ b/english/talk_to_neighbour/woman/go-with-scully/talk-aside.md @@ -1,2 +1,2 @@ -Listen, I need you're help. The world is in grave danger. -Will you help me? \ No newline at end of file +Scully says "Listen, I need you're help. The world is in grave danger. +Will you help me?" \ No newline at end of file diff --git a/english/talk_to_neighbour/woman/scully.md b/english/talk_to_neighbour/woman/scully.md index 048228a699..0e4e486f94 100644 --- a/english/talk_to_neighbour/woman/scully.md +++ b/english/talk_to_neighbour/woman/scully.md @@ -1,4 +1,6 @@ "I'm Special Agent Dana Scully. You may also know me from The Fall or Hannibal. I need your help. This man beside me is an Alien." + [Go with Scully](go-with-scully/talk-aside.md) + [Drive away](hop-into-car/drive.md) \ No newline at end of file From 9746ac5f2a4c7c908755b77d47998ed1c85740a4 Mon Sep 17 00:00:00 2001 From: James Duffy Date: Sun, 7 Feb 2016 13:45:47 +0000 Subject: [PATCH 2483/5486] Not modifying existing line --- english/talk_to_neighbour/woman/scully.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/talk_to_neighbour/woman/scully.md b/english/talk_to_neighbour/woman/scully.md index 0e4e486f94..073661b476 100644 --- a/english/talk_to_neighbour/woman/scully.md +++ b/english/talk_to_neighbour/woman/scully.md @@ -1,5 +1,5 @@ -"I'm Special Agent Dana Scully. You may also know me from The Fall or Hannibal. -I need your help. This man beside me is an Alien." +"I'm Special Agent Dana Scully. You may also know me from The Fall or Hannibal". +"I need your help. This man beside me is an Alien". [Go with Scully](go-with-scully/talk-aside.md) From 6a6f142142760a0ccb185b6d68a4dadaefcac489 Mon Sep 17 00:00:00 2001 From: James Duffy Date: Sun, 7 Feb 2016 13:47:09 +0000 Subject: [PATCH 2484/5486] Oy vey- can't must keep quotes consistent \! --- english/talk_to_neighbour/woman/scully.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/talk_to_neighbour/woman/scully.md b/english/talk_to_neighbour/woman/scully.md index 073661b476..be7e2e4c20 100644 --- a/english/talk_to_neighbour/woman/scully.md +++ b/english/talk_to_neighbour/woman/scully.md @@ -1,5 +1,5 @@ -"I'm Special Agent Dana Scully. You may also know me from The Fall or Hannibal". -"I need your help. This man beside me is an Alien". +"I'm Special Agent Dana Scully. You may also know me from The Fall or Hannibal." +"I need your help. This man beside me is an Alien." [Go with Scully](go-with-scully/talk-aside.md) From 53834b64e6bfe42d42c11af0b46466a85aecbdd4 Mon Sep 17 00:00:00 2001 From: Jon Gregg Date: Sun, 7 Feb 2016 12:10:56 -0500 Subject: [PATCH 2485/5486] added hurdles page --- english/hurdles/hurdles.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/hurdles/hurdles.md diff --git a/english/hurdles/hurdles.md b/english/hurdles/hurdles.md new file mode 100644 index 0000000000..b0298952ff --- /dev/null +++ b/english/hurdles/hurdles.md @@ -0,0 +1 @@ +Never fear! A hurdle to one man is an [opportunity to another](https://www.youtube.com/watch?v=VmU6BChuiBs). \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 23202b0de3..6a6d6ac747 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -762,6 +762,8 @@ The divergence is coming, [survive](divergence/divergence.md) or perish? You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) +But there are [too many hurdles in your way](hurdles/hurdles.md). + "What a joke?", he said, after looking at the [news](joke/joke.md) Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... From 7a4e3883b280bb5f59f16dfa787e9c311907967f Mon Sep 17 00:00:00 2001 From: Jon Gregg Date: Sun, 7 Feb 2016 12:28:36 -0500 Subject: [PATCH 2486/5486] added line before introducing hurdles --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6a6d6ac747..9436b3fa73 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -762,6 +762,8 @@ The divergence is coming, [survive](divergence/divergence.md) or perish? You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) +You start off strong... + But there are [too many hurdles in your way](hurdles/hurdles.md). "What a joke?", he said, after looking at the [news](joke/joke.md) From e25d68eb9c3e67af89d8359698494946b058db24 Mon Sep 17 00:00:00 2001 From: clittlejohn Date: Sun, 7 Feb 2016 12:35:51 -0500 Subject: [PATCH 2487/5486] Add story lines to english/marshmallow.md --- english/marshmallow.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 23202b0de3..fbe666a8e7 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -787,4 +787,8 @@ The understanding of git [go here](Booyah/booyah.md) [link to google website] (kumar/kumar.md) -Hi i got this one for udacity team. \ No newline at end of file +Hi i got this one for udacity team. + +As the sand encompassed her toes and +the ocean-spray breezed through her nose +she froze... \ No newline at end of file From a4115c4727ec434baebdf7b78335c4636139709b Mon Sep 17 00:00:00 2001 From: KUMN Date: Sun, 7 Feb 2016 13:34:20 -0800 Subject: [PATCH 2488/5486] Added new line to the end of file --- english/explore-outside/journey-to-flaming-tower/home/home.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/explore-outside/journey-to-flaming-tower/home/home.md b/english/explore-outside/journey-to-flaming-tower/home/home.md index 2d728f8ea8..688dabb1b6 100644 --- a/english/explore-outside/journey-to-flaming-tower/home/home.md +++ b/english/explore-outside/journey-to-flaming-tower/home/home.md @@ -14,3 +14,4 @@ You [start a conversation](hello/hello.md) You [keep walking](../walk/walk.md) You [turn back and run towards the tower](../start-running/start-running.md) + From da1d34d7fe41beba4afc015b2aaab085d10b3d34 Mon Sep 17 00:00:00 2001 From: Joanne Yeung Date: Sun, 7 Feb 2016 16:22:17 -0800 Subject: [PATCH 2489/5486] Add story "show me what you got" to sing/sing-something-else --- .../sing/something-else/show-me-what-you-got/smwyg.md | 11 +++++++++++ english/sing/something-else/sing-something-else.md | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 english/sing/something-else/show-me-what-you-got/smwyg.md diff --git a/english/sing/something-else/show-me-what-you-got/smwyg.md b/english/sing/something-else/show-me-what-you-got/smwyg.md new file mode 100644 index 0000000000..3f8cc2cf13 --- /dev/null +++ b/english/sing/something-else/show-me-what-you-got/smwyg.md @@ -0,0 +1,11 @@ +The heads are alien Cromulons seeking a live performance of the next best hit in the universe. + +It is a competition amongst the planets, and the losing planets are told they will be destroyed. + +"SHOW ME WHAT YOU GOT," they chant again. + +[Do you sing Rick Astley's "Never Gonna Give You Up"?](https://www.youtube.com/watch?v=XHJqQvTNYss) + +[Attempt escape by launching missiles at the heads?](https://www.youtube.com/watch?v=XHJqQvTNYss) + +[Do you get schwifty?](https://www.youtube.com/watch?v=I1188GO4p1E) \ No newline at end of file diff --git a/english/sing/something-else/sing-something-else.md b/english/sing/something-else/sing-something-else.md index a1c9575165..715780e41c 100644 --- a/english/sing/something-else/sing-something-else.md +++ b/english/sing/something-else/sing-something-else.md @@ -4,4 +4,8 @@ Aha, you say to yourself as you figure out the perfect song. Once again, you clear your throat and begin to sing Rick Astley's "Never Gonna Give You Up". -As you sing, a smile grows on the monster's face and you both begin to dance. \ No newline at end of file +As you sing, a smile grows on the monster's face and you both begin to dance. + +But just as you thought you had pleased the monster, several large heads appear from nowhere in the sky. + +["SHOW ME WHAT YOU GOT,"](show-me-what-you-got/smwyg.md) they chant. \ No newline at end of file From 076feb98057ae0004d7766088a4e47541f96858b Mon Sep 17 00:00:00 2001 From: Linda Hellborg Date: Mon, 8 Feb 2016 11:36:20 +0100 Subject: [PATCH 2490/5486] add line in swedish titta-ut --- swedish/titta-ut/titta-ut.md | 1 + 1 file changed, 1 insertion(+) diff --git a/swedish/titta-ut/titta-ut.md b/swedish/titta-ut/titta-ut.md index 7c8bdee707..53b0c93ec7 100644 --- a/swedish/titta-ut/titta-ut.md +++ b/swedish/titta-ut/titta-ut.md @@ -1,6 +1,7 @@ När du tittar ut genom fönstret ser du att det regnar. Det är fortfarande ganska mörkt ute och du känner dig helt utmattad efter nattens mardrömmar. +varför är det alltdi så mörkt i dtta landet? Efter att ha övervägt din situation väljer du att From fc5e6344546c19d4c163bea928d6e42799b3aa3e Mon Sep 17 00:00:00 2001 From: Emad Omar Date: Mon, 8 Feb 2016 16:57:12 +0300 Subject: [PATCH 2491/5486] Add a link to my adventure --- arabic/salamoAlikom.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 94010687b7..12802ff7ff 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -1,6 +1,6 @@ ...السلام عليكم و رحمة الله و بركاته... -هذة اول مشاركة باللغة العربية +هذة اول مشاركة باللغة العربية تمنياتي الى كل من قرأ هذا الملف بالاستفادة الكاملة من هذا التدريب بعد ان انتهيت من هذا السياق حول استعمل جيت هب ماذا تريد ان تفعل؟ @@ -19,3 +19,5 @@ [online](learn/learn.md) عايز اعرف اسماء مواقع كورسات [freelancer](learn/learn.md) عايز اعرف اسماء مواقع كورسات فرى لانس + +[قرار شجاع](tough-decision/tough-decision.md) From f485b05862e52c7b618a4c6f339c1d1d36145b5a Mon Sep 17 00:00:00 2001 From: Emad Omar Date: Mon, 8 Feb 2016 16:57:46 +0300 Subject: [PATCH 2492/5486] Add my adventure --- arabic/tough-decision/tough-decision.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 arabic/tough-decision/tough-decision.md diff --git a/arabic/tough-decision/tough-decision.md b/arabic/tough-decision/tough-decision.md new file mode 100644 index 0000000000..563e431935 --- /dev/null +++ b/arabic/tough-decision/tough-decision.md @@ -0,0 +1,10 @@ +أمضيت سنتان في الدراسة الجامعية والتي اتضح فيما بعد أنها مجرد مضيعة للوقت. لا +شيء استفدته خلال تلك السنتين سوى أنني احتاج لإتخاذ قرار شجاع بالتخلي عن الدراسة +الجامعية واستغلال ذلك الوقت الضائع بشيء ينفعني أكثر. قررت ان أكرس وقت أكثر +للدراسة على يوداستي وتطوير مهاراتي باللغة الانجليزية أكثر. +وأيضاً العمل على فريي لانسر أو موقع مستقل من أجل تغطية تكاليف البرامج. بقي فقط +ذلك القرار الشجاع الذي ينتظر مني ان اتخذه لكي أكرس وقت أكثر للعلم، بدلاً من +مهزلة تضييع الوقت لتحصيل العلامات او الدراجات فقط. + +هل أتخذت قرار كهذا؟ ماذا تتوقع أن يكون المسار الجديد لحياتك، بعد إتخاذ قرار +كهذا؟ From 246f682e7226cf9ab29f3d4862c13bfeaf1df815 Mon Sep 17 00:00:00 2001 From: Emad Omar Date: Mon, 8 Feb 2016 17:07:24 +0300 Subject: [PATCH 2493/5486] Put back the space at the end of line My pull request wasn't eligible for auto merge by @casey-collab , because of a space at the end of line that was removed automatically by my editor. --- arabic/salamoAlikom.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 12802ff7ff..2db079c990 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -1,6 +1,6 @@ ...السلام عليكم و رحمة الله و بركاته... -هذة اول مشاركة باللغة العربية +هذة اول مشاركة باللغة العربية تمنياتي الى كل من قرأ هذا الملف بالاستفادة الكاملة من هذا التدريب بعد ان انتهيت من هذا السياق حول استعمل جيت هب ماذا تريد ان تفعل؟ From f60ea1544d532611b797003630b4a4e4661d113e Mon Sep 17 00:00:00 2001 From: Gabriele Meloncelli Date: Mon, 8 Feb 2016 15:26:02 +0100 Subject: [PATCH 2494/5486] Add new option and page --- Italian/finestra/apri.md | 2 ++ Italian/finestra/attira-il-tappeto/attira-il-tappeto.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 Italian/finestra/attira-il-tappeto/attira-il-tappeto.md diff --git a/Italian/finestra/apri.md b/Italian/finestra/apri.md index 99af3e3023..e905e1b8ea 100644 --- a/Italian/finestra/apri.md +++ b/Italian/finestra/apri.md @@ -16,3 +16,5 @@ Come reagisci? [Torni a dormire](../caramelle.md) [Crei una bambola voodoo per addomesticarlo](tour/tour.md) + +[Attiri il tappeto] (attira-il-tappeto/attira-il-tappeto.md) diff --git a/Italian/finestra/attira-il-tappeto/attira-il-tappeto.md b/Italian/finestra/attira-il-tappeto/attira-il-tappeto.md new file mode 100644 index 0000000000..5b31566332 --- /dev/null +++ b/Italian/finestra/attira-il-tappeto/attira-il-tappeto.md @@ -0,0 +1,2 @@ +Chiami il tappeto per provare ad usarlo come mezzo di trasporto. +Il tappeto reagisce ai tuoi richiami ma non si avvicina a sufficienza per poterci salire. \ No newline at end of file From 7a35a3d5dc9030a5da41a22644d6d290e5f4624b Mon Sep 17 00:00:00 2001 From: Cai Black Date: Mon, 8 Feb 2016 16:17:29 +0000 Subject: [PATCH 2495/5486] Fix broken links. --- english/lunge-for-the-lighter/steep-slope/steep-slope.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/lunge-for-the-lighter/steep-slope/steep-slope.md b/english/lunge-for-the-lighter/steep-slope/steep-slope.md index a09097c0e9..4b6978affd 100644 --- a/english/lunge-for-the-lighter/steep-slope/steep-slope.md +++ b/english/lunge-for-the-lighter/steep-slope/steep-slope.md @@ -15,7 +15,7 @@ lights with wires connecting each of them The second new opening reveals what ap same manner as the first, lined with pictures of various types of bird-like lizards wearing very ... um, unique clothing. You can just barely hear odd animalistic noises from some point far down the hallway. -[Walk into the stone tunnel](stone-tunnel) +[Walk into the stone tunnel](stone-tunnel/stone-tunnel.md) -[Walk into the hallway](hallway) +[Walk into the hallway](hallway/hallway.md) From f2501599de6c34c0eb5fcc9780c76acb3c56b893 Mon Sep 17 00:00:00 2001 From: Goko Minov Date: Mon, 8 Feb 2016 23:29:08 +0100 Subject: [PATCH 2496/5486] Update the adventure --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index a5437b1ec5..f445a85268 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -795,4 +795,6 @@ Hi i got this one for udacity team. As the sand encompassed her toes and the ocean-spray breezed through her nose -she froze... \ No newline at end of file +she froze... + +But the cold never bothered me anyway. \ No newline at end of file From 6e44cbe32392762b088c3e5ef441bd4f3ec90888 Mon Sep 17 00:00:00 2001 From: Goko Minov Date: Mon, 8 Feb 2016 23:32:21 +0100 Subject: [PATCH 2497/5486] Disney frozen --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index f445a85268..5a40e1c7dd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -797,4 +797,6 @@ As the sand encompassed her toes and the ocean-spray breezed through her nose she froze... -But the cold never bothered me anyway. \ No newline at end of file +But the cold never bothered me anyway. + +Let it go, let it gooo... \ No newline at end of file From 11d4a57354baaaf029a74b9442b4b6d13bd893e1 Mon Sep 17 00:00:00 2001 From: Juan Manuel Mateo Date: Tue, 9 Feb 2016 00:00:01 +0100 Subject: [PATCH 2498/5486] que hace el pueblo tras cerrar las puertas --- espanol/muralla/abrir/cerrado/cerrado.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/muralla/abrir/cerrado/cerrado.md b/espanol/muralla/abrir/cerrado/cerrado.md index 9bb9f1bf04..f4499f5b02 100644 --- a/espanol/muralla/abrir/cerrado/cerrado.md +++ b/espanol/muralla/abrir/cerrado/cerrado.md @@ -5,4 +5,6 @@ El ejército cayó implacable sobre los soldados. La batalla había comenzado. +En el pueblo todos se rebelaron contra Beatito. +Como podía abandonarlos solo a su suerte. From ae6bfc88f3baf4a9598a4e0149ef0de5c735cea6 Mon Sep 17 00:00:00 2001 From: BGiv Date: Mon, 8 Feb 2016 18:31:04 -0500 Subject: [PATCH 2499/5486] Add pray changes --- english/little-me/Pray/Pray.md | 7 +++++++ english/little-me/little-me.md | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 english/little-me/Pray/Pray.md diff --git a/english/little-me/Pray/Pray.md b/english/little-me/Pray/Pray.md new file mode 100644 index 0000000000..a41ba653e8 --- /dev/null +++ b/english/little-me/Pray/Pray.md @@ -0,0 +1,7 @@ +You squint your eyes. You pray, and it seems like nothing happens. + +You choose to: + +[Keep Praying](../use-powers/use-powers.md) + +[Eat Candy](../little-me/Candy/Candy.md) \ No newline at end of file diff --git a/english/little-me/little-me.md b/english/little-me/little-me.md index e27c7dcf04..0d95d3f40f 100644 --- a/english/little-me/little-me.md +++ b/english/little-me/little-me.md @@ -6,4 +6,6 @@ You Choose To: [Feed him Apple](../little-me/Apple/Apple.md) -[Feed him Candy](../little-me/Candy/Candy.md) \ No newline at end of file +[Feed him Candy](../little-me/Candy/Candy.md) + +[Pray](../little-me/Pray/Pray.md) \ No newline at end of file From 03a610f4a8f190832b72e915164815494a505386 Mon Sep 17 00:00:00 2001 From: Brendhan Givens Date: Mon, 8 Feb 2016 18:37:45 -0500 Subject: [PATCH 2500/5486] Fix links --- english/little-me/Pray/Pray.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/little-me/Pray/Pray.md b/english/little-me/Pray/Pray.md index a41ba653e8..52386b20fe 100644 --- a/english/little-me/Pray/Pray.md +++ b/english/little-me/Pray/Pray.md @@ -2,6 +2,6 @@ You squint your eyes. You pray, and it seems like nothing happens. You choose to: -[Keep Praying](../use-powers/use-powers.md) +[Keep Praying](../../use-powers/use-powers.md) -[Eat Candy](../little-me/Candy/Candy.md) \ No newline at end of file +[Eat Candy](../../little-me/Candy/Candy.md) From 6f0128bb12dda62abf4b2dd223fd64c7e2696d6f Mon Sep 17 00:00:00 2001 From: Jake Date: Tue, 9 Feb 2016 11:32:10 +0800 Subject: [PATCH 2501/5486] New links for PH --- Philippines/bago/bago.md | 3 +++ Philippines/salamat.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 Philippines/bago/bago.md diff --git a/Philippines/bago/bago.md b/Philippines/bago/bago.md new file mode 100644 index 0000000000..f0240d829d --- /dev/null +++ b/Philippines/bago/bago.md @@ -0,0 +1,3 @@ +Dito nag-uumpisa ang iyong daan tungo sa pagbabago. + +Bumalik sa Udacity para mag-aral o kaya bumalik sa [umpisa] (Philippines/salamat.md) \ No newline at end of file diff --git a/Philippines/salamat.md b/Philippines/salamat.md index 11a0fe3322..d99d0b0e0b 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -1,3 +1,5 @@ Maligayang pasko at manigong bagong taon sa inyo! Salamat sa Udacity para sa -online class na ito :D \ No newline at end of file +online class na ito :D + +Ipagpatuloy ang adventure [dito] (Philippines/bago/bago.md). \ No newline at end of file From 53c5778bfac5330c1dea72583c3952986d3c99f4 Mon Sep 17 00:00:00 2001 From: "John Carlo \"Jake\" Malto" Date: Tue, 9 Feb 2016 11:38:47 +0800 Subject: [PATCH 2502/5486] Update salamat.md --- Philippines/salamat.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index d99d0b0e0b..314b21d055 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -2,4 +2,4 @@ Maligayang pasko at manigong bagong taon sa inyo! Salamat sa Udacity para sa online class na ito :D -Ipagpatuloy ang adventure [dito] (Philippines/bago/bago.md). \ No newline at end of file +Ipagpatuloy ang adventure [dito] (bago/bago.md). From a163c857ede34e460827f26d6874239341f0cc63 Mon Sep 17 00:00:00 2001 From: "John Carlo \"Jake\" Malto" Date: Tue, 9 Feb 2016 11:39:24 +0800 Subject: [PATCH 2503/5486] Update bago.md --- Philippines/bago/bago.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Philippines/bago/bago.md b/Philippines/bago/bago.md index f0240d829d..6a4deed3c5 100644 --- a/Philippines/bago/bago.md +++ b/Philippines/bago/bago.md @@ -1,3 +1,3 @@ Dito nag-uumpisa ang iyong daan tungo sa pagbabago. -Bumalik sa Udacity para mag-aral o kaya bumalik sa [umpisa] (Philippines/salamat.md) \ No newline at end of file +Bumalik sa Udacity para mag-aral o kaya bumalik sa [umpisa] (../salamat.md) From 507982881ff8d7183989c93e172b4af64f24de11 Mon Sep 17 00:00:00 2001 From: Sherartz Date: Tue, 9 Feb 2016 01:50:54 -0500 Subject: [PATCH 2504/5486] Add new line --- english/coffee/procrastinate/procrastinate.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/coffee/procrastinate/procrastinate.md b/english/coffee/procrastinate/procrastinate.md index cf1939cd38..9aaf3308e9 100644 --- a/english/coffee/procrastinate/procrastinate.md +++ b/english/coffee/procrastinate/procrastinate.md @@ -4,3 +4,4 @@ Procrastinate!! Well, That seems to work every time you want to avoid a problem. You flip out your phone and tap on that little twitter icon and voila! Problems just disappear and you are in a [whole new world!](./whole-new-world/whole-new-world.md) +Then your counscioussness pokes you again, and you don't want to listen to it so you try youtube instead. \ No newline at end of file From 95bfd9fb99a879765b9e2ff9645fa07ce98f6c88 Mon Sep 17 00:00:00 2001 From: jensbackvall Date: Tue, 9 Feb 2016 13:20:11 +0100 Subject: [PATCH 2505/5486] Add haervejen option to velkommen.md --- danish/haervejen/haervejen.md | 8 ++++++++ danish/velkommen.md | 4 ++++ 2 files changed, 12 insertions(+) create mode 100644 danish/haervejen/haervejen.md diff --git a/danish/haervejen/haervejen.md b/danish/haervejen/haervejen.md new file mode 100644 index 0000000000..0de05626b3 --- /dev/null +++ b/danish/haervejen/haervejen.md @@ -0,0 +1,8 @@ +Du vandrer sydpå og fra bakkerne hører du lyden af [musik](https://www.youtube.com/watch?v=cUGd8X7bjuo). + +Men du vælger at ignorere det og prøver at finde et køretøj. Vælger du: + +[en traktor](https://youtu.be/kCsSVLZ6wCI?t=31s)? +[at ride med Dick Turpin](https://www.youtube.com/watch?v=n4d3RW488AQ)? +eller +[det ukendte eventyr(kun for de modige)](https://www.youtube.com/watch?v=MFzDaBzBlL0) \ No newline at end of file diff --git a/danish/velkommen.md b/danish/velkommen.md index e728ad674a..c4fb1db1ac 100644 --- a/danish/velkommen.md +++ b/danish/velkommen.md @@ -2,6 +2,8 @@ Du befinder på en mark i Vestjylland tilhørende kartoffelavler Oluf Sand og de Sammen med dig er Fritz, Hansi og Günther, der skal finde en nøgle til the Playdåse som spiller Gammel Noks livsmelodi. +Når du kigger sydpå, kan du se Hærvejen som fører mod SønderJylland og Nissernes forjættede once-again-joined-land. + Gammel Nok bliver i sin seng. Vælger du at: @@ -9,3 +11,5 @@ Vælger du at: [Spørge "Well Gynter! How goes it with the snitting?"](snitting/snitting.md) [Prøver at lette stemningen](synging/synging.md) + +[Tage kapsækken på ryggen og vandre sydpå, "Come so med jer! What are you venting for?"](haervejen/haervejen.md) From 4e5a2aa6550905489b96e1fe2bcba6860a97928e Mon Sep 17 00:00:00 2001 From: jensbackvall Date: Tue, 9 Feb 2016 13:23:21 +0100 Subject: [PATCH 2506/5486] Add question mark to final option in haervejen --- danish/haervejen/haervejen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/danish/haervejen/haervejen.md b/danish/haervejen/haervejen.md index 0de05626b3..f0a2eeeaae 100644 --- a/danish/haervejen/haervejen.md +++ b/danish/haervejen/haervejen.md @@ -5,4 +5,4 @@ Men du vælger at ignorere det og prøver at finde et køretøj. Vælger du: [en traktor](https://youtu.be/kCsSVLZ6wCI?t=31s)? [at ride med Dick Turpin](https://www.youtube.com/watch?v=n4d3RW488AQ)? eller -[det ukendte eventyr(kun for de modige)](https://www.youtube.com/watch?v=MFzDaBzBlL0) \ No newline at end of file +[det ukendte eventyr(kun for de modige)](https://www.youtube.com/watch?v=MFzDaBzBlL0)? \ No newline at end of file From 670ac727cd1425fbdb8f261ca976b7c2ec046117 Mon Sep 17 00:00:00 2001 From: jensbackvall Date: Tue, 9 Feb 2016 13:29:54 +0100 Subject: [PATCH 2507/5486] Add lines between options --- danish/haervejen/haervejen.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/danish/haervejen/haervejen.md b/danish/haervejen/haervejen.md index f0a2eeeaae..2ad680619b 100644 --- a/danish/haervejen/haervejen.md +++ b/danish/haervejen/haervejen.md @@ -3,6 +3,9 @@ Du vandrer sydpå og fra bakkerne hører du lyden af [musik](https://www.youtube Men du vælger at ignorere det og prøver at finde et køretøj. Vælger du: [en traktor](https://youtu.be/kCsSVLZ6wCI?t=31s)? + [at ride med Dick Turpin](https://www.youtube.com/watch?v=n4d3RW488AQ)? + eller + [det ukendte eventyr(kun for de modige)](https://www.youtube.com/watch?v=MFzDaBzBlL0)? \ No newline at end of file From ed79dde2336a7cd334fcaaf3cb32bdc7f2797103 Mon Sep 17 00:00:00 2001 From: Ikari Date: Tue, 9 Feb 2016 11:39:32 -0200 Subject: [PATCH 2508/5486] Add new path from portuguese md file (udacity choice) and new conclusion (udacity folder and file) --- portugues/colaborando.md | 2 ++ portugues/udacity/udacity.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 portugues/udacity/udacity.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index c594194bb2..06d43561cd 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -11,6 +11,8 @@ Você: [Git o quê?](git/oque.md) +[Procura o site da Udacity para aprender sobre Git e GitHub](udacity/udacity.md) + [Procura um amigo que sabe de tecnologia](amigo/tecnologia.md) [Cria um aplicativo melhor](cria/melhor.md) diff --git a/portugues/udacity/udacity.md b/portugues/udacity/udacity.md new file mode 100644 index 0000000000..2556554f7a --- /dev/null +++ b/portugues/udacity/udacity.md @@ -0,0 +1 @@ +Você acessa a página [Udacity](http://udacity.com), faz o seu cadastro e começa a aprender! \ No newline at end of file From 11345b481f600265a5ad38ff32600db123c38401 Mon Sep 17 00:00:00 2001 From: agmcc Date: Tue, 9 Feb 2016 15:00:43 +0000 Subject: [PATCH 2509/5486] Add chocolate lego platypus --- english/lego-world/lego-world.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/lego-world/lego-world.md b/english/lego-world/lego-world.md index 4558ff54fb..8d945bf684 100644 --- a/english/lego-world/lego-world.md +++ b/english/lego-world/lego-world.md @@ -3,4 +3,5 @@ But this world is a Lego version of Willy Wonka and the Chocolate Factory. You are actually skiing down the slope of a marshmallow mountain made out of Legos! You are surrounded by lollipop trees and gingerbread houses. [Everything is awesome!](https://youtu.be/etzMjoH0rJw) -And you just can't help but bust out some dance moves \ No newline at end of file +And you just can't help but bust out some dance moves +But oh wait! Suddenly a giant Lego platypus appears out of the chocolate river! It starts waddling towards you... \ No newline at end of file From 568de9fd67cd566d5ffbc37e9551069729eb7e16 Mon Sep 17 00:00:00 2001 From: Larry Date: Tue, 9 Feb 2016 18:09:45 +0000 Subject: [PATCH 2510/5486] Add lines to exising story re git --- english/Booyah/booyah.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/Booyah/booyah.md b/english/Booyah/booyah.md index a7ef5fa3b1..c2478fb708 100644 --- a/english/Booyah/booyah.md +++ b/english/Booyah/booyah.md @@ -1 +1,4 @@ -I finally understand git and gitHub. I actually understand branches and merges. \ No newline at end of file +I finally understand git and gitHub. I actually understand branches and merges. + +What am I going to do with my new found knowledge? +The world is now my [oyster.](https://en.wikipedia.org/wiki/Pacific_oyster) From ba974eb2a4ca054136c201b2c3f799b38a49221d Mon Sep 17 00:00:00 2001 From: Juan Lessey Paredes Date: Tue, 9 Feb 2016 15:12:36 -0430 Subject: [PATCH 2511/5486] Add "curandero" string and file to espanol/canudos.md --- espanol/canudos.md | 2 ++ espanol/curandero/curandero.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 espanol/curandero/curandero.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 1d5d8d1f37..8400731083 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -118,3 +118,5 @@ No tuvo más opción que buscar refuerzos, luchadores incanzables que tuvieran l Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, la guerra no había hecho más que [comenzar](guerra/duracion.md). + +"El que tenga rabo de paja ni que lo fajen chiquito", dijo el [curandero](curandero/curandero.md)... diff --git a/espanol/curandero/curandero.md b/espanol/curandero/curandero.md new file mode 100644 index 0000000000..1b24e8dcbd --- /dev/null +++ b/espanol/curandero/curandero.md @@ -0,0 +1 @@ +Y enseguida, aparentando locura, recitó en su mente el conjuro para librar a los Canudos de las fuerzas del Kerepakupai \ No newline at end of file From 40db9bab8522ba9d1e8e77c5dbd477c70a3be05d Mon Sep 17 00:00:00 2001 From: Juan Lessey Paredes Date: Tue, 9 Feb 2016 16:48:20 -0430 Subject: [PATCH 2512/5486] Add fixing lines to "curandero string" --- espanol/canudos.md | 3 ++- espanol/curandero/curandero.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 8400731083..b905f0eee7 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -119,4 +119,5 @@ No tuvo más opción que buscar refuerzos, luchadores incanzables que tuvieran l Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, la guerra no había hecho más que [comenzar](guerra/duracion.md). -"El que tenga rabo de paja ni que lo fajen chiquito", dijo el [curandero](curandero/curandero.md)... +"El que tenga rabo de paja ni que lo fajen chiquito", +dijo el [curandero](curandero/curandero.md)... diff --git a/espanol/curandero/curandero.md b/espanol/curandero/curandero.md index 1b24e8dcbd..ae3dc970ed 100644 --- a/espanol/curandero/curandero.md +++ b/espanol/curandero/curandero.md @@ -1 +1,2 @@ -Y enseguida, aparentando locura, recitó en su mente el conjuro para librar a los Canudos de las fuerzas del Kerepakupai \ No newline at end of file +Y enseguida, aparentando locura, recitó en su mente el conjuro para librar a los Canudos de las +fuerzas del Kerepakupai \ No newline at end of file From 0251bad46c73d1308d914878d5d5894f77229e4a Mon Sep 17 00:00:00 2001 From: tkrings Date: Tue, 9 Feb 2016 23:00:23 +0100 Subject: [PATCH 2513/5486] Contribute to German part of the story --- german/abwarten/abwarten.md | 6 ++++++ german/ruderboot.md | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 german/abwarten/abwarten.md diff --git a/german/abwarten/abwarten.md b/german/abwarten/abwarten.md new file mode 100644 index 0000000000..85f75c2a83 --- /dev/null +++ b/german/abwarten/abwarten.md @@ -0,0 +1,6 @@ +In der Tat lösen sich so einige Probleme von selbst, wenn man einfach nur lange genug wartet. + +Bei genauerer Betrachtung ist die aktuelle allerdings keine solche Situation, in der die sich ergebende Lösung besonders angenehm +oder reizvoll erscheint. + +[Daher bietet es sich an doch noch eine andere Entscheidung zu treffen...](../ruderboot.md) \ No newline at end of file diff --git a/german/ruderboot.md b/german/ruderboot.md index a89ab7246c..55d08e4707 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -24,6 +24,8 @@ Werden Sie: [Durchlcherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) +[Handeln ist anstrengend. Warum nicht einfach abwarten was passiert?](abwarten/abwarten.md) + [Sie spren einen hllischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) [Kopfber ins Wasser springen](Kopfsprung/Kopfsprung.md) \ No newline at end of file From beaf804b74d57f9d3f48d73a03fe019ee03c0f56 Mon Sep 17 00:00:00 2001 From: JuGiner Date: Tue, 9 Feb 2016 23:05:03 +0100 Subject: [PATCH 2514/5486] Add new option in the main story, panic --- catala/catala.md | 4 +++- catala/panic/panic.md | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 catala/panic/panic.md diff --git a/catala/catala.md b/catala/catala.md index a5fce5e9c6..dd131e5231 100644 --- a/catala/catala.md +++ b/catala/catala.md @@ -20,4 +20,6 @@ Què fas? [Comences a menjar sucre desesperadament](menjar/menjar.md) -[somrius](somrius/somrius.md) \ No newline at end of file +[somrius](somrius/somrius.md) + +[Entres en pànic absolut](panic/panic.md) diff --git a/catala/panic/panic.md b/catala/panic/panic.md new file mode 100644 index 0000000000..895b2d7da0 --- /dev/null +++ b/catala/panic/panic.md @@ -0,0 +1,16 @@ +De sobte no pots respirar, els pulmons se't fan petits i no t'entra l'aire. + +Notes com tot el cos se't paralitza de por. + +Però com redimonis has arribat allà? + +L'últim que recordes és que estaves a casa, tumbat al teu llit, llegint +abans d'anar a dormir. + +I pensant en llegit... on està el llibre? + +Però redimoniiiiis!!! A qui li importa on està el llibre en aquest moment? +Això no és important en aquest moment, t'has de centrar i pensar en on estàs, +com hi has arribat i com redimooooooniiiiis sortiràs d'allà. + +Però... i el llibre? From 59efa46cfa2cde013e63369189731cf4cbed2ec6 Mon Sep 17 00:00:00 2001 From: tkrings Date: Tue, 9 Feb 2016 23:12:15 +0100 Subject: [PATCH 2515/5486] Shorten line in abwarten.md --- german/abwarten/abwarten.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/german/abwarten/abwarten.md b/german/abwarten/abwarten.md index 85f75c2a83..26f780793d 100644 --- a/german/abwarten/abwarten.md +++ b/german/abwarten/abwarten.md @@ -1,6 +1,6 @@ In der Tat lösen sich so einige Probleme von selbst, wenn man einfach nur lange genug wartet. -Bei genauerer Betrachtung ist die aktuelle allerdings keine solche Situation, in der die sich ergebende Lösung besonders angenehm -oder reizvoll erscheint. +Bei genauerer Betrachtung ist die aktuelle allerdings keine solche Situation, in der die sich +ergebende Lösung besonders angenehm oder reizvoll erscheint. [Daher bietet es sich an doch noch eine andere Entscheidung zu treffen...](../ruderboot.md) \ No newline at end of file From 6d0ffb4b14b2b84875e5fa347e2f39f41b6e5903 Mon Sep 17 00:00:00 2001 From: "lee.kerley@gmail.com" Date: Tue, 9 Feb 2016 17:37:43 -0800 Subject: [PATCH 2516/5486] adding beer brewing adventure --- english/beer-brewer/beer-brewer.md | 11 +++++++++++ english/marshmallow.md | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 english/beer-brewer/beer-brewer.md diff --git a/english/beer-brewer/beer-brewer.md b/english/beer-brewer/beer-brewer.md new file mode 100644 index 0000000000..9bd8c329e1 --- /dev/null +++ b/english/beer-brewer/beer-brewer.md @@ -0,0 +1,11 @@ +You decide that brewing beer might be a good idea. + +You go to a beer brewing store and realise that you have no idea what you're doing. + +What should you do? + +Decide that its better to just give up and drink some [Beer](https://www.youtube.com/watch?v=yzcEG_JoVuo)." + +Learn how to brew from some online [videos](https://www.youtube.com/watch?v=qCW-SVPCw4Y) + +Give up and go back to the [beginning](../marshmallow.md) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5a40e1c7dd..378281eea1 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -770,6 +770,8 @@ But there are [too many hurdles in your way](hurdles/hurdles.md). Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... +It says you should [brew some beer](beer-brewer/beer-brewer.md). + The [news](joke/joke.md) says it all my people! Bible says... As you sow, so shall you [reap](think/growrich.md) From 8b229a9cf1a5e64195d5f1a1c1a2612fb3a95153 Mon Sep 17 00:00:00 2001 From: Tiffany Stallings Date: Tue, 9 Feb 2016 21:43:41 -0500 Subject: [PATCH 2517/5486] Add link to "sing" for next page. --- english/blah-balh/blah-blah.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/blah-balh/blah-blah.md b/english/blah-balh/blah-blah.md index a3e0f20b20..0cf211c8e9 100644 --- a/english/blah-balh/blah-blah.md +++ b/english/blah-balh/blah-blah.md @@ -2,6 +2,6 @@ Say something, just talk, so everybody can listen to the voice you have to offer Be as smart as you can be in your voice so you don't sound stupid. -And sing if possible. Singing cheers people up. +And [sing](../singing.md) if possible. Singing cheers people up. -If no sing [go back](../marshmallow.md) \ No newline at end of file +If no sing [go back](../marshmallow.md) From cadaa623188e01aa146126706e6d99ee9d74b36d Mon Sep 17 00:00:00 2001 From: Tiffany Stallings Date: Tue, 9 Feb 2016 21:47:10 -0500 Subject: [PATCH 2518/5486] Create singing.md --- english/singing/singing.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/singing/singing.md diff --git a/english/singing/singing.md b/english/singing/singing.md new file mode 100644 index 0000000000..5e73b4c757 --- /dev/null +++ b/english/singing/singing.md @@ -0,0 +1,3 @@ +You choose to sing your favorite song. + +You were mildly out of tune, but the sentiment was appreciated! From 7000101c96868a30a0ec5ffa1e6d1d914721a312 Mon Sep 17 00:00:00 2001 From: Tiffany Stallings Date: Tue, 9 Feb 2016 21:48:11 -0500 Subject: [PATCH 2519/5486] Fix link for singing --- english/blah-balh/blah-blah.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/blah-balh/blah-blah.md b/english/blah-balh/blah-blah.md index 0cf211c8e9..f3c510e7e6 100644 --- a/english/blah-balh/blah-blah.md +++ b/english/blah-balh/blah-blah.md @@ -2,6 +2,6 @@ Say something, just talk, so everybody can listen to the voice you have to offer Be as smart as you can be in your voice so you don't sound stupid. -And [sing](../singing.md) if possible. Singing cheers people up. +And [sing](../singing/singing.md) if possible. Singing cheers people up. If no sing [go back](../marshmallow.md) From 7d67763578815530e024d0274f267b4d863d2fe5 Mon Sep 17 00:00:00 2001 From: Jack Ngai Date: Tue, 9 Feb 2016 22:49:34 -0500 Subject: [PATCH 2520/5486] Add snowman story line --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index a5437b1ec5..0efdd42ab4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -795,4 +795,6 @@ Hi i got this one for udacity team. As the sand encompassed her toes and the ocean-spray breezed through her nose -she froze... \ No newline at end of file +she froze... + +Do you want to build a [snowman?] (snowman/snowman.md) \ No newline at end of file From 0b444bb925ca9e33b23ad7cc83ed48dee6981011 Mon Sep 17 00:00:00 2001 From: Jack Ngai Date: Tue, 9 Feb 2016 22:50:41 -0500 Subject: [PATCH 2521/5486] Add snowman choices --- english/snowman/ice_monster.md | 1 + english/snowman/olaf.md | 1 + english/snowman/snowman.md | 3 +++ 3 files changed, 5 insertions(+) create mode 100644 english/snowman/ice_monster.md create mode 100644 english/snowman/olaf.md create mode 100644 english/snowman/snowman.md diff --git a/english/snowman/ice_monster.md b/english/snowman/ice_monster.md new file mode 100644 index 0000000000..e4be9357dc --- /dev/null +++ b/english/snowman/ice_monster.md @@ -0,0 +1 @@ +Furious for being rejected, the Ice Queen created the Ice Monster! \ No newline at end of file diff --git a/english/snowman/olaf.md b/english/snowman/olaf.md new file mode 100644 index 0000000000..6bbce9f361 --- /dev/null +++ b/english/snowman/olaf.md @@ -0,0 +1 @@ +The Ice Queen created Olaf! \ No newline at end of file diff --git a/english/snowman/snowman.md b/english/snowman/snowman.md new file mode 100644 index 0000000000..75024bdd9b --- /dev/null +++ b/english/snowman/snowman.md @@ -0,0 +1,3 @@ +[Yes] (olaf.md) + +[No] (ice_monster.md) \ No newline at end of file From 211399e6abc22a5d25d9978934066eb678ee4b89 Mon Sep 17 00:00:00 2001 From: Matthew Morton Date: Wed, 10 Feb 2016 16:53:21 +1300 Subject: [PATCH 2522/5486] Added alfred to the story --- english/batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index 301c8debfa..cdd5f411be 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -27,3 +27,5 @@ Commissioner Gordon: He's the hero Gotham deserves but not the one that it needs Uncle Ben: With great power comes great responsibility. (Hey Uncle Ben was a character in Spiderman!!, doesn't belong here) + +The real hero is alfred the butler.. From b7b7d375f26d29c75c458b0e72dee2402f381c4a Mon Sep 17 00:00:00 2001 From: Jack Ngai Date: Tue, 9 Feb 2016 23:15:32 -0500 Subject: [PATCH 2523/5486] Adjust snowman format --- english/snowman/ice_monster/ice_monster.md | 1 + english/snowman/olaf/olaf.md | 1 + english/snowman/snowman.md | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 english/snowman/ice_monster/ice_monster.md create mode 100644 english/snowman/olaf/olaf.md diff --git a/english/snowman/ice_monster/ice_monster.md b/english/snowman/ice_monster/ice_monster.md new file mode 100644 index 0000000000..e4be9357dc --- /dev/null +++ b/english/snowman/ice_monster/ice_monster.md @@ -0,0 +1 @@ +Furious for being rejected, the Ice Queen created the Ice Monster! \ No newline at end of file diff --git a/english/snowman/olaf/olaf.md b/english/snowman/olaf/olaf.md new file mode 100644 index 0000000000..6bbce9f361 --- /dev/null +++ b/english/snowman/olaf/olaf.md @@ -0,0 +1 @@ +The Ice Queen created Olaf! \ No newline at end of file diff --git a/english/snowman/snowman.md b/english/snowman/snowman.md index 75024bdd9b..075c0ced29 100644 --- a/english/snowman/snowman.md +++ b/english/snowman/snowman.md @@ -1,3 +1,3 @@ -[Yes] (olaf.md) +[Yes] (olaf/olaf.md) -[No] (ice_monster.md) \ No newline at end of file +[No] (ice_monster/ice_monster.md) \ No newline at end of file From 01cd40a42d2199185dd41389cdeebb88b1298ded Mon Sep 17 00:00:00 2001 From: Robert Johnston Date: Wed, 10 Feb 2016 17:42:00 +1300 Subject: [PATCH 2524/5486] Contribute to English story --- english/quit-your-job/quit-your-job.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/quit-your-job/quit-your-job.md b/english/quit-your-job/quit-your-job.md index c66ebf6b69..a6ffa585b3 100644 --- a/english/quit-your-job/quit-your-job.md +++ b/english/quit-your-job/quit-your-job.md @@ -1,2 +1,3 @@ You suddenly decide that coding and enjoying your life are far mor important than saving money. You decide that you are going to take the leap and quit your job in December 2015. +You write your letter giving 4 weeks notice and hand it to your employer. From 93403aebcb2295014a00eccc339741111ca051df Mon Sep 17 00:00:00 2001 From: Brendan Date: Wed, 10 Feb 2016 03:44:29 -0500 Subject: [PATCH 2525/5486] Add simple branch for PR --- english/talk_to_neighbour/woman/bored/circus.md | 2 ++ english/talk_to_neighbour/woman/scully.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/talk_to_neighbour/woman/bored/circus.md diff --git a/english/talk_to_neighbour/woman/bored/circus.md b/english/talk_to_neighbour/woman/bored/circus.md new file mode 100644 index 0000000000..f743f0ee69 --- /dev/null +++ b/english/talk_to_neighbour/woman/bored/circus.md @@ -0,0 +1,2 @@ +Picture of elephants in tutus begin to float through your brain... + diff --git a/english/talk_to_neighbour/woman/scully.md b/english/talk_to_neighbour/woman/scully.md index be7e2e4c20..e40a65cf0a 100644 --- a/english/talk_to_neighbour/woman/scully.md +++ b/english/talk_to_neighbour/woman/scully.md @@ -3,4 +3,6 @@ [Go with Scully](go-with-scully/talk-aside.md) +[Bored](bored/circus.md), you start to think of something else. + [Drive away](hop-into-car/drive.md) \ No newline at end of file From 3610553674b7cd3da36adbff99f6fdd8e186e423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Kj=C3=B8ller=20Hansen?= Date: Wed, 10 Feb 2016 06:47:03 -0500 Subject: [PATCH 2526/5486] Added bicycle ride to Danish story --- danish/haervejen/cykeltur/cykeltur.md | 8 ++++++++ danish/haervejen/haervejen.md | 2 ++ 2 files changed, 10 insertions(+) create mode 100644 danish/haervejen/cykeltur/cykeltur.md diff --git a/danish/haervejen/cykeltur/cykeltur.md b/danish/haervejen/cykeltur/cykeltur.md new file mode 100644 index 0000000000..d56daa7b04 --- /dev/null +++ b/danish/haervejen/cykeltur/cykeltur.md @@ -0,0 +1,8 @@ +Du samler cyklen op, og nu går det væsentligt hurtigere, omend lettere +knirkende. Vejen bugter sig langsomt ned gennem landskabet, langs marker, +gårde og landsbyer. + +Dagen er nu ved at være på hæld, og du kan ikke se noget der kunne ligne et +gæstgiveri i nærheden. + +Hvad gør du? diff --git a/danish/haervejen/haervejen.md b/danish/haervejen/haervejen.md index 2ad680619b..7d6e3f2b3a 100644 --- a/danish/haervejen/haervejen.md +++ b/danish/haervejen/haervejen.md @@ -2,6 +2,8 @@ Du vandrer sydpå og fra bakkerne hører du lyden af [musik](https://www.youtube Men du vælger at ignorere det og prøver at finde et køretøj. Vælger du: +[en rusten cykel](cykeltur/cykeltur.md) + [en traktor](https://youtu.be/kCsSVLZ6wCI?t=31s)? [at ride med Dick Turpin](https://www.youtube.com/watch?v=n4d3RW488AQ)? From ab699aedfa239c426c45d81b2ec0bf8a80c54282 Mon Sep 17 00:00:00 2001 From: Tiffany Stallings Date: Wed, 10 Feb 2016 16:52:43 -0500 Subject: [PATCH 2527/5486] Update blah-blah.md --- english/blah-balh/blah-blah.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/blah-balh/blah-blah.md b/english/blah-balh/blah-blah.md index f3c510e7e6..ba8ca6cbf9 100644 --- a/english/blah-balh/blah-blah.md +++ b/english/blah-balh/blah-blah.md @@ -2,6 +2,8 @@ Say something, just talk, so everybody can listen to the voice you have to offer Be as smart as you can be in your voice so you don't sound stupid. -And [sing](../singing/singing.md) if possible. Singing cheers people up. +And sing if possible. Singing cheers people up. + +[Sing](../singing/singing.md) If no sing [go back](../marshmallow.md) From 9186211d76818c58b262320c45ca10b8ca1f3ffa Mon Sep 17 00:00:00 2001 From: Tiffany Stallings Date: Wed, 10 Feb 2016 16:54:42 -0500 Subject: [PATCH 2528/5486] Fix line deletions --- english/blah-balh/blah-blah.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/blah-balh/blah-blah.md b/english/blah-balh/blah-blah.md index ba8ca6cbf9..32dfa1a514 100644 --- a/english/blah-balh/blah-blah.md +++ b/english/blah-balh/blah-blah.md @@ -4,6 +4,6 @@ Be as smart as you can be in your voice so you don't sound stupid. And sing if possible. Singing cheers people up. -[Sing](../singing/singing.md) - If no sing [go back](../marshmallow.md) + +[Sing](../singing/singing.md) From 9bfcbaa960510bfdc75d972d985f59c038e4ede0 Mon Sep 17 00:00:00 2001 From: Jonathan Warshaw Date: Wed, 10 Feb 2016 18:18:58 -0600 Subject: [PATCH 2529/5486] Fix broken link to attack folder --- .../ask-person-about-mission/duel/duel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/duel.md b/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/duel.md index 05331a7787..7b97cd8ea1 100644 --- a/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/duel.md +++ b/english/explore-outside/journey-to-flaming-tower/jellybus/ask-person-about-destination/ask-person-about-mission/duel/duel.md @@ -10,4 +10,4 @@ He instantly leaps to his feet and lets out a roar. Do you? -[Attack!](../attack/attack.md) \ No newline at end of file +[Attack!](./attack/attack.md) From a5d3e683232ff2305c43603881d23ad907f881da Mon Sep 17 00:00:00 2001 From: Lucas de Castro Oliveira Date: Thu, 11 Feb 2016 01:09:01 -0200 Subject: [PATCH 2530/5486] add something --- portugues/colaborando.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 06d43561cd..f8e12820f5 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -41,3 +41,5 @@ Vende seu PC? [NÃO](nvenda/nao.md) Um tijolo pesa 1 quilo mais meio tijolo. Quanto pesa 1 tijolo e meio? + +BR BR BR Hue hue hue!!!! From 0948b9a0e7e33936d24c9f521798106b768fa706 Mon Sep 17 00:00:00 2001 From: Jack Ngai Date: Wed, 10 Feb 2016 22:32:58 -0500 Subject: [PATCH 2531/5486] Adjust folder structure --- english/ice_monster/ice_monster.md | 1 + english/olaf/olaf.md | 1 + english/snowman/snowman.md | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 english/ice_monster/ice_monster.md create mode 100644 english/olaf/olaf.md diff --git a/english/ice_monster/ice_monster.md b/english/ice_monster/ice_monster.md new file mode 100644 index 0000000000..e4be9357dc --- /dev/null +++ b/english/ice_monster/ice_monster.md @@ -0,0 +1 @@ +Furious for being rejected, the Ice Queen created the Ice Monster! \ No newline at end of file diff --git a/english/olaf/olaf.md b/english/olaf/olaf.md new file mode 100644 index 0000000000..6bbce9f361 --- /dev/null +++ b/english/olaf/olaf.md @@ -0,0 +1 @@ +The Ice Queen created Olaf! \ No newline at end of file diff --git a/english/snowman/snowman.md b/english/snowman/snowman.md index 075c0ced29..7534eed3cc 100644 --- a/english/snowman/snowman.md +++ b/english/snowman/snowman.md @@ -1,3 +1,3 @@ -[Yes] (olaf/olaf.md) +[Yes] (../olaf/olaf.md) -[No] (ice_monster/ice_monster.md) \ No newline at end of file +[No] (../ice_monster/ice_monster.md) \ No newline at end of file From 0b204a53254a37b3df7baf15da00ec2bc26139a7 Mon Sep 17 00:00:00 2001 From: Jack Ngai Date: Wed, 10 Feb 2016 22:35:31 -0500 Subject: [PATCH 2532/5486] Delete moved files from commit --- english/snowman/ice_monster.md | 1 - english/snowman/ice_monster/ice_monster.md | 1 - english/snowman/olaf.md | 1 - english/snowman/olaf/olaf.md | 1 - 4 files changed, 4 deletions(-) delete mode 100644 english/snowman/ice_monster.md delete mode 100644 english/snowman/ice_monster/ice_monster.md delete mode 100644 english/snowman/olaf.md delete mode 100644 english/snowman/olaf/olaf.md diff --git a/english/snowman/ice_monster.md b/english/snowman/ice_monster.md deleted file mode 100644 index e4be9357dc..0000000000 --- a/english/snowman/ice_monster.md +++ /dev/null @@ -1 +0,0 @@ -Furious for being rejected, the Ice Queen created the Ice Monster! \ No newline at end of file diff --git a/english/snowman/ice_monster/ice_monster.md b/english/snowman/ice_monster/ice_monster.md deleted file mode 100644 index e4be9357dc..0000000000 --- a/english/snowman/ice_monster/ice_monster.md +++ /dev/null @@ -1 +0,0 @@ -Furious for being rejected, the Ice Queen created the Ice Monster! \ No newline at end of file diff --git a/english/snowman/olaf.md b/english/snowman/olaf.md deleted file mode 100644 index 6bbce9f361..0000000000 --- a/english/snowman/olaf.md +++ /dev/null @@ -1 +0,0 @@ -The Ice Queen created Olaf! \ No newline at end of file diff --git a/english/snowman/olaf/olaf.md b/english/snowman/olaf/olaf.md deleted file mode 100644 index 6bbce9f361..0000000000 --- a/english/snowman/olaf/olaf.md +++ /dev/null @@ -1 +0,0 @@ -The Ice Queen created Olaf! \ No newline at end of file From e807f4d6eb2826d26d6d45cf8186d6f495e1da1a Mon Sep 17 00:00:00 2001 From: SuboorJunaidi Date: Thu, 11 Feb 2016 23:57:52 +0530 Subject: [PATCH 2533/5486] Add Gibberish --- Gibberish/Gibberish.md | 5 +++++ language.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 Gibberish/Gibberish.md diff --git a/Gibberish/Gibberish.md b/Gibberish/Gibberish.md new file mode 100644 index 0000000000..a249b004e1 --- /dev/null +++ b/Gibberish/Gibberish.md @@ -0,0 +1,5 @@ +ksdjbsdbsdkjlcbksbdb sck sdkcj bdckjsc dksdbckbdc +ksdbcksbdkjc cbskbckjbsdkcj wdc +dckjbkbdckjbskjdbckbf ww +djlsdbkjbsvdkjbkrjv ekrjberkjdber rekbvekjbre kbe +kdjsbvkjsbdvjks dweskbqwobqwdlkasnlsanb diff --git a/language.md b/language.md index 5dcdd5b6df..04610ef880 100644 --- a/language.md +++ b/language.md @@ -139,3 +139,5 @@ If you speak Gujarati, go [here](Gujarati/gujarati.md). If you want learn Telugu, click [here](Telugu/Telugu.md). If you want to know more about IoT, click [here](english/iot/intro.md). + +If GibberisHkjsbckjsjcn,[hereeekdcskj](Gibberish/Gibberish.md) From 85de1b72787b3641280de6cb7fb04695a228c69d Mon Sep 17 00:00:00 2001 From: Caroline Date: Thu, 11 Feb 2016 13:48:45 -0600 Subject: [PATCH 2534/5486] adding a line --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 58dfa40d2e..7b6b80fd3f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -804,4 +804,6 @@ But the cold never bothered me anyway. Let it go, let it gooo... -Do you want to build a [snowman?] (snowman/snowman.md) \ No newline at end of file +Do you want to build a [snowman?] (snowman/snowman.md) + +I think I'll try defying gravity. \ No newline at end of file From 2f61137671761cfb7076ccf02c4e4757cccd59b1 Mon Sep 17 00:00:00 2001 From: a1xdvn Date: Fri, 12 Feb 2016 16:09:16 +0100 Subject: [PATCH 2535/5486] Add option to take a nap --- .../keep_looking_for_chocolate/keep_looking_for_chocolate.md | 5 ++++- english/take-a-nap/take-a-nap.md | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 english/take-a-nap/take-a-nap.md diff --git a/english/keep_looking_for_chocolate/keep_looking_for_chocolate.md b/english/keep_looking_for_chocolate/keep_looking_for_chocolate.md index 3fc728756b..d28b28d9ce 100644 --- a/english/keep_looking_for_chocolate/keep_looking_for_chocolate.md +++ b/english/keep_looking_for_chocolate/keep_looking_for_chocolate.md @@ -1,3 +1,6 @@ Underneath the Tums you find a single, faintly glowing malt ball. -[Take the malt ball](../take-malt/take-malt.md) \ No newline at end of file +[Take the malt ball](../take-malt/take-malt.md) + +[Take a nap](../take-a-nap/take-a-nap.md) + diff --git a/english/take-a-nap/take-a-nap.md b/english/take-a-nap/take-a-nap.md new file mode 100644 index 0000000000..09acd99455 --- /dev/null +++ b/english/take-a-nap/take-a-nap.md @@ -0,0 +1 @@ +You wake up a few hours later, and note that there are now two malt balls. \ No newline at end of file From 0429c537f82ec07e0ae1a5e3be506451121360f4 Mon Sep 17 00:00:00 2001 From: Laurent Sehabiague Date: Fri, 12 Feb 2016 11:55:48 -0500 Subject: [PATCH 2536/5486] add croisiere option --- french/manger/trou/reveille/sirene/crapaud.md | 4 +++- french/manger/trou/reveille/sirene/et_alors/croisiere.md | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 french/manger/trou/reveille/sirene/et_alors/croisiere.md diff --git a/french/manger/trou/reveille/sirene/crapaud.md b/french/manger/trou/reveille/sirene/crapaud.md index f7ac3225e6..e230c0c4ac 100644 --- a/french/manger/trou/reveille/sirene/crapaud.md +++ b/french/manger/trou/reveille/sirene/crapaud.md @@ -4,4 +4,6 @@ Vous avez perdu le contrôle, les yeux clos, votre bouche contre la sienne, vous En effet, plus de sirène, le vieux crapaud est de retour juste sous votre nez, -vous regardant d'un oeil satisfait. Il vous a berné, vous avez bel et bien embrassé le batrassien... \ No newline at end of file +vous regardant d'un oeil satisfait. Il vous a berné, vous avez bel et bien embrassé le batrassien... + +[et alors?](et_alors/croisiere.md) \ No newline at end of file diff --git a/french/manger/trou/reveille/sirene/et_alors/croisiere.md b/french/manger/trou/reveille/sirene/et_alors/croisiere.md new file mode 100644 index 0000000000..6e26bedbdb --- /dev/null +++ b/french/manger/trou/reveille/sirene/et_alors/croisiere.md @@ -0,0 +1,2 @@ +Vous vous dites qu'un baiser de crapaud n'est pas la fin du monde. +Et d'ailleurs, pourquoi ne pas continuer votre petite croisière et aller la trouver cette fin? \ No newline at end of file From 76d87fc476efd5d79b6e3308cc0a0d257a3c27f8 Mon Sep 17 00:00:00 2001 From: Matthew Song Date: Fri, 12 Feb 2016 17:06:23 -0500 Subject: [PATCH 2537/5486] Add a new dialogue to Supreme Bao --- Chinese/PanicStation/panic.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/PanicStation/panic.md diff --git a/Chinese/PanicStation/panic.md b/Chinese/PanicStation/panic.md new file mode 100644 index 0000000000..9030c5dcf3 --- /dev/null +++ b/Chinese/PanicStation/panic.md @@ -0,0 +1 @@ +至尊宝：其实我就是一条狗 一条害怕😢的狗 From b6455b439f255b455536a5df26df0931877c3836 Mon Sep 17 00:00:00 2001 From: Matthew Song Date: Fri, 12 Feb 2016 17:16:35 -0500 Subject: [PATCH 2538/5486] Add link to my story --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 4b3082fc00..60dee1fb80 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -1,5 +1,7 @@ 在1994年大话西游之月光宝盒的电影中，主角周星驰饰演的孙悟空在500年后转世成为： +[PanicStation](PanicStation/panic.md) + [Orascom](Orascom/Orascom.md) [雪人](snowman/story.md) From 2f0b2b3ef38830065e14dc4c90165a6770bc51ff Mon Sep 17 00:00:00 2001 From: Tan Liang Wei Date: Sat, 13 Feb 2016 11:38:13 +0800 Subject: [PATCH 2539/5486] Liang's combat ration --- english/2spooky/2spooky.md | 4 +++- english/combatration/combat_ration.md | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 english/combatration/combat_ration.md diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index e8cdb29969..f1f6f896fa 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -14,4 +14,6 @@ no your face! [Go back to sleep.](../sleep/marshmallow.md) -[Check DC Comics.](../DC-Comics/epic_DC_Character.md) +[Check DC Comics.](../DC-Comics/epic_DC_Character.md + +[consume combat ration](../combatration/combat_ration.md) \ No newline at end of file diff --git a/english/combatration/combat_ration.md b/english/combatration/combat_ration.md new file mode 100644 index 0000000000..042d1ef275 --- /dev/null +++ b/english/combatration/combat_ration.md @@ -0,0 +1,2 @@ +this combat ration is so nice. +it is poisonous you ate and died From 1fc75a7c3efa8b2df3eb81b47a28c0c8d8779abe Mon Sep 17 00:00:00 2001 From: Tan Liang Wei Date: Sat, 13 Feb 2016 11:46:48 +0800 Subject: [PATCH 2540/5486] correct typo brace --- english/2spooky/2spooky.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index f1f6f896fa..bc6e8003a9 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -14,6 +14,6 @@ no your face! [Go back to sleep.](../sleep/marshmallow.md) -[Check DC Comics.](../DC-Comics/epic_DC_Character.md +[Check DC Comics.](../DC-Comics/epic_DC_Character.md) [consume combat ration](../combatration/combat_ration.md) \ No newline at end of file From 440b91e7a5dd2da372a7017e61ed3ea396363cf9 Mon Sep 17 00:00:00 2001 From: Jonathan Bracey Date: Sat, 13 Feb 2016 13:25:17 -0500 Subject: [PATCH 2541/5486] Add links to give reader options --- .../find-a-toilet/door/run-in/take-ladder/open-sky.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/eating-walls/find-a-toilet/door/run-in/take-ladder/open-sky.md b/english/eating-walls/find-a-toilet/door/run-in/take-ladder/open-sky.md index 0485fcb16d..9c3b1c604b 100644 --- a/english/eating-walls/find-a-toilet/door/run-in/take-ladder/open-sky.md +++ b/english/eating-walls/find-a-toilet/door/run-in/take-ladder/open-sky.md @@ -4,4 +4,8 @@ as you are tens-of-thousands of feet up in the clouds, just like Luke Skywalker. After many hours you are resigned to the fact that you will die here or will you? -What do you do: \ No newline at end of file +What do you do: + +[Let go.] (english/wake-up/wake-up.md) + +[Continue the climb down] (english/strange-room/room.md) and bust through a door. \ No newline at end of file From e51dffbb71ed81d944d86ae265cf51bcbc911bd9 Mon Sep 17 00:00:00 2001 From: jonathanbracey Date: Sat, 13 Feb 2016 13:35:48 -0500 Subject: [PATCH 2542/5486] Fix relative links --- .../find-a-toilet/door/run-in/take-ladder/open-sky.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/eating-walls/find-a-toilet/door/run-in/take-ladder/open-sky.md b/english/eating-walls/find-a-toilet/door/run-in/take-ladder/open-sky.md index 9c3b1c604b..146fc90871 100644 --- a/english/eating-walls/find-a-toilet/door/run-in/take-ladder/open-sky.md +++ b/english/eating-walls/find-a-toilet/door/run-in/take-ladder/open-sky.md @@ -6,6 +6,6 @@ After many hours you are resigned to the fact that you will die here or will you What do you do: -[Let go.] (english/wake-up/wake-up.md) +[Let go.](../../../../../wake-up/wake-up.md) -[Continue the climb down] (english/strange-room/room.md) and bust through a door. \ No newline at end of file +[Continue the climb down](../../../../../strange-room/room.md) and bust through a door. From c902df6091b63704fee60e43eb0dff29b0f6f21d Mon Sep 17 00:00:00 2001 From: Steve Frechette Date: Sat, 13 Feb 2016 14:55:12 -0500 Subject: [PATCH 2543/5486] Added diversion thought for main character --- english/marshmallow.md | 2 ++ .../yellow-baby-buggy-bumpers.md | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 english/yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 7b6b80fd3f..9d75198088 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -40,6 +40,8 @@ Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. Ok, we have to consider Saturday too. +And as you considered Saturday, [this crazy thought popped into your head](yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md) + Alice doesn't live here anymore, [or does she?](scarab/goddess.md) But not Monday; you never go out on a Sunday evening......[or do you](./or-do-you/or-do-you.md)? diff --git a/english/yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md b/english/yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md new file mode 100644 index 0000000000..3f11a94747 --- /dev/null +++ b/english/yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md @@ -0,0 +1,11 @@ +You weren't sure how it happened, but you suddenly remembered a story about yellow baby +buggy bumpers. But you didn't actually "remember" it; it was more of a dead link in +your brain. You remember the phrase "yellow baby buggy bumpers" from your past, it reminds +you of your youth. But you don't know what it means. + +After many days of not eating or sleeping while trying to recall what that phrase meant, +you suddenly make a decision. You want to take a bumper car ride while dressed in your +favorite yellow suit and sucking your thumb. You're not sure it is the best decision for +your career but you know it's the right thing to do. + +You then start walking towards the amusement park. \ No newline at end of file From 6e5c30c2063df569d7d5723c5aea69e75df07aef Mon Sep 17 00:00:00 2001 From: Steve Frechette Date: Sat, 13 Feb 2016 15:00:54 -0500 Subject: [PATCH 2544/5486] shortened to less than 100 characters --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 9d75198088..3472c72caf 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -40,7 +40,7 @@ Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. Ok, we have to consider Saturday too. -And as you considered Saturday, [this crazy thought popped into your head](yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md) +[this crazy thought popped into your head](yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md) Alice doesn't live here anymore, [or does she?](scarab/goddess.md) From 7518ac66dcaca3fc3f67028f7f9473661280c4f4 Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Sun, 14 Feb 2016 12:20:17 +1100 Subject: [PATCH 2545/5486] Add line about making yourself a sandwich --- english/hungry/hungry.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/hungry/hungry.md b/english/hungry/hungry.md index ac51e92889..6478594aa1 100644 --- a/english/hungry/hungry.md +++ b/english/hungry/hungry.md @@ -1,3 +1,4 @@ When ur hungry, wat do you eat ? Maggi is outdated, so i would eat potato chips -Why not try 2-minute noodles? \ No newline at end of file +Why not try 2-minute noodles? +Ultimately you decide that the best course of action is to make yourself a sandwich. \ No newline at end of file From 82202a18bd9a9746cef3f7335afa3446e700b61b Mon Sep 17 00:00:00 2001 From: David Peebles Date: Sun, 14 Feb 2016 10:40:07 +0000 Subject: [PATCH 2546/5486] Add sandwich story element --- english/marshmallow.md | 4 +++- english/sandwich/sandwich.md | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 english/sandwich/sandwich.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 3472c72caf..fd15507f40 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -10,6 +10,8 @@ and search for your [destiny](destiny/destiny.md). Before we begin, do you need a [warm-up?](warm-up/warm-up.md) +or maybe [eat that delicious cucumber sandwich?](sandwich/sandwich.md) + After warming up, take a minute and reflect on your [love for udacity](love-udacity/love-udacity.md) You are are man (or woman) for all seasons but need help in choosing @@ -808,4 +810,4 @@ Let it go, let it gooo... Do you want to build a [snowman?] (snowman/snowman.md) -I think I'll try defying gravity. \ No newline at end of file +I think I'll try defying gravity. diff --git a/english/sandwich/sandwich.md b/english/sandwich/sandwich.md new file mode 100644 index 0000000000..ff3b4b700e --- /dev/null +++ b/english/sandwich/sandwich.md @@ -0,0 +1,6 @@ +You rummage in your rucksack and find that cucumber sandwich you made +for the journey. + +It's gone a bit soggy though. + +You strengthen your resolve and eat it anyway. You may need the energy later. From c67907ee2df70ca10967a6729bf5b488c3421595 Mon Sep 17 00:00:00 2001 From: amilar Date: Sun, 14 Feb 2016 13:48:55 +0100 Subject: [PATCH 2547/5486] Add to Norwegian story --- norwegian/start.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/norwegian/start.md b/norwegian/start.md index 7818922d94..66a0e5f7e0 100644 --- a/norwegian/start.md +++ b/norwegian/start.md @@ -1,3 +1,5 @@ Nå er det din tur å fortsette eventyret herfra! +Det er en varm kveld midt i sommerferien. + Du sitter på en stein i vannkanten og ser noe flyte i fjæra. \ No newline at end of file From 33cf1e8c6f0676d61f465f88bb39b4d6fb796626 Mon Sep 17 00:00:00 2001 From: jmgarzo Date: Sun, 14 Feb 2016 14:41:56 +0100 Subject: [PATCH 2548/5486] Add new option guerrero modified: espanol/comida/comida.md Add new file guerrero new file: espanol/comida/guerrero/guerrero.md --- espanol/comida/comida.md | 4 +++- espanol/comida/guerrero/guerrero.md | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 espanol/comida/guerrero/guerrero.md diff --git a/espanol/comida/comida.md b/espanol/comida/comida.md index ef338f7f41..2ae6d3f2ef 100644 --- a/espanol/comida/comida.md +++ b/espanol/comida/comida.md @@ -2,4 +2,6 @@ Aguantose las náuseas, y tras enjugarse el sudor, pensó que nuevas le traería [El ejercito había vencido al enemigo](victoria/victoria.md) -[Una orda de ogros había atravesado la frontera norte](ogros/ogros.md) \ No newline at end of file +[Una orda de ogros había atravesado la frontera norte](ogros/ogros.md) + +[Un misterioso guerrero les estaba prestando ayuda](guerrero/guerrero.md) \ No newline at end of file diff --git a/espanol/comida/guerrero/guerrero.md b/espanol/comida/guerrero/guerrero.md new file mode 100644 index 0000000000..2be5ce93df --- /dev/null +++ b/espanol/comida/guerrero/guerrero.md @@ -0,0 +1,5 @@ +El capitán exhausto por la larga cabalgata desmontó del caballo y explicó, rebosante de esperanza, como un misterioso +guerrero había aparecido justo cuando la batalla parecía perdida. + +Insufló ánimo y esperanza a las tropas que consiguieron, por esta vez, rechazar al enemigo. + From ebd2dd94eab417b7cad259c6fffe03313bf550dd Mon Sep 17 00:00:00 2001 From: mopsen Date: Sun, 14 Feb 2016 16:21:45 +0100 Subject: [PATCH 2549/5486] Add pinkman, Bitch! --- english/say-my-name/say-my-name.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/say-my-name/say-my-name.md b/english/say-my-name/say-my-name.md index 3a82fe6c17..1659b541d3 100644 --- a/english/say-my-name/say-my-name.md +++ b/english/say-my-name/say-my-name.md @@ -6,4 +6,6 @@ NOW... SAY MY NAME [You better..](https://www.youtube.com/watch?v=sQgd6MccwZc) -[Some dancing](https://www.youtube.com/watch?v=zBvPEmEkpkg) \ No newline at end of file +[Some dancing](https://www.youtube.com/watch?v=zBvPEmEkpkg) + +[Pinkman](https://www.youtube.com/watch?v=RLe6qQ5MK20) From 7c54fdb558a5426b781e304fb07c8e6f0247fd64 Mon Sep 17 00:00:00 2001 From: martiBpl Date: Sun, 14 Feb 2016 19:39:04 +0100 Subject: [PATCH 2550/5486] Dodano opcja Google w przygodzie ! --- Polish/przygoda/przygoda.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Polish/przygoda/przygoda.md b/Polish/przygoda/przygoda.md index 03a15a8cac..96ea33ce92 100644 --- a/Polish/przygoda/przygoda.md +++ b/Polish/przygoda/przygoda.md @@ -8,3 +8,5 @@ Co robisz? [Rozbijasz ściany siłą mięśni](miesnie/miesnie.md) [Zaczynasz jeść ptasie mleczko](jedzenie/jedzenie.md) + +[Szukasz rozwiązania u wujka Google](http://www.google.pl) From 0fc8fd08965699c930f9b03beb15a09e72aa2003 Mon Sep 17 00:00:00 2001 From: HiItsMe Date: Sun, 14 Feb 2016 12:17:22 -0800 Subject: [PATCH 2551/5486] Add Lost reference --- english/getsLost/getsLost.md | 8 +++++++- english/getsLost/meetKate/meetKate.md | 5 +++++ .../getsLost/runFromSmokeMonster/runFromSmokeMonster.md | 7 +++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 english/getsLost/meetKate/meetKate.md create mode 100644 english/getsLost/runFromSmokeMonster/runFromSmokeMonster.md diff --git a/english/getsLost/getsLost.md b/english/getsLost/getsLost.md index 04ed96a5fd..7e931abe20 100644 --- a/english/getsLost/getsLost.md +++ b/english/getsLost/getsLost.md @@ -1,4 +1,10 @@ And there comes Spiderman to the rescue. But Oh oh !!, a Blackhole opens and spiderman is trapped in the Blackhole And your gps stops working so you are lost. -Guess it's time to give up. \ No newline at end of file +Guess it's time to give up. + +Not so fast... Are you really lost? Or are you in an episode of the TV show Lost? It is rather jungley around here. + +[Go toward a beach](meetKate/meetKate.md). + +[Go further into Jungle](runFromSmokeMonster/runFromSmokeMonster.md) diff --git a/english/getsLost/meetKate/meetKate.md b/english/getsLost/meetKate/meetKate.md new file mode 100644 index 0000000000..a535d114ba --- /dev/null +++ b/english/getsLost/meetKate/meetKate.md @@ -0,0 +1,5 @@ +You suddenly get the feeling of deja-vue. This is actually an episode of Lost, and you're lost on a mysterious island. + +You stumble through the jungle until reaching a wide sandy beach. In the distance you see Kate. + +Wow! This is getting very mysterious! \ No newline at end of file diff --git a/english/getsLost/runFromSmokeMonster/runFromSmokeMonster.md b/english/getsLost/runFromSmokeMonster/runFromSmokeMonster.md new file mode 100644 index 0000000000..1531152816 --- /dev/null +++ b/english/getsLost/runFromSmokeMonster/runFromSmokeMonster.md @@ -0,0 +1,7 @@ +You suddenly get the feeling of deja-vue. This is actually an episode of Lost, and you're lost on a mysterious island. + +You stumble deeper and deeper into the jungle. A strange noise gets closer... sounds like whispers. + +Could it be ---- the smoke monster from Lost!?!?!? + +Quickly you scamper for safety into a banyon tree. \ No newline at end of file From f9ca57f171206783581dfc9a5d3f8093f1636831 Mon Sep 17 00:00:00 2001 From: raksh93 Date: Mon, 15 Feb 2016 16:21:17 +0530 Subject: [PATCH 2552/5486] Add link to Cricinfo --- english/cricket/cricket.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/cricket/cricket.md diff --git a/english/cricket/cricket.md b/english/cricket/cricket.md new file mode 100644 index 0000000000..e0e24a4d04 --- /dev/null +++ b/english/cricket/cricket.md @@ -0,0 +1 @@ +Click [here](http://www.espncricinfo.com) to catch up on cricket news and view live scores. From 94d094819c5ce1e0910bea9a2decb7a1b66fca02 Mon Sep 17 00:00:00 2001 From: raksh93 Date: Mon, 15 Feb 2016 16:24:16 +0530 Subject: [PATCH 2553/5486] Add link to cricinfo --- english/play-some-cricket/playsomecricket.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/play-some-cricket/playsomecricket.md b/english/play-some-cricket/playsomecricket.md index a87822ae68..c4390af0ed 100644 --- a/english/play-some-cricket/playsomecricket.md +++ b/english/play-some-cricket/playsomecricket.md @@ -4,3 +4,4 @@ [Mr. Cool Dhoni finishes off.](https://youtu.be/wbfv1qOG3WM) +[Follow cricket news](http://www.espncricinfo.com) From ce669964622b4e529ae7d036f09059b9d7376f39 Mon Sep 17 00:00:00 2001 From: raksh93 Date: Mon, 15 Feb 2016 16:38:12 +0530 Subject: [PATCH 2554/5486] Edit link to cricket.md --- english/play-some-cricket/playsomecricket.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/play-some-cricket/playsomecricket.md b/english/play-some-cricket/playsomecricket.md index c4390af0ed..863e4e0de8 100644 --- a/english/play-some-cricket/playsomecricket.md +++ b/english/play-some-cricket/playsomecricket.md @@ -4,4 +4,4 @@ [Mr. Cool Dhoni finishes off.](https://youtu.be/wbfv1qOG3WM) -[Follow cricket news](http://www.espncricinfo.com) +[Follow cricket news](english/cricket/cricket.md) From 13747968114e0a99dc9414118a596760ae11014a Mon Sep 17 00:00:00 2001 From: raksh93 Date: Mon, 15 Feb 2016 16:50:25 +0530 Subject: [PATCH 2555/5486] Fix link to cricket.md --- english/play-some-cricket/playsomecricket.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/play-some-cricket/playsomecricket.md b/english/play-some-cricket/playsomecricket.md index 863e4e0de8..850b3564ce 100644 --- a/english/play-some-cricket/playsomecricket.md +++ b/english/play-some-cricket/playsomecricket.md @@ -4,4 +4,4 @@ [Mr. Cool Dhoni finishes off.](https://youtu.be/wbfv1qOG3WM) -[Follow cricket news](english/cricket/cricket.md) +[Follow cricket news](~/english/cricket/cricket.md) From 64d93fcde0a5d6baa298e56ea3cea314505100ba Mon Sep 17 00:00:00 2001 From: raksh93 Date: Mon, 15 Feb 2016 16:56:03 +0530 Subject: [PATCH 2556/5486] Fix link to cricket.md --- english/play-some-cricket/playsomecricket.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/play-some-cricket/playsomecricket.md b/english/play-some-cricket/playsomecricket.md index 850b3564ce..be76c3b1d6 100644 --- a/english/play-some-cricket/playsomecricket.md +++ b/english/play-some-cricket/playsomecricket.md @@ -4,4 +4,4 @@ [Mr. Cool Dhoni finishes off.](https://youtu.be/wbfv1qOG3WM) -[Follow cricket news](~/english/cricket/cricket.md) +[Follow cricket news](../cricket/cricket.md) From 38e1849ac7995ebf37b17fac05c4418f88221ec0 Mon Sep 17 00:00:00 2001 From: Pavel Kravchenko Date: Mon, 15 Feb 2016 22:50:00 +0600 Subject: [PATCH 2557/5486] Added couple of sentences to marshrutka.md --- russian/light-fire/sing/marshrutka/marshrutka.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/light-fire/sing/marshrutka/marshrutka.md b/russian/light-fire/sing/marshrutka/marshrutka.md index 9f5f2e01a4..fe7d23af54 100644 --- a/russian/light-fire/sing/marshrutka/marshrutka.md +++ b/russian/light-fire/sing/marshrutka/marshrutka.md @@ -1 +1,3 @@ И через пару минут на горизонте, и правда, появилась маршрутка №1 времен CCCР. + +В маршрутке нет водителя, но вы садитесь в неё, дверь автоматически закрывается и маршрутка увозит вас из этого места. По дороге вы видите красивые леса, поля и какие-то деревеньки. Постепенно вы засыпаете. From 896dff12d296482c3f5fd0fd5ef8323b1664f7ff Mon Sep 17 00:00:00 2001 From: Pavel Kravchenko Date: Mon, 15 Feb 2016 23:03:55 +0600 Subject: [PATCH 2558/5486] Splited lines to fit in 120 symbols --- russian/light-fire/sing/marshrutka/marshrutka.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/light-fire/sing/marshrutka/marshrutka.md b/russian/light-fire/sing/marshrutka/marshrutka.md index fe7d23af54..f9acc7e98c 100644 --- a/russian/light-fire/sing/marshrutka/marshrutka.md +++ b/russian/light-fire/sing/marshrutka/marshrutka.md @@ -1,3 +1,5 @@ И через пару минут на горизонте, и правда, появилась маршрутка №1 времен CCCР. -В маршрутке нет водителя, но вы садитесь в неё, дверь автоматически закрывается и маршрутка увозит вас из этого места. По дороге вы видите красивые леса, поля и какие-то деревеньки. Постепенно вы засыпаете. +В маршрутке нет водителя, но вы садитесь в неё, дверь автоматически закрывается и маршрутка увозит вас из этого места. +По дороге вы видите красивые леса, поля и какие-то деревеньки. +Постепенно вы засыпаете. From 176bcbcae01d01361e96c0d7ecafe7c8adaf6011 Mon Sep 17 00:00:00 2001 From: Francis Caceres Date: Mon, 15 Feb 2016 13:18:12 -0400 Subject: [PATCH 2559/5486] Agregando la era de los mutantes --- espanol/Mutantes/Mutantes.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 espanol/Mutantes/Mutantes.md diff --git a/espanol/Mutantes/Mutantes.md b/espanol/Mutantes/Mutantes.md new file mode 100644 index 0000000000..a05a7875cb --- /dev/null +++ b/espanol/Mutantes/Mutantes.md @@ -0,0 +1,3 @@ + +Activo sus poderes de mutantes, Control mental, apoderandose de la voluntad de los soldados del +ejercito enemigo y convirtiendolos en sus marionetas personales. \ No newline at end of file From 7d71154041a11ac32c1f891dfc5afcdc485e376e Mon Sep 17 00:00:00 2001 From: SuitMonkey Date: Mon, 15 Feb 2016 13:35:50 -0400 Subject: [PATCH 2560/5486] Update canudos.md Please review this, @casey-collab --- espanol/canudos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index b905f0eee7..d26af9ea8c 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -121,3 +121,5 @@ Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, "El que tenga rabo de paja ni que lo fajen chiquito", dijo el [curandero](curandero/curandero.md)... + +[Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", se atrevio a lo que nadie se imaginó:](Mutantes/Mutantes.md) From 077f3901900dd300eb9b64868f12b2884add0741 Mon Sep 17 00:00:00 2001 From: SuitMonkey Date: Mon, 15 Feb 2016 13:38:59 -0400 Subject: [PATCH 2561/5486] Update canudos.md Agregando longitud --- espanol/canudos.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index d26af9ea8c..c8b0739de7 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -122,4 +122,5 @@ Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, "El que tenga rabo de paja ni que lo fajen chiquito", dijo el [curandero](curandero/curandero.md)... -[Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", se atrevio a lo que nadie se imaginó:](Mutantes/Mutantes.md) +[Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", +se atrevio a lo que nadie se imaginó:](Mutantes/Mutantes.md) From 34cb31f36debee39ba581c3de2049b603c94922e Mon Sep 17 00:00:00 2001 From: SuitMonkey Date: Mon, 15 Feb 2016 13:43:49 -0400 Subject: [PATCH 2562/5486] Update canudos.md Segundo intento de arreglar --- espanol/canudos.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index c8b0739de7..5f52e06c91 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -122,5 +122,5 @@ Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, "El que tenga rabo de paja ni que lo fajen chiquito", dijo el [curandero](curandero/curandero.md)... -[Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", -se atrevio a lo que nadie se imaginó:](Mutantes/Mutantes.md) +Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", +se atrevio a lo que nadie se [imaginó:](Mutantes/Mutantes.md) From a20c8cc88bda44a2290175344280a97a0a07a65b Mon Sep 17 00:00:00 2001 From: Tjitske Date: Mon, 15 Feb 2016 20:52:14 +0100 Subject: [PATCH 2563/5486] add: strange thing on the road. --- .../woman/hop-into-car/big-bump/strange-thing.md | 1 + english/talk_to_neighbour/woman/hop-into-car/drive.md | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 english/talk_to_neighbour/woman/hop-into-car/big-bump/strange-thing.md diff --git a/english/talk_to_neighbour/woman/hop-into-car/big-bump/strange-thing.md b/english/talk_to_neighbour/woman/hop-into-car/big-bump/strange-thing.md new file mode 100644 index 0000000000..7ae2a23630 --- /dev/null +++ b/english/talk_to_neighbour/woman/hop-into-car/big-bump/strange-thing.md @@ -0,0 +1 @@ +In the rear-view mirrow you see an oddly shaped thing laying in the middel of the road... \ No newline at end of file diff --git a/english/talk_to_neighbour/woman/hop-into-car/drive.md b/english/talk_to_neighbour/woman/hop-into-car/drive.md index f3feee8897..552ce5a426 100644 --- a/english/talk_to_neighbour/woman/hop-into-car/drive.md +++ b/english/talk_to_neighbour/woman/hop-into-car/drive.md @@ -1,2 +1,5 @@ You push Scully aside and hop into the car. -You drive off into the sunset leaving behind the smell of burning rubber. \ No newline at end of file +You drive off into the sunset leaving behind the smell of burning rubber. + +[Suddenly, you feel a big bump!](big-bump/strange-thing.md) + From c0c8f0daedc100cc2a2efba3306cd21a7ee70b07 Mon Sep 17 00:00:00 2001 From: cdmunoz Date: Mon, 15 Feb 2016 20:43:20 -0500 Subject: [PATCH 2564/5486] Adiciona continuacion del control mental mutante --- espanol/Mutantes/Mutantes.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/espanol/Mutantes/Mutantes.md b/espanol/Mutantes/Mutantes.md index a05a7875cb..ef203863a4 100644 --- a/espanol/Mutantes/Mutantes.md +++ b/espanol/Mutantes/Mutantes.md @@ -1,3 +1,7 @@ Activo sus poderes de mutantes, Control mental, apoderandose de la voluntad de los soldados del -ejercito enemigo y convirtiendolos en sus marionetas personales. \ No newline at end of file +ejercito enemigo y convirtiendolos en sus marionetas personales. + +Con lo que no contaba era con que existan algunos soldados fieles a l, lo cual afectaba su control +mental, pues en ocasiones hacan todo lo contrario a lo que l quera. + From 00565b63882d3bd35e70a62c5b255d9c721ec854 Mon Sep 17 00:00:00 2001 From: Bolik Date: Tue, 16 Feb 2016 08:32:27 +0500 Subject: [PATCH 2565/5486] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BA?= =?UTF-8?q?=D1=80=D0=B0=D1=81=D0=BE=D0=B2=20=D0=B2=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=86=D0=B5=D1=81=D1=81=20=D1=85=D0=B2=D0=B0=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B7=D0=B0=20=D0=BF=D0=B0=D0=BB=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- russian/window/win-stick/win-stick.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/window/win-stick/win-stick.md b/russian/window/win-stick/win-stick.md index ec9e87e69e..75cb79ef22 100644 --- a/russian/window/win-stick/win-stick.md +++ b/russian/window/win-stick/win-stick.md @@ -2,8 +2,9 @@ Вы видите еще одну, хваетесь и слава богу, она вас удерживает. Сверху на вас падают огромные куски зефира, им чудом не удается вас сбить и они летят дальше, вы держитесь из последних сил! +Ваши ладони вспотели от страха, они все в зефире, палка выскальзывает, но вы вгрызаетесь в неё зубами... Но палка опять ломается! [ А-А-А-А-А-а-а-а-а-а-а](../win-scream/win-scream.md) -[ Схватиться за ветку еще раз!](../win-stick/win-stick.md) \ No newline at end of file +[ Схватиться за ветку еще раз!](../win-stick/win-stick.md) From f1d1d1c84b360f2cdd0f6dcf52a0134760d5b437 Mon Sep 17 00:00:00 2001 From: Kostiuk Inna Date: Tue, 16 Feb 2016 13:12:47 +0900 Subject: [PATCH 2566/5486] Add new option to make a whole in the wall --- ukrainian/make-a-hole/in-the-wall.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 ukrainian/make-a-hole/in-the-wall.md diff --git a/ukrainian/make-a-hole/in-the-wall.md b/ukrainian/make-a-hole/in-the-wall.md new file mode 100644 index 0000000000..720bfbeb83 --- /dev/null +++ b/ukrainian/make-a-hole/in-the-wall.md @@ -0,0 +1 @@ +Оговтуюсь від шоку, беру виделку і виковирюю дирку у зефіровій стіні.. Що буде зі мною далі? \ No newline at end of file From c124649c6412758d317b339a5d1e9bf10c753e3d Mon Sep 17 00:00:00 2001 From: Bolik Date: Tue, 16 Feb 2016 09:52:29 +0500 Subject: [PATCH 2567/5486] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=89=D1=83=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=B0=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- russian/window/win-stick/win-stick.md | 1 + 1 file changed, 1 insertion(+) diff --git a/russian/window/win-stick/win-stick.md b/russian/window/win-stick/win-stick.md index 75cb79ef22..a4cd81a14c 100644 --- a/russian/window/win-stick/win-stick.md +++ b/russian/window/win-stick/win-stick.md @@ -4,6 +4,7 @@ они летят дальше, вы держитесь из последних сил! Ваши ладони вспотели от страха, они все в зефире, палка выскальзывает, но вы вгрызаетесь в неё зубами... Но палка опять ломается! +В животе появляется щекотное ощущение свободноего падения, вы понимаете что падаете! [ А-А-А-А-А-а-а-а-а-а-а](../win-scream/win-scream.md) From 49ef3f3d513e3b8f5852d5a3a95a0f1c7f9866be Mon Sep 17 00:00:00 2001 From: Muhammad Nadzeri Munawar Date: Tue, 16 Feb 2016 18:41:19 +0700 Subject: [PATCH 2568/5486] Add Indonesian Culture --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index fd15507f40..9594f0cf6b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -811,3 +811,5 @@ Let it go, let it gooo... Do you want to build a [snowman?] (snowman/snowman.md) I think I'll try defying gravity. + +Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) From 90ffbd35f62bcc6822084df27176eca65ebb8df9 Mon Sep 17 00:00:00 2001 From: Andrew Kettles Date: Tue, 16 Feb 2016 13:23:34 -0500 Subject: [PATCH 2569/5486] Add a line to marshmallow --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 9594f0cf6b..7e14c48dc4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -182,6 +182,8 @@ Startled, you immediately whirl around to see who (or what) touched you...but th You hear a strange noise then turn and see a large, wooden door. +You turn for a third time and see a small, metal door. + You knock, hear nothing and decide to [enter](./strange-room/room.md). Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air From 773dbe6c0cfe1d60394e9fc00ab2f70ef1723bab Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Wed, 17 Feb 2016 00:39:47 +0200 Subject: [PATCH 2570/5486] Add question --- ukrainian/question/wtf.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 ukrainian/question/wtf.md diff --git a/ukrainian/question/wtf.md b/ukrainian/question/wtf.md new file mode 100644 index 0000000000..5ae352b2ab --- /dev/null +++ b/ukrainian/question/wtf.md @@ -0,0 +1 @@ +"Якщо ти - це я, то всі мої запитання тобі вже відомі. А відтак я чекаю на відповіді!" From 5288d59ef88a7945a7d6ea98478aca0a8e1a1e32 Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Wed, 17 Feb 2016 00:41:02 +0200 Subject: [PATCH 2571/5486] Modify call.md --- ukrainian/old-photo/conspiracy/call/call.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ukrainian/old-photo/conspiracy/call/call.md b/ukrainian/old-photo/conspiracy/call/call.md index d0817999cf..c67edf3c9e 100644 --- a/ukrainian/old-photo/conspiracy/call/call.md +++ b/ukrainian/old-photo/conspiracy/call/call.md @@ -1 +1,4 @@ Після кількасекундних гудків ви почули свій власний голос по ту сторону. + +Ви не розумієте, як це могло статися. Ви невпевнено промовляєте ... +[Питання](../../../question/wtf.md) From 3736b82b607490885f7d458052b851530c22c661 Mon Sep 17 00:00:00 2001 From: Amit Rakesh Date: Tue, 16 Feb 2016 16:46:57 -0800 Subject: [PATCH 2572/5486] Adding Story 'Paint It Black Stanza' --- english/marshmallow.md | 2 ++ english/paint-it-black/PaintItBlack.md | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 english/paint-it-black/PaintItBlack.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 7e14c48dc4..0b24ae5aa9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -815,3 +815,5 @@ Do you want to build a [snowman?] (snowman/snowman.md) I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) + +[Paint It Black](paint-it-black/PaintItBlack.md) diff --git a/english/paint-it-black/PaintItBlack.md b/english/paint-it-black/PaintItBlack.md new file mode 100644 index 0000000000..7680fb4ed9 --- /dev/null +++ b/english/paint-it-black/PaintItBlack.md @@ -0,0 +1,13 @@ +I love this song + +"Paint It Black" + +I see a red door and I want it painted black +No colors any more, I want them to turn black +I see the girls walk by, dressed in their summer clothes +I have to turn my head until my darkness goes + + +Yeah! + +Hmm, hmm, hmm... \ No newline at end of file From 884e281940ec9658e383a7686d3562582acab115 Mon Sep 17 00:00:00 2001 From: Enrique Sierra Gutierrez Date: Tue, 16 Feb 2016 20:42:39 -0600 Subject: [PATCH 2573/5486] fix: Remove forgotten commit markers --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index fd15507f40..ea961af74c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -698,9 +698,9 @@ This false egotism makes you forget [something important.](watch-star-wars/watch [Call a random number](call-a-random-number/answer.md) -<<<<<<< HEAD + You must be lonely. [Want a friend?](robofriend/AIRobot.md) -======= + When I code over my weekend, I feel that this becomes my [whole life](code-my-life/code-my-life.md). Suddenly you feel a strong craving for [something.](craving/craving.md) From 97f49bee7cd631ffe3c1eb112129b6b80f8d1936 Mon Sep 17 00:00:00 2001 From: Kostiuk Inna Date: Wed, 17 Feb 2016 13:02:30 +0900 Subject: [PATCH 2574/5486] Add a link to the new option in ukrainian story --- ukrainian/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 86483ec2ce..a0c5ec8338 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -22,6 +22,8 @@ [Просто трошки почекаю](wait-more/wait.md) +[Візьму виделку і ] (make-a-hole/in-the-wall.md) + [Test!](test/test.md) І, так, я теж не розумію, для чого мотузка, але в голову лізуть підозрілі думки! From b0766ef5db637138ab73466dbaa4123c3adcf395 Mon Sep 17 00:00:00 2001 From: Martin Paradis Date: Tue, 16 Feb 2016 23:13:45 -0500 Subject: [PATCH 2575/5486] Add line about hot chocolate sea. --- english/shotgun/shotgun.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/shotgun/shotgun.md b/english/shotgun/shotgun.md index 31ef702b37..6d2d1b31d6 100644 --- a/english/shotgun/shotgun.md +++ b/english/shotgun/shotgun.md @@ -3,3 +3,4 @@ over the marshmallow wall. Suddenly the brain matter starts to disintegrate the wall. You see sunlight peeking through. After a while the wall is gone and you are free. +You find you are on an island surrounded by a sea of hot chocolate. From 43191084c2b66e4dad8fe01685c376e393fdc4e2 Mon Sep 17 00:00:00 2001 From: jlevym Date: Wed, 17 Feb 2016 06:42:37 +0200 Subject: [PATCH 2576/5486] add a link to return to woman --- english/talk_to_neighbour/man/mulder.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/talk_to_neighbour/man/mulder.md b/english/talk_to_neighbour/man/mulder.md index 70a1823def..fc20a7c997 100644 --- a/english/talk_to_neighbour/man/mulder.md +++ b/english/talk_to_neighbour/man/mulder.md @@ -1 +1,4 @@ -"I'm FBI Special Agent Fox Mulder," the man says in a monotone voice. \ No newline at end of file +"I'm FBI Special Agent Fox Mulder," the man says in a monotone voice. +The man looked very stange. I was scared and looked frantically for the woman + +[Talk to the woman](woman/scully.md) \ No newline at end of file From 165a97075dc4524f740b2c1ce0ed76883ccbe985 Mon Sep 17 00:00:00 2001 From: jlevym Date: Wed, 17 Feb 2016 11:35:14 +0200 Subject: [PATCH 2577/5486] remove the broken ling --- english/talk_to_neighbour/man/mulder.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/talk_to_neighbour/man/mulder.md b/english/talk_to_neighbour/man/mulder.md index fc20a7c997..b9a86747a6 100644 --- a/english/talk_to_neighbour/man/mulder.md +++ b/english/talk_to_neighbour/man/mulder.md @@ -1,4 +1,2 @@ "I'm FBI Special Agent Fox Mulder," the man says in a monotone voice. The man looked very stange. I was scared and looked frantically for the woman - -[Talk to the woman](woman/scully.md) \ No newline at end of file From e5f7d6fbc79a27d260e8ec68d6a807b0e449de31 Mon Sep 17 00:00:00 2001 From: Sandah Date: Wed, 17 Feb 2016 15:10:51 +0100 Subject: [PATCH 2578/5486] Correction ajout option trappe --- french/sortie/chercher-la-sortie.md | 2 ++ french/sortie/trappe/trappe.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 french/sortie/trappe/trappe.md diff --git a/french/sortie/chercher-la-sortie.md b/french/sortie/chercher-la-sortie.md index ca99824785..2169665b2a 100644 --- a/french/sortie/chercher-la-sortie.md +++ b/french/sortie/chercher-la-sortie.md @@ -7,3 +7,5 @@ issue soit une porte en caramel avec une poignée de réglisse. [Vous tirez la porte](tirer-porte/tirer-porte.md) [Vous vous rendormez](../feu-de-camp.md) + +[Vous découvrez une trappe](trappe/trappe.md) \ No newline at end of file diff --git a/french/sortie/trappe/trappe.md b/french/sortie/trappe/trappe.md new file mode 100644 index 0000000000..51eccb1897 --- /dev/null +++ b/french/sortie/trappe/trappe.md @@ -0,0 +1,4 @@ +En inspectant la chambre avec attention vous remarquez un relief au niveau du sol, vous vous approchez et réalisez que c’est une trappe. +Impatient(e) de savoir ce qui se cache en dessous vous vous empressez de soulever la trappe… + +Qu'est ce que vous découvrez ? \ No newline at end of file From e2a8f7ed9058f1f85165df219c436a00cbb9f1ce Mon Sep 17 00:00:00 2001 From: Sandah Date: Wed, 17 Feb 2016 15:18:18 +0100 Subject: [PATCH 2579/5486] Correction trappe.md --- french/sortie/trappe/trappe.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/french/sortie/trappe/trappe.md b/french/sortie/trappe/trappe.md index 51eccb1897..54ead9b391 100644 --- a/french/sortie/trappe/trappe.md +++ b/french/sortie/trappe/trappe.md @@ -1,4 +1,5 @@ -En inspectant la chambre avec attention vous remarquez un relief au niveau du sol, vous vous approchez et réalisez que c’est une trappe. +En inspectant la chambre avec attention vous remarquez un relief au niveau du sol. +vous vous approchez et réalisez que c’est une trappe. Impatient(e) de savoir ce qui se cache en dessous vous vous empressez de soulever la trappe… Qu'est ce que vous découvrez ? \ No newline at end of file From b1f820a57860efcf85b8fc11ea3b29b455371f60 Mon Sep 17 00:00:00 2001 From: raymeibaum Date: Wed, 17 Feb 2016 11:47:13 -0600 Subject: [PATCH 2580/5486] modified story --- english/drink-beer/drink-beer.md | 3 +++ english/marshmallow.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/drink-beer/drink-beer.md diff --git a/english/drink-beer/drink-beer.md b/english/drink-beer/drink-beer.md new file mode 100644 index 0000000000..3f042a5e8e --- /dev/null +++ b/english/drink-beer/drink-beer.md @@ -0,0 +1,3 @@ +You decide to drink one or two craft beers. Mmm refreshing. + +You decide to drink a whole case of Natural Light. Whoa! \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index fd15507f40..ce23baf046 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -232,7 +232,7 @@ You pause for a second, awaiting a spectacular sight. Sheepishly you look down on the crappy wand in your hand. -You must be doing something wrong. You drink a beer and think about it, then Ah-ha! +You must be doing something wrong. You drink a [beer](drink-beer/drink-beer.md) and think about it, then Ah-ha! You notice your pants are now glowing, so you must have been holding the wand upside down. From 6e1f8a64fbeabab668a2af99a318f4ce6349007f Mon Sep 17 00:00:00 2001 From: raymeibaum Date: Wed, 17 Feb 2016 11:54:24 -0600 Subject: [PATCH 2581/5486] updated marshmellow.md --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index ce23baf046..cb0fe808ea 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -232,7 +232,9 @@ You pause for a second, awaiting a spectacular sight. Sheepishly you look down on the crappy wand in your hand. -You must be doing something wrong. You drink a [beer](drink-beer/drink-beer.md) and think about it, then Ah-ha! +You must be doing something wrong. You drink a beer and think about it, then Ah-ha! + +so many [beer](drink-beer/drink-beer.md) options.. You notice your pants are now glowing, so you must have been holding the wand upside down. From 3b12264146df79df24a12db70cc99807dc4dd403 Mon Sep 17 00:00:00 2001 From: Mohamed Ramzy Date: Wed, 17 Feb 2016 22:57:52 +0300 Subject: [PATCH 2582/5486] adding another link to learn programming --- arabic/learn/whattolearn/programming/programming.md | 1 + 1 file changed, 1 insertion(+) diff --git a/arabic/learn/whattolearn/programming/programming.md b/arabic/learn/whattolearn/programming/programming.md index 0c9e0643fe..10a0453606 100644 --- a/arabic/learn/whattolearn/programming/programming.md +++ b/arabic/learn/whattolearn/programming/programming.md @@ -1 +1,2 @@ ممكن أن تبدأ [بهذا](https://www.udacity.com) +وهذا ايضا [هنا](https://www.codeschool.com) From fabc011931618aa0411ec639acb57107e6c48942 Mon Sep 17 00:00:00 2001 From: Mohamed Ramzy Date: Wed, 17 Feb 2016 23:02:58 +0300 Subject: [PATCH 2583/5486] adding a blank line as required --- arabic/learn/whattolearn/programming/programming.md | 1 + 1 file changed, 1 insertion(+) diff --git a/arabic/learn/whattolearn/programming/programming.md b/arabic/learn/whattolearn/programming/programming.md index 10a0453606..a7e6b6aa80 100644 --- a/arabic/learn/whattolearn/programming/programming.md +++ b/arabic/learn/whattolearn/programming/programming.md @@ -1,2 +1,3 @@ ممكن أن تبدأ [بهذا](https://www.udacity.com) + وهذا ايضا [هنا](https://www.codeschool.com) From 620785053b4ab75ad15f5cada52b9ff7d714ba05 Mon Sep 17 00:00:00 2001 From: Mohamed Abdallah Date: Wed, 17 Feb 2016 22:10:13 +0200 Subject: [PATCH 2584/5486] Add a new line to dream story --- arabic/dream/dream.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arabic/dream/dream.md b/arabic/dream/dream.md index 78972bd625..29281b91ea 100644 --- a/arabic/dream/dream.md +++ b/arabic/dream/dream.md @@ -4,4 +4,5 @@ الان انت فى بداية الطريق ماذا ستفعل 1-[ستبدأ فى التعلم](../learn/learn.md) لكل مخلوق حاجة ولكل حاجة غاية -لكن لا تسرف بالاحلام فقد تصطدم بالواقع \ No newline at end of file +لكن لا تسرف بالاحلام فقد تصطدم بالواقع +2- استعن بالله ولا تعجز \ No newline at end of file From 672a31aaf293faa030b8536eba572827f77679ad Mon Sep 17 00:00:00 2001 From: Ethan Faryna Date: Wed, 17 Feb 2016 19:39:26 -0400 Subject: [PATCH 2585/5486] add new lines to story --- english/animal/animal.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/animal/animal.md b/english/animal/animal.md index 46ee3ef9ee..bd92ddcc3b 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -12,4 +12,7 @@ OMG WHAT SHOULD I DO?? I NEED HELP... I wonder what the cat would do if I gave it a hot dog. I know -what I would do. \ No newline at end of file +what I would do. + +I'd eat it. Yup, I know it sounds disgusting but a dog is a dog and a cat is a cat. +You know what I mean? \ No newline at end of file From c5cf02027ad81cac48ea426bc7cfca63a9f29540 Mon Sep 17 00:00:00 2001 From: James Newton Date: Wed, 17 Feb 2016 16:44:56 -0800 Subject: [PATCH 2586/5486] Add option to say hi to the alien --- english/talk_to_neighbour/woman/say-hi/rare.md | 5 +++++ english/talk_to_neighbour/woman/scully.md | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 english/talk_to_neighbour/woman/say-hi/rare.md diff --git a/english/talk_to_neighbour/woman/say-hi/rare.md b/english/talk_to_neighbour/woman/say-hi/rare.md new file mode 100644 index 0000000000..f0c95d90c7 --- /dev/null +++ b/english/talk_to_neighbour/woman/say-hi/rare.md @@ -0,0 +1,5 @@ +The alien seems surprised that you said hello and replies: +"Thank you! Very few humans have been polite enough to acknowledge my existance at all." +"Because you were nice, I will increase your intelligence by 10%" +Suddenly, you feel 10% sadder. + diff --git a/english/talk_to_neighbour/woman/scully.md b/english/talk_to_neighbour/woman/scully.md index e40a65cf0a..e1f6b0706c 100644 --- a/english/talk_to_neighbour/woman/scully.md +++ b/english/talk_to_neighbour/woman/scully.md @@ -5,4 +5,7 @@ [Bored](bored/circus.md), you start to think of something else. -[Drive away](hop-into-car/drive.md) \ No newline at end of file +[Drive away](hop-into-car/drive.md) + +[Say Hi to the Alien](say-hi/rare.md) + From 10d18c7b042c43df07529cbf2fe585df0af9b617 Mon Sep 17 00:00:00 2001 From: Matthew Lee Date: Wed, 17 Feb 2016 19:13:41 -0800 Subject: [PATCH 2587/5486] Add action after sandwich --- english/sandwich/sandwich.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/sandwich/sandwich.md b/english/sandwich/sandwich.md index ff3b4b700e..be474f1099 100644 --- a/english/sandwich/sandwich.md +++ b/english/sandwich/sandwich.md @@ -4,3 +4,5 @@ for the journey. It's gone a bit soggy though. You strengthen your resolve and eat it anyway. You may need the energy later. + +Bolstered by the invigourating feeling of the sandwich in your belly, your senses tingle in anticipation for [continuing your adventure](../marshmallow.md). From acd7a2ea24fa47c122574baab2658994a515aac5 Mon Sep 17 00:00:00 2001 From: Matthew Lee Date: Wed, 17 Feb 2016 19:19:42 -0800 Subject: [PATCH 2588/5486] Reduced line length --- english/sandwich/sandwich.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/sandwich/sandwich.md b/english/sandwich/sandwich.md index be474f1099..779de629ad 100644 --- a/english/sandwich/sandwich.md +++ b/english/sandwich/sandwich.md @@ -5,4 +5,5 @@ It's gone a bit soggy though. You strengthen your resolve and eat it anyway. You may need the energy later. -Bolstered by the invigourating feeling of the sandwich in your belly, your senses tingle in anticipation for [continuing your adventure](../marshmallow.md). +Bolstered by the invigourating feeling of the sandwich in your belly, +your senses tingle in anticipation for [continuing your adventure](../marshmallow.md). From a2fcef99cacbfa9f129cc99bfe8c6bcc356f3d29 Mon Sep 17 00:00:00 2001 From: Matthew Lee Date: Wed, 17 Feb 2016 19:22:37 -0800 Subject: [PATCH 2589/5486] Fixed idiom from anticipation FROM to anticipation OF --- english/sandwich/sandwich.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sandwich/sandwich.md b/english/sandwich/sandwich.md index 779de629ad..6bd5a4fd0d 100644 --- a/english/sandwich/sandwich.md +++ b/english/sandwich/sandwich.md @@ -6,4 +6,4 @@ It's gone a bit soggy though. You strengthen your resolve and eat it anyway. You may need the energy later. Bolstered by the invigourating feeling of the sandwich in your belly, -your senses tingle in anticipation for [continuing your adventure](../marshmallow.md). +your senses tingle in anticipation of [continuing your adventure](../marshmallow.md). From 13119377d9d3a416ce0b426ed05d52740a95ab99 Mon Sep 17 00:00:00 2001 From: joannahsu Date: Thu, 18 Feb 2016 16:09:40 +0800 Subject: [PATCH 2590/5486] Add bear to the sotry. --- english/bear/bear.md | 2 ++ english/marshmallow.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/bear/bear.md diff --git a/english/bear/bear.md b/english/bear/bear.md new file mode 100644 index 0000000000..790e6452e7 --- /dev/null +++ b/english/bear/bear.md @@ -0,0 +1,2 @@ +Stella atroir. +Taiwan bear. diff --git a/english/marshmallow.md b/english/marshmallow.md index e30fb667f9..149d43cb21 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -4,6 +4,8 @@ Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) Vist the master [liquid](liquid/liquid.md). +Drink some [bear](bear/bear.md) + [play](http://pcottle.github.io/learnGitBranching/) with the (git) branches and search for your [destiny](destiny/destiny.md). From 4682be1123b311e7df4d3c3cf087647da39182bd Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 18 Feb 2016 09:27:56 -0200 Subject: [PATCH 2591/5486] Add new step to portuguese version of the story --- portugues/revisa/cria-proprio-app/cria-proprio-app.md | 1 + portugues/revisa/revisar.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 portugues/revisa/cria-proprio-app/cria-proprio-app.md diff --git a/portugues/revisa/cria-proprio-app/cria-proprio-app.md b/portugues/revisa/cria-proprio-app/cria-proprio-app.md new file mode 100644 index 0000000000..ef07a84a40 --- /dev/null +++ b/portugues/revisa/cria-proprio-app/cria-proprio-app.md @@ -0,0 +1 @@ +Você agora tem um longo caminho pela frente. Boa sorte! diff --git a/portugues/revisa/revisar.md b/portugues/revisa/revisar.md index c7b6858c17..4ad541d2f1 100644 --- a/portugues/revisa/revisar.md +++ b/portugues/revisa/revisar.md @@ -11,3 +11,5 @@ Você: [Não está com saco pra isso, e deixa pra lá](desiste/desistir.md) [Simplesmente desiste e baixa um app melhor](novo-app/novo-app.md) + +[Decide desenvolver seu próprio app](cria-proprio-app/cria-proprio-app.md) From b40478fb3b49f8f65aa29ef3787c3860e67c0d3c Mon Sep 17 00:00:00 2001 From: GodOfSun Date: Thu, 18 Feb 2016 12:02:40 -0200 Subject: [PATCH 2592/5486] Godofsun changes --- portugues/amigo/incomodar/reinventar/reinventar-app.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/amigo/incomodar/reinventar/reinventar-app.md b/portugues/amigo/incomodar/reinventar/reinventar-app.md index 1847fc5729..6ad9d19b49 100644 --- a/portugues/amigo/incomodar/reinventar/reinventar-app.md +++ b/portugues/amigo/incomodar/reinventar/reinventar-app.md @@ -1 +1,3 @@ Procuro um amigo "geek" para colaborar comigo e fazemos uma versão melhorada sem o bug :) + +Mas infelizmente ele registrou a patente do programa e ganhou todos os créditos. From d561fdb08be2a1a3d03fc985caea41869554668d Mon Sep 17 00:00:00 2001 From: odile-ww Date: Thu, 18 Feb 2016 16:23:52 +0200 Subject: [PATCH 2593/5486] Add two lines to the story --- pig-latin/othay-ocolatechay/ocolatechay.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pig-latin/othay-ocolatechay/ocolatechay.md b/pig-latin/othay-ocolatechay/ocolatechay.md index c4e3880c33..8138cfbda8 100644 --- a/pig-latin/othay-ocolatechay/ocolatechay.md +++ b/pig-latin/othay-ocolatechay/ocolatechay.md @@ -1,2 +1,5 @@ Youyay apescray omesay arshmallowsmay offyay ethay allsway andyay utpay ityay -inyay youryay othay ocolatechay. astesTay eatgray! \ No newline at end of file +inyay youryay othay ocolatechay. astesTay eatgray! + +utbay uddenlysay, ouyay earhay away ucklechay... +"o'swhay erethay?" ouyay askway. \ No newline at end of file From 6fe19d9e006a976305731b482896b47d27376a9d Mon Sep 17 00:00:00 2001 From: jaiagg Date: Thu, 18 Feb 2016 22:15:38 +0530 Subject: [PATCH 2594/5486] Add Rubik's Cube --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 149d43cb21..819a0d37fe 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -821,3 +821,5 @@ I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) [Paint It Black](paint-it-black/PaintItBlack.md) + +[Try to solve Rubik's Cube](rubikcube/rubikcube.md) \ No newline at end of file From 824f53808a8a66ead5a8e98b9d957624cfe2bb4d Mon Sep 17 00:00:00 2001 From: jaiagg Date: Thu, 18 Feb 2016 22:31:01 +0530 Subject: [PATCH 2595/5486] Fixed a typo --- english/marshmallow.md | 2 +- english/rubik-cube/rubik-cube.md | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 english/rubik-cube/rubik-cube.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 819a0d37fe..f16060d5d8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -822,4 +822,4 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [Paint It Black](paint-it-black/PaintItBlack.md) -[Try to solve Rubik's Cube](rubikcube/rubikcube.md) \ No newline at end of file +[Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) \ No newline at end of file diff --git a/english/rubik-cube/rubik-cube.md b/english/rubik-cube/rubik-cube.md new file mode 100644 index 0000000000..539aa69e60 --- /dev/null +++ b/english/rubik-cube/rubik-cube.md @@ -0,0 +1,21 @@ +You search for the Rubik's cube. Nobody has it. You have to get it. +You paddle miles before reaching a place which has it, the cube. +Ecstatic. Happy. Amazed. Wondering. Imagining how to solve. Coming back to reality. +Curious. +Rush back home. Start solving the cube. + +Solving. + +Solving. + +Still solving. + + +Tired!!, still solving. + + + +AAH! solved. +Tired like hell. Haven't slept for two days straight. Lay down on bed. +Went straight to sleep. +[Dreaming Begins!!](../dream/dream.md) \ No newline at end of file From c99cb6bf903b4734b948f3405569c7231614bbe3 Mon Sep 17 00:00:00 2001 From: IanSkyles Date: Thu, 18 Feb 2016 10:50:07 -0800 Subject: [PATCH 2596/5486] Added a new line to english/animal/animal.md --- english/animal/animal.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/animal/animal.md b/english/animal/animal.md index bd92ddcc3b..d51024d32b 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -15,4 +15,6 @@ I wonder what the cat would do if I gave it a hot dog. I know what I would do. I'd eat it. Yup, I know it sounds disgusting but a dog is a dog and a cat is a cat. -You know what I mean? \ No newline at end of file +You know what I mean? + +Don't eat animals #GoVegan \ No newline at end of file From 7af0da7b61cc1a422e62b049b4ae601f2fead57d Mon Sep 17 00:00:00 2001 From: Victor Vanni Date: Thu, 18 Feb 2016 17:53:58 -0200 Subject: [PATCH 2597/5486] Add eat ladybug in portuguese version --- portugues/spray/joaninha/comer/comer.md | 1 + portugues/spray/matainsetos.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 portugues/spray/joaninha/comer/comer.md diff --git a/portugues/spray/joaninha/comer/comer.md b/portugues/spray/joaninha/comer/comer.md new file mode 100644 index 0000000000..66b7283491 --- /dev/null +++ b/portugues/spray/joaninha/comer/comer.md @@ -0,0 +1 @@ +Hm... o sabor parece bem exótico! \ No newline at end of file diff --git a/portugues/spray/matainsetos.md b/portugues/spray/matainsetos.md index 7813ebc375..8b405e54a6 100644 --- a/portugues/spray/matainsetos.md +++ b/portugues/spray/matainsetos.md @@ -4,4 +4,6 @@ Você não faria mal a uma joaninha, faria? [Matar a joaninha](joaninha/matar/matar.md) +[Comer a joaninha](joaninha/comer/comer.md) + [Claro que não! Elas são adoráveis.](joaninha/liberar/liberar.md) From 0944338752e83c608905c566a2c837eca6db9b24 Mon Sep 17 00:00:00 2001 From: Riyaz Date: Fri, 19 Feb 2016 08:38:36 +1100 Subject: [PATCH 2598/5486] Create 00 Life of this world --- english/00 Life of this world | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 english/00 Life of this world diff --git a/english/00 Life of this world b/english/00 Life of this world new file mode 100644 index 0000000000..1ab005a1f5 --- /dev/null +++ b/english/00 Life of this world @@ -0,0 +1,10 @@ +“Know that the life of this world is only play and amusement, +pomp and mutual boasting among you, and rivalry in respect of +wealth and children, as the likeness of vegetation after rain, +thereof the growth is pleasing to the tiller; afterwards it +dries up and you see it turning yellow; then it becomes straw1. +But in the Hereafter (there is) a severe torment (for the +disbelievers, evil-doers), and (there is) Forgiveness from +Allah and (His) Good Pleasure (for the believers, good-doers), +whereas the life of this world is only a deceiving enjoyment“. +[QURAN 57:20] From c2ff6bb7e88489f502a85341a6e04851c6f08ece Mon Sep 17 00:00:00 2001 From: Riyaz Date: Fri, 19 Feb 2016 08:39:31 +1100 Subject: [PATCH 2599/5486] Delete 00 Life of this world --- english/00 Life of this world | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 english/00 Life of this world diff --git a/english/00 Life of this world b/english/00 Life of this world deleted file mode 100644 index 1ab005a1f5..0000000000 --- a/english/00 Life of this world +++ /dev/null @@ -1,10 +0,0 @@ -“Know that the life of this world is only play and amusement, -pomp and mutual boasting among you, and rivalry in respect of -wealth and children, as the likeness of vegetation after rain, -thereof the growth is pleasing to the tiller; afterwards it -dries up and you see it turning yellow; then it becomes straw1. -But in the Hereafter (there is) a severe torment (for the -disbelievers, evil-doers), and (there is) Forgiveness from -Allah and (His) Good Pleasure (for the believers, good-doers), -whereas the life of this world is only a deceiving enjoyment“. -[QURAN 57:20] From 14fd7ddce3ca2a33df181c448050c9f1a7c0d05b Mon Sep 17 00:00:00 2001 From: Riyaz Date: Fri, 19 Feb 2016 08:40:16 +1100 Subject: [PATCH 2600/5486] Create Life of this world.md --- english/00-Life-of-this-world/Life of this world.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 english/00-Life-of-this-world/Life of this world.md diff --git a/english/00-Life-of-this-world/Life of this world.md b/english/00-Life-of-this-world/Life of this world.md new file mode 100644 index 0000000000..1ab005a1f5 --- /dev/null +++ b/english/00-Life-of-this-world/Life of this world.md @@ -0,0 +1,10 @@ +“Know that the life of this world is only play and amusement, +pomp and mutual boasting among you, and rivalry in respect of +wealth and children, as the likeness of vegetation after rain, +thereof the growth is pleasing to the tiller; afterwards it +dries up and you see it turning yellow; then it becomes straw1. +But in the Hereafter (there is) a severe torment (for the +disbelievers, evil-doers), and (there is) Forgiveness from +Allah and (His) Good Pleasure (for the believers, good-doers), +whereas the life of this world is only a deceiving enjoyment“. +[QURAN 57:20] From dd9112a806951c041b3c1c735d9e1c1833ca293b Mon Sep 17 00:00:00 2001 From: Riyaz Date: Fri, 19 Feb 2016 08:42:28 +1100 Subject: [PATCH 2601/5486] Update marshmallow.md --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index f16060d5d8..57c6f9587d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,5 @@ +[Know about the life of this world](00-Life-of-this-world/Life of this world.md) + This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) @@ -822,4 +824,4 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [Paint It Black](paint-it-black/PaintItBlack.md) -[Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) \ No newline at end of file +[Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) From 1742182295661cf1688fb6320772cbc020b37a63 Mon Sep 17 00:00:00 2001 From: Anoor2css Date: Thu, 18 Feb 2016 17:04:02 -0500 Subject: [PATCH 2602/5486] create a history in Chinese --- Chinese/Donggewudi/Donggeheiheihei.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/Donggewudi/Donggeheiheihei.md diff --git a/Chinese/Donggewudi/Donggeheiheihei.md b/Chinese/Donggewudi/Donggeheiheihei.md new file mode 100644 index 0000000000..c01c3096d7 --- /dev/null +++ b/Chinese/Donggewudi/Donggeheiheihei.md @@ -0,0 +1 @@ +孙悟空变成了东哥，就此解放了压抑数百年的欲望，看见石头就想嘿嘿嘿 \ No newline at end of file From 3369ce18a495859846360a68e18da36432ac4597 Mon Sep 17 00:00:00 2001 From: Sander Jetten Date: Thu, 18 Feb 2016 23:09:57 +0100 Subject: [PATCH 2603/5486] Added page --- dutch/bos/donker-bos.md | 2 +- dutch/bos/struiken/in_de_struiken.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 dutch/bos/struiken/in_de_struiken.md diff --git a/dutch/bos/donker-bos.md b/dutch/bos/donker-bos.md index c04315965e..2f69f20245 100644 --- a/dutch/bos/donker-bos.md +++ b/dutch/bos/donker-bos.md @@ -1,7 +1,7 @@ In het donkere bos aangekomen, hoor je plotseling stemmen. Je verstaat geen woord ervan, maar de stemmen komen wel steeds sneller naar je toe. -Je verstopt je in de struiken, en ziet twee mannen met een lijkzak sleuren. +Je verstopt je in de [struiken](struiken/in_de_struiken.md), en ziet twee mannen met een lijkzak sleuren. De grootste kijkt achterdochtig op als er een vogel opvliegt uit een boom vlak bij je schuilplaats. Je gaat snel [terug naar de hei](../welkom.md) diff --git a/dutch/bos/struiken/in_de_struiken.md b/dutch/bos/struiken/in_de_struiken.md new file mode 100644 index 0000000000..f12e1bb820 --- /dev/null +++ b/dutch/bos/struiken/in_de_struiken.md @@ -0,0 +1 @@ +Je ligt in de struiken en kijkt rond. De takken prikken in je rug. \ No newline at end of file From a81b0a4787b5203bcd5ea96b57805914676cf7a2 Mon Sep 17 00:00:00 2001 From: Sander Jetten Date: Thu, 18 Feb 2016 23:13:29 +0100 Subject: [PATCH 2604/5486] Fix for casey --- dutch/bos/donker-bos.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dutch/bos/donker-bos.md b/dutch/bos/donker-bos.md index 2f69f20245..e4ed1cd3c2 100644 --- a/dutch/bos/donker-bos.md +++ b/dutch/bos/donker-bos.md @@ -1,10 +1,11 @@ In het donkere bos aangekomen, hoor je plotseling stemmen. Je verstaat geen woord ervan, maar de stemmen komen wel steeds sneller naar je toe. -Je verstopt je in de [struiken](struiken/in_de_struiken.md), en ziet twee mannen met een lijkzak sleuren. +Je verstopt je in de struiken, en ziet twee mannen met een lijkzak sleuren. De grootste kijkt achterdochtig op als er een vogel opvliegt uit een boom vlak bij je schuilplaats. Je gaat snel [terug naar de hei](../welkom.md) Je blijft stiekem [meekijken](ontvoering/ontvoering.md) +Je kijkt rond in de [struiken](struiken/in_de_struiken.md) \ No newline at end of file From 33bd2707e79ea84f5d17000059bd355dd4bf2abd Mon Sep 17 00:00:00 2001 From: Anoor2css Date: Thu, 18 Feb 2016 17:26:33 -0500 Subject: [PATCH 2605/5486] fixed more --- Chinese/Donggewudi/Donggeheiheihei.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Chinese/Donggewudi/Donggeheiheihei.md b/Chinese/Donggewudi/Donggeheiheihei.md index c01c3096d7..f459c513f6 100644 --- a/Chinese/Donggewudi/Donggeheiheihei.md +++ b/Chinese/Donggewudi/Donggeheiheihei.md @@ -1 +1,7 @@ -孙悟空变成了东哥，就此解放了压抑数百年的欲望，看见石头就想嘿嘿嘿 \ No newline at end of file +孙悟空变成了东哥，就此解放了压抑数百年的欲望，看见石头就想嘿嘿嘿 + +直到有一天，被宠幸的石头开口说话： + +[你可知月光宝盒？](../Xinyang/MyLoveStory.md) + +由此嘿嘿嘿 \ No newline at end of file From 5234a7ddb0d717aa7db732a840f04926d6a13c5c Mon Sep 17 00:00:00 2001 From: Anoor2css Date: Thu, 18 Feb 2016 17:36:58 -0500 Subject: [PATCH 2606/5486] what's this? --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 60dee1fb80..540f1494b0 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -95,3 +95,5 @@ [鹿晗](luhan/luhan.md) [Fermat] (Fermat/Fermat.md) + +[东哥](Donggewudi/Donggeheiheihei.md) From aa11af0f13bc63a16aea1471cba5f4f8eb43e977 Mon Sep 17 00:00:00 2001 From: Anoor2css Date: Thu, 18 Feb 2016 17:39:39 -0500 Subject: [PATCH 2607/5486] =?UTF-8?q?update=20the=20=E5=A4=A7=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 540f1494b0..55e0819f87 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -96,4 +96,4 @@ [Fermat] (Fermat/Fermat.md) -[东哥](Donggewudi/Donggeheiheihei.md) +[东哥与石头](Donggewudi/Donggeheiheihei.md) From 94b749844cc56af40709262b8b12251f6c679293 Mon Sep 17 00:00:00 2001 From: IanSkyles Date: Thu, 18 Feb 2016 17:23:24 -0800 Subject: [PATCH 2608/5486] Added a new line to the english/animal/animal.md story. --- english/animal/animal.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/animal/animal.md b/english/animal/animal.md index d51024d32b..5d02cde056 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -17,4 +17,6 @@ what I would do. I'd eat it. Yup, I know it sounds disgusting but a dog is a dog and a cat is a cat. You know what I mean? -Don't eat animals #GoVegan \ No newline at end of file +Don't eat animals #GoVegan + +Don't be cruel. \ No newline at end of file From 52c067efd8d65006864480356700af79eeb36afc Mon Sep 17 00:00:00 2001 From: Enrique Sierra Gutierrez Date: Thu, 18 Feb 2016 20:28:59 -0600 Subject: [PATCH 2609/5486] docs: Add to the story about you --- english/this-story-is-about-you/this-story-is-about-you.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/this-story-is-about-you/this-story-is-about-you.md diff --git a/english/this-story-is-about-you/this-story-is-about-you.md b/english/this-story-is-about-you/this-story-is-about-you.md new file mode 100644 index 0000000000..f8ae7eff1e --- /dev/null +++ b/english/this-story-is-about-you/this-story-is-about-you.md @@ -0,0 +1,5 @@ +You try to remember the story... you've heard it before.. +There is a song... isn't it??? +Too many questions, too few answers.. +So first things first.... +What kind of story is this?? \ No newline at end of file From 3195dd1b764890121f1e84d52768182f3e0098c0 Mon Sep 17 00:00:00 2001 From: Enrique Sierra Gutierrez Date: Thu, 18 Feb 2016 20:44:57 -0600 Subject: [PATCH 2610/5486] feat: Add link to the story about you --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index ea961af74c..8cb2b7690a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -693,6 +693,7 @@ You made it through the day and are starting to get sleepy... [Time to fall asle You wake up in front of a computer screen. You begin reading the text of a markdown file called marshmallow.md. As you read you realize that the story is about you! +[remember this story!](this-story-is-about-you/this-story-is-about-you.md) This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) From 0ae3430b2d7a4555ba02b6d6dcd3025122a4f22f Mon Sep 17 00:00:00 2001 From: jokem59 Date: Fri, 19 Feb 2016 03:10:32 -0500 Subject: [PATCH 2611/5486] Create climbing.md --- english/climbing/climbing.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/climbing/climbing.md diff --git a/english/climbing/climbing.md b/english/climbing/climbing.md new file mode 100644 index 0000000000..5c90184f25 --- /dev/null +++ b/english/climbing/climbing.md @@ -0,0 +1 @@ +You decide that the best way out of this situation is boudering... hardcore bouldering. From bce1ef4425d5cf155e166dcd336f3e2dfe98a995 Mon Sep 17 00:00:00 2001 From: jokem59 Date: Fri, 19 Feb 2016 03:12:32 -0500 Subject: [PATCH 2612/5486] Update marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 1daf62afc9..0e4b58d9f5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,5 @@ +You decide the only way out is to climb, [climb][climb/climb.md] hard friend. + [Know about the life of this world](00-Life-of-this-world/Life of this world.md) This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down From 95740fd45889dac625485e0ba33de59e4badf05a Mon Sep 17 00:00:00 2001 From: jokem59 Date: Fri, 19 Feb 2016 03:13:30 -0500 Subject: [PATCH 2613/5486] Update marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0e4b58d9f5..f7a831d09a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -You decide the only way out is to climb, [climb][climb/climb.md] hard friend. +You decide the only way out is to climb, [climb][climbing/climbing.md] hard friend. [Know about the life of this world](00-Life-of-this-world/Life of this world.md) From fdf08707bb5f747da2c27f7e84d6249a3670abf7 Mon Sep 17 00:00:00 2001 From: jokem59 Date: Fri, 19 Feb 2016 03:14:09 -0500 Subject: [PATCH 2614/5486] Update marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index f7a831d09a..b88e85406d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -You decide the only way out is to climb, [climb][climbing/climbing.md] hard friend. +You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. [Know about the life of this world](00-Life-of-this-world/Life of this world.md) From a22e65f5ed8c2c029fb0fe5ab8b1d1a179336c4a Mon Sep 17 00:00:00 2001 From: Aileen Sim Date: Fri, 19 Feb 2016 21:53:41 +0800 Subject: [PATCH 2615/5486] Add wikipedia option to smores.md --- english/smores/smores.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/smores/smores.md b/english/smores/smores.md index ffe704f593..153cfcb2bd 100644 --- a/english/smores/smores.md +++ b/english/smores/smores.md @@ -1,3 +1,7 @@ You try to make s'mores! Too bad you don't have any chocolate... ...but you do have stroopwafels! This will be a huge sugar hit. Now, what is the perfect ratio of marshmallow to stroopwafel? + +Do you: +[Look it up on wikipedia?](../wikipedia/wikipedia.md) +[Go back](../marshmallow.md) \ No newline at end of file From 47fb1d38c5d02eb5880d2bb8e21bdc159b24725b Mon Sep 17 00:00:00 2001 From: Aileen Sim Date: Fri, 19 Feb 2016 21:57:31 +0800 Subject: [PATCH 2616/5486] Fix typo in wiki.md file name --- english/smores/smores.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/smores/smores.md b/english/smores/smores.md index 153cfcb2bd..69d2f86c32 100644 --- a/english/smores/smores.md +++ b/english/smores/smores.md @@ -3,5 +3,6 @@ You try to make s'mores! Too bad you don't have any chocolate... Now, what is the perfect ratio of marshmallow to stroopwafel? Do you: -[Look it up on wikipedia?](../wikipedia/wikipedia.md) +[Look it up on wikipedia?](../wikipedia/wiki.md) + [Go back](../marshmallow.md) \ No newline at end of file From 28e5197b26be26037bccd06cdb9225dc4c2e060b Mon Sep 17 00:00:00 2001 From: Aileen Sim Date: Fri, 19 Feb 2016 22:10:11 +0800 Subject: [PATCH 2617/5486] Add option in smores to wiki --- english/smores/smores.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/smores/smores.md b/english/smores/smores.md index 69d2f86c32..04281411ce 100644 --- a/english/smores/smores.md +++ b/english/smores/smores.md @@ -3,6 +3,7 @@ You try to make s'mores! Too bad you don't have any chocolate... Now, what is the perfect ratio of marshmallow to stroopwafel? Do you: + [Look it up on wikipedia?](../wikipedia/wiki.md) [Go back](../marshmallow.md) \ No newline at end of file From 7323377fa346eb92dd8f208c102c0159f66594f6 Mon Sep 17 00:00:00 2001 From: Michael Missouri Date: Fri, 19 Feb 2016 11:27:39 -0500 Subject: [PATCH 2618/5486] Added a line in the norwegian part of the story. --- norwegian/start.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/norwegian/start.md b/norwegian/start.md index 66a0e5f7e0..ffc299ec1f 100644 --- a/norwegian/start.md +++ b/norwegian/start.md @@ -2,4 +2,6 @@ Det er en varm kveld midt i sommerferien. -Du sitter på en stein i vannkanten og ser noe flyte i fjæra. \ No newline at end of file +Du sitter på en stein i vannkanten og ser noe flyte i fjæra. + +Jeg sitter ned på berget og ser utover havet. \ No newline at end of file From 4b11c3958f560e88773cfbb8eb205cdc5a0e2b19 Mon Sep 17 00:00:00 2001 From: Michael Missouri Date: Fri, 19 Feb 2016 11:33:36 -0500 Subject: [PATCH 2619/5486] Started in master instead of my own branch --- norwegian/start.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/norwegian/start.md b/norwegian/start.md index ffc299ec1f..66a0e5f7e0 100644 --- a/norwegian/start.md +++ b/norwegian/start.md @@ -2,6 +2,4 @@ Det er en varm kveld midt i sommerferien. -Du sitter på en stein i vannkanten og ser noe flyte i fjæra. - -Jeg sitter ned på berget og ser utover havet. \ No newline at end of file +Du sitter på en stein i vannkanten og ser noe flyte i fjæra. \ No newline at end of file From 32a7efce39b50c699ec12f8b9e8c14e5e42dcb0d Mon Sep 17 00:00:00 2001 From: smh111976 Date: Fri, 19 Feb 2016 10:45:54 -0600 Subject: [PATCH 2620/5486] add options and storyline to choose-your-own-adventure --- english/tell-mother/call-mother/call-mother.md | 1 + english/tell-mother/select-option/select-option.md | 1 + english/tell-mother/tell-mother.md | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 english/tell-mother/call-mother/call-mother.md create mode 100644 english/tell-mother/select-option/select-option.md diff --git a/english/tell-mother/call-mother/call-mother.md b/english/tell-mother/call-mother/call-mother.md new file mode 100644 index 0000000000..923dc25b4b --- /dev/null +++ b/english/tell-mother/call-mother/call-mother.md @@ -0,0 +1 @@ +Your mother is so glad you called that she places an order of 2 tons of marshmallows for you... yeah... good choice! \ No newline at end of file diff --git a/english/tell-mother/select-option/select-option.md b/english/tell-mother/select-option/select-option.md new file mode 100644 index 0000000000..9eaef5b994 --- /dev/null +++ b/english/tell-mother/select-option/select-option.md @@ -0,0 +1 @@ +By letting your curiosity get the best of you, you selected the new option and wiped your phone clean, losing all data you had stored. I'm sorry. \ No newline at end of file diff --git a/english/tell-mother/tell-mother.md b/english/tell-mother/tell-mother.md index bd28673a1a..d8b863b049 100644 --- a/english/tell-mother/tell-mother.md +++ b/english/tell-mother/tell-mother.md @@ -1,2 +1,10 @@ You pull out your cell phone to call your mother. It has seven extra antennas. Turning it on, you notice a new option you've never seen before. + +Do you... + +[...select the option to see what it does?](select-option/select-option.md) + +or... + +[...call your mother?](call-mother/call-mother.md) \ No newline at end of file From f8b8bf955ad020e40653600d4ade8d7ab49b78b5 Mon Sep 17 00:00:00 2001 From: smh111976 Date: Fri, 19 Feb 2016 11:00:48 -0600 Subject: [PATCH 2621/5486] fixing character number per line issue --- english/tell-mother/select-option/select-option.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/tell-mother/select-option/select-option.md b/english/tell-mother/select-option/select-option.md index 9eaef5b994..84f560aaba 100644 --- a/english/tell-mother/select-option/select-option.md +++ b/english/tell-mother/select-option/select-option.md @@ -1 +1,3 @@ -By letting your curiosity get the best of you, you selected the new option and wiped your phone clean, losing all data you had stored. I'm sorry. \ No newline at end of file +By letting your curiosity get the best of you, +you selected the new option and wiped your phone clean, +losing all data you had stored. I'm sorry. \ No newline at end of file From 476b36266547809c9d510ac5b72c7144517b2fa0 Mon Sep 17 00:00:00 2001 From: Wes Bell Date: Fri, 19 Feb 2016 13:44:28 -0600 Subject: [PATCH 2622/5486] Add math to the adventure --- english/marshmallow.md | 2 ++ english/math/math.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 english/math/math.md diff --git a/english/marshmallow.md b/english/marshmallow.md index b88e85406d..950d8e225f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -828,3 +828,5 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [Paint It Black](paint-it-black/PaintItBlack.md) [Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) + +[To Infinity and Beyond](math/math.md) \ No newline at end of file diff --git a/english/math/math.md b/english/math/math.md new file mode 100644 index 0000000000..c7c7d89b6f --- /dev/null +++ b/english/math/math.md @@ -0,0 +1,5 @@ +I'm thinking of an order of infinity between 12 and infinity. + +What order of infinity am I thinking of? + +-Georg Cantor From e78f1c19ccdfb46b1e88c8d9ff42e3dda1de91a2 Mon Sep 17 00:00:00 2001 From: Aileen Sim Date: Sat, 20 Feb 2016 13:44:52 +0800 Subject: [PATCH 2623/5486] Add google option to smores. --- english/smores/smores.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/smores/smores.md b/english/smores/smores.md index 04281411ce..9d571bce08 100644 --- a/english/smores/smores.md +++ b/english/smores/smores.md @@ -6,4 +6,6 @@ Do you: [Look it up on wikipedia?](../wikipedia/wiki.md) +[Google it] (http://google.com) + [Go back](../marshmallow.md) \ No newline at end of file From 0a3495636d861e3b980960af670441de1b2da1bd Mon Sep 17 00:00:00 2001 From: Aileen Sim Date: Sat, 20 Feb 2016 13:49:12 +0800 Subject: [PATCH 2624/5486] Add option to call mother from math.md --- english/math/math.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/math/math.md b/english/math/math.md index c7c7d89b6f..d4bef3726a 100644 --- a/english/math/math.md +++ b/english/math/math.md @@ -1,5 +1,11 @@ -I'm thinking of an order of infinity between 12 and infinity. +Hmm.. I'm thinking of an order of infinity between 12 and infinity. What order of infinity am I thinking of? -Georg Cantor + +Do you: + +[Call your mother.](../tell-mother/tell-mother.md) + +[Go back.](../) \ No newline at end of file From 7d891b68bae269e41d8c342f132bacc59a5d3fad Mon Sep 17 00:00:00 2001 From: Aileen Sim Date: Sat, 20 Feb 2016 14:06:17 +0800 Subject: [PATCH 2625/5486] Change option to go back to wiki it. --- english/math/math.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/math/math.md b/english/math/math.md index d4bef3726a..962ac9da2a 100644 --- a/english/math/math.md +++ b/english/math/math.md @@ -1,4 +1,4 @@ -Hmm.. I'm thinking of an order of infinity between 12 and infinity. +I'm thinking of an order of infinity between 12 and infinity. What order of infinity am I thinking of? @@ -8,4 +8,4 @@ Do you: [Call your mother.](../tell-mother/tell-mother.md) -[Go back.](../) \ No newline at end of file +[Wiki it.](../wikipedia/wiki.md) \ No newline at end of file From d59eb70f83a5a2d7bab38856d12241fa1307b648 Mon Sep 17 00:00:00 2001 From: Gururaj Date: Sun, 21 Feb 2016 12:34:21 +0530 Subject: [PATCH 2626/5486] Modifying Kannada file --- kannada/kannada_kali/kannada_kali.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kannada/kannada_kali/kannada_kali.md b/kannada/kannada_kali/kannada_kali.md index d0c89ef653..669734735e 100644 --- a/kannada/kannada_kali/kannada_kali.md +++ b/kannada/kannada_kali/kannada_kali.md @@ -1 +1,3 @@ -ಕನ್ನಡ ಕಲಿಯಲು [ಇದು](https://play.google.com/store/apps/details?id=com.pgjpb.learnkannada&hl=en) ಒಳ್ಳೆಯ ಸಾಧನ. \ No newline at end of file +ಕನ್ನಡ ಕಲಿಯಲು [ಇದು](https://play.google.com/store/apps/details?id=com.pgjpb.learnkannada&hl=en) ಒಳ್ಳೆಯ ಸಾಧನ. + +ಅದರ ಜೊತೆಗೆ [ಈ]()https://play.google.com/store/apps/details?id=com.sriandroid.justkannada)ಸಾಧನದಿಂದ ಕನ್ನಡದಲ್ಲಿ ಟೈಪ್ ಮಾಡಬಹುದು \ No newline at end of file From 9dcc198d79b7b11f8a979e4b4cf08935c04723a4 Mon Sep 17 00:00:00 2001 From: Gururaj Date: Sun, 21 Feb 2016 12:40:46 +0530 Subject: [PATCH 2627/5486] Modifying Kannada file --- kannada/kannada_kali/kannada_kali.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kannada/kannada_kali/kannada_kali.md b/kannada/kannada_kali/kannada_kali.md index 669734735e..8bb101ff04 100644 --- a/kannada/kannada_kali/kannada_kali.md +++ b/kannada/kannada_kali/kannada_kali.md @@ -1,3 +1,4 @@ ಕನ್ನಡ ಕಲಿಯಲು [ಇದು](https://play.google.com/store/apps/details?id=com.pgjpb.learnkannada&hl=en) ಒಳ್ಳೆಯ ಸಾಧನ. -ಅದರ ಜೊತೆಗೆ [ಈ]()https://play.google.com/store/apps/details?id=com.sriandroid.justkannada)ಸಾಧನದಿಂದ ಕನ್ನಡದಲ್ಲಿ ಟೈಪ್ ಮಾಡಬಹುದು \ No newline at end of file +ಅದರ ಜೊತೆಗೆ [ಈ](https://play.google.com/store/apps/details?id=com.sriandroid.justkannada) +ಸಾಧನದಿಂದ ಕನ್ನಡದಲ್ಲಿ ಟೈಪ್ ಮಾಡಬಹುದು \ No newline at end of file From e01e4bb616a9ce804c2b394a0246ae41c3e3d8d1 Mon Sep 17 00:00:00 2001 From: Parag Pachpute Date: Sun, 21 Feb 2016 17:18:35 +0530 Subject: [PATCH 2628/5486] Add me marathi opinion --- Marathi/marathi.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marathi/marathi.md b/Marathi/marathi.md index 8bbe9bd128..c1866be947 100644 --- a/Marathi/marathi.md +++ b/Marathi/marathi.md @@ -1,4 +1,5 @@ मराठी विश्वात आपले स्वागत आहे चार प्राइवेट ड्राइव पत्त्यावर राहणार्‍या श्री. आणि सौ. डर्सलीना आपण सामान्य असल्याचा अतिशय अभिमान होता. गणपती उत्सवात आपले हार्दिक स्वागत. -मराठी विश्व खुप सुंदर आहे. \ No newline at end of file +मराठी विश्व खुप सुंदर आहे. +मी मराठी असल्याचा मला अभिमान आहे. \ No newline at end of file From 11c3e1eb8806c6ae5e62ef1e08b75f6adc28bc65 Mon Sep 17 00:00:00 2001 From: Murphy Chen Date: Sun, 21 Feb 2016 23:04:05 +0800 Subject: [PATCH 2629/5486] Add a new character into the story --- Chinese/DesertHell/OldStory/Story.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Chinese/DesertHell/OldStory/Story.md b/Chinese/DesertHell/OldStory/Story.md index fef333ff28..ae043b2b0f 100644 --- a/Chinese/DesertHell/OldStory/Story.md +++ b/Chinese/DesertHell/OldStory/Story.md @@ -1,4 +1,8 @@ 从前有座山， 山上有座庙， 庙里有个白胡子老头正在讲故事， +他说, +很久很久以前, +有一隻白猫, +他是一隻活过一万次的猫, [他讲的什么？](./Story.md) From a493ac677035e0db54ff7bd3d68ecdb567a40396 Mon Sep 17 00:00:00 2001 From: MW Date: Sun, 21 Feb 2016 22:43:23 -0800 Subject: [PATCH 2630/5486] Add take-more-nap.md --- english/take-more-nap/take-more-nap.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/take-more-nap/take-more-nap.md diff --git a/english/take-more-nap/take-more-nap.md b/english/take-more-nap/take-more-nap.md new file mode 100644 index 0000000000..aee997dbc2 --- /dev/null +++ b/english/take-more-nap/take-more-nap.md @@ -0,0 +1 @@ +You woke up a couple of hours later, feeling refreshed. The two malt balls are still there. \ No newline at end of file From 76cda363cebcba40ccd79ae87996cff31bada84f Mon Sep 17 00:00:00 2001 From: MW Date: Sun, 21 Feb 2016 22:47:39 -0800 Subject: [PATCH 2631/5486] Update take-a-nap.md to link to take-more-nap.md --- english/take-a-nap/take-a-nap.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/take-a-nap/take-a-nap.md b/english/take-a-nap/take-a-nap.md index 09acd99455..2e91172d45 100644 --- a/english/take-a-nap/take-a-nap.md +++ b/english/take-a-nap/take-a-nap.md @@ -1 +1,5 @@ -You wake up a few hours later, and note that there are now two malt balls. \ No newline at end of file +You wake up a few hours later, and note that there are now two malt balls. + +What will you do? + +[Still sleepy...](../take-more-nap/take-more-nap.md) \ No newline at end of file From d1f4893d13b05cb2d2f8b800cb7a54d695386f4d Mon Sep 17 00:00:00 2001 From: attapalace Date: Mon, 22 Feb 2016 09:05:51 +0200 Subject: [PATCH 2632/5486] add read to arabic --- arabic/read/read.md | 1 + arabic/salamoAlikom.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 arabic/read/read.md diff --git a/arabic/read/read.md b/arabic/read/read.md new file mode 100644 index 0000000000..7367d2daeb --- /dev/null +++ b/arabic/read/read.md @@ -0,0 +1 @@ +إن القراءة من أفضل الهوايات ولكن يجب ان تختار بعناية ما تقرأه وتتعلم منه \ No newline at end of file diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 2db079c990..834fa799e9 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -14,6 +14,8 @@ [وظيفة](Job/Job.md) +[اقرأ](read/read.md) + [أريد أن أحصل على Nanodegree](https://www.udacity.com/nanodegree) [online](learn/learn.md) عايز اعرف اسماء مواقع كورسات From 2e3fde17a812da30c9694925f002017c0f200dcb Mon Sep 17 00:00:00 2001 From: edwins-leonardi Date: Mon, 22 Feb 2016 09:25:15 -0300 Subject: [PATCH 2633/5486] Add another option for the titanic story in portuguese --- portugues/titanic/arrumar/arrumar.md | 2 ++ portugues/titanic/arrumar/middleware/404.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 portugues/titanic/arrumar/middleware/404.md diff --git a/portugues/titanic/arrumar/arrumar.md b/portugues/titanic/arrumar/arrumar.md index 2c9430b384..e55b93ca94 100644 --- a/portugues/titanic/arrumar/arrumar.md +++ b/portugues/titanic/arrumar/arrumar.md @@ -3,3 +3,5 @@ Assim, vocês colidem com toda a forca no bugberg. O aplicativo nunca mais abre. [Tentar fazer uma imitacão de Di Caprio na proa do barco](imitar/falha.md) + +[Utilizar o middleware java Bote Salva Vidas](middleware/404.md) diff --git a/portugues/titanic/arrumar/middleware/404.md b/portugues/titanic/arrumar/middleware/404.md new file mode 100644 index 0000000000..25ae75762b --- /dev/null +++ b/portugues/titanic/arrumar/middleware/404.md @@ -0,0 +1 @@ +Infelizmente você recebe uma exceção de java.langOutOfMemory exception e acaba cortando os pulsos com os pedaços de uma xícara de café quebrada. From a93a9a2a1df17632d4642b931575c5c87f2235ef Mon Sep 17 00:00:00 2001 From: edwins-leonardi Date: Mon, 22 Feb 2016 09:31:00 -0300 Subject: [PATCH 2634/5486] Fix the row length --- portugues/titanic/arrumar/middleware/404.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/portugues/titanic/arrumar/middleware/404.md b/portugues/titanic/arrumar/middleware/404.md index 25ae75762b..bb795f2ee3 100644 --- a/portugues/titanic/arrumar/middleware/404.md +++ b/portugues/titanic/arrumar/middleware/404.md @@ -1 +1,2 @@ -Infelizmente você recebe uma exceção de java.langOutOfMemory exception e acaba cortando os pulsos com os pedaços de uma xícara de café quebrada. +Infelizmente você recebe uma exceção de java.langOutOfMemory exception e acaba cortando os pulsos com os pedaços de +uma xícara de café quebrada. From 69aa7eab3577ccfa9fd3c0673b6fb820207a1462 Mon Sep 17 00:00:00 2001 From: jspatter Date: Mon, 22 Feb 2016 15:13:23 -0600 Subject: [PATCH 2635/5486] Add new scene with Hermione and Snape --- english/visit-hagrid/visit-hagrid.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/visit-hagrid/visit-hagrid.md b/english/visit-hagrid/visit-hagrid.md index 25cde6d98b..a9efabbb4b 100644 --- a/english/visit-hagrid/visit-hagrid.md +++ b/english/visit-hagrid/visit-hagrid.md @@ -2,4 +2,10 @@ Hermione, Harry, and Ron saunter down to Hagrid's hut. Before they even knock they are greeted by Fang's loud barking, prompting Hagrid to come to the door. The gang is glad to see Hagrid's friendly face after a tough week. They sit together drinking tea and politely nibbling on Hagrid's over-baked snacks. -Snape wanders in looking really drunk and smelling of whiskey. \ No newline at end of file +Snape wanders in looking really drunk and smelling of whiskey. + +Hermione responds by: + +[Yelling](../yell-at-snape/yell-at-snape.md) + +[Punching Snape](../punch-snape/punch-snape.md) \ No newline at end of file From 8a1061316fa98fd263e9bcf25e0466ad2f247639 Mon Sep 17 00:00:00 2001 From: jspatter Date: Mon, 22 Feb 2016 15:13:52 -0600 Subject: [PATCH 2636/5486] Add punching snape storyline option --- english/punch-snape/punch-snape.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/punch-snape/punch-snape.md diff --git a/english/punch-snape/punch-snape.md b/english/punch-snape/punch-snape.md new file mode 100644 index 0000000000..a677743604 --- /dev/null +++ b/english/punch-snape/punch-snape.md @@ -0,0 +1 @@ +Hermione takes complete leave of her senses in the face of such blatant rule-breaking and punches Professor Snape in the face, Malfoy-in-third-year style. \ No newline at end of file From d210f4265f6d5c622e58fbe2b71c9811419fd1a5 Mon Sep 17 00:00:00 2001 From: jspatter Date: Mon, 22 Feb 2016 15:14:21 -0600 Subject: [PATCH 2637/5486] Add yell at snape option --- english/yell-at-snape/yell-at-snape.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/yell-at-snape/yell-at-snape.md diff --git a/english/yell-at-snape/yell-at-snape.md b/english/yell-at-snape/yell-at-snape.md new file mode 100644 index 0000000000..c3d88a6f9e --- /dev/null +++ b/english/yell-at-snape/yell-at-snape.md @@ -0,0 +1 @@ +Hermione, her distaste for Snape's rule-breaking overwhelming her respect for Hogwart's professors screams "How could you do this? Being a Death Eater is one thing but being drunk at Hogwarts is unforgiveable!" \ No newline at end of file From 121be1bc13f65e159eb867372bd0a1ac871c816d Mon Sep 17 00:00:00 2001 From: jspatter Date: Mon, 22 Feb 2016 15:18:35 -0600 Subject: [PATCH 2638/5486] Make the number of characters per line shorter --- english/yell-at-snape/yell-at-snape.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/yell-at-snape/yell-at-snape.md b/english/yell-at-snape/yell-at-snape.md index c3d88a6f9e..c1c73ac435 100644 --- a/english/yell-at-snape/yell-at-snape.md +++ b/english/yell-at-snape/yell-at-snape.md @@ -1 +1,5 @@ -Hermione, her distaste for Snape's rule-breaking overwhelming her respect for Hogwart's professors screams "How could you do this? Being a Death Eater is one thing but being drunk at Hogwarts is unforgiveable!" \ No newline at end of file +Hermione, her distaste for Snape's rule-breaking +overwhelming her respect for Hogwart's professors +screams "How could you do this? Being a Death Eater is +one thing but being drunk at Hogwarts is +unforgiveable!" \ No newline at end of file From 788fd867d542b453b524476a4f9b161fec5e939e Mon Sep 17 00:00:00 2001 From: jspatter Date: Mon, 22 Feb 2016 15:19:16 -0600 Subject: [PATCH 2639/5486] Make the punch snape the appopriate characters per line --- english/punch-snape/punch-snape.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/punch-snape/punch-snape.md b/english/punch-snape/punch-snape.md index a677743604..18428d6498 100644 --- a/english/punch-snape/punch-snape.md +++ b/english/punch-snape/punch-snape.md @@ -1 +1,4 @@ -Hermione takes complete leave of her senses in the face of such blatant rule-breaking and punches Professor Snape in the face, Malfoy-in-third-year style. \ No newline at end of file +Hermione takes complete leave of her senses in the +face of such blatant rule-breaking and punches +Professor Snape in the face, Malfoy-in-third-year +style. \ No newline at end of file From 1b64514322ebe3545dc467f19b98b28d41b239b4 Mon Sep 17 00:00:00 2001 From: John Bradley Date: Mon, 22 Feb 2016 17:21:43 -0500 Subject: [PATCH 2640/5486] I couldn't really think of anything else to add --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 950d8e225f..623dc654af 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -829,4 +829,6 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) -[To Infinity and Beyond](math/math.md) \ No newline at end of file +[To Infinity and Beyond](math/math.md) + +[I hope you aren't using a poorly built crawler on this](./marshmallow.md) From 881fd73cd97b00cffce4a3aeb8c0152dcf917543 Mon Sep 17 00:00:00 2001 From: Ann Kidder Date: Mon, 22 Feb 2016 19:53:32 -0500 Subject: [PATCH 2641/5486] Add Camelot as option --- english/rib-eye/rib-eye.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/rib-eye/rib-eye.md b/english/rib-eye/rib-eye.md index c4e98727bc..323a1627af 100644 --- a/english/rib-eye/rib-eye.md +++ b/english/rib-eye/rib-eye.md @@ -14,4 +14,8 @@ or or +[In Camelot] (../camelot.md) + +or + [Who cares, gimme Smores](../smores/smores.md) From 3d0837849dbac6377ecd3fe22398484d92e23eb8 Mon Sep 17 00:00:00 2001 From: Ann Kidder Date: Mon, 22 Feb 2016 20:09:02 -0500 Subject: [PATCH 2642/5486] Edit link for Camelot in rib-eye.md --- english/rib-eye/rib-eye.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/rib-eye/rib-eye.md b/english/rib-eye/rib-eye.md index 323a1627af..d5f9f16159 100644 --- a/english/rib-eye/rib-eye.md +++ b/english/rib-eye/rib-eye.md @@ -14,7 +14,7 @@ or or -[In Camelot] (../camelot.md) +[In Camelot] (english/camelot.md) or From eaba13089e4b132bd1da0318269eae36ad3b92c0 Mon Sep 17 00:00:00 2001 From: Ann Kidder Date: Mon, 22 Feb 2016 20:12:34 -0500 Subject: [PATCH 2643/5486] Fix URL in rib-eye for Camelot --- english/rib-eye/rib-eye.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/rib-eye/rib-eye.md b/english/rib-eye/rib-eye.md index d5f9f16159..5dbc30cc97 100644 --- a/english/rib-eye/rib-eye.md +++ b/english/rib-eye/rib-eye.md @@ -14,7 +14,7 @@ or or -[In Camelot] (english/camelot.md) +[In Camelot] (https://github.com/itsmeava/create-your-own-adventure/blob/master/english/camelot/camelot.md) or From fdfed40909e2ef51e79313481322371618d9f3b8 Mon Sep 17 00:00:00 2001 From: Ann Kidder Date: Mon, 22 Feb 2016 20:15:30 -0500 Subject: [PATCH 2644/5486] Fix URL from absolute to relative --- english/rib-eye/rib-eye.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/rib-eye/rib-eye.md b/english/rib-eye/rib-eye.md index 5dbc30cc97..03b17ba186 100644 --- a/english/rib-eye/rib-eye.md +++ b/english/rib-eye/rib-eye.md @@ -14,7 +14,7 @@ or or -[In Camelot] (https://github.com/itsmeava/create-your-own-adventure/blob/master/english/camelot/camelot.md) +[In Camelot] (english/camelot/camelot.md) or From 70aab6d53db10bd261559d2248861fb7e2300024 Mon Sep 17 00:00:00 2001 From: itsmeava Date: Mon, 22 Feb 2016 20:18:11 -0500 Subject: [PATCH 2645/5486] Fix broken URL --- english/rib-eye/rib-eye.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/rib-eye/rib-eye.md b/english/rib-eye/rib-eye.md index 03b17ba186..2d054c1096 100644 --- a/english/rib-eye/rib-eye.md +++ b/english/rib-eye/rib-eye.md @@ -14,7 +14,7 @@ or or -[In Camelot] (english/camelot/camelot.md) +[In Camelot] (../camelot/camelot.md) or From c9bd0edffa9a16159b7dd2f8b644fb9827d69d8d Mon Sep 17 00:00:00 2001 From: Daniel J Janiak Date: Mon, 22 Feb 2016 20:26:29 -0700 Subject: [PATCH 2646/5486] Add a link to a jazz concert --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 623dc654af..29416a5a60 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -648,6 +648,8 @@ A quick brown fox jumps over the lazy dog! [Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) +[Watch a recording of an awesome jazz concert](https://www.youtube.com/watch?v=VMb3PX9gq78) + This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. You decide that you do not want to visit the miracle man. [You check your From 12ff589c908ccb164b8eab570bb838c2a21efcd0 Mon Sep 17 00:00:00 2001 From: Tysro Date: Tue, 23 Feb 2016 16:15:17 +0530 Subject: [PATCH 2647/5486] Prestige --- english/magic/magic2.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/magic/magic2.md diff --git a/english/magic/magic2.md b/english/magic/magic2.md new file mode 100644 index 0000000000..b06e532c41 --- /dev/null +++ b/english/magic/magic2.md @@ -0,0 +1 @@ +Are you watching [ closely](/magic.md) / \ No newline at end of file From df698701e64b2507c6565ee2b67d86e363800efb Mon Sep 17 00:00:00 2001 From: Tysro Date: Tue, 23 Feb 2016 16:22:08 +0530 Subject: [PATCH 2648/5486] change of path --- english/magic/magic2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/magic/magic2.md b/english/magic/magic2.md index b06e532c41..b3728eaafd 100644 --- a/english/magic/magic2.md +++ b/english/magic/magic2.md @@ -1 +1 @@ -Are you watching [ closely](/magic.md) / \ No newline at end of file +Are you watching [ closely](magic.md) / From d2ed06e0eb40941a8750897e77185f2e1de6b7e7 Mon Sep 17 00:00:00 2001 From: Tysro Date: Tue, 23 Feb 2016 16:23:47 +0530 Subject: [PATCH 2649/5486] change of text --- english/magic/magic2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/magic/magic2.md b/english/magic/magic2.md index b3728eaafd..f3c170fd9a 100644 --- a/english/magic/magic2.md +++ b/english/magic/magic2.md @@ -1 +1 @@ -Are you watching [ closely](magic.md) / +Are you watching [ closely](magic.md) . From 1c3eda6b1c586cd9b9751bc2ea67498dff39927a Mon Sep 17 00:00:00 2001 From: Samantha Medeiros Date: Tue, 23 Feb 2016 14:24:52 -0500 Subject: [PATCH 2650/5486] Clean up punctuation --- english/ghost-buster/ghost-busted.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/ghost-buster/ghost-busted.md b/english/ghost-buster/ghost-busted.md index 7814d65b63..c0c8bbb03a 100644 --- a/english/ghost-buster/ghost-busted.md +++ b/english/ghost-buster/ghost-busted.md @@ -1,6 +1,6 @@ -After reciting your magic spell to open the door, you then realize you are not Hermione Granger, -in fact you are no wizard at all. Upon realizing this demoralizing truth you take a moment to ponder your situation, -"Alas! I may not be a wizard but I ain't afraid of no ghost nor a marshmallow!" you say aloud after having the epiphany +After reciting your magic spell to open the door, you then realize you are not Hermione Granger; +in fact you are no wizard at all. Upon realizing this demoralizing truth, you take a moment to ponder your situation. +"Alas! I may not be a wizard but, I ain't afraid of no ghost, nor a marshmallow!" you say aloud after having the epiphany that you are indeed a ghost-buster! Your proton pack then materializes right in front of you. From cda1ea3048f3ab958324df2a60d7de0e1cb28175 Mon Sep 17 00:00:00 2001 From: Samantha Medeiros Date: Tue, 23 Feb 2016 14:27:54 -0500 Subject: [PATCH 2651/5486] Fix comma typo --- english/ghost-buster/ghost-busted.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/ghost-buster/ghost-busted.md b/english/ghost-buster/ghost-busted.md index c0c8bbb03a..6fc2b2d6b3 100644 --- a/english/ghost-buster/ghost-busted.md +++ b/english/ghost-buster/ghost-busted.md @@ -1,6 +1,6 @@ After reciting your magic spell to open the door, you then realize you are not Hermione Granger; in fact you are no wizard at all. Upon realizing this demoralizing truth, you take a moment to ponder your situation. -"Alas! I may not be a wizard but, I ain't afraid of no ghost, nor a marshmallow!" you say aloud after having the epiphany +"Alas! I may not be a wizard, but I ain't afraid of no ghost, nor a marshmallow!" you say aloud after having the epiphany that you are indeed a ghost-buster! Your proton pack then materializes right in front of you. From 162ad3de7cb6fcc7b37758c1777a114d2c887637 Mon Sep 17 00:00:00 2001 From: eddievillan Date: Tue, 23 Feb 2016 13:52:40 -0800 Subject: [PATCH 2652/5486] Added what happens when you drink a 30 pack! --- english/drink-beer/drink-beer.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/drink-beer/drink-beer.md b/english/drink-beer/drink-beer.md index 3f042a5e8e..a7353ffea0 100644 --- a/english/drink-beer/drink-beer.md +++ b/english/drink-beer/drink-beer.md @@ -1,3 +1,4 @@ You decide to drink one or two craft beers. Mmm refreshing. -You decide to drink a whole case of Natural Light. Whoa! \ No newline at end of file +You decide to drink a whole case of Natural Light. Whoa! +After doing so you see that tiny 6 pack you had in your abdomen region turn into a full keg! \ No newline at end of file From fca810a0ac3d44bd461157bb91226a582209b1be Mon Sep 17 00:00:00 2001 From: Tysro Date: Wed, 24 Feb 2016 13:27:59 +0530 Subject: [PATCH 2653/5486] moved magic2 to seperate directory --- english/magic/magic2.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 english/magic/magic2.md diff --git a/english/magic/magic2.md b/english/magic/magic2.md deleted file mode 100644 index f3c170fd9a..0000000000 --- a/english/magic/magic2.md +++ /dev/null @@ -1 +0,0 @@ -Are you watching [ closely](magic.md) . From 4ce7e2918b0e994bbb8cc125c17e76b31fb9c172 Mon Sep 17 00:00:00 2001 From: Tysro Date: Wed, 24 Feb 2016 13:31:17 +0530 Subject: [PATCH 2654/5486] added magic2 to repository --- english/magic2/magic2.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/magic2/magic2.md diff --git a/english/magic2/magic2.md b/english/magic2/magic2.md new file mode 100644 index 0000000000..535be9625f --- /dev/null +++ b/english/magic2/magic2.md @@ -0,0 +1 @@ +Are you watching [ closely](/../magic/magic.md) . From 684fe278d9ebf524e6c8b91f6094f2d1c36e776d Mon Sep 17 00:00:00 2001 From: Tysro Date: Wed, 24 Feb 2016 13:34:39 +0530 Subject: [PATCH 2655/5486] path change --- english/magic2/magic2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/magic2/magic2.md b/english/magic2/magic2.md index 535be9625f..41be4adc27 100644 --- a/english/magic2/magic2.md +++ b/english/magic2/magic2.md @@ -1 +1 @@ -Are you watching [ closely](/../magic/magic.md) . +Are you watching [ closely](../magic/magic.md) . From 5a4eddd5f9df2578d3f1db72d6584d706ffa59ee Mon Sep 17 00:00:00 2001 From: Tysro Date: Wed, 24 Feb 2016 13:45:13 +0530 Subject: [PATCH 2656/5486] added path in marshmallow.md --- english/marshmallow.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 29416a5a60..c91fa6c471 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -834,3 +834,6 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [To Infinity and Beyond](math/math.md) [I hope you aren't using a poorly built crawler on this](./marshmallow.md) + +[Read my story](magic2/magic2.md) + From 96774b299878df9a2ea2d89c0045d9140430fd34 Mon Sep 17 00:00:00 2001 From: Foncy Cootauco Date: Wed, 24 Feb 2016 17:59:51 +0800 Subject: [PATCH 2657/5486] Modify Philippines Salamat.md --- Philippines/salamat.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index 314b21d055..cad672ed46 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -3,3 +3,5 @@ Maligayang pasko at manigong bagong taon sa inyo! Salamat sa Udacity para sa online class na ito :D Ipagpatuloy ang adventure [dito] (bago/bago.md). + +Un oh. Nakapag-tagalog din. [Pindot Kalikot] (bago/bago.md) From a92e97418d5354dad9702f50b113e4c9c2074d01 Mon Sep 17 00:00:00 2001 From: krauzer Date: Wed, 24 Feb 2016 16:04:41 +0200 Subject: [PATCH 2658/5486] greek intimacy folder modification --- greek/offer_marshmallow_a_cigar/intimacy/cool/cool.md | 1 + greek/offer_marshmallow_a_cigar/intimacy/intimacy.md | 10 ++++++++++ .../intimacy/laughter/laughter.md | 1 + greek/offer_marshmallow_a_cigar/intimacy/open/open.md | 1 + 4 files changed, 13 insertions(+) create mode 100644 greek/offer_marshmallow_a_cigar/intimacy/cool/cool.md create mode 100644 greek/offer_marshmallow_a_cigar/intimacy/laughter/laughter.md create mode 100644 greek/offer_marshmallow_a_cigar/intimacy/open/open.md diff --git a/greek/offer_marshmallow_a_cigar/intimacy/cool/cool.md b/greek/offer_marshmallow_a_cigar/intimacy/cool/cool.md new file mode 100644 index 0000000000..d6d9d34ca4 --- /dev/null +++ b/greek/offer_marshmallow_a_cigar/intimacy/cool/cool.md @@ -0,0 +1 @@ +blah \ No newline at end of file diff --git a/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md b/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md index 080cc83cdf..036b0de4ff 100644 --- a/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md +++ b/greek/offer_marshmallow_a_cigar/intimacy/intimacy.md @@ -1,3 +1,13 @@ Το σκεφτεσαι περισσοτερο αναβωντας ακομα ένα τσιγαρο. Το ζαχαρωτο χερι εχει πνιγει στους καπνους αλλα πλεον δεν σε νοιαζει. Εισαι οικειος μαζι του αφου εχουν περασει πεντε ολοκληρα λεπτα από τοτε που γνωριστηκατε. +Σιγά σιγά, αρχίζεις και ξύνεις και καμιά μασχάλη αφού σχεδόν γίνατε και κολλητάρια. +Το ζαχαρωτό αρχίζει και ιδρώνει με την κλεισούρα που έχεις δημιουργήσει και αρχίζει να λιώνει. +Ξαφνικά βλέπεις να ξεπροβάλει ένα κουτί από μέσα του. + +[Αρχίζεις και γελάς δείχνοντας το ζαχαρωτό σου φίλο](laughter/laughter.md) + +[Του κουλ φορ σκουλ, ανάβεις άλλο ένα τσιγάρο](cool/cool.md) + +[Αρπάζεις το κουτί με βία και το ανοίγεις](open/open.md) + diff --git a/greek/offer_marshmallow_a_cigar/intimacy/laughter/laughter.md b/greek/offer_marshmallow_a_cigar/intimacy/laughter/laughter.md new file mode 100644 index 0000000000..d6d9d34ca4 --- /dev/null +++ b/greek/offer_marshmallow_a_cigar/intimacy/laughter/laughter.md @@ -0,0 +1 @@ +blah \ No newline at end of file diff --git a/greek/offer_marshmallow_a_cigar/intimacy/open/open.md b/greek/offer_marshmallow_a_cigar/intimacy/open/open.md new file mode 100644 index 0000000000..d6d9d34ca4 --- /dev/null +++ b/greek/offer_marshmallow_a_cigar/intimacy/open/open.md @@ -0,0 +1 @@ +blah \ No newline at end of file From c019c4c58d361fa8c33b54e0609f74453646ebbf Mon Sep 17 00:00:00 2001 From: krauzer Date: Wed, 24 Feb 2016 16:15:59 +0200 Subject: [PATCH 2659/5486] greek intimacy choices text added --- greek/offer_marshmallow_a_cigar/intimacy/cool/cool.md | 3 ++- greek/offer_marshmallow_a_cigar/intimacy/laughter/laughter.md | 3 ++- greek/offer_marshmallow_a_cigar/intimacy/open/open.md | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/greek/offer_marshmallow_a_cigar/intimacy/cool/cool.md b/greek/offer_marshmallow_a_cigar/intimacy/cool/cool.md index d6d9d34ca4..ad591a6337 100644 --- a/greek/offer_marshmallow_a_cigar/intimacy/cool/cool.md +++ b/greek/offer_marshmallow_a_cigar/intimacy/cool/cool.md @@ -1 +1,2 @@ -blah \ No newline at end of file +Αρχίζεις και αναρωτιέσαι μήπως το έχεις παρακάνει με το κάπνισμα και είναι καιρός να το κόψεις. +Από τον ζαχαρωτό σου φίλο δεν έχουν μείνει και πολλά. \ No newline at end of file diff --git a/greek/offer_marshmallow_a_cigar/intimacy/laughter/laughter.md b/greek/offer_marshmallow_a_cigar/intimacy/laughter/laughter.md index d6d9d34ca4..bb8a8573b0 100644 --- a/greek/offer_marshmallow_a_cigar/intimacy/laughter/laughter.md +++ b/greek/offer_marshmallow_a_cigar/intimacy/laughter/laughter.md @@ -1 +1,2 @@ -blah \ No newline at end of file +Νιώθεις ότι ξαναγύρισες στην 6η δημοτικού με την συμπεριφορά σου. +Δεν πειράζει όμως το ευχαριστιέσαι. \ No newline at end of file diff --git a/greek/offer_marshmallow_a_cigar/intimacy/open/open.md b/greek/offer_marshmallow_a_cigar/intimacy/open/open.md index d6d9d34ca4..c167228f58 100644 --- a/greek/offer_marshmallow_a_cigar/intimacy/open/open.md +++ b/greek/offer_marshmallow_a_cigar/intimacy/open/open.md @@ -1 +1,2 @@ -blah \ No newline at end of file +Από το κουτί εκπεμπεται ένα κύμα μαγικής ενέργειας. +Όταν το άνοιξες σε τύφλωσε το φως που βγληκε από μέσα From 8f4327ec412aaaec6e8656f0d13b8711a8538d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=B6yh=C3=B6nen?= Date: Wed, 24 Feb 2016 18:34:26 +0200 Subject: [PATCH 2660/5486] add back-to-sauna --- finnish/loyly/loyly.md | 1 + finnish/sauna.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 finnish/loyly/loyly.md diff --git a/finnish/loyly/loyly.md b/finnish/loyly/loyly.md new file mode 100644 index 0000000000..d5a5c1f973 --- /dev/null +++ b/finnish/loyly/loyly.md @@ -0,0 +1 @@ +Hiki valuu. \ No newline at end of file diff --git a/finnish/sauna.md b/finnish/sauna.md index 7e4a196f03..bed29fa29e 100644 --- a/finnish/sauna.md +++ b/finnish/sauna.md @@ -2,4 +2,6 @@ Istut saunan terassilla. Katsellessasi tyyntä järveä kuulet kuikan huudot hämärtyvässä elokuun alun illassa. -Mene uimaan painamalla [tästä](järvi/järvi.md) \ No newline at end of file +Mene uimaan painamalla [tästä](järvi/järvi.md) + +Palaa [löylyyn](loyly/loyly.md) \ No newline at end of file From 3ed17611ceaaf33828d6a7efc14e8eb5c9e865fe Mon Sep 17 00:00:00 2001 From: Doug Masiel Date: Wed, 24 Feb 2016 11:45:27 -0800 Subject: [PATCH 2661/5486] Add torch line to zork --- english/zork/zork.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/zork/zork.md b/english/zork/zork.md index 974b9f48cd..33715b7a0b 100644 --- a/english/zork/zork.md +++ b/english/zork/zork.md @@ -7,3 +7,5 @@ Not to be confused with Felonious Gru and his minions... [What's a grue?](../grue/grue.md) Very scary story for halloween + +There is an object that looks like a [torch](../torch/torch.md) on the ground. From bfe7b8b3ae7756c5da8f95bdb0f927a63aedc5ca Mon Sep 17 00:00:00 2001 From: Doug Masiel Date: Wed, 24 Feb 2016 11:46:11 -0800 Subject: [PATCH 2662/5486] add torch to english --- english/torch/torch.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/torch/torch.md diff --git a/english/torch/torch.md b/english/torch/torch.md new file mode 100644 index 0000000000..3e481cbd06 --- /dev/null +++ b/english/torch/torch.md @@ -0,0 +1,4 @@ +torch.md + +Upon inspection the object has a small depression. +When pressed an incandescent glow is emitted and the room comes into view. [Return to the twisted passages](../zork/zork.md) \ No newline at end of file From 7da29b73d5eb28729025712bb76bc14d2ab31f6b Mon Sep 17 00:00:00 2001 From: Doug Masiel Date: Wed, 24 Feb 2016 11:55:15 -0800 Subject: [PATCH 2663/5486] revise line length --- english/torch/torch.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/torch/torch.md b/english/torch/torch.md index 3e481cbd06..460e4ca29e 100644 --- a/english/torch/torch.md +++ b/english/torch/torch.md @@ -1,4 +1,5 @@ torch.md Upon inspection the object has a small depression. -When pressed an incandescent glow is emitted and the room comes into view. [Return to the twisted passages](../zork/zork.md) \ No newline at end of file +When pressed an incandescent glow is emitted and the room comes into view +. [Return to the twisted passages](../zork/zork.md) \ No newline at end of file From e6bb504614177a1ebbac1f973ec1d2c31dab0683 Mon Sep 17 00:00:00 2001 From: Jhonny Blaze Date: Wed, 24 Feb 2016 16:29:43 -0600 Subject: [PATCH 2664/5486] Added universe question? --- english/marshmallow.md | 12 ++++++++++++ english/universe-test/blaze_verse.md | 13 +++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 english/universe-test/blaze_verse.md diff --git a/english/marshmallow.md b/english/marshmallow.md index c91fa6c471..9d27ebabdd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -650,6 +650,18 @@ A quick brown fox jumps over the lazy dog! [Watch a recording of an awesome jazz concert](https://www.youtube.com/watch?v=VMb3PX9gq78) +whilst wandering through the vastness of this universe. + +[But what universe is this?](universe-test/blaze_verse.md) + +[This one?](https://www.youtube.com/watch?v=U5LVb3UtD3Q) + +Or... + +[Is it this one?](https://www.youtube.com/watch?v=tbSo7VmU7xo) + +Either way we are cool, right? + This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. You decide that you do not want to visit the miracle man. [You check your diff --git a/english/universe-test/blaze_verse.md b/english/universe-test/blaze_verse.md new file mode 100644 index 0000000000..6ccc8508a0 --- /dev/null +++ b/english/universe-test/blaze_verse.md @@ -0,0 +1,13 @@ +[I hope you aren't using a poorly built crawler on this](https://www.youtube.com/watch?v=VMb3PX9gq78) + +wandering through the vastness of this universe. + +But what universe is this? + +[This one?](https://www.youtube.com/watch?v=U5LVb3UtD3Q) + +Or... + +[Is it this one?](https://www.youtube.com/watch?v=tbSo7VmU7xo) + +Either way we are cool, [right?] (./marshmallow.md) \ No newline at end of file From c88bb4abc4a4d57327ca230d25432bdf1d84a6dd Mon Sep 17 00:00:00 2001 From: Jhonny Blaze Date: Wed, 24 Feb 2016 16:31:52 -0600 Subject: [PATCH 2665/5486] Fixed it? --- english/marshmallow.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 9d27ebabdd..5e172cafd0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -654,12 +654,6 @@ whilst wandering through the vastness of this universe. [But what universe is this?](universe-test/blaze_verse.md) -[This one?](https://www.youtube.com/watch?v=U5LVb3UtD3Q) - -Or... - -[Is it this one?](https://www.youtube.com/watch?v=tbSo7VmU7xo) - Either way we are cool, right? This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. From 3142a516f2dee3e76f41d9e692933ef7f9d6e063 Mon Sep 17 00:00:00 2001 From: Jhonny Blaze Date: Wed, 24 Feb 2016 16:43:46 -0600 Subject: [PATCH 2666/5486] Fixed broken link. --- english/universe-test/blaze_verse.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/english/universe-test/blaze_verse.md b/english/universe-test/blaze_verse.md index 6ccc8508a0..b351250617 100644 --- a/english/universe-test/blaze_verse.md +++ b/english/universe-test/blaze_verse.md @@ -1,6 +1,4 @@ -[I hope you aren't using a poorly built crawler on this](https://www.youtube.com/watch?v=VMb3PX9gq78) - -wandering through the vastness of this universe. +Whilst wandering through the vastness of this universe. But what universe is this? @@ -10,4 +8,4 @@ Or... [Is it this one?](https://www.youtube.com/watch?v=tbSo7VmU7xo) -Either way we are cool, [right?] (./marshmallow.md) \ No newline at end of file +Either way we are cool, [right?] (../marshmallow.md) \ No newline at end of file From 19ac877a92ca41ceaed7e8e761c9e8d0e9d9df35 Mon Sep 17 00:00:00 2001 From: shashank bijwe Date: Thu, 25 Feb 2016 11:52:49 +0900 Subject: [PATCH 2667/5486] Hi ahe mazi story --- Marathi/mi_marathi/mi_marathi.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Marathi/mi_marathi/mi_marathi.md diff --git a/Marathi/mi_marathi/mi_marathi.md b/Marathi/mi_marathi/mi_marathi.md new file mode 100644 index 0000000000..dfcf72b00e --- /dev/null +++ b/Marathi/mi_marathi/mi_marathi.md @@ -0,0 +1,3 @@ +Mala khup anand zala marathi folder baghun. +Dhyanawad mitra +Marathi news wachanyasathi [ethe](http://mimarathi.in/) kara. \ No newline at end of file From a04e532970060fc312439482f2d430297fc111e3 Mon Sep 17 00:00:00 2001 From: shashank bijwe Date: Thu, 25 Feb 2016 12:07:35 +0900 Subject: [PATCH 2668/5486] mazi story added --- Marathi/marathi.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Marathi/marathi.md b/Marathi/marathi.md index c1866be947..bd8977f6a2 100644 --- a/Marathi/marathi.md +++ b/Marathi/marathi.md @@ -2,4 +2,6 @@ चार प्राइवेट ड्राइव पत्त्यावर राहणार्‍या श्री. आणि सौ. डर्सलीना आपण सामान्य असल्याचा अतिशय अभिमान होता. गणपती उत्सवात आपले हार्दिक स्वागत. मराठी विश्व खुप सुंदर आहे. -मी मराठी असल्याचा मला अभिमान आहे. \ No newline at end of file +मी मराठी असल्याचा मला अभिमान आहे. + +mazi story [ethe](mi_marathi/mi_marathi.md)ahe. \ No newline at end of file From 91d4ffa4ee1806903febe2af732960c05bf142fe Mon Sep 17 00:00:00 2001 From: David Penny Date: Thu, 25 Feb 2016 11:35:59 -0500 Subject: [PATCH 2669/5486] added dream line to beer-brewer --- english/beer-brewer/beer-brewer.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/beer-brewer/beer-brewer.md b/english/beer-brewer/beer-brewer.md index 9bd8c329e1..a3c3c1e01c 100644 --- a/english/beer-brewer/beer-brewer.md +++ b/english/beer-brewer/beer-brewer.md @@ -2,6 +2,8 @@ You decide that brewing beer might be a good idea. You go to a beer brewing store and realise that you have no idea what you're doing. +You dream of beer, and start to research beer on the internet, but it's still confusing. + What should you do? Decide that its better to just give up and drink some [Beer](https://www.youtube.com/watch?v=yzcEG_JoVuo)." From 34ebdef41e742ed38275b55bb12cdee5983d8343 Mon Sep 17 00:00:00 2001 From: douglajl Date: Thu, 25 Feb 2016 11:38:23 -0500 Subject: [PATCH 2670/5486] added a link back to marshmallow form the ladder page --- english/can-i-get-you-a-ladder/can-i-get-you-a-ladder.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/can-i-get-you-a-ladder/can-i-get-you-a-ladder.md b/english/can-i-get-you-a-ladder/can-i-get-you-a-ladder.md index 6dae9c0911..ff9f6d7fe0 100644 --- a/english/can-i-get-you-a-ladder/can-i-get-you-a-ladder.md +++ b/english/can-i-get-you-a-ladder/can-i-get-you-a-ladder.md @@ -3,4 +3,7 @@ How ungrateful. Oh, well. You know, the one good thing about unbreakable marshmallow prisons is how they bring people together. In peace, vigilance; in war, victory; in death, sacrifice! -Horns up, and back to the marshmallow room. \ No newline at end of file +Horns up, and back to the marshmallow room. + + +Click [here](english/marshmallow.md) to go back to the marshmallow room!. \ No newline at end of file From 9810a7d7b26a9113354f897a42fc92cd06623cc3 Mon Sep 17 00:00:00 2001 From: douglajl Date: Thu, 25 Feb 2016 13:13:12 -0500 Subject: [PATCH 2671/5486] used ".." to get to relative parent path --- english/can-i-get-you-a-ladder/can-i-get-you-a-ladder.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/can-i-get-you-a-ladder/can-i-get-you-a-ladder.md b/english/can-i-get-you-a-ladder/can-i-get-you-a-ladder.md index ff9f6d7fe0..2cd5955a46 100644 --- a/english/can-i-get-you-a-ladder/can-i-get-you-a-ladder.md +++ b/english/can-i-get-you-a-ladder/can-i-get-you-a-ladder.md @@ -6,4 +6,4 @@ In peace, vigilance; in war, victory; in death, sacrifice! Horns up, and back to the marshmallow room. -Click [here](english/marshmallow.md) to go back to the marshmallow room!. \ No newline at end of file +Click [here](../marshmallow.md) to go back to the marshmallow room!. \ No newline at end of file From 2328eba1ac62f45b14332b541b32059665e5064b Mon Sep 17 00:00:00 2001 From: Sithi Vaseela Yasser Date: Fri, 26 Feb 2016 00:20:57 +0530 Subject: [PATCH 2672/5486] Committing my changes - Sithi --- english/liquid/liquid.md | 4 +++- english/vaporization/vaporization | 6 ++++++ english/vaporization/vaporization.md | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 english/vaporization/vaporization create mode 100644 english/vaporization/vaporization.md diff --git a/english/liquid/liquid.md b/english/liquid/liquid.md index 4013c3025d..5f5df28f53 100644 --- a/english/liquid/liquid.md +++ b/english/liquid/liquid.md @@ -1,3 +1,5 @@ You can check him out on [Twitch](http://www.twitch.tv/liquidneo) -Or not. +Or not + +TO know about vaporization go to [vaporization](../vaporization/vaporization.md) diff --git a/english/vaporization/vaporization b/english/vaporization/vaporization new file mode 100644 index 0000000000..3a69c6d3ac --- /dev/null +++ b/english/vaporization/vaporization @@ -0,0 +1,6 @@ +Vaporization is a phase transition from the liquid phase to vapor. + +There are two types of vaporization + +(i) Evaporation +(ii) Boiling diff --git a/english/vaporization/vaporization.md b/english/vaporization/vaporization.md new file mode 100644 index 0000000000..3a69c6d3ac --- /dev/null +++ b/english/vaporization/vaporization.md @@ -0,0 +1,6 @@ +Vaporization is a phase transition from the liquid phase to vapor. + +There are two types of vaporization + +(i) Evaporation +(ii) Boiling From 3a085114a48f91c8843352676eea566ec29dda05 Mon Sep 17 00:00:00 2001 From: Patel Date: Thu, 25 Feb 2016 15:04:31 -0600 Subject: [PATCH 2673/5486] changed animal story. --- english/animal/animal.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/animal/animal.md b/english/animal/animal.md index 5d02cde056..63ebe7ec59 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -19,4 +19,6 @@ You know what I mean? Don't eat animals #GoVegan -Don't be cruel. \ No newline at end of file +Don't be cruel. + +one more animal. \ No newline at end of file From 92fe07c42e1ac723ce4aaa1a974986ef50d8f9f3 Mon Sep 17 00:00:00 2001 From: Joanna Lowndes Date: Fri, 26 Feb 2016 19:01:14 +0000 Subject: [PATCH 2674/5486] Add option to meditate --- english/ask-to-alice/ask-to-alice.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/ask-to-alice/ask-to-alice.md b/english/ask-to-alice/ask-to-alice.md index fc63c65fe0..a212cdff0b 100644 --- a/english/ask-to-alice/ask-to-alice.md +++ b/english/ask-to-alice/ask-to-alice.md @@ -16,3 +16,5 @@ Just click on the link. [The one that your mother gave you that doesn't do anything](./ask-to-alice.md) [The one with a transparent glowing scarab within it](../scarab/goddess.md) + +[The one that makes you chill out](../sleep/sit-down-to-meditate/sit-down-to-meditate.md) From cfa83a73e99c02ccd08f38e5998cc9363d9e2e99 Mon Sep 17 00:00:00 2001 From: Matthew Nerger Date: Fri, 26 Feb 2016 15:39:58 -0600 Subject: [PATCH 2675/5486] Add reflection on your Fiat 500 --- english/marshmallow.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5e172cafd0..d5bd12fccb 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -103,6 +103,17 @@ The type of extreme mortal danger that so often accompanies confectionary inspir Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. +The man is not large but not small, but not average either. He is reciting poetry in a language you assume to be Egyptian, +though you are not familiar with Egyptian. You only assume this because of the small pictograms that seem to rise into the +air above his head when he speaks. One looks like a small bird. Another a small insect. A third is for all appearances the +third car your father ever bought you, a small Fiat 500, which though in the picture above the man's head is purple, was +in reality more of a mauve. It had a tendency to bark whenever you drove it over hills, not like the proud great dane from +Nova Scotia that most smaller cars tend to imitate when taking on tasks greater than their strengths, but rather more like +the small pomerainian who is now barking at the blue music notes hovering over the man's large-ish head, now peeing on the +back of the sofa, making it difficult for you to remember the name of that dude you totally scored with in the back of your +Fiat 500. You're finding it difficult to think. You sit down on the sofa to gather your thoughts. You think of all the men +you slept with on your hitch hiking journeys across the southern american continent. + [Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) You recall what a man said to you once: "Live as one of them, Kal-El, to discover From 65c15ac61ff615b2cb6a63f8f1344982ccff2d0b Mon Sep 17 00:00:00 2001 From: Konrad-pl Date: Fri, 26 Feb 2016 20:34:11 -0500 Subject: [PATCH 2676/5486] add three new lines and a link to an existing page --- english/code/code.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/code/code.md b/english/code/code.md index f42e28e440..ffa5c4ec8f 100644 --- a/english/code/code.md +++ b/english/code/code.md @@ -11,3 +11,9 @@ and randomness. Then I decided to change the transparency of the marshmallows to 50%. + +This also worked! + +You then decide to change the transparency program to slowly alternate between 100% and 25%. + +Some time passes and an opportunity arises to [follow your destiny.](../destiny/destiny.md) From e14d451ffff181f21157ab1d87f0c01e4de53b19 Mon Sep 17 00:00:00 2001 From: Konrad-pl Date: Fri, 26 Feb 2016 20:35:05 -0500 Subject: [PATCH 2677/5486] add new line with a link to a new page --- english/cricket/cricket.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/cricket/cricket.md b/english/cricket/cricket.md index e0e24a4d04..e141693071 100644 --- a/english/cricket/cricket.md +++ b/english/cricket/cricket.md @@ -1 +1,3 @@ Click [here](http://www.espncricinfo.com) to catch up on cricket news and view live scores. + +You look around and find the cricket bat-and-ball game equipment and rule book. Click [here](../cricket-game/cricket-game.md) to read the rules. From 0d2e2f747f83a31503696612d545c5af68e5b09c Mon Sep 17 00:00:00 2001 From: Konrad-pl Date: Fri, 26 Feb 2016 20:37:09 -0500 Subject: [PATCH 2678/5486] add new folder and page with two lines of text --- english/cricket-rules/cricket-rule-book.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/cricket-rules/cricket-rule-book.md diff --git a/english/cricket-rules/cricket-rule-book.md b/english/cricket-rules/cricket-rule-book.md new file mode 100644 index 0000000000..f58b2d6fce --- /dev/null +++ b/english/cricket-rules/cricket-rule-book.md @@ -0,0 +1,3 @@ +Rules and game-play + +Cricket is a bat and ball game, played between two teams of eleven players each. One team bats, attempting to score runs, while the other bowls and fields the ball, attempting to restrict the scoring and dismiss the batsmen. The objective of the game is for a team to score more runs than its opponent. In some forms of cricket, it may also be necessary to dismiss the opposition in order to win the match, which would otherwise be drawn. From 2401bb3869563b5c6a423e487552044a2371a7de Mon Sep 17 00:00:00 2001 From: Konrad-pl Date: Fri, 26 Feb 2016 20:39:47 -0500 Subject: [PATCH 2679/5486] add two new lines and two new links to existing pages. --- english/bored/bored.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/bored/bored.md b/english/bored/bored.md index f52bd87e48..b272dee45a 100644 --- a/english/bored/bored.md +++ b/english/bored/bored.md @@ -3,3 +3,7 @@ "Imma go to [sleep](../dream/dream.md)." "Or should I just go over [there](../forest/forest.md)?" + +"Or decide it's [STORY TIME](../avatar/air.md)?" + +"Or should I go on an [ADVENTURE!](../eat-rainbows/rainbows.md)?" From 92fb6a38c5edfd3384768a2c48681df278d7c983 Mon Sep 17 00:00:00 2001 From: tomwyr Date: Sat, 27 Feb 2016 09:36:20 +0100 Subject: [PATCH 2680/5486] Add story paths to broccoli soup --- Polish/ubranie/macasz/zupa/karmisz/karmisz.md | 1 + Polish/ubranie/macasz/zupa/moczysz/moczysz.md | 1 + Polish/ubranie/macasz/zupa/zupa.md | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 Polish/ubranie/macasz/zupa/karmisz/karmisz.md create mode 100644 Polish/ubranie/macasz/zupa/moczysz/moczysz.md diff --git a/Polish/ubranie/macasz/zupa/karmisz/karmisz.md b/Polish/ubranie/macasz/zupa/karmisz/karmisz.md new file mode 100644 index 0000000000..838c974250 --- /dev/null +++ b/Polish/ubranie/macasz/zupa/karmisz/karmisz.md @@ -0,0 +1 @@ +Skunks, początkowo podejrzliwy i nieufny, podchodzi zwabiony cypryjskim przysmakiem i bierze do pyska pierwszy brokuł. diff --git a/Polish/ubranie/macasz/zupa/moczysz/moczysz.md b/Polish/ubranie/macasz/zupa/moczysz/moczysz.md new file mode 100644 index 0000000000..6ac16bf821 --- /dev/null +++ b/Polish/ubranie/macasz/zupa/moczysz/moczysz.md @@ -0,0 +1 @@ +Po kąpieli w talerzu kumpla zupa nabiera zielonkawego koloru, a futro skunksa jest teraz wyraźnie czystsze. diff --git a/Polish/ubranie/macasz/zupa/zupa.md b/Polish/ubranie/macasz/zupa/zupa.md index 22501dd182..b4c3c6fad0 100644 --- a/Polish/ubranie/macasz/zupa/zupa.md +++ b/Polish/ubranie/macasz/zupa/zupa.md @@ -1,2 +1,7 @@ Otwierasz kieszeń. Tak to brokuły. Nagle przenosisz się do przedszkolnej stołówki, a przed tobą stoi talerz pełen pożywnej zupy brokułowej bez soli. +Twoją uwagę zwraca stojący obok stolika, stary i mokry skunks, który wpatruje się w talerz z obiadem. + +[Karmisz](karmisz/karmisz.md) go zupą w nadziei, że uwolni cię od brokułowego koszmaru. + +[Moczysz](moczysz/moczysz.md) skunksa w zupie kumpla, który właśnie wyszedł do toalety. From 547d4a86103d93f05a2a35cc4e5ae5e7a5b9494d Mon Sep 17 00:00:00 2001 From: tomwyr Date: Sat, 27 Feb 2016 11:30:44 +0100 Subject: [PATCH 2681/5486] Add another type of pill --- english/ask-to-alice/ask-to-alice.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/ask-to-alice/ask-to-alice.md b/english/ask-to-alice/ask-to-alice.md index fc63c65fe0..1ba8c1a14b 100644 --- a/english/ask-to-alice/ask-to-alice.md +++ b/english/ask-to-alice/ask-to-alice.md @@ -16,3 +16,5 @@ Just click on the link. [The one that your mother gave you that doesn't do anything](./ask-to-alice.md) [The one with a transparent glowing scarab within it](../scarab/goddess.md) + +[The one that lets you speak Nintendo](../../japanese/beer/beer.md) From 164ae547551571850a08958bec50b69f397c5719 Mon Sep 17 00:00:00 2001 From: Sithi Vaseela Yasser Date: Sat, 27 Feb 2016 16:48:37 +0530 Subject: [PATCH 2682/5486] undoing the removal of fullstop --- english/liquid/liquid.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/liquid/liquid.md b/english/liquid/liquid.md index 5f5df28f53..2753ea71ee 100644 --- a/english/liquid/liquid.md +++ b/english/liquid/liquid.md @@ -1,5 +1,5 @@ You can check him out on [Twitch](http://www.twitch.tv/liquidneo) -Or not +Or not. TO know about vaporization go to [vaporization](../vaporization/vaporization.md) From 154b5e0532538ac147c905a0ab85d8614b65efc3 Mon Sep 17 00:00:00 2001 From: Sithi Vaseela Yasser Date: Sat, 27 Feb 2016 16:54:03 +0530 Subject: [PATCH 2683/5486] Renaming the file --- english/vaporization/vaporization | 6 ------ english/vaporization/vaporization.md | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 english/vaporization/vaporization diff --git a/english/vaporization/vaporization b/english/vaporization/vaporization deleted file mode 100644 index 3a69c6d3ac..0000000000 --- a/english/vaporization/vaporization +++ /dev/null @@ -1,6 +0,0 @@ -Vaporization is a phase transition from the liquid phase to vapor. - -There are two types of vaporization - -(i) Evaporation -(ii) Boiling diff --git a/english/vaporization/vaporization.md b/english/vaporization/vaporization.md index 3a69c6d3ac..4174d5813a 100644 --- a/english/vaporization/vaporization.md +++ b/english/vaporization/vaporization.md @@ -1,4 +1,4 @@ -Vaporization is a phase transition from the liquid phase to vapor. +Vaporization is transition from the liquid phase to vapor phase. There are two types of vaporization From 9fe7a6a9c12435c3968631e656e03744123b7ea2 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Sat, 27 Feb 2016 17:27:41 +0530 Subject: [PATCH 2684/5486] Adding Shraddha to hindi directory. --- hindi/shraddha/shraddha.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 hindi/shraddha/shraddha.md diff --git a/hindi/shraddha/shraddha.md b/hindi/shraddha/shraddha.md new file mode 100644 index 0000000000..8ef5d973f2 --- /dev/null +++ b/hindi/shraddha/shraddha.md @@ -0,0 +1,3 @@ +Shraddha Kapoor (born 3 March 1989) is an Indian film actress and singer who works in Bollywood films. +(https://en.wikipedia.org/wiki/Shraddha_Kapoor) +Kapoor made her acting debut in the 2010 drama Teen Patti alongside Amitabh Bachchan, Ben Kingsley and R. Madhavan. \ No newline at end of file From 8b1953565a2675e7041979d6f1ef5dbeead33465 Mon Sep 17 00:00:00 2001 From: olga kosha Date: Sat, 27 Feb 2016 15:17:16 +0200 Subject: [PATCH 2685/5486] Add my story to russian branch --- russian/dream/dream.md | 2 ++ russian/zefir.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 russian/dream/dream.md diff --git a/russian/dream/dream.md b/russian/dream/dream.md new file mode 100644 index 0000000000..07e5303e0d --- /dev/null +++ b/russian/dream/dream.md @@ -0,0 +1,2 @@ +...А во сне увижу, как просыпаюсь в комнате со стенами из зефира. +Зеваю, откусываю кусок и снова засыпаю... \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index ce660274b6..f85e335985 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -69,3 +69,5 @@ [Поговорю с соседями](speak_to_neighbor/speak_to_neighbor.md) [Внезапно безумно начну просить сломать меня] (break-me-completelly/break-me.md) + +[Зевну, откушу кусок зефира и снова усну...](dream/dream.md) From b106d5c52b476e4d8c369a7bbb2ff263ee04fc51 Mon Sep 17 00:00:00 2001 From: tiagonj Date: Sat, 27 Feb 2016 18:19:04 +0000 Subject: [PATCH 2686/5486] Add new alternative to portuguese (PT) story --- portugues_pt/chaleira/arroz/arroz.md | 5 +++++ portugues_pt/chaleira/cha/cha.md | 11 +++++++++++ portugues_pt/chaleira/chaleira.md | 7 +++++++ portugues_pt/chaleira/saco/cama/cama.md | 1 + portugues_pt/chaleira/saco/saco.md | 3 +++ portugues_pt/colaborar.md | 5 +++++ 6 files changed, 32 insertions(+) create mode 100644 portugues_pt/chaleira/arroz/arroz.md create mode 100644 portugues_pt/chaleira/cha/cha.md create mode 100644 portugues_pt/chaleira/chaleira.md create mode 100644 portugues_pt/chaleira/saco/cama/cama.md create mode 100644 portugues_pt/chaleira/saco/saco.md diff --git a/portugues_pt/chaleira/arroz/arroz.md b/portugues_pt/chaleira/arroz/arroz.md new file mode 100644 index 0000000000..7d3b1b327d --- /dev/null +++ b/portugues_pt/chaleira/arroz/arroz.md @@ -0,0 +1,5 @@ +Vai ao armário e apercebe-se de que não tem arroz, mas tem massas de várias qualidades. + +Decide cozinhar massas. + +Não lhe apetece massas, portanto vai à mercearia mais próxima comprar arroz. diff --git a/portugues_pt/chaleira/cha/cha.md b/portugues_pt/chaleira/cha/cha.md new file mode 100644 index 0000000000..2a4f4e991f --- /dev/null +++ b/portugues_pt/chaleira/cha/cha.md @@ -0,0 +1,11 @@ +No seu armário encontra três variedades de chá. + +Apetece-lhe um chá verde para ajudar a despertar. + +Decide escolher camomila porque quer relaxar. + +Agrada-lhe a ideia de beber um chá de menta. + +Não lhe apetece nenhuma das variedades, logo sai de casa para ir comprar uma outra variedade de chá. + +Não lhe apetece nenhuma das variedades, portanto decide abandonar a ideia de fazer chá. diff --git a/portugues_pt/chaleira/chaleira.md b/portugues_pt/chaleira/chaleira.md new file mode 100644 index 0000000000..0e52e9df2f --- /dev/null +++ b/portugues_pt/chaleira/chaleira.md @@ -0,0 +1,7 @@ +Não se recorda para que queria água fervida. + +Pretendia fazer um [chá](cha/cha.md). + +Queria encher um [saco de água quente](saco/saco.md) depois de deixar arrefecer um pouco ou misturar com água fria. + +Queria usar a água para cozinhar [arroz](arroz/arroz.md). diff --git a/portugues_pt/chaleira/saco/cama/cama.md b/portugues_pt/chaleira/saco/cama/cama.md new file mode 100644 index 0000000000..77c4ecb7fe --- /dev/null +++ b/portugues_pt/chaleira/saco/cama/cama.md @@ -0,0 +1 @@ +O sono não demora a pegar, agora que tem os pés aquecidos. Os sonhs também não tardam... diff --git a/portugues_pt/chaleira/saco/saco.md b/portugues_pt/chaleira/saco/saco.md new file mode 100644 index 0000000000..bac1278b0f --- /dev/null +++ b/portugues_pt/chaleira/saco/saco.md @@ -0,0 +1,3 @@ +O que lhe apetece é voltar para a cama, agora com os pés mais aquecidos, e contiunar a sonhar com ganhar o Euromilhões. + +Após encher saco de água quente dirige-se imediatamente para a [cama](cama/cama.md). \ No newline at end of file diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index b3a488d5ad..30bf5f1d01 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -19,3 +19,8 @@ Revolucionava o sistema de [ensino](ensino/alternativo.md) Usava um repositorio privado. Ia ao Japão driftar em Tsukuba. + + +Depois de muito sonhar apercebe-de de que (ainda) nâo ganhou o Euromilhões. + +Lembra-se que deixou a [chaleira a ferver água](chaleira/chaleira.md). From e9e36f9c0132894e3667891f4eed62681e9cec57 Mon Sep 17 00:00:00 2001 From: Jon Osgood Date: Sat, 27 Feb 2016 13:41:03 -0800 Subject: [PATCH 2687/5486] Add dessert island story --- english/wake-up/dessert-island/explore-island.md | 15 +++++++++++++++ english/wake-up/wake-up.md | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 english/wake-up/dessert-island/explore-island.md diff --git a/english/wake-up/dessert-island/explore-island.md b/english/wake-up/dessert-island/explore-island.md new file mode 100644 index 0000000000..3ba718bad6 --- /dev/null +++ b/english/wake-up/dessert-island/explore-island.md @@ -0,0 +1,15 @@ +You decide that this is a lovely dream, so you decide to eat a marshmallow from +the campfire and explore the imaginary island. + +As you start walking around, you realize that the ground is actually made of +marshmallows. The palm trees are made of licorice. The ocean tastes like 7-up. +Everything is made of candy and sugary sweet desserts! + +You're not sure, but the moon might be cheese. + +You walk the along the beach until you come back to the campfire. The island is +smaller than you thought. You decide to climb the chocolate lave cake mountain +in the middle of the island to get a better view. + +At the peak, you find out it's not an island at all! It's actually a sleeping +giant made of marshmallows. Is this the marshmallow chief? diff --git a/english/wake-up/wake-up.md b/english/wake-up/wake-up.md index ef1293c45e..af774f7da1 100644 --- a/english/wake-up/wake-up.md +++ b/english/wake-up/wake-up.md @@ -16,4 +16,6 @@ from? Since you cannot remember any of these things then it begins to dawn on you that you really are still having a dream. -....... [Not quite.](wake-up-again/wake-up-again.md) \ No newline at end of file +....... [Not quite.](wake-up-again/wake-up-again.md) + +[Stay in the dream and explore the island](dessert-island/explore-island.md) From 41bd2612758827467ff73f4c008b9d59fa3f6e2b Mon Sep 17 00:00:00 2001 From: Jon Osgood Date: Sat, 27 Feb 2016 13:44:20 -0800 Subject: [PATCH 2688/5486] Fix some grammar mistakes --- english/wake-up/dessert-island/explore-island.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/wake-up/dessert-island/explore-island.md b/english/wake-up/dessert-island/explore-island.md index 3ba718bad6..5500be741f 100644 --- a/english/wake-up/dessert-island/explore-island.md +++ b/english/wake-up/dessert-island/explore-island.md @@ -2,12 +2,12 @@ You decide that this is a lovely dream, so you decide to eat a marshmallow from the campfire and explore the imaginary island. As you start walking around, you realize that the ground is actually made of -marshmallows. The palm trees are made of licorice. The ocean tastes like 7-up. +marshmallows! The palm trees are made of licorice. The ocean tastes like 7-up. Everything is made of candy and sugary sweet desserts! You're not sure, but the moon might be cheese. -You walk the along the beach until you come back to the campfire. The island is +You walk along the beach until you come back to the campfire. The island is smaller than you thought. You decide to climb the chocolate lave cake mountain in the middle of the island to get a better view. From 50f3d8332384e42c726435fb0bb23555485b64fe Mon Sep 17 00:00:00 2001 From: roscopcoletrane Date: Sat, 27 Feb 2016 17:40:44 -0500 Subject: [PATCH 2689/5486] Add more content to white-star ending --- english/experience/white-star/white-star.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/experience/white-star/white-star.md b/english/experience/white-star/white-star.md index 51a679298e..3f755a691a 100644 --- a/english/experience/white-star/white-star.md +++ b/english/experience/white-star/white-star.md @@ -1 +1,2 @@ -you know you are one with the marshmallow \ No newline at end of file +you know you are one with the marshmallow +and you are comforted by the realization that you always were From d796c6cdb691db2ad0e095ac1f9261eb2b1e4f48 Mon Sep 17 00:00:00 2001 From: Julian Betancourt Date: Sun, 28 Feb 2016 00:41:27 -0500 Subject: [PATCH 2690/5486] Add CJ story --- english/Carl/carl-johnson.md | 2 ++ english/marshmallow.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/Carl/carl-johnson.md diff --git a/english/Carl/carl-johnson.md b/english/Carl/carl-johnson.md new file mode 100644 index 0000000000..52e67971c9 --- /dev/null +++ b/english/Carl/carl-johnson.md @@ -0,0 +1,2 @@ +Did CJ died ? It's a mistery just Rockstar will be able to answer. But... +Do they even know it ? I bet he's somewhere in San Fierro working in tech. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 5e172cafd0..9ab353e737 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -843,3 +843,5 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [Read my story](magic2/magic2.md) +[..and recall that Carl Johnson might be alive](carl/carl-johnson.md) + From 74959e845d165e2966cd622d4cd24ee19c2c6c15 Mon Sep 17 00:00:00 2001 From: Julian Betancourt Date: Sun, 28 Feb 2016 00:51:28 -0500 Subject: [PATCH 2691/5486] Fix relative link to CJ story --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 9ab353e737..80890b21ff 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -843,5 +843,5 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [Read my story](magic2/magic2.md) -[..and recall that Carl Johnson might be alive](carl/carl-johnson.md) +[..and recall that Carl Johnson might be alive](Carl/carl-johnson.md) From 5ea3803112c3772faa46e3dc7e7d13bae0bf3b79 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 28 Feb 2016 16:24:32 +0900 Subject: [PATCH 2692/5486] Add filibuster in Korean directory --- korean/filibuster/filibuster.md | 1 + korean/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 korean/filibuster/filibuster.md diff --git a/korean/filibuster/filibuster.md b/korean/filibuster/filibuster.md new file mode 100644 index 0000000000..9cc4ddbab1 --- /dev/null +++ b/korean/filibuster/filibuster.md @@ -0,0 +1 @@ +필리버스터 중인 국회의원을 응원하다가, 배가 고파 [마시멜로를 먹으러 돌아간다.](../eating-walls/eating-marshmallows.md) \ No newline at end of file diff --git a/korean/marshmallow.md b/korean/marshmallow.md index 26d8522f51..6003f624f0 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -2,6 +2,8 @@ 어떻게 할까요? +[국회로 간다](filibuster/filibuster.md) + [벽을 먹는다](eating-walls/eating-marshmallows.md)? [불을 지핀다](light-fire/fire.md)? From 90296cfc9d937bdb7dc07bb71bf5e79ab6e8fb6f Mon Sep 17 00:00:00 2001 From: Solo4768 Date: Sun, 28 Feb 2016 12:06:13 -0600 Subject: [PATCH 2693/5486] Add drink-beer and breakfast to destiny.md --- english/destiny/destiny.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/destiny/destiny.md b/english/destiny/destiny.md index 1d0dd377f8..9396704b54 100644 --- a/english/destiny/destiny.md +++ b/english/destiny/destiny.md @@ -21,3 +21,9 @@ and I have [high hopes](../hope/hope.md) for you. and you might be someone [who knocks](../say-my-name/say-my-name.md). or perhaps you are someone [who opens](https://www.biblegateway.com/passage/?search=Revelation+3%3A20). + +If you have finished pursuing your destiny, it may be time for a +[cold one](../drink-beer/drink-beer.md). + +If you have only just begun to pursue your destiny, it's best not to +do so on an [empty stomach](../breakfast/breakfast.md). From a51dc4416ed99ded21bfae62613a95275a807614 Mon Sep 17 00:00:00 2001 From: Anton Frolenkov Date: Mon, 29 Feb 2016 00:00:40 +0500 Subject: [PATCH 2694/5486] Add link be-teacher in thinking.md --- russian/thinking-about/thinking.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/thinking-about/thinking.md b/russian/thinking-about/thinking.md index c80c256452..3df0857041 100644 --- a/russian/thinking-about/thinking.md +++ b/russian/thinking-about/thinking.md @@ -19,4 +19,5 @@ делать зарядку по утрам и обливаться холодной водой... -[Ты достал листочек и ручку из кармана и решил все это записать, чтобы не забыть.](pen-paper/pen-paper.md) \ No newline at end of file +[Ты достал листочек и ручку из кармана и решил все это записать, чтобы не забыть.](pen-paper/pen-paper.md) +[Взять кого-нибудь в ученики](be-teacher/be-teacher.md) \ No newline at end of file From b8bc063bab22b9a1e04e84118b56d818a755b211 Mon Sep 17 00:00:00 2001 From: Anton Frolenkov Date: Mon, 29 Feb 2016 00:05:47 +0500 Subject: [PATCH 2695/5486] Add be-teacher option --- russian/thinking-about/be-teacher/be-teacher.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 russian/thinking-about/be-teacher/be-teacher.md diff --git a/russian/thinking-about/be-teacher/be-teacher.md b/russian/thinking-about/be-teacher/be-teacher.md new file mode 100644 index 0000000000..8746887e53 --- /dev/null +++ b/russian/thinking-about/be-teacher/be-teacher.md @@ -0,0 +1,5 @@ +Вы: Дети, запишите предложение: «Рыба сидела на дереве». +Ученик: А разве рыбы сидят на деревьях? +Вы: Ну… Это была сумасшедшая рыба. + +[Продолжить размышлять](/russian/thinking-about/thinking-about.md) From 8d62ca7888f8e9182468bb56c6678c12b3a20997 Mon Sep 17 00:00:00 2001 From: Anton Frolenkov Date: Mon, 29 Feb 2016 00:14:51 +0500 Subject: [PATCH 2696/5486] Link: delete slash --- russian/thinking-about/be-teacher/be-teacher.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/thinking-about/be-teacher/be-teacher.md b/russian/thinking-about/be-teacher/be-teacher.md index 8746887e53..37b813b440 100644 --- a/russian/thinking-about/be-teacher/be-teacher.md +++ b/russian/thinking-about/be-teacher/be-teacher.md @@ -2,4 +2,4 @@ Ученик: А разве рыбы сидят на деревьях? Вы: Ну… Это была сумасшедшая рыба. -[Продолжить размышлять](/russian/thinking-about/thinking-about.md) +[Продолжить размышлять](russian/thinking-about/thinking-about.md) From 1b31abee4b05a895f4a0fc9426ad81fac34dbf28 Mon Sep 17 00:00:00 2001 From: Anton Frolenkov Date: Mon, 29 Feb 2016 00:20:15 +0500 Subject: [PATCH 2697/5486] Use .. in link path --- russian/thinking-about/be-teacher/be-teacher.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/thinking-about/be-teacher/be-teacher.md b/russian/thinking-about/be-teacher/be-teacher.md index 37b813b440..3fc10b7ed0 100644 --- a/russian/thinking-about/be-teacher/be-teacher.md +++ b/russian/thinking-about/be-teacher/be-teacher.md @@ -2,4 +2,4 @@ Ученик: А разве рыбы сидят на деревьях? Вы: Ну… Это была сумасшедшая рыба. -[Продолжить размышлять](russian/thinking-about/thinking-about.md) +[Продолжить размышлять](../thinking.md) From d1c45ad93dfb5be4cd9f445639d6cdc4d90205b9 Mon Sep 17 00:00:00 2001 From: Thomas Furlong Date: Mon, 29 Feb 2016 08:49:19 +0000 Subject: [PATCH 2698/5486] Add a story branch in which you learn the importance of sharing --- english/pick-up-blowtorch/stop-running/apologize.md | 4 ++++ .../pick-up-blowtorch/stop-running/eat-all/you-eat.md | 9 +++++++++ .../pick-up-blowtorch/stop-running/share-some/he-eats.md | 7 +++++++ 3 files changed, 20 insertions(+) create mode 100644 english/pick-up-blowtorch/stop-running/eat-all/you-eat.md create mode 100644 english/pick-up-blowtorch/stop-running/share-some/he-eats.md diff --git a/english/pick-up-blowtorch/stop-running/apologize.md b/english/pick-up-blowtorch/stop-running/apologize.md index 5cb8dffa81..f1b1670076 100644 --- a/english/pick-up-blowtorch/stop-running/apologize.md +++ b/english/pick-up-blowtorch/stop-running/apologize.md @@ -3,3 +3,7 @@ As you come to a stop, you declare: "My apologies, Mr. Stay Puft Marmallow Man. I don't know why I just did that." He stares at you for a moment, then asks if you are willing to share your chocolate. + +[Break off a piece and hand it over](share-some/he-eats.md) + +[Decide to eat it all yourself](eat-all/you-eat.md) \ No newline at end of file diff --git a/english/pick-up-blowtorch/stop-running/eat-all/you-eat.md b/english/pick-up-blowtorch/stop-running/eat-all/you-eat.md new file mode 100644 index 0000000000..da33b93c97 --- /dev/null +++ b/english/pick-up-blowtorch/stop-running/eat-all/you-eat.md @@ -0,0 +1,9 @@ +You look sullenly back at the Mr Stay Puft Marshmallow Man and then +petulantly shove the remaining chocolate into your mouth. + +He smiles and with horror you notice that your arms are beginning +to go white and are inflating like marshmallow. + +Your thoughts evaporate and all you can think is about soft +fluffy sugar and why the Marshmallow Man seemed to think it was +so funny. \ No newline at end of file diff --git a/english/pick-up-blowtorch/stop-running/share-some/he-eats.md b/english/pick-up-blowtorch/stop-running/share-some/he-eats.md new file mode 100644 index 0000000000..88be7fbe75 --- /dev/null +++ b/english/pick-up-blowtorch/stop-running/share-some/he-eats.md @@ -0,0 +1,7 @@ +You break off a piece of chocolate and hand it over to Mr. Stay Puft +Marshmallow Man. + +As it munches he slowly changes colour taking on the soft hue of +creamy browness. + +As he finishes eating it he passes out on the floor snooring. \ No newline at end of file From c0bd6b13a04e4f865209df41e23f1fe021a91a51 Mon Sep 17 00:00:00 2001 From: Kuman Date: Mon, 29 Feb 2016 11:02:20 +0100 Subject: [PATCH 2699/5486] Add ayudantes story --- espanol/ayudantes/ayudantes.md | 12 ++++++++++++ espanol/canudos.md | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 espanol/ayudantes/ayudantes.md diff --git a/espanol/ayudantes/ayudantes.md b/espanol/ayudantes/ayudantes.md new file mode 100644 index 0000000000..ecc792523f --- /dev/null +++ b/espanol/ayudantes/ayudantes.md @@ -0,0 +1,12 @@ +Les indico que prepararan todo para el recibimiento del ejercito tal como los habia instruido. + +Immediatamente despues se despidio de su amigo Beatito y se dirigio a la plaza del pueblo. + +Al llegar a la plaza ya empezaban a llegar los primeros soldados, estos tenian reflejada en sus caras +el horror de la batalla y el cansancio del viaje de vuelta, el consejero nervioso iba haciendo un +calculo mental de cuantos llegaban, habian marchado sus 1000 mejores hombres a la batalla pero cuando +se cerraron las puertas de la muralla y por tanto ya no queda nadie mas que llegar conto solamente +200 soldados, los costes de la guerra habian sido demasiados altos. + +Mientras veia como se habitantes del pueblo buscando a sus familiares penso en los pesames que tendria +que dar y noto como envejecia unos años. \ No newline at end of file diff --git a/espanol/canudos.md b/espanol/canudos.md index 5f52e06c91..8c714c940a 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -124,3 +124,5 @@ dijo el [curandero](curandero/curandero.md)... Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", se atrevio a lo que nadie se [imaginó:](Mutantes/Mutantes.md) + +[Hizo un breve movimiento para llamar a sus ayudantes y](ayudantes/ayudantes.md) \ No newline at end of file From a553e2486c2086150953d0e4246e5478e24f06b2 Mon Sep 17 00:00:00 2001 From: Anton Frolenkov Date: Mon, 29 Feb 2016 19:22:32 +0500 Subject: [PATCH 2700/5486] Add new lines between links and at the end --- russian/thinking-about/thinking.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/thinking-about/thinking.md b/russian/thinking-about/thinking.md index 3df0857041..f6ce7ed9a6 100644 --- a/russian/thinking-about/thinking.md +++ b/russian/thinking-about/thinking.md @@ -20,4 +20,5 @@ [Ты достал листочек и ручку из кармана и решил все это записать, чтобы не забыть.](pen-paper/pen-paper.md) -[Взять кого-нибудь в ученики](be-teacher/be-teacher.md) \ No newline at end of file + +[Взять кого-нибудь в ученики](be-teacher/be-teacher.md) From 5bb8dfd13340c1f596925c56a5b8a98f2ff3f4cc Mon Sep 17 00:00:00 2001 From: Andrei Pop Date: Mon, 29 Feb 2016 18:45:09 +0100 Subject: [PATCH 2701/5486] Aggiungo la mia storia --- Italian/caramelle.md | 4 +++- Italian/spuntini/spuntini.md | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Italian/spuntini/spuntini.md diff --git a/Italian/caramelle.md b/Italian/caramelle.md index e63f60dc2b..b1ecc952f2 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -13,4 +13,6 @@ Che fai? [Cerco aiuto ulrando c'è qualcuno?](aiuto/aiuto.md) -[Cerco qualcosa per fare colazione](colazione/colazione.md) \ No newline at end of file +[Cerco qualcosa per fare colazione](colazione/colazione.md) + +[Spuntini] (spuntini/spuntini.md) \ No newline at end of file diff --git a/Italian/spuntini/spuntini.md b/Italian/spuntini/spuntini.md new file mode 100644 index 0000000000..46ea7b6467 --- /dev/null +++ b/Italian/spuntini/spuntini.md @@ -0,0 +1,9 @@ +Vado alle macchinette +Non ho soldi sulla chiavetta +Torno a prendere soldi +Carico +Scelgo +Cade +Si ferma a meta' +Bestiemmio cordialmente +Torno alla postazione e scrivo questo \ No newline at end of file From ee3211f93b6d7733dcd1c4c6f37d15e45e887b9f Mon Sep 17 00:00:00 2001 From: Kiara Ottogalli Date: Mon, 29 Feb 2016 18:22:45 -0430 Subject: [PATCH 2702/5486] Add a new part of the story to a page and Juanito Nieves option --- espanol/torre/estrategia/estrategia.md | 4 ++++ espanol/torre/estrategia/juanito/juanito.md | 1 + 2 files changed, 5 insertions(+) create mode 100644 espanol/torre/estrategia/juanito/juanito.md diff --git a/espanol/torre/estrategia/estrategia.md b/espanol/torre/estrategia/estrategia.md index 71b975579a..69732bfa6b 100644 --- a/espanol/torre/estrategia/estrategia.md +++ b/espanol/torre/estrategia/estrategia.md @@ -4,3 +4,7 @@ estarian preparados para hacerles frente y proteger a su pueblo. Mientras que si los visitantes eran aliados, practicamente no notarian la presencia de este ejercito que ante todo se manejaba con sigilo y astucia. + +En ese momento el consejero mandó a Beatito, quien era su mano derecha a + +Llamar al general [Juanito Nieves](juanito/juanito.md) diff --git a/espanol/torre/estrategia/juanito/juanito.md b/espanol/torre/estrategia/juanito/juanito.md new file mode 100644 index 0000000000..e90a0cd50f --- /dev/null +++ b/espanol/torre/estrategia/juanito/juanito.md @@ -0,0 +1 @@ +Beatito salió como un rayo por la puerta en búsqueda del general Juanito Nieves. \ No newline at end of file From c68fbb643e79c9bda0f69fa750c1b06204958408 Mon Sep 17 00:00:00 2001 From: hmads Date: Tue, 1 Mar 2016 13:13:59 +0100 Subject: [PATCH 2703/5486] Update haervejen.md --- danish/haervejen/haervejen.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/danish/haervejen/haervejen.md b/danish/haervejen/haervejen.md index 7d6e3f2b3a..03c6b9c41f 100644 --- a/danish/haervejen/haervejen.md +++ b/danish/haervejen/haervejen.md @@ -1,4 +1,4 @@ -Du vandrer sydpå og fra bakkerne hører du lyden af [musik](https://www.youtube.com/watch?v=cUGd8X7bjuo). +Du vandrer sydpå og fra bakkerne hører du lyden af "Bob bob bob". Det er Benny, som vandrer rundt og snakker med sig selv. Men du vælger at ignorere det og prøver at finde et køretøj. Vælger du: @@ -10,4 +10,4 @@ Men du vælger at ignorere det og prøver at finde et køretøj. Vælger du: eller -[det ukendte eventyr(kun for de modige)](https://www.youtube.com/watch?v=MFzDaBzBlL0)? \ No newline at end of file +[det ukendte eventyr(kun for de modige)](https://www.youtube.com/watch?v=MFzDaBzBlL0)? From 8fef6c2fc2087bf91d88589c3bc5539a8d470b3c Mon Sep 17 00:00:00 2001 From: Leigh Ann Date: Tue, 1 Mar 2016 14:35:27 -0500 Subject: [PATCH 2704/5486] english: add a random line in the advice from mothers --- english/advice_from_mother/advice_from_mother.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/advice_from_mother/advice_from_mother.md b/english/advice_from_mother/advice_from_mother.md index f7582af07c..0d8f51e5e1 100644 --- a/english/advice_from_mother/advice_from_mother.md +++ b/english/advice_from_mother/advice_from_mother.md @@ -3,4 +3,6 @@ such as yourself should avoid LSD. Knowing now that this is all a bad trip, you use the bonfire to melt all the marshmallows, ignoring the giant pile of fluff in one corner, watching the swirl and glitter of the toasting surface until you can walk out of the corner and back -into the bar. \ No newline at end of file +into the bar. + +just a random test \ No newline at end of file From 539f908dfa40d7197203807c1562e134b2d43ca0 Mon Sep 17 00:00:00 2001 From: jasper-ballantyne Date: Wed, 2 Mar 2016 09:18:39 +1300 Subject: [PATCH 2705/5486] Continue Frozen song --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5e172cafd0..9788638db4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -827,6 +827,8 @@ But the cold never bothered me anyway. Let it go, let it gooo... +CANT HOLD IT BACK ANY MORE + Do you want to build a [snowman?] (snowman/snowman.md) I think I'll try defying gravity. From 1996a1b7912764ca1eb5184760c7984f8554c9db Mon Sep 17 00:00:00 2001 From: Alex Swiontek Date: Tue, 1 Mar 2016 22:09:28 -0800 Subject: [PATCH 2706/5486] Keeping it punny --- english/bear/bear.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/bear/bear.md b/english/bear/bear.md index 790e6452e7..72e35e5f2d 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -1,2 +1,3 @@ Stella atroir. Taiwan bear. +Ice cold. If warm, the results could be unbearable. From 76a481e76463eabc67e29471e727f75bfeb3bd6a Mon Sep 17 00:00:00 2001 From: cmschell Date: Wed, 2 Mar 2016 17:00:33 -0800 Subject: [PATCH 2707/5486] Commit love poem --- english/love/love.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/english/love/love.md b/english/love/love.md index 9f0c1d97fe..28a82d0c70 100644 --- a/english/love/love.md +++ b/english/love/love.md @@ -21,3 +21,27 @@ Love feels eternal but the pain it adds to your heart is painful [The Pain] (https://www.quora.com/What-is-it-like-when-you-feel-the-pain-of-loving-someone-when-its-one-sided) to see how people manage the pain + +An Entrapment + +My love, I have tried with all my being +to grasp a form comparable to thine own, +but nothing seems worthy; + +I know now why Shakespeare could not +compare his love to a summer’s day. +It would be a crime to denounce the beauty +of such a creature as thee, +to simply cast away the precision +God had placed in forging you. + +Each facet of your being +whether it physical or spiritual +is an ensnarement +from which there is no release. +But I do not wish release. +I wish to stay entrapped forever. +With you for all eternity. +Our hearts, always as one. + +- Anthony Kolos - From f4a2ec04f6a4ba0d47aeea343ff3b2362f8afcb3 Mon Sep 17 00:00:00 2001 From: Robert Giordano Date: Wed, 2 Mar 2016 20:24:43 -0500 Subject: [PATCH 2708/5486] Add onions to garden --- english/garden/choose.md | 2 ++ english/garden/onions/onions.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 english/garden/onions/onions.md diff --git a/english/garden/choose.md b/english/garden/choose.md index 6e2b7c34e3..847e71f476 100644 --- a/english/garden/choose.md +++ b/english/garden/choose.md @@ -9,3 +9,5 @@ You decide to choose: [Carrots](carrots/carrots.md) [Tomatoes](tomatoes/tomatoes.md) + +[Onions](onions/onions.md) \ No newline at end of file diff --git a/english/garden/onions/onions.md b/english/garden/onions/onions.md new file mode 100644 index 0000000000..ae6727a72d --- /dev/null +++ b/english/garden/onions/onions.md @@ -0,0 +1,5 @@ +If you're already crying and then cut an onion, will it make you feel better, or cry harder? + +Better to not find out. + +Go back to the [garden](../choose.md)... \ No newline at end of file From 1b7c295116c68c042e2ae7dc12b46d0606fdcfcd Mon Sep 17 00:00:00 2001 From: Robert Giordano Date: Wed, 2 Mar 2016 21:06:48 -0500 Subject: [PATCH 2709/5486] Add onions again with blank line at end of each file. --- english/garden/choose.md | 2 +- english/garden/onions/onions.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/english/garden/choose.md b/english/garden/choose.md index 847e71f476..fce5b16d2d 100644 --- a/english/garden/choose.md +++ b/english/garden/choose.md @@ -10,4 +10,4 @@ You decide to choose: [Tomatoes](tomatoes/tomatoes.md) -[Onions](onions/onions.md) \ No newline at end of file +[Onions](onions/onions.md) diff --git a/english/garden/onions/onions.md b/english/garden/onions/onions.md index ae6727a72d..cde99961c8 100644 --- a/english/garden/onions/onions.md +++ b/english/garden/onions/onions.md @@ -2,4 +2,4 @@ If you're already crying and then cut an onion, will it make you feel better, or Better to not find out. -Go back to the [garden](../choose.md)... \ No newline at end of file +Go back to the [garden](../choose.md)... From 1e9f386d6d26b06183036b0ba77c48232685a627 Mon Sep 17 00:00:00 2001 From: Gabriele Cimato Date: Wed, 2 Mar 2016 19:02:02 -0800 Subject: [PATCH 2710/5486] Fix typo. --- Italian/guardare/guarda.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Italian/guardare/guarda.md b/Italian/guardare/guarda.md index 86dc7e547f..4a9738f5cd 100644 --- a/Italian/guardare/guarda.md +++ b/Italian/guardare/guarda.md @@ -3,7 +3,7 @@ i funghi "speciali" che ho mangiato ieri in realtà erano allucinogeni. Non avresti dovuto fidarti di quella ragazza conosciuta alla festa. -Hai pochi, confusi ricordi di quello che è successo. Con la test che gira per l'intossicazione, provi ad alzarti. +Hai pochi, confusi ricordi di quello che è successo. Con la testa che gira per l'intossicazione, provi ad alzarti. Le gambe ti reggono a malapena e, in pochi difficili passi, riesci a raggiungere la libreria che sta di fronte al letto. Sugli scaffali trovi solo vecchi libri di leggende francesi e alcune fotografie sbiadite. From c041a5f6ccd9c19412a663bbe255eb434e74d422 Mon Sep 17 00:00:00 2001 From: ahmetfurkanustun Date: Thu, 3 Mar 2016 15:26:36 +0200 Subject: [PATCH 2711/5486] Edit iple-in.md --- turkce/catalla-kaz/metali-cek/iple-in/iple-in.md | 1 + 1 file changed, 1 insertion(+) diff --git a/turkce/catalla-kaz/metali-cek/iple-in/iple-in.md b/turkce/catalla-kaz/metali-cek/iple-in/iple-in.md index 3fb16c701f..88d2bdaf23 100644 --- a/turkce/catalla-kaz/metali-cek/iple-in/iple-in.md +++ b/turkce/catalla-kaz/metali-cek/iple-in/iple-in.md @@ -3,3 +3,4 @@ Meğerse ipin aşağıdaki kısmı yanmaya başlamış. İpin yanıp biteceğini görünce iki opsiyon aklına gelir: - ne beklediğini bilmeden karanlığa atlamak veya - hızla ipten tutunarak yukarı doğru hareket etmek. +- değişiklik. From 73fe57cc7654896162f0a57760358a088a9a1f6b Mon Sep 17 00:00:00 2001 From: rkr1017 Date: Thu, 3 Mar 2016 11:58:47 -0800 Subject: [PATCH 2712/5486] add line to big bird --- english/bird-salvation/bird.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/bird-salvation/bird.md b/english/bird-salvation/bird.md index b4566d9e2d..5e71b06cc1 100644 --- a/english/bird-salvation/bird.md +++ b/english/bird-salvation/bird.md @@ -1,10 +1,12 @@ All of a sudden, a bird swoops down, big as a bus, and snatches the marshmallow right off of you. + You are shocked... + Amazed, you sit in silence at the mythical animal you just witnessed ... as well as trying to catch your breath...and, in the distance, glimpse what appears to be a horse with a horn sprouting from its forehead... You really have only one option [Go ask Alice](../ask-to-alice/ask-to-alice.md) -I think she'll know ... \ No newline at end of file +I think she'll know ... From cc7bef39a63aa09e25ff41d4e429281ae9120606 Mon Sep 17 00:00:00 2001 From: "j.khakimyanova" Date: Thu, 3 Mar 2016 14:08:34 -0600 Subject: [PATCH 2713/5486] Add drinking wine option --- english/wine/wine.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/wine/wine.md diff --git a/english/wine/wine.md b/english/wine/wine.md new file mode 100644 index 0000000000..72f5ebfdc7 --- /dev/null +++ b/english/wine/wine.md @@ -0,0 +1 @@ +The glass of wine is the best thing that happened with you during this day. \ No newline at end of file From da8a0536b0c05050fe933f4733f8a29bca295c81 Mon Sep 17 00:00:00 2001 From: legglessbird Date: Fri, 4 Mar 2016 17:03:44 +0800 Subject: [PATCH 2714/5486] I like Thai Green Curry better! --- Thai/Cuisine/TomYumKung.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Thai/Cuisine/TomYumKung.md b/Thai/Cuisine/TomYumKung.md index ec2a709a2d..7beb8fe6c2 100644 --- a/Thai/Cuisine/TomYumKung.md +++ b/Thai/Cuisine/TomYumKung.md @@ -14,3 +14,5 @@ Do you: [sing a song while having Thai food](../../english/sing-song/sing.md) [ดูทีวี eat Thai food and watch TV](https://www.youtube.com) + +Actually I prefer Thai Green Curry better! From 4b58851d318a677275845ecfde5634bbb5933198 Mon Sep 17 00:00:00 2001 From: Ishan Loya Date: Fri, 4 Mar 2016 23:30:28 +0530 Subject: [PATCH 2715/5486] Add 'say something' option (Robot Chicken video link) --- english/blah-balh/blah-blah.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/blah-balh/blah-blah.md b/english/blah-balh/blah-blah.md index 32dfa1a514..dbab31af60 100644 --- a/english/blah-balh/blah-blah.md +++ b/english/blah-balh/blah-blah.md @@ -7,3 +7,5 @@ And sing if possible. Singing cheers people up. If no sing [go back](../marshmallow.md) [Sing](../singing/singing.md) + +[Say something, just talk](https://www.youtube.com/watch?v=XfWnITmT1Ws) From 32a3f929ea5d2873a273ae4216a79dba4a72ed2b Mon Sep 17 00:00:00 2001 From: sg Date: Fri, 4 Mar 2016 16:19:53 -0500 Subject: [PATCH 2716/5486] Added encounter with Froboznian police --- english/climbing/climbing.md | 7 +++++++ english/froboznia/froboznia.md | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 english/froboznia/froboznia.md diff --git a/english/climbing/climbing.md b/english/climbing/climbing.md index 5c90184f25..428184ebbf 100644 --- a/english/climbing/climbing.md +++ b/english/climbing/climbing.md @@ -1 +1,8 @@ You decide that the best way out of this situation is boudering... hardcore bouldering. + +There is a door at the top of the rock. + +Click [here](froboznia/froboznia.md) to open the door. + +Click [here](../marshmallow.md) to lower yourself back down into the pit of despair. + diff --git a/english/froboznia/froboznia.md b/english/froboznia/froboznia.md new file mode 100644 index 0000000000..756faf7112 --- /dev/null +++ b/english/froboznia/froboznia.md @@ -0,0 +1,3 @@ +You find yourself face to face with the Froboznian police. + +"Ouzna gotcha!" they bellow. From 89f700a77ee2864d9dc60879e3376b00ddbea296 Mon Sep 17 00:00:00 2001 From: sg Date: Fri, 4 Mar 2016 16:23:31 -0500 Subject: [PATCH 2717/5486] Fixed broken link --- english/climbing/climbing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/climbing/climbing.md b/english/climbing/climbing.md index 428184ebbf..2e86a245c4 100644 --- a/english/climbing/climbing.md +++ b/english/climbing/climbing.md @@ -2,7 +2,7 @@ You decide that the best way out of this situation is boudering... hardcore boul There is a door at the top of the rock. -Click [here](froboznia/froboznia.md) to open the door. +Click [here](../froboznia/froboznia.md) to open the door. Click [here](../marshmallow.md) to lower yourself back down into the pit of despair. From b6e3dd336c8da76f8d5adff0113a27240b5caffe Mon Sep 17 00:00:00 2001 From: "j.khakimyanova" Date: Fri, 4 Mar 2016 16:02:20 -0600 Subject: [PATCH 2718/5486] Add link to drink wine option --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5e172cafd0..48628abd61 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -285,6 +285,8 @@ Take out your [knitting project](knit/knit.md) and finish your sock heel turn. [Grab some coffee?](coffee/coffee.md) +[Grab some wine?](wine/wine.md) + [Call the GhostBusters](ghostbusters/ghostbusters.md) [Talk to Bob Barker](bob-barker/barker.md) From ce87cedac40f64a3963ef437448b1de0a544a147 Mon Sep 17 00:00:00 2001 From: blueanglezsy Date: Fri, 4 Mar 2016 20:33:47 -0500 Subject: [PATCH 2719/5486] add disney --- Chinese/Baymax/Baymax.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/Baymax/Baymax.md b/Chinese/Baymax/Baymax.md index 4265ef3054..d63d1b816a 100644 --- a/Chinese/Baymax/Baymax.md +++ b/Chinese/Baymax/Baymax.md @@ -1,3 +1,3 @@ -Baymax, 中文译名为大白或者杯面，在电影《超能陆战队》中出现的机器人，主要用于健康检查与辅助。大白非常呆萌和可爱。尤其在女生当中很受欢迎，符合“暖男”形象。 +Baymax, 中文译名为大白或者杯面，在迪斯尼电影《超能陆战队》中出现的机器人，主要用于健康检查与辅助。大白非常呆萌和可爱。尤其在女生当中很受欢迎，符合“暖男”形象。 GO TO [here](../mayDay/mayDay.md) \ No newline at end of file From b31c8759de724ab50a5cbe1830c101cb4e398a5e Mon Sep 17 00:00:00 2001 From: blueanglezsy Date: Fri, 4 Mar 2016 20:51:44 -0500 Subject: [PATCH 2720/5486] add muse of baymax --- Chinese/Baymax/Baymax.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Chinese/Baymax/Baymax.md b/Chinese/Baymax/Baymax.md index d63d1b816a..175d26da07 100644 --- a/Chinese/Baymax/Baymax.md +++ b/Chinese/Baymax/Baymax.md @@ -1,3 +1,3 @@ -Baymax, 中文译名为大白或者杯面，在迪斯尼电影《超能陆战队》中出现的机器人，主要用于健康检查与辅助。大白非常呆萌和可爱。尤其在女生当中很受欢迎，符合“暖男”形象。 - +Baymax, 中文译名为大白或者杯面，在电影《超能陆战队》中出现的机器人，主要用于健康检查与辅助。大白非常呆萌和可爱。尤其在女生当中很受欢迎，符合“暖男”形象。 +大白的形象来源于一种日本铃铛。 GO TO [here](../mayDay/mayDay.md) \ No newline at end of file From d917eb5a6b91b794ef20d2d16207533a1f2fca7a Mon Sep 17 00:00:00 2001 From: blueanglezsy Date: Fri, 4 Mar 2016 20:56:33 -0500 Subject: [PATCH 2721/5486] fix the error --- Chinese/Baymax/Baymax.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Chinese/Baymax/Baymax.md b/Chinese/Baymax/Baymax.md index 175d26da07..b50abe8ad2 100644 --- a/Chinese/Baymax/Baymax.md +++ b/Chinese/Baymax/Baymax.md @@ -1,3 +1,4 @@ Baymax, 中文译名为大白或者杯面，在电影《超能陆战队》中出现的机器人，主要用于健康检查与辅助。大白非常呆萌和可爱。尤其在女生当中很受欢迎，符合“暖男”形象。 + 大白的形象来源于一种日本铃铛。 GO TO [here](../mayDay/mayDay.md) \ No newline at end of file From cb054d9e996b2b5676b32e15465641aceedb4b6f Mon Sep 17 00:00:00 2001 From: Robin Prak Date: Sat, 5 Mar 2016 07:48:52 +0100 Subject: [PATCH 2722/5486] Update welkom.md I think this word was missing. 'het' --- dutch/welkom.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dutch/welkom.md b/dutch/welkom.md index e572310796..826f48dafc 100644 --- a/dutch/welkom.md +++ b/dutch/welkom.md @@ -7,7 +7,7 @@ U denkt ... lekker rustig, eindelijk geen gezeur van de baas. Hier blijf ik een poosje. -... in het [bos](bos/donker-bos.md) daarginds is vast koeler. +... in het [bos](bos/donker-bos.md) daarginds is het vast koeler. ... niet naar het bos! U heeft het gevoel dat daar iets niet pluis is... u keert uw rug naar het bos en nu ziet u een hek. Daar [klimt u overheen](over-het-hek/hek.md). From 8dd9ab3395150a10a843fc84ac1403e27d6cd701 Mon Sep 17 00:00:00 2001 From: Joanne Salvador Date: Sat, 5 Mar 2016 16:53:20 +0800 Subject: [PATCH 2723/5486] Added bagong simula --- Philippines/bagong simula/bagong_simula.md | 4 ++++ Philippines/salamat.md | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 Philippines/bagong simula/bagong_simula.md diff --git a/Philippines/bagong simula/bagong_simula.md b/Philippines/bagong simula/bagong_simula.md new file mode 100644 index 0000000000..bef5fa075d --- /dev/null +++ b/Philippines/bagong simula/bagong_simula.md @@ -0,0 +1,4 @@ +Nagdesisyon kang buksan ang pinto. + +[Magsimula muli] (../salamat.md) + diff --git a/Philippines/salamat.md b/Philippines/salamat.md index cad672ed46..55f31464c4 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -5,3 +5,5 @@ online class na ito :D Ipagpatuloy ang adventure [dito] (bago/bago.md). Un oh. Nakapag-tagalog din. [Pindot Kalikot] (bago/bago.md) + +Buksan ang [pinto] (bagong simula/bagong_simula.md). From e47b436f96f906a1db959169f77a4f85c35f473d Mon Sep 17 00:00:00 2001 From: cpwork Date: Sat, 5 Mar 2016 12:12:11 -0700 Subject: [PATCH 2724/5486] jump off cliff --- english/cliff/cliff.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/cliff/cliff.md diff --git a/english/cliff/cliff.md b/english/cliff/cliff.md new file mode 100644 index 0000000000..c85ed2683f --- /dev/null +++ b/english/cliff/cliff.md @@ -0,0 +1,7 @@ +You fling youself off the cliff. + +As you fall you notice that you a your clothing is flapping in the wind. + +Grabbing the excess fabric you pull it tight and begin to glide, unfortunately, all you can see below are clouds. + +... \ No newline at end of file From e7a331dbedd754d64030ebf8b5dcbff05d6024d7 Mon Sep 17 00:00:00 2001 From: cpwork Date: Sat, 5 Mar 2016 12:16:21 -0700 Subject: [PATCH 2725/5486] fix forgotten link --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5bf12f70b1..8f09e85e43 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -849,3 +849,4 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [..and recall that Carl Johnson might be alive](Carl/carl-johnson.md) +[Or, forget it all, and jump off the cliff](cliff/cliff.md) \ No newline at end of file From 6637910f7312a9dd239a05aae4ed289c5bb3d995 Mon Sep 17 00:00:00 2001 From: lilSandyGnome Date: Sat, 5 Mar 2016 23:19:02 +0100 Subject: [PATCH 2726/5486] new adventure paths --- german/Alkohol/alkohol.md | 9 +++++++++ german/Alkohol/bierflasche/bierflasche.md | 5 +++++ german/Alkohol/feuerzeug/Prost/Prost.md | 3 +++ german/Alkohol/feuerzeug/feuerzeug.md | 8 ++++++++ 4 files changed, 25 insertions(+) create mode 100644 german/Alkohol/bierflasche/bierflasche.md create mode 100644 german/Alkohol/feuerzeug/Prost/Prost.md create mode 100644 german/Alkohol/feuerzeug/feuerzeug.md diff --git a/german/Alkohol/alkohol.md b/german/Alkohol/alkohol.md index 79e7c2df01..9f4b39863c 100644 --- a/german/Alkohol/alkohol.md +++ b/german/Alkohol/alkohol.md @@ -4,3 +4,12 @@ können sich jedoch seitdem an nichts mehr erinnern. Schließlich hatten Sie ach Vorab tranken sie bereits 5 Bier. Was ist passiert? + +Ihr Schädel brummt - wenn das Wasser um Sie herum nicht ärgerlicher Weise Salzwasser wäre, würden sie sich einen großen Schluck davon gönnen. +Die Sonne knallt herab. Panik macht sich in Ihnen breit und Sie versuchen sich mit allem, was sie auf dem Boot finden können, zu behelfen. + +[Sie finden eine Bierflasche](bierflasche/bierflasche.md) + +[Sie finden ein Feuerzeug](feuerzeug/feuerzeug.md) + +[Sie finden zwei Leichen](../Leichen/Leichen.md) diff --git a/german/Alkohol/bierflasche/bierflasche.md b/german/Alkohol/bierflasche/bierflasche.md new file mode 100644 index 0000000000..93d2f32e03 --- /dev/null +++ b/german/Alkohol/bierflasche/bierflasche.md @@ -0,0 +1,5 @@ +Sie finden eine Bierflasche. Welch ein Glück! +Aber wie öffnen Sie die Flasche nun? + + +[Vielleicht finde ich noch einen passenden Öffner](../alkohol.md) \ No newline at end of file diff --git a/german/Alkohol/feuerzeug/Prost/Prost.md b/german/Alkohol/feuerzeug/Prost/Prost.md new file mode 100644 index 0000000000..87eef5122c --- /dev/null +++ b/german/Alkohol/feuerzeug/Prost/Prost.md @@ -0,0 +1,3 @@ +Prost! Endlich mal was gutes. Das Bier ist noch kühl +obwohl es die ganze Zeit in der Sonne lag. +Den Kater auskonternd denken Sie jetzt über ihre Rettung nach. \ No newline at end of file diff --git a/german/Alkohol/feuerzeug/feuerzeug.md b/german/Alkohol/feuerzeug/feuerzeug.md new file mode 100644 index 0000000000..c218da71e7 --- /dev/null +++ b/german/Alkohol/feuerzeug/feuerzeug.md @@ -0,0 +1,8 @@ +Beim Absuchen des Bootes haben Sie ein Feuerzeug entdeckt. Sie klopen auf ihre Hosentaschen - leer. +Ihr gängiger Lösungsansatz "erstmal eine Rauchen" führt Sie hier nicht weiter. +Außerdem läuft ihnen die Zeit davon, denn das Wasser sammelt sich immer weiter im Boot. + +Was nun? + +[Nocheinmal um mich sehen](../alkohol.md) +[Bierflasche öffnen - Prost](Prost/Prost.md) \ No newline at end of file From 6678068e2f73f59c6ca62e877daf72d843e376ec Mon Sep 17 00:00:00 2001 From: lilSandyGnome Date: Sat, 5 Mar 2016 23:25:39 +0100 Subject: [PATCH 2727/5486] fixes to make code casey-collab approved --- german/Alkohol/alkohol.md | 7 +++++-- german/Alkohol/feuerzeug/feuerzeug.md | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/german/Alkohol/alkohol.md b/german/Alkohol/alkohol.md index 9f4b39863c..64379bd211 100644 --- a/german/Alkohol/alkohol.md +++ b/german/Alkohol/alkohol.md @@ -5,8 +5,11 @@ Vorab tranken sie bereits 5 Bier. Was ist passiert? -Ihr Schädel brummt - wenn das Wasser um Sie herum nicht ärgerlicher Weise Salzwasser wäre, würden sie sich einen großen Schluck davon gönnen. -Die Sonne knallt herab. Panik macht sich in Ihnen breit und Sie versuchen sich mit allem, was sie auf dem Boot finden können, zu behelfen. +Ihr Schädel brummt - wenn das Wasser um Sie herum nicht ärgerlicher Weise Salzwasser wäre, +würden sie sich einen großen Schluck davon gönnen. +Die Sonne knallt herab. +Panik macht sich in Ihnen breit und Sie versuchen sich mit allem, +was sie auf dem Boot finden können, zu behelfen. [Sie finden eine Bierflasche](bierflasche/bierflasche.md) diff --git a/german/Alkohol/feuerzeug/feuerzeug.md b/german/Alkohol/feuerzeug/feuerzeug.md index c218da71e7..6d8db2e5a8 100644 --- a/german/Alkohol/feuerzeug/feuerzeug.md +++ b/german/Alkohol/feuerzeug/feuerzeug.md @@ -5,4 +5,5 @@ Außerdem läuft ihnen die Zeit davon, denn das Wasser sammelt sich immer weiter Was nun? [Nocheinmal um mich sehen](../alkohol.md) + [Bierflasche öffnen - Prost](Prost/Prost.md) \ No newline at end of file From 05851c19af2d68ff59bcc7971b47397b066d1740 Mon Sep 17 00:00:00 2001 From: svankj Date: Sun, 6 Mar 2016 08:30:26 +0100 Subject: [PATCH 2728/5486] Add my own adventure --- Italian/alice/alice.md | 8 ++++++++ Italian/caramelle.md | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 Italian/alice/alice.md diff --git a/Italian/alice/alice.md b/Italian/alice/alice.md new file mode 100644 index 0000000000..2d3d4801a5 --- /dev/null +++ b/Italian/alice/alice.md @@ -0,0 +1,8 @@ +La chiamo... +Le dico che mi trovo in una strana stanza... +Lei mi dice che ha una soluzione... +Ha avuto un deja vu... +Anche lei, un giorno, si è trovata in una strana stanza... +C'era una piccola bottiglia sul tavolo, mi dice... +Con su scritto bevimi... +L'ha bevuta e la via di uscita ha trovato. diff --git a/Italian/caramelle.md b/Italian/caramelle.md index b1ecc952f2..b23327076e 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -15,4 +15,6 @@ Che fai? [Cerco qualcosa per fare colazione](colazione/colazione.md) -[Spuntini] (spuntini/spuntini.md) \ No newline at end of file +[Spuntini] (spuntini/spuntini.md) + +[Alice non abita più qui] (alice/alice.md) From ee5e875c89e039ac79497f50d0146c989be84129 Mon Sep 17 00:00:00 2001 From: Jooyong Chung Date: Sun, 6 Mar 2016 00:09:06 -0800 Subject: [PATCH 2729/5486] Added New Option --- .../approach-green-people/approached-green-people.md | 2 ++ .../investigate-marshmallow-structure.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md diff --git a/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md new file mode 100644 index 0000000000..08e4dc9699 --- /dev/null +++ b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md @@ -0,0 +1,2 @@ +초록 인간들에게 다가가자 그들이 고개를 돌려 당신이 있는쪽을 바라보고 있어요. +당신은 어떻게 할까요? \ No newline at end of file diff --git a/korean/explore-outside/investigate-marshmallow-structure/investigate-marshmallow-structure.md b/korean/explore-outside/investigate-marshmallow-structure/investigate-marshmallow-structure.md index 0ca745087b..c2f56b1be9 100644 --- a/korean/explore-outside/investigate-marshmallow-structure/investigate-marshmallow-structure.md +++ b/korean/explore-outside/investigate-marshmallow-structure/investigate-marshmallow-structure.md @@ -6,3 +6,5 @@ [마시멜로 방으로 되돌아가 마시멜로를 더 먹는다](../../eating-walls/eating-marshmallows.md) [붙이 붙은 탑으로 가본다](../journey-to-flaming-tower/journey-to-flaming-tower.md) + +[초록 인간들한테 간다] (/approach-green-people/approached-green-people.md) \ No newline at end of file From df37381ed0d25b1987dd19fdc1cdab90f3ead0fc Mon Sep 17 00:00:00 2001 From: Jooyong Chung Date: Sun, 6 Mar 2016 00:13:08 -0800 Subject: [PATCH 2730/5486] Added one option to approached-green-people.md --- .../approach-green-people/approached-green-people.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md index 08e4dc9699..0f1b035f28 100644 --- a/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md +++ b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md @@ -1,2 +1,4 @@ 초록 인간들에게 다가가자 그들이 고개를 돌려 당신이 있는쪽을 바라보고 있어요. -당신은 어떻게 할까요? \ No newline at end of file +당신은 어떻게 할까요? + +[마시멜로 방 밖으로 되돌아간다] (../../explore-outside.md) \ No newline at end of file From aa6c4db5a35af82a39d27741bdee1a16a72a1be8 Mon Sep 17 00:00:00 2001 From: Jooyong Chung Date: Sun, 6 Mar 2016 00:30:46 -0800 Subject: [PATCH 2731/5486] fixed file location bug --- .../investigate-marshmallow-structure.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/korean/explore-outside/investigate-marshmallow-structure/investigate-marshmallow-structure.md b/korean/explore-outside/investigate-marshmallow-structure/investigate-marshmallow-structure.md index c2f56b1be9..4e89345274 100644 --- a/korean/explore-outside/investigate-marshmallow-structure/investigate-marshmallow-structure.md +++ b/korean/explore-outside/investigate-marshmallow-structure/investigate-marshmallow-structure.md @@ -7,4 +7,4 @@ [붙이 붙은 탑으로 가본다](../journey-to-flaming-tower/journey-to-flaming-tower.md) -[초록 인간들한테 간다] (/approach-green-people/approached-green-people.md) \ No newline at end of file +[초록 인간들한테 간다] (approach-green-people/approached-green-people.md) \ No newline at end of file From 7a55e688f0649ec59900c28d0b09776ad37e1933 Mon Sep 17 00:00:00 2001 From: Anna Hull Date: Sun, 6 Mar 2016 02:14:36 -0800 Subject: [PATCH 2732/5486] adding a crochet chapter to the story... --- english/crochet/crochet.md | 3 +++ english/marshmallow.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 english/crochet/crochet.md diff --git a/english/crochet/crochet.md b/english/crochet/crochet.md new file mode 100644 index 0000000000..ed42da0075 --- /dev/null +++ b/english/crochet/crochet.md @@ -0,0 +1,3 @@ +Crochet teddy bears are the cutest. You should start working on one today. + +Click here to [return to reality] (https://github.com/udacity/create-your-own-adventure/blob/master/english/marshmallow.md). diff --git a/english/marshmallow.md b/english/marshmallow.md index 5bf12f70b1..065915a07a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -265,6 +265,8 @@ Do you: Take out your [knitting project](knit/knit.md) and finish your sock heel turn. +Take out your [crochet project](crochet/crochet.md) instead and finish that teddy bear you've been working on. + [Realize you are in the ...](in-matrix/matrix.md) [Realize you better call Saul](better-call-saul/saul.md) From 333e47229386c2543fc9eb01145215805fcb2e2d Mon Sep 17 00:00:00 2001 From: Anna Hull Date: Sun, 6 Mar 2016 02:25:28 -0800 Subject: [PATCH 2733/5486] updates to crochet.md --- english/crochet/crochet.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/crochet/crochet.md b/english/crochet/crochet.md index ed42da0075..22b3510125 100644 --- a/english/crochet/crochet.md +++ b/english/crochet/crochet.md @@ -1,3 +1,3 @@ -Crochet teddy bears are the cutest. You should start working on one today. +Crochet teddy bears are the cutest. Start one today! :) -Click here to [return to reality] (https://github.com/udacity/create-your-own-adventure/blob/master/english/marshmallow.md). +Click here to [return to reality] (../marshmallow.md). From 1be1fc3d7d685d00f174c646d9ce61955de0855d Mon Sep 17 00:00:00 2001 From: Gabriel Mojica Date: Mon, 7 Mar 2016 01:14:20 +1100 Subject: [PATCH 2734/5486] Add another bear pun --- english/bear/bear.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/bear/bear.md b/english/bear/bear.md index 72e35e5f2d..ad05d266b9 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -1,3 +1,4 @@ Stella atroir. Taiwan bear. Ice cold. If warm, the results could be unbearable. +Bear in mind, the grizzly taste. \ No newline at end of file From 2d9ef499374b1c715ca82d974c2fb3d76a13dbbc Mon Sep 17 00:00:00 2001 From: Daniil Orlov Date: Sun, 6 Mar 2016 19:04:46 +0300 Subject: [PATCH 2735/5486] Add Marshmallow Redemption --- russian/eating-walls/police/potracheno/prison/inmate.md | 5 +++++ russian/eating-walls/police/potracheno/wanted.md | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 russian/eating-walls/police/potracheno/prison/inmate.md diff --git a/russian/eating-walls/police/potracheno/prison/inmate.md b/russian/eating-walls/police/potracheno/prison/inmate.md new file mode 100644 index 0000000000..198b8ffaf6 --- /dev/null +++ b/russian/eating-walls/police/potracheno/prison/inmate.md @@ -0,0 +1,5 @@ +Вас заточили в зефирной тюрьме, но вы планируете побег - +каждую ночь вы съедате кусочек зефирной стены +и каждое утро скрываете отверстие за зефирным постером. +Но вот незадача - толстеете вы быстрее, +чем успевате расширять туннель для побега... \ No newline at end of file diff --git a/russian/eating-walls/police/potracheno/wanted.md b/russian/eating-walls/police/potracheno/wanted.md index ec053ec238..a8c2110372 100644 --- a/russian/eating-walls/police/potracheno/wanted.md +++ b/russian/eating-walls/police/potracheno/wanted.md @@ -1 +1,3 @@ -Полиция схватывает вас и заковывает в зефирные наручники \ No newline at end of file +Полиция схватывает вас и заковывает в зефирные наручники + +[Вы не оказываете сопротивления служителям закона](prison/inmate.md) \ No newline at end of file From c55b23a21ced9257285008e9576b7425e1894696 Mon Sep 17 00:00:00 2001 From: Neeraj Date: Mon, 7 Mar 2016 01:12:58 +0530 Subject: [PATCH 2736/5486] modified bollywood.md for shraddha --- hindi/bollywood.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 600cb7cf46..ba73ac2351 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -13,6 +13,8 @@ Amithab, [go here](actor3/amithab.md) Hrithik Roshan, [यहाँ देखें](hrithik/hrithik.md) +shraddha kappor,[go here](shraddha/shraddha.md) + आमीर खान को तो भूल ही गए थे ये लोग | [यहाँ दबाये ](./actor4/aamir.md) From 4af23ed1164389d5b13561ab48fb03e76fb75a04 Mon Sep 17 00:00:00 2001 From: Cory Potwin Date: Sun, 6 Mar 2016 18:20:50 -0500 Subject: [PATCH 2737/5486] More details added to flame throwing arms pill --- english/poke-the-wall/choco-power-pill/choco-power-pill.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/poke-the-wall/choco-power-pill/choco-power-pill.md b/english/poke-the-wall/choco-power-pill/choco-power-pill.md index 1a83666780..ddeb363dfc 100644 --- a/english/poke-the-wall/choco-power-pill/choco-power-pill.md +++ b/english/poke-the-wall/choco-power-pill/choco-power-pill.md @@ -1 +1,5 @@ As expected, eating the small blue pill transformed your arms into blow torches. + +This is exactly as you planned. Eating an entire marshmallow door would be impossible. + +Unless it was toasted to perfection. \ No newline at end of file From ece711cfb9447eba42d3e452b80b7ec61de64ec2 Mon Sep 17 00:00:00 2001 From: KarthicK Mariappan Date: Sun, 6 Mar 2016 20:32:16 -0500 Subject: [PATCH 2738/5486] doc: New Kural - Manly Effort/Aalvinaiyutaimai --- Tamil/Thirukural.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Tamil/Thirukural.md b/Tamil/Thirukural.md index 9609b54e8d..eef5badf9b 100644 --- a/Tamil/Thirukural.md +++ b/Tamil/Thirukural.md @@ -4,3 +4,8 @@ Face's smile doesn't shows the friendship, but the heart's rejoice does. உடுக்கை இழந்தவன் கைபோல ஆங்கே இடுக்கண் களைவதாம் நட்பு Friendship hastens to rescue as fast as hand’s reflex to catch slipping cloth + +தெய்வத்தான் ஆகா தெனினும் முயற்சிதன் +மெய்வருத்தக் கூலி தரும் +Though fate-divine should make your labour vain; +Effort its labour's sure reward will gain \ No newline at end of file From 5ccffe7f178d99d8f6e32ad2c0bd365676c97a2d Mon Sep 17 00:00:00 2001 From: tory-mo Date: Mon, 7 Mar 2016 13:08:38 +0300 Subject: [PATCH 2739/5486] russian conquer story --- russian/conquer/lead.md | 1 + russian/zefir.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 russian/conquer/lead.md diff --git a/russian/conquer/lead.md b/russian/conquer/lead.md new file mode 100644 index 0000000000..3ba1f50803 --- /dev/null +++ b/russian/conquer/lead.md @@ -0,0 +1 @@ +Завоевав этот мир, ты спокойно ложишься спать дальше diff --git a/russian/zefir.md b/russian/zefir.md index f85e335985..a084d43ae4 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -71,3 +71,5 @@ [Внезапно безумно начну просить сломать меня] (break-me-completelly/break-me.md) [Зевну, откушу кусок зефира и снова усну...](dream/dream.md) + +[Завоюю мир, в котором проснулся](conquer/lead.md) From 3620e5dbf2f106d171bf645224ff3be560bdab5a Mon Sep 17 00:00:00 2001 From: ArchitShah248 Date: Mon, 7 Mar 2016 23:26:04 +0530 Subject: [PATCH 2740/5486] Added extra quotes --- Gujarati/gujarati.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gujarati/gujarati.md b/Gujarati/gujarati.md index 0deedef950..f94d255394 100644 --- a/Gujarati/gujarati.md +++ b/Gujarati/gujarati.md @@ -1,3 +1,6 @@ When object to be gained is sufficiently valued, and efforts towards its attainment are persistently followed without intermission, then the steadiness of mind is secured. + +A problem is achance for you to do your best. +Tha best way to predict the future is to create. From 9fba484405edd3b2771954c7b3ea9a4a2b419ab6 Mon Sep 17 00:00:00 2001 From: Jeff DeSurra Date: Mon, 7 Mar 2016 11:50:30 -0800 Subject: [PATCH 2741/5486] Added direction to talk to woman at ../woman/scully.md --- english/talk_to_neighbour/man/mulder.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/talk_to_neighbour/man/mulder.md b/english/talk_to_neighbour/man/mulder.md index b9a86747a6..f71ba5d2ed 100644 --- a/english/talk_to_neighbour/man/mulder.md +++ b/english/talk_to_neighbour/man/mulder.md @@ -1,2 +1,5 @@ "I'm FBI Special Agent Fox Mulder," the man says in a monotone voice. The man looked very stange. I was scared and looked frantically for the woman +I saw the woman and ran toward her. + +[Talk to the woman](../woman/scully.md) From 4c6f3fac7426f910dbfd0bd6139b70d08f55cf0d Mon Sep 17 00:00:00 2001 From: Brendan Date: Tue, 8 Mar 2016 11:08:40 +1000 Subject: [PATCH 2742/5486] Add line to cthulhu.md --- english/madness/cthulhu.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/madness/cthulhu.md b/english/madness/cthulhu.md index 8141702741..2e55543276 100644 --- a/english/madness/cthulhu.md +++ b/english/madness/cthulhu.md @@ -10,4 +10,6 @@ choice is clear. Do you: Accept instant death at the hands of the [Yog-Sothoth] (yogsothoth/yog-sothoth.md) -[Boil] (boil/boil.md) your own flesh with the heat of one million suns \ No newline at end of file +[Boil] (boil/boil.md) your own flesh with the heat of one million suns + +All the while the call of cthulhu can be heard, ominously accompanying your fate \ No newline at end of file From 46cc705d286390d5498be0ec84d3b63844daa25c Mon Sep 17 00:00:00 2001 From: Langdon Himebaugh Date: Mon, 7 Mar 2016 21:58:12 -0500 Subject: [PATCH 2743/5486] Add line to story --- english/amnesia/amnesia.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/amnesia/amnesia.md b/english/amnesia/amnesia.md index 6e09991dfe..70a5705adf 100644 --- a/english/amnesia/amnesia.md +++ b/english/amnesia/amnesia.md @@ -19,3 +19,5 @@ Amnesia can be freaking awesome sometimes :) Or it can be highly disturbing. Or, it can be highly... oh, I forgot what I was going to say. + +Who am I? Where am I? What am I doing? \ No newline at end of file From 9d68b5178d3cc90181fa1691f002b30d0010baed Mon Sep 17 00:00:00 2001 From: chayzee Date: Tue, 8 Mar 2016 01:40:07 -0500 Subject: [PATCH 2744/5486] Update justice-league.md --- english/justice-league/justice-league.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/justice-league/justice-league.md b/english/justice-league/justice-league.md index 0f0538f74e..c9b97d6897 100644 --- a/english/justice-league/justice-league.md +++ b/english/justice-league/justice-league.md @@ -12,6 +12,7 @@ Who will answer the call? - Batman? - Wonder Woman? - Flash? + - Green Arrow? - Green Lantern? - Aquaman? - Martian Manhunter? From ba086b6a404f33256cf83c5a57116ba6cd1a96e8 Mon Sep 17 00:00:00 2001 From: Pakpoom Buabthong Date: Tue, 8 Mar 2016 14:56:29 -0800 Subject: [PATCH 2745/5486] Add schrodinger's cat to the story --- english/marshmallow.md | 2 ++ english/schrodinger-cat/schrodinger-cat.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/schrodinger-cat/schrodinger-cat.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 065915a07a..e807df9264 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -24,6 +24,8 @@ You are are man (or woman) for all seasons but need help in choosing your travel destinations.. Of course we are happy to help you with these [suggestions](travel-destinations/travel-destinations.md) +Meet a [Schrodingers cat](schrodinger-cat/schrodinger-cat.md) + Another visitor! [Stay a while...](impossible-adventure/start/start.md) [I am the one who knocks](say-my-name/say-my-name.md) diff --git a/english/schrodinger-cat/schrodinger-cat.md b/english/schrodinger-cat/schrodinger-cat.md new file mode 100644 index 0000000000..e0c42b9acc --- /dev/null +++ b/english/schrodinger-cat/schrodinger-cat.md @@ -0,0 +1 @@ +You are either dead or alive. From fb23433a85a1cf159b472bc9dbae491b77ee47c7 Mon Sep 17 00:00:00 2001 From: aufdemtisher Date: Wed, 9 Mar 2016 17:50:52 +0300 Subject: [PATCH 2746/5486] Add vesti nedeli link --- russian/zefir.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/zefir.md b/russian/zefir.md index f85e335985..81c025cfb7 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -30,6 +30,8 @@ [Разведёте костер.](light-fire/fire.md) +[Включите вести недели](vesti-nedeli/vesti.md) + [Попытаетесь проснуться.](awaken/awaken.md) [Вернётесь ко сну.](sleep/zefir.md) From 11972022259e01ef5df6ff4daccd2c6d6f7da437 Mon Sep 17 00:00:00 2001 From: aufdemtisher Date: Wed, 9 Mar 2016 18:56:32 +0300 Subject: [PATCH 2747/5486] Add vesti-nedeli text --- russian/vesti-nedeli/vesti.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 russian/vesti-nedeli/vesti.md diff --git a/russian/vesti-nedeli/vesti.md b/russian/vesti-nedeli/vesti.md new file mode 100644 index 0000000000..ce02f1ea5f --- /dev/null +++ b/russian/vesti-nedeli/vesti.md @@ -0,0 +1 @@ +Вести вселяют смысл. Зефирная комната, подмышечный оркестр, ящик водки - грани единого плана, несмотря на неясные очертания,План несомненно велик. Разливаясь слегка тошнотворным теплом по гортани, водка вливает расслабляющую уверенность в каждую клеточку. Очертания Плана ярче не становятся, но грани вырастают до космических масштабов, разрывая границы понимания, уходя в мглу непознаваемого. Оркестр играл советскиЙ марш потом "Землю в иллюминаторе", гимн советской космонавтики незаметно влился в "Боже царя храни". Глаза закрылись. Все хорошо. Спи. \ No newline at end of file From 031161803f2eb44dc525075149e42e4ee8be4d1c Mon Sep 17 00:00:00 2001 From: thomasfischersm Date: Wed, 9 Mar 2016 19:25:18 -0800 Subject: [PATCH 2748/5486] Update sulfur description --- english/your-dog/your-dog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/your-dog/your-dog.md b/english/your-dog/your-dog.md index be4201afe6..8ae70f447c 100644 --- a/english/your-dog/your-dog.md +++ b/english/your-dog/your-dog.md @@ -1,3 +1,5 @@ Then you wake up! Or did you really? But your dog is licking you in the face. Lord, that dog breath! +An evil vile smell of rotten, no desicated, dry dog food that would haunt an arch demon used to the hellish smell of sulfur fire burning flesh. + Then your dog speaks to you and says ["follow me ..."](../play-with-dog/dog.md) \ No newline at end of file From 161e165f9905c95804061a257e63bdf27b7fff9a Mon Sep 17 00:00:00 2001 From: Michael B Date: Wed, 9 Mar 2016 21:33:09 -0700 Subject: [PATCH 2749/5486] Updating fork-rope-wand.md docs: Add more story. --- english/utilize-wand/fork-rope-wand.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/utilize-wand/fork-rope-wand.md b/english/utilize-wand/fork-rope-wand.md index fd7134f098..f13e198d2b 100644 --- a/english/utilize-wand/fork-rope-wand.md +++ b/english/utilize-wand/fork-rope-wand.md @@ -6,3 +6,6 @@ you point your rope and fork wand to the door and firmly encant "Alohomora!" splintering as the sounds of grinding metal and wood fill the room. The door jars opens with a creak as the locking mechanism breaks. + + As you gaze around the room one last time you can't help but feel + a strange sense of deja-vu... \ No newline at end of file From 816914ebfce28bb6a371fc7c60459ae93ac564eb Mon Sep 17 00:00:00 2001 From: vumapathy Date: Thu, 10 Mar 2016 09:03:12 -0800 Subject: [PATCH 2750/5486] added work option to boston --- english/boston/boston.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/boston/boston.md b/english/boston/boston.md index 788e529ce8..29824efe76 100644 --- a/english/boston/boston.md +++ b/english/boston/boston.md @@ -2,4 +2,7 @@ "This city is the life! Though now that I'm here, I think I'll take a vacation..." +...or on the second thought, I'll put on a coat, stop being a sissy, and get to work! + [Go on vacation](../licked-cat/vacation.md) +[Get to work](../gtd/gtd.md) \ No newline at end of file From e4c29b2d392e1fd5d34900027f0f832dd8244c9d Mon Sep 17 00:00:00 2001 From: Walter Oldham Date: Thu, 10 Mar 2016 20:13:56 -0500 Subject: [PATCH 2751/5486] Add my story line --- english/Booyah/booyah.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/Booyah/booyah.md b/english/Booyah/booyah.md index c2478fb708..25eb9331ea 100644 --- a/english/Booyah/booyah.md +++ b/english/Booyah/booyah.md @@ -2,3 +2,5 @@ I finally understand git and gitHub. I actually understand branches and merges. What am I going to do with my new found knowledge? The world is now my [oyster.](https://en.wikipedia.org/wiki/Pacific_oyster) + +Have some booyah stew From 15864d18bcf7d0d8bb0655c0f302dc29d9c6fb9f Mon Sep 17 00:00:00 2001 From: Vinit1234 Date: Fri, 11 Mar 2016 11:04:04 +0530 Subject: [PATCH 2752/5486] Add consistency,focus and a quote --- english/fortune/fortune.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/fortune/fortune.md b/english/fortune/fortune.md index 6e633ecca3..d2d561ce96 100644 --- a/english/fortune/fortune.md +++ b/english/fortune/fortune.md @@ -1 +1,3 @@ Whoever wants to reach a distant goal must make small steps. +One needs to be consistent and focussed to reach his goal. +"Think big.Start small.Act now." -Robin Sharma \ No newline at end of file From 6c1f2173e5a46ef420360c6b8a06733b33026209 Mon Sep 17 00:00:00 2001 From: Eddie Date: Fri, 11 Mar 2016 12:49:53 +0100 Subject: [PATCH 2753/5486] feat: Add new ending to the spanish branch ("ayudantes_accion"). --- espanol/ayudantes_accion/ayudantes_accion.md | 3 +++ espanol/canudos.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 espanol/ayudantes_accion/ayudantes_accion.md diff --git a/espanol/ayudantes_accion/ayudantes_accion.md b/espanol/ayudantes_accion/ayudantes_accion.md new file mode 100644 index 0000000000..0b3888090e --- /dev/null +++ b/espanol/ayudantes_accion/ayudantes_accion.md @@ -0,0 +1,3 @@ +lo expulsaron de forma inmediata y para siempre del poblado. + +Fue ésto lo que finalmente les liberó de sus propios males, lo que les trajo eterna e infinita paz y armonía. \ No newline at end of file diff --git a/espanol/canudos.md b/espanol/canudos.md index 8c714c940a..9853dc7ee8 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -125,4 +125,6 @@ dijo el [curandero](curandero/curandero.md)... Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", se atrevio a lo que nadie se [imaginó:](Mutantes/Mutantes.md) -[Hizo un breve movimiento para llamar a sus ayudantes y](ayudantes/ayudantes.md) \ No newline at end of file +[Hizo un breve movimiento para llamar a sus ayudantes y](ayudantes/ayudantes.md) + +éstos, sin mediar palabra y al unísono, [no dudaron](ayudantes_accion/ayudantes_accion.md) \ No newline at end of file From b758fe53951c0f441c965e100d3fc4c0b8e16012 Mon Sep 17 00:00:00 2001 From: Eddie Date: Fri, 11 Mar 2016 12:53:02 +0100 Subject: [PATCH 2754/5486] fix: Add missing preposition "y" --- espanol/ayudantes_accion/ayudantes_accion.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/ayudantes_accion/ayudantes_accion.md b/espanol/ayudantes_accion/ayudantes_accion.md index 0b3888090e..c9f9d0762a 100644 --- a/espanol/ayudantes_accion/ayudantes_accion.md +++ b/espanol/ayudantes_accion/ayudantes_accion.md @@ -1,3 +1,3 @@ -lo expulsaron de forma inmediata y para siempre del poblado. +y lo expulsaron de forma inmediata y para siempre del poblado. Fue ésto lo que finalmente les liberó de sus propios males, lo que les trajo eterna e infinita paz y armonía. \ No newline at end of file From b22ed6235f3f152256e0659d0844238af0783df9 Mon Sep 17 00:00:00 2001 From: isabelblanco Date: Fri, 11 Mar 2016 17:48:22 +0000 Subject: [PATCH 2755/5486] ADD JORDI HURTADO TO THE ADVENTURE --- espanol/jordiHurtado/inmortal/inmortal.md | 1 + espanol/jordiHurtado/jordiHurtado.md | 3 +++ espanol/jordiHurtado/saberYganar/saberYganar.md | 1 + 3 files changed, 5 insertions(+) create mode 100644 espanol/jordiHurtado/inmortal/inmortal.md create mode 100644 espanol/jordiHurtado/jordiHurtado.md create mode 100644 espanol/jordiHurtado/saberYganar/saberYganar.md diff --git a/espanol/jordiHurtado/inmortal/inmortal.md b/espanol/jordiHurtado/inmortal/inmortal.md new file mode 100644 index 0000000000..7fb817c18a --- /dev/null +++ b/espanol/jordiHurtado/inmortal/inmortal.md @@ -0,0 +1 @@ +Y Jordi Hurtado creò una pociòn de inmmortalidad que terminò bebièndose èl. \ No newline at end of file diff --git a/espanol/jordiHurtado/jordiHurtado.md b/espanol/jordiHurtado/jordiHurtado.md new file mode 100644 index 0000000000..f2ee160136 --- /dev/null +++ b/espanol/jordiHurtado/jordiHurtado.md @@ -0,0 +1,3 @@ +Y le dijo que organizara algo para entretener al ejèrcito que se avecinaba. + +Le dijo que fabricara una pociòn para no morir durante el ataque. \ No newline at end of file diff --git a/espanol/jordiHurtado/saberYganar/saberYganar.md b/espanol/jordiHurtado/saberYganar/saberYganar.md new file mode 100644 index 0000000000..0a6c6c069c --- /dev/null +++ b/espanol/jordiHurtado/saberYganar/saberYganar.md @@ -0,0 +1 @@ +Y Jordi Hurtado creò Saber y Ganar. \ No newline at end of file From 77cf5451ea3f5fd918e9f27cf685b917cb229433 Mon Sep 17 00:00:00 2001 From: isabelblanco Date: Fri, 11 Mar 2016 18:13:08 +0000 Subject: [PATCH 2756/5486] CANUDOS IN SPANISH STORY --- espanol/canudos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index 8c714c940a..d2aead0320 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -2,6 +2,8 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del i república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: +[Mandó llamar a Jordi Hurtado](jordiHurtado/jordiHurtado.md) + [Sintió como la comida le subía por el exófago](comida/comida.md) [Mandó a congregar a Canudos entero al templo.](templo/templo.md) From fa7848cf01a1e4cb84f3cb0d084ba3d57a76d419 Mon Sep 17 00:00:00 2001 From: isabelblanco Date: Fri, 11 Mar 2016 18:19:28 +0000 Subject: [PATCH 2757/5486] JORDI HURTADO CORRECT LINK --- espanol/jordiHurtado/jordiHurtado.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/espanol/jordiHurtado/jordiHurtado.md b/espanol/jordiHurtado/jordiHurtado.md index f2ee160136..01c0001921 100644 --- a/espanol/jordiHurtado/jordiHurtado.md +++ b/espanol/jordiHurtado/jordiHurtado.md @@ -1,3 +1,3 @@ -Y le dijo que organizara algo para entretener al ejèrcito que se avecinaba. +[Y le dijo que organizara algo para entretener al ejèrcito que se avecinaba.](saberYganar/saberYganar.md) -Le dijo que fabricara una pociòn para no morir durante el ataque. \ No newline at end of file +[Le dijo que fabricara una pociòn para no morir durante el ataque.](inmortal/inmortal.md) \ No newline at end of file From cade775edea5bb57ff5f90887cee6d004dc5f21d Mon Sep 17 00:00:00 2001 From: Chris Eldredge Date: Fri, 11 Mar 2016 10:28:42 -0800 Subject: [PATCH 2758/5486] Add pie chart link --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 065915a07a..f660f1259d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -851,3 +851,4 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [..and recall that Carl Johnson might be alive](Carl/carl-johnson.md) +[Make a pie chart](http://i.imgur.com/uaFES1b.jpg) From 66d2988972ff32ddf1924784bb4f2b826effbf88 Mon Sep 17 00:00:00 2001 From: Bandyk Date: Fri, 11 Mar 2016 20:09:20 +0100 Subject: [PATCH 2759/5486] add more story --- Polish/ubranie/macasz/zupa/karmisz/karmisz.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Polish/ubranie/macasz/zupa/karmisz/karmisz.md b/Polish/ubranie/macasz/zupa/karmisz/karmisz.md index 838c974250..a30f1efc61 100644 --- a/Polish/ubranie/macasz/zupa/karmisz/karmisz.md +++ b/Polish/ubranie/macasz/zupa/karmisz/karmisz.md @@ -1 +1,7 @@ Skunks, początkowo podejrzliwy i nieufny, podchodzi zwabiony cypryjskim przysmakiem i bierze do pyska pierwszy brokuł. +Wykrzywia pyszczek i mówi: "To mi przypomina czasy szkolnej stołówki, chodźmy +lepiej na pizze albo sami coś ugtujmy." + +[Idziesz](idziesz/idziesz.md) ze skunksem na pizze. + +[Gotujesz](gotujesz/gotujesz.md) ze skunksem kumpla, który wyżera właśnie brokuły. From 065d150242f210b672e42c85488c4696b9972027 Mon Sep 17 00:00:00 2001 From: Bandyk Date: Fri, 11 Mar 2016 20:10:17 +0100 Subject: [PATCH 2760/5486] next chapter cookiing --- Polish/ubranie/macasz/zupa/karmisz/gotujesz/gotujesz.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Polish/ubranie/macasz/zupa/karmisz/gotujesz/gotujesz.md diff --git a/Polish/ubranie/macasz/zupa/karmisz/gotujesz/gotujesz.md b/Polish/ubranie/macasz/zupa/karmisz/gotujesz/gotujesz.md new file mode 100644 index 0000000000..2a457f6e83 --- /dev/null +++ b/Polish/ubranie/macasz/zupa/karmisz/gotujesz/gotujesz.md @@ -0,0 +1 @@ +Wraz ze skunksem gotujecie kumpla na wolnym ogniu. From 6e93433fe0ef442817ebf33bd65bd0fa57ac3ee9 Mon Sep 17 00:00:00 2001 From: Bandyk Date: Fri, 11 Mar 2016 20:11:13 +0100 Subject: [PATCH 2761/5486] add next chapter Go --- Polish/ubranie/macasz/zupa/karmisz/idziesz/idziesz.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Polish/ubranie/macasz/zupa/karmisz/idziesz/idziesz.md diff --git a/Polish/ubranie/macasz/zupa/karmisz/idziesz/idziesz.md b/Polish/ubranie/macasz/zupa/karmisz/idziesz/idziesz.md new file mode 100644 index 0000000000..01c4fb70d6 --- /dev/null +++ b/Polish/ubranie/macasz/zupa/karmisz/idziesz/idziesz.md @@ -0,0 +1 @@ +Idziecie ze skunksem na pizze, a później do baru na piwo. From 0dfddeaa0d6038d81cf7f3cf81c5d6140292ce3f Mon Sep 17 00:00:00 2001 From: vumapathy Date: Fri, 11 Mar 2016 11:31:43 -0800 Subject: [PATCH 2762/5486] fixed newline issue --- english/boston/boston.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/boston/boston.md b/english/boston/boston.md index 29824efe76..52bcb3c93d 100644 --- a/english/boston/boston.md +++ b/english/boston/boston.md @@ -5,4 +5,5 @@ ...or on the second thought, I'll put on a coat, stop being a sissy, and get to work! [Go on vacation](../licked-cat/vacation.md) + [Get to work](../gtd/gtd.md) \ No newline at end of file From cb11f2c3850b6c4118ff3afa6b74100cc8469394 Mon Sep 17 00:00:00 2001 From: Zach Walker Date: Fri, 11 Mar 2016 14:12:16 -0800 Subject: [PATCH 2763/5486] Extended the forest storyline with two new options --- english/forest/fire/woods/camp/camp.md | 4 ++++ english/forest/fire/woods/follow/follow.md | 4 ++++ english/forest/fire/woods/woods.md | 2 ++ 3 files changed, 10 insertions(+) create mode 100644 english/forest/fire/woods/camp/camp.md create mode 100644 english/forest/fire/woods/follow/follow.md diff --git a/english/forest/fire/woods/camp/camp.md b/english/forest/fire/woods/camp/camp.md new file mode 100644 index 0000000000..8583d8b133 --- /dev/null +++ b/english/forest/fire/woods/camp/camp.md @@ -0,0 +1,4 @@ +You return to the camp to find the bear still there, now accompanied by a tiger. +You look further and see a kangaroo, and a piglet. You've seen this before, but you can't quite remember where. +A donkey clumsily appears and asks you your name. You reply in a confused voice: "Christopher...." +"Christopher Robin?"... \ No newline at end of file diff --git a/english/forest/fire/woods/follow/follow.md b/english/forest/fire/woods/follow/follow.md new file mode 100644 index 0000000000..c63f3b2ce2 --- /dev/null +++ b/english/forest/fire/woods/follow/follow.md @@ -0,0 +1,4 @@ +As you start to follow the shawman, you notice the bear behind you, drinking from the magical stream. +The bear is now twice as big, and looks angry. +You turn to ask for help from the shawman, but he's vanished. +You slowly turn to the bear, and feel a hot breath on the back of your neck. \ No newline at end of file diff --git a/english/forest/fire/woods/woods.md b/english/forest/fire/woods/woods.md index 287a4cd7c4..2cdb1686fa 100644 --- a/english/forest/fire/woods/woods.md +++ b/english/forest/fire/woods/woods.md @@ -11,3 +11,5 @@ they are welcome to join the tribe of ancient warlocks. Maybe you decided to follow the shawman deeper into the forest? +[Follow the shawman](follow/follow.md) +[Go back to camp](camp/camp.md) \ No newline at end of file From 744fe5999b06196b8670ba62bd928f3a35eb296a Mon Sep 17 00:00:00 2001 From: Zach Walker Date: Fri, 11 Mar 2016 14:15:59 -0800 Subject: [PATCH 2764/5486] Added blank line between options for easier reading --- english/forest/fire/woods/woods.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/forest/fire/woods/woods.md b/english/forest/fire/woods/woods.md index 2cdb1686fa..ab0458a0c2 100644 --- a/english/forest/fire/woods/woods.md +++ b/english/forest/fire/woods/woods.md @@ -12,4 +12,5 @@ they are welcome to join the tribe of ancient warlocks. Maybe you decided to follow the shawman deeper into the forest? [Follow the shawman](follow/follow.md) + [Go back to camp](camp/camp.md) \ No newline at end of file From 438386ee3fd4b249738ca7a4689d4ca68472215c Mon Sep 17 00:00:00 2001 From: Stephen Baker Date: Fri, 11 Mar 2016 15:04:30 -0800 Subject: [PATCH 2765/5486] confirm alfred is the illuminati --- english/batman/batman.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index cdd5f411be..5e631eda78 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -28,4 +28,5 @@ Commissioner Gordon: He's the hero Gotham deserves but not the one that it needs Uncle Ben: With great power comes great responsibility. (Hey Uncle Ben was a character in Spiderman!!, doesn't belong here) -The real hero is alfred the butler.. +The real hero is alfred the butler... +Who is really [Luke Skywalker's](http://fellowshipoftheminds.com/2015/11/23/star-wars-goes-to-illuminati-dark-side/) son! From 59bcbe9f3ade03b76a84c9f42bf3d2f5a1876e72 Mon Sep 17 00:00:00 2001 From: Stephen Baker Date: Fri, 11 Mar 2016 15:09:28 -0800 Subject: [PATCH 2766/5486] after confirm, un-delete line so that Casey can help me out --- english/batman/batman.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index 5e631eda78..cbee52ed30 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -28,5 +28,5 @@ Commissioner Gordon: He's the hero Gotham deserves but not the one that it needs Uncle Ben: With great power comes great responsibility. (Hey Uncle Ben was a character in Spiderman!!, doesn't belong here) -The real hero is alfred the butler... +The real hero is alfred the butler.. Who is really [Luke Skywalker's](http://fellowshipoftheminds.com/2015/11/23/star-wars-goes-to-illuminati-dark-side/) son! From e5e89e98e6ea384dd2954a175bc0c88b9d49ba7c Mon Sep 17 00:00:00 2001 From: Stephen Baker Date: Fri, 11 Mar 2016 15:16:50 -0800 Subject: [PATCH 2767/5486] split dat line for an easier read and diff --- english/batman/batman.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index cbee52ed30..48386a4367 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -29,4 +29,5 @@ Uncle Ben: With great power comes great responsibility. (Hey Uncle Ben was a character in Spiderman!!, doesn't belong here) The real hero is alfred the butler.. -Who is really [Luke Skywalker's](http://fellowshipoftheminds.com/2015/11/23/star-wars-goes-to-illuminati-dark-side/) son! +Who is really +[Luke Skywalker's](http://fellowshipoftheminds.com/2015/11/23/star-wars-goes-to-illuminati-dark-side/) son! From ba52faa20f41d978a3e7f78112c21be9435a0348 Mon Sep 17 00:00:00 2001 From: Ron Date: Fri, 11 Mar 2016 23:15:39 -0500 Subject: [PATCH 2768/5486] Change lopen.md and add vastzitten.md --- dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md | 4 ++-- .../meehelpen/plassen/lopen/vastzitten/vastzitten.md | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 dutch/bos/ontvoering/meehelpen/plassen/lopen/vastzitten/vastzitten.md diff --git a/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md b/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md index f5ad1e6a7f..e9e56e669d 100644 --- a/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md +++ b/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md @@ -3,6 +3,6 @@ Wat doe je? Je laat je op de grond vallen en doet alsof je dood bent. -Je klimt in een boom. +Je klimt in een boom. Gelukkig rennen de zware jongens je zo [voorbij](vastzitten/vastzitten.md). -Je stopt, [draait je om](omdraaien/terugrennen.md) en rent zo hard als je kan op de zware jongens af. \ No newline at end of file +Je stopt, [draait je om](omdraaien/terugrennen.md) en rent zo hard als je kan op de zware jongens af. diff --git a/dutch/bos/ontvoering/meehelpen/plassen/lopen/vastzitten/vastzitten.md b/dutch/bos/ontvoering/meehelpen/plassen/lopen/vastzitten/vastzitten.md new file mode 100644 index 0000000000..be4daad642 --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/plassen/lopen/vastzitten/vastzitten.md @@ -0,0 +1,9 @@ +Maar je geluk is van korte duur. Terwijl je zucht van opluchting, glijd je voet +van de tak af. Je valt beneden, maar een van je handen komt klem te +zitten. + +Nu hang je daar in de lucht, je benen zwengelen in de lucht. De enigste manier +om te zorgen dat je niet verder valt is door je mobiel te laten vallen in de +hand die klem zit. + +Wat doe je? From 88ff17a5349781d43d8be45230ce65cc14e380dc Mon Sep 17 00:00:00 2001 From: Ron Date: Fri, 11 Mar 2016 23:23:22 -0500 Subject: [PATCH 2769/5486] Modify lopen to not modify line --- dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md b/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md index e9e56e669d..01c12671a6 100644 --- a/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md +++ b/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md @@ -3,6 +3,10 @@ Wat doe je? Je laat je op de grond vallen en doet alsof je dood bent. -Je klimt in een boom. Gelukkig rennen de zware jongens je zo [voorbij](vastzitten/vastzitten.md). + +Je klimt in een boom. + +Gelukkig rennen de zware jongens je zo [voorbij](vastzitten/vastzitten.md), +terwijl je in de boom zit. Je stopt, [draait je om](omdraaien/terugrennen.md) en rent zo hard als je kan op de zware jongens af. From 3abd6f2b8df1ee52f0e999b8ff7cdcb81fab36c5 Mon Sep 17 00:00:00 2001 From: Ron Date: Fri, 11 Mar 2016 23:33:24 -0500 Subject: [PATCH 2770/5486] Change lopen again --- dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md b/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md index 01c12671a6..6fa595533c 100644 --- a/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md +++ b/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md @@ -3,10 +3,6 @@ Wat doe je? Je laat je op de grond vallen en doet alsof je dood bent. - Je klimt in een boom. - -Gelukkig rennen de zware jongens je zo [voorbij](vastzitten/vastzitten.md), -terwijl je in de boom zit. - +Maar komt [vast te zitten](vastzitten/terugrennen.md). Je stopt, [draait je om](omdraaien/terugrennen.md) en rent zo hard als je kan op de zware jongens af. From bfe031faa029f31c9c5fe8380413f3cef09deb7c Mon Sep 17 00:00:00 2001 From: Ron Date: Fri, 11 Mar 2016 23:54:11 -0500 Subject: [PATCH 2771/5486] Changed lopen to caseys strict rules! --- dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md | 5 ++++- .../meehelpen/plassen/lopen/vastzitten/vastzitten.md | 7 +++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md b/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md index 6fa595533c..3502b09209 100644 --- a/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md +++ b/dutch/bos/ontvoering/meehelpen/plassen/lopen/lopen.md @@ -4,5 +4,8 @@ Wat doe je? Je laat je op de grond vallen en doet alsof je dood bent. Je klimt in een boom. -Maar komt [vast te zitten](vastzitten/terugrennen.md). + Je stopt, [draait je om](omdraaien/terugrennen.md) en rent zo hard als je kan op de zware jongens af. + +Je maakt een scherpe bocht, de zware jongens merken het niet op, maar je glijdt +uit en [rolt](vastzitten/vastzitten.md) van een heuvel af. diff --git a/dutch/bos/ontvoering/meehelpen/plassen/lopen/vastzitten/vastzitten.md b/dutch/bos/ontvoering/meehelpen/plassen/lopen/vastzitten/vastzitten.md index be4daad642..1b5ae3b484 100644 --- a/dutch/bos/ontvoering/meehelpen/plassen/lopen/vastzitten/vastzitten.md +++ b/dutch/bos/ontvoering/meehelpen/plassen/lopen/vastzitten/vastzitten.md @@ -1,8 +1,7 @@ -Maar je geluk is van korte duur. Terwijl je zucht van opluchting, glijd je voet -van de tak af. Je valt beneden, maar een van je handen komt klem te -zitten. +Aan het eind van de heubel val je beneden, maar een van je handen komt klem te +zitten aan de rand. -Nu hang je daar in de lucht, je benen zwengelen in de lucht. De enigste manier +Nu hang je daar, je benen zwengelen in de lucht. De enigste manier om te zorgen dat je niet verder valt is door je mobiel te laten vallen in de hand die klem zit. From 04d077fdd5845376e78ab58c727d61082a688a87 Mon Sep 17 00:00:00 2001 From: aufdemtisher Date: Sat, 12 Mar 2016 15:34:01 +0300 Subject: [PATCH 2772/5486] Do a shorter line --- russian/vesti-nedeli/vesti.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/vesti-nedeli/vesti.md b/russian/vesti-nedeli/vesti.md index ce02f1ea5f..02915127d8 100644 --- a/russian/vesti-nedeli/vesti.md +++ b/russian/vesti-nedeli/vesti.md @@ -1 +1,2 @@ -Вести вселяют смысл. Зефирная комната, подмышечный оркестр, ящик водки - грани единого плана, несмотря на неясные очертания,План несомненно велик. Разливаясь слегка тошнотворным теплом по гортани, водка вливает расслабляющую уверенность в каждую клеточку. Очертания Плана ярче не становятся, но грани вырастают до космических масштабов, разрывая границы понимания, уходя в мглу непознаваемого. Оркестр играл советскиЙ марш потом "Землю в иллюминаторе", гимн советской космонавтики незаметно влился в "Боже царя храни". Глаза закрылись. Все хорошо. Спи. \ No newline at end of file +Вести вселяют смысл. Зефирная комната, подмышечный оркестр, ящик водки - грани единого плана, несмотря на неясные очертания,План несомненно велик. Разливаясь слегка тошнотворным теплом по гортани, водка вливает расслабляющую уверенность в каждую клеточку. +Очертания Плана ярче не становятся, но грани вырастают до космических масштабов, разрывая границы понимания, уходя в мглу непознаваемого. Оркестр играл советскиЙ марш потом "Землю в иллюминаторе", гимн советской космонавтики незаметно влился в "Боже царя храни". Глаза закрылись. Все хорошо. Спи. \ No newline at end of file From 9641168018658aea4ce45ca8755f9ae9e7ff5590 Mon Sep 17 00:00:00 2001 From: aufdemtisher Date: Sat, 12 Mar 2016 16:23:45 +0300 Subject: [PATCH 2773/5486] Shorter lines --- russian/vesti-nedeli/vesti.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/russian/vesti-nedeli/vesti.md b/russian/vesti-nedeli/vesti.md index 02915127d8..c611878fdf 100644 --- a/russian/vesti-nedeli/vesti.md +++ b/russian/vesti-nedeli/vesti.md @@ -1,2 +1,5 @@ -Вести вселяют смысл. Зефирная комната, подмышечный оркестр, ящик водки - грани единого плана, несмотря на неясные очертания,План несомненно велик. Разливаясь слегка тошнотворным теплом по гортани, водка вливает расслабляющую уверенность в каждую клеточку. -Очертания Плана ярче не становятся, но грани вырастают до космических масштабов, разрывая границы понимания, уходя в мглу непознаваемого. Оркестр играл советскиЙ марш потом "Землю в иллюминаторе", гимн советской космонавтики незаметно влился в "Боже царя храни". Глаза закрылись. Все хорошо. Спи. \ No newline at end of file +Вести вселяют смысл. Зефирная комната, подмышечный оркестр, ящик водки - грани единого плана, несмотря на неясные очертания,План несомненно велик. +Разливаясь слегка тошнотворным теплом по гортани, водка вливает расслабляющую уверенность в каждую клеточку. + +Очертания Плана ярче не становятся, но грани вырастают до космических масштабов, разрывая границы понимания, уходя в мглу непознаваемого. +Оркестр играл советскиЙ марш потом "Землю в иллюминаторе", гимн советской космонавтики незаметно влился в "Боже царя храни". Глаза закрылись. Все хорошо. Спи. \ No newline at end of file From 2367fc14dac0bb65c763c192b83de1d3360084e4 Mon Sep 17 00:00:00 2001 From: aufdemtisher Date: Sat, 12 Mar 2016 16:29:26 +0300 Subject: [PATCH 2774/5486] Shortest as i can) --- russian/vesti-nedeli/vesti.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/russian/vesti-nedeli/vesti.md b/russian/vesti-nedeli/vesti.md index c611878fdf..7258c266ae 100644 --- a/russian/vesti-nedeli/vesti.md +++ b/russian/vesti-nedeli/vesti.md @@ -1,5 +1,10 @@ Вести вселяют смысл. Зефирная комната, подмышечный оркестр, ящик водки - грани единого плана, несмотря на неясные очертания,План несомненно велик. + Разливаясь слегка тошнотворным теплом по гортани, водка вливает расслабляющую уверенность в каждую клеточку. - + Очертания Плана ярче не становятся, но грани вырастают до космических масштабов, разрывая границы понимания, уходя в мглу непознаваемого. -Оркестр играл советскиЙ марш потом "Землю в иллюминаторе", гимн советской космонавтики незаметно влился в "Боже царя храни". Глаза закрылись. Все хорошо. Спи. \ No newline at end of file + +Оркестр играл советскиЙ марш потом "Землю в иллюминаторе", гимн советской космонавтики незаметно влился в "Боже царя храни". +Глаза закрылись. +Все хорошо. +Спи. \ No newline at end of file From d06b65110618fdf8d48bb82d7301e15808bd0883 Mon Sep 17 00:00:00 2001 From: aufdemtisher Date: Sat, 12 Mar 2016 16:33:13 +0300 Subject: [PATCH 2775/5486] Shorter --- russian/vesti-nedeli/vesti.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/russian/vesti-nedeli/vesti.md b/russian/vesti-nedeli/vesti.md index 7258c266ae..07749e0f26 100644 --- a/russian/vesti-nedeli/vesti.md +++ b/russian/vesti-nedeli/vesti.md @@ -1,10 +1,15 @@ -Вести вселяют смысл. Зефирная комната, подмышечный оркестр, ящик водки - грани единого плана, несмотря на неясные очертания,План несомненно велик. +Вести вселяют смысл. Зефирная комната, подмышечный оркестр, ящик водки. + +Грани единого плана, несмотря на неясные очертания,План несомненно велик. Разливаясь слегка тошнотворным теплом по гортани, водка вливает расслабляющую уверенность в каждую клеточку. -Очертания Плана ярче не становятся, но грани вырастают до космических масштабов, разрывая границы понимания, уходя в мглу непознаваемого. +Очертания Плана ярче не становятся. + +Грани вырастают до космических масштабов, разрывая границы понимания, уходя в мглу непознаваемого. Оркестр играл советскиЙ марш потом "Землю в иллюминаторе", гимн советской космонавтики незаметно влился в "Боже царя храни". + Глаза закрылись. Все хорошо. Спи. \ No newline at end of file From 702df2bcb79a568965c5b7dec4c9c872d8c1e668 Mon Sep 17 00:00:00 2001 From: aufdemtisher Date: Sat, 12 Mar 2016 16:41:16 +0300 Subject: [PATCH 2776/5486] Shorter --- russian/vesti-nedeli/vesti.md | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/russian/vesti-nedeli/vesti.md b/russian/vesti-nedeli/vesti.md index 07749e0f26..6525ad35dd 100644 --- a/russian/vesti-nedeli/vesti.md +++ b/russian/vesti-nedeli/vesti.md @@ -1,15 +1,12 @@ Вести вселяют смысл. Зефирная комната, подмышечный оркестр, ящик водки. - -Грани единого плана, несмотря на неясные очертания,План несомненно велик. - -Разливаясь слегка тошнотворным теплом по гортани, водка вливает расслабляющую уверенность в каждую клеточку. - +Грани единого плана, несмотря на неясные очертания. +План несомненно велик. +Разливаясь слегка тошнотворным теплом по гортани, +водка вливает расслабляющую уверенность в каждую клеточку. Очертания Плана ярче не становятся. - Грани вырастают до космических масштабов, разрывая границы понимания, уходя в мглу непознаваемого. - -Оркестр играл советскиЙ марш потом "Землю в иллюминаторе", гимн советской космонавтики незаметно влился в "Боже царя храни". - +Оркестр играл советскиЙ марш потом "Землю в иллюминаторе", +гимн советской космонавтики незаметно влился в "Боже царя храни". Глаза закрылись. Все хорошо. Спи. \ No newline at end of file From c73d84237d8e64846df580855f9656ae3dca0a26 Mon Sep 17 00:00:00 2001 From: Konrad-pl Date: Sat, 12 Mar 2016 11:01:43 -0500 Subject: [PATCH 2777/5486] broken into multiple lines --- english/cricket-rules/cricket-rule-book.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/cricket-rules/cricket-rule-book.md b/english/cricket-rules/cricket-rule-book.md index f58b2d6fce..2317bb2b50 100644 --- a/english/cricket-rules/cricket-rule-book.md +++ b/english/cricket-rules/cricket-rule-book.md @@ -1,3 +1,6 @@ Rules and game-play -Cricket is a bat and ball game, played between two teams of eleven players each. One team bats, attempting to score runs, while the other bowls and fields the ball, attempting to restrict the scoring and dismiss the batsmen. The objective of the game is for a team to score more runs than its opponent. In some forms of cricket, it may also be necessary to dismiss the opposition in order to win the match, which would otherwise be drawn. +Cricket is a bat and ball game, played between two teams of eleven players each. +One team bats, attempting to score runs, while the other bowls and fields the ball, attempting to restrict the scoring and dismiss the batsmen. +The objective of the game is for a team to score more runs than its opponent. +In some forms of cricket, it may also be necessary to dismiss the opposition in order to win the match, which would otherwise be drawn. From d9170c8b7a9af5cb7d19cef06768b0f35efabf05 Mon Sep 17 00:00:00 2001 From: Konrad-pl Date: Sat, 12 Mar 2016 11:12:49 -0500 Subject: [PATCH 2778/5486] Fixed broken link --- english/cricket/cricket.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/cricket/cricket.md b/english/cricket/cricket.md index e141693071..f08b6d9143 100644 --- a/english/cricket/cricket.md +++ b/english/cricket/cricket.md @@ -1,3 +1,4 @@ Click [here](http://www.espncricinfo.com) to catch up on cricket news and view live scores. -You look around and find the cricket bat-and-ball game equipment and rule book. Click [here](../cricket-game/cricket-game.md) to read the rules. +You look around and find the cricket bat-and-ball game equipment and rule book. +Click [here](../cricket-rules/cricket-rule-book.md) to read the rules. From 963e8cf1c2897d2af969c0edb8998bf255092172 Mon Sep 17 00:00:00 2001 From: Konrad-pl Date: Sat, 12 Mar 2016 11:30:34 -0500 Subject: [PATCH 2779/5486] Fixed long lines, added line breaks --- english/cricket-rules/cricket-rule-book.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/english/cricket-rules/cricket-rule-book.md b/english/cricket-rules/cricket-rule-book.md index 2317bb2b50..48ae5dc237 100644 --- a/english/cricket-rules/cricket-rule-book.md +++ b/english/cricket-rules/cricket-rule-book.md @@ -1,6 +1,8 @@ Rules and game-play Cricket is a bat and ball game, played between two teams of eleven players each. -One team bats, attempting to score runs, while the other bowls and fields the ball, attempting to restrict the scoring and dismiss the batsmen. +One team bats, attempting to score runs, while the other bowls and fields the ball, +attempting to restrict the scoring and dismiss the batsmen. The objective of the game is for a team to score more runs than its opponent. -In some forms of cricket, it may also be necessary to dismiss the opposition in order to win the match, which would otherwise be drawn. +In some forms of cricket, it may also be necessary to dismiss the opposition in order to win the match, +which would otherwise be drawn. From e61f27c37db5b7335558d474e7e1dd729910dc7c Mon Sep 17 00:00:00 2001 From: Juan Carlos Date: Sat, 12 Mar 2016 13:11:30 -0500 Subject: [PATCH 2780/5486] Add new line revolucion --- espanol/revolucion/revolucion.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/revolucion/revolucion.md diff --git a/espanol/revolucion/revolucion.md b/espanol/revolucion/revolucion.md new file mode 100644 index 0000000000..d999b5cd47 --- /dev/null +++ b/espanol/revolucion/revolucion.md @@ -0,0 +1 @@ +Indicando que sus planes revolucionarios deberian tener un espacio y tiempo adecuado para su realizacion. \ No newline at end of file From 5842c470b4f8fcaf2cdf4c8aadb5bd0877fac2b9 Mon Sep 17 00:00:00 2001 From: Juan Carlos Date: Sat, 12 Mar 2016 13:12:33 -0500 Subject: [PATCH 2781/5486] Add new line to cannudos.md --- espanol/canudos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index 7496e14af7..df89379e43 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -2,6 +2,8 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del i república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: +[Hizo un gesto a Beatito](revolucion/revolucion.md) + [Mandó llamar a Jordi Hurtado](jordiHurtado/jordiHurtado.md) [Sintió como la comida le subía por el exófago](comida/comida.md) From c45a860b4ad5598eb9a0477a122659bc08438b01 Mon Sep 17 00:00:00 2001 From: Anna Valieva Date: Sun, 13 Mar 2016 06:41:43 +0300 Subject: [PATCH 2782/5486] added kompot directory --- russian/kompot/kompot.md | 4 ++++ russian/kompot/wakeup/wakeup.md | 1 + russian/kompot/walk/walk.md | 1 + 3 files changed, 6 insertions(+) create mode 100644 russian/kompot/kompot.md create mode 100644 russian/kompot/wakeup/wakeup.md create mode 100644 russian/kompot/walk/walk.md diff --git a/russian/kompot/kompot.md b/russian/kompot/kompot.md new file mode 100644 index 0000000000..d8fbc49fcf --- /dev/null +++ b/russian/kompot/kompot.md @@ -0,0 +1,4 @@ +Компот забродил и вы тоже. + +1. [И тут вы просыпаетесь](wakeup/wakeup.md) +2. [Вы продолжаете бродить](walk/walk.md) diff --git a/russian/kompot/wakeup/wakeup.md b/russian/kompot/wakeup/wakeup.md new file mode 100644 index 0000000000..52e3ba3b25 --- /dev/null +++ b/russian/kompot/wakeup/wakeup.md @@ -0,0 +1 @@ +Хорошо было там, где вас теперь нет? \ No newline at end of file diff --git a/russian/kompot/walk/walk.md b/russian/kompot/walk/walk.md new file mode 100644 index 0000000000..9df1faf967 --- /dev/null +++ b/russian/kompot/walk/walk.md @@ -0,0 +1 @@ +Ничего на свете лучше нету, чем бродить друзьям по белу свету? \ No newline at end of file From 5d20612173c0355e2fefc87e62ee91798a778ae8 Mon Sep 17 00:00:00 2001 From: Anna Valieva Date: Sun, 13 Mar 2016 07:04:22 +0300 Subject: [PATCH 2783/5486] added gaps --- russian/kompot/kompot.md | 1 + russian/zefir.md | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/russian/kompot/kompot.md b/russian/kompot/kompot.md index d8fbc49fcf..1927677817 100644 --- a/russian/kompot/kompot.md +++ b/russian/kompot/kompot.md @@ -1,4 +1,5 @@ Компот забродил и вы тоже. 1. [И тут вы просыпаетесь](wakeup/wakeup.md) + 2. [Вы продолжаете бродить](walk/walk.md) diff --git a/russian/zefir.md b/russian/zefir.md index 71ad559f70..405a946e18 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -12,6 +12,8 @@ Нащупав наконец, головой, недопитый ящик водки, вы пытаетесь открыть глаза. +Это была всего лишь банка с вишневым компотом. + Ваши действия: [Смешать водку с пивом](vodka/vodka.md) @@ -75,3 +77,5 @@ [Зевну, откушу кусок зефира и снова усну...](dream/dream.md) [Завоюю мир, в котором проснулся](conquer/lead.md) + +[Отхлебну и закушу](kompot/kompot.md) From 1481a5f34258a83761efc740997c508ad304c342 Mon Sep 17 00:00:00 2001 From: Martin Breuss Date: Sun, 13 Mar 2016 01:28:42 -0800 Subject: [PATCH 2784/5486] add sentence for atmosphere --- slovenian/rumena/rumena.md | 1 + 1 file changed, 1 insertion(+) diff --git a/slovenian/rumena/rumena.md b/slovenian/rumena/rumena.md index 998bfa0f0f..d08111d6ea 100644 --- a/slovenian/rumena/rumena.md +++ b/slovenian/rumena/rumena.md @@ -1 +1,2 @@ Znašel si se v rumeni sobi z dvemi vrati. +Soba je rumena zaradi sončni vzhod. From 5da80f0679e4eba902919ad7cae169226145d1ed Mon Sep 17 00:00:00 2001 From: Jiwon Hwang Date: Sun, 13 Mar 2016 22:12:53 +0900 Subject: [PATCH 2785/5486] =?UTF-8?q?[=EC=B2=98=EC=9D=8C=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EB=8F=8C=EC=95=84=EA=B0=84=EB=8B=A4](../marshmallow.md)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- korean/call-mom/call-mom.md | 1 + 1 file changed, 1 insertion(+) diff --git a/korean/call-mom/call-mom.md b/korean/call-mom/call-mom.md index 38328ef534..fb3fc661ee 100644 --- a/korean/call-mom/call-mom.md +++ b/korean/call-mom/call-mom.md @@ -7,3 +7,4 @@ [이건 아니다 싶어 영어 버전으로 간다](../../english/marshmallow.md)? +[처음으로 돌아간다](../marshmallow.md) From 1be945780bd346d0ebfac01b2a2810c7fdafa5bf Mon Sep 17 00:00:00 2001 From: Jiwon Hwang Date: Sun, 13 Mar 2016 22:17:30 +0900 Subject: [PATCH 2786/5486] first --- korean/call-mom/call-mom.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/korean/call-mom/call-mom.md b/korean/call-mom/call-mom.md index fb3fc661ee..b5673b1992 100644 --- a/korean/call-mom/call-mom.md +++ b/korean/call-mom/call-mom.md @@ -7,4 +7,4 @@ [이건 아니다 싶어 영어 버전으로 간다](../../english/marshmallow.md)? -[처음으로 돌아간다](../marshmallow.md) +[처음으로 돌아간다.](../marshmallow.md) From 9de7575c3a5f5a807cbdb290f88f392adcc10254 Mon Sep 17 00:00:00 2001 From: Glenn Bacon Date: Sun, 13 Mar 2016 11:59:21 -0400 Subject: [PATCH 2787/5486] Add option to dance --- english/climbing/climbing.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/climbing/climbing.md b/english/climbing/climbing.md index 2e86a245c4..361bced624 100644 --- a/english/climbing/climbing.md +++ b/english/climbing/climbing.md @@ -6,3 +6,4 @@ Click [here](../froboznia/froboznia.md) to open the door. Click [here](../marshmallow.md) to lower yourself back down into the pit of despair. +Click [here](../dance/dance.md) to dance. From b2245afaf3894316c725a7eb24002234d6f23787 Mon Sep 17 00:00:00 2001 From: Ivan Monari Date: Sun, 13 Mar 2016 19:24:02 +0100 Subject: [PATCH 2788/5486] Add lines to messaggio.md --- Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md b/Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md index dc2089f1ce..0916c83bac 100644 --- a/Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md +++ b/Italian/guardare/vecchie-fotografie/girare_foto/messaggio.md @@ -7,3 +7,5 @@ di una giovane ragazza che è stato bruciato. Il messaggio dietro la fotografia è il seguente: "Sei sulla buona strada..." + +Giri nuovamente la fotografia e la guardi meglio. From 2b23abff90245e877ec319861f34723796828de4 Mon Sep 17 00:00:00 2001 From: aneukmie Date: Sun, 13 Mar 2016 14:17:54 -0500 Subject: [PATCH 2789/5486] Add: To be a snowman --- english/marshmallow.md | 2 ++ english/to-be-a-snowman/to-be-a-snowman.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/to-be-a-snowman/to-be-a-snowman.md diff --git a/english/marshmallow.md b/english/marshmallow.md index ddc304818c..82cf47fd06 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -837,6 +837,8 @@ CANT HOLD IT BACK ANY MORE Do you want to build a [snowman?] (snowman/snowman.md) +It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) + I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) diff --git a/english/to-be-a-snowman/to-be-a-snowman.md b/english/to-be-a-snowman/to-be-a-snowman.md new file mode 100644 index 0000000000..8d7a7bdda9 --- /dev/null +++ b/english/to-be-a-snowman/to-be-a-snowman.md @@ -0,0 +1,3 @@ +Who on earth want to be a snowman in a summer day in Texas? Noboby! +Let's just ride a horse and be a Cowboy. That's what everybody one +to be... Yeeehaaa!! \ No newline at end of file From e951fa3b49e4a187d4f7934577ddfa4f56038253 Mon Sep 17 00:00:00 2001 From: Truls Date: Sun, 13 Mar 2016 21:04:24 +0100 Subject: [PATCH 2790/5486] Add two lines. Introducing me in the story. --- norwegian/start.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/norwegian/start.md b/norwegian/start.md index 66a0e5f7e0..12eead6990 100644 --- a/norwegian/start.md +++ b/norwegian/start.md @@ -2,4 +2,8 @@ Det er en varm kveld midt i sommerferien. -Du sitter på en stein i vannkanten og ser noe flyte i fjæra. \ No newline at end of file +Du sitter på en stein i vannkanten og ser noe flyte i fjæra. + +En måke skrikker over deg, det er da du ser meg. + +Jeg går ned i fjæra og plukker opp gjennstanden som fløyt der. From fd01ce4a4cd58abc609a8d15298b6e4861568842 Mon Sep 17 00:00:00 2001 From: riedlblower Date: Sun, 13 Mar 2016 20:54:02 +0000 Subject: [PATCH 2791/5486] Add line: There is also om twine on the ground. --- english/zork/zork.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/zork/zork.md b/english/zork/zork.md index 33715b7a0b..7287527675 100644 --- a/english/zork/zork.md +++ b/english/zork/zork.md @@ -9,3 +9,5 @@ Not to be confused with Felonious Gru and his minions... Very scary story for halloween There is an object that looks like a [torch](../torch/torch.md) on the ground. + +There is also om twine on the ground. \ No newline at end of file From 51c30b97c4f794f09e99d58635bf4764a368a059 Mon Sep 17 00:00:00 2001 From: Ognjen Vukovic Date: Sun, 13 Mar 2016 22:23:38 +0100 Subject: [PATCH 2792/5486] Dezert? --- serbian/dezert/dezert.md | 2 ++ serbian/start.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 serbian/dezert/dezert.md diff --git a/serbian/dezert/dezert.md b/serbian/dezert/dezert.md new file mode 100644 index 0000000000..bcac4a3319 --- /dev/null +++ b/serbian/dezert/dezert.md @@ -0,0 +1,2 @@ +"Da li ste za neki dezert mozda?" upitala ga je mlada radnica veselim glasom i dodala +"imamo tople palacinke sa Nutelom ili Eurokremom." \ No newline at end of file diff --git a/serbian/start.md b/serbian/start.md index 431be50168..d8684e4a79 100644 --- a/serbian/start.md +++ b/serbian/start.md @@ -10,3 +10,5 @@ Mlada radnica ga je ljubazno gledala. Rekla je: "Ili mozda dva ?" "Ili mozda tri?"[klikni ovde](noveIdeje/noveIdeje.md) + +"Da li ste mozda zainteresovani za neki dezert?" [klikni ovde](dezert/dezert.md) From 9122a15a5f8d314695898dcd62180a7c625f9b55 Mon Sep 17 00:00:00 2001 From: Aaron Staker Date: Sun, 13 Mar 2016 22:50:19 -0500 Subject: [PATCH 2793/5486] Adds intriguing details on pizza orders, including tiki drinks. --- english/order-pizza/order-pizza.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/english/order-pizza/order-pizza.md b/english/order-pizza/order-pizza.md index 7b28516959..3e6b1a8591 100644 --- a/english/order-pizza/order-pizza.md +++ b/english/order-pizza/order-pizza.md @@ -1,3 +1,10 @@ -Your hungry and tired, pizza is the only thing that will cheer you up. -But you dont know what to order. -Suddenly a [menu](https://www.pizzahut.com.au/) appears! \ No newline at end of file +Your hungry and tired, pizza is the only thing that will cheer you up. You +thought long and hard about fried chicken, or perhaps all you can eat mongolian +stir fry but in the end the only thing that truly matters to a programmer is hot delivery pizza. When it's done you'll hang it from your window in a pillowcase +to keep it cold and hidden from the horrible people that are after you. + +You truly don't know what to order. Pineapple however makes everything better. +Suddenly a [menu](https://www.pizzahut.com.au/) appears! Another option also +appears a [menu](http://fongspizza.com/) Fong's appears. + +Fong's serves delicious Asian Pizza and also offers exceptional [Tiki Drinks](http://liquor.com/slideshows/10-tiki-cocktails-to-kick-off-summer/). From 6f2f5b23e01e5127948ad5b5a3387a8a5b741f47 Mon Sep 17 00:00:00 2001 From: Aaron Staker Date: Sun, 13 Mar 2016 23:03:22 -0500 Subject: [PATCH 2794/5486] An update related to unclear project requirements. --- english/order-pizza/order-pizza.md | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/english/order-pizza/order-pizza.md b/english/order-pizza/order-pizza.md index 3e6b1a8591..c7cf5820ce 100644 --- a/english/order-pizza/order-pizza.md +++ b/english/order-pizza/order-pizza.md @@ -1,10 +1,15 @@ -Your hungry and tired, pizza is the only thing that will cheer you up. You -thought long and hard about fried chicken, or perhaps all you can eat mongolian -stir fry but in the end the only thing that truly matters to a programmer is hot delivery pizza. When it's done you'll hang it from your window in a pillowcase -to keep it cold and hidden from the horrible people that are after you. - -You truly don't know what to order. Pineapple however makes everything better. -Suddenly a [menu](https://www.pizzahut.com.au/) appears! Another option also -appears a [menu](http://fongspizza.com/) Fong's appears. +Your hungry and tired, pizza is the only thing that will cheer you up. +But you dont know what to order. +Suddenly a [menu](https://www.pizzahut.com.au/) appears! + +You thought long and hard about fried chicken, or perhaps all you can eat +mongolian stir fry but in the end the only thing that truly matters to a +programmer is hot delivery pizza. When it's done you'll hang it from your window +in a pillowcase to keep it cold and hidden from the horrible people that are +after you. + +Pineapple however makes everything better. + +Another option also appears a [menu](http://fongspizza.com/) for Fong's pizza. Fong's serves delicious Asian Pizza and also offers exceptional [Tiki Drinks](http://liquor.com/slideshows/10-tiki-cocktails-to-kick-off-summer/). From 6c5450d09a8bb13f8e1438aaf6371d7b214cb61c Mon Sep 17 00:00:00 2001 From: Aaron Staker Date: Sun, 13 Mar 2016 23:09:11 -0500 Subject: [PATCH 2795/5486] Fixes line length issue. --- english/order-pizza/order-pizza.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/order-pizza/order-pizza.md b/english/order-pizza/order-pizza.md index c7cf5820ce..20dfc3474e 100644 --- a/english/order-pizza/order-pizza.md +++ b/english/order-pizza/order-pizza.md @@ -12,4 +12,5 @@ Pineapple however makes everything better. Another option also appears a [menu](http://fongspizza.com/) for Fong's pizza. -Fong's serves delicious Asian Pizza and also offers exceptional [Tiki Drinks](http://liquor.com/slideshows/10-tiki-cocktails-to-kick-off-summer/). +Fong's serves delicious Asian Pizza and also offers exceptional +[Tiki Drinks](http://liquor.com/slideshows/10-tiki-cocktails-to-kick-off-summer/). From 53119dae65fc741bd4142ed833e192afad32b104 Mon Sep 17 00:00:00 2001 From: lawrencesmns Date: Mon, 14 Mar 2016 02:21:07 -0400 Subject: [PATCH 2796/5486] Update love.md --- english/experience/blue-tunnel/love/love.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/experience/blue-tunnel/love/love.md b/english/experience/blue-tunnel/love/love.md index a3dc0ee508..c81694d332 100644 --- a/english/experience/blue-tunnel/love/love.md +++ b/english/experience/blue-tunnel/love/love.md @@ -1 +1,3 @@ -It is here that you meet a beautiful woman. \ No newline at end of file +It is here that you meet a beautiful woman. + +The beautiful woman looks at you and smiles. She then asks "Are you afriad?" Your response is: From 0960bfd3e5d49fa9a0e9514d51f4e775574c47d2 Mon Sep 17 00:00:00 2001 From: HaroldReyiz Date: Mon, 14 Mar 2016 15:54:45 +0200 Subject: [PATCH 2797/5486] Create a page for the option "cakmakla ilerle" in language "turkce" and add 2 sentences to it. --- .../catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md | 3 +++ turkce/catalla-kaz/metali-cek/metali-cek.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md diff --git a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md new file mode 100644 index 0000000000..4e78ebdf62 --- /dev/null +++ b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md @@ -0,0 +1,3 @@ +Hızla karanlığa daldın ve çakmak alevinin zayıf ışığı rehberliğinde koşmaya başladın. + +Hatmiçiçeği arkandan büyük bir hışımla geliyor ve aradaki fark gitgide kapanıyor. \ No newline at end of file diff --git a/turkce/catalla-kaz/metali-cek/metali-cek.md b/turkce/catalla-kaz/metali-cek/metali-cek.md index 292b764e78..1ae46263a4 100644 --- a/turkce/catalla-kaz/metali-cek/metali-cek.md +++ b/turkce/catalla-kaz/metali-cek/metali-cek.md @@ -14,3 +14,5 @@ Diğer taraf ise uçurum fakat iple inebilirsin. Ne yapacaksın? [İple in](iple-in/iple-in.md) + +[Çakmakla İlerle](cakmakla-ilerle/cakmakla-ilerle.md) From 40ed8ae5e0e353c487529a5f84b8d96f39921947 Mon Sep 17 00:00:00 2001 From: gvrettos Date: Mon, 14 Mar 2016 16:12:22 +0200 Subject: [PATCH 2798/5486] Add options and text to dead-end file put-socks-off --- greek/put_socks_off/put-socks-off.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/greek/put_socks_off/put-socks-off.md b/greek/put_socks_off/put-socks-off.md index 9eb33af64c..eca11bf1f8 100644 --- a/greek/put_socks_off/put-socks-off.md +++ b/greek/put_socks_off/put-socks-off.md @@ -2,5 +2,8 @@ άραγε παρόμοια αισθητήρια όπως και εσύ; Βλέπει, ακούει, μυρίζει; Ας δούμε λοιπόν πως αντιδράει στην μοχθηρή μυρωδιά μιας χιλιο-φορεμένης καλτσας... -... ίσως το ζαχαρωτό να αρχίσει να δακρύζει. Τι θα μας έδειχνε αυτό; +... ίσως το ζαχαρωτό να αρχίσει να δακρύζει. Ενδεχομένως να άρχιζε το φτάρνισμα. Ή ακόμα χειρότερα το βήχα... Τι θα μας έδειχνε αυτό; +[Παίρνεις το πιρούνι](../take_the_fork/take-the-fork.md) + +[Προσφέρεις στο ζαχαρωτό τσιγάρο](../offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md) \ No newline at end of file From 15369ae4d93acc9a1adc7fe2655cd065320e7de8 Mon Sep 17 00:00:00 2001 From: gvrettos Date: Mon, 14 Mar 2016 16:12:56 +0200 Subject: [PATCH 2799/5486] Add more options and text to use_the_rope --- greek/use_the_rope/use_the_rope.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/greek/use_the_rope/use_the_rope.md b/greek/use_the_rope/use_the_rope.md index 1863dfa131..147ab07509 100644 --- a/greek/use_the_rope/use_the_rope.md +++ b/greek/use_the_rope/use_the_rope.md @@ -2,10 +2,14 @@ Κάνεις ένα κόμπο και δοκιμάζεις να δεις ότι είναι σταθερά δεμένο πάνω σου -Τραβάς την το υπόλοιπο για να βρεις την άλλη άκρη και διαπιστώνεις ότι το υπόλοιπο σχοινί έρχεται μέσα από το ζαχαρωτό. +Τραβάς την το υπόλοιπο για να βρεις την άλλη άκρη και διαπιστώνεις ότι το υπόλοιπο σχοινί έρχεται μέσα από το ζαχαρωτό. + +Αναφωνείς: "Τι στο καλό"; Τρομάζεις τόσο που... [Βγάζεις την κάλτσα σου](../put_socks_off/put-socks-off.md) [Παίρνεις το πιρούνι](../take_the_fork/take-the-fork.md) +[Προσφέρεις στο ζαχαρωτό τσιγάρο](../offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md) +[Προσεύχεσαι](../pray/pray.md) From a87e808c9d0ca165c07347dfa84f2a787922c276 Mon Sep 17 00:00:00 2001 From: gvrettos Date: Mon, 14 Mar 2016 16:13:22 +0200 Subject: [PATCH 2800/5486] Add new option pray --- greek/pray/pray.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 greek/pray/pray.md diff --git a/greek/pray/pray.md b/greek/pray/pray.md new file mode 100644 index 0000000000..a8714bc4bc --- /dev/null +++ b/greek/pray/pray.md @@ -0,0 +1,2 @@ +Κάνεις το σταυρό σου και προσπαθείς να θυμηθείς ό,τι προσευχή σου είχε +μάθει η γιαγιά όταν ήσουν τριών μήπως και σωθείς. \ No newline at end of file From 4a624270a6fa087fd036f61772408e57b0bebfd7 Mon Sep 17 00:00:00 2001 From: Minimakina Date: Mon, 14 Mar 2016 18:52:13 +0100 Subject: [PATCH 2801/5486] =?UTF-8?q?Continuaci=C3=B3n=20a=20la=20historia?= =?UTF-8?q?=20del=20'artefacto'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/artefacto/artefacto.md | 3 +++ espanol/artefacto/resultado_explosion/alienigenas.md | 2 ++ espanol/artefacto/resultado_explosion/perderoido.md | 2 ++ 3 files changed, 7 insertions(+) create mode 100644 espanol/artefacto/resultado_explosion/alienigenas.md create mode 100644 espanol/artefacto/resultado_explosion/perderoido.md diff --git a/espanol/artefacto/artefacto.md b/espanol/artefacto/artefacto.md index ebe7e3eb75..f71194de44 100644 --- a/espanol/artefacto/artefacto.md +++ b/espanol/artefacto/artefacto.md @@ -3,3 +3,6 @@ Beatito asombrado cogió el artefacto, mientras el Consejero le decia asintio con su cabeza a la vez que accionaba el artefacto, entonces se oyo una gran explosión en la habitacion y: +[Apareció una misteriosa pareja de alienígenas](resultado_explosion/alienigenas.md) + +[Ambos perdieron la capacidad de oir](resultado_explosion/perderoido.md) \ No newline at end of file diff --git a/espanol/artefacto/resultado_explosion/alienigenas.md b/espanol/artefacto/resultado_explosion/alienigenas.md new file mode 100644 index 0000000000..5e1e336024 --- /dev/null +++ b/espanol/artefacto/resultado_explosion/alienigenas.md @@ -0,0 +1,2 @@ +Estos dos seres, con un brillo multicolor pero casi transparentes, +les comunicaron que ya no había vuelta atrás. \ No newline at end of file diff --git a/espanol/artefacto/resultado_explosion/perderoido.md b/espanol/artefacto/resultado_explosion/perderoido.md new file mode 100644 index 0000000000..3f58d7cb62 --- /dev/null +++ b/espanol/artefacto/resultado_explosion/perderoido.md @@ -0,0 +1,2 @@ +Pero obtuvieron una potenciación de la capacidad visual, pudiendo ver ahora realidades existentes +en otras longitudes de onda. Cosas invisibles para el resto de los seres humanos. \ No newline at end of file From 2732c4ea65ec2a338bc9fbd2dbd33907bc9ee883 Mon Sep 17 00:00:00 2001 From: Minimakina Date: Mon, 14 Mar 2016 19:08:14 +0100 Subject: [PATCH 2802/5486] Separar dos archivos en dos directorios distintos --- .../{resultado_explosion => alienigenas}/alienigenas.md | 0 espanol/artefacto/artefacto.md | 4 ++-- .../artefacto/{resultado_explosion => sinoido}/perderoido.md | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename espanol/artefacto/{resultado_explosion => alienigenas}/alienigenas.md (100%) rename espanol/artefacto/{resultado_explosion => sinoido}/perderoido.md (100%) diff --git a/espanol/artefacto/resultado_explosion/alienigenas.md b/espanol/artefacto/alienigenas/alienigenas.md similarity index 100% rename from espanol/artefacto/resultado_explosion/alienigenas.md rename to espanol/artefacto/alienigenas/alienigenas.md diff --git a/espanol/artefacto/artefacto.md b/espanol/artefacto/artefacto.md index f71194de44..c5847900b3 100644 --- a/espanol/artefacto/artefacto.md +++ b/espanol/artefacto/artefacto.md @@ -3,6 +3,6 @@ Beatito asombrado cogió el artefacto, mientras el Consejero le decia asintio con su cabeza a la vez que accionaba el artefacto, entonces se oyo una gran explosión en la habitacion y: -[Apareció una misteriosa pareja de alienígenas](resultado_explosion/alienigenas.md) +[Apareció una misteriosa pareja de alienígenas](alienigenas/alienigenas.md) -[Ambos perdieron la capacidad de oir](resultado_explosion/perderoido.md) \ No newline at end of file +[Ambos perdieron la capacidad de oir](sinoido/perderoido.md) \ No newline at end of file diff --git a/espanol/artefacto/resultado_explosion/perderoido.md b/espanol/artefacto/sinoido/perderoido.md similarity index 100% rename from espanol/artefacto/resultado_explosion/perderoido.md rename to espanol/artefacto/sinoido/perderoido.md From f66421b2f558f420b0767aa3240bae0d3b92136e Mon Sep 17 00:00:00 2001 From: Ryan Dennis Date: Mon, 14 Mar 2016 13:22:33 -0700 Subject: [PATCH 2803/5486] Add (5) options to drink-beer.md --- english/drink-beer/drink-beer.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/english/drink-beer/drink-beer.md b/english/drink-beer/drink-beer.md index a7353ffea0..e13cf0db19 100644 --- a/english/drink-beer/drink-beer.md +++ b/english/drink-beer/drink-beer.md @@ -1,4 +1,12 @@ You decide to drink one or two craft beers. Mmm refreshing. - You decide to drink a whole case of Natural Light. Whoa! -After doing so you see that tiny 6 pack you had in your abdomen region turn into a full keg! \ No newline at end of file +After doing so you see that tiny 6 pack you had in your abdomen region turn into a full keg! +You realize you've got to find a solution to your stomach situation. + +You decide that you will... + +[Cry out to your father for help](../cry-out-for-daddy/oh_daddy.md) +[Cry out to your mother for help](../cry-out-for-mommy/oh_mommy.md) +[Ask you friends to come to your aid](../invite-friends/friends.md) +[Use your phone to ask the Quora community what to do](../ask-on-quora/ask-on-quora.md) +[Grab a cup of coffee and hope to piss everything out](../coffee/coffee.md) From f9088d3e50d06b972cac8af3c13af9d93e366304 Mon Sep 17 00:00:00 2001 From: Ryan Dennis Date: Mon, 14 Mar 2016 13:36:15 -0700 Subject: [PATCH 2804/5486] Add options to english/drink-beer page --- english/drink-beer/drink-beer.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/english/drink-beer/drink-beer.md b/english/drink-beer/drink-beer.md index e13cf0db19..3dc1ccbd5e 100644 --- a/english/drink-beer/drink-beer.md +++ b/english/drink-beer/drink-beer.md @@ -1,12 +1,18 @@ You decide to drink one or two craft beers. Mmm refreshing. + You decide to drink a whole case of Natural Light. Whoa! After doing so you see that tiny 6 pack you had in your abdomen region turn into a full keg! -You realize you've got to find a solution to your stomach situation. -You decide that you will... +You decide you need to find a solution to your stomach situation, fast! + +Do you... [Cry out to your father for help](../cry-out-for-daddy/oh_daddy.md) + [Cry out to your mother for help](../cry-out-for-mommy/oh_mommy.md) + [Ask you friends to come to your aid](../invite-friends/friends.md) + [Use your phone to ask the Quora community what to do](../ask-on-quora/ask-on-quora.md) + [Grab a cup of coffee and hope to piss everything out](../coffee/coffee.md) From 0dc93566d4e8f982fc8a892fe31e406569ea1e8e Mon Sep 17 00:00:00 2001 From: gvrettos Date: Mon, 14 Mar 2016 22:58:16 +0200 Subject: [PATCH 2805/5486] Update colissions of pull request --- greek/put_socks_off/put-socks-off.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/greek/put_socks_off/put-socks-off.md b/greek/put_socks_off/put-socks-off.md index eca11bf1f8..ca4c1bc8a4 100644 --- a/greek/put_socks_off/put-socks-off.md +++ b/greek/put_socks_off/put-socks-off.md @@ -2,7 +2,9 @@ άραγε παρόμοια αισθητήρια όπως και εσύ; Βλέπει, ακούει, μυρίζει; Ας δούμε λοιπόν πως αντιδράει στην μοχθηρή μυρωδιά μιας χιλιο-φορεμένης καλτσας... -... ίσως το ζαχαρωτό να αρχίσει να δακρύζει. Ενδεχομένως να άρχιζε το φτάρνισμα. Ή ακόμα χειρότερα το βήχα... Τι θα μας έδειχνε αυτό; +... ίσως το ζαχαρωτό να αρχίσει να δακρύζει. Τι θα μας έδειχνε αυτό; +Ποιος ξέρει, ενδεχομένως να άρχιζε το φτάρνισμα. +Ή ακόμα χειρότερα το βήχα... [Παίρνεις το πιρούνι](../take_the_fork/take-the-fork.md) From fe653efe80bdc5392282214830f1b90a9e85292a Mon Sep 17 00:00:00 2001 From: gvrettos Date: Mon, 14 Mar 2016 23:09:31 +0200 Subject: [PATCH 2806/5486] Update collisions --- greek/use_the_rope/use_the_rope.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/greek/use_the_rope/use_the_rope.md b/greek/use_the_rope/use_the_rope.md index 147ab07509..a7df1a055f 100644 --- a/greek/use_the_rope/use_the_rope.md +++ b/greek/use_the_rope/use_the_rope.md @@ -2,7 +2,7 @@ Κάνεις ένα κόμπο και δοκιμάζεις να δεις ότι είναι σταθερά δεμένο πάνω σου -Τραβάς την το υπόλοιπο για να βρεις την άλλη άκρη και διαπιστώνεις ότι το υπόλοιπο σχοινί έρχεται μέσα από το ζαχαρωτό. +Τραβάς την το υπόλοιπο για να βρεις την άλλη άκρη και διαπιστώνεις ότι το υπόλοιπο σχοινί έρχεται μέσα από το ζαχαρωτό. Αναφωνείς: "Τι στο καλό"; Τρομάζεις τόσο που... @@ -12,4 +12,4 @@ [Προσφέρεις στο ζαχαρωτό τσιγάρο](../offer_marshmallow_a_cigar/offer_marshmallow_a_cigar.md) -[Προσεύχεσαι](../pray/pray.md) +[Προσεύχεσαι](../pray/pray.md) \ No newline at end of file From e6cbe515b3e63506f4de5fb0883988d45c3a359e Mon Sep 17 00:00:00 2001 From: Michael MacLeod Date: Mon, 14 Mar 2016 21:50:47 -0700 Subject: [PATCH 2807/5486] Add an option to write a hiku --- english/write-a-hiku/hiku.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/write-a-hiku/hiku.md diff --git a/english/write-a-hiku/hiku.md b/english/write-a-hiku/hiku.md new file mode 100644 index 0000000000..46665c5ae6 --- /dev/null +++ b/english/write-a-hiku/hiku.md @@ -0,0 +1,3 @@ +Git, so wonderful +Beautiful branch structure +[Discard the hiku](../) \ No newline at end of file From 690f74055ff6b3a6ca6dc58a59901d17e6892997 Mon Sep 17 00:00:00 2001 From: quentin Date: Mon, 14 Mar 2016 21:53:22 -0700 Subject: [PATCH 2808/5486] Add a crouch dragone story --- english/crouch-dragon/crouch-dragon.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/crouch-dragon/crouch-dragon.md diff --git a/english/crouch-dragon/crouch-dragon.md b/english/crouch-dragon/crouch-dragon.md new file mode 100644 index 0000000000..281bff5865 --- /dev/null +++ b/english/crouch-dragon/crouch-dragon.md @@ -0,0 +1 @@ +Once upon a time, there is a baby dragon living in the sea. The baby dragon is very smart and nice, but some devils curse it. It lost its father, entwined into a family turnmoil, and then lost its beloved elder brother. It seemed to be doomed to live a miseral life. Nonetheless, with great perserverance, it rebounced back after crouching for a while. After having been surviving all the disasters and unfortune, it grew up with formidable willpower and undefeatable inner spirit. Here comes it, up front in the face of so-called destiny. From d955b0b57d814d50f28625b7588d905c6255873c Mon Sep 17 00:00:00 2001 From: Michael MacLeod Date: Mon, 14 Mar 2016 22:11:30 -0700 Subject: [PATCH 2809/5486] Add last line to hiku --- english/write-a-hiku/hiku.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/write-a-hiku/hiku.md b/english/write-a-hiku/hiku.md index 46665c5ae6..ac8a0e2976 100644 --- a/english/write-a-hiku/hiku.md +++ b/english/write-a-hiku/hiku.md @@ -1,3 +1,3 @@ Git, so wonderful -Beautiful branch structure -[Discard the hiku](../) \ No newline at end of file +It's beautiful branch structure +five, seven, five, yay! \ No newline at end of file From 0f712411f4b502a0c53de3be833b73e86f925e9b Mon Sep 17 00:00:00 2001 From: Michael MacLeod Date: Mon, 14 Mar 2016 22:18:07 -0700 Subject: [PATCH 2810/5486] Fix unreachable file, spelling error --- english/marshmallow.md | 2 +- english/write-a-hiku/hiku.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 82cf47fd06..4cbfc1311a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -859,4 +859,4 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [Make a pie chart](http://i.imgur.com/uaFES1b.jpg) - +[Write a hiku](write-a-hiku/hiku.md) diff --git a/english/write-a-hiku/hiku.md b/english/write-a-hiku/hiku.md index ac8a0e2976..ad6ea0ae39 100644 --- a/english/write-a-hiku/hiku.md +++ b/english/write-a-hiku/hiku.md @@ -1,3 +1,3 @@ Git, so wonderful -It's beautiful branch structure +Its beautiful branch structure five, seven, five, yay! \ No newline at end of file From 0a140b461bf70af2f0307c84834f9f341ce18746 Mon Sep 17 00:00:00 2001 From: quentin Date: Tue, 15 Mar 2016 00:09:47 -0700 Subject: [PATCH 2811/5486] Add link to my story --- english/crouch-dragon/crouch-dragon.md | 9 ++++++++- english/marshmallow.md | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/english/crouch-dragon/crouch-dragon.md b/english/crouch-dragon/crouch-dragon.md index 281bff5865..7891fee45f 100644 --- a/english/crouch-dragon/crouch-dragon.md +++ b/english/crouch-dragon/crouch-dragon.md @@ -1 +1,8 @@ -Once upon a time, there is a baby dragon living in the sea. The baby dragon is very smart and nice, but some devils curse it. It lost its father, entwined into a family turnmoil, and then lost its beloved elder brother. It seemed to be doomed to live a miseral life. Nonetheless, with great perserverance, it rebounced back after crouching for a while. After having been surviving all the disasters and unfortune, it grew up with formidable willpower and undefeatable inner spirit. Here comes it, up front in the face of so-called destiny. +Once upon a time, there is a baby dragon living in the sea. The baby dragon is +very smart and nice, but some devils curse it. It lost its father, entwined into +a family turnmoil, and then lost its beloved elder brother. It seemed to be +doomed to live a miseral life. Nonetheless, with great perserverance, it +rebounced back after crouching for a while. After having been surviving all the +disasters and unfortune, it grew up with formidable willpower and undefeatable +inner spirit. Here comes it, up front in the face of so-called destiny. + diff --git a/english/marshmallow.md b/english/marshmallow.md index 82cf47fd06..3bc4df34d4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -859,4 +859,4 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [Make a pie chart](http://i.imgur.com/uaFES1b.jpg) - +[Read a story of a crouch dragon](crouchdragon/crouchdragon.md) From 6319d237095e8942a5d70b07724fa40c05dd828c Mon Sep 17 00:00:00 2001 From: hmads Date: Tue, 15 Mar 2016 09:23:27 +0100 Subject: [PATCH 2812/5486] Update haervejen.md --- danish/haervejen/haervejen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/danish/haervejen/haervejen.md b/danish/haervejen/haervejen.md index 03c6b9c41f..5ed68adc1e 100644 --- a/danish/haervejen/haervejen.md +++ b/danish/haervejen/haervejen.md @@ -1,4 +1,4 @@ -Du vandrer sydpå og fra bakkerne hører du lyden af "Bob bob bob". Det er Benny, som vandrer rundt og snakker med sig selv. +Du vandrer sydpå og fra bakkerne hører du lyden af [musik](https://www.youtube.com/watch?v=cUGd8X7bjuo). Men du vælger at ignorere det og prøver at finde et køretøj. Vælger du: From 9c2a292bd0a9a381b4e2453c60a28fbee60bfa66 Mon Sep 17 00:00:00 2001 From: hmads Date: Tue, 15 Mar 2016 09:27:01 +0100 Subject: [PATCH 2813/5486] Update haervejen.md --- danish/haervejen/haervejen.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/danish/haervejen/haervejen.md b/danish/haervejen/haervejen.md index 5ed68adc1e..b4024d7678 100644 --- a/danish/haervejen/haervejen.md +++ b/danish/haervejen/haervejen.md @@ -8,6 +8,8 @@ Men du vælger at ignorere det og prøver at finde et køretøj. Vælger du: [at ride med Dick Turpin](https://www.youtube.com/watch?v=n4d3RW488AQ)? +Finde et lift på [GoMore] (lift/lift.md)? + eller [det ukendte eventyr(kun for de modige)](https://www.youtube.com/watch?v=MFzDaBzBlL0)? From a1171167bf240997fce0972a06e4f597189bde80 Mon Sep 17 00:00:00 2001 From: hmads Date: Tue, 15 Mar 2016 09:31:44 +0100 Subject: [PATCH 2814/5486] Update haervejen.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tilføjer mulighed bil --- danish/haervejen/haervejen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/danish/haervejen/haervejen.md b/danish/haervejen/haervejen.md index b4024d7678..cdc954bff5 100644 --- a/danish/haervejen/haervejen.md +++ b/danish/haervejen/haervejen.md @@ -8,7 +8,7 @@ Men du vælger at ignorere det og prøver at finde et køretøj. Vælger du: [at ride med Dick Turpin](https://www.youtube.com/watch?v=n4d3RW488AQ)? -Finde et lift på [GoMore] (lift/lift.md)? +En [forladt bil] (bobob/bob.md), der holder i vejkanten? eller From 29a9fab0eab7e34eb9a0e5136cd01db58008969e Mon Sep 17 00:00:00 2001 From: hmads Date: Tue, 15 Mar 2016 09:34:17 +0100 Subject: [PATCH 2815/5486] Create bob.md --- danish/haervejen/bobbob/bob.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 danish/haervejen/bobbob/bob.md diff --git a/danish/haervejen/bobbob/bob.md b/danish/haervejen/bobbob/bob.md new file mode 100644 index 0000000000..16ecd48783 --- /dev/null +++ b/danish/haervejen/bobbob/bob.md @@ -0,0 +1,2 @@ +Nøglen sidder i tændingen, så du kører afsted. Efter et stykke tid hører du en mumlen fra bagsædet. +Du opdager bestyrtet at der ligger en høj, tynd og bleg mand og taler i søvne. Han siger "Bob bob bob". From cbabb1814e9477b8a1ec94f5551ed4ae62c775c2 Mon Sep 17 00:00:00 2001 From: hmads Date: Tue, 15 Mar 2016 09:34:38 +0100 Subject: [PATCH 2816/5486] Update haervejen.md --- danish/haervejen/haervejen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/danish/haervejen/haervejen.md b/danish/haervejen/haervejen.md index cdc954bff5..e67ef909e0 100644 --- a/danish/haervejen/haervejen.md +++ b/danish/haervejen/haervejen.md @@ -8,7 +8,7 @@ Men du vælger at ignorere det og prøver at finde et køretøj. Vælger du: [at ride med Dick Turpin](https://www.youtube.com/watch?v=n4d3RW488AQ)? -En [forladt bil] (bobob/bob.md), der holder i vejkanten? +En [forladt bil] (bobbob/bob.md), der holder i vejkanten? eller From 5b03a3c305161c8077f15cc6d1115fb3a666c018 Mon Sep 17 00:00:00 2001 From: hmads Date: Tue, 15 Mar 2016 09:35:10 +0100 Subject: [PATCH 2817/5486] Update bob.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tilføjer glad --- danish/haervejen/bobbob/bob.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/danish/haervejen/bobbob/bob.md b/danish/haervejen/bobbob/bob.md index 16ecd48783..e502e81805 100644 --- a/danish/haervejen/bobbob/bob.md +++ b/danish/haervejen/bobbob/bob.md @@ -1,2 +1,2 @@ -Nøglen sidder i tændingen, så du kører afsted. Efter et stykke tid hører du en mumlen fra bagsædet. +Nøglen sidder i tændingen, så du kører tilfreds afsted. Efter et stykke tid hører du en mumlen fra bagsædet. Du opdager bestyrtet at der ligger en høj, tynd og bleg mand og taler i søvne. Han siger "Bob bob bob". From b45a9987e8a13d6f5490a50bef17342bfb8d2d4b Mon Sep 17 00:00:00 2001 From: suzannebph Date: Tue, 15 Mar 2016 17:57:58 +0800 Subject: [PATCH 2818/5486] Add new step in tagalog choose-your-own-adventure. --- Philippines/bago/bago.md | 2 ++ Philippines/bago/hakbang/hakbang.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 Philippines/bago/hakbang/hakbang.md diff --git a/Philippines/bago/bago.md b/Philippines/bago/bago.md index 6a4deed3c5..0f357baa0a 100644 --- a/Philippines/bago/bago.md +++ b/Philippines/bago/bago.md @@ -1,3 +1,5 @@ Dito nag-uumpisa ang iyong daan tungo sa pagbabago. +Isang [hakbang] (hakbang/hakbang.md) tungo sa pagbabago. + Bumalik sa Udacity para mag-aral o kaya bumalik sa [umpisa] (../salamat.md) diff --git a/Philippines/bago/hakbang/hakbang.md b/Philippines/bago/hakbang/hakbang.md new file mode 100644 index 0000000000..6da8befe14 --- /dev/null +++ b/Philippines/bago/hakbang/hakbang.md @@ -0,0 +1,5 @@ +Ito ang una mong hakbang tungo sa pagbabago. + +Sa Mayo, bumoto. Bumoto ng wais. + +Kung ayaw mo, bumalik sa Udacity para mag-aral o kaya bumalik sa [umpisa] (../salamat.md) From 1eb6711e5c117d3c4aaaaf99e7e991487766693b Mon Sep 17 00:00:00 2001 From: suzannebph Date: Tue, 15 Mar 2016 18:02:42 +0800 Subject: [PATCH 2819/5486] Correct path to first page in tagalog, create your own adventure. --- Philippines/bago/hakbang/hakbang.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Philippines/bago/hakbang/hakbang.md b/Philippines/bago/hakbang/hakbang.md index 6da8befe14..06f71998d0 100644 --- a/Philippines/bago/hakbang/hakbang.md +++ b/Philippines/bago/hakbang/hakbang.md @@ -2,4 +2,4 @@ Ito ang una mong hakbang tungo sa pagbabago. Sa Mayo, bumoto. Bumoto ng wais. -Kung ayaw mo, bumalik sa Udacity para mag-aral o kaya bumalik sa [umpisa] (../salamat.md) +Kung ayaw mo, bumalik sa Udacity para mag-aral o kaya bumalik sa [umpisa] (../../salamat.md) From 720fc6e66b8a564e83199dc95ee0d65ccc7f1b6d Mon Sep 17 00:00:00 2001 From: MichaelMMacLeod Date: Tue, 15 Mar 2016 10:14:14 -0700 Subject: [PATCH 2820/5486] Add a line to try and get the bot to add my commit --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 4cbfc1311a..066b96e44b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -859,4 +859,5 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [Make a pie chart](http://i.imgur.com/uaFES1b.jpg) + [Write a hiku](write-a-hiku/hiku.md) From ffef40abb7b6b98ff2fcb53321cbc1f3415cc0ba Mon Sep 17 00:00:00 2001 From: Aellon Date: Tue, 15 Mar 2016 13:45:10 -0400 Subject: [PATCH 2821/5486] Add wilderness story addition --- english/wilderness.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 english/wilderness.md diff --git a/english/wilderness.md b/english/wilderness.md new file mode 100644 index 0000000000..a15e698e29 --- /dev/null +++ b/english/wilderness.md @@ -0,0 +1,22 @@ +You decide to escape the city for a weekend and head out to the wilderness. + +With your bag all packed with camping gear, you make your way toward the mountains. + +The hike to a campsite was relatively easy so you settle down in a sleeping bag +next to the campfire, and drift off to sleep. + +You awake to find you're being dragged across the forest floor. But by who or what? + +Perhaps a [bear](https://github.com/udacity/create-your-own-adventure/blob/master/english/bear/bear.md) got a hold of you. + +In a moment of panic, you: + +[sing](https://github.com/udacity/create-your-own-adventure/blob/master/english/sing/sing.md) + +convince yourself you're [dreaming](https://github.com/udacity/create-your-own-adventure/blob/master/english/dream/dream.md) + +[meditate](https://github.com/udacity/create-your-own-adventure/blob/master/english/meditate/meditate.md) + +make a [haiku](https://github.com/udacity/create-your-own-adventure/blob/master/english/write-a-hiku/hiku.md) to stay calm + +[scream](https://github.com/udacity/create-your-own-adventure/blob/master/english/scream/scream.md) \ No newline at end of file From 8d1b23bd77f27471fb34a7dcf610fac1c8bab9a9 Mon Sep 17 00:00:00 2001 From: quentin Date: Tue, 15 Mar 2016 11:18:01 -0700 Subject: [PATCH 2822/5486] Modify the pointer to my page --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 3bc4df34d4..09742b745e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -859,4 +859,4 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [Make a pie chart](http://i.imgur.com/uaFES1b.jpg) -[Read a story of a crouch dragon](crouchdragon/crouchdragon.md) +[Read a story of a crouch dragon](crouch-dragon/crouch-dragon.md) From 4976321f7b452ebd8e466177cbfb8bbb39eea385 Mon Sep 17 00:00:00 2001 From: thomasfischersm Date: Tue, 15 Mar 2016 13:58:52 -0700 Subject: [PATCH 2823/5486] Broke the line into two to adhere to max line width. --- english/your-dog/your-dog.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/your-dog/your-dog.md b/english/your-dog/your-dog.md index 8ae70f447c..ebe79f687c 100644 --- a/english/your-dog/your-dog.md +++ b/english/your-dog/your-dog.md @@ -1,5 +1,6 @@ Then you wake up! Or did you really? But your dog is licking you in the face. Lord, that dog breath! -An evil vile smell of rotten, no desicated, dry dog food that would haunt an arch demon used to the hellish smell of sulfur fire burning flesh. +An evil vile smell of rotten, no desicated, dry dog food that would haunt an arch demon used to the +hellish smell of sulfur fire burning flesh. Then your dog speaks to you and says ["follow me ..."](../play-with-dog/dog.md) \ No newline at end of file From 81535a7e0e2041906b201dbe80ab201e5c5f069b Mon Sep 17 00:00:00 2001 From: KC Date: Wed, 16 Mar 2016 10:04:45 +0800 Subject: [PATCH 2824/5486] Update wegschneiden.md ein wort dazugefuegt --- german/wegschneiden/wegschneiden.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/german/wegschneiden/wegschneiden.md b/german/wegschneiden/wegschneiden.md index e65b187381..4e926e45a2 100644 --- a/german/wegschneiden/wegschneiden.md +++ b/german/wegschneiden/wegschneiden.md @@ -1,5 +1,5 @@ -Sie suchen nach einer Sge im Boot und tatschlich finden sie auch etwas... -Doch es ist keine Sge sondern ein Hammer mit einer Schachtel voll Ngel. -Da kommt ihnen eine Idee. +Sie suchen nach einer Säge im Boot und tatsächlich finden sie auch etwas... +Doch es ist keine Säge sondern ein Hammer mit einer Schachtel voll Nägel. +Da kommt ihnen eine tolle Idee. -[Ausziehen, denn nackt kann man besser denken!](ausziehen/ausziehen.md) \ No newline at end of file +[Ausziehen, denn nackt kann man besser denken!](ausziehen/ausziehen.md) From 89e7b8f3cb8ebc534152d3548a2e8154cbd079d6 Mon Sep 17 00:00:00 2001 From: thorhayek Date: Tue, 15 Mar 2016 22:13:28 -0700 Subject: [PATCH 2825/5486] adding a new option for underwater world --- english/marshmallow.md | 2 ++ english/underwater/scuba-diving.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/underwater/scuba-diving.md diff --git a/english/marshmallow.md b/english/marshmallow.md index dfa25e9de9..d17343c9f9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -862,3 +862,5 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [Read a story of a crouch dragon](crouch-dragon/crouch-dragon.md) [Write a hiku](write-a-hiku/hiku.md) + +Explore the unknown. Most people die without ever visiting this [place.](underwater/scuba-diving.md) diff --git a/english/underwater/scuba-diving.md b/english/underwater/scuba-diving.md new file mode 100644 index 0000000000..358c933bc6 --- /dev/null +++ b/english/underwater/scuba-diving.md @@ -0,0 +1 @@ +70 % of this planet is water. The underwater world is beautiful with wildlife like corals and fish. \ No newline at end of file From 9af4a6e2846e06f38361728c89ef420e74df8f49 Mon Sep 17 00:00:00 2001 From: chensk Date: Thu, 17 Mar 2016 00:32:47 +0800 Subject: [PATCH 2826/5486] Add geek story --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 55e0819f87..d6a02295ca 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -97,3 +97,5 @@ [Fermat] (Fermat/Fermat.md) [东哥与石头](Donggewudi/Donggeheiheihei.md) + +[极客](Geek/Geek.md) From 8218272e2400dba53dcf4612a2577e0edef61d86 Mon Sep 17 00:00:00 2001 From: chensk Date: Thu, 17 Mar 2016 00:34:27 +0800 Subject: [PATCH 2827/5486] Fix geek story bug --- Chinese/Geek/Geek.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/Geek/Geek.md diff --git a/Chinese/Geek/Geek.md b/Chinese/Geek/Geek.md new file mode 100644 index 0000000000..2f8230de12 --- /dev/null +++ b/Chinese/Geek/Geek.md @@ -0,0 +1 @@ +500年后，猴子转世来到21世纪，摇身一变，成为一个叱咤风云的极客！ From 0f129893723a79139db06b783e34a3194cf90059 Mon Sep 17 00:00:00 2001 From: David Njakai Date: Thu, 17 Mar 2016 03:22:29 +0300 Subject: [PATCH 2828/5486] insert cliffhanger in dragons-fire-everywhere --- english/dragons/fire-everywhere.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/dragons/fire-everywhere.md b/english/dragons/fire-everywhere.md index 39b1ff3595..0f22591750 100644 --- a/english/dragons/fire-everywhere.md +++ b/english/dragons/fire-everywhere.md @@ -49,3 +49,4 @@ When you wake up its noon and you come to know that it was all a dream ! +...or was it?! From 27a366d07ee5e57f038f848ea0807eca560a6d29 Mon Sep 17 00:00:00 2001 From: Adarsh Date: Wed, 16 Mar 2016 18:42:38 -0600 Subject: [PATCH 2829/5486] Add details to shelter --- english/forest/shelter/shelter.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/forest/shelter/shelter.md b/english/forest/shelter/shelter.md index 0bf7c93c13..693618f428 100644 --- a/english/forest/shelter/shelter.md +++ b/english/forest/shelter/shelter.md @@ -4,4 +4,6 @@ because as you make yourself comfortable for the night the heaven's open. There's a terrible storm brewing... This will be the worst storm to hit this -area in over a century. \ No newline at end of file +area in over a century. + +And then you deploy your tent and sleep. From 3df1165f900f9d7ba5f4866253eb3242d3239b4a Mon Sep 17 00:00:00 2001 From: David Njakai Date: Thu, 17 Mar 2016 03:50:43 +0300 Subject: [PATCH 2830/5486] add hope --- english/forest/shelter/shelter.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/forest/shelter/shelter.md b/english/forest/shelter/shelter.md index 0bf7c93c13..fbfad13db5 100644 --- a/english/forest/shelter/shelter.md +++ b/english/forest/shelter/shelter.md @@ -4,4 +4,5 @@ because as you make yourself comfortable for the night the heaven's open. There's a terrible storm brewing... This will be the worst storm to hit this -area in over a century. \ No newline at end of file +area in over a century. +But you do not despair From 122ce9fddf61a49d97f7a1dee373d3ec7fcda1c5 Mon Sep 17 00:00:00 2001 From: Kenneth Abad Date: Wed, 16 Mar 2016 21:37:00 -0400 Subject: [PATCH 2831/5486] Update marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index dfa25e9de9..6b86dde94d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -862,3 +862,5 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon [Read a story of a crouch dragon](crouch-dragon/crouch-dragon.md) [Write a hiku](write-a-hiku/hiku.md) + +As you attempt this, a voice booms!! From 91f6625d35193ea38f32dbe41b33153977b75a02 Mon Sep 17 00:00:00 2001 From: "Donovan K. Hamrick" Date: Wed, 16 Mar 2016 20:02:04 -0700 Subject: [PATCH 2832/5486] Add story lines and 1 option --- english/froboznia/froboznia.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/froboznia/froboznia.md b/english/froboznia/froboznia.md index 756faf7112..1cb331f794 100644 --- a/english/froboznia/froboznia.md +++ b/english/froboznia/froboznia.md @@ -1,3 +1,9 @@ You find yourself face to face with the Froboznian police. "Ouzna gotcha!" they bellow. + +You deftly spin around the clumsy officer's hand and rush out the doorway on the +other side of the room. You enter a huge, poorly lit cavern and desperately search +for an escape route. You see a rickety bridge spanning a bottomless chasm. + +[Take the Bridge] (../get-way/get-away.md) \ No newline at end of file From 3180e6bc7be8a42afebd77f3aa4ae49f0fb79ce9 Mon Sep 17 00:00:00 2001 From: "Donovan K. Hamrick" Date: Wed, 16 Mar 2016 20:02:31 -0700 Subject: [PATCH 2833/5486] Add get-away story option for Froboznian storyline --- english/get-away/get-away.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/get-away/get-away.md diff --git a/english/get-away/get-away.md b/english/get-away/get-away.md new file mode 100644 index 0000000000..d696c3ee82 --- /dev/null +++ b/english/get-away/get-away.md @@ -0,0 +1,2 @@ +You race across the rickety bridge as the officer explodes from the room. He begins +across the brdige just as you get to the other end. \ No newline at end of file From 5939008ef37db4c2dad561a592060d24100194e5 Mon Sep 17 00:00:00 2001 From: "Donovan K. Hamrick" Date: Wed, 16 Mar 2016 20:07:21 -0700 Subject: [PATCH 2834/5486] Fix spelling in link for option --- english/froboznia/froboznia.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/froboznia/froboznia.md b/english/froboznia/froboznia.md index 1cb331f794..aaf41a3872 100644 --- a/english/froboznia/froboznia.md +++ b/english/froboznia/froboznia.md @@ -6,4 +6,4 @@ You deftly spin around the clumsy officer's hand and rush out the doorway on the other side of the room. You enter a huge, poorly lit cavern and desperately search for an escape route. You see a rickety bridge spanning a bottomless chasm. -[Take the Bridge] (../get-way/get-away.md) \ No newline at end of file +[Take the Bridge] (../get-away/get-away.md) \ No newline at end of file From 9acc668319fc1617f7d89dfb9939b15b0f52edac Mon Sep 17 00:00:00 2001 From: "Donovan K. Hamrick" Date: Wed, 16 Mar 2016 20:09:14 -0700 Subject: [PATCH 2835/5486] Fix spelling of 'bridge' --- english/get-away/get-away.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/get-away/get-away.md b/english/get-away/get-away.md index d696c3ee82..16ccecfa14 100644 --- a/english/get-away/get-away.md +++ b/english/get-away/get-away.md @@ -1,2 +1,2 @@ You race across the rickety bridge as the officer explodes from the room. He begins -across the brdige just as you get to the other end. \ No newline at end of file +across the bridge just as you get to the other end. \ No newline at end of file From ab6f053d382ad8f7af5e88879309e1bbc42e025a Mon Sep 17 00:00:00 2001 From: Lapyl Date: Wed, 16 Mar 2016 21:20:42 -0700 Subject: [PATCH 2836/5486] docs: Improved Gujarati.md Extended Gujarati.md by adding a sentence. --- Gujarati/gujarati.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gujarati/gujarati.md b/Gujarati/gujarati.md index f94d255394..7a8130b5e6 100644 --- a/Gujarati/gujarati.md +++ b/Gujarati/gujarati.md @@ -4,3 +4,5 @@ followed without intermission, then the steadiness of mind is secured. A problem is achance for you to do your best. Tha best way to predict the future is to create. + +Gujarati language is great. Lord Krishna spoke or led to it. Mahatma Gandhi spoke and wrote in it. From 9a6ed761452103b35106a7b2262c8a130cb9c14f Mon Sep 17 00:00:00 2001 From: StefanoCremona Date: Thu, 17 Mar 2016 16:12:30 +0100 Subject: [PATCH 2837/5486] Add overthrowing books looking for a secret door. --- .../controlla-stanza/cerca-passaggio/cerca-passaggio.md | 1 + .../esamina-stanza/controlla-stanza/controlla-stanza.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Italian/scappare/scopri-oggetto/esamina-stanza/controlla-stanza/cerca-passaggio/cerca-passaggio.md diff --git a/Italian/scappare/scopri-oggetto/esamina-stanza/controlla-stanza/cerca-passaggio/cerca-passaggio.md b/Italian/scappare/scopri-oggetto/esamina-stanza/controlla-stanza/cerca-passaggio/cerca-passaggio.md new file mode 100644 index 0000000000..61d6d88c6b --- /dev/null +++ b/Italian/scappare/scopri-oggetto/esamina-stanza/controlla-stanza/cerca-passaggio/cerca-passaggio.md @@ -0,0 +1 @@ +Inizi a rovesciare nervosamente e disperatamente tutti i libri cercando una via d'uscita nella libreria. \ No newline at end of file diff --git a/Italian/scappare/scopri-oggetto/esamina-stanza/controlla-stanza/controlla-stanza.md b/Italian/scappare/scopri-oggetto/esamina-stanza/controlla-stanza/controlla-stanza.md index 35fd88f5b3..067ed6b102 100644 --- a/Italian/scappare/scopri-oggetto/esamina-stanza/controlla-stanza/controlla-stanza.md +++ b/Italian/scappare/scopri-oggetto/esamina-stanza/controlla-stanza/controlla-stanza.md @@ -1,3 +1,5 @@ Mentre ti volti verso la parete opposta, che ospita una libreria piena di volumi antichi, noti con inquietudine che la stanza è priva di finestre. Non c'è traccia di porte: la consapevolezza di essere in trappola si fa strada nei tuoi pensieri. + +[Rovesci tutti i libri cercando un passaggio segreto](cerca-passaggio/cerca-passaggio.md) From 7e06ce4e297d169bb79837fc5a88513e37b437b5 Mon Sep 17 00:00:00 2001 From: Aellon Date: Thu, 17 Mar 2016 11:27:25 -0400 Subject: [PATCH 2838/5486] move file into "escape-to-the-wilderness" folder --- .../escape-to-the-wilderness/wilderness.md | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 english/escape-to-the-wilderness/wilderness.md diff --git a/english/escape-to-the-wilderness/wilderness.md b/english/escape-to-the-wilderness/wilderness.md new file mode 100644 index 0000000000..a15e698e29 --- /dev/null +++ b/english/escape-to-the-wilderness/wilderness.md @@ -0,0 +1,22 @@ +You decide to escape the city for a weekend and head out to the wilderness. + +With your bag all packed with camping gear, you make your way toward the mountains. + +The hike to a campsite was relatively easy so you settle down in a sleeping bag +next to the campfire, and drift off to sleep. + +You awake to find you're being dragged across the forest floor. But by who or what? + +Perhaps a [bear](https://github.com/udacity/create-your-own-adventure/blob/master/english/bear/bear.md) got a hold of you. + +In a moment of panic, you: + +[sing](https://github.com/udacity/create-your-own-adventure/blob/master/english/sing/sing.md) + +convince yourself you're [dreaming](https://github.com/udacity/create-your-own-adventure/blob/master/english/dream/dream.md) + +[meditate](https://github.com/udacity/create-your-own-adventure/blob/master/english/meditate/meditate.md) + +make a [haiku](https://github.com/udacity/create-your-own-adventure/blob/master/english/write-a-hiku/hiku.md) to stay calm + +[scream](https://github.com/udacity/create-your-own-adventure/blob/master/english/scream/scream.md) \ No newline at end of file From 8871184b0ca7ec15055251b830eed236ff605ca2 Mon Sep 17 00:00:00 2001 From: aellonk Date: Thu, 17 Mar 2016 11:32:40 -0400 Subject: [PATCH 2839/5486] Delete wilderness.md and add to specified folder --- english/wilderness.md | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 english/wilderness.md diff --git a/english/wilderness.md b/english/wilderness.md deleted file mode 100644 index a15e698e29..0000000000 --- a/english/wilderness.md +++ /dev/null @@ -1,22 +0,0 @@ -You decide to escape the city for a weekend and head out to the wilderness. - -With your bag all packed with camping gear, you make your way toward the mountains. - -The hike to a campsite was relatively easy so you settle down in a sleeping bag -next to the campfire, and drift off to sleep. - -You awake to find you're being dragged across the forest floor. But by who or what? - -Perhaps a [bear](https://github.com/udacity/create-your-own-adventure/blob/master/english/bear/bear.md) got a hold of you. - -In a moment of panic, you: - -[sing](https://github.com/udacity/create-your-own-adventure/blob/master/english/sing/sing.md) - -convince yourself you're [dreaming](https://github.com/udacity/create-your-own-adventure/blob/master/english/dream/dream.md) - -[meditate](https://github.com/udacity/create-your-own-adventure/blob/master/english/meditate/meditate.md) - -make a [haiku](https://github.com/udacity/create-your-own-adventure/blob/master/english/write-a-hiku/hiku.md) to stay calm - -[scream](https://github.com/udacity/create-your-own-adventure/blob/master/english/scream/scream.md) \ No newline at end of file From 1dbf6dde3290b6d4074d1115f929b70f50f7a9d9 Mon Sep 17 00:00:00 2001 From: aellonk Date: Thu, 17 Mar 2016 11:48:13 -0400 Subject: [PATCH 2840/5486] Change absolute to relative links, shorten lines --- .../escape-to-the-wilderness/wilderness.md | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/english/escape-to-the-wilderness/wilderness.md b/english/escape-to-the-wilderness/wilderness.md index a15e698e29..3aa163384f 100644 --- a/english/escape-to-the-wilderness/wilderness.md +++ b/english/escape-to-the-wilderness/wilderness.md @@ -1,22 +1,26 @@ -You decide to escape the city for a weekend and head out to the wilderness. +You decide to escape the city for a +weekend and head out to the wilderness. -With your bag all packed with camping gear, you make your way toward the mountains. +With your bag all packed with camping +gear, you make your way toward the mountains. -The hike to a campsite was relatively easy so you settle down in a sleeping bag +The hike to a campsite was relatively +easy so you settle down in a sleeping bag next to the campfire, and drift off to sleep. -You awake to find you're being dragged across the forest floor. But by who or what? +You awake to find you're being dragged across +the forest floor. But by who or what? -Perhaps a [bear](https://github.com/udacity/create-your-own-adventure/blob/master/english/bear/bear.md) got a hold of you. +Perhaps a [bear](english/bear/bear.md) got a hold of you. In a moment of panic, you: -[sing](https://github.com/udacity/create-your-own-adventure/blob/master/english/sing/sing.md) +[sing](english/sing/sing.md) -convince yourself you're [dreaming](https://github.com/udacity/create-your-own-adventure/blob/master/english/dream/dream.md) +convince yourself you're [dreaming](english/dream/dream.md) -[meditate](https://github.com/udacity/create-your-own-adventure/blob/master/english/meditate/meditate.md) +[meditate](english/meditate/meditate.md) -make a [haiku](https://github.com/udacity/create-your-own-adventure/blob/master/english/write-a-hiku/hiku.md) to stay calm +make a [haiku](english/write-a-hiku/hiku.md) to stay calm -[scream](https://github.com/udacity/create-your-own-adventure/blob/master/english/scream/scream.md) \ No newline at end of file +[scream](english/scream/scream.md) From f7094b8b8dc5cd522377f367978f8f54429ab99e Mon Sep 17 00:00:00 2001 From: aellonk Date: Thu, 17 Mar 2016 11:53:40 -0400 Subject: [PATCH 2841/5486] Add escape-to-the-wilderness as an option --- english/bored/bored.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/bored/bored.md b/english/bored/bored.md index b272dee45a..4e16bfa1cb 100644 --- a/english/bored/bored.md +++ b/english/bored/bored.md @@ -7,3 +7,5 @@ "Or decide it's [STORY TIME](../avatar/air.md)?" "Or should I go on an [ADVENTURE!](../eat-rainbows/rainbows.md)?" + +"Or maybe [escape to the wilderness](../escape-to-the-wilderness/wilderness.md)?" From 7692bbdb8772b9931336aa6bdc0d66ebbef9e334 Mon Sep 17 00:00:00 2001 From: aellonk Date: Thu, 17 Mar 2016 11:57:24 -0400 Subject: [PATCH 2842/5486] Fix relative links --- english/escape-to-the-wilderness/wilderness.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/english/escape-to-the-wilderness/wilderness.md b/english/escape-to-the-wilderness/wilderness.md index 3aa163384f..2d179a1f44 100644 --- a/english/escape-to-the-wilderness/wilderness.md +++ b/english/escape-to-the-wilderness/wilderness.md @@ -11,16 +11,16 @@ next to the campfire, and drift off to sleep. You awake to find you're being dragged across the forest floor. But by who or what? -Perhaps a [bear](english/bear/bear.md) got a hold of you. +Perhaps a [bear](../bear/bear.md) got a hold of you. In a moment of panic, you: -[sing](english/sing/sing.md) +[sing](../sing/sing.md) -convince yourself you're [dreaming](english/dream/dream.md) +convince yourself you're [dreaming](../dream/dream.md) -[meditate](english/meditate/meditate.md) +[meditate](../meditate/meditate.md) -make a [haiku](english/write-a-hiku/hiku.md) to stay calm +make a [haiku](../write-a-hiku/hiku.md) to stay calm -[scream](english/scream/scream.md) +[scream](../scream/scream.md) From 378f508e651fce6299877275efd2c5991f75fc4c Mon Sep 17 00:00:00 2001 From: aellonk Date: Thu, 17 Mar 2016 11:59:43 -0400 Subject: [PATCH 2843/5486] Delete haiku line and link --- english/escape-to-the-wilderness/wilderness.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/escape-to-the-wilderness/wilderness.md b/english/escape-to-the-wilderness/wilderness.md index 2d179a1f44..4cf360f0e9 100644 --- a/english/escape-to-the-wilderness/wilderness.md +++ b/english/escape-to-the-wilderness/wilderness.md @@ -21,6 +21,4 @@ convince yourself you're [dreaming](../dream/dream.md) [meditate](../meditate/meditate.md) -make a [haiku](../write-a-hiku/hiku.md) to stay calm - [scream](../scream/scream.md) From 8718c8598c808eb024b6e979c4b4fa9a4426bc5d Mon Sep 17 00:00:00 2001 From: piperid Date: Thu, 17 Mar 2016 22:44:27 -0500 Subject: [PATCH 2844/5486] Add run-away --- korean/light-fire/fire.md | 2 ++ korean/light-fire/run-away/run-away.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 korean/light-fire/run-away/run-away.md diff --git a/korean/light-fire/fire.md b/korean/light-fire/fire.md index 1a91f89983..8d48216aa5 100644 --- a/korean/light-fire/fire.md +++ b/korean/light-fire/fire.md @@ -7,3 +7,5 @@ [벽을 먹는다](../eating-walls/eating-marshmallows.md)? [다시 잔다](../sleep/marshmallow.md)? + +밖으로 [달아난다](run-away/run-away.md)? \ No newline at end of file diff --git a/korean/light-fire/run-away/run-away.md b/korean/light-fire/run-away/run-away.md new file mode 100644 index 0000000000..c0516e5cb4 --- /dev/null +++ b/korean/light-fire/run-away/run-away.md @@ -0,0 +1 @@ +마시멜로 방 천장이 무너지기 전에 빨리 밖으로 달려 나갑니다. \ No newline at end of file From 7d4e49e70d7b59e202390a2651e64e084afaf803 Mon Sep 17 00:00:00 2001 From: Serge Madignier Date: Fri, 18 Mar 2016 09:20:21 +0100 Subject: [PATCH 2845/5486] add choice to do nothing in "reve-etrange" --- french/dormir/reve-etrange.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/french/dormir/reve-etrange.md b/french/dormir/reve-etrange.md index d7f250feae..341a326a52 100644 --- a/french/dormir/reve-etrange.md +++ b/french/dormir/reve-etrange.md @@ -10,4 +10,6 @@ Que faites-vous ? [Je panique](../panique/frapper-le-mur.md) -[Je mange](../manger/faim.md) \ No newline at end of file +[Je mange](../manger/faim.md) + +[Rien] (../rien/rien.md) \ No newline at end of file From 969c43fd472f97df383cc4cde5d3ee68ea0626a1 Mon Sep 17 00:00:00 2001 From: Ralph Pighin Date: Fri, 18 Mar 2016 11:14:26 +0100 Subject: [PATCH 2846/5486] Remove typo Fishe and add bigger teeth and big appetite --- german/Kopfsprung/Kopfsprung.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/Kopfsprung/Kopfsprung.md b/german/Kopfsprung/Kopfsprung.md index bc478372a7..d0cfce2eb2 100644 --- a/german/Kopfsprung/Kopfsprung.md +++ b/german/Kopfsprung/Kopfsprung.md @@ -2,7 +2,7 @@ Sie springen ins Wasser und holen die Hose zurück. Im Wasser sehen Sie, dass ihr Boot auf ein Riff aufgelaufen ist. Das Riff ist mit wunderschönen Korallen bewachsen, welche eine bunte Schar Fische beheimatet. -Die Fishe haben große Zähne und die Fische haben Hunger. +Die Fische haben sehr große Zähne und die Fische haben Hunger. Großen Hunger. Werden Sie: From 6ce06b6cc17c11dec95352564c9e2c52e331d5d9 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 18 Mar 2016 12:47:31 +0100 Subject: [PATCH 2847/5486] Add new option to Japan.md, and some story to follow it --- english/dream/fly/asia/japan/japan.md | 4 +++- english/dream/fly/asia/japan/train/train.md | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 english/dream/fly/asia/japan/train/train.md diff --git a/english/dream/fly/asia/japan/japan.md b/english/dream/fly/asia/japan/japan.md index 326c4faf04..b58cefe23b 100644 --- a/english/dream/fly/asia/japan/japan.md +++ b/english/dream/fly/asia/japan/japan.md @@ -2,4 +2,6 @@ You have decided to leave India and fly to Japan. You land in Tokyo Haneda Airport in the morning. -What is your first stop in Japan? \ No newline at end of file +What is your first stop in Japan? + +[Board a train](english/dream/fly/asia/japan/train.md) heading to Mount Fuji. \ No newline at end of file diff --git a/english/dream/fly/asia/japan/train/train.md b/english/dream/fly/asia/japan/train/train.md new file mode 100644 index 0000000000..7b99954223 --- /dev/null +++ b/english/dream/fly/asia/japan/train/train.md @@ -0,0 +1,8 @@ +You board the next train heading to Mount Fuji, and arrive much faster than +expected. As you arrive at the entrance, it occurs to you that such a +popular destination is strangely empty of visitors. You approach the +first gate, and realize that the statue of a 3-tailed fox beside it is +not a statue at all, but alive. The fox greets you, and asks whether +you would be so kind as to donate 1,000 yen toward the UNESCO world +heritage site. Something about its tone and expression make you +suspicious of what might happen should you proceed without making a donation. \ No newline at end of file From 79968847b6aa57c4a5124a4f24f2d6b32be666fb Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 18 Mar 2016 12:53:20 +0100 Subject: [PATCH 2848/5486] Fix broken link --- english/dream/fly/asia/japan/japan.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/fly/asia/japan/japan.md b/english/dream/fly/asia/japan/japan.md index b58cefe23b..7ef72511ea 100644 --- a/english/dream/fly/asia/japan/japan.md +++ b/english/dream/fly/asia/japan/japan.md @@ -4,4 +4,4 @@ You land in Tokyo Haneda Airport in the morning. What is your first stop in Japan? -[Board a train](english/dream/fly/asia/japan/train.md) heading to Mount Fuji. \ No newline at end of file +[Board a train](../train.md) heading to Mount Fuji. \ No newline at end of file From a6e26d7794cda6c152e175bbed9529a26a3a5b2f Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 18 Mar 2016 12:56:22 +0100 Subject: [PATCH 2849/5486] Fix broken link (again) --- english/dream/fly/asia/japan/japan.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/fly/asia/japan/japan.md b/english/dream/fly/asia/japan/japan.md index 7ef72511ea..d772170d29 100644 --- a/english/dream/fly/asia/japan/japan.md +++ b/english/dream/fly/asia/japan/japan.md @@ -4,4 +4,4 @@ You land in Tokyo Haneda Airport in the morning. What is your first stop in Japan? -[Board a train](../train.md) heading to Mount Fuji. \ No newline at end of file +[Board a train](../train/train.md) heading to Mount Fuji. \ No newline at end of file From b9d9838e8159881fbbc930b60f8dd68cec52b248 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 18 Mar 2016 13:08:26 +0100 Subject: [PATCH 2850/5486] Fix link again...maybe I got it right this time? --- english/dream/fly/asia/japan/japan.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/fly/asia/japan/japan.md b/english/dream/fly/asia/japan/japan.md index d772170d29..fed76bb9bd 100644 --- a/english/dream/fly/asia/japan/japan.md +++ b/english/dream/fly/asia/japan/japan.md @@ -4,4 +4,4 @@ You land in Tokyo Haneda Airport in the morning. What is your first stop in Japan? -[Board a train](../train/train.md) heading to Mount Fuji. \ No newline at end of file +[Board a train](train/train.md) heading to Mount Fuji. \ No newline at end of file From 76e3ccc288b8b31f9111f01bda6a92d34639e61f Mon Sep 17 00:00:00 2001 From: stlbluesfan46 Date: Fri, 18 Mar 2016 08:29:12 -0500 Subject: [PATCH 2851/5486] Added two options after crossing the bridge. --- english/get-away/get-away.md | 8 +++++++- english/stairs/stairs.md | 1 + english/tunnel/tunnel.md | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 english/stairs/stairs.md create mode 100644 english/tunnel/tunnel.md diff --git a/english/get-away/get-away.md b/english/get-away/get-away.md index 16ccecfa14..d7d9afec80 100644 --- a/english/get-away/get-away.md +++ b/english/get-away/get-away.md @@ -1,2 +1,8 @@ You race across the rickety bridge as the officer explodes from the room. He begins -across the bridge just as you get to the other end. \ No newline at end of file +across the bridge just as you get to the other end. + +There's a set of twisting stairs to the left and a long dark tunnel to your right. +Which way do you go? + +Take the [stairs](../stairs/stairs.md). +Enter the [tunnel](../tunnel/tunnel.md). diff --git a/english/stairs/stairs.md b/english/stairs/stairs.md new file mode 100644 index 0000000000..3a0bfe9c29 --- /dev/null +++ b/english/stairs/stairs.md @@ -0,0 +1 @@ +You race for the twisting stair case. The officer is catching up, but you race up the stairs. As you round your way up the stairs you hear the officer pounding up behind you. You glance back and see him only a few steps away! diff --git a/english/tunnel/tunnel.md b/english/tunnel/tunnel.md new file mode 100644 index 0000000000..6985fcc5c1 --- /dev/null +++ b/english/tunnel/tunnel.md @@ -0,0 +1 @@ +You sprint into the tunnel. The light quickly fades as you rush deeper into its depths. It gets eerily quiet. You can no longer hear your pursuer, only your breath echoing around you. From ac3a7cece1c4c05157657097b84ff4e4bd52f472 Mon Sep 17 00:00:00 2001 From: stlbluesfan46 Date: Fri, 18 Mar 2016 08:36:19 -0500 Subject: [PATCH 2852/5486] Added a line between the links --- english/get-away/get-away.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/get-away/get-away.md b/english/get-away/get-away.md index d7d9afec80..a046f3d151 100644 --- a/english/get-away/get-away.md +++ b/english/get-away/get-away.md @@ -5,4 +5,5 @@ There's a set of twisting stairs to the left and a long dark tunnel to your righ Which way do you go? Take the [stairs](../stairs/stairs.md). + Enter the [tunnel](../tunnel/tunnel.md). From 57fbff53269de21a45bae9c3dd36dbbe83f79d83 Mon Sep 17 00:00:00 2001 From: stlbluesfan46 Date: Fri, 18 Mar 2016 08:37:00 -0500 Subject: [PATCH 2853/5486] Split the long lines into several --- english/stairs/stairs.md | 5 ++++- english/tunnel/tunnel.md | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/english/stairs/stairs.md b/english/stairs/stairs.md index 3a0bfe9c29..3b4b3c55da 100644 --- a/english/stairs/stairs.md +++ b/english/stairs/stairs.md @@ -1 +1,4 @@ -You race for the twisting stair case. The officer is catching up, but you race up the stairs. As you round your way up the stairs you hear the officer pounding up behind you. You glance back and see him only a few steps away! +You race for the twisting stair case. The officer is catching up, +but you race up the stairs. As you round your way up the stairs you +hear the officer pounding up behind you. You glance back and see +him only a few steps away! diff --git a/english/tunnel/tunnel.md b/english/tunnel/tunnel.md index 6985fcc5c1..325c62afe6 100644 --- a/english/tunnel/tunnel.md +++ b/english/tunnel/tunnel.md @@ -1 +1,3 @@ -You sprint into the tunnel. The light quickly fades as you rush deeper into its depths. It gets eerily quiet. You can no longer hear your pursuer, only your breath echoing around you. +You sprint into the tunnel. The light quickly fades as you rush +deeper into its depths. It gets eerily quiet. You can no longer +hear your pursuer, only your breath echoing around you. From 826dc2fc0c6a3c6db2d6631967ab73d573f663a9 Mon Sep 17 00:00:00 2001 From: Victor Lopez Date: Fri, 18 Mar 2016 21:17:56 +0100 Subject: [PATCH 2854/5486] Add day-dream to English story --- english/day-dream/day-dream.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/day-dream/day-dream.md diff --git a/english/day-dream/day-dream.md b/english/day-dream/day-dream.md new file mode 100644 index 0000000000..6e9d2f2274 --- /dev/null +++ b/english/day-dream/day-dream.md @@ -0,0 +1 @@ +An you wake up from you day dream and realized you have forgotten how to clone a remote. The end! \ No newline at end of file From eefba6b85228ba81b97216e8c9273ec1b3a71dcd Mon Sep 17 00:00:00 2001 From: Victor Lopez Date: Fri, 18 Mar 2016 21:29:35 +0100 Subject: [PATCH 2855/5486] Add missing link to day-dream --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5eecbc65c5..f3d180c6f6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -865,5 +865,5 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon Explore the unknown. Most people die without ever visiting this [place.](underwater/scuba-diving.md) -As you attempt this, a voice booms!! +As you attempt this, a voice [booms](day-dream/day-dream.md)!! From cb9919c5f6b6be848eeab6eeac6d36da9a167bce Mon Sep 17 00:00:00 2001 From: Victor Lopez Date: Fri, 18 Mar 2016 21:34:16 +0100 Subject: [PATCH 2856/5486] Add a new line so automerge is possible --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index f3d180c6f6..87272ed214 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -865,5 +865,7 @@ Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indon Explore the unknown. Most people die without ever visiting this [place.](underwater/scuba-diving.md) -As you attempt this, a voice [booms](day-dream/day-dream.md)!! +As you attempt this, a voice booms!! + +The [boom](day-dream/day-dream.md) From da02df896cad3677a44e481398a278abad27ea29 Mon Sep 17 00:00:00 2001 From: shaikh12345 Date: Sat, 19 Mar 2016 09:46:04 +0530 Subject: [PATCH 2857/5486] Add a page with a link to Shaikh Ismail's quora profile --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5eecbc65c5..b204814e3f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,5 @@ +[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) + You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. [Know about the life of this world](00-Life-of-this-world/Life of this world.md) From 82d50c63461f58f7ba0093b99178b92df1c292f3 Mon Sep 17 00:00:00 2001 From: shaikh12345 Date: Sat, 19 Mar 2016 09:49:57 +0530 Subject: [PATCH 2858/5486] Add a link to quora profile in ismail-quora-profile subdirectory --- english/ismail-quora-profile/quora-profile.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/ismail-quora-profile/quora-profile.md diff --git a/english/ismail-quora-profile/quora-profile.md b/english/ismail-quora-profile/quora-profile.md new file mode 100644 index 0000000000..7fd49821db --- /dev/null +++ b/english/ismail-quora-profile/quora-profile.md @@ -0,0 +1 @@ +Click [here](https://www.quora.com/profile/Shaikh-Ismail) to see my quora profile. Have nice time! \ No newline at end of file From 542ff3dfbc5dd550dee2062b2709f63884a5f385 Mon Sep 17 00:00:00 2001 From: Otto Borchert Date: Fri, 18 Mar 2016 22:31:09 -0700 Subject: [PATCH 2859/5486] Add more advice from mothers to the story. --- english/advice_from_mother/advice_from_mother.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/advice_from_mother/advice_from_mother.md b/english/advice_from_mother/advice_from_mother.md index 0d8f51e5e1..9275b400bf 100644 --- a/english/advice_from_mother/advice_from_mother.md +++ b/english/advice_from_mother/advice_from_mother.md @@ -5,4 +5,6 @@ giant pile of fluff in one corner, watching the swirl and glitter of the toasting surface until you can walk out of the corner and back into the bar. -just a random test \ No newline at end of file +just a random test + +My mother also told me that I should eat my vegetables. From 97a206fd3c012a096b955e6e03bf8d47fa519379 Mon Sep 17 00:00:00 2001 From: Arturo Reyes Date: Sat, 19 Mar 2016 00:51:08 -0500 Subject: [PATCH 2860/5486] Spiderman --- espanol/canudos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index df89379e43..69a98e1606 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -131,4 +131,6 @@ se atrevio a lo que nadie se [imaginó:](Mutantes/Mutantes.md) [Hizo un breve movimiento para llamar a sus ayudantes y](ayudantes/ayudantes.md) -éstos, sin mediar palabra y al unísono, [no dudaron](ayudantes_accion/ayudantes_accion.md) \ No newline at end of file +éstos, sin mediar palabra y al unísono, [no dudaron](ayudantes_accion/ayudantes_accion.md) + +Y llego spiderman a salvar el dia. \ No newline at end of file From 2a4d8533aee14b177106726076621f9497d55fbb Mon Sep 17 00:00:00 2001 From: Joel Date: Sat, 19 Mar 2016 15:16:29 -0400 Subject: [PATCH 2861/5486] off to the gym --- english/triathlon/triathlon.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/triathlon/triathlon.md b/english/triathlon/triathlon.md index 833dceba1f..ba0965a191 100644 --- a/english/triathlon/triathlon.md +++ b/english/triathlon/triathlon.md @@ -16,3 +16,5 @@ reading reviews. Okay, now you realize that this is going to cost you some real money. You have to get some serious gear to compete. You can't just use an old bike and any pair of sneakers. You need to put together a budget. + +When you sit down to crunch the numbers for your budget, your wife asks, "When's last time you crunched your abs? You know the triathlon is right around the corner. Suddenly it hits you, you've been avoiding what you're really afrad of. It's a lot easier to buy gear and make plans to train rather than actually training. Off to the gym you go. From 569778ccdcdb6ed7d3e01c410565112e0cbe81da Mon Sep 17 00:00:00 2001 From: Joel Date: Sat, 19 Mar 2016 15:22:30 -0400 Subject: [PATCH 2862/5486] off to the gym shorter lines --- english/triathlon/triathlon.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/triathlon/triathlon.md b/english/triathlon/triathlon.md index ba0965a191..2946e9d9e7 100644 --- a/english/triathlon/triathlon.md +++ b/english/triathlon/triathlon.md @@ -17,4 +17,8 @@ Okay, now you realize that this is going to cost you some real money. You have to get some serious gear to compete. You can't just use an old bike and any pair of sneakers. You need to put together a budget. -When you sit down to crunch the numbers for your budget, your wife asks, "When's last time you crunched your abs? You know the triathlon is right around the corner. Suddenly it hits you, you've been avoiding what you're really afrad of. It's a lot easier to buy gear and make plans to train rather than actually training. Off to the gym you go. +When you sit down to crunch the numbers for your budget, your wife asks, +"When's last time you crunched your abs? You know the triathlon is right +around the corner. Suddenly it hits you, you've been avoiding what +you're really afrad of. It's a lot easier to buy gear and make plans +to train rather than actually training. Off to the gym you go. From c2f3c59d01ce988f71324126d4e1be8940684fb0 Mon Sep 17 00:00:00 2001 From: Robert Hooper Date: Sat, 19 Mar 2016 13:26:03 -0600 Subject: [PATCH 2863/5486] Add text. --- english/zork/zork.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/zork/zork.md b/english/zork/zork.md index 7287527675..ea95319d7b 100644 --- a/english/zork/zork.md +++ b/english/zork/zork.md @@ -10,4 +10,6 @@ Very scary story for halloween There is an object that looks like a [torch](../torch/torch.md) on the ground. -There is also om twine on the ground. \ No newline at end of file +There is also om twine on the ground. + +The work Zork brings back memories. From eff5087be07c974e79164e6253f142c457c771df Mon Sep 17 00:00:00 2001 From: Ze Date: Sun, 20 Mar 2016 00:11:50 +0000 Subject: [PATCH 2864/5486] Adicionou-se a hipotese de apenas apagar o lume e tentar pensar calmamente sobre o que fazer --- portugues_pt/chaleira/apagar/apagar.md | 3 +++ portugues_pt/chaleira/chaleira.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 portugues_pt/chaleira/apagar/apagar.md diff --git a/portugues_pt/chaleira/apagar/apagar.md b/portugues_pt/chaleira/apagar/apagar.md new file mode 100644 index 0000000000..1ddaa7dc26 --- /dev/null +++ b/portugues_pt/chaleira/apagar/apagar.md @@ -0,0 +1,3 @@ +O assobiar da chaleira não deixava pensar. Apagou o lume e pondera sobre como lidar com tanta riqueza. + +Decide contemplar durante os próximos dias sobre o que é possivel fazer com tanto dinheiro. diff --git a/portugues_pt/chaleira/chaleira.md b/portugues_pt/chaleira/chaleira.md index 0e52e9df2f..424923f9ea 100644 --- a/portugues_pt/chaleira/chaleira.md +++ b/portugues_pt/chaleira/chaleira.md @@ -5,3 +5,5 @@ Pretendia fazer um [chá](cha/cha.md). Queria encher um [saco de água quente](saco/saco.md) depois de deixar arrefecer um pouco ou misturar com água fria. Queria usar a água para cozinhar [arroz](arroz/arroz.md). + +A chaleira assobiava há já algum tempo. Estava na altura de [apagar o lume](apagar/apagar.md). From b8e84f293e3cfa877a994576397e5bc9b55d2ade Mon Sep 17 00:00:00 2001 From: Sujay Bhobe Date: Sat, 19 Mar 2016 18:47:42 -0700 Subject: [PATCH 2865/5486] Added a link to a resource for finding other Seattle-kars --- Marathi/marathi.md | 4 +++- Marathi/seattle/seattle.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Marathi/seattle/seattle.md diff --git a/Marathi/marathi.md b/Marathi/marathi.md index bd8977f6a2..b4ad1eb92e 100644 --- a/Marathi/marathi.md +++ b/Marathi/marathi.md @@ -4,4 +4,6 @@ मराठी विश्व खुप सुंदर आहे. मी मराठी असल्याचा मला अभिमान आहे. -mazi story [ethe](mi_marathi/mi_marathi.md)ahe. \ No newline at end of file +mazi story [ethe](mi_marathi/mi_marathi.md)ahe. + +Want to meet Maharashtrians in Seattle? Go [here](seattle/seattle.md) \ No newline at end of file diff --git a/Marathi/seattle/seattle.md b/Marathi/seattle/seattle.md new file mode 100644 index 0000000000..7d310e099d --- /dev/null +++ b/Marathi/seattle/seattle.md @@ -0,0 +1 @@ +[Enter](http://www.seattlemm.org/) \ No newline at end of file From a7d4a8e219c461281704a7f1e811d6079c65ea35 Mon Sep 17 00:00:00 2001 From: Carlos Villarreal Date: Sat, 19 Mar 2016 21:50:05 -0500 Subject: [PATCH 2866/5486] Pregunta del consejero --- espanol/torre/alarma/asustado/asustado.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/torre/alarma/asustado/asustado.md b/espanol/torre/alarma/asustado/asustado.md index e08a2116d2..800d043c18 100644 --- a/espanol/torre/alarma/asustado/asustado.md +++ b/espanol/torre/alarma/asustado/asustado.md @@ -1,4 +1,5 @@ Empezando un escándalo, entonces el consejero fue corriendo hacia donde estaba el alcalde del pueblo. Y aprovechado la confusión del pueblo saco una daga y le apuñalo en el corazon. El alcalde alcanzó a vociferar: "Qué haz hecho? Ahora todos sabrán la verdad acerca de tus propositos" y al decir esto -cayó muerto dejando caer un sobre. El consejero intentó hacerse con el sobre pero el mismo fue impulsado por el viento. \ No newline at end of file +cayó muerto dejando caer un sobre. El consejero intentó hacerse con el sobre pero el mismo fue impulsado por el viento. +¿Qué contendría dicho sobre?. Pensó el consejero. \ No newline at end of file From add3989b126a2db7ac3b31a70be2e248a5b8c7a4 Mon Sep 17 00:00:00 2001 From: tokayon Date: Sun, 20 Mar 2016 15:26:07 +0200 Subject: [PATCH 2867/5486] Update visit-owl.md --- russian/eating-walls/breakfast/visit-owl/visit-owl.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/eating-walls/breakfast/visit-owl/visit-owl.md b/russian/eating-walls/breakfast/visit-owl/visit-owl.md index dab200f2af..0cdc6359da 100644 --- a/russian/eating-walls/breakfast/visit-owl/visit-owl.md +++ b/russian/eating-walls/breakfast/visit-owl/visit-owl.md @@ -2,3 +2,5 @@ Она очень рада нежданным гостям, предлагает им чашечку ароматного кофе и вспоминает один забавный случай, приключившийся с ее тётушкой. + +[Послушать историю про тетушку](story/story.md) \ No newline at end of file From 3482e3cfb8e098dd6875eecc45fc33004e27ed83 Mon Sep 17 00:00:00 2001 From: tokayon Date: Sun, 20 Mar 2016 15:29:53 +0200 Subject: [PATCH 2868/5486] Add story-md --- russian/eating-walls/breakfast/visit-owl/story/story.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 russian/eating-walls/breakfast/visit-owl/story/story.md diff --git a/russian/eating-walls/breakfast/visit-owl/story/story.md b/russian/eating-walls/breakfast/visit-owl/story/story.md new file mode 100644 index 0000000000..0ab3d3fcbd --- /dev/null +++ b/russian/eating-walls/breakfast/visit-owl/story/story.md @@ -0,0 +1,6 @@ +Как-то раз рассказала мне тетушка историю. +Сидит она на дереве, размышляет. Умная была, умнее меня даже. +И приходят к ней как-то зайчик и белочка. И спрашивают: +- Тетушка Сова, мы пробовали сделать детей, но у нас ничего не получается. + Это потому что, мы - зайчик и белочка? +- Нет! Потому что вы - мальчик и мальчик.. \ No newline at end of file From aa03962c9c9e591d996771f29b17d40fe46825b4 Mon Sep 17 00:00:00 2001 From: jesspagan Date: Sun, 20 Mar 2016 13:47:40 -0400 Subject: [PATCH 2869/5486] Add option to return the dragon --- espanol/dragon/devolverlo/devolverlo.md | 1 + espanol/dragon/dragon.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 espanol/dragon/devolverlo/devolverlo.md diff --git a/espanol/dragon/devolverlo/devolverlo.md b/espanol/dragon/devolverlo/devolverlo.md new file mode 100644 index 0000000000..54a0b00188 --- /dev/null +++ b/espanol/dragon/devolverlo/devolverlo.md @@ -0,0 +1 @@ +Con el temor de que el dragón se saliera de control y los atacara a ellos mismo, decidió tratar de devolverlo. Pero el vendedor no lo aceptaba de vuelta. Sin embargo, decidió ayudarlo a domesticarlo vendiendole... \ No newline at end of file diff --git a/espanol/dragon/dragon.md b/espanol/dragon/dragon.md index d5b3ca2bab..79fe033c93 100644 --- a/espanol/dragon/dragon.md +++ b/espanol/dragon/dragon.md @@ -26,3 +26,5 @@ Pero no sabía controlar al dragón, así que decidió: [matarlo](muerte-dragon/muerte-dragon.md) [darle de comer](festin/festin.md) + +[Devolverlo](devolverlo/devolverlo.md) \ No newline at end of file From 7c56aff001669bc7589601258ccc0765aa6f09a1 Mon Sep 17 00:00:00 2001 From: jesspagan Date: Sun, 20 Mar 2016 13:49:25 -0400 Subject: [PATCH 2870/5486] Break line into multiple lines --- espanol/dragon/devolverlo/devolverlo.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/dragon/devolverlo/devolverlo.md b/espanol/dragon/devolverlo/devolverlo.md index 54a0b00188..fc16533ccc 100644 --- a/espanol/dragon/devolverlo/devolverlo.md +++ b/espanol/dragon/devolverlo/devolverlo.md @@ -1 +1,3 @@ -Con el temor de que el dragón se saliera de control y los atacara a ellos mismo, decidió tratar de devolverlo. Pero el vendedor no lo aceptaba de vuelta. Sin embargo, decidió ayudarlo a domesticarlo vendiendole... \ No newline at end of file +Con el temor de que el dragón se saliera de control y los atacara a ellos mismo, decidió tratar de devolverlo. + +Pero el vendedor no lo aceptaba de vuelta. Sin embargo, decidió ayudarlo a domesticarlo vendiendole... \ No newline at end of file From e71ddce777e15460d653997893d4ad319270f605 Mon Sep 17 00:00:00 2001 From: JC Li Date: Sun, 20 Mar 2016 18:07:51 -0700 Subject: [PATCH 2871/5486] Add story about swim in english/dream/dream.md. --- english/dream/dream.md | 2 ++ english/swim/swim.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/swim/swim.md diff --git a/english/dream/dream.md b/english/dream/dream.md index 297ed014ca..f5a3268aa2 100644 --- a/english/dream/dream.md +++ b/english/dream/dream.md @@ -21,3 +21,5 @@ Afterwards, you decide to: [karaoke](../karaoke/nope.md) [Drink a nice cup of tea](../tea/tea.md) + +[swim](../swim/swim.md) diff --git a/english/swim/swim.md b/english/swim/swim.md new file mode 100644 index 0000000000..c46368ddf4 --- /dev/null +++ b/english/swim/swim.md @@ -0,0 +1 @@ +Swim while sleeping is really cool but dangerous. You swam for 10 min and decided to give it up. From 9241601cc76d8e5bbfad54f4c01241cfd8a1cddc Mon Sep 17 00:00:00 2001 From: Armando Date: Sun, 20 Mar 2016 18:27:09 -0700 Subject: [PATCH 2872/5486] feat: add the story of the cucuyachi to the repo Following the guidelines for contributing to the story a new segment was added. The story of the cucuyachi is similar to the story of the cuco, but more regional. --- espanol/cuco/cuco.md | 8 +++++++- espanol/cucuyachi/cucuyachi.md | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 espanol/cucuyachi/cucuyachi.md diff --git a/espanol/cuco/cuco.md b/espanol/cuco/cuco.md index c4634c41ce..94b35de6ad 100644 --- a/espanol/cuco/cuco.md +++ b/espanol/cuco/cuco.md @@ -16,4 +16,10 @@ Pero su madre no oiría los gritos de terror de su cría mientras el cuco desaparecía... -junto al pequeño Elías. \ No newline at end of file +junto al pequeño Elías. + +Y si la historia del cuco +te parece espantosa, +amarrate tus chones +que la historia del [cucuyachi](../cucuyachi/cucuyachi.md) +es aun mas tenebrosa. \ No newline at end of file diff --git a/espanol/cucuyachi/cucuyachi.md b/espanol/cucuyachi/cucuyachi.md new file mode 100644 index 0000000000..0e986d6b7c --- /dev/null +++ b/espanol/cucuyachi/cucuyachi.md @@ -0,0 +1,5 @@ +El cucuyachi es el primo del cuco. +Tio del chupacabras. +Sobrino de la llorona. +El habita la region montañosa de la region de Sonora, en Mѐxico. +Y por lo tanto, le gusta el tequila, y el mezcal. From 887215c629dd748cfde3cf3fa036f47cb2e91b4f Mon Sep 17 00:00:00 2001 From: johnnyqbui Date: Mon, 21 Mar 2016 02:43:24 -0500 Subject: [PATCH 2873/5486] Added story about dimension, added dimensions/dimension.md --- english/dimensions/dimension.md | 1 + english/marshmallow.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 english/dimensions/dimension.md diff --git a/english/dimensions/dimension.md b/english/dimensions/dimension.md new file mode 100644 index 0000000000..8ea29a712d --- /dev/null +++ b/english/dimensions/dimension.md @@ -0,0 +1 @@ +And here you enter a new [dimension](https://www.youtube.com/watch?v=sea8yNCDqWo.) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 19f3636570..416bd3077b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -871,3 +871,4 @@ As you attempt this, a voice booms!! The [boom](day-dream/day-dream.md) +Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) \ No newline at end of file From 0022c50a9eb331fad13e39c55a2a428ba06e7f91 Mon Sep 17 00:00:00 2001 From: Dias Date: Mon, 21 Mar 2016 18:59:17 +0600 Subject: [PATCH 2874/5486] Instagram --- russian/instagram/instagram.md | 1 + russian/zefir.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 russian/instagram/instagram.md diff --git a/russian/instagram/instagram.md b/russian/instagram/instagram.md new file mode 100644 index 0000000000..2524b89d37 --- /dev/null +++ b/russian/instagram/instagram.md @@ -0,0 +1 @@ +Внезапно увидев фотки со вчерашнего вечера становиться ясно как я попал сюда, но что же делать дальше? \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index 405a946e18..050836e806 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -79,3 +79,5 @@ [Завоюю мир, в котором проснулся](conquer/lead.md) [Отхлебну и закушу](kompot/kompot.md) + +[Открою Instagram](instagram/instagram.md) \ No newline at end of file From 01ac8786844a188a70a2c45705b384aed092167f Mon Sep 17 00:00:00 2001 From: Jeffrey Techentin Date: Mon, 21 Mar 2016 16:40:31 -0400 Subject: [PATCH 2875/5486] feat: added an option to chicken out of your destiny to the code story --- english/cowardice/cowardice.md | 5 +++++ english/destiny/destiny.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 english/cowardice/cowardice.md diff --git a/english/cowardice/cowardice.md b/english/cowardice/cowardice.md new file mode 100644 index 0000000000..ef8ffbfd10 --- /dev/null +++ b/english/cowardice/cowardice.md @@ -0,0 +1,5 @@ +You live a life in which the only reprieve from the deep dissatisfaction with your choices is the immeasurable pain which stems from +watching everything you love and could have fought for be destroyed to make room for the objects of greater persons' wishes. + +You finally die, the few people who you knew morn for the minimum time required. Not out of loss but out of the fact that you are not worth +the effort it would take to justify their lack of sorrow to their acquaintances. diff --git a/english/destiny/destiny.md b/english/destiny/destiny.md index 9396704b54..34ed908efa 100644 --- a/english/destiny/destiny.md +++ b/english/destiny/destiny.md @@ -27,3 +27,5 @@ If you have finished pursuing your destiny, it may be time for a If you have only just begun to pursue your destiny, it's best not to do so on an [empty stomach](../breakfast/breakfast.md). + +On second thought, it might be safer to just lie low. The world is a dangerous place and to so strike out into it might be dangerous. [You decide obscurity is for you](../cowardice/cowardice.md). From 3f3696b12ef6b2238c6d3bdacec1b125459926f2 Mon Sep 17 00:00:00 2001 From: Jeffrey Techentin Date: Mon, 21 Mar 2016 16:52:23 -0400 Subject: [PATCH 2876/5486] fix: broke up lines of cowardice.md into smaller sizes --- english/cowardice/cowardice.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/english/cowardice/cowardice.md b/english/cowardice/cowardice.md index ef8ffbfd10..9d7c9b5a0b 100644 --- a/english/cowardice/cowardice.md +++ b/english/cowardice/cowardice.md @@ -1,5 +1,8 @@ -You live a life in which the only reprieve from the deep dissatisfaction with your choices is the immeasurable pain which stems from -watching everything you love and could have fought for be destroyed to make room for the objects of greater persons' wishes. +You live a life in which the only reprieve from the deep +dissatisfaction with your choices is the immeasurable pain which stems from +watching everything you love and could have fought for be destroyed to make + room for the objects of greater persons' wishes. -You finally die, the few people who you knew morn for the minimum time required. Not out of loss but out of the fact that you are not worth -the effort it would take to justify their lack of sorrow to their acquaintances. +You finally die, the few people who you knew morn for the minimum time required. + Not out of loss but out of the fact that you are not worth the effort it would take to +justify their lack of sorrow to their acquaintances. From 7a7b98296458cc6de76e968b0a6b0ffe2e668d88 Mon Sep 17 00:00:00 2001 From: Jeffrey Techentin Date: Mon, 21 Mar 2016 16:53:57 -0400 Subject: [PATCH 2877/5486] fix: broke lines of my additions to destiny.md into smaller chunks --- english/destiny/destiny.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/destiny/destiny.md b/english/destiny/destiny.md index 34ed908efa..2ba7ec802f 100644 --- a/english/destiny/destiny.md +++ b/english/destiny/destiny.md @@ -28,4 +28,8 @@ If you have finished pursuing your destiny, it may be time for a If you have only just begun to pursue your destiny, it's best not to do so on an [empty stomach](../breakfast/breakfast.md). -On second thought, it might be safer to just lie low. The world is a dangerous place and to so strike out into it might be dangerous. [You decide obscurity is for you](../cowardice/cowardice.md). +On second thought, it might be safer to just lie low. + The world is a dangerous place and to so strike out into it might be dangerous. + [You decide obscurity is for you](../cowardice/cowardice.md). + + From 07e887ddcf1f5742a1a9159d02a0e3aa64cc2428 Mon Sep 17 00:00:00 2001 From: Jose Manuel Date: Mon, 21 Mar 2016 17:01:30 -0600 Subject: [PATCH 2878/5486] Add josemcz history fragment --- espanol/canudos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 69a98e1606..0eaa811428 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -133,4 +133,6 @@ se atrevio a lo que nadie se [imaginó:](Mutantes/Mutantes.md) éstos, sin mediar palabra y al unísono, [no dudaron](ayudantes_accion/ayudantes_accion.md) -Y llego spiderman a salvar el dia. \ No newline at end of file +Y llego spiderman a salvar el dia. + +Con sus acrobáticos movimientos y osadas frases From 221f7a3006155f2c3ccd4da0d8840868c8d71f05 Mon Sep 17 00:00:00 2001 From: Seb Date: Tue, 22 Mar 2016 11:28:59 +0100 Subject: [PATCH 2879/5486] add new choice --- .../traverser-hautes-herbes/traverser-hautes-herbes.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md b/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md index 338ec7e28c..575c9e1edf 100644 --- a/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md +++ b/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md @@ -2,4 +2,6 @@ Vous prenez une pleine respiration et vous vous engagez dans les hautes-herbes. La végétation est dense et sa traversée plus compliquée que prévue. Soudain, quelque chose saisit votre cheville… -[Frapper](frapper-la-chose/frapper-la-chose.md) cette chose qui vous tracasse. \ No newline at end of file +[Frapper](frapper-la-chose/frapper-la-chose.md) cette chose qui vous tracasse. + +[Demander à Google](../../../google/google.md) quelle est cette chose étrange ! \ No newline at end of file From a16abfed3192d823c0a054861d0acb3aa95b139f Mon Sep 17 00:00:00 2001 From: DeuceX Date: Tue, 22 Mar 2016 15:32:48 +0200 Subject: [PATCH 2880/5486] Add lezginka turn of story --- russian/dance_lezginka/cake_bomb/cake_bomb.md | 9 +++++++++ russian/dance_lezginka/dance.md | 13 +++++++++++++ russian/dance_lezginka/jump/drink/drink.md | 3 +++ russian/dance_lezginka/jump/jump.md | 9 +++++++++ russian/dance_lezginka/jump/swim/swim.md | 7 +++++++ russian/dance_lezginka/keep_dancing/dance/dance.md | 9 +++++++++ russian/dance_lezginka/keep_dancing/keep.md | 11 +++++++++++ russian/dance_lezginka/keep_dancing/stop/stop.md | 7 +++++++ russian/zefir.md | 2 ++ 9 files changed, 70 insertions(+) create mode 100644 russian/dance_lezginka/cake_bomb/cake_bomb.md create mode 100644 russian/dance_lezginka/dance.md create mode 100644 russian/dance_lezginka/jump/drink/drink.md create mode 100644 russian/dance_lezginka/jump/jump.md create mode 100644 russian/dance_lezginka/jump/swim/swim.md create mode 100644 russian/dance_lezginka/keep_dancing/dance/dance.md create mode 100644 russian/dance_lezginka/keep_dancing/keep.md create mode 100644 russian/dance_lezginka/keep_dancing/stop/stop.md diff --git a/russian/dance_lezginka/cake_bomb/cake_bomb.md b/russian/dance_lezginka/cake_bomb/cake_bomb.md new file mode 100644 index 0000000000..2d1c369971 --- /dev/null +++ b/russian/dance_lezginka/cake_bomb/cake_bomb.md @@ -0,0 +1,9 @@ +Вам не нравится, что эти лица неопределенной национальности продолжают вторгаться в Ваш зефирный дом. + +Вы вспоминаете, что у Вас в кармане завалялась парочка кексовых бомб. Вы достаете бомбы и делаете предупреждения, но никто не собирается уходить. + +Вам ничего не остается, кроме как использовать бомбы. + +Зефирный дом разлетается на мелкие части, в Вашем зефирном городе начинается зефирный дождь, довольные дети бегают по зефирной площади имени Зефирыча и собирают в ведра зефир, падающий с неба. + +Что ж, хотя бы дети довольны. \ No newline at end of file diff --git a/russian/dance_lezginka/dance.md b/russian/dance_lezginka/dance.md new file mode 100644 index 0000000000..44115e436e --- /dev/null +++ b/russian/dance_lezginka/dance.md @@ -0,0 +1,13 @@ +Вы начинаете танцевать лезгинку. + +От вашего зажигательного танца зефир начинает трескаться и сквозь + +зефирные щели начинают сбегаться бородатые ребята в красных макасинах. + +Они в восторге смотрят на Ваш танец, некоторые уже готовы тоже пуститься впляс! + +[Использовать кексовые бомбы](cake_bomb/cake_bomb.md) + +[Продолжить танцевать](keep_dancing/keep.md) + +[Прыгнуть в зефирную щель](jump/jump.md) \ No newline at end of file diff --git a/russian/dance_lezginka/jump/drink/drink.md b/russian/dance_lezginka/jump/drink/drink.md new file mode 100644 index 0000000000..88c9cde864 --- /dev/null +++ b/russian/dance_lezginka/jump/drink/drink.md @@ -0,0 +1,3 @@ +Вы начинаете пить молоко из молочного озера в надежде выпить его до дна. + +Не рассчитав свои силы, молочное озеро поглощает вас :( \ No newline at end of file diff --git a/russian/dance_lezginka/jump/jump.md b/russian/dance_lezginka/jump/jump.md new file mode 100644 index 0000000000..021b7c81c2 --- /dev/null +++ b/russian/dance_lezginka/jump/jump.md @@ -0,0 +1,9 @@ +Вы прыгаете в зефирную щель. До земли недалеко, так что все в порядке. + +Но вдруг! Огромный летающий жабожук хватает Вас своим клювом и кидает в водопад из пунша. + +Вы падаете вниз и выживаете. Плывя по течению, вы доплываете до молочного озера. + +[Пить молоко](drink/drink.md) + +[Барахтаться](swim/swim.md) \ No newline at end of file diff --git a/russian/dance_lezginka/jump/swim/swim.md b/russian/dance_lezginka/jump/swim/swim.md new file mode 100644 index 0000000000..f15f4b8d03 --- /dev/null +++ b/russian/dance_lezginka/jump/swim/swim.md @@ -0,0 +1,7 @@ +В надежде спастись, вы начинаете судорожно барахтаться в воде! + +Спустя несколько минут, Вам удается взбить молоко, оно превращается сначала в сметану, а затем в масло! + +Вы залазите на масло и уходите в закат! + +В закат зефирного города... Вы спасены \ No newline at end of file diff --git a/russian/dance_lezginka/keep_dancing/dance/dance.md b/russian/dance_lezginka/keep_dancing/dance/dance.md new file mode 100644 index 0000000000..3a1e58235e --- /dev/null +++ b/russian/dance_lezginka/keep_dancing/dance/dance.md @@ -0,0 +1,9 @@ +Вы продолжаете танцевать! + +Вы поглащены танцем и не замечаете ничего вокруг. + +Во время очередного лезгиночного выхода, вы задеваете локтем двух стоящих рядом ребят. + +Один из них достает из кармана пистолет в виде заниженной лады приоры и направляет его на Вас. + +Вы понимаете, что это конец, но все равно не можете остановиться и продолжаете танце... \ No newline at end of file diff --git a/russian/dance_lezginka/keep_dancing/keep.md b/russian/dance_lezginka/keep_dancing/keep.md new file mode 100644 index 0000000000..90b2758d34 --- /dev/null +++ b/russian/dance_lezginka/keep_dancing/keep.md @@ -0,0 +1,11 @@ +Вы продолжаете танцевать. + +Кто-то даже включил музыку со своего Nokia 3210. + +Вы жжете настолько, что вскоре к танцу подключаются все новые и новые люди. + +Под тяжестью красных макасин зефирный дом готов развалиться, но никого это уже не волнует. + +[Остановить танец](stop/stop.md) + +[Танцевать до упаду](dance/dance.md) \ No newline at end of file diff --git a/russian/dance_lezginka/keep_dancing/stop/stop.md b/russian/dance_lezginka/keep_dancing/stop/stop.md new file mode 100644 index 0000000000..cee5d062a8 --- /dev/null +++ b/russian/dance_lezginka/keep_dancing/stop/stop.md @@ -0,0 +1,7 @@ +Вы пробуете остановить танец, но уже слишком поздно. + +Танец продолжается и зефирный дом не выдерживает. + +При очередном ударе каблука макасина об пол зефирный дом взрывается сверх-новой звездой, которая и будет освещать зефирное королевство и дальше. + +Вас провозгласили зефирной мессией, в вашу честь строят памятники и называют своих детей. \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index 405a946e18..e7eb2d6a11 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -16,6 +16,8 @@ Ваши действия: +[Начать танцевать Лезгинку](dance_lezginka/dance.md) + [Смешать водку с пивом](vodka/vodka.md) [Импортозаместить тромбон на гусли](gusli/gusli.md) From 686483781f99026ab4b8db560c9aad374a2d93df Mon Sep 17 00:00:00 2001 From: DeuceX Date: Tue, 22 Mar 2016 15:37:13 +0200 Subject: [PATCH 2881/5486] Add more beautiful win message --- russian/dance_lezginka/jump/swim/swim.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/dance_lezginka/jump/swim/swim.md b/russian/dance_lezginka/jump/swim/swim.md index f15f4b8d03..19d31dff0d 100644 --- a/russian/dance_lezginka/jump/swim/swim.md +++ b/russian/dance_lezginka/jump/swim/swim.md @@ -4,4 +4,6 @@ Вы залазите на масло и уходите в закат! -В закат зефирного города... Вы спасены \ No newline at end of file +В закат зефирного города... Вы спасены + +### ПОБЕДА! Поздравляю From 1fc5e400f21d8f55c7000b530fc2bc7ed6f3935a Mon Sep 17 00:00:00 2001 From: DeuceX Date: Tue, 22 Mar 2016 15:42:45 +0200 Subject: [PATCH 2882/5486] Fix line length below 120 --- russian/dance_lezginka/cake_bomb/cake_bomb.md | 9 ++++++--- russian/dance_lezginka/keep_dancing/stop/stop.md | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/russian/dance_lezginka/cake_bomb/cake_bomb.md b/russian/dance_lezginka/cake_bomb/cake_bomb.md index 2d1c369971..3749fe2234 100644 --- a/russian/dance_lezginka/cake_bomb/cake_bomb.md +++ b/russian/dance_lezginka/cake_bomb/cake_bomb.md @@ -1,9 +1,12 @@ -Вам не нравится, что эти лица неопределенной национальности продолжают вторгаться в Ваш зефирный дом. +Вам не нравится, что эти лица неопределенной национальности продолжают +вторгаться в Ваш зефирный дом. -Вы вспоминаете, что у Вас в кармане завалялась парочка кексовых бомб. Вы достаете бомбы и делаете предупреждения, но никто не собирается уходить. +Вы вспоминаете, что у Вас в кармане завалялась парочка кексовых бомб. +Вы достаете бомбы и делаете предупреждения, но никто не собирается уходить. Вам ничего не остается, кроме как использовать бомбы. -Зефирный дом разлетается на мелкие части, в Вашем зефирном городе начинается зефирный дождь, довольные дети бегают по зефирной площади имени Зефирыча и собирают в ведра зефир, падающий с неба. +Зефирный дом разлетается на мелкие части, в Вашем зефирном городе начинается зефирный дождь, +довольные дети бегают по зефирной площади имени Зефирыча и собирают в ведра зефир, падающий с неба. Что ж, хотя бы дети довольны. \ No newline at end of file diff --git a/russian/dance_lezginka/keep_dancing/stop/stop.md b/russian/dance_lezginka/keep_dancing/stop/stop.md index cee5d062a8..7423247d0a 100644 --- a/russian/dance_lezginka/keep_dancing/stop/stop.md +++ b/russian/dance_lezginka/keep_dancing/stop/stop.md @@ -2,6 +2,7 @@ Танец продолжается и зефирный дом не выдерживает. -При очередном ударе каблука макасина об пол зефирный дом взрывается сверх-новой звездой, которая и будет освещать зефирное королевство и дальше. +При очередном ударе каблука макасина об пол зефирный дом взрывается +сверх-новой звездой, которая и будет освещать зефирное королевство и дальше. Вас провозгласили зефирной мессией, в вашу честь строят памятники и называют своих детей. \ No newline at end of file From bb4393efee868b22a27e8f83b332b4e7c008ec73 Mon Sep 17 00:00:00 2001 From: Artem Konovalov Date: Tue, 22 Mar 2016 15:44:02 +0200 Subject: [PATCH 2883/5486] Feat: Add new level --- russian/prayer/exmachina/belt/belt.md | 3 +++ russian/prayer/exmachina/couple/couple.md | 7 +++++++ .../exmachina/couple/disease/disease.md | 5 +++++ .../prayer/exmachina/couple/leave/leave.md | 3 +++ russian/prayer/exmachina/exmachina.md | 19 +++++++++++++++++++ russian/prayer/exmachina/vk/ban/ban.md | 3 +++ russian/prayer/exmachina/vk/likes/likes.md | 3 +++ russian/prayer/exmachina/vk/vk.md | 11 +++++++++++ russian/prayer/gopstop/gopstop.md | 9 +++++++++ russian/prayer/gopstop/logovo/logovo.md | 5 +++++ russian/prayer/gopstop/shpana/shpana.md | 11 +++++++++++ russian/prayer/morning_prayer.md | 9 +++++++++ russian/zefir.md | 2 ++ 13 files changed, 90 insertions(+) create mode 100644 russian/prayer/exmachina/belt/belt.md create mode 100644 russian/prayer/exmachina/couple/couple.md create mode 100644 russian/prayer/exmachina/couple/disease/disease.md create mode 100644 russian/prayer/exmachina/couple/leave/leave.md create mode 100644 russian/prayer/exmachina/exmachina.md create mode 100644 russian/prayer/exmachina/vk/ban/ban.md create mode 100644 russian/prayer/exmachina/vk/likes/likes.md create mode 100644 russian/prayer/exmachina/vk/vk.md create mode 100644 russian/prayer/gopstop/gopstop.md create mode 100644 russian/prayer/gopstop/logovo/logovo.md create mode 100644 russian/prayer/gopstop/shpana/shpana.md create mode 100644 russian/prayer/morning_prayer.md diff --git a/russian/prayer/exmachina/belt/belt.md b/russian/prayer/exmachina/belt/belt.md new file mode 100644 index 0000000000..d05c86823a --- /dev/null +++ b/russian/prayer/exmachina/belt/belt.md @@ -0,0 +1,3 @@ +Трясь! Вся эта модерновая техника не выдержала натиска десантурской бляхи и посыпалась в муку! + +Конечно же. услышав весь этот треш. в зал сеанса влетает охрана и провести следующие 15 суток тебе придется в кутузке. \ No newline at end of file diff --git a/russian/prayer/exmachina/couple/couple.md b/russian/prayer/exmachina/couple/couple.md new file mode 100644 index 0000000000..f594dc2ba0 --- /dev/null +++ b/russian/prayer/exmachina/couple/couple.md @@ -0,0 +1,7 @@ +Подсесть то ты подсел, но ты же вчера гульбенил по-дикому... Забыл?! + +Омбрэ от твоих вчерашних посиделок настолько сильно что + +[Пара не выдерживает и уходит](leave/leave) + +[Ты сам не выдерживаешь и падаешь от приступа](disease/ disease/md) \ No newline at end of file diff --git a/russian/prayer/exmachina/couple/disease/disease.md b/russian/prayer/exmachina/couple/disease/disease.md new file mode 100644 index 0000000000..5ea24c5378 --- /dev/null +++ b/russian/prayer/exmachina/couple/disease/disease.md @@ -0,0 +1,5 @@ +Лучше бы тебе вчера было подумать, прежде чем звать своих друзей. + +Ты уже не молод... Скорая тебя. конечно, забрала. Но врядли ты переживешь это мероприятие. + +Да и за все это кому то надо будет платить... Нет... Сам виноват. Прощай. \ No newline at end of file diff --git a/russian/prayer/exmachina/couple/leave/leave.md b/russian/prayer/exmachina/couple/leave/leave.md new file mode 100644 index 0000000000..2c22659e8a --- /dev/null +++ b/russian/prayer/exmachina/couple/leave/leave.md @@ -0,0 +1,3 @@ +Ну, молодец! Ни себе, ни людям! + +Ладно, не парься. в инете досмотрят. \ No newline at end of file diff --git a/russian/prayer/exmachina/exmachina.md b/russian/prayer/exmachina/exmachina.md new file mode 100644 index 0000000000..bbf225ddca --- /dev/null +++ b/russian/prayer/exmachina/exmachina.md @@ -0,0 +1,19 @@ +"Не тарантино. конечно. но делать нечего. Тем более, что я забыл напрочь, куда и зачем шел." - подумал ты. + +Решено. Ты бредешь в кинозал. Весь такой из себя махровый дед бредешь на совсем не олдскульный кинч. + +Тебе бы на что-то попроще сходить, но нет... Ты шаришь в ИТ - винду от Паскаля отличить умеешь. Значит ты в теме. + +Тем более ты помнишь, как облажался на последних трансформерах, когда не выдержал спецеффектов и повалился с выпученными глазами еще до входа в кинозал. + +> Назвался груздем - полезай в кузов! + +Все верно! Красавчик! + +Но мувик показался полнейшей ахинеей для такого динозавра. как ты. И посреди сеанса ты решаешь + +[Запулить в проектор армейской бляхой](belt/belt.md) + +[Подсесть к влюбленной паре на заднем ряду](couple/couple.md) + +[Досмотреть доконца и набросать очерк на своей стене в вк](vk/vk.md) \ No newline at end of file diff --git a/russian/prayer/exmachina/vk/ban/ban.md b/russian/prayer/exmachina/vk/ban/ban.md new file mode 100644 index 0000000000..1fca7662e6 --- /dev/null +++ b/russian/prayer/exmachina/vk/ban/ban.md @@ -0,0 +1,3 @@ +Да пост твой откровенное УГ. + +Да и тебя посчитали лишним на портале. Пакеда! \ No newline at end of file diff --git a/russian/prayer/exmachina/vk/likes/likes.md b/russian/prayer/exmachina/vk/likes/likes.md new file mode 100644 index 0000000000..3b43a911ef --- /dev/null +++ b/russian/prayer/exmachina/vk/likes/likes.md @@ -0,0 +1,3 @@ +Твой пост набрал в 4 раза больше лайков, чем Gangnam Style. + +Но!!! На планете нет столько людишек! "Как такое возможно?!" - завопил ты и сойдя с ума провел остаток дней своих в "Калинке". \ No newline at end of file diff --git a/russian/prayer/exmachina/vk/vk.md b/russian/prayer/exmachina/vk/vk.md new file mode 100644 index 0000000000..1b23d0608e --- /dev/null +++ b/russian/prayer/exmachina/vk/vk.md @@ -0,0 +1,11 @@ +Ты полон ярости от некачественных спецеффектов и недоработанного сценария возвращаешься домой. + +Там же тебя ждут. Конечно! Обои в розочку и полуразбитый лэптоп. + +Это не мешает тебе накатать некислую статейку-обзор о фильмце. + +Твой пост + +[Набрал кучу лайков](likes/likes.md) + +[Пометили как "Спам", а тебя отправили в кик-бан](ban/ban.md) \ No newline at end of file diff --git a/russian/prayer/gopstop/gopstop.md b/russian/prayer/gopstop/gopstop.md new file mode 100644 index 0000000000..547ccf9f36 --- /dev/null +++ b/russian/prayer/gopstop/gopstop.md @@ -0,0 +1,9 @@ +Ты уже понимал, что тебя ждет. Эти ребята не из тех. кто тратит свое время зря. + +Эти местные Робин Гуды никогда не оставят тебя с мучительно тяжелым излишком благ на кармане. + +Но ты бывалый старый, ты не растерялся и + +[Достав волыну, с криками "Валерааа, настааало твое врееемя!" начал хаотично потрошить шпану](shpana/shpana.md) + +[Заметив их издалека, потопал обратно в свое логово](logovo/logovo.md) \ No newline at end of file diff --git a/russian/prayer/gopstop/logovo/logovo.md b/russian/prayer/gopstop/logovo/logovo.md new file mode 100644 index 0000000000..7f108d275d --- /dev/null +++ b/russian/prayer/gopstop/logovo/logovo.md @@ -0,0 +1,5 @@ +"Не по-мужски это", - подумал ты. Да ну и ладно. Жизнь дороже. + +Тем более сколько такой беготни еще выдержит твой кардиостимулятор "Радуга". + +Конечно, обидно. досадно... Ну да ладно! \ No newline at end of file diff --git a/russian/prayer/gopstop/shpana/shpana.md b/russian/prayer/gopstop/shpana/shpana.md new file mode 100644 index 0000000000..ffd5a7e048 --- /dev/null +++ b/russian/prayer/gopstop/shpana/shpana.md @@ -0,0 +1,11 @@ +Матрица замедляется. Твои резкие движения слились в синхронную линию событий. + +Твой Дигл зол и беспощаден как и ты сам! + +Но что же такое... Тебе же вчера было не до новостей. А ведь новая полиция приняла присягу. + +Поэтому в ту же секунду, как бездыханное тело последнего пацика приземляется на траву, из-за угла, поднимая кучу пыли, влетает в поворот Toyota. + +Конечно. ты не ожидал, да и откуда тебе знать. кто за рулем. А читать ты не научился еще с детства, поэтому надпись "Полиция" тебе сказала не более, чем "Столичная" на вчерашней бутылке. + +В общем и целом, тебя повязали и остаток дней ты проведешь в кутузке. \ No newline at end of file diff --git a/russian/prayer/morning_prayer.md b/russian/prayer/morning_prayer.md new file mode 100644 index 0000000000..e15a47b525 --- /dev/null +++ b/russian/prayer/morning_prayer.md @@ -0,0 +1,9 @@ +По пути в храм последствия вчерашнего угара становятся все заметнее отражаться на твоем 65 летнем организме. + +В наушниках **Portishead**, нНастроение вообще "не айс" и вроде как сейчас можно себе позволить задуматься о тленности происходящего. + +Но только ты въезжаешь в минорные нотки Бэт Гиббонс, как тут на твоем пути... + +[Появляются два персонажа, стремящиеся уточнить твое благосостояние и избавить тебя от этих излишков](gopstop/gopstop.md) + +[Афиша фильма "Ex-Machina"](exmachina/exmachina) \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index 405a946e18..62a81388da 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -79,3 +79,5 @@ [Завоюю мир, в котором проснулся](conquer/lead.md) [Отхлебну и закушу](kompot/kompot.md) + +[Бросить "уделанную" футболку Slayer в стирку и отправиться на заутреннюю молитву](prayer/morning_prayer.md) \ No newline at end of file From b83908a1ca55de859c9ff0be0fe6281f1c2b6d7e Mon Sep 17 00:00:00 2001 From: Artem Konovalov Date: Tue, 22 Mar 2016 15:56:01 +0200 Subject: [PATCH 2884/5486] Fix typo bug --- russian/prayer/morning_prayer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/prayer/morning_prayer.md b/russian/prayer/morning_prayer.md index e15a47b525..6cff09eea4 100644 --- a/russian/prayer/morning_prayer.md +++ b/russian/prayer/morning_prayer.md @@ -6,4 +6,4 @@ [Появляются два персонажа, стремящиеся уточнить твое благосостояние и избавить тебя от этих излишков](gopstop/gopstop.md) -[Афиша фильма "Ex-Machina"](exmachina/exmachina) \ No newline at end of file +[Афиша фильма "Ex-Machina"](exmachina/exmachina.md) \ No newline at end of file From abf77bccdac9c1731cb27b3d9a9bc0b1f877cdbf Mon Sep 17 00:00:00 2001 From: Artem Konovalov Date: Tue, 22 Mar 2016 15:57:11 +0200 Subject: [PATCH 2885/5486] Fix typo bug --- russian/prayer/exmachina/couple/couple.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/russian/prayer/exmachina/couple/couple.md b/russian/prayer/exmachina/couple/couple.md index f594dc2ba0..18f939c0ed 100644 --- a/russian/prayer/exmachina/couple/couple.md +++ b/russian/prayer/exmachina/couple/couple.md @@ -2,6 +2,6 @@ Омбрэ от твоих вчерашних посиделок настолько сильно что -[Пара не выдерживает и уходит](leave/leave) +[Пара не выдерживает и уходит](leave/leave.md) -[Ты сам не выдерживаешь и падаешь от приступа](disease/ disease/md) \ No newline at end of file +[Ты сам не выдерживаешь и падаешь от приступа](disease/disease.md) \ No newline at end of file From cc1e9b0e161d845f8051bbcb5eec9b616df1cbb3 Mon Sep 17 00:00:00 2001 From: Artem Konovalov Date: Tue, 22 Mar 2016 16:03:40 +0200 Subject: [PATCH 2886/5486] Fix line length bug --- russian/prayer/exmachina/belt/belt.md | 8 ++++++-- .../prayer/exmachina/couple/disease/disease.md | 9 ++++++--- russian/prayer/exmachina/exmachina.md | 17 ++++++++++++----- russian/prayer/exmachina/vk/likes/likes.md | 7 +++++-- russian/prayer/exmachina/vk/vk.md | 3 ++- russian/prayer/gopstop/gopstop.md | 10 ++++++---- russian/prayer/gopstop/logovo/logovo.md | 6 ++++-- russian/prayer/gopstop/shpana/shpana.md | 16 ++++++++++++---- russian/prayer/morning_prayer.md | 9 ++++++--- 9 files changed, 59 insertions(+), 26 deletions(-) diff --git a/russian/prayer/exmachina/belt/belt.md b/russian/prayer/exmachina/belt/belt.md index d05c86823a..0fc139e3b9 100644 --- a/russian/prayer/exmachina/belt/belt.md +++ b/russian/prayer/exmachina/belt/belt.md @@ -1,3 +1,7 @@ -Трясь! Вся эта модерновая техника не выдержала натиска десантурской бляхи и посыпалась в муку! +Трясь! Вся эта модерновая техника +не выдержала натиска десантурской бляхи +и посыпалась в муку! -Конечно же. услышав весь этот треш. в зал сеанса влетает охрана и провести следующие 15 суток тебе придется в кутузке. \ No newline at end of file +Конечно же. услышав весь этот треш, +в зал сеанса влетает охрана и провести +следующие 15 суток тебе придется в кутузке. \ No newline at end of file diff --git a/russian/prayer/exmachina/couple/disease/disease.md b/russian/prayer/exmachina/couple/disease/disease.md index 5ea24c5378..e3b7b22220 100644 --- a/russian/prayer/exmachina/couple/disease/disease.md +++ b/russian/prayer/exmachina/couple/disease/disease.md @@ -1,5 +1,8 @@ -Лучше бы тебе вчера было подумать, прежде чем звать своих друзей. +Лучше бы тебе вчера было подумать, +прежде чем звать своих друзей. -Ты уже не молод... Скорая тебя. конечно, забрала. Но врядли ты переживешь это мероприятие. +Ты уже не молод... Скорая тебя. конечно, забрала. +Но врядли ты переживешь это мероприятие. -Да и за все это кому то надо будет платить... Нет... Сам виноват. Прощай. \ No newline at end of file +Да и за все это кому то надо будет платить... +Нет... Сам виноват. Прощай. \ No newline at end of file diff --git a/russian/prayer/exmachina/exmachina.md b/russian/prayer/exmachina/exmachina.md index bbf225ddca..35b8a262f6 100644 --- a/russian/prayer/exmachina/exmachina.md +++ b/russian/prayer/exmachina/exmachina.md @@ -1,16 +1,23 @@ -"Не тарантино. конечно. но делать нечего. Тем более, что я забыл напрочь, куда и зачем шел." - подумал ты. +"Не тарантино. конечно. но делать нечего. +Тем более, что я забыл напрочь, куда и зачем шел." - подумал ты. -Решено. Ты бредешь в кинозал. Весь такой из себя махровый дед бредешь на совсем не олдскульный кинч. +Решено. Ты бредешь в кинозал. Весь такой из себя махровый дед +бредешь на совсем не олдскульный кинч. -Тебе бы на что-то попроще сходить, но нет... Ты шаришь в ИТ - винду от Паскаля отличить умеешь. Значит ты в теме. +Тебе бы на что-то попроще сходить, но нет... +Ты шаришь в ИТ - винду от Паскаля отличить умеешь. +Значит ты в теме. -Тем более ты помнишь, как облажался на последних трансформерах, когда не выдержал спецеффектов и повалился с выпученными глазами еще до входа в кинозал. +Тем более ты помнишь, как облажался на последних трансформерах, +когда не выдержал спецеффектов и повалился с выпученными +глазами еще до входа в кинозал. > Назвался груздем - полезай в кузов! Все верно! Красавчик! -Но мувик показался полнейшей ахинеей для такого динозавра. как ты. И посреди сеанса ты решаешь +Но мувик показался полнейшей ахинеей для такого динозавра. как ты. +И посреди сеанса ты решаешь [Запулить в проектор армейской бляхой](belt/belt.md) diff --git a/russian/prayer/exmachina/vk/likes/likes.md b/russian/prayer/exmachina/vk/likes/likes.md index 3b43a911ef..adb889f4e3 100644 --- a/russian/prayer/exmachina/vk/likes/likes.md +++ b/russian/prayer/exmachina/vk/likes/likes.md @@ -1,3 +1,6 @@ -Твой пост набрал в 4 раза больше лайков, чем Gangnam Style. +Твой пост набрал в 4 раза больше лайков, +чем Gangnam Style. -Но!!! На планете нет столько людишек! "Как такое возможно?!" - завопил ты и сойдя с ума провел остаток дней своих в "Калинке". \ No newline at end of file +Но!!! На планете нет столько людишек! +"Как такое возможно?!" - завопил ты и сойдя с +ума провел остаток дней своих в "Калинке". \ No newline at end of file diff --git a/russian/prayer/exmachina/vk/vk.md b/russian/prayer/exmachina/vk/vk.md index 1b23d0608e..1f604e8dfa 100644 --- a/russian/prayer/exmachina/vk/vk.md +++ b/russian/prayer/exmachina/vk/vk.md @@ -1,4 +1,5 @@ -Ты полон ярости от некачественных спецеффектов и недоработанного сценария возвращаешься домой. +Ты полон ярости от некачественных спецеффектов и +недоработанного сценария возвращаешься домой. Там же тебя ждут. Конечно! Обои в розочку и полуразбитый лэптоп. diff --git a/russian/prayer/gopstop/gopstop.md b/russian/prayer/gopstop/gopstop.md index 547ccf9f36..2961b07d07 100644 --- a/russian/prayer/gopstop/gopstop.md +++ b/russian/prayer/gopstop/gopstop.md @@ -1,9 +1,11 @@ -Ты уже понимал, что тебя ждет. Эти ребята не из тех. кто тратит свое время зря. +Ты уже понимал, что тебя ждет. +Эти ребята не из тех, кто тратит свое время зря. -Эти местные Робин Гуды никогда не оставят тебя с мучительно тяжелым излишком благ на кармане. +Эти местные Робин Гуды никогда не оставят тебя +с мучительно тяжелым излишком благ на кармане. Но ты бывалый старый, ты не растерялся и -[Достав волыну, с криками "Валерааа, настааало твое врееемя!" начал хаотично потрошить шпану](shpana/shpana.md) +[Достав волыну, начал потрошить шпану](shpana/shpana.md) -[Заметив их издалека, потопал обратно в свое логово](logovo/logovo.md) \ No newline at end of file +[Заметив их издалека, потопал в свое логово](logovo/logovo.md) \ No newline at end of file diff --git a/russian/prayer/gopstop/logovo/logovo.md b/russian/prayer/gopstop/logovo/logovo.md index 7f108d275d..bafdb87e42 100644 --- a/russian/prayer/gopstop/logovo/logovo.md +++ b/russian/prayer/gopstop/logovo/logovo.md @@ -1,5 +1,7 @@ -"Не по-мужски это", - подумал ты. Да ну и ладно. Жизнь дороже. +"Не по-мужски это", - подумал ты. +Да ну и ладно. Жизнь дороже. -Тем более сколько такой беготни еще выдержит твой кардиостимулятор "Радуга". +Тем более сколько такой беготни еще +выдержит твой кардиостимулятор "Радуга". Конечно, обидно. досадно... Ну да ладно! \ No newline at end of file diff --git a/russian/prayer/gopstop/shpana/shpana.md b/russian/prayer/gopstop/shpana/shpana.md index ffd5a7e048..ef1ef7803e 100644 --- a/russian/prayer/gopstop/shpana/shpana.md +++ b/russian/prayer/gopstop/shpana/shpana.md @@ -1,11 +1,19 @@ -Матрица замедляется. Твои резкие движения слились в синхронную линию событий. +Матрица замедляется. Твои резкие движения +слились в синхронную линию событий. + +"Валерааа, настааало твое врееемя!" Твой Дигл зол и беспощаден как и ты сам! -Но что же такое... Тебе же вчера было не до новостей. А ведь новая полиция приняла присягу. +Но что же такое... Тебе же вчера было не до новостей. +А ведь новая полиция приняла присягу. -Поэтому в ту же секунду, как бездыханное тело последнего пацика приземляется на траву, из-за угла, поднимая кучу пыли, влетает в поворот Toyota. +Поэтому в ту же секунду, как бездыханное тело последнего +пацика приземляется на траву, из-за угла, поднимая кучу пыли, +влетает в поворот Toyota. -Конечно. ты не ожидал, да и откуда тебе знать. кто за рулем. А читать ты не научился еще с детства, поэтому надпись "Полиция" тебе сказала не более, чем "Столичная" на вчерашней бутылке. +Конечно. ты не ожидал, да и откуда тебе знать. кто за рулем. +А читать ты не научился еще с детства, поэтому надпись "Полиция" +тебе сказала не более, чем "Столичная" на вчерашней бутылке. В общем и целом, тебя повязали и остаток дней ты проведешь в кутузке. \ No newline at end of file diff --git a/russian/prayer/morning_prayer.md b/russian/prayer/morning_prayer.md index 6cff09eea4..d367e9647f 100644 --- a/russian/prayer/morning_prayer.md +++ b/russian/prayer/morning_prayer.md @@ -1,9 +1,12 @@ -По пути в храм последствия вчерашнего угара становятся все заметнее отражаться на твоем 65 летнем организме. +По пути в храм последствия вчерашнего угара становятся +все заметнее отражаться на твоем 65 летнем организме. -В наушниках **Portishead**, нНастроение вообще "не айс" и вроде как сейчас можно себе позволить задуматься о тленности происходящего. +В наушниках **Portishead**, нНастроение вообще "не айс" +и вроде как сейчас можно себе позволить задуматься о тленности +происходящего. Но только ты въезжаешь в минорные нотки Бэт Гиббонс, как тут на твоем пути... -[Появляются два персонажа, стремящиеся уточнить твое благосостояние и избавить тебя от этих излишков](gopstop/gopstop.md) +[Появляются два персонажа](gopstop/gopstop.md) [Афиша фильма "Ex-Machina"](exmachina/exmachina.md) \ No newline at end of file From a6d5b73ad9cdc18bf13e3aff8e6155ae78fb68de Mon Sep 17 00:00:00 2001 From: Artem Konovalov Date: Tue, 22 Mar 2016 16:15:23 +0200 Subject: [PATCH 2887/5486] Fix line length bug --- russian/prayer/exmachina/belt/belt.md | 10 +++----- russian/prayer/exmachina/couple/couple.md | 3 --- .../exmachina/couple/disease/disease.md | 11 +++------ .../prayer/exmachina/couple/leave/leave.md | 4 +--- russian/prayer/exmachina/exmachina.md | 24 ++++--------------- russian/prayer/exmachina/vk/ban/ban.md | 4 +--- russian/prayer/exmachina/vk/likes/likes.md | 7 ++---- russian/prayer/exmachina/vk/vk.md | 8 +------ russian/prayer/gopstop/gopstop.md | 4 ---- russian/prayer/gopstop/logovo/logovo.md | 8 ++----- russian/prayer/gopstop/shpana/shpana.md | 17 ++++--------- 11 files changed, 22 insertions(+), 78 deletions(-) diff --git a/russian/prayer/exmachina/belt/belt.md b/russian/prayer/exmachina/belt/belt.md index 0fc139e3b9..76291e7a55 100644 --- a/russian/prayer/exmachina/belt/belt.md +++ b/russian/prayer/exmachina/belt/belt.md @@ -1,7 +1,3 @@ -Трясь! Вся эта модерновая техника -не выдержала натиска десантурской бляхи -и посыпалась в муку! - -Конечно же. услышав весь этот треш, -в зал сеанса влетает охрана и провести -следующие 15 суток тебе придется в кутузке. \ No newline at end of file +Трясь! Вся эта модерновая техника не выдержала натиска десантурской бляхи +и посыпалась в муку! Конечно же. услышав весь этот треш, +в зал сеанса влетает охрана и провести следующие 15 суток тебе придется в кутузке. \ No newline at end of file diff --git a/russian/prayer/exmachina/couple/couple.md b/russian/prayer/exmachina/couple/couple.md index 18f939c0ed..ad8b80918f 100644 --- a/russian/prayer/exmachina/couple/couple.md +++ b/russian/prayer/exmachina/couple/couple.md @@ -1,7 +1,4 @@ Подсесть то ты подсел, но ты же вчера гульбенил по-дикому... Забыл?! - Омбрэ от твоих вчерашних посиделок настолько сильно что - [Пара не выдерживает и уходит](leave/leave.md) - [Ты сам не выдерживаешь и падаешь от приступа](disease/disease.md) \ No newline at end of file diff --git a/russian/prayer/exmachina/couple/disease/disease.md b/russian/prayer/exmachina/couple/disease/disease.md index e3b7b22220..3d83c3319d 100644 --- a/russian/prayer/exmachina/couple/disease/disease.md +++ b/russian/prayer/exmachina/couple/disease/disease.md @@ -1,8 +1,3 @@ -Лучше бы тебе вчера было подумать, -прежде чем звать своих друзей. - -Ты уже не молод... Скорая тебя. конечно, забрала. -Но врядли ты переживешь это мероприятие. - -Да и за все это кому то надо будет платить... -Нет... Сам виноват. Прощай. \ No newline at end of file +Лучше бы тебе вчера было подумать, прежде чем звать своих друзей. +Ты уже не молод... Скорая тебя. конечно, забрала. Но врядли ты переживешь это мероприятие. +Да и за все это кому то надо будет платить... Нет... Сам виноват. Прощай. \ No newline at end of file diff --git a/russian/prayer/exmachina/couple/leave/leave.md b/russian/prayer/exmachina/couple/leave/leave.md index 2c22659e8a..9f89a46bf4 100644 --- a/russian/prayer/exmachina/couple/leave/leave.md +++ b/russian/prayer/exmachina/couple/leave/leave.md @@ -1,3 +1 @@ -Ну, молодец! Ни себе, ни людям! - -Ладно, не парься. в инете досмотрят. \ No newline at end of file +Ну, молодец! Ни себе, ни людям! Ладно, не парься. в инете досмотрят. \ No newline at end of file diff --git a/russian/prayer/exmachina/exmachina.md b/russian/prayer/exmachina/exmachina.md index 35b8a262f6..0367ad6d67 100644 --- a/russian/prayer/exmachina/exmachina.md +++ b/russian/prayer/exmachina/exmachina.md @@ -1,26 +1,12 @@ "Не тарантино. конечно. но делать нечего. Тем более, что я забыл напрочь, куда и зачем шел." - подумал ты. - -Решено. Ты бредешь в кинозал. Весь такой из себя махровый дед -бредешь на совсем не олдскульный кинч. - -Тебе бы на что-то попроще сходить, но нет... -Ты шаришь в ИТ - винду от Паскаля отличить умеешь. -Значит ты в теме. - -Тем более ты помнишь, как облажался на последних трансформерах, -когда не выдержал спецеффектов и повалился с выпученными -глазами еще до входа в кинозал. - +Решено. Ты бредешь в кинозал. Весь такой из себя махровый дед бредешь на совсем не олдскульный кинч. +Тебе бы на что-то попроще сходить, но нет... Ты шаришь в ИТ - винду от Паскаля отличить умеешь. +Значит ты в теме. Тем более ты помнишь, как облажался на последних трансформерах, +когда не выдержал спецеффектов и повалился с выпученными глазами еще до входа в кинозал. > Назвался груздем - полезай в кузов! - Все верно! Красавчик! - -Но мувик показался полнейшей ахинеей для такого динозавра. как ты. -И посреди сеанса ты решаешь - +Но мувик показался полнейшей ахинеей для такого динозавра. как ты.И посреди сеанса ты решаешь [Запулить в проектор армейской бляхой](belt/belt.md) - [Подсесть к влюбленной паре на заднем ряду](couple/couple.md) - [Досмотреть доконца и набросать очерк на своей стене в вк](vk/vk.md) \ No newline at end of file diff --git a/russian/prayer/exmachina/vk/ban/ban.md b/russian/prayer/exmachina/vk/ban/ban.md index 1fca7662e6..9f5d763b9b 100644 --- a/russian/prayer/exmachina/vk/ban/ban.md +++ b/russian/prayer/exmachina/vk/ban/ban.md @@ -1,3 +1 @@ -Да пост твой откровенное УГ. - -Да и тебя посчитали лишним на портале. Пакеда! \ No newline at end of file +Да пост твой откровенное УГ. Да и тебя посчитали лишним на портале. Пакеда! \ No newline at end of file diff --git a/russian/prayer/exmachina/vk/likes/likes.md b/russian/prayer/exmachina/vk/likes/likes.md index adb889f4e3..5d98d35580 100644 --- a/russian/prayer/exmachina/vk/likes/likes.md +++ b/russian/prayer/exmachina/vk/likes/likes.md @@ -1,6 +1,3 @@ -Твой пост набрал в 4 раза больше лайков, -чем Gangnam Style. - -Но!!! На планете нет столько людишек! -"Как такое возможно?!" - завопил ты и сойдя с +Твой пост набрал в 4 раза больше лайков, чем Gangnam Style. +Но!!! На планете нет столько людишек! "Как такое возможно?!" - завопил ты и сойдя с ума провел остаток дней своих в "Калинке". \ No newline at end of file diff --git a/russian/prayer/exmachina/vk/vk.md b/russian/prayer/exmachina/vk/vk.md index 1f604e8dfa..e6213af9e9 100644 --- a/russian/prayer/exmachina/vk/vk.md +++ b/russian/prayer/exmachina/vk/vk.md @@ -1,12 +1,6 @@ Ты полон ярости от некачественных спецеффектов и недоработанного сценария возвращаешься домой. - Там же тебя ждут. Конечно! Обои в розочку и полуразбитый лэптоп. - -Это не мешает тебе накатать некислую статейку-обзор о фильмце. - -Твой пост - +Это не мешает тебе накатать некислую статейку-обзор о фильмце. Твой пост [Набрал кучу лайков](likes/likes.md) - [Пометили как "Спам", а тебя отправили в кик-бан](ban/ban.md) \ No newline at end of file diff --git a/russian/prayer/gopstop/gopstop.md b/russian/prayer/gopstop/gopstop.md index 2961b07d07..9aeb25c49c 100644 --- a/russian/prayer/gopstop/gopstop.md +++ b/russian/prayer/gopstop/gopstop.md @@ -1,11 +1,7 @@ Ты уже понимал, что тебя ждет. Эти ребята не из тех, кто тратит свое время зря. - Эти местные Робин Гуды никогда не оставят тебя с мучительно тяжелым излишком благ на кармане. - Но ты бывалый старый, ты не растерялся и - [Достав волыну, начал потрошить шпану](shpana/shpana.md) - [Заметив их издалека, потопал в свое логово](logovo/logovo.md) \ No newline at end of file diff --git a/russian/prayer/gopstop/logovo/logovo.md b/russian/prayer/gopstop/logovo/logovo.md index bafdb87e42..910f8ab7f6 100644 --- a/russian/prayer/gopstop/logovo/logovo.md +++ b/russian/prayer/gopstop/logovo/logovo.md @@ -1,7 +1,3 @@ -"Не по-мужски это", - подумал ты. -Да ну и ладно. Жизнь дороже. - -Тем более сколько такой беготни еще -выдержит твой кардиостимулятор "Радуга". - +"Не по-мужски это", - подумал ты. Да ну и ладно. Жизнь дороже. +Тем более сколько такой беготни еще выдержит твой кардиостимулятор "Радуга". Конечно, обидно. досадно... Ну да ладно! \ No newline at end of file diff --git a/russian/prayer/gopstop/shpana/shpana.md b/russian/prayer/gopstop/shpana/shpana.md index ef1ef7803e..4a3bae6799 100644 --- a/russian/prayer/gopstop/shpana/shpana.md +++ b/russian/prayer/gopstop/shpana/shpana.md @@ -1,19 +1,10 @@ -Матрица замедляется. Твои резкие движения -слились в синхронную линию событий. - -"Валерааа, настааало твое врееемя!" - -Твой Дигл зол и беспощаден как и ты сам! - +Матрица замедляется. Твои резкие движения слились в синхронную линию событий. +"Валерааа, настааало твое врееемя!" Твой Дигл зол и беспощаден как и ты сам! Но что же такое... Тебе же вчера было не до новостей. А ведь новая полиция приняла присягу. - -Поэтому в ту же секунду, как бездыханное тело последнего -пацика приземляется на траву, из-за угла, поднимая кучу пыли, -влетает в поворот Toyota. - +Поэтому в ту же секунду, как бездыханное тело последнего пацика приземляется +на траву, из-за угла, поднимая кучу пыли,влетает в поворот Toyota. Конечно. ты не ожидал, да и откуда тебе знать. кто за рулем. А читать ты не научился еще с детства, поэтому надпись "Полиция" тебе сказала не более, чем "Столичная" на вчерашней бутылке. - В общем и целом, тебя повязали и остаток дней ты проведешь в кутузке. \ No newline at end of file From 132cea9a79a5ef9e94bdec7191144db63a876758 Mon Sep 17 00:00:00 2001 From: Artem Konovalov Date: Tue, 22 Mar 2016 16:18:14 +0200 Subject: [PATCH 2888/5486] Fix line length bug --- russian/prayer/exmachina/couple/couple.md | 1 + russian/prayer/exmachina/exmachina.md | 2 ++ russian/prayer/exmachina/vk/vk.md | 1 + russian/prayer/gopstop/gopstop.md | 1 + 4 files changed, 5 insertions(+) diff --git a/russian/prayer/exmachina/couple/couple.md b/russian/prayer/exmachina/couple/couple.md index ad8b80918f..cc47ea7cb1 100644 --- a/russian/prayer/exmachina/couple/couple.md +++ b/russian/prayer/exmachina/couple/couple.md @@ -1,4 +1,5 @@ Подсесть то ты подсел, но ты же вчера гульбенил по-дикому... Забыл?! Омбрэ от твоих вчерашних посиделок настолько сильно что [Пара не выдерживает и уходит](leave/leave.md) + [Ты сам не выдерживаешь и падаешь от приступа](disease/disease.md) \ No newline at end of file diff --git a/russian/prayer/exmachina/exmachina.md b/russian/prayer/exmachina/exmachina.md index 0367ad6d67..cf97dd3160 100644 --- a/russian/prayer/exmachina/exmachina.md +++ b/russian/prayer/exmachina/exmachina.md @@ -8,5 +8,7 @@ Все верно! Красавчик! Но мувик показался полнейшей ахинеей для такого динозавра. как ты.И посреди сеанса ты решаешь [Запулить в проектор армейской бляхой](belt/belt.md) + [Подсесть к влюбленной паре на заднем ряду](couple/couple.md) + [Досмотреть доконца и набросать очерк на своей стене в вк](vk/vk.md) \ No newline at end of file diff --git a/russian/prayer/exmachina/vk/vk.md b/russian/prayer/exmachina/vk/vk.md index e6213af9e9..27b775b08c 100644 --- a/russian/prayer/exmachina/vk/vk.md +++ b/russian/prayer/exmachina/vk/vk.md @@ -3,4 +3,5 @@ Там же тебя ждут. Конечно! Обои в розочку и полуразбитый лэптоп. Это не мешает тебе накатать некислую статейку-обзор о фильмце. Твой пост [Набрал кучу лайков](likes/likes.md) + [Пометили как "Спам", а тебя отправили в кик-бан](ban/ban.md) \ No newline at end of file diff --git a/russian/prayer/gopstop/gopstop.md b/russian/prayer/gopstop/gopstop.md index 9aeb25c49c..71ead0ae89 100644 --- a/russian/prayer/gopstop/gopstop.md +++ b/russian/prayer/gopstop/gopstop.md @@ -4,4 +4,5 @@ с мучительно тяжелым излишком благ на кармане. Но ты бывалый старый, ты не растерялся и [Достав волыну, начал потрошить шпану](shpana/shpana.md) + [Заметив их издалека, потопал в свое логово](logovo/logovo.md) \ No newline at end of file From 905dd0f1b5f4106cb7dfe35293b9790ac6f5b200 Mon Sep 17 00:00:00 2001 From: Sabin Maharjan Date: Tue, 22 Mar 2016 20:33:53 +0545 Subject: [PATCH 2889/5486] gthfy --- nepali/gthfy/gthfy.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 nepali/gthfy/gthfy.md diff --git a/nepali/gthfy/gthfy.md b/nepali/gthfy/gthfy.md new file mode 100644 index 0000000000..58d552995b --- /dev/null +++ b/nepali/gthfy/gthfy.md @@ -0,0 +1,3 @@ +Good To Hear From You + +Duet on Android -- Nice Game \ No newline at end of file From 9fc9ca0c6d09b7fbb93f202d0fab17efe491a92e Mon Sep 17 00:00:00 2001 From: Sabin Maharjan Date: Tue, 22 Mar 2016 20:43:49 +0545 Subject: [PATCH 2890/5486] gthfy2 --- nepali/gthfy/gthfy.md | 4 +++- nepali/gthfy/nice-one/nice.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 nepali/gthfy/nice-one/nice.md diff --git a/nepali/gthfy/gthfy.md b/nepali/gthfy/gthfy.md index 58d552995b..73217a0abe 100644 --- a/nepali/gthfy/gthfy.md +++ b/nepali/gthfy/gthfy.md @@ -1,3 +1,5 @@ Good To Hear From You -Duet on Android -- Nice Game \ No newline at end of file +Duet on Android -- Nice Game + +[Nice] (nice-one/nice.md) \ No newline at end of file diff --git a/nepali/gthfy/nice-one/nice.md b/nepali/gthfy/nice-one/nice.md new file mode 100644 index 0000000000..eb069437d2 --- /dev/null +++ b/nepali/gthfy/nice-one/nice.md @@ -0,0 +1 @@ +Good Job \ No newline at end of file From 233039e8c5aa6eb4e4e654d333547b55cd2effb2 Mon Sep 17 00:00:00 2001 From: Sabin Maharjan Date: Tue, 22 Mar 2016 21:00:12 +0545 Subject: [PATCH 2891/5486] varkhar bujyo --- nepali/about_nepal.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nepali/about_nepal.md b/nepali/about_nepal.md index 5be7bda80d..bd4b87d7ab 100644 --- a/nepali/about_nepal.md +++ b/nepali/about_nepal.md @@ -1,4 +1,4 @@ -नेपाल एक सुनदर देश हो । यहाँका पाकृितक समपदा +नेपाल एक सुनदर देश हो । यहाँका पाकृितक समपदा र पुरातातिवक समपदाहरूको बखान अनतराषिटय समुदायमा पिन ठुलो छ । @@ -8,3 +8,5 @@ चितवन राष्ट्रिय निकुन्जको बारे जान्न [यहाँ िथचनुहोस् ।] (http://www.chitwannationalpark.gov.np) +dhanyabad tapai ko .md file ko lagi +[tapai sanga kura garda ramro lagyo](gthfy/gthfy.md) \ No newline at end of file From fe5007406025a4877505d1771de52eddaa090382 Mon Sep 17 00:00:00 2001 From: Sabin Maharjan Date: Tue, 22 Mar 2016 21:09:56 +0545 Subject: [PATCH 2892/5486] link fixed --- nepali/about_nepal.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nepali/about_nepal.md b/nepali/about_nepal.md index bd4b87d7ab..dd96365ed6 100644 --- a/nepali/about_nepal.md +++ b/nepali/about_nepal.md @@ -9,4 +9,6 @@ [यहाँ िथचनुहोस् ।] (http://www.chitwannationalpark.gov.np) dhanyabad tapai ko .md file ko lagi -[tapai sanga kura garda ramro lagyo](gthfy/gthfy.md) \ No newline at end of file +[tapai sanga kura garda ramro lagyo](gthfy/gthfy.md) + +[purano](aalchi lagyo/alchi.md) \ No newline at end of file From c3553e2a0ca6fdb382822bccddd2bce1f477cc83 Mon Sep 17 00:00:00 2001 From: Sabin Maharjan Date: Tue, 22 Mar 2016 21:35:02 +0545 Subject: [PATCH 2893/5486] m --- nepali/about_nepal.md | 1 + 1 file changed, 1 insertion(+) diff --git a/nepali/about_nepal.md b/nepali/about_nepal.md index dd96365ed6..010cd0f9b2 100644 --- a/nepali/about_nepal.md +++ b/nepali/about_nepal.md @@ -8,6 +8,7 @@ चितवन राष्ट्रिय निकुन्जको बारे जान्न [यहाँ िथचनुहोस् ।] (http://www.chitwannationalpark.gov.np) + dhanyabad tapai ko .md file ko lagi [tapai sanga kura garda ramro lagyo](gthfy/gthfy.md) From 0da4e738f89797cf42e1daee0ccafa8d83e37b5c Mon Sep 17 00:00:00 2001 From: Sabin Maharjan Date: Tue, 22 Mar 2016 21:40:59 +0545 Subject: [PATCH 2894/5486] b --- nepali/about_nepal.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nepali/about_nepal.md b/nepali/about_nepal.md index 010cd0f9b2..a83918dbed 100644 --- a/nepali/about_nepal.md +++ b/nepali/about_nepal.md @@ -9,6 +9,8 @@ [यहाँ िथचनुहोस् ।] (http://www.chitwannationalpark.gov.np) + + dhanyabad tapai ko .md file ko lagi [tapai sanga kura garda ramro lagyo](gthfy/gthfy.md) From feaa23720eeaa3c61a8df9fe437cf173f9b6612f Mon Sep 17 00:00:00 2001 From: Sabin Maharjan Date: Tue, 22 Mar 2016 21:49:40 +0545 Subject: [PATCH 2895/5486] c --- nepali/about_nepal.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/nepali/about_nepal.md b/nepali/about_nepal.md index a83918dbed..dd96365ed6 100644 --- a/nepali/about_nepal.md +++ b/nepali/about_nepal.md @@ -8,9 +8,6 @@ चितवन राष्ट्रिय निकुन्जको बारे जान्न [यहाँ िथचनुहोस् ।] (http://www.chitwannationalpark.gov.np) - - - dhanyabad tapai ko .md file ko lagi [tapai sanga kura garda ramro lagyo](gthfy/gthfy.md) From 2f18b2c524324aebe8c989ceb4631bd35c66e6cc Mon Sep 17 00:00:00 2001 From: Sabin Maharjan Date: Tue, 22 Mar 2016 22:00:52 +0545 Subject: [PATCH 2896/5486] asdfasdf --- nepali/about_nepal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nepali/about_nepal.md b/nepali/about_nepal.md index dd96365ed6..0c23405e25 100644 --- a/nepali/about_nepal.md +++ b/nepali/about_nepal.md @@ -1,4 +1,4 @@ -नेपाल एक सुनदर देश हो । यहाँका पाकृितक समपदा +नेपाल एक सुनदर देश हो । यहाँका पाकृितक समपदा र पुरातातिवक समपदाहरूको बखान अनतराषिटय समुदायमा पिन ठुलो छ । From 5dd9874b6ee7b40e030a175afc8d452e922082ed Mon Sep 17 00:00:00 2001 From: Crystabelle Lopez Date: Tue, 22 Mar 2016 15:35:30 -0700 Subject: [PATCH 2897/5486] Fix: Add two options to a current dead-end page --- english/strange-room/room.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/english/strange-room/room.md b/english/strange-room/room.md index 4d84b6c863..fddf77b1bd 100644 --- a/english/strange-room/room.md +++ b/english/strange-room/room.md @@ -2,5 +2,12 @@ Upon entering, you see a sparsely furnished room with just a table, with a lit c It's obvious someone has been here recently but who? +You don't feel scared in the room for now, so you decide to look around for a +few minutes. You look under the table, and find a card with a random phone +number written on it. +Do you: +[Call the random number?](../call-a-random-number/answer.md) + +[Leave the room?](../find-exit/leave.md) From 77a0625802b822e0f7b47c1bb31d8d32a34219bf Mon Sep 17 00:00:00 2001 From: "Matt Wong (mattwon)" Date: Tue, 22 Mar 2016 15:55:35 -0700 Subject: [PATCH 2898/5486] Adding my part of the story "blackout" --- english/blackout/blackout.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/blackout/blackout.md diff --git a/english/blackout/blackout.md b/english/blackout/blackout.md new file mode 100644 index 0000000000..d155a1631d --- /dev/null +++ b/english/blackout/blackout.md @@ -0,0 +1 @@ +You walk down the tunnel and feel faint. You blackout and right before you hit the floor someone catches you. \ No newline at end of file From 08f4f2151da03d582c3bfd2f78675f7cc30cc3d6 Mon Sep 17 00:00:00 2001 From: "Matt Wong (mattwon)" Date: Tue, 22 Mar 2016 16:09:46 -0700 Subject: [PATCH 2899/5486] Added my part I think? "blackout" --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 416bd3077b..3bf246e275 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -871,4 +871,6 @@ As you attempt this, a voice booms!! The [boom](day-dream/day-dream.md) -Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) \ No newline at end of file +Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) + +You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) \ No newline at end of file From b06aa945b6a2d87c1f84e5bb472cdb414f29180c Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 22 Mar 2016 19:43:34 -0400 Subject: [PATCH 2900/5486] Added new storyline Daredevil Changes to be committed: new file: daredevil-marshmallows.md.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md.md diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md.md new file mode 100644 index 0000000000..d3b069f709 --- /dev/null +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md.md @@ -0,0 +1,6 @@ +The marshmallows require more Daredevil. + +They do not want to watch Luke Cage in the fall. +They plan to force Netflix into Daredevil season 3 instead. + +Hurray for the marshmallows. \ No newline at end of file From 1e8ecec70aab06f79eee80b732dad89ae8f352ad Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 22 Mar 2016 19:49:43 -0400 Subject: [PATCH 2901/5486] Edited the file path Changes to be committed: new file: daredevil-marshmallows.md Changes not staged for commit: deleted: daredevil-marshmallows.md.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md new file mode 100644 index 0000000000..d3b069f709 --- /dev/null +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md @@ -0,0 +1,6 @@ +The marshmallows require more Daredevil. + +They do not want to watch Luke Cage in the fall. +They plan to force Netflix into Daredevil season 3 instead. + +Hurray for the marshmallows. \ No newline at end of file From 3d47909c55d85ae0b940918c059a840c420b4a80 Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 19:51:14 -0400 Subject: [PATCH 2902/5486] Delete daredevil-marshmallows.md.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md.md | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md.md diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md.md deleted file mode 100644 index d3b069f709..0000000000 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md.md +++ /dev/null @@ -1,6 +0,0 @@ -The marshmallows require more Daredevil. - -They do not want to watch Luke Cage in the fall. -They plan to force Netflix into Daredevil season 3 instead. - -Hurray for the marshmallows. \ No newline at end of file From 8f14c6fb9191236dad36787e63f0c73a3489d9e5 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 22 Mar 2016 19:59:47 -0400 Subject: [PATCH 2903/5486] Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. Explicit paths specified without -i or -o; assuming --only paths... On branch story-changes Added a link to the original story line. Changes to be committed: modified: daredevil-marshmallows.md Changes not staged for commit: deleted: daredevil-marshmallows.md.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md index d3b069f709..a19c4c6d07 100644 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md @@ -1,6 +1,10 @@ -The marshmallows require more Daredevil. +The marshmallow did not like Casablanca. [watch-movie](up.md) + +The marshmallow require more Daredevil. They do not want to watch Luke Cage in the fall. They plan to force Netflix into Daredevil season 3 instead. -Hurray for the marshmallows. \ No newline at end of file +Hurray for the marshmallow! + +[go back to the story.](../marshmallow.md) From 6198032601b739a8fa2c47d430a655986df61050 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 22 Mar 2016 21:09:38 -0400 Subject: [PATCH 2904/5486] Changes to be committed: deleted: daredevil-marshmallows.md.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md.md | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md.md diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md.md deleted file mode 100644 index d3b069f709..0000000000 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md.md +++ /dev/null @@ -1,6 +0,0 @@ -The marshmallows require more Daredevil. - -They do not want to watch Luke Cage in the fall. -They plan to force Netflix into Daredevil season 3 instead. - -Hurray for the marshmallows. \ No newline at end of file From 3897f5fce5c4ca7c8a0d39226ecdfd88bbee6a94 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 22 Mar 2016 21:23:09 -0400 Subject: [PATCH 2905/5486] Edited Links Changes to be committed: modified: daredevil-marshmallows.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md index a19c4c6d07..ed29d237e7 100644 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md @@ -1,10 +1,10 @@ -The marshmallow did not like Casablanca. [watch-movie](up.md) +The marshmallows did not like Casablanca. [watch-movie](../up.md) -The marshmallow require more Daredevil. +The marshmallows requires more Daredevil. They do not want to watch Luke Cage in the fall. They plan to force Netflix into Daredevil season 3 instead. -Hurray for the marshmallow! +Hurray for the marshmallows! -[go back to the story.](../marshmallow.md) +[go back to the story.](english/marshmallow.md) From 4c49352f8ea1de25bf115f98cde5ae017ad5c0d3 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 22 Mar 2016 21:30:00 -0400 Subject: [PATCH 2906/5486] Still editing links Changes to be committed: modified: daredevil-marshmallows.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md index ed29d237e7..91c4e374c1 100644 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md @@ -1,4 +1,4 @@ -The marshmallows did not like Casablanca. [watch-movie](../up.md) +The marshmallows did not like Casablanca. [watch-movie](watch-movie/up.md) The marshmallows requires more Daredevil. @@ -7,4 +7,4 @@ They plan to force Netflix into Daredevil season 3 instead. Hurray for the marshmallows! -[go back to the story.](english/marshmallow.md) +[go back to the story.](..english/marshmallow.md) From d4a933a53b8c8d21fbde26562e96060bc0aaf569 Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 21:38:46 -0400 Subject: [PATCH 2907/5486] Update daredevil-marshmallows.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md index 91c4e374c1..d832554ee2 100644 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md @@ -1,4 +1,4 @@ -The marshmallows did not like Casablanca. [watch-movie](watch-movie/up.md) +The marshmallows did not like Casablanca. [watch-movie](../up.md) The marshmallows requires more Daredevil. @@ -8,3 +8,5 @@ They plan to force Netflix into Daredevil season 3 instead. Hurray for the marshmallows! [go back to the story.](..english/marshmallow.md) + + From 97bb5b336542f1a3107b7349f74c769a52db60b4 Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 21:39:49 -0400 Subject: [PATCH 2908/5486] Update daredevil-marshmallows.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md index d832554ee2..1a6d535e1a 100644 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md @@ -1,4 +1,4 @@ -The marshmallows did not like Casablanca. [watch-movie](../up.md) +The marshmallows did not like Casablanca. [watch-movie](../Up.md) The marshmallows requires more Daredevil. From b36e138cf9ba926f7e0a27e5d15fb152fdd4dbb7 Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 21:40:44 -0400 Subject: [PATCH 2909/5486] Update daredevil-marshmallows.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md index 1a6d535e1a..7052972fd3 100644 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md @@ -1,4 +1,4 @@ -The marshmallows did not like Casablanca. [watch-movie](../Up.md) +The marshmallows did not like Casablanca. [watch-movie](../up.md) The marshmallows requires more Daredevil. @@ -7,6 +7,6 @@ They plan to force Netflix into Daredevil season 3 instead. Hurray for the marshmallows! -[go back to the story.](..english/marshmallow.md) +[go back to the story.](....english/marshmallow.md) From 9d642e97d2ab759bb7ea2c07dec8e7212042547c Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 21:42:40 -0400 Subject: [PATCH 2910/5486] Update daredevil-marshmallows.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md index 7052972fd3..f289c9f64c 100644 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md @@ -7,6 +7,6 @@ They plan to force Netflix into Daredevil season 3 instead. Hurray for the marshmallows! -[go back to the story.](....english/marshmallow.md) +[go back to the story.](english/marshmallow.md) From e8acd38d5e1248132bcdcac47ec59b9be2ef635e Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 21:44:01 -0400 Subject: [PATCH 2911/5486] Update daredevil-marshmallows.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md index f289c9f64c..ad812dc78a 100644 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md @@ -7,6 +7,6 @@ They plan to force Netflix into Daredevil season 3 instead. Hurray for the marshmallows! -[go back to the story.](english/marshmallow.md) +[go back to the story.](../english/marshmallow.md) From f8351a9bbcee4605c67425491aa070dedeb4bee7 Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 21:44:21 -0400 Subject: [PATCH 2912/5486] Update daredevil-marshmallows.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md index ad812dc78a..78dab2eb0b 100644 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md @@ -7,6 +7,6 @@ They plan to force Netflix into Daredevil season 3 instead. Hurray for the marshmallows! -[go back to the story.](../english/marshmallow.md) +[go back to the story.](../../english/marshmallow.md) From 980a79ae491f39d554d5c2725b473626ed919385 Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 21:44:38 -0400 Subject: [PATCH 2913/5486] Update daredevil-marshmallows.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md index 78dab2eb0b..feaafb237d 100644 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md @@ -7,6 +7,6 @@ They plan to force Netflix into Daredevil season 3 instead. Hurray for the marshmallows! -[go back to the story.](../../english/marshmallow.md) +[go back to the story.](../../marshmallow.md) From 6edc6dada86d5bc634c26811bc16d2fc5673f34f Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 21:47:06 -0400 Subject: [PATCH 2914/5486] Update daredevil-marshmallows.md --- .../Daredevil-marshmallows/daredevil-marshmallows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md index feaafb237d..d889f6dd00 100644 --- a/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md +++ b/english/watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md @@ -1,4 +1,4 @@ -The marshmallows did not like Casablanca. [watch-movie](../up.md) +The marshmallows did not like Casablanca. [watch-movie](../Up.md) The marshmallows requires more Daredevil. From 6ee9813ecdb492f21fa3071c10f955e5e9271899 Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 21:52:18 -0400 Subject: [PATCH 2915/5486] Update marshmallow.md --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 416bd3077b..ece01e9842 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -871,4 +871,6 @@ As you attempt this, a voice booms!! The [boom](day-dream/day-dream.md) -Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) \ No newline at end of file +Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) + +For the love of Matt Murdock [Daredevil](watch-movie/daredevil-marshmallows/daredevil-marshmallows.md) From bc0a018251387fced906f9490775cce5e0f3cbcd Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 21:53:59 -0400 Subject: [PATCH 2916/5486] Update marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index ece01e9842..e155ff15ce 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -873,4 +873,4 @@ The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) -For the love of Matt Murdock [Daredevil](watch-movie/daredevil-marshmallows/daredevil-marshmallows.md) +For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) From 52903cac69b8440fba30538403def04558a73187 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 22 Mar 2016 22:45:45 -0400 Subject: [PATCH 2917/5486] Merged file with udacity/master --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index e155ff15ce..ab5b438718 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) +[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. @@ -874,3 +874,5 @@ The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) + +You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) From 365e9fd4326df6035aba9724d461d9059f62cc90 Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 22:55:19 -0400 Subject: [PATCH 2918/5486] Update marshmallow.md --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 767d026e62..23e9a62ce0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) +[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. @@ -875,4 +875,4 @@ Is it really? You see what appears to be a tunnel, a tunnel leading into the [un For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) -You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) \ No newline at end of file +You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) From e16a06d6431e6248f062dbc74e67e64d2dac0a5f Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 22:56:35 -0400 Subject: [PATCH 2919/5486] Update marshmallow.md From e98f62102938cb0a18239e98d27d978d6fab5926 Mon Sep 17 00:00:00 2001 From: Robert James Driscoll Date: Tue, 22 Mar 2016 22:59:48 -0400 Subject: [PATCH 2920/5486] Update marshmallow.md --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 23e9a62ce0..7157fb0ffa 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -873,6 +873,6 @@ The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) -For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) - You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) + +For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) From be7858eced92eb27e17a94fdcec66d884143396f Mon Sep 17 00:00:00 2001 From: nwinger Date: Tue, 22 Mar 2016 21:34:20 -0700 Subject: [PATCH 2921/5486] Add option to bake cookies --- english/meditate/meditate.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/meditate/meditate.md b/english/meditate/meditate.md index cfa7eed3b5..a4cd6f02d6 100644 --- a/english/meditate/meditate.md +++ b/english/meditate/meditate.md @@ -26,6 +26,8 @@ Afterwards, you decide to: [dance with joy](../dance/dance.md) +[bake cookies!](../bake-cookies/cookies.md) + [invite friends to party with you](../invite-friends/friends.md) [begin your journey](../explore-outside/explore-outside.md) From dfd45f73e98f5ed5d4eec28bc11d3764cfeff388 Mon Sep 17 00:00:00 2001 From: Patricia Date: Wed, 23 Mar 2016 11:15:03 -0400 Subject: [PATCH 2922/5486] Add my new story line to create-your-own-adventure --- english/marshmallow.md | 2 ++ english/mysterydoor/mysterydoor.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/mysterydoor/mysterydoor.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 7157fb0ffa..80c20fe4d5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -876,3 +876,5 @@ Is it really? You see what appears to be a tunnel, a tunnel leading into the [un You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) + +So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) diff --git a/english/mysterydoor/mysterydoor.md b/english/mysterydoor/mysterydoor.md new file mode 100644 index 0000000000..0ce61937b6 --- /dev/null +++ b/english/mysterydoor/mysterydoor.md @@ -0,0 +1,3 @@ +You see gymnasts all around doing miraculous moves. You forget everything and watch the routines and music. +You feel yourself never wanting to return, just stay here for eternity. Is there anything else? +A voice inside of you getting softer and softer. It is a super human effort but you say [return...](../marmallow.md) From ece8164498ea451f9d7f799bf94fd74e60b7175e Mon Sep 17 00:00:00 2001 From: Patricia Date: Wed, 23 Mar 2016 11:30:59 -0400 Subject: [PATCH 2923/5486] Typo for marshmallow.md link --- english/mysterydoor/mysterydoor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/mysterydoor/mysterydoor.md b/english/mysterydoor/mysterydoor.md index 0ce61937b6..c0ff38ff7e 100644 --- a/english/mysterydoor/mysterydoor.md +++ b/english/mysterydoor/mysterydoor.md @@ -1,3 +1,3 @@ You see gymnasts all around doing miraculous moves. You forget everything and watch the routines and music. You feel yourself never wanting to return, just stay here for eternity. Is there anything else? -A voice inside of you getting softer and softer. It is a super human effort but you say [return...](../marmallow.md) +A voice inside of you getting softer and softer. It is a super human effort but you say [return...](../marshmallow.md) From 4238487ee01a3fd6bbc2fde989ad948fd75f4c69 Mon Sep 17 00:00:00 2001 From: Daniel Marquez Date: Wed, 23 Mar 2016 16:45:53 -0400 Subject: [PATCH 2924/5486] Add new thunder carrots page to marshmallow page option --- english/marshmallow.md | 2 ++ english/thunder-carrots/thunder-carrots.md | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 english/thunder-carrots/thunder-carrots.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 7157fb0ffa..79b09b6dd6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -876,3 +876,5 @@ Is it really? You see what appears to be a tunnel, a tunnel leading into the [un You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) + +You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). diff --git a/english/thunder-carrots/thunder-carrots.md b/english/thunder-carrots/thunder-carrots.md new file mode 100644 index 0000000000..914748c557 --- /dev/null +++ b/english/thunder-carrots/thunder-carrots.md @@ -0,0 +1,12 @@ +You dream of walking to the microwave in the kitchen. +And you warm up a little soup. But then something happens. + +Out from the microwave, a dozen exploding thunder carrots swarm you smothering you as you cower. +You fall to the ground and hit your head. You come to, and, + +Yes! + +That's how to [clone](https://help.github.com/articles/fork-a-repo/) a remote! + +So you get to cloning. And get [back to your journey](../marshmallow.md). + From 452ceff1df4681daf581a1edbd361aa15fb2147a Mon Sep 17 00:00:00 2001 From: Daniel Marquez Date: Wed, 23 Mar 2016 16:52:37 -0400 Subject: [PATCH 2925/5486] Update link for auto-merge --- english/thunder-carrots/thunder-carrots.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/thunder-carrots/thunder-carrots.md b/english/thunder-carrots/thunder-carrots.md index 914748c557..0d93cad653 100644 --- a/english/thunder-carrots/thunder-carrots.md +++ b/english/thunder-carrots/thunder-carrots.md @@ -6,7 +6,7 @@ You fall to the ground and hit your head. You come to, and, Yes! -That's how to [clone](https://help.github.com/articles/fork-a-repo/) a remote! +That's how to [clone](https://www.google.com/search?q=fork+a+repo&oq=fork+a+repo&aqs=chrome..69i57j69i60j0l4.1958j0j1&sourceid=chrome&ie=UTF-8) a remote! So you get to cloning. And get [back to your journey](../marshmallow.md). From 555971e2fd4cc7d6f0b3f512e8f5632a9fbfc8a1 Mon Sep 17 00:00:00 2001 From: Daniel Marquez Date: Wed, 23 Mar 2016 16:55:55 -0400 Subject: [PATCH 2926/5486] Shorted Link for automerge --- english/thunder-carrots/thunder-carrots.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/thunder-carrots/thunder-carrots.md b/english/thunder-carrots/thunder-carrots.md index 0d93cad653..ed95d3f6e4 100644 --- a/english/thunder-carrots/thunder-carrots.md +++ b/english/thunder-carrots/thunder-carrots.md @@ -6,7 +6,7 @@ You fall to the ground and hit your head. You come to, and, Yes! -That's how to [clone](https://www.google.com/search?q=fork+a+repo&oq=fork+a+repo&aqs=chrome..69i57j69i60j0l4.1958j0j1&sourceid=chrome&ie=UTF-8) a remote! +That's how to [clone](https://goo.gl/IqYvlE) a remote! So you get to cloning. And get [back to your journey](../marshmallow.md). From d6a4995692ea36477e194eca7bcbb22f0e326528 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 24 Mar 2016 10:41:08 -0500 Subject: [PATCH 2927/5486] Add new solution to tunnel --- english/tunnel/blind-search/blind-search.md | 3 +++ english/tunnel/blind-search/small-hole/small-hole.md | 2 ++ english/tunnel/tunnel.md | 2 ++ 3 files changed, 7 insertions(+) create mode 100644 english/tunnel/blind-search/blind-search.md create mode 100644 english/tunnel/blind-search/small-hole/small-hole.md diff --git a/english/tunnel/blind-search/blind-search.md b/english/tunnel/blind-search/blind-search.md new file mode 100644 index 0000000000..6201550d03 --- /dev/null +++ b/english/tunnel/blind-search/blind-search.md @@ -0,0 +1,3 @@ +You feel around in the dark tunnel. The floor is smooth except for a small hole slightly larger than your hand. + +[Reach in for something useful.] (small-hole/small-hole.md) \ No newline at end of file diff --git a/english/tunnel/blind-search/small-hole/small-hole.md b/english/tunnel/blind-search/small-hole/small-hole.md new file mode 100644 index 0000000000..23da033df1 --- /dev/null +++ b/english/tunnel/blind-search/small-hole/small-hole.md @@ -0,0 +1,2 @@ +As you reach into the hole you feel a sharp sting on your hand. You pull your hand back to your body. +Your thoughts start to get fuzzy and you black out. \ No newline at end of file diff --git a/english/tunnel/tunnel.md b/english/tunnel/tunnel.md index 325c62afe6..f9d4e7c7f8 100644 --- a/english/tunnel/tunnel.md +++ b/english/tunnel/tunnel.md @@ -1,3 +1,5 @@ You sprint into the tunnel. The light quickly fades as you rush deeper into its depths. It gets eerily quiet. You can no longer hear your pursuer, only your breath echoing around you. + +[Look for a light] (blind-search/blind-search.md) \ No newline at end of file From 00874de99dd09e41b9a51ed2c0d49449ad49ff9c Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 24 Mar 2016 10:45:42 -0500 Subject: [PATCH 2928/5486] Fix punctuation --- english/tunnel/tunnel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/tunnel/tunnel.md b/english/tunnel/tunnel.md index f9d4e7c7f8..14a2a720f0 100644 --- a/english/tunnel/tunnel.md +++ b/english/tunnel/tunnel.md @@ -2,4 +2,4 @@ You sprint into the tunnel. The light quickly fades as you rush deeper into its depths. It gets eerily quiet. You can no longer hear your pursuer, only your breath echoing around you. -[Look for a light] (blind-search/blind-search.md) \ No newline at end of file +[Look for a light.] (blind-search/blind-search.md) \ No newline at end of file From eedf72418005e89a8b5e909ad1375fec8bb7bd03 Mon Sep 17 00:00:00 2001 From: jcnicolai Date: Thu, 24 Mar 2016 11:46:48 -0400 Subject: [PATCH 2929/5486] Add "impossible" page --- english/impossible/impossible.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 english/impossible/impossible.md diff --git a/english/impossible/impossible.md b/english/impossible/impossible.md new file mode 100644 index 0000000000..6a8d97590e --- /dev/null +++ b/english/impossible/impossible.md @@ -0,0 +1,23 @@ +IM POS SI BLE + - not able to occur, exist, or be done + - improbable, utterly impractical + - unable to be, exist, happen + - not capable of being accomplished + +You begin to [ponder](../ponder/ponder-about-life.md). + +Suddenly you have a flashback to being in a [forest](../forest/forest.md) + +But your eyes begin to blink rapidly. "Focus.", you shout to yourself. +Why all those steps? Where has it taken me? Have I become what I once thought was impossible? + +Have I become a [front-end web developer](https://www.udacity.com/course/front-end-web-developer-nanodegree--nd001) + +Is that a [Python](https://en.wikipedia.org/wiki/Pythonidae) on my desktop? + +No. Wait. Am I a [full stack web developer](https://www.udacity.com/course/full-stack-web-developer-nanodegree--nd004)? + +This is not possible. I need to look more closely at the data in front of me. +Surely I have not become a [data analyst](https://www.udacity.com/course/data-analyst-nanodegree--nd002). + +Is this merely a [dream within a dream](../dream_in_dream/inception.md) From 3b0cca9722edc2ed350ef8f6f3c913b9e2a9715e Mon Sep 17 00:00:00 2001 From: jcnicolai Date: Thu, 24 Mar 2016 11:47:28 -0400 Subject: [PATCH 2930/5486] Add story and link to "impossible" page --- english/real-life/real-life.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/real-life/real-life.md b/english/real-life/real-life.md index 75a72fb693..01d25fe14d 100644 --- a/english/real-life/real-life.md +++ b/english/real-life/real-life.md @@ -5,3 +5,7 @@ Therefore, don't consider this a dead-end in the adventure story, but a step along the path toward better collaborative coding. +Step. Step. Step. Step. Step... You open your eyes. Has it been days. No, maybe months. Years? +All you recall is the constant motion forward... Step. Step. Step. Step. Step. Step... + +Where you stand feels familiar, but distantly [impossible](../impossible/impossible.md). From 9c344efef1e167c2e6637c971f1137b6907d7fcd Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 24 Mar 2016 11:04:19 -0500 Subject: [PATCH 2931/5486] Add option to continue down the tunnel --- english/tunnel/continue/continue.md | 1 + english/tunnel/tunnel.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/tunnel/continue/continue.md diff --git a/english/tunnel/continue/continue.md b/english/tunnel/continue/continue.md new file mode 100644 index 0000000000..42e623dba1 --- /dev/null +++ b/english/tunnel/continue/continue.md @@ -0,0 +1 @@ +As you keep pushing on through the dark tunnel you eventually start to see a soft glow begin to appear. diff --git a/english/tunnel/tunnel.md b/english/tunnel/tunnel.md index 14a2a720f0..96acc0dc27 100644 --- a/english/tunnel/tunnel.md +++ b/english/tunnel/tunnel.md @@ -2,4 +2,6 @@ You sprint into the tunnel. The light quickly fades as you rush deeper into its depths. It gets eerily quiet. You can no longer hear your pursuer, only your breath echoing around you. -[Look for a light.] (blind-search/blind-search.md) \ No newline at end of file +[Look for a light.] (blind-search/blind-search.md) + +[Continue down the tunnel.] (continue/continue.ms) From 5a95abff24ce5271df24d938dcdd7a0cc89c0d12 Mon Sep 17 00:00:00 2001 From: TamikSKW Date: Thu, 24 Mar 2016 11:08:08 -0500 Subject: [PATCH 2932/5486] fix bad file extension --- english/tunnel/tunnel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/tunnel/tunnel.md b/english/tunnel/tunnel.md index 96acc0dc27..9b0ac09db3 100644 --- a/english/tunnel/tunnel.md +++ b/english/tunnel/tunnel.md @@ -4,4 +4,4 @@ hear your pursuer, only your breath echoing around you. [Look for a light.] (blind-search/blind-search.md) -[Continue down the tunnel.] (continue/continue.ms) +[Continue down the tunnel.] (continue/continue.md) From 5d32e0fda725b8c8673b0d6365814b4fb66600fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabu=20L=C3=A1rtiga?= Date: Thu, 24 Mar 2016 15:45:08 -0300 Subject: [PATCH 2933/5486] Add a new option to an existing choice point --- espanol/barracas/capitan.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/barracas/capitan.md b/espanol/barracas/capitan.md index eb2dd52ed9..91629ff72a 100644 --- a/espanol/barracas/capitan.md +++ b/espanol/barracas/capitan.md @@ -3,4 +3,6 @@ llamó al Capitán Hernández: [¡Capitán Hernández!, ¡Capitán Hernández!...](amable/hernandez.md) -[¡HERNÁNDEZ REMEDADO IMBÉCIL!](grosero/hernandez.md) \ No newline at end of file +[¡HERNÁNDEZ REMEDADO IMBÉCIL!](grosero/hernandez.md) + +[¡Mi capitán! El consejero lo manda a llamar. ¡Ha llegado el ejercito de la república!](llave/hernandez.md) \ No newline at end of file From 927a1c63554158408c4ef0cbaedc87f3182a989e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabu=20L=C3=A1rtiga?= Date: Thu, 24 Mar 2016 15:46:36 -0300 Subject: [PATCH 2934/5486] Create a new page and folder for the new option --- espanol/barracas/llave/hernandez.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 espanol/barracas/llave/hernandez.md diff --git a/espanol/barracas/llave/hernandez.md b/espanol/barracas/llave/hernandez.md new file mode 100644 index 0000000000..216db32edb --- /dev/null +++ b/espanol/barracas/llave/hernandez.md @@ -0,0 +1,3 @@ +El capitán Hernández sin hacer un mínimo gesto de alteración, sacó una llave de su bolsillo y se la pasó a Beatito. + +-Vé y entregasela al Consejero- le ordenó. \ No newline at end of file From 065cd9331ce8f913b45083cc02e3d332bc07033c Mon Sep 17 00:00:00 2001 From: dechengc Date: Thu, 24 Mar 2016 13:42:48 -0700 Subject: [PATCH 2935/5486] create Ray Allen --- Chinese/Ray-Allen/Ray-Allen.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Chinese/Ray-Allen/Ray-Allen.md diff --git a/Chinese/Ray-Allen/Ray-Allen.md b/Chinese/Ray-Allen/Ray-Allen.md new file mode 100644 index 0000000000..7a295162f0 --- /dev/null +++ b/Chinese/Ray-Allen/Ray-Allen.md @@ -0,0 +1,2 @@ +Walter Ray Allen, Jr. (born July 20, 1975) is an American professional basketball player who is currently a free agent. +Go to [here](https://en.wikipedia.org/wiki/Ray_Allen) \ No newline at end of file From 468b936c9f6e8c42e39407be27b11cc0dd18e36c Mon Sep 17 00:00:00 2001 From: dechengc Date: Thu, 24 Mar 2016 14:38:23 -0700 Subject: [PATCH 2936/5486] =?UTF-8?q?Update=20=E5=A4=A7=E8=AF=9D=E8=A5=BF?= =?UTF-8?q?=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index d6a02295ca..12b65d5541 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -99,3 +99,5 @@ [东哥与石头](Donggewudi/Donggeheiheihei.md) [极客](Geek/Geek.md) + +[Ray Allen](Ray-Allen/Ray-Allen.md) From 808ffcfae05da9c4b4d8ed30c900bab29da2400a Mon Sep 17 00:00:00 2001 From: lsylsy186 Date: Thu, 24 Mar 2016 16:34:06 -0700 Subject: [PATCH 2937/5486] add ZERO --- Chinese/ZERO/ZERO.md.txt | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Chinese/ZERO/ZERO.md.txt diff --git a/Chinese/ZERO/ZERO.md.txt b/Chinese/ZERO/ZERO.md.txt new file mode 100644 index 0000000000..a14c27299c --- /dev/null +++ b/Chinese/ZERO/ZERO.md.txt @@ -0,0 +1 @@ +Click [here](http://www.google.com) to visit Google. \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 12b65d5541..9c2f909c60 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -101,3 +101,5 @@ [极客](Geek/Geek.md) [Ray Allen](Ray-Allen/Ray-Allen.md) + +[ZERO](ZERO/ZERO.md) \ No newline at end of file From 8da6512a93547ee4a311e81f4ad712ae674c0a14 Mon Sep 17 00:00:00 2001 From: lsylsy186 Date: Thu, 24 Mar 2016 16:45:58 -0700 Subject: [PATCH 2938/5486] add --- Chinese/ZERO/{ZERO.md.txt => ZERO.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Chinese/ZERO/{ZERO.md.txt => ZERO.md} (100%) diff --git a/Chinese/ZERO/ZERO.md.txt b/Chinese/ZERO/ZERO.md similarity index 100% rename from Chinese/ZERO/ZERO.md.txt rename to Chinese/ZERO/ZERO.md From c8f3a3a74dc22be01281c21ef67c9cb3a580bfa2 Mon Sep 17 00:00:00 2001 From: Tracy Bragdon Date: Thu, 24 Mar 2016 20:03:30 -0400 Subject: [PATCH 2939/5486] Add option to eat ice cream if you think you are going crazy --- english/crazy/crazy.md | 4 +++- english/ice-cream/ice-cream.md | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/ice-cream/ice-cream.md diff --git a/english/crazy/crazy.md b/english/crazy/crazy.md index 567e918b38..54083a4e91 100644 --- a/english/crazy/crazy.md +++ b/english/crazy/crazy.md @@ -10,4 +10,6 @@ Do you... [Run](../run/run.md) -[Hide](../hide/hide-chk.md) \ No newline at end of file +[Hide](../hide/hide-chk.md) + +Eat some [ice cream?](../ice-cream/ice-cream.md) \ No newline at end of file diff --git a/english/ice-cream/ice-cream.md b/english/ice-cream/ice-cream.md new file mode 100644 index 0000000000..c6777185d9 --- /dev/null +++ b/english/ice-cream/ice-cream.md @@ -0,0 +1,5 @@ +Yes, ice cream makes everything better. Now it's just a matter of what flavor to have. +There are so many delicious possibilities.... + +french vanilla just melts in your mouth +brown sugar oatmeal is surprisingly scumptious \ No newline at end of file From 16e0aa1f5f253235779b4a050631475f573d0bf9 Mon Sep 17 00:00:00 2001 From: Chand Date: Fri, 25 Mar 2016 11:02:21 +0530 Subject: [PATCH 2940/5486] Add link to official 'Try Everything' song from Zootopia movie --- english/new-movie/new-movie.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/new-movie/new-movie.md b/english/new-movie/new-movie.md index 0a858a4b35..a2ad088653 100644 --- a/english/new-movie/new-movie.md +++ b/english/new-movie/new-movie.md @@ -35,3 +35,4 @@ Do you: [run straight?](../unending-story/unending-story.md) +[Try Everything](https://www.youtube.com/watch?v=c6rP-YP4c5I) from Zootopia. Wonderful movie. \ No newline at end of file From 0c32f07f3cb1ecd1c7509cb5170cac161498c963 Mon Sep 17 00:00:00 2001 From: Paolo Lammens Date: Fri, 25 Mar 2016 12:10:08 +0100 Subject: [PATCH 2941/5486] Add "transcender" story page in spanish section Added transcender.md, a new story page file, under the "espanol" folder (in spanish). Also added respective link in canudos.md (spanish section landing page). --- espanol/canudos.md | 2 ++ espanol/transcender/transcender.md | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 espanol/transcender/transcender.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 69a98e1606..0f098136ea 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -41,6 +41,8 @@ and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyA [Subió a la torre](torre/torre.md) +[Se cansó de la guerra y decidió alienarse de todo lo material, accediendo a un estado de meditación transcendente](transcender/transcender.md) + [Ordenó buscar al Capitán Trueno](capitan/trueno.md) [Empezó con el ritual de bienvenida para el ejército](ritual/ritual.md) diff --git a/espanol/transcender/transcender.md b/espanol/transcender/transcender.md new file mode 100644 index 0000000000..4c0806f3ef --- /dev/null +++ b/espanol/transcender/transcender.md @@ -0,0 +1,8 @@ +La percepción de todos las entidades materiales de su alrededor empezó a desvanecer. Primero los +utensilios, el mapa, los objetos pequeños; luego los muebles, la puerta, las ventanas... Todo se iba +fundiendo e integrando en un indescribible plasma vacilante y confuso, que como más crecía menos percibía +su existencia el Consejero. Una de las últimas figuras que, por así decir, desvaneció, fue Beatito, que +ya no era mas que una masa de colores amorfa que aún se diferenciaba del "fondo". + +Pero aún persistian sus pensamientos. Debería desprenderse de esos también, si quería transcender +debidamente. \ No newline at end of file From 8155e66f9e557afb7fbc7e7655358c865540ad84 Mon Sep 17 00:00:00 2001 From: Paolo Lammens Date: Fri, 25 Mar 2016 12:16:52 +0100 Subject: [PATCH 2942/5486] Update "canudos.md" to break into multiple lines Had a line that was over 120 characters long. I split it up into two lines and changed the link so that it would work. --- espanol/canudos.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 0f098136ea..79ddac3394 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -41,7 +41,8 @@ and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyA [Subió a la torre](torre/torre.md) -[Se cansó de la guerra y decidió alienarse de todo lo material, accediendo a un estado de meditación transcendente](transcender/transcender.md) +Se cansó de la guerra y decidió alienarse de todo lo material, +accediendo a un [estado de meditación transcendente](transcender/transcender.md) [Ordenó buscar al Capitán Trueno](capitan/trueno.md) From 215f3affe41a55956088d44681dce8384b33e632 Mon Sep 17 00:00:00 2001 From: Chand Date: Fri, 25 Mar 2016 17:31:32 +0530 Subject: [PATCH 2943/5486] Add reference to Shakira for the song Try Everything. --- english/new-movie/new-movie.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/new-movie/new-movie.md b/english/new-movie/new-movie.md index a2ad088653..c15a526db6 100644 --- a/english/new-movie/new-movie.md +++ b/english/new-movie/new-movie.md @@ -35,4 +35,6 @@ Do you: [run straight?](../unending-story/unending-story.md) -[Try Everything](https://www.youtube.com/watch?v=c6rP-YP4c5I) from Zootopia. Wonderful movie. \ No newline at end of file +[Try Everything](https://www.youtube.com/watch?v=c6rP-YP4c5I) from Zootopia. Wonderful movie. +Wonderful song from Shakira. + From eb9d4d706bcef36217ab40fd5547bf3b5e3df2d9 Mon Sep 17 00:00:00 2001 From: labuveiksmi Date: Fri, 25 Mar 2016 14:27:50 +0200 Subject: [PATCH 2944/5486] Added backward link to dead-end --- ukrainian/eat-wall/obese/continue/continue_eat.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ukrainian/eat-wall/obese/continue/continue_eat.md b/ukrainian/eat-wall/obese/continue/continue_eat.md index 4a9441939d..f04ac8415f 100644 --- a/ukrainian/eat-wall/obese/continue/continue_eat.md +++ b/ukrainian/eat-wall/obese/continue/continue_eat.md @@ -2,3 +2,5 @@ i i. , , , . "" . + +[ ](../marshmallow.md) From 968366f03929e70101d8541825264e096b7d878d Mon Sep 17 00:00:00 2001 From: labuveiksmi Date: Fri, 25 Mar 2016 14:34:21 +0200 Subject: [PATCH 2945/5486] fixing link --- ukrainian/eat-wall/obese/continue/continue_eat.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/eat-wall/obese/continue/continue_eat.md b/ukrainian/eat-wall/obese/continue/continue_eat.md index f04ac8415f..1e9441ab5b 100644 --- a/ukrainian/eat-wall/obese/continue/continue_eat.md +++ b/ukrainian/eat-wall/obese/continue/continue_eat.md @@ -3,4 +3,4 @@ , , , . "" . -[ ](../marshmallow.md) +[ ](../../../marshmallow.md) From acd6865caa5e5d5cc447150c08424446a8300856 Mon Sep 17 00:00:00 2001 From: WSiaB Date: Fri, 25 Mar 2016 09:19:17 -0700 Subject: [PATCH 2946/5486] Added submarine joke --- english/marshmallow.md | 2 ++ english/submarine/greatDeep.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/submarine/greatDeep.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 79b09b6dd6..f3f54f8b2d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -878,3 +878,5 @@ You start your way through the tunnel but you feel something coming [on](blackou For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). + +You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). diff --git a/english/submarine/greatDeep.md b/english/submarine/greatDeep.md new file mode 100644 index 0000000000..8983f46f34 --- /dev/null +++ b/english/submarine/greatDeep.md @@ -0,0 +1 @@ +[The thing about submarines is ...](http://static.fjcdn.com/pictures/Male+genital+joke+_8a8562_3703243.jpg) \ No newline at end of file From 337f9e710379567d498698e7689e746f8a4afdc7 Mon Sep 17 00:00:00 2001 From: Kulakouski Ihar Date: Fri, 25 Mar 2016 19:42:10 +0300 Subject: [PATCH 2947/5486] add exchange-office sell-zefir sleep-sweet --- belarussian/exchange-office/exchange-office.md | 3 +++ belarussian/sell-zefir/sell-zefir.md | 1 + belarussian/sleep-sweet/sleep-sweet.md | 1 + belarussian/zefir.md | 15 +++++++++++++++ language.md | 2 ++ 5 files changed, 22 insertions(+) create mode 100644 belarussian/exchange-office/exchange-office.md create mode 100644 belarussian/sell-zefir/sell-zefir.md create mode 100644 belarussian/sleep-sweet/sleep-sweet.md create mode 100644 belarussian/zefir.md diff --git a/belarussian/exchange-office/exchange-office.md b/belarussian/exchange-office/exchange-office.md new file mode 100644 index 0000000000..9a02aab58d --- /dev/null +++ b/belarussian/exchange-office/exchange-office.md @@ -0,0 +1,3 @@ + . + + , , ! i ... (evil smile) \ No newline at end of file diff --git a/belarussian/sell-zefir/sell-zefir.md b/belarussian/sell-zefir/sell-zefir.md new file mode 100644 index 0000000000..e4cd16182c --- /dev/null +++ b/belarussian/sell-zefir/sell-zefir.md @@ -0,0 +1 @@ +... i i , iii ?!... \ No newline at end of file diff --git a/belarussian/sleep-sweet/sleep-sweet.md b/belarussian/sleep-sweet/sleep-sweet.md new file mode 100644 index 0000000000..68479206e0 --- /dev/null +++ b/belarussian/sleep-sweet/sleep-sweet.md @@ -0,0 +1 @@ + , i ii. \ No newline at end of file diff --git a/belarussian/zefir.md b/belarussian/zefir.md new file mode 100644 index 0000000000..95b81964ef --- /dev/null +++ b/belarussian/zefir.md @@ -0,0 +1,15 @@ +Вы прачынаецеся ў пакоі са сценамі з зефіру. + +Пол пакрыты шакаладным глазурам. + +Сонца дорыць цяпло і спакой. + +Аднекуль даносіцца ціхі надзейны голас, які гарантуе стабільнасць нацыянальнай валюты. + +Вашы дзеянні: + +[Набяру пабольш зефіру, ён жа безкаштоўны!](sell-zefir/sell-zefir.md). + +[Пабягу ў абменнiк купляць далляры](exchange-office/exchange-office.md). + +[Пасплю яшчэ гадзінку](sleep-sweet/sleep-sweet.md). \ No newline at end of file diff --git a/language.md b/language.md index 04610ef880..6ecfea8f0e 100644 --- a/language.md +++ b/language.md @@ -42,6 +42,8 @@ Ha beszélsz magyarul, [kövess](hungarian/malyvacukor.md) Если вы говорите по-русски, то вам [сюда](russian/zefir.md) +Калі вы размаўляеце па-беларуску, вам [сюды] (belarussian/zefir.md) + Pokud mluvíš česky, [pokračuj zde](czech/marsmelouny.md). Toegang tot de [nederlandse versie](dutch/welkom.md). From 46b03e708d65070729befd5c66856166fed96a91 Mon Sep 17 00:00:00 2001 From: Kulakouski Ihar Date: Fri, 25 Mar 2016 19:48:47 +0300 Subject: [PATCH 2948/5486] adit broken links --- belarussian/zefir.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/belarussian/zefir.md b/belarussian/zefir.md index 95b81964ef..1ee5b64971 100644 --- a/belarussian/zefir.md +++ b/belarussian/zefir.md @@ -8,8 +8,8 @@ Вашы дзеянні: -[Набяру пабольш зефіру, ён жа безкаштоўны!](sell-zefir/sell-zefir.md). +[Набяру пабольш зефіру, ён жа безкаштоўны](sell-zefir/sell-zefir.md) -[Пабягу ў абменнiк купляць далляры](exchange-office/exchange-office.md). +[Пабягу ў абменнiк купляць далляры](exchange-office/exchange-office.md) -[Пасплю яшчэ гадзінку](sleep-sweet/sleep-sweet.md). \ No newline at end of file +[Пасплю яшчэ гадзінку](sleep-sweet/sleep-sweet.md) \ No newline at end of file From 89cd7d3fe9ad661e3e54d89495fa34d8571c5b84 Mon Sep 17 00:00:00 2001 From: Kulakouski Ihar Date: Fri, 25 Mar 2016 19:51:14 +0300 Subject: [PATCH 2949/5486] edit broken links --- belarussian/exchange-office/exchange-office.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/belarussian/exchange-office/exchange-office.md b/belarussian/exchange-office/exchange-office.md index 9a02aab58d..f5a5831239 100644 --- a/belarussian/exchange-office/exchange-office.md +++ b/belarussian/exchange-office/exchange-office.md @@ -1,3 +1,3 @@ . - , , ! i ... (evil smile) \ No newline at end of file + , , ! i i ... From fb91ce519a66497e813a206983a09755ff1d8bcd Mon Sep 17 00:00:00 2001 From: Kulakouski Ihar Date: Fri, 25 Mar 2016 19:52:50 +0300 Subject: [PATCH 2950/5486] edit broken links2 --- belarussian/sleep-sweet/sleep-sweet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/belarussian/sleep-sweet/sleep-sweet.md b/belarussian/sleep-sweet/sleep-sweet.md index 68479206e0..8b13789179 100644 --- a/belarussian/sleep-sweet/sleep-sweet.md +++ b/belarussian/sleep-sweet/sleep-sweet.md @@ -1 +1 @@ - , i ii. \ No newline at end of file + From d117af9687777a8f9d7564d0a88a49479f16677f Mon Sep 17 00:00:00 2001 From: Eugene Date: Fri, 25 Mar 2016 20:47:45 +0200 Subject: [PATCH 2951/5486] Just a phrase was added --- ukrainian/look-around/look-around.md | 1 + ukrainian/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 ukrainian/look-around/look-around.md diff --git a/ukrainian/look-around/look-around.md b/ukrainian/look-around/look-around.md new file mode 100644 index 0000000000..eeb3225920 --- /dev/null +++ b/ukrainian/look-around/look-around.md @@ -0,0 +1 @@ +When you look around you can see a lot of interesting people who you do not know. diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index a0c5ec8338..393285d62e 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -27,3 +27,5 @@ [Test!](test/test.md) І, так, я теж не розумію, для чого мотузка, але в голову лізуть підозрілі думки! + +[Look around](look-around/look-around.md) From ec6265ba42b1c20a2638d26dbc5d53f066e3ba41 Mon Sep 17 00:00:00 2001 From: Isa Date: Fri, 25 Mar 2016 22:08:33 -0700 Subject: [PATCH 2952/5486] Add call a spirit option --- english/Booyah/booyah.md | 1 + english/call-spirit/call-spirit.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 english/call-spirit/call-spirit.md diff --git a/english/Booyah/booyah.md b/english/Booyah/booyah.md index 25eb9331ea..19277e14d1 100644 --- a/english/Booyah/booyah.md +++ b/english/Booyah/booyah.md @@ -4,3 +4,4 @@ What am I going to do with my new found knowledge? The world is now my [oyster.](https://en.wikipedia.org/wiki/Pacific_oyster) Have some booyah stew +or call a [spirit](call-spirit/call-spirit.md) \ No newline at end of file diff --git a/english/call-spirit/call-spirit.md b/english/call-spirit/call-spirit.md new file mode 100644 index 0000000000..4dfbff2591 --- /dev/null +++ b/english/call-spirit/call-spirit.md @@ -0,0 +1 @@ +The spirit says everything in your life is upside down! Are you even alive? Is everyone who they say the are? \ No newline at end of file From 4f0038897a0b016c19cf5941e0e1083affd61113 Mon Sep 17 00:00:00 2001 From: Isa Date: Fri, 25 Mar 2016 22:14:11 -0700 Subject: [PATCH 2953/5486] Fixed link bug on booyah --- english/Booyah/booyah.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/Booyah/booyah.md b/english/Booyah/booyah.md index 19277e14d1..7784c0c732 100644 --- a/english/Booyah/booyah.md +++ b/english/Booyah/booyah.md @@ -4,4 +4,4 @@ What am I going to do with my new found knowledge? The world is now my [oyster.](https://en.wikipedia.org/wiki/Pacific_oyster) Have some booyah stew -or call a [spirit](call-spirit/call-spirit.md) \ No newline at end of file +or call a [spirit](../call-spirit/call-spirit.md) \ No newline at end of file From e3b75d858a3dfdbc94df060aec36bc74a6337ef2 Mon Sep 17 00:00:00 2001 From: Alberto Samaniego Date: Sat, 26 Mar 2016 03:16:31 -0300 Subject: [PATCH 2954/5486] Add option to huida --- espanol/torre/huida/huida.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/torre/huida/huida.md b/espanol/torre/huida/huida.md index 6d85e05ae5..6b5579cf94 100644 --- a/espanol/torre/huida/huida.md +++ b/espanol/torre/huida/huida.md @@ -1 +1,3 @@ No se puede medir la fuerza del enemigo y su estimacion supone una fuerza muy alta. + +Por lo que el consejero decidió de nuevo [subir a la torre](torre/torre.md) From 83140916a3b693fd0c9108a03c5c6a04b02e1305 Mon Sep 17 00:00:00 2001 From: Alberto Samaniego Date: Sat, 26 Mar 2016 03:22:36 -0300 Subject: [PATCH 2955/5486] Fix broken link --- espanol/torre/huida/huida.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/huida/huida.md b/espanol/torre/huida/huida.md index 6b5579cf94..c14e7fbd04 100644 --- a/espanol/torre/huida/huida.md +++ b/espanol/torre/huida/huida.md @@ -1,3 +1,3 @@ No se puede medir la fuerza del enemigo y su estimacion supone una fuerza muy alta. -Por lo que el consejero decidió de nuevo [subir a la torre](torre/torre.md) +Por lo que el consejero decidió de nuevo [subir a la torre](../torre.md) From 9b92aa00f7ba5b27951927f80d4ecccd8b1580ce Mon Sep 17 00:00:00 2001 From: Stephen Klein Date: Sat, 26 Mar 2016 02:31:38 -0400 Subject: [PATCH 2956/5486] Add cowboy directory and md file --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 44b2b0782a..bda1fc80a7 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -884,3 +884,4 @@ You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) +You put your [cowboy hat](cowboy/cowboy.md) back on your head. From 1715c9039adf78d8661fbbef3c69d916ae9f3dd8 Mon Sep 17 00:00:00 2001 From: Stephen Klein Date: Sat, 26 Mar 2016 02:38:07 -0400 Subject: [PATCH 2957/5486] Add cowboy.md to cowboy directory --- english/cowboy/cowboy.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/cowboy/cowboy.md diff --git a/english/cowboy/cowboy.md b/english/cowboy/cowboy.md new file mode 100644 index 0000000000..7fb2fa2112 --- /dev/null +++ b/english/cowboy/cowboy.md @@ -0,0 +1,3 @@ +... Once you feel your best bib and tucker are all correct, you strut into the +bar, push the nearest deadbeat and start the meanest brawl the ruff'n'tumble +tavern has ever seen. From 97ed27ffcfbc8915b33f4df9827a1e4c0a757680 Mon Sep 17 00:00:00 2001 From: Alberto Samaniego Date: Sat, 26 Mar 2016 04:25:10 -0300 Subject: [PATCH 2958/5486] Add I forgot at the end of marshmallow --- english/marshmallow.md | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index bda1fc80a7..5b444d3e38 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -4,9 +4,9 @@ You decide the only way out is to climb, [climb](climbing/climbing.md) hard frie [Know about the life of this world](00-Life-of-this-world/Life of this world.md) -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) Vist the master [liquid](liquid/liquid.md). @@ -732,7 +732,7 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now +Despite the little conundrum that you resolved, you realize that it's now Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" @@ -754,9 +754,9 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines +When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. +there are two options you must choose from. You may either do [this](gtd/gtd.md), @@ -768,12 +768,12 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? @@ -787,7 +787,7 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive](divergence/divergence.md) or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) @@ -841,7 +841,7 @@ Do you want to build a [snowman?] (snowman/snowman.md) It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) -I think I'll try defying gravity. +I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) @@ -869,7 +869,7 @@ Explore the unknown. Most people die without ever visiting this [place.](underwa As you attempt this, a voice booms!! -The [boom](day-dream/day-dream.md) +The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) @@ -881,7 +881,9 @@ You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). -So what to do next? Three doors appear and all other ways out disappear. +So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. + +Or... or... or... oh, I forgot. From 3858ed28fa937c73dbcff0a9e5b39f6af0a989ed Mon Sep 17 00:00:00 2001 From: Alberto Samaniego Date: Sat, 26 Mar 2016 12:23:41 -0300 Subject: [PATCH 2959/5486] Revert "Add I forgot at the end of marshmallow" This reverts commit 97ed27ffcfbc8915b33f4df9827a1e4c0a757680. --- english/marshmallow.md | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5b444d3e38..bda1fc80a7 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -4,9 +4,9 @@ You decide the only way out is to climb, [climb](climbing/climbing.md) hard frie [Know about the life of this world](00-Life-of-this-world/Life of this world.md) -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) Vist the master [liquid](liquid/liquid.md). @@ -732,7 +732,7 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now +Despite the little conundrum that you resolved, you realize that it's now Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" @@ -754,9 +754,9 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines +When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. +there are two options you must choose from. You may either do [this](gtd/gtd.md), @@ -768,12 +768,12 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? @@ -787,7 +787,7 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive](divergence/divergence.md) or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) @@ -841,7 +841,7 @@ Do you want to build a [snowman?] (snowman/snowman.md) It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) -I think I'll try defying gravity. +I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) @@ -869,7 +869,7 @@ Explore the unknown. Most people die without ever visiting this [place.](underwa As you attempt this, a voice booms!! -The [boom](day-dream/day-dream.md) +The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) @@ -881,9 +881,7 @@ You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). -So what to do next? Three doors appear and all other ways out disappear. +So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. - -Or... or... or... oh, I forgot. From 7fb508d2700c2788a742d9340f6e25712eebf356 Mon Sep 17 00:00:00 2001 From: Alberto Samaniego Date: Sat, 26 Mar 2016 12:46:44 -0300 Subject: [PATCH 2960/5486] Add "Oh, I forgot at the end for marshmallow" --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index bda1fc80a7..87de4dde54 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -885,3 +885,5 @@ So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. + +Or... or... or... Oh, I forgot! From a579c48a3dbc5297b018b6ce18bb79dc479d2369 Mon Sep 17 00:00:00 2001 From: bazzika Date: Sat, 26 Mar 2016 19:12:54 +0200 Subject: [PATCH 2961/5486] - add new story --- russian/light-fire/sing/dubinushka/dubinushka.md | 15 +++++++++++++++ russian/light-fire/sing/sing.md | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 russian/light-fire/sing/dubinushka/dubinushka.md diff --git a/russian/light-fire/sing/dubinushka/dubinushka.md b/russian/light-fire/sing/dubinushka/dubinushka.md new file mode 100644 index 0000000000..7f2f0da712 --- /dev/null +++ b/russian/light-fire/sing/dubinushka/dubinushka.md @@ -0,0 +1,15 @@ +Мы бьем первую залогу, +Просим Бога на подмогу. + +Эх, дубинушка, ухнем! +Эх, зеленая, сама пойдет, +Сама пойдет! + +Что ж ты, сваюшка, стала, +Аль на камушек попала? + +Как мы сваюшку затурим, +Сядем трубочки закурим. + +Эй, ребята, плохо дело, +На каменья свая села. \ No newline at end of file diff --git a/russian/light-fire/sing/sing.md b/russian/light-fire/sing/sing.md index 6eab2a0eb3..d26f82cdaf 100644 --- a/russian/light-fire/sing/sing.md +++ b/russian/light-fire/sing/sing.md @@ -13,3 +13,5 @@ ["Это не шутки, мы встретились в маршрутке..."](marshrutka/marshrutka.md) ["Все бегут бегут бегут бегут бегут бегут бегут, а он им светит..."](svetophor/svetophor.md) + +[Эх, дубинушка, уууухнем...](dubinushka/dubinushka.md) From d3a8084016b086af6683bb1c73a90b7bcedce625 Mon Sep 17 00:00:00 2001 From: HsuYiRen Date: Sun, 27 Mar 2016 21:16:33 +0800 Subject: [PATCH 2962/5486] became Macarone --- Chinese/YingJeouMa/YingJeouMa.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/YingJeouMa/YingJeouMa.md b/Chinese/YingJeouMa/YingJeouMa.md index 17f0e1c771..c9efa7c6d8 100644 --- a/Chinese/YingJeouMa/YingJeouMa.md +++ b/Chinese/YingJeouMa/YingJeouMa.md @@ -1,3 +1,5 @@ 成為某國總統，禍國殃民。 -最喜歡的人有三個，一個是金葡蔥，一個是周沒清，另一個我不能說。 \ No newline at end of file +耳朵還長了鹿茸，成了甜點馬卡茸代言人。 + +最喜歡的人有三個，一個是金葡蔥，一個是周沒清，另一個我不能說。 From 89f126f9a87c1f77f3f03901e45667793c129e94 Mon Sep 17 00:00:00 2001 From: HsuYiRen Date: Sun, 27 Mar 2016 21:24:27 +0800 Subject: [PATCH 2963/5486] style the new contents to new lines --- Chinese/YingJeouMa/YingJeouMa.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Chinese/YingJeouMa/YingJeouMa.md b/Chinese/YingJeouMa/YingJeouMa.md index c9efa7c6d8..2b834567ad 100644 --- a/Chinese/YingJeouMa/YingJeouMa.md +++ b/Chinese/YingJeouMa/YingJeouMa.md @@ -1,5 +1,5 @@ 成為某國總統，禍國殃民。 -耳朵還長了鹿茸，成了甜點馬卡茸代言人。 - 最喜歡的人有三個，一個是金葡蔥，一個是周沒清，另一個我不能說。 + +耳朵還長了鹿茸，成了甜點馬卡茸代言人。 From fc48e0e802ddc84f40509d504f82433c1beb79b4 Mon Sep 17 00:00:00 2001 From: code4salvation Date: Mon, 28 Mar 2016 12:51:14 +0530 Subject: [PATCH 2964/5486] Update yoga_benefits.md --- english/yoga/benefits/yoga_benefits.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/yoga/benefits/yoga_benefits.md b/english/yoga/benefits/yoga_benefits.md index 72710819c2..586907adc4 100644 --- a/english/yoga/benefits/yoga_benefits.md +++ b/english/yoga/benefits/yoga_benefits.md @@ -17,3 +17,6 @@ Here we provide a list of benefits: 7. Protection from injury 9. Increases happiness 10. Meet righteous babes. +11. Increases focus. +12. Make you calm and manages anger. +13. Help you connect with your soul and inner god. From 737adc40a891611d18a38593a124132b31ed7940 Mon Sep 17 00:00:00 2001 From: uk61 Date: Mon, 28 Mar 2016 22:07:32 +0200 Subject: [PATCH 2965/5486] add new option kreuzfahrt to klingeln --- .../Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md | 2 +- .../insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md diff --git a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md index dc9f1303b9..911a592865 100644 --- a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md +++ b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md @@ -1 +1 @@ -Du klingelst das Glöckchen nochmals und der Wal muss plötzlich niesen. \ No newline at end of file +Du klingelst das Glöckchen nochmals und der [Wal muss plötzlich niesen](kreuzfahrt/kreuzfahrt.md). \ No newline at end of file diff --git a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md new file mode 100644 index 0000000000..5f410ac1de --- /dev/null +++ b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md @@ -0,0 +1,3 @@ +Und so gewaltig ist das Niesen des Blauwals, dass es Sie hinaus katapultiert aus dem Wal; wie ein Torpedo schießen Sie durch das salzige Wasser, durchbrechen die Oberfläche und landen mit einem königlichen Bauchplatscher in einem chlorhaltigen Pool. Mit letzter Ktaft heben Sie den Kopf und während Sie noch nach Luft ringen und Wasser spucken, merken Sie : Sie sind auf einem Kreuzfahrtschiff gelandet! + +Soweit alles, gut, denken Sie noch, da sehen Sie, wie sich mit Highspeed zwei große Schlauchboote voller Bewaffneter dem Schiff nähern ... \ No newline at end of file From b3991f8bf33fbbf48083a7f50110728a34b89c10 Mon Sep 17 00:00:00 2001 From: uk61 Date: Mon, 28 Mar 2016 22:16:39 +0200 Subject: [PATCH 2966/5486] add new line in klingeln.md --- .../Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md | 3 ++- .../insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md index 911a592865..342ab4168b 100644 --- a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md +++ b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/klingeln.md @@ -1 +1,2 @@ -Du klingelst das Glöckchen nochmals und der [Wal muss plötzlich niesen](kreuzfahrt/kreuzfahrt.md). \ No newline at end of file +Du klingelst das Glöckchen nochmals und der Wal muss plötzlich niesen. +[Und so gewaltig niest der Wal, dass ...](kreuzfahrt/kreuzfahrt.md) \ No newline at end of file diff --git a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md index 5f410ac1de..ad09b28d72 100644 --- a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md +++ b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md @@ -1,3 +1,3 @@ -Und so gewaltig ist das Niesen des Blauwals, dass es Sie hinaus katapultiert aus dem Wal; wie ein Torpedo schießen Sie durch das salzige Wasser, durchbrechen die Oberfläche und landen mit einem königlichen Bauchplatscher in einem chlorhaltigen Pool. Mit letzter Ktaft heben Sie den Kopf und während Sie noch nach Luft ringen und Wasser spucken, merken Sie : Sie sind auf einem Kreuzfahrtschiff gelandet! + ... es dich hinaus katapultiert aus dem Wal; wie ein Torpedo schießt du durch das salzige Wasser, durchbrichst die Oberfläche und landest mit einem königlichen Bauchplatscher in einem chlorhaltigen Pool. Mit letzter Ktaft hebst du den Kopf und während du noch nach Luft ringst und Wasser spuckst, merkst du : Oh nein, ich bin auf einem Kreuzfahrtschiff gelandet! -Soweit alles, gut, denken Sie noch, da sehen Sie, wie sich mit Highspeed zwei große Schlauchboote voller Bewaffneter dem Schiff nähern ... \ No newline at end of file +Na gut, wenigstens bin ich hier sicher, denkst du noch, da siehst du, wie sich mit Highspeed zwei große Schlauchboote voller Bewaffneter dem Schiff nähern ... \ No newline at end of file From d866dde4f8421539a2fc96487bab1fea1d3e569f Mon Sep 17 00:00:00 2001 From: uk61 Date: Mon, 28 Mar 2016 22:24:53 +0200 Subject: [PATCH 2967/5486] change shortened the lines --- .../insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md index ad09b28d72..01b9b3eb8b 100644 --- a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md +++ b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md @@ -1,3 +1,8 @@ - ... es dich hinaus katapultiert aus dem Wal; wie ein Torpedo schießt du durch das salzige Wasser, durchbrichst die Oberfläche und landest mit einem königlichen Bauchplatscher in einem chlorhaltigen Pool. Mit letzter Ktaft hebst du den Kopf und während du noch nach Luft ringst und Wasser spuckst, merkst du : Oh nein, ich bin auf einem Kreuzfahrtschiff gelandet! + ... es dich hinaus katapultiert aus dem Wal; wie ein Torpedo schießt du durch das + salzige Wasser, durchbrichst die Oberfläche und landest mit einem königlichen + Bauchplatscher in einem chlorhaltigen Pool. Mit letzter Ktaft hebst du den Kopf + und während du noch nach Luft ringst und Wasser spuckst, merkst du: + Oh nein, ich bin auf einem Kreuzfahrtschiff gelandet! -Na gut, wenigstens bin ich hier sicher, denkst du noch, da siehst du, wie sich mit Highspeed zwei große Schlauchboote voller Bewaffneter dem Schiff nähern ... \ No newline at end of file +Na gut, wenigstens bin ich hier sicher, denkst du noch, da siehst du, wie +sich mit Highspeed zwei große Schlauchboote voller Bewaffneter dem Schiff nähern ... \ No newline at end of file From 695d56406432322a7c82588d2f434b4c430102c9 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 28 Mar 2016 23:51:57 +0200 Subject: [PATCH 2968/5486] continue colazione --- Italian/colazione/colazione.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Italian/colazione/colazione.md b/Italian/colazione/colazione.md index ab05cfffc0..ddb5f823d0 100644 --- a/Italian/colazione/colazione.md +++ b/Italian/colazione/colazione.md @@ -1 +1,3 @@ -[Si mangia](https://www.youtube.com/watch?v=sN6opoE0iZk) \ No newline at end of file +[Si mangia](https://www.youtube.com/watch?v=sN6opoE0iZk) + +Si esce a prendere il tram \ No newline at end of file From e49627dc1cbcea384f023c3f1a8d4c298b64d778 Mon Sep 17 00:00:00 2001 From: John Chung Date: Mon, 28 Mar 2016 21:28:20 -0700 Subject: [PATCH 2969/5486] Add fish talk option. --- .../eating/stream/go-fish/talk-fish/meaning/meaning.md | 3 +++ english/light-fire/eating/stream/go-fish/talk-fish/talk.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/light-fire/eating/stream/go-fish/talk-fish/meaning/meaning.md diff --git a/english/light-fire/eating/stream/go-fish/talk-fish/meaning/meaning.md b/english/light-fire/eating/stream/go-fish/talk-fish/meaning/meaning.md new file mode 100644 index 0000000000..efa8c20b54 --- /dev/null +++ b/english/light-fire/eating/stream/go-fish/talk-fish/meaning/meaning.md @@ -0,0 +1,3 @@ +You ask the fish the meaning of life. + +The fish stares at you with hollow eyes, gasping. \ No newline at end of file diff --git a/english/light-fire/eating/stream/go-fish/talk-fish/talk.md b/english/light-fire/eating/stream/go-fish/talk-fish/talk.md index 520042a405..639a869094 100644 --- a/english/light-fire/eating/stream/go-fish/talk-fish/talk.md +++ b/english/light-fire/eating/stream/go-fish/talk-fish/talk.md @@ -4,4 +4,6 @@ A lot of things are on your mind. It's been a busy day so far! What do you talk about with the fish? -[Talk about the weather](weather/weather.md) \ No newline at end of file +[Talk about the weather](weather/weather.md) + +[Talk about the meaning of life](meaning/meaning.md) \ No newline at end of file From c6cc8967487d9fc85775c48dda853a566700da4f Mon Sep 17 00:00:00 2001 From: Lujun Weng Date: Tue, 29 Mar 2016 20:57:19 +0800 Subject: [PATCH 2970/5486] add a new story in OldStory --- .../\345\217\230\346\210\220\347\213\227\344\272\206.md" | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 "Chinese/DesertHell/OldStory/Cat2Dog/\345\217\230\346\210\220\347\213\227\344\272\206.md" diff --git "a/Chinese/DesertHell/OldStory/Cat2Dog/\345\217\230\346\210\220\347\213\227\344\272\206.md" "b/Chinese/DesertHell/OldStory/Cat2Dog/\345\217\230\346\210\220\347\213\227\344\272\206.md" new file mode 100644 index 0000000000..a2c2446d83 --- /dev/null +++ "b/Chinese/DesertHell/OldStory/Cat2Dog/\345\217\230\346\210\220\347\213\227\344\272\206.md" @@ -0,0 +1,2 @@ +这只猫变成了一只狗。它很茫然。它就去找白胡子老头，白胡子老头说，说什么呢？ + From d7e573bf339489aa8e5289ac4b5cf87044f8abc2 Mon Sep 17 00:00:00 2001 From: Lujun Weng Date: Tue, 29 Mar 2016 20:59:44 +0800 Subject: [PATCH 2971/5486] add a new option --- Chinese/DesertHell/OldStory/Story.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/DesertHell/OldStory/Story.md b/Chinese/DesertHell/OldStory/Story.md index ae043b2b0f..93ed432411 100644 --- a/Chinese/DesertHell/OldStory/Story.md +++ b/Chinese/DesertHell/OldStory/Story.md @@ -5,4 +5,4 @@ 很久很久以前, 有一隻白猫, 他是一隻活过一万次的猫, -[他讲的什么？](./Story.md) +[突然](./Cat2Dog/变成狗了.md) From 2f50efaa64d0fa0dc0c8cca0502dcb077aeb69b0 Mon Sep 17 00:00:00 2001 From: Lujun Weng Date: Tue, 29 Mar 2016 21:22:23 +0800 Subject: [PATCH 2972/5486] Revert "add a new option" This reverts commit d7e573bf339489aa8e5289ac4b5cf87044f8abc2. --- Chinese/DesertHell/OldStory/Story.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/DesertHell/OldStory/Story.md b/Chinese/DesertHell/OldStory/Story.md index 93ed432411..ae043b2b0f 100644 --- a/Chinese/DesertHell/OldStory/Story.md +++ b/Chinese/DesertHell/OldStory/Story.md @@ -5,4 +5,4 @@ 很久很久以前, 有一隻白猫, 他是一隻活过一万次的猫, -[突然](./Cat2Dog/变成狗了.md) +[他讲的什么？](./Story.md) From b09e5eec5303173c918d6be9a3cc9f006384e266 Mon Sep 17 00:00:00 2001 From: Lujun Weng Date: Tue, 29 Mar 2016 21:24:19 +0800 Subject: [PATCH 2973/5486] add a new option and leave the original unchanged --- Chinese/DesertHell/OldStory/Story.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Chinese/DesertHell/OldStory/Story.md b/Chinese/DesertHell/OldStory/Story.md index ae043b2b0f..7cc240422d 100644 --- a/Chinese/DesertHell/OldStory/Story.md +++ b/Chinese/DesertHell/OldStory/Story.md @@ -6,3 +6,5 @@ 有一隻白猫, 他是一隻活过一万次的猫, [他讲的什么？](./Story.md) + +[突然](./Cat2Dog/变成够了.md) From 92c5829ef649b8859295f753e432c915678aa71b Mon Sep 17 00:00:00 2001 From: Lujun Weng Date: Tue, 29 Mar 2016 21:26:53 +0800 Subject: [PATCH 2974/5486] fix a typo --- Chinese/DesertHell/OldStory/Story.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/DesertHell/OldStory/Story.md b/Chinese/DesertHell/OldStory/Story.md index 7cc240422d..74ae63bd1a 100644 --- a/Chinese/DesertHell/OldStory/Story.md +++ b/Chinese/DesertHell/OldStory/Story.md @@ -7,4 +7,4 @@ 他是一隻活过一万次的猫, [他讲的什么？](./Story.md) -[突然](./Cat2Dog/变成够了.md) +[突然](./Cat2Dog/变成狗了.md) From b19bb30b19047ab97e917918b2d0f7122fd58de7 Mon Sep 17 00:00:00 2001 From: Deelen Date: Tue, 29 Mar 2016 15:35:09 +0200 Subject: [PATCH 2975/5486] Added story element when you enter the bushes in the dark forrest. --- dutch/bos/struiken/bes/bes.md | 3 +++ dutch/bos/struiken/in_de_struiken.md | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 dutch/bos/struiken/bes/bes.md diff --git a/dutch/bos/struiken/bes/bes.md b/dutch/bos/struiken/bes/bes.md new file mode 100644 index 0000000000..778ce60f1e --- /dev/null +++ b/dutch/bos/struiken/bes/bes.md @@ -0,0 +1,3 @@ +Je krijgt een visioen. + +Je bevindt je in de [struiken](../in_de_struiken). \ No newline at end of file diff --git a/dutch/bos/struiken/in_de_struiken.md b/dutch/bos/struiken/in_de_struiken.md index f12e1bb820..89e91b8dac 100644 --- a/dutch/bos/struiken/in_de_struiken.md +++ b/dutch/bos/struiken/in_de_struiken.md @@ -1 +1,5 @@ -Je ligt in de struiken en kijkt rond. De takken prikken in je rug. \ No newline at end of file +Je ligt in de struiken en kijkt rond. De takken prikken in je rug. + +Je plukt een bes [struiken](bes/bes.md). + +Je besluit geen bes te plukken en gaat [verder in het bos](../donker-bos.md). \ No newline at end of file From 4fe9a3033a874ef31ea60f9ba64fc5d009f86a0d Mon Sep 17 00:00:00 2001 From: Deelen Date: Tue, 29 Mar 2016 15:40:04 +0200 Subject: [PATCH 2976/5486] Fixed some broken links. --- dutch/bos/struiken/bes/bes.md | 2 +- dutch/bos/struiken/in_de_struiken.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dutch/bos/struiken/bes/bes.md b/dutch/bos/struiken/bes/bes.md index 778ce60f1e..e2ea06fcb4 100644 --- a/dutch/bos/struiken/bes/bes.md +++ b/dutch/bos/struiken/bes/bes.md @@ -1,3 +1,3 @@ Je krijgt een visioen. -Je bevindt je in de [struiken](../in_de_struiken). \ No newline at end of file +Je bevindt je in de [struiken](../in_de_struiken.md). \ No newline at end of file diff --git a/dutch/bos/struiken/in_de_struiken.md b/dutch/bos/struiken/in_de_struiken.md index 89e91b8dac..561b8d1fb4 100644 --- a/dutch/bos/struiken/in_de_struiken.md +++ b/dutch/bos/struiken/in_de_struiken.md @@ -1,5 +1,5 @@ Je ligt in de struiken en kijkt rond. De takken prikken in je rug. -Je plukt een bes [struiken](bes/bes.md). +Je [plukt een bes](bes/bes.md). Je besluit geen bes te plukken en gaat [verder in het bos](../donker-bos.md). \ No newline at end of file From 2d30e15d384ca5eb437c86ea1b728bb614752658 Mon Sep 17 00:00:00 2001 From: "luca.gramaglia" <1993luca@gmail.com> Date: Tue, 29 Mar 2016 23:04:34 +0200 Subject: [PATCH 2977/5486] Add new ending for the dinosaur story --- Italian/finestra/mangiato/mangiato.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Italian/finestra/mangiato/mangiato.md b/Italian/finestra/mangiato/mangiato.md index 410b282268..8304bb9767 100644 --- a/Italian/finestra/mangiato/mangiato.md +++ b/Italian/finestra/mangiato/mangiato.md @@ -1,3 +1,10 @@ Mentre fai la foto ti accorgi che il Tirannosauro si muove nella tua direzione -Non fai tempo a spostarti e il tirannosauro ti mangia in un sol boccone! \ No newline at end of file +Non fai tempo a spostarti e il tirannosauro ti mangia in un sol boccone! + +Per tua fortuna il Tirannosauro, frutto di un esperimento del Jurassic Park™, + +è erbivoro. Quando si accorge della presenza di carne umana nella sua bocca, + +ti sputa contro un tronco. + From 5f276047b646996b684e462c688e6d1bc6380f3c Mon Sep 17 00:00:00 2001 From: Shobhit Gupta Date: Wed, 30 Mar 2016 09:46:52 +0530 Subject: [PATCH 2978/5486] Add a new option, a page and a joke in hindi --- hindi/bollywood.md | 2 ++ hindi/joke/joke.md | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 hindi/joke/joke.md diff --git a/hindi/bollywood.md b/hindi/bollywood.md index ba73ac2351..13276be738 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -24,3 +24,5 @@ shraddha kappor,[go here](shraddha/shraddha.md) Art of Living [Know More](art-of-living/art-of-living.md) [Sunny Deol](Sunny_Deol/sunny.md) + +[चुटकुला पढो](joke/joke.md) और मुस्कुराते रहो diff --git a/hindi/joke/joke.md b/hindi/joke/joke.md new file mode 100644 index 0000000000..affe79857c --- /dev/null +++ b/hindi/joke/joke.md @@ -0,0 +1,33 @@ +खूब लंबा-तगड़ा एक पहलवान बस में चढ़ा। + +कंडक्टर: भाई साहब, टिकट? + +पहलवान: हम टिकट नहीं लेते। + +कंडक्टर डर के मारे कुछ नहीं कर सका। +लेकिन कंडक्टर ने इस बात को दिल पर ले लिया। +कंडक्टर जिम जाकर खूब मेहनत करने लगा। + +पहलवान रोज बस में चढ़ता। + +कंडक्टर रोज पूछता: भाई साहब, टिकट? + +पहलवान रोज जवाब देता: हम टिकट नहीं लेते। + +कण्डक्टर ने बात को दिल पर ले ली.. +रातोँ की नीँद उड़ गई +ख़ून ख़ौल उठा.. + +5 महीने में कंडक्टर ज़िम में कसरत करके पहलवान की तरह तगड़ा हो गया। + +पहलवान फिर बस में चढ़ा। + +कंडक्टर: भाई, टिकट ले ले। + +पहलवान: हम टिकट नहीं लेते। + +कंडक्टर छाती चौड़ी करके बोला: क्यों नहीं लेता बे? + +पहलवान: पास बनवा रखा है, इसीलिए नहीं लेता। + +कुछ बातें दिल पे नही लेनी चाहिए!! 😀 😛 \ No newline at end of file From f7287258fc5621d572233c174142c57e13130f63 Mon Sep 17 00:00:00 2001 From: Johan Sigfrids Date: Wed, 30 Mar 2016 13:46:31 +0300 Subject: [PATCH 2979/5486] Add option to look underneath carpet. --- english/33hours/explore-room/room.md | 4 +++- english/33hours/explore-room/under-carpet/under-carpet.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/33hours/explore-room/under-carpet/under-carpet.md diff --git a/english/33hours/explore-room/room.md b/english/33hours/explore-room/room.md index 69225b7fbf..3e7538f42b 100644 --- a/english/33hours/explore-room/room.md +++ b/english/33hours/explore-room/room.md @@ -3,4 +3,6 @@ are here. The nightstand is completely empty. There's not even a phonebook. [Try the phone.](use-phone/use-phone.md) -[Look under the bed.](look-under-bed/look-under-bed.md) \ No newline at end of file +[Look under the bed.](look-under-bed/look-under-bed.md) + +[Look under the carpet on the floor.](under-carpet/under-carpet.md) diff --git a/english/33hours/explore-room/under-carpet/under-carpet.md b/english/33hours/explore-room/under-carpet/under-carpet.md new file mode 100644 index 0000000000..4819b2abf5 --- /dev/null +++ b/english/33hours/explore-room/under-carpet/under-carpet.md @@ -0,0 +1 @@ +Under the carpet there are only floorboards. It looks like one of them might be loose. From 319534c5aee6528a613225f803eb41ed6572f5b4 Mon Sep 17 00:00:00 2001 From: Parker Date: Wed, 30 Mar 2016 22:12:53 +1100 Subject: [PATCH 2980/5486] Add an option --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 87de4dde54..2424415fc5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -887,3 +887,4 @@ So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. Or... or... or... Oh, I forgot! +You foget something, but you decide to [move on](move-on/move-on.md). \ No newline at end of file From 76a99aff7db62951734c29756e8c4c6d89f78cf7 Mon Sep 17 00:00:00 2001 From: Parker Date: Wed, 30 Mar 2016 22:13:24 +1100 Subject: [PATCH 2981/5486] create a new directory --- english/move-on/move-on.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/move-on/move-on.md diff --git a/english/move-on/move-on.md b/english/move-on/move-on.md new file mode 100644 index 0000000000..82d872cd53 --- /dev/null +++ b/english/move-on/move-on.md @@ -0,0 +1 @@ +you move on, and find a panda smiles at you. \ No newline at end of file From 53e1d024a97d84588c7ca29bc0b08062fdf5389e Mon Sep 17 00:00:00 2001 From: Mark Hunt Date: Wed, 30 Mar 2016 13:27:27 +0100 Subject: [PATCH 2982/5486] updated storyline.... meets a panda! --- english/bamboo/bamboo-shoots.md | 2 ++ english/marshmallow.md | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 english/bamboo/bamboo-shoots.md diff --git a/english/bamboo/bamboo-shoots.md b/english/bamboo/bamboo-shoots.md new file mode 100644 index 0000000000..40455a33d6 --- /dev/null +++ b/english/bamboo/bamboo-shoots.md @@ -0,0 +1,2 @@ +at the top of the bamboo trees you meet a whole panda family, they are friendly. +they show you a path ahead out of the forest, which you take. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 2424415fc5..1754b3a430 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -887,4 +887,6 @@ So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. Or... or... or... Oh, I forgot! -You foget something, but you decide to [move on](move-on/move-on.md). \ No newline at end of file +You foget something, but you decide to [move on](move-on/move-on.md). + +You follow the panda up the nearest tree, chewing bamboo shoots as you go [bamboo-shoots](bamboo/bamboo-shoots.md) From ddfee1fd49cbca62d72ca4fefc573e198914f1f7 Mon Sep 17 00:00:00 2001 From: Mark Hsu Date: Wed, 30 Mar 2016 20:17:25 -0700 Subject: [PATCH 2983/5486] added option to walk instead of call --- english/scream/remove/removemarshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/scream/remove/removemarshmallow.md b/english/scream/remove/removemarshmallow.md index a9e54537f7..746589cbdb 100644 --- a/english/scream/remove/removemarshmallow.md +++ b/english/scream/remove/removemarshmallow.md @@ -2,4 +2,6 @@ You remove the marshmallow and then you feel some guilt. It’s Mothers Day. Did you call your mother? -[Call Mother](../mom/eatwithmom.md) \ No newline at end of file +[Call Mother](../mom/eatwithmom.md) + +I already called Mother. Instead I think I'll [take a walk](../walk/walkwiththought.md) \ No newline at end of file From 9251dfc01128a9de4b0add4948f30c68b9206209 Mon Sep 17 00:00:00 2001 From: Mark Hsu Date: Wed, 30 Mar 2016 20:19:26 -0700 Subject: [PATCH 2984/5486] changed order --- english/scream/remove/removemarshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/scream/remove/removemarshmallow.md b/english/scream/remove/removemarshmallow.md index 746589cbdb..4cbee45d01 100644 --- a/english/scream/remove/removemarshmallow.md +++ b/english/scream/remove/removemarshmallow.md @@ -2,6 +2,6 @@ You remove the marshmallow and then you feel some guilt. It’s Mothers Day. Did you call your mother? -[Call Mother](../mom/eatwithmom.md) +I already called Mother. Instead I think I'll [take a walk](../walk/walkwiththought.md) -I already called Mother. Instead I think I'll [take a walk](../walk/walkwiththought.md) \ No newline at end of file +[Call Mother](../mom/eatwithmom.md) \ No newline at end of file From db744c731f91cb91a81bedb9596a17c7ea03567d Mon Sep 17 00:00:00 2001 From: Miki Landver Date: Thu, 31 Mar 2016 19:14:03 +0300 Subject: [PATCH 2985/5486] Reconside bar option --- hebrew/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hebrew/marshmallow.md b/hebrew/marshmallow.md index 523f7e4637..ca67bc5792 100644 --- a/hebrew/marshmallow.md +++ b/hebrew/marshmallow.md @@ -8,4 +8,6 @@ [תזיין את אחותך](sister/your-sister.md) -[אתה קורא את מה שכתוב, יוצא מההלם, ומחפש אופציה שפויה](sane-option/fresh-start.md) \ No newline at end of file +[אתה קורא את מה שכתוב, יוצא מההלם, ומחפש אופציה שפויה](sane-option/fresh-start.md) + +[אתה מבין שלזיין את בר רפאלי זאת בעצם אופציה מאוד שפוייה](bar/bar.md) From 5681d73561ea9f960b7b6e61c0afeac99b58f5ea Mon Sep 17 00:00:00 2001 From: Hyejeong Park Date: Fri, 1 Apr 2016 17:18:16 +0900 Subject: [PATCH 2986/5486] Add look-around --- korean/look-around/look-around.md | 5 +++++ korean/marshmallow.md | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 korean/look-around/look-around.md diff --git a/korean/look-around/look-around.md b/korean/look-around/look-around.md new file mode 100644 index 0000000000..14bf6e5fae --- /dev/null +++ b/korean/look-around/look-around.md @@ -0,0 +1,5 @@ +방 안에는 아무것도 없었어요. + +[벽을 먹어본다](../eating-walls/eating-marshmallows.md) + +[밖으로 나간다](../explore-outside/explore-outside.md) \ No newline at end of file diff --git a/korean/marshmallow.md b/korean/marshmallow.md index 6003f624f0..1dcbc6003f 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -38,4 +38,6 @@ 라고 고민하지만 선택하기 위해서 [요가를 한다](yoga/yoga.md) -[내가 나비인지 나비가 나인지 철학적인 고민을 한다](philosophy/philosophy.md) \ No newline at end of file +[내가 나비인지 나비가 나인지 철학적인 고민을 한다](philosophy/philosophy.md) + +[방을 둘러본다](look-around/look-around.md) \ No newline at end of file From 08e94ce83f932df49730f416b14d2cb092d1cbd7 Mon Sep 17 00:00:00 2001 From: Michael Toback Date: Sat, 2 Apr 2016 08:47:54 -0700 Subject: [PATCH 2987/5486] J'ajoute des plus mots --- french/dormir/reve-etrange.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/french/dormir/reve-etrange.md b/french/dormir/reve-etrange.md index 341a326a52..da66d9fa14 100644 --- a/french/dormir/reve-etrange.md +++ b/french/dormir/reve-etrange.md @@ -6,6 +6,8 @@ Vous vous reveillez ce qui semble etre quelques heures plus tard, Que faites-vous ? +Je ne sais pas, mais je vais determiner [quoi](../appelle-genie/appelle-genie.md) le c'est + [Je cherche une sortie](../sortie/chercher-la-sortie.md) [Je panique](../panique/frapper-le-mur.md) From 9fbc1c7cf8889038ab621d6d089a8ecd06f0dad1 Mon Sep 17 00:00:00 2001 From: luciolucio Date: Sat, 2 Apr 2016 13:06:16 -0600 Subject: [PATCH 2988/5486] Add some cowboys and make it a dream --- english/karaoke/karaoke/propose-to-her/propose-to-her.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/karaoke/karaoke/propose-to-her/propose-to-her.md b/english/karaoke/karaoke/propose-to-her/propose-to-her.md index aae0088a36..b07913420e 100644 --- a/english/karaoke/karaoke/propose-to-her/propose-to-her.md +++ b/english/karaoke/karaoke/propose-to-her/propose-to-her.md @@ -8,3 +8,5 @@ Her eyes light up and her lips part in an elated smile. But then she remembers something. Her expression turns solemn. "Well, that's very kind of you," she says, "but... I'm afraid I can't. I'm only dreaming you see, and I couldn't in good conscience engage myself to a figment in one of my dreams." + +It was the age of dreams. It was the age of being awake. You become a [cowboy](../../../cowboy/cowboy.md) From 74f1b428fcc9ad4fe00f615b786d73cbe498809a Mon Sep 17 00:00:00 2001 From: Milesh Bhana Date: Sun, 3 Apr 2016 16:13:01 +0200 Subject: [PATCH 2989/5486] Added jump story to the climb thread. --- english/climbing/climbing.md | 2 ++ english/jump/jump.md | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 english/jump/jump.md diff --git a/english/climbing/climbing.md b/english/climbing/climbing.md index 361bced624..94b1277c0a 100644 --- a/english/climbing/climbing.md +++ b/english/climbing/climbing.md @@ -7,3 +7,5 @@ Click [here](../froboznia/froboznia.md) to open the door. Click [here](../marshmallow.md) to lower yourself back down into the pit of despair. Click [here](../dance/dance.md) to dance. + +Click [here] (../jump/jump) to jump. diff --git a/english/jump/jump.md b/english/jump/jump.md new file mode 100644 index 0000000000..46e57171a9 --- /dev/null +++ b/english/jump/jump.md @@ -0,0 +1,6 @@ +You decide that the quickest way down to just jump. + +The wind rushes through your face and you hit terminal velocity, you're quickly reminded of some important and very relevant words of wisdom from your friends Arthur Dent and Ford Prefect. +"Flying is easy, all you have to do is throw yourself at the ground and miss." + +Fortunately, you have terrible aim and you glide to safety toward the ground. \ No newline at end of file From 8ddae8c98a22579f08a8223d47b18953e6c0372d Mon Sep 17 00:00:00 2001 From: Milesh Bhana Date: Sun, 3 Apr 2016 16:15:11 +0200 Subject: [PATCH 2990/5486] added jump story to climb. --- english/climbing/climbing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/climbing/climbing.md b/english/climbing/climbing.md index 94b1277c0a..386e4bd867 100644 --- a/english/climbing/climbing.md +++ b/english/climbing/climbing.md @@ -8,4 +8,4 @@ Click [here](../marshmallow.md) to lower yourself back down into the pit of desp Click [here](../dance/dance.md) to dance. -Click [here] (../jump/jump) to jump. +Click [here] (../jump/jump.md) to jump. From 163a62c717c606fde28b61f20168922838cf1526 Mon Sep 17 00:00:00 2001 From: Milesh Bhana Date: Sun, 3 Apr 2016 16:25:00 +0200 Subject: [PATCH 2991/5486] 120 char line limit on jump story. --- english/jump/jump.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/jump/jump.md b/english/jump/jump.md index 46e57171a9..b4569bc4d5 100644 --- a/english/jump/jump.md +++ b/english/jump/jump.md @@ -1,6 +1,7 @@ You decide that the quickest way down to just jump. -The wind rushes through your face and you hit terminal velocity, you're quickly reminded of some important and very relevant words of wisdom from your friends Arthur Dent and Ford Prefect. +The wind rushes through your face and you hit terminal velocity, you're quickly reminded of some important +and very relevant words of wisdom from your friends Arthur Dent and Ford Prefect. "Flying is easy, all you have to do is throw yourself at the ground and miss." Fortunately, you have terrible aim and you glide to safety toward the ground. \ No newline at end of file From da0ec6f87135225f926913c58cbad74167ed3108 Mon Sep 17 00:00:00 2001 From: TravisWG Date: Sun, 3 Apr 2016 11:17:31 -0500 Subject: [PATCH 2992/5486] Update animal.md --- english/animal/animal.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/animal/animal.md b/english/animal/animal.md index 63ebe7ec59..d1a450dc80 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -21,4 +21,6 @@ Don't eat animals #GoVegan Don't be cruel. -one more animal. \ No newline at end of file +one more animal. + +Maybe two more bites... From 83893e4037f44b8189cd25dc5dc12c22911bfd20 Mon Sep 17 00:00:00 2001 From: Abelardo Vieira Mota Date: Sun, 3 Apr 2016 22:48:06 -0400 Subject: [PATCH 2993/5486] =?UTF-8?q?minha=20humilde=20contribui=C3=A7?= =?UTF-8?q?=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues_pt/colaborar.md | 1 + portugues_pt/sorvete/sorvete.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 portugues_pt/sorvete/sorvete.md diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index 30bf5f1d01..f99a9958c9 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -20,6 +20,7 @@ Usava um repositorio privado. Ia ao Japão driftar em Tsukuba. +Comprar tudo de [sorvete](sorvete/sorvete.md). Depois de muito sonhar apercebe-de de que (ainda) nâo ganhou o Euromilhões. diff --git a/portugues_pt/sorvete/sorvete.md b/portugues_pt/sorvete/sorvete.md new file mode 100644 index 0000000000..1b98fed184 --- /dev/null +++ b/portugues_pt/sorvete/sorvete.md @@ -0,0 +1 @@ +Comeu todo o sorvete e morreu de diabetes. \ No newline at end of file From 27a5fab1e9fbac2651e986d68dd7c97f00d82acb Mon Sep 17 00:00:00 2001 From: Ambrose Cheung Date: Mon, 4 Apr 2016 11:36:48 +0800 Subject: [PATCH 2994/5486] Add instruction on how to build a car --- english/build-a-car/build-a-car.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/build-a-car/build-a-car.md b/english/build-a-car/build-a-car.md index 62847aa58c..9e507fa6c0 100644 --- a/english/build-a-car/build-a-car.md +++ b/english/build-a-car/build-a-car.md @@ -1,5 +1,6 @@ Make the body. Make the frame. Add some paint. Build the interior. Build the chassis. Add a motor. Add the wheels. +Pump the wheels fully. Add interior seats. [Drive your new car back to the story](../marshmallow.md) \ No newline at end of file From 24626b739246d528fa1ee8b7018fb91518b513f1 Mon Sep 17 00:00:00 2001 From: rouje Date: Mon, 4 Apr 2016 21:31:46 +0800 Subject: [PATCH 2995/5486] Add more story elements --- Philippines/bagong simula/bagong_simula.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Philippines/bagong simula/bagong_simula.md b/Philippines/bagong simula/bagong_simula.md index bef5fa075d..596992cf95 100644 --- a/Philippines/bagong simula/bagong_simula.md +++ b/Philippines/bagong simula/bagong_simula.md @@ -1,4 +1,9 @@ Nagdesisyon kang buksan ang pinto. +Inikot mo ang hawakan at itinulak paloob ang pinto hanggang magkaron ng puwang +para ika'y makadaan. Sa iyong pag-pasok, sinubukan mong hanapin ang pindutan ng +ilaw ngunit di mo ito makapa. + +Ipagpatuloy maghanap ng [pindutan ng ilaw](ipis/ipis.md). [Magsimula muli] (../salamat.md) From 2f50d242949e70cf760eb9417c7fde6ae99cc97e Mon Sep 17 00:00:00 2001 From: rouje Date: Mon, 4 Apr 2016 21:32:28 +0800 Subject: [PATCH 2996/5486] Add new page for 'Ipagpatuloy maghanap ng pindutan ng ilaw' choice point --- Philippines/bagong simula/ipis/ipis.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Philippines/bagong simula/ipis/ipis.md diff --git a/Philippines/bagong simula/ipis/ipis.md b/Philippines/bagong simula/ipis/ipis.md new file mode 100644 index 0000000000..7473e2089e --- /dev/null +++ b/Philippines/bagong simula/ipis/ipis.md @@ -0,0 +1,9 @@ +Nagpatuloy ka sa paghanap ng pindutan at nang ito'y iyong nahanap, agad mo itong +pinindot. Nabulag ka saglit sa liwanag ng nag-iisang bumbilya at inangat mo ang +iyong kamay pra subukang takpan ang iyong mata. Sa pag angat mo ng kamay mo, +napansin mong may kakaibang hugis na mistulang nakadikit sa iyong palad. +Sa puntong iyon, nalaman mo na hindi lang ikaw na nasa loob ng kwarto. + +Subukang [durugin ang ipis](http://www.publicdomainpictures.net/pictures/60000/velka/cockroach.jpg). + +Tigtigin ang kamay para maalis ang ipis at [kumaripas pabalas ng kwarto] (../salamat.md). \ No newline at end of file From f9010405213bbca4c0db6809a984067c16147719 Mon Sep 17 00:00:00 2001 From: Andy Galdi Date: Mon, 4 Apr 2016 14:46:16 -0700 Subject: [PATCH 2997/5486] Add a second inspirational quote --- english/the-nights/the-nights.md | 4 +++- english/the-nights/why/darts.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/the-nights/why/darts.md diff --git a/english/the-nights/the-nights.md b/english/the-nights/the-nights.md index c0d1dddd2a..a11d942d4d 100644 --- a/english/the-nights/the-nights.md +++ b/english/the-nights/the-nights.md @@ -1,4 +1,6 @@ One day you'll leave this world behind So live a life you will remember. [Go Back](../marshmallow.md) - Stay hungry, stay foolish! \ No newline at end of file + Stay hungry, stay foolish! + + Know your [why](why/darts.md) \ No newline at end of file diff --git a/english/the-nights/why/darts.md b/english/the-nights/why/darts.md new file mode 100644 index 0000000000..f492afaa5d --- /dev/null +++ b/english/the-nights/why/darts.md @@ -0,0 +1 @@ +They will throw darts at your face but don't let their disgrace enter your space \ No newline at end of file From 0080366f3daf3a6a1760d9b9b5f398ce3aaec3ac Mon Sep 17 00:00:00 2001 From: eguegan Date: Tue, 5 Apr 2016 10:07:39 -0400 Subject: [PATCH 2998/5486] Update premio.md --- espanol/carrera/premio/premio.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/carrera/premio/premio.md b/espanol/carrera/premio/premio.md index b2a10522c4..9906e5163e 100644 --- a/espanol/carrera/premio/premio.md +++ b/espanol/carrera/premio/premio.md @@ -1 +1,3 @@ De la cual, el premio era la hermosa princesa del reino... + +[la verdad oculta...] (verdad-oculta/verdad-oculta.md) From 5a668057af5dc8ba25796b36720475e114a6ae0a Mon Sep 17 00:00:00 2001 From: eguegan Date: Tue, 5 Apr 2016 10:15:25 -0400 Subject: [PATCH 2999/5486] Create verdad-oculta.md --- espanol/carrera/verdad-oculta/verdad-oculta.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/carrera/verdad-oculta/verdad-oculta.md diff --git a/espanol/carrera/verdad-oculta/verdad-oculta.md b/espanol/carrera/verdad-oculta/verdad-oculta.md new file mode 100644 index 0000000000..9b84afed7b --- /dev/null +++ b/espanol/carrera/verdad-oculta/verdad-oculta.md @@ -0,0 +1 @@ +La princesa estaba locamente enamorada del dragon! From fec76114a2048fc4fdf6bf0816cbab3600748ea5 Mon Sep 17 00:00:00 2001 From: eguegan Date: Tue, 5 Apr 2016 10:16:26 -0400 Subject: [PATCH 3000/5486] Update premio.md --- espanol/carrera/premio/premio.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/carrera/premio/premio.md b/espanol/carrera/premio/premio.md index 9906e5163e..1687fbd7d1 100644 --- a/espanol/carrera/premio/premio.md +++ b/espanol/carrera/premio/premio.md @@ -1,3 +1,3 @@ De la cual, el premio era la hermosa princesa del reino... -[la verdad oculta...] (verdad-oculta/verdad-oculta.md) +[la verdad oculta...] (../verdad-oculta/verdad-oculta.md) From da1c4b0ce1df6bc45559fe7956e0b6fb7b18e23b Mon Sep 17 00:00:00 2001 From: Allem Date: Tue, 5 Apr 2016 16:52:14 +0200 Subject: [PATCH 3001/5486] change --- Bosnian/Bosnian_story.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bosnian/Bosnian_story.md b/Bosnian/Bosnian_story.md index 5988225baf..9a657af6c7 100644 --- a/Bosnian/Bosnian_story.md +++ b/Bosnian/Bosnian_story.md @@ -42,4 +42,8 @@ Skažite Za vjernost Moju +Djevu idem traziti +crnom dolinom +mrske ljude poraziti + Click [here](http://www.spiritofbosnia.org/volume-2-no-3-2007-july/gorcin/) for English version From 1df7d84eeccd65799823b7529d98e837681ccbe7 Mon Sep 17 00:00:00 2001 From: Giovanni Galasso Date: Tue, 5 Apr 2016 08:07:36 -0700 Subject: [PATCH 3002/5486] Add introduction to English story. --- english/marshmallow.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 1754b3a430..563a6cb7fd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,6 @@ +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. + [Want to see my Quora profile](ismail-quora-profile/quora-profile.md) You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. From a7911e72b8a8bd3ae4f035e114a6e25ecb18cea2 Mon Sep 17 00:00:00 2001 From: MNicolePro Date: Tue, 5 Apr 2016 10:17:07 -0500 Subject: [PATCH 3003/5486] Update marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 1754b3a430..a80b896839 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -44,6 +44,8 @@ Marshmallows smell funny. What is a marshmallow anyway? Unexpectedly, the Chief Marshmallow demands to see your [references](references/references.md). +Show him your [references](https://youtu.be/uZbjlsX0DNY?t=10s). + The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtube.com/watch?v=s9Dp20ydm1E) *(Must be a Tuesday.)* From 5cdc8323a63adbaf7abe5aa9e1c45494150da2e5 Mon Sep 17 00:00:00 2001 From: MNicolePro Date: Tue, 5 Apr 2016 10:29:31 -0500 Subject: [PATCH 3004/5486] Add marshmallow option and link --- english/world-war-marshmallows/world-war-marshmallows.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/english/world-war-marshmallows/world-war-marshmallows.md b/english/world-war-marshmallows/world-war-marshmallows.md index 91eceb7dfd..55747f5ab0 100644 --- a/english/world-war-marshmallows/world-war-marshmallows.md +++ b/english/world-war-marshmallows/world-war-marshmallows.md @@ -12,3 +12,8 @@ scared then realize you need to make a choice. or [Wait and hope someone comes to save you?](hope-help-comes/hope-help-comes.md) + +OR + +Do you [show that marshmallow](https://youtu.be/uZbjlsX0DNY?t=10s) +who's BOSS? ...even it goes horribly wrong.... \ No newline at end of file From 243c7c11585699f0bea9f8a3fe3a5df4f2922f0d Mon Sep 17 00:00:00 2001 From: John Hillegass Date: Tue, 5 Apr 2016 12:50:33 -0400 Subject: [PATCH 3005/5486] Update 2spooky.md --- english/2spooky/2spooky.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index bc6e8003a9..e988c65940 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -16,4 +16,5 @@ no your face! [Check DC Comics.](../DC-Comics/epic_DC_Character.md) -[consume combat ration](../combatration/combat_ration.md) \ No newline at end of file +[consume combat ration](../combatration/combat_ration.md) +mmmm combat rations... From 3adf64f88d81e77d3added0e2f2db5994c842893 Mon Sep 17 00:00:00 2001 From: alex bymoen Date: Tue, 5 Apr 2016 14:37:14 -0600 Subject: [PATCH 3006/5486] Add more lines about how yuou feel with the pandas --- english/bamboo/bamboo-shoots.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/bamboo/bamboo-shoots.md b/english/bamboo/bamboo-shoots.md index 40455a33d6..87cd52ed5f 100644 --- a/english/bamboo/bamboo-shoots.md +++ b/english/bamboo/bamboo-shoots.md @@ -1,2 +1,3 @@ at the top of the bamboo trees you meet a whole panda family, they are friendly. -they show you a path ahead out of the forest, which you take. \ No newline at end of file +they show you a path ahead out of the forest, which you take. As you venture deep into the forest +you start to realize these pandas may not be as friendly as you thought. \ No newline at end of file From 964ae0d2a80711921c0b1203364236d8b280a754 Mon Sep 17 00:00:00 2001 From: mikeescom Date: Tue, 5 Apr 2016 23:06:08 -0400 Subject: [PATCH 3007/5486] my contribution --- english/marshmallow.md | 2 ++ english/master/miMaster.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/master/miMaster.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 1754b3a430..ef1bc6646e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -890,3 +890,5 @@ Or... or... or... Oh, I forgot! You foget something, but you decide to [move on](move-on/move-on.md). You follow the panda up the nearest tree, chewing bamboo shoots as you go [bamboo-shoots](bamboo/bamboo-shoots.md) + +And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) \ No newline at end of file diff --git a/english/master/miMaster.md b/english/master/miMaster.md new file mode 100644 index 0000000000..947be5a4a8 --- /dev/null +++ b/english/master/miMaster.md @@ -0,0 +1,3 @@ +yes!, master is you, what are you doing there? + +he points out his right side, now I can see the Dragon \ No newline at end of file From a80c1ad289a22ffd0d80f8c5a0d8edd714bfe776 Mon Sep 17 00:00:00 2001 From: makleks Date: Wed, 6 Apr 2016 10:38:35 +0100 Subject: [PATCH 3008/5486] journey down the trail of ters --- english/light-fire/magic-world/follow/suspense.md | 4 ++++ .../magic-world/follow/trail_of_tears/trail_of_tears.md | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 english/light-fire/magic-world/follow/trail_of_tears/trail_of_tears.md diff --git a/english/light-fire/magic-world/follow/suspense.md b/english/light-fire/magic-world/follow/suspense.md index a1a25c6bb3..2c61cf65cb 100644 --- a/english/light-fire/magic-world/follow/suspense.md +++ b/english/light-fire/magic-world/follow/suspense.md @@ -6,6 +6,10 @@ The rat finally goes into a dark place. When you look back, you see nothing... +You know to the west lies the Trail of Tears.. + +[Go West] (trail_of_tears/trail_of_tears.md) + [Go back](../../fire/die/die.md) [Go to that dark place](dream/dream.md) \ No newline at end of file diff --git a/english/light-fire/magic-world/follow/trail_of_tears/trail_of_tears.md b/english/light-fire/magic-world/follow/trail_of_tears/trail_of_tears.md new file mode 100644 index 0000000000..6afe2dc075 --- /dev/null +++ b/english/light-fire/magic-world/follow/trail_of_tears/trail_of_tears.md @@ -0,0 +1,2 @@ +You travel this desolate path for eighty days. At the foot of a hill you build your house. +A stranger knocks on your door.. \ No newline at end of file From ccf64dc49855a4577d88626e81b1db8e26a533df Mon Sep 17 00:00:00 2001 From: Jan Riebe Date: Wed, 6 Apr 2016 12:23:54 +0100 Subject: [PATCH 3009/5486] Adding new page "verteidigen" in subdirectory and linking in it from "momentmal". --- german/schwimmen/hunger/momentmal/momentmal.md | 4 +++- german/schwimmen/hunger/momentmal/verteidigen/verteidigen.md | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 german/schwimmen/hunger/momentmal/verteidigen/verteidigen.md diff --git a/german/schwimmen/hunger/momentmal/momentmal.md b/german/schwimmen/hunger/momentmal/momentmal.md index 2d64dc2a1c..89e7989300 100644 --- a/german/schwimmen/hunger/momentmal/momentmal.md +++ b/german/schwimmen/hunger/momentmal/momentmal.md @@ -8,4 +8,6 @@ Du beschließt, doch besser woanders hinzugehen, aber plötzlich bist du von einer Gruppe von kleinen, fast nackten Männern mit Speeren umringt, die wild gestikulieren. -Du wirst versuchen: [die Männer zu verstehen?](verstehen/verstehen.md) \ No newline at end of file +Du wirst versuchen: [die Männer zu verstehen?](verstehen/verstehen.md) + +Du wirst versuchen: [dich zu verteidigen](verteidigen/verteidigen.md) \ No newline at end of file diff --git a/german/schwimmen/hunger/momentmal/verteidigen/verteidigen.md b/german/schwimmen/hunger/momentmal/verteidigen/verteidigen.md new file mode 100644 index 0000000000..0201f11529 --- /dev/null +++ b/german/schwimmen/hunger/momentmal/verteidigen/verteidigen.md @@ -0,0 +1,4 @@ +Die Männer wedeln mit ihren Speeren, doch du hast die spirituelle Kraft von Unagi auf deiner Seite. +Du konzentrierst dich und nimmst Kampfhaltung ein, die Füße tänzelnd, die Hände flach wie Säbel. + +Die Männer sehen dich erschrocken an und weichen ein paar Schritte zurück. \ No newline at end of file From 56a20ae9195b85887add3171ea876c79a6041872 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 6 Apr 2016 12:30:24 -0500 Subject: [PATCH 3010/5486] Add 3 lines to Schrodinger Cat page. --- english/schrodinger-cat/schrodinger-cat.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/schrodinger-cat/schrodinger-cat.md b/english/schrodinger-cat/schrodinger-cat.md index e0c42b9acc..fce4f5e4bc 100644 --- a/english/schrodinger-cat/schrodinger-cat.md +++ b/english/schrodinger-cat/schrodinger-cat.md @@ -1 +1,7 @@ You are either dead or alive. + +You simultaneously are both dead and alive. + +Also known as Quantum Superposition + +It is only when you open the box that you become either dead or alive. From c73286c77b0d149e8549c04f447ecf15cd11191a Mon Sep 17 00:00:00 2001 From: Jimmy-D Date: Wed, 6 Apr 2016 19:34:00 -0300 Subject: [PATCH 3011/5486] colocar solucao viavel --- portugues/titanic/arrumar/arrumar.md | 2 ++ portugues/titanic/arrumar/celine-dion/cantar.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 portugues/titanic/arrumar/celine-dion/cantar.md diff --git a/portugues/titanic/arrumar/arrumar.md b/portugues/titanic/arrumar/arrumar.md index e55b93ca94..9cc569d8a9 100644 --- a/portugues/titanic/arrumar/arrumar.md +++ b/portugues/titanic/arrumar/arrumar.md @@ -5,3 +5,5 @@ O aplicativo nunca mais abre. [Tentar fazer uma imitacão de Di Caprio na proa do barco](imitar/falha.md) [Utilizar o middleware java Bote Salva Vidas](middleware/404.md) + +[Cantar "My heart will go on" para o celular](celine-dion/cantar.md) \ No newline at end of file diff --git a/portugues/titanic/arrumar/celine-dion/cantar.md b/portugues/titanic/arrumar/celine-dion/cantar.md new file mode 100644 index 0000000000..61697a65d9 --- /dev/null +++ b/portugues/titanic/arrumar/celine-dion/cantar.md @@ -0,0 +1 @@ +O celular se comove e começa a cantar com você. \ No newline at end of file From f40fa7b97075f87e51f6ffcf8bc184f15930f6b0 Mon Sep 17 00:00:00 2001 From: Ameen Demidem Date: Wed, 6 Apr 2016 15:44:55 -0700 Subject: [PATCH 3012/5486] Change continue.md so that you do not die --- french/manger/continue/continue.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/french/manger/continue/continue.md b/french/manger/continue/continue.md index 198524b602..2eabe6cb34 100644 --- a/french/manger/continue/continue.md +++ b/french/manger/continue/continue.md @@ -5,3 +5,16 @@ Sans vous arrêter, frénétiquement vous engloutissez le mur entier. . . . Vous mourrez d'intoxication. + +. . . + +Mais non, mais non ! Vous avez eu peur, hein ? Respirez, vous êtes toujours en +vie. Cependant, vous respirez très difficilement, vous avez très mal a +l'estomac et la température de la chambre baisse rapidement maintenant que le +mur qui vous protegeait du vent glaciale n'est plus. Que faites vous ? + +[J'allume une allumette pour me réchauffer](allumette/l-extinction.md) + +[Je me rendors](../../dormir/reve-etrange.md) + +[J'appel au secours](../../appel-au-secours/appeler-au-secours.md) From 9a4bb3e44765d821fce982b0bdb679a04e6b4ceb Mon Sep 17 00:00:00 2001 From: Ameen Demidem Date: Wed, 6 Apr 2016 15:47:18 -0700 Subject: [PATCH 3013/5486] Add allumette/l-extinction.md --- french/manger/continue/allumette/l-extinction.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 french/manger/continue/allumette/l-extinction.md diff --git a/french/manger/continue/allumette/l-extinction.md b/french/manger/continue/allumette/l-extinction.md new file mode 100644 index 0000000000..11a734fcbc --- /dev/null +++ b/french/manger/continue/allumette/l-extinction.md @@ -0,0 +1,4 @@ +Vous croyez vraiment qu'une allumette vous sauverait du froid! Voyons! L'allumette +s'éteint. Vous vous accrochez aux dernières lueurs du bois rouge flamboyant qui +finissent par vous brûler les doigts ... et juste a ce moment la vous vous +réveillez! Ce n'était qu'un mauvais rêve. La vie reprend son cours ... From 68ec5305718a1030681cc0f962e450c37a25d505 Mon Sep 17 00:00:00 2001 From: Volcano Octopus Date: Wed, 6 Apr 2016 21:26:58 -0400 Subject: [PATCH 3014/5486] add beary good pun --- english/bear/bear.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/bear/bear.md b/english/bear/bear.md index ad05d266b9..2dab08de8d 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -1,4 +1,5 @@ Stella atroir. Taiwan bear. Ice cold. If warm, the results could be unbearable. -Bear in mind, the grizzly taste. \ No newline at end of file +Bear in mind, the grizzly taste. +You are now drunk. You stumble over to the nearest cutie and ask, "Hey baby, what's ursine?" \ No newline at end of file From 73a89e12f488903b416f56590d4ec4555cbc5fe7 Mon Sep 17 00:00:00 2001 From: Toni Kukurin Date: Thu, 7 Apr 2016 22:57:56 +0200 Subject: [PATCH 3015/5486] added line to croatian adventure. --- croatian/sljez.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/croatian/sljez.md b/croatian/sljez.md index 22b52cd92c..035fca65a2 100644 --- a/croatian/sljez.md +++ b/croatian/sljez.md @@ -11,3 +11,5 @@ Cini ti se da te netko promatra Kad pogledas na stranu, sljezova ruka ti pokusava zgrabiti upaljac/ Napokon shvatis da je sljez samosvjestan! + +Brzo zgrabiš upaljač, prestravljeno trčeći prema najbližim vratima. From 68d4ad3f226337cf9de2391e74a336ebd875bb9d Mon Sep 17 00:00:00 2001 From: Amelia Boli Date: Thu, 7 Apr 2016 18:21:33 -0700 Subject: [PATCH 3016/5486] docs: Edit link in inception to drink_me --- english/dream_in_dream/go_back/drink_me.md | 3 +++ english/dream_in_dream/inception.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 english/dream_in_dream/go_back/drink_me.md diff --git a/english/dream_in_dream/go_back/drink_me.md b/english/dream_in_dream/go_back/drink_me.md new file mode 100644 index 0000000000..e83ee4248c --- /dev/null +++ b/english/dream_in_dream/go_back/drink_me.md @@ -0,0 +1,3 @@ +When you return to the room you notice two new things. The first is a very small door +that only a mouse could crawl through. The second is a small table with two bottles on +it. One bottle is filled with blue liquid. The other is filled with red. They both have a label that says, "Drink Me." \ No newline at end of file diff --git a/english/dream_in_dream/inception.md b/english/dream_in_dream/inception.md index 1eb5a3777d..1e634008eb 100644 --- a/english/dream_in_dream/inception.md +++ b/english/dream_in_dream/inception.md @@ -15,3 +15,5 @@ Do you: [Spin the spinner on the table top?](spin_spinner/spin.md) [Exit through the door?](exit_room/exit_room.md) + +[Return to the previous room?](go_back/drink_me.md) From 8dcbf25bdb6a0f116307b470186aefa8cdfcd5a3 Mon Sep 17 00:00:00 2001 From: Christopher_Reyes Date: Fri, 8 Apr 2016 00:12:27 -0500 Subject: [PATCH 3017/5486] Add Texas folder and file --- english/texas/texas.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/texas/texas.md diff --git a/english/texas/texas.md b/english/texas/texas.md new file mode 100644 index 0000000000..323f0e66a3 --- /dev/null +++ b/english/texas/texas.md @@ -0,0 +1,4 @@ +The man informs you that you are in Texas!! +No wonder everything is so big. +Time to follow your [destiny](../destiny.destiny.md). +Or just [alchemy](../alchemy/alchemy.md) time! \ No newline at end of file From ae7f0046448495fb30facb795985998b8c319514 Mon Sep 17 00:00:00 2001 From: Christopher_Reyes Date: Fri, 8 Apr 2016 00:18:30 -0500 Subject: [PATCH 3018/5486] Edited cowboy.md to include relative link to texas.md --- english/cowboy/cowboy.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/cowboy/cowboy.md b/english/cowboy/cowboy.md index 7fb2fa2112..60945668ef 100644 --- a/english/cowboy/cowboy.md +++ b/english/cowboy/cowboy.md @@ -1,3 +1,5 @@ ... Once you feel your best bib and tucker are all correct, you strut into the bar, push the nearest deadbeat and start the meanest brawl the ruff'n'tumble tavern has ever seen. +You grab your aggressor and ask him "Where are we ?", he +replies ["Texas"](../texas/texas.md) \ No newline at end of file From 102a50a272f84ee843f2338d71d16c7a0f2cf515 Mon Sep 17 00:00:00 2001 From: Dawid Date: Fri, 8 Apr 2016 14:32:32 +0200 Subject: [PATCH 3019/5486] And the story goes on --- Polish/przygoda/jedzenie/jedzenie.md | 2 ++ Polish/przygoda/jedzenie/spanie/spanie.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 Polish/przygoda/jedzenie/spanie/spanie.md diff --git a/Polish/przygoda/jedzenie/jedzenie.md b/Polish/przygoda/jedzenie/jedzenie.md index 1c4621814d..66f9dae76c 100644 --- a/Polish/przygoda/jedzenie/jedzenie.md +++ b/Polish/przygoda/jedzenie/jedzenie.md @@ -10,3 +10,5 @@ Gdy całe ptasie mleczko jest już zjedzone, dochodzisz do oczywistych wniosków [Jestem najedzony!](najedzony/najedzony.md) [Mam ochotę zagrać w Wiedźmina trójkę](wiedzmin/wiedzmin.md) + +[Chce mi się spać](spanie/spanie.md) diff --git a/Polish/przygoda/jedzenie/spanie/spanie.md b/Polish/przygoda/jedzenie/spanie/spanie.md new file mode 100644 index 0000000000..7158e1fa32 --- /dev/null +++ b/Polish/przygoda/jedzenie/spanie/spanie.md @@ -0,0 +1 @@ +Usypiasz a gdy budzisz się ściany z ptasiego mleczka pojawiły się ponownie. Co robisz? \ No newline at end of file From e23592b05f4bbd86317df20c073090ff8d604889 Mon Sep 17 00:00:00 2001 From: qw0000wp Date: Fri, 8 Apr 2016 19:05:54 +0200 Subject: [PATCH 3020/5486] Add new option - beautiful sight --- .../kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md | 4 +++- .../kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zlaka/zlaka.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zlaka/zlaka.md diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md index 9a2949b9e0..ec0f29d14c 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zagwizdaj.md @@ -10,4 +10,6 @@ staje się ciepły i zmienia się w duży marker do tablicy. [Myśląc że zaczynasz rozumieć jak się gra, zbliżasz się do tablicy zdejmujac pokrywke z markera](zmarkerem/zmarkerem.md) -[Przestraszony przez tych dziwnych wydarzeń, sięgasz po gumke do tablicy](zgumka/zgumka.md) \ No newline at end of file +[Przestraszony przez tych dziwnych wydarzeń, sięgasz po gumke do tablicy](zgumka/zgumka.md) + +[Rozglądasz się wokół i myślisz jaka piękna łąka](zlaka/zlaka.md) \ No newline at end of file diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zlaka/zlaka.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zlaka/zlaka.md new file mode 100644 index 0000000000..5b0a60415c --- /dev/null +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zlaka/zlaka.md @@ -0,0 +1 @@ +Rozsiadasz si beztrosko pod drzewem i korzystasz z chwili ciszy. From edb3ee4bb419377b199da9b33c2c852a68ac7d61 Mon Sep 17 00:00:00 2001 From: qw0000wp Date: Fri, 8 Apr 2016 19:22:49 +0200 Subject: [PATCH 3021/5486] Expand option text --- .../kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zgumka/zgumka.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zgumka/zgumka.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zgumka/zgumka.md index 2abe2f8a49..b0da33c0b7 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zgumka/zgumka.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zgumka/zgumka.md @@ -1 +1,2 @@ -Gumka jest zimny jak podnosisz ją do tablicy. \ No newline at end of file +Gumka jest zimny jak podnosisz ją do tablicy. +Może gdyby na nią pochuchać... \ No newline at end of file From 7594563cece887b38b30aa6407a489d06912922f Mon Sep 17 00:00:00 2001 From: rouje Date: Sat, 9 Apr 2016 02:30:24 +0800 Subject: [PATCH 3022/5486] Change relative link from ../salamat.md to ../../salamat.md --- Philippines/bagong simula/ipis/ipis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Philippines/bagong simula/ipis/ipis.md b/Philippines/bagong simula/ipis/ipis.md index 7473e2089e..72239f36f2 100644 --- a/Philippines/bagong simula/ipis/ipis.md +++ b/Philippines/bagong simula/ipis/ipis.md @@ -6,4 +6,4 @@ Sa puntong iyon, nalaman mo na hindi lang ikaw na nasa loob ng kwarto. Subukang [durugin ang ipis](http://www.publicdomainpictures.net/pictures/60000/velka/cockroach.jpg). -Tigtigin ang kamay para maalis ang ipis at [kumaripas pabalas ng kwarto] (../salamat.md). \ No newline at end of file +Tigtigin ang kamay para maalis ang ipis at [kumaripas pabalas ng kwarto] (../../salamat.md). \ No newline at end of file From b3584ae3a493418a952f19c9ed6d33709cdc4f60 Mon Sep 17 00:00:00 2001 From: Chris Murone Date: Fri, 8 Apr 2016 14:38:26 -0400 Subject: [PATCH 3023/5486] Add my option --- english/stopbernie/stopbernie.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/stopbernie/stopbernie.md diff --git a/english/stopbernie/stopbernie.md b/english/stopbernie/stopbernie.md new file mode 100644 index 0000000000..3a333a84e0 --- /dev/null +++ b/english/stopbernie/stopbernie.md @@ -0,0 +1,3 @@ +Nothing is free. [Even the middle class will pay more under Bernie Sanders](http://www.vox.com/policy-and-politics/2016/3/25/11298868/simple-charts-tax-plans) + +Go [back to menu](../) \ No newline at end of file From 50538de759b343efdd8a0b8716d5f74b1b013976 Mon Sep 17 00:00:00 2001 From: Chris Murone Date: Fri, 8 Apr 2016 14:42:17 -0400 Subject: [PATCH 3024/5486] Fix back link --- english/stopbernie/stopbernie.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/stopbernie/stopbernie.md b/english/stopbernie/stopbernie.md index 3a333a84e0..e92a848517 100644 --- a/english/stopbernie/stopbernie.md +++ b/english/stopbernie/stopbernie.md @@ -1,3 +1,3 @@ Nothing is free. [Even the middle class will pay more under Bernie Sanders](http://www.vox.com/policy-and-politics/2016/3/25/11298868/simple-charts-tax-plans) -Go [back to menu](../) \ No newline at end of file +Go [back to menu](../marshmallow.md) \ No newline at end of file From efdce1a42ec72e1acbd81c6c45ee7355dd82415b Mon Sep 17 00:00:00 2001 From: Chris Murone Date: Fri, 8 Apr 2016 14:43:35 -0400 Subject: [PATCH 3025/5486] Fix error where I missed changes to english directory --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 7fa43f0741..55c4ff6c25 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,6 +1,8 @@ Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. +Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) + [Want to see my Quora profile](ismail-quora-profile/quora-profile.md) You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. From 042aa0f0937064aa5b4e4f39b9589adf48dce847 Mon Sep 17 00:00:00 2001 From: Chris Murone Date: Fri, 8 Apr 2016 14:50:03 -0400 Subject: [PATCH 3026/5486] Shorten line to satisfy Casey Bot --- english/stopbernie/stopbernie.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/stopbernie/stopbernie.md b/english/stopbernie/stopbernie.md index e92a848517..879023db2b 100644 --- a/english/stopbernie/stopbernie.md +++ b/english/stopbernie/stopbernie.md @@ -1,3 +1,3 @@ -Nothing is free. [Even the middle class will pay more under Bernie Sanders](http://www.vox.com/policy-and-politics/2016/3/25/11298868/simple-charts-tax-plans) +Nothing is free. [Even the middle class will pay more under Bernie Sanders](http://goo.gl/uZIN0d) Go [back to menu](../marshmallow.md) \ No newline at end of file From 18663af27702071e686d6ccb25bf5db5751ab3b2 Mon Sep 17 00:00:00 2001 From: Gautam Ashok Date: Fri, 8 Apr 2016 13:29:34 -0700 Subject: [PATCH 3027/5486] Add to becomemarshmallow.md and code-my-life.md files --- english/becomemarshmallow/becomemarshmallow.md | 4 +++- english/code-my-life/code-my-life.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/english/becomemarshmallow/becomemarshmallow.md b/english/becomemarshmallow/becomemarshmallow.md index 9349de3f51..d3b4170856 100644 --- a/english/becomemarshmallow/becomemarshmallow.md +++ b/english/becomemarshmallow/becomemarshmallow.md @@ -6,4 +6,6 @@ They return the favor and make a s'more out of you. RIP marshmallow you. -You will be remembered! \ No newline at end of file +You will be remembered! + +But for what? The sweetness or for being caught? \ No newline at end of file diff --git a/english/code-my-life/code-my-life.md b/english/code-my-life/code-my-life.md index 3ed243d2f2..2b88da9f1c 100644 --- a/english/code-my-life/code-my-life.md +++ b/english/code-my-life/code-my-life.md @@ -1 +1,3 @@ -As you have read this far, you are of the same kind. \ No newline at end of file +As you have read this far, you are of the same kind. + +You have persisted and endured to have come this far. \ No newline at end of file From 4b502cd519f01b802d673326ff1110809fc23f3e Mon Sep 17 00:00:00 2001 From: krishnan sarkar Date: Fri, 8 Apr 2016 17:29:38 -0400 Subject: [PATCH 3028/5486] feat: add ability do nothing --- english/marshmallow.md | 4 +++- english/nothing/do-nothing.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/nothing/do-nothing.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 55c4ff6c25..1161ee44e5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -898,4 +898,6 @@ You foget something, but you decide to [move on](move-on/move-on.md). You follow the panda up the nearest tree, chewing bamboo shoots as you go [bamboo-shoots](bamboo/bamboo-shoots.md) -And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) \ No newline at end of file +And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) + +[Do nothing.](nothing/do-nothing.md) \ No newline at end of file diff --git a/english/nothing/do-nothing.md b/english/nothing/do-nothing.md new file mode 100644 index 0000000000..a98db1c358 --- /dev/null +++ b/english/nothing/do-nothing.md @@ -0,0 +1 @@ +Congratulations. \ No newline at end of file From 368d6fb7c9a0bdccd69e6db43ee709a9589aef91 Mon Sep 17 00:00:00 2001 From: krishnan sarkar Date: Fri, 8 Apr 2016 17:37:43 -0400 Subject: [PATCH 3029/5486] fix: add option to try something else --- english/nothing/do-nothing.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/nothing/do-nothing.md b/english/nothing/do-nothing.md index a98db1c358..9d7e2c17dc 100644 --- a/english/nothing/do-nothing.md +++ b/english/nothing/do-nothing.md @@ -1 +1,4 @@ -Congratulations. \ No newline at end of file +Congratulations. + +Do you feel unsatisfied? +Then, (try something else)[../marshmallow.md]. \ No newline at end of file From 4ae1c0eeea15ca80336e2a5ad6d64db9e0b2479a Mon Sep 17 00:00:00 2001 From: krishnan sarkar Date: Fri, 8 Apr 2016 17:40:03 -0400 Subject: [PATCH 3030/5486] fix: repair broken link --- english/nothing/do-nothing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/nothing/do-nothing.md b/english/nothing/do-nothing.md index 9d7e2c17dc..b82b709660 100644 --- a/english/nothing/do-nothing.md +++ b/english/nothing/do-nothing.md @@ -1,4 +1,4 @@ Congratulations. Do you feel unsatisfied? -Then, (try something else)[../marshmallow.md]. \ No newline at end of file +Then, [try something else)(../marshmallow.md). \ No newline at end of file From 4165b4c713f34cffc19be9f30d52590d7c18a266 Mon Sep 17 00:00:00 2001 From: krishnan sarkar Date: Fri, 8 Apr 2016 17:41:05 -0400 Subject: [PATCH 3031/5486] fix: repair broken link (actually) --- english/nothing/do-nothing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/nothing/do-nothing.md b/english/nothing/do-nothing.md index b82b709660..438df96729 100644 --- a/english/nothing/do-nothing.md +++ b/english/nothing/do-nothing.md @@ -1,4 +1,4 @@ Congratulations. Do you feel unsatisfied? -Then, [try something else)(../marshmallow.md). \ No newline at end of file +Then, [try something else](../marshmallow.md). \ No newline at end of file From 882a323376cf844c752e3d35468bde7ecd271975 Mon Sep 17 00:00:00 2001 From: javier sierra Date: Fri, 8 Apr 2016 16:39:43 -0700 Subject: [PATCH 3032/5486] Add change to zork.md --- english/zork/zork.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/zork/zork.md b/english/zork/zork.md index ea95319d7b..f8d6852bbd 100644 --- a/english/zork/zork.md +++ b/english/zork/zork.md @@ -13,3 +13,5 @@ There is an object that looks like a [torch](../torch/torch.md) on the ground. There is also om twine on the ground. The work Zork brings back memories. + +Zork is life, Zork is love. From ab9ca08e8f93682f4755ee31d6fcfcad61b6ceee Mon Sep 17 00:00:00 2001 From: Kelderth Date: Fri, 8 Apr 2016 23:04:53 -0500 Subject: [PATCH 3033/5486] Add sc2 story --- english/marshmallow.md | 2 ++ english/sc2/sc2.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/sc2/sc2.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 1161ee44e5..f072302173 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -631,6 +631,8 @@ Take out your [crochet project](crochet/crochet.md) instead and finish that tedd [Play some DotA 2](play-dota2/play-dota2.md) +[Play Starctaft 2](play-sc2/sc2.md) + [Play some Geometry Dash](play-geometrydash/play-geometrydash.md) [See if there is a Udacity course on the subject](udacity/udacity.md) diff --git a/english/sc2/sc2.md b/english/sc2/sc2.md new file mode 100644 index 0000000000..11f6ac4b68 --- /dev/null +++ b/english/sc2/sc2.md @@ -0,0 +1 @@ +It's 10 p.m. and you're borging, and decide to surf on google, for stacraft 1, an old game that you play some years ago, suddenly you read starcraft 2 a new version with beter graphics and you give it a chance again visiting [Starcraft 2](www.starcraft2.com) \ No newline at end of file From 5c833f88cb5a098efd7689851ed059caece9bcce Mon Sep 17 00:00:00 2001 From: Kelderth Date: Fri, 8 Apr 2016 23:14:00 -0500 Subject: [PATCH 3034/5486] Add a short story about starcraft 2 the game --- english/marshmallow.md | 2 +- english/starcraft2/starcraft2.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 english/starcraft2/starcraft2.md diff --git a/english/marshmallow.md b/english/marshmallow.md index f072302173..efb530f05a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -631,7 +631,7 @@ Take out your [crochet project](crochet/crochet.md) instead and finish that tedd [Play some DotA 2](play-dota2/play-dota2.md) -[Play Starctaft 2](play-sc2/sc2.md) +[Play Starcraft 2](play-sc2/starcraft2.md) [Play some Geometry Dash](play-geometrydash/play-geometrydash.md) diff --git a/english/starcraft2/starcraft2.md b/english/starcraft2/starcraft2.md new file mode 100644 index 0000000000..11f6ac4b68 --- /dev/null +++ b/english/starcraft2/starcraft2.md @@ -0,0 +1 @@ +It's 10 p.m. and you're borging, and decide to surf on google, for stacraft 1, an old game that you play some years ago, suddenly you read starcraft 2 a new version with beter graphics and you give it a chance again visiting [Starcraft 2](www.starcraft2.com) \ No newline at end of file From 355e16a5f953391c834c45c38276ef4602efbaa7 Mon Sep 17 00:00:00 2001 From: Kelderth Date: Fri, 8 Apr 2016 23:29:07 -0500 Subject: [PATCH 3035/5486] Update Starcraft 2 Story game --- english/marshmallow.md | 2 +- english/starcraft2/starcraft2.md | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index efb530f05a..ea56929e4e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -631,7 +631,7 @@ Take out your [crochet project](crochet/crochet.md) instead and finish that tedd [Play some DotA 2](play-dota2/play-dota2.md) -[Play Starcraft 2](play-sc2/starcraft2.md) +[Play Starcraft 2](starcraft2/starcraft2.md) [Play some Geometry Dash](play-geometrydash/play-geometrydash.md) diff --git a/english/starcraft2/starcraft2.md b/english/starcraft2/starcraft2.md index 11f6ac4b68..59c2fad56d 100644 --- a/english/starcraft2/starcraft2.md +++ b/english/starcraft2/starcraft2.md @@ -1 +1,7 @@ -It's 10 p.m. and you're borging, and decide to surf on google, for stacraft 1, an old game that you play some years ago, suddenly you read starcraft 2 a new version with beter graphics and you give it a chance again visiting [Starcraft 2](www.starcraft2.com) \ No newline at end of file +It's 10 p.m. and you're borging, and decide to surf on google, for stacraft 1, + +an old game that you play some years ago, suddenly you read starcraft 2 + +a new version with beter graphics and you give it a chance again + +visiting [Starcraft 2](www.starcraft2.com) \ No newline at end of file From a84532c1048d2be4cc1a97beb9bf5e01d43baca4 Mon Sep 17 00:00:00 2001 From: Kelderth Date: Fri, 8 Apr 2016 23:43:42 -0500 Subject: [PATCH 3036/5486] Fix link fixed --- english/starcraft2/starcraft2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/starcraft2/starcraft2.md b/english/starcraft2/starcraft2.md index 59c2fad56d..0c2334078c 100644 --- a/english/starcraft2/starcraft2.md +++ b/english/starcraft2/starcraft2.md @@ -4,4 +4,4 @@ an old game that you play some years ago, suddenly you read starcraft 2 a new version with beter graphics and you give it a chance again -visiting [Starcraft 2](www.starcraft2.com) \ No newline at end of file +visiting [Starcraft 2](http://www.starcraft2.com) \ No newline at end of file From d8a2a56a02019c6cbcc6740c43552170f946c477 Mon Sep 17 00:00:00 2001 From: Kelderth Date: Fri, 8 Apr 2016 23:49:57 -0500 Subject: [PATCH 3037/5486] Deleted files --- english/sc2/sc2.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 english/sc2/sc2.md diff --git a/english/sc2/sc2.md b/english/sc2/sc2.md deleted file mode 100644 index 11f6ac4b68..0000000000 --- a/english/sc2/sc2.md +++ /dev/null @@ -1 +0,0 @@ -It's 10 p.m. and you're borging, and decide to surf on google, for stacraft 1, an old game that you play some years ago, suddenly you read starcraft 2 a new version with beter graphics and you give it a chance again visiting [Starcraft 2](www.starcraft2.com) \ No newline at end of file From 6dde4dffa5d03d0b08290ae0e1a87c10fc7e557d Mon Sep 17 00:00:00 2001 From: Gary Date: Sat, 9 Apr 2016 03:22:49 -0500 Subject: [PATCH 3038/5486] Add to Talk to Neighbor story --- .../go-with-scully/hanging-with-scully/hanging-with-scully.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/talk_to_neighbour/woman/go-with-scully/hanging-with-scully/hanging-with-scully.md diff --git a/english/talk_to_neighbour/woman/go-with-scully/hanging-with-scully/hanging-with-scully.md b/english/talk_to_neighbour/woman/go-with-scully/hanging-with-scully/hanging-with-scully.md new file mode 100644 index 0000000000..4b169eab69 --- /dev/null +++ b/english/talk_to_neighbour/woman/go-with-scully/hanging-with-scully/hanging-with-scully.md @@ -0,0 +1 @@ +There's a scientist of sorts that can help us understand the situation. But he lives in Las Vegas. \ No newline at end of file From 95e57fb8c92a106c63f85b5fbb005ce7503c39ee Mon Sep 17 00:00:00 2001 From: Gary Date: Sat, 9 Apr 2016 03:24:42 -0500 Subject: [PATCH 3039/5486] Add more to Talk to Neighbor story --- .../talk_to_neighbour/woman/go-with-scully/talk-aside.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/talk_to_neighbour/woman/go-with-scully/talk-aside.md b/english/talk_to_neighbour/woman/go-with-scully/talk-aside.md index e7b19e7ebc..27cc87a53c 100644 --- a/english/talk_to_neighbour/woman/go-with-scully/talk-aside.md +++ b/english/talk_to_neighbour/woman/go-with-scully/talk-aside.md @@ -1,2 +1,6 @@ Scully says "Listen, I need you're help. The world is in grave danger. -Will you help me?" \ No newline at end of file +Will you help me?" + +[Sure](hanging-with-scully/hanging-with-scully.md) + +[Nah, I gotta go](../../../marshmallow.md) \ No newline at end of file From 0dfb136153f2cbcd0143f3b95b37089e77e96133 Mon Sep 17 00:00:00 2001 From: SoniaMoudgil Date: Sat, 9 Apr 2016 12:46:09 +0200 Subject: [PATCH 3040/5486] Update marshmallow.md --- english/marshmallow.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index ea56929e4e..3009880ecb 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -7,6 +7,9 @@ Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. +I also agree only way to find way is to keep climbing or walking or studying or learning or all of this is DOING. +DOING will definitely keep your sharpened with latest skills (which you can get by the way from Udacity !!!) + [Know about the life of this world](00-Life-of-this-world/Life of this world.md) This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down @@ -902,4 +905,4 @@ You follow the panda up the nearest tree, chewing bamboo shoots as you go [bambo And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) -[Do nothing.](nothing/do-nothing.md) \ No newline at end of file +[Do nothing.](nothing/do-nothing.md) From 0c3e0aaae8f19092ebe603fbe1005a31fa722fd9 Mon Sep 17 00:00:00 2001 From: yuu-oniichan Date: Sat, 9 Apr 2016 20:24:33 +0800 Subject: [PATCH 3041/5486] Add bear-story and linked to already-existing bear page On branch bear-story Changes to be committed: new file: english/bear-story/bear-story.md modified: english/bear/bear.md --- english/bear-story/bear-story.md | 1 + english/bear/bear.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 english/bear-story/bear-story.md diff --git a/english/bear-story/bear-story.md b/english/bear-story/bear-story.md new file mode 100644 index 0000000000..dd06f8dab3 --- /dev/null +++ b/english/bear-story/bear-story.md @@ -0,0 +1 @@ +"[Yuna](https://xantandminions.wordpress.com/kuma-kuma-kuma-bear/). Nice to meet you," she says, as she dances around in her bear dress and summons two giant bears to haul you away to another fantasy world as her bear slave. You end up in the body of a 10-year-old and are forced to participate in the bear takeover of the world! \ No newline at end of file diff --git a/english/bear/bear.md b/english/bear/bear.md index 2dab08de8d..66b0d85952 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -2,4 +2,5 @@ Stella atroir. Taiwan bear. Ice cold. If warm, the results could be unbearable. Bear in mind, the grizzly taste. -You are now drunk. You stumble over to the nearest cutie and ask, "Hey baby, what's ursine?" \ No newline at end of file +You are now drunk. You stumble over to the nearest cutie and ask, +"[Hey baby, what's ursine?](../bear-story/bear-story.md)" \ No newline at end of file From 8cdf9efb8911dca2e199c01018c44ae494654ee8 Mon Sep 17 00:00:00 2001 From: yuu-oniichan Date: Sat, 9 Apr 2016 20:47:14 +0800 Subject: [PATCH 3042/5486] Use advice_from_mother with newline to satisfy non-modification requirement. Also adjust line length for bear-story Changes to be committed: modified: english/advice_from_mother/advice_from_mother.md modified: english/bear-story/bear-story.md modified: english/bear/bear.md --- english/advice_from_mother/advice_from_mother.md | 2 ++ english/bear-story/bear-story.md | 10 +++++++++- english/bear/bear.md | 3 +-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/english/advice_from_mother/advice_from_mother.md b/english/advice_from_mother/advice_from_mother.md index 9275b400bf..8c7872f49d 100644 --- a/english/advice_from_mother/advice_from_mother.md +++ b/english/advice_from_mother/advice_from_mother.md @@ -8,3 +8,5 @@ into the bar. just a random test My mother also told me that I should eat my vegetables. + +"[She answers.](../bear-story/bear-story.md)" diff --git a/english/bear-story/bear-story.md b/english/bear-story/bear-story.md index dd06f8dab3..cbf06ee0e2 100644 --- a/english/bear-story/bear-story.md +++ b/english/bear-story/bear-story.md @@ -1 +1,9 @@ -"[Yuna](https://xantandminions.wordpress.com/kuma-kuma-kuma-bear/). Nice to meet you," she says, as she dances around in her bear dress and summons two giant bears to haul you away to another fantasy world as her bear slave. You end up in the body of a 10-year-old and are forced to participate in the bear takeover of the world! \ No newline at end of file +"[Yuna](https://xantandminions.wordpress.com/kuma-kuma-kuma-bear/). +Nice to meet you," +she says, as she dances around in her bear dress +and summons two giant bears to haul you away to +another fantasy world as her bear slave. + +You end up in the body of a 10-year-old and are +forced to participate in the bear takeover of the world! + diff --git a/english/bear/bear.md b/english/bear/bear.md index 66b0d85952..2dab08de8d 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -2,5 +2,4 @@ Stella atroir. Taiwan bear. Ice cold. If warm, the results could be unbearable. Bear in mind, the grizzly taste. -You are now drunk. You stumble over to the nearest cutie and ask, -"[Hey baby, what's ursine?](../bear-story/bear-story.md)" \ No newline at end of file +You are now drunk. You stumble over to the nearest cutie and ask, "Hey baby, what's ursine?" \ No newline at end of file From ecb6704d9f02d14bb6c5e2f67dbcdc5f26947fc4 Mon Sep 17 00:00:00 2001 From: Shaban Bakari Date: Sat, 9 Apr 2016 20:18:55 +0300 Subject: [PATCH 3043/5486] get us a mouse --- english/animal/animal.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/animal/animal.md b/english/animal/animal.md index d1a450dc80..d18d88c00a 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -24,3 +24,5 @@ Don't be cruel. one more animal. Maybe two more bites... + +oh! i have a great idea. why don't we get ourselves a mouse? me and the cat would be both satisfied... From 909071ded0b57e83d8f6974f78120438a233ad96 Mon Sep 17 00:00:00 2001 From: Kara Anderson Date: Sat, 9 Apr 2016 19:51:02 -0400 Subject: [PATCH 3044/5486] Add option to take dog sled adventure, add new page --- english/dog-sled/dogsled.md | 2 ++ english/marshmallow.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/dog-sled/dogsled.md diff --git a/english/dog-sled/dogsled.md b/english/dog-sled/dogsled.md new file mode 100644 index 0000000000..25d2d48a8b --- /dev/null +++ b/english/dog-sled/dogsled.md @@ -0,0 +1,2 @@ +You embark on a dog sled adventure across the globe, setting the record for the fastest time. Then you realize you're +[right back where you started](english/marshmallow.md). \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 3009880ecb..30ff8c38c8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -906,3 +906,5 @@ You follow the panda up the nearest tree, chewing bamboo shoots as you go [bambo And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) [Do nothing.](nothing/do-nothing.md) + +[Rent a hydroplaning dog sled to get you to the other side of the world] (dog-sled/dogsled.md) From 36be3a9bd04ec57bd26e9cc9d7f3647225614b8c Mon Sep 17 00:00:00 2001 From: Kara Anderson Date: Sat, 9 Apr 2016 20:02:36 -0400 Subject: [PATCH 3045/5486] Fixed link back to main page --- english/dog-sled/dogsled.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dog-sled/dogsled.md b/english/dog-sled/dogsled.md index 25d2d48a8b..7a7e00c709 100644 --- a/english/dog-sled/dogsled.md +++ b/english/dog-sled/dogsled.md @@ -1,2 +1,2 @@ You embark on a dog sled adventure across the globe, setting the record for the fastest time. Then you realize you're -[right back where you started](english/marshmallow.md). \ No newline at end of file +[right back where you started](../marshmallow.md). \ No newline at end of file From 1c606ceb2b5bdc6e32c18afa4c46963eb3883de7 Mon Sep 17 00:00:00 2001 From: heylittodude Date: Sat, 9 Apr 2016 20:53:24 -0700 Subject: [PATCH 3046/5486] Add line for Amnesia the video game --- english/amnesia/amnesia.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/amnesia/amnesia.md b/english/amnesia/amnesia.md index 70a5705adf..c27c502191 100644 --- a/english/amnesia/amnesia.md +++ b/english/amnesia/amnesia.md @@ -20,4 +20,6 @@ Or it can be highly disturbing. Or, it can be highly... oh, I forgot what I was going to say. -Who am I? Where am I? What am I doing? \ No newline at end of file +Who am I? Where am I? What am I doing? + +All your quesions can be answered by going [here](https://www.amnesiagame.com/#main). \ No newline at end of file From df35db0bb0df94493d42c30d2eabe276af22e475 Mon Sep 17 00:00:00 2001 From: TigerhawkT3 Date: Sun, 10 Apr 2016 00:31:47 -0700 Subject: [PATCH 3047/5486] Add vivid description of chocolate sea. --- english/shotgun/shotgun.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/shotgun/shotgun.md b/english/shotgun/shotgun.md index 6d2d1b31d6..e7346143d0 100644 --- a/english/shotgun/shotgun.md +++ b/english/shotgun/shotgun.md @@ -4,3 +4,4 @@ Suddenly the brain matter starts to disintegrate the wall. You see sunlight peeking through. After a while the wall is gone and you are free. You find you are on an island surrounded by a sea of hot chocolate. +The chocolate foams and steams. From afc072f2bd42846e885de9416300aecdb049ff05 Mon Sep 17 00:00:00 2001 From: Vishal Ponugoti Date: Sun, 10 Apr 2016 18:40:51 +0530 Subject: [PATCH 3048/5486] Add Walter's White's description in Hank's context --- english/breaking-bad/breaking-bad.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/breaking-bad/breaking-bad.md b/english/breaking-bad/breaking-bad.md index 95ef85ecf4..6516f7a8c3 100644 --- a/english/breaking-bad/breaking-bad.md +++ b/english/breaking-bad/breaking-bad.md @@ -1,3 +1,5 @@ Spoiler Alert! -Cancer kills. But sometimes it is a [dream](../marshmallow.md) \ No newline at end of file +Cancer kills. But sometimes it is a [dream](../marshmallow.md) + +And sometimes it's your brother-in-law. \ No newline at end of file From 0f26ffc850b5cb4300bec68dbf09d6bfbba7b97a Mon Sep 17 00:00:00 2001 From: Akshar Patel Date: Sun, 10 Apr 2016 19:21:13 +0530 Subject: [PATCH 3049/5486] feat: Added Uttarayan based adventure --- Gujarati/gujarati.md | 4 ++++ ...\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" | 5 +++++ ...\215\340\252\257\340\253\213 \340\252\233\340\253\207.md" | 1 + ...\207 \340\252\255\340\252\207\340\252\257\340\252\276.md" | 1 + 4 files changed, 11 insertions(+) create mode 100644 "Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243\340\252\256\340\252\276\340\252\202 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" create mode 100644 "Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232... \340\252\217 \340\252\225\340\252\276\340\252\252\340\253\215\340\252\257\340\253\213 \340\252\233\340\253\207.md" create mode 100644 "Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\246\340\253\207 \340\252\260\340\253\207 \340\252\255\340\252\207\340\252\257\340\252\276.md" diff --git a/Gujarati/gujarati.md b/Gujarati/gujarati.md index 7a8130b5e6..5fabd75bec 100644 --- a/Gujarati/gujarati.md +++ b/Gujarati/gujarati.md @@ -6,3 +6,7 @@ A problem is achance for you to do your best. Tha best way to predict the future is to create. Gujarati language is great. Lord Krishna spoke or led to it. Mahatma Gandhi spoke and wrote in it. + +ગુજરાતી ભાષાનાં પરાક્રમી સફરોમાં આપનું સ્વાગત છે. અગણીત સફરો માંથી તમે કયું પસંદ કરશો? તમારી ખરી કસોટી શરુ થાય છે. તમને ખુબ શુબકામના. + +[ઉત્તરાયણમાં ખેંચ કે ઢીલ?](ઉત્તરાયણ/ઉત્તરાયણમાં ખેંચ કે ઢીલ.md) \ No newline at end of file diff --git "a/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243\340\252\256\340\252\276\340\252\202 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" "b/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243\340\252\256\340\252\276\340\252\202 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" new file mode 100644 index 0000000000..51cba9d2a4 --- /dev/null +++ "b/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243\340\252\256\340\252\276\340\252\202 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" @@ -0,0 +1,5 @@ +ઉત્તરાયણનો સુંદર દિવસ છે. વાયરો વંટોળની જેમ વાયી રહ્યો છે. પતંગને ખાલી પકડી રાખવો પણ ભારે પડી રહ્યો છે. અાજુ બાજુ પતંગોથી આસમાન ભરાઇ ગયું છે. બધા પતંગ કાપવા તમારી લાળ પડી રહી છે. +તમે કયી રીત અપનાવશો? + +- [ઢીલ](ખેંચ ખેંચ ખેંચ ખેંચ... એ કાપ્યો છે.md) +- [ખેંચ](ઢીલ દે ઢીલ દે દે રે ભઇયા.md) \ No newline at end of file diff --git "a/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232... \340\252\217 \340\252\225\340\252\276\340\252\252\340\253\215\340\252\257\340\253\213 \340\252\233\340\253\207.md" "b/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232... \340\252\217 \340\252\225\340\252\276\340\252\252\340\253\215\340\252\257\340\253\213 \340\252\233\340\253\207.md" new file mode 100644 index 0000000000..83692e6bb5 --- /dev/null +++ "b/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232... \340\252\217 \340\252\225\340\252\276\340\252\252\340\253\215\340\252\257\340\253\213 \340\252\233\340\253\207.md" @@ -0,0 +1 @@ +જોર પવનમાં ખુબ ખેંચ્યું. હાથમાં વાગ્યું પણ ખેંચવાનું ના મુક્યું. આખરે મેહનત રંગ લાવી. તમે કપ્યો છે ની જોેરથી બુમ પાડી. \ No newline at end of file diff --git "a/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\246\340\253\207 \340\252\260\340\253\207 \340\252\255\340\252\207\340\252\257\340\252\276.md" "b/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\246\340\253\207 \340\252\260\340\253\207 \340\252\255\340\252\207\340\252\257\340\252\276.md" new file mode 100644 index 0000000000..9a812acdf7 --- /dev/null +++ "b/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\246\340\253\207 \340\252\260\340\253\207 \340\252\255\340\252\207\340\252\257\340\252\276.md" @@ -0,0 +1 @@ +જોર પવનમાં ઢીલ દિધી. ભલે પતંગે છાશ પીધી. પતંગે બરાબરનો લીધો ભાર. બાજુ વાળા કાકાએ માની હાર. એ કાઇપો છે!!!!! \ No newline at end of file From 0c2f623029d5cf90bed9869bdb7b96d018371d89 Mon Sep 17 00:00:00 2001 From: Akshar Patel Date: Sun, 10 Apr 2016 19:25:20 +0530 Subject: [PATCH 3050/5486] fix: Move options page to subdirectory --- ...2\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" | 4 ++-- ...3\215\340\252\257\340\253\213 \340\252\233\340\253\207.md" | 0 ...3\207 \340\252\255\340\252\207\340\252\257\340\252\276.md" | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename "Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232... \340\252\217 \340\252\225\340\252\276\340\252\252\340\253\215\340\252\257\340\253\213 \340\252\233\340\253\207.md" => "Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\226\340\253\207\340\252\202\340\252\232/\340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232... \340\252\217 \340\252\225\340\252\276\340\252\252\340\253\215\340\252\257\340\253\213 \340\252\233\340\253\207.md" (100%) rename "Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\246\340\253\207 \340\252\260\340\253\207 \340\252\255\340\252\207\340\252\257\340\252\276.md" => "Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\242\340\253\200\340\252\262/\340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\246\340\253\207 \340\252\260\340\253\207 \340\252\255\340\252\207\340\252\257\340\252\276.md" (100%) diff --git "a/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243\340\252\256\340\252\276\340\252\202 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" "b/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243\340\252\256\340\252\276\340\252\202 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" index 51cba9d2a4..575128ffe8 100644 --- "a/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243\340\252\256\340\252\276\340\252\202 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" +++ "b/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243\340\252\256\340\252\276\340\252\202 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" @@ -1,5 +1,5 @@ ઉત્તરાયણનો સુંદર દિવસ છે. વાયરો વંટોળની જેમ વાયી રહ્યો છે. પતંગને ખાલી પકડી રાખવો પણ ભારે પડી રહ્યો છે. અાજુ બાજુ પતંગોથી આસમાન ભરાઇ ગયું છે. બધા પતંગ કાપવા તમારી લાળ પડી રહી છે. તમે કયી રીત અપનાવશો? -- [ઢીલ](ખેંચ ખેંચ ખેંચ ખેંચ... એ કાપ્યો છે.md) -- [ખેંચ](ઢીલ દે ઢીલ દે દે રે ભઇયા.md) \ No newline at end of file +- [ઢીલ](ખેંચ/ખેંચ ખેંચ ખેંચ ખેંચ... એ કાપ્યો છે.md) +- [ખેંચ](ઢીલ/ઢીલ દે ઢીલ દે દે રે ભઇયા.md) \ No newline at end of file diff --git "a/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232... \340\252\217 \340\252\225\340\252\276\340\252\252\340\253\215\340\252\257\340\253\213 \340\252\233\340\253\207.md" "b/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\226\340\253\207\340\252\202\340\252\232/\340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232... \340\252\217 \340\252\225\340\252\276\340\252\252\340\253\215\340\252\257\340\253\213 \340\252\233\340\253\207.md" similarity index 100% rename from "Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232... \340\252\217 \340\252\225\340\252\276\340\252\252\340\253\215\340\252\257\340\253\213 \340\252\233\340\253\207.md" rename to "Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\226\340\253\207\340\252\202\340\252\232/\340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\226\340\253\207\340\252\202\340\252\232... \340\252\217 \340\252\225\340\252\276\340\252\252\340\253\215\340\252\257\340\253\213 \340\252\233\340\253\207.md" diff --git "a/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\246\340\253\207 \340\252\260\340\253\207 \340\252\255\340\252\207\340\252\257\340\252\276.md" "b/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\242\340\253\200\340\252\262/\340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\246\340\253\207 \340\252\260\340\253\207 \340\252\255\340\252\207\340\252\257\340\252\276.md" similarity index 100% rename from "Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\246\340\253\207 \340\252\260\340\253\207 \340\252\255\340\252\207\340\252\257\340\252\276.md" rename to "Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\242\340\253\200\340\252\262/\340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\242\340\253\200\340\252\262 \340\252\246\340\253\207 \340\252\246\340\253\207 \340\252\260\340\253\207 \340\252\255\340\252\207\340\252\257\340\252\276.md" From 669e42454e20bfae2a2c0361d2b6e358efe46ad9 Mon Sep 17 00:00:00 2001 From: Akshar Patel Date: Sun, 10 Apr 2016 19:30:28 +0530 Subject: [PATCH 3051/5486] fix: Fix typo in Gujarati Introduction --- Gujarati/gujarati.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gujarati/gujarati.md b/Gujarati/gujarati.md index 5fabd75bec..4ccea16104 100644 --- a/Gujarati/gujarati.md +++ b/Gujarati/gujarati.md @@ -7,6 +7,6 @@ Tha best way to predict the future is to create. Gujarati language is great. Lord Krishna spoke or led to it. Mahatma Gandhi spoke and wrote in it. -ગુજરાતી ભાષાનાં પરાક્રમી સફરોમાં આપનું સ્વાગત છે. અગણીત સફરો માંથી તમે કયું પસંદ કરશો? તમારી ખરી કસોટી શરુ થાય છે. તમને ખુબ શુબકામના. +ગુજરાતી ભાષાનાં પરાક્રમી સફરોમાં આપનું સ્વાગત છે. અગણીત સફરો માંથી તમે કયું પસંદ કરશો? તમારી ખરી કસોટી શરુ થાય છે. તમને ખુબ શુભકામના. [ઉત્તરાયણમાં ખેંચ કે ઢીલ?](ઉત્તરાયણ/ઉત્તરાયણમાં ખેંચ કે ઢીલ.md) \ No newline at end of file From 83aa842243c0365ea6f03618d5802591b30000ee Mon Sep 17 00:00:00 2001 From: Akshar Patel Date: Sun, 10 Apr 2016 19:35:02 +0530 Subject: [PATCH 3052/5486] style: Change formatting as described. --- Gujarati/gujarati.md | 3 ++- ...2\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Gujarati/gujarati.md b/Gujarati/gujarati.md index 4ccea16104..9223382af6 100644 --- a/Gujarati/gujarati.md +++ b/Gujarati/gujarati.md @@ -7,6 +7,7 @@ Tha best way to predict the future is to create. Gujarati language is great. Lord Krishna spoke or led to it. Mahatma Gandhi spoke and wrote in it. -ગુજરાતી ભાષાનાં પરાક્રમી સફરોમાં આપનું સ્વાગત છે. અગણીત સફરો માંથી તમે કયું પસંદ કરશો? તમારી ખરી કસોટી શરુ થાય છે. તમને ખુબ શુભકામના. +ગુજરાતી ભાષાનાં પરાક્રમી સફરોમાં આપનું સ્વાગત છે. અગણીત સફરો માંથી તમે કયું પસંદ કરશો? +તમારી ખરી કસોટી શરુ થાય છે. તમને ખુબ શુભકામના. [ઉત્તરાયણમાં ખેંચ કે ઢીલ?](ઉત્તરાયણ/ઉત્તરાયણમાં ખેંચ કે ઢીલ.md) \ No newline at end of file diff --git "a/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243\340\252\256\340\252\276\340\252\202 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" "b/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243\340\252\256\340\252\276\340\252\202 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" index 575128ffe8..1f10fdd251 100644 --- "a/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243\340\252\256\340\252\276\340\252\202 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" +++ "b/Gujarati/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243/\340\252\211\340\252\244\340\253\215\340\252\244\340\252\260\340\252\276\340\252\257\340\252\243\340\252\256\340\252\276\340\252\202 \340\252\226\340\253\207\340\252\202\340\252\232 \340\252\225\340\253\207 \340\252\242\340\253\200\340\252\262.md" @@ -1,5 +1,7 @@ -ઉત્તરાયણનો સુંદર દિવસ છે. વાયરો વંટોળની જેમ વાયી રહ્યો છે. પતંગને ખાલી પકડી રાખવો પણ ભારે પડી રહ્યો છે. અાજુ બાજુ પતંગોથી આસમાન ભરાઇ ગયું છે. બધા પતંગ કાપવા તમારી લાળ પડી રહી છે. +ઉત્તરાયણનો સુંદર દિવસ છે. વાયરો વંટોળની જેમ વાયી રહ્યો છે. પતંગને ખાલી પકડી રાખવો પણ ભારે પડી રહ્યો છે. +અાજુ બાજુ પતંગોથી આસમાન ભરાઇ ગયું છે. બધા પતંગ કાપવા તમારી લાળ પડી રહી છે. તમે કયી રીત અપનાવશો? - [ઢીલ](ખેંચ/ખેંચ ખેંચ ખેંચ ખેંચ... એ કાપ્યો છે.md) + - [ખેંચ](ઢીલ/ઢીલ દે ઢીલ દે દે રે ભઇયા.md) \ No newline at end of file From 7ebd46811f8fdc3f05fbdf0af41ae7b7048e2083 Mon Sep 17 00:00:00 2001 From: Kyle Morrison Date: Sun, 10 Apr 2016 15:19:57 -0500 Subject: [PATCH 3053/5486] Added officer catching up after passing out --- english/officer-returns/return-of-officer.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/officer-returns/return-of-officer.txt diff --git a/english/officer-returns/return-of-officer.txt b/english/officer-returns/return-of-officer.txt new file mode 100644 index 0000000000..b7e79546f4 --- /dev/null +++ b/english/officer-returns/return-of-officer.txt @@ -0,0 +1,5 @@ +As you awaken, you feel the venom of the sting creeping up your arm. + +The officer can't be far behind now. + +Then, approaching footsteps echo down the tunnel. \ No newline at end of file From 6550d77c24f787542900a6581dad673f498bf78e Mon Sep 17 00:00:00 2001 From: Kyle Morrison Date: Sun, 10 Apr 2016 15:22:50 -0500 Subject: [PATCH 3054/5486] Added officer catching up to story --- english/officer-returns/return-of-officer.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/officer-returns/return-of-officer.md diff --git a/english/officer-returns/return-of-officer.md b/english/officer-returns/return-of-officer.md new file mode 100644 index 0000000000..b7e79546f4 --- /dev/null +++ b/english/officer-returns/return-of-officer.md @@ -0,0 +1,5 @@ +As you awaken, you feel the venom of the sting creeping up your arm. + +The officer can't be far behind now. + +Then, approaching footsteps echo down the tunnel. \ No newline at end of file From ee42d77b396d62e08026b393781c4772da1376e4 Mon Sep 17 00:00:00 2001 From: Kyle Morrison Date: Sun, 10 Apr 2016 15:23:36 -0500 Subject: [PATCH 3055/5486] Deleted .txt and replaced with .md --- english/officer-returns/return-of-officer.txt | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 english/officer-returns/return-of-officer.txt diff --git a/english/officer-returns/return-of-officer.txt b/english/officer-returns/return-of-officer.txt deleted file mode 100644 index b7e79546f4..0000000000 --- a/english/officer-returns/return-of-officer.txt +++ /dev/null @@ -1,5 +0,0 @@ -As you awaken, you feel the venom of the sting creeping up your arm. - -The officer can't be far behind now. - -Then, approaching footsteps echo down the tunnel. \ No newline at end of file From 9fe77591572dba9e0ff7153ee8f1f9551d3f9a1e Mon Sep 17 00:00:00 2001 From: Kyle Morrison Date: Sun, 10 Apr 2016 15:36:30 -0500 Subject: [PATCH 3056/5486] Added link to progress storyline In the next part, you will wake up and the officer will be catching up to you! --- english/tunnel/blind-search/small-hole/small-hole.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/tunnel/blind-search/small-hole/small-hole.md b/english/tunnel/blind-search/small-hole/small-hole.md index 23da033df1..5bbc7bf640 100644 --- a/english/tunnel/blind-search/small-hole/small-hole.md +++ b/english/tunnel/blind-search/small-hole/small-hole.md @@ -1,2 +1,4 @@ As you reach into the hole you feel a sharp sting on your hand. You pull your hand back to your body. -Your thoughts start to get fuzzy and you black out. \ No newline at end of file +Your thoughts start to get fuzzy and you black out. + +Moments later, you [awake](create-your-own-adventure/english/officer-returns/return-of-officer.md) in a daze. \ No newline at end of file From 3a7e45fd0ba6b875cbf62a7893fef76793f14eb2 Mon Sep 17 00:00:00 2001 From: Kyle Morrison Date: Sun, 10 Apr 2016 15:45:02 -0500 Subject: [PATCH 3057/5486] Moved directory to correct location --- .../small-hole/officer-returns/return-of-officer.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/tunnel/blind-search/small-hole/officer-returns/return-of-officer.md diff --git a/english/tunnel/blind-search/small-hole/officer-returns/return-of-officer.md b/english/tunnel/blind-search/small-hole/officer-returns/return-of-officer.md new file mode 100644 index 0000000000..b7e79546f4 --- /dev/null +++ b/english/tunnel/blind-search/small-hole/officer-returns/return-of-officer.md @@ -0,0 +1,5 @@ +As you awaken, you feel the venom of the sting creeping up your arm. + +The officer can't be far behind now. + +Then, approaching footsteps echo down the tunnel. \ No newline at end of file From ef44c626d568c104eb33a939945be5105c273811 Mon Sep 17 00:00:00 2001 From: Kyle Morrison Date: Sun, 10 Apr 2016 15:47:20 -0500 Subject: [PATCH 3058/5486] Moved directory to correct location --- english/officer-returns/return-of-officer.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 english/officer-returns/return-of-officer.md diff --git a/english/officer-returns/return-of-officer.md b/english/officer-returns/return-of-officer.md deleted file mode 100644 index b7e79546f4..0000000000 --- a/english/officer-returns/return-of-officer.md +++ /dev/null @@ -1,5 +0,0 @@ -As you awaken, you feel the venom of the sting creeping up your arm. - -The officer can't be far behind now. - -Then, approaching footsteps echo down the tunnel. \ No newline at end of file From f870b71b9084d916075d74bedc66f42c4f8712e3 Mon Sep 17 00:00:00 2001 From: Kyle Morrison Date: Sun, 10 Apr 2016 15:50:20 -0500 Subject: [PATCH 3059/5486] Corrected link --- english/tunnel/blind-search/small-hole/small-hole.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/tunnel/blind-search/small-hole/small-hole.md b/english/tunnel/blind-search/small-hole/small-hole.md index 5bbc7bf640..71325cb6af 100644 --- a/english/tunnel/blind-search/small-hole/small-hole.md +++ b/english/tunnel/blind-search/small-hole/small-hole.md @@ -1,4 +1,4 @@ As you reach into the hole you feel a sharp sting on your hand. You pull your hand back to your body. Your thoughts start to get fuzzy and you black out. -Moments later, you [awake](create-your-own-adventure/english/officer-returns/return-of-officer.md) in a daze. \ No newline at end of file +Moments later, you [awake](officer-returns/return-of-officer.md) in a daze. \ No newline at end of file From 0b86518d6878fd626043b628750012eecd6502dd Mon Sep 17 00:00:00 2001 From: YIXUAN DANG Date: Sun, 10 Apr 2016 14:22:22 -0700 Subject: [PATCH 3060/5486] add another opinion for the main question --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 9c2f909c60..45c116e6b6 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -102,4 +102,6 @@ [Ray Allen](Ray-Allen/Ray-Allen.md) -[ZERO](ZERO/ZERO.md) \ No newline at end of file +[ZERO](ZERO/ZERO.md) + +[小至尊宝](yixuanda/yixuanda.md) \ No newline at end of file From ca5c89d709046e39cb70e6c13e561728c4100ae9 Mon Sep 17 00:00:00 2001 From: YIXUAN DANG Date: Sun, 10 Apr 2016 14:25:10 -0700 Subject: [PATCH 3061/5486] update the yixuanda file --- Chinese/yixuanda/yixuanda.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/yixuanda/yixuanda.md diff --git a/Chinese/yixuanda/yixuanda.md b/Chinese/yixuanda/yixuanda.md new file mode 100644 index 0000000000..27d60ab8f1 --- /dev/null +++ b/Chinese/yixuanda/yixuanda.md @@ -0,0 +1 @@ +爱一个人需要理由吗？需要吗？不需要吗？需要吗？ \ No newline at end of file From 78deaf97151e68498402f5c66c56a85198a72dae Mon Sep 17 00:00:00 2001 From: Peter Chaivre Date: Sun, 10 Apr 2016 19:19:04 -0700 Subject: [PATCH 3062/5486] Add option to close eyes --- english/cliff/cliff.md | 7 ++++++- english/cliff/close-eyes/close-eyes.md | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 english/cliff/close-eyes/close-eyes.md diff --git a/english/cliff/cliff.md b/english/cliff/cliff.md index c85ed2683f..75df8a9651 100644 --- a/english/cliff/cliff.md +++ b/english/cliff/cliff.md @@ -4,4 +4,9 @@ As you fall you notice that you a your clothing is flapping in the wind. Grabbing the excess fabric you pull it tight and begin to glide, unfortunately, all you can see below are clouds. -... \ No newline at end of file +... + +You're enjoying the sensation of the wind rushing past you. You think you can control your +glide and steer yourself, but you're tempted to just close your eyes and enjoy the ride. + +[You decide to close your eyes and see what magical place the wind will take you](close-eyes/close-eyes.md). \ No newline at end of file diff --git a/english/cliff/close-eyes/close-eyes.md b/english/cliff/close-eyes/close-eyes.md new file mode 100644 index 0000000000..236b361822 --- /dev/null +++ b/english/cliff/close-eyes/close-eyes.md @@ -0,0 +1,7 @@ +You close your eyes and put your fate into the wind's hands. You're excited to see where it will take you. + +You pass below the clouds and the earth below you is suddenly visible. Or it would be, if your eyes were open. + +Unfortunately, with your eyes closed you fail to see that you're rapidly approaching the ground. + +Your last thought is, "I can't wait until I land." \ No newline at end of file From 7e90f144f435975233a96c1c093df3d424ba44d0 Mon Sep 17 00:00:00 2001 From: Rand Relatores Date: Sun, 10 Apr 2016 20:19:52 -0700 Subject: [PATCH 3063/5486] Add voldemort branch and story addition --- english/hermione/hermioneHere.md | 4 +++- english/voldemort/voldemort.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/voldemort/voldemort.md diff --git a/english/hermione/hermioneHere.md b/english/hermione/hermioneHere.md index dffa336458..a37699cd16 100644 --- a/english/hermione/hermioneHere.md +++ b/english/hermione/hermioneHere.md @@ -1,8 +1,10 @@ Hermione is always getting into trouble with Ron and Harry. They -could be at Hagrid's hut or in town having a butter beer. +could be at Hagrid's hut, chasing Voldemort or in town having a butter beer. Today they decide to: [Visit Hagrid](../visit-hagrid/visit-hagrid.md) [Head into Hogsmeade](../hogsmeade/hogsmeade.md) + +[Chase Voldemort](../voldemort/voldemort.md) diff --git a/english/voldemort/voldemort.md b/english/voldemort/voldemort.md new file mode 100644 index 0000000000..2f80131339 --- /dev/null +++ b/english/voldemort/voldemort.md @@ -0,0 +1 @@ +Harry and Hermoine resisted the temptation to go to go to Hogsmeade or Hagrid's. Instead they focused on tracking down Voldemort. They knew that he could only be in a few places but where would they start? From 2186e123225ef4a2913a2294124c1a3105db93e1 Mon Sep 17 00:00:00 2001 From: Rand Relatores Date: Sun, 10 Apr 2016 20:29:14 -0700 Subject: [PATCH 3064/5486] Made changes to be compliant with README --- english/hermione/hermioneHere.md | 4 +++- english/voldemort/voldemort.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/english/hermione/hermioneHere.md b/english/hermione/hermioneHere.md index a37699cd16..94091a8a0b 100644 --- a/english/hermione/hermioneHere.md +++ b/english/hermione/hermioneHere.md @@ -1,5 +1,7 @@ Hermione is always getting into trouble with Ron and Harry. They -could be at Hagrid's hut, chasing Voldemort or in town having a butter beer. +could be at Hagrid's hut or in town having a butter beer. + +Instead of wasting time, they also could go chase Voldemort. Today they decide to: diff --git a/english/voldemort/voldemort.md b/english/voldemort/voldemort.md index 2f80131339..284ecdfca8 100644 --- a/english/voldemort/voldemort.md +++ b/english/voldemort/voldemort.md @@ -1 +1,3 @@ -Harry and Hermoine resisted the temptation to go to go to Hogsmeade or Hagrid's. Instead they focused on tracking down Voldemort. They knew that he could only be in a few places but where would they start? +Harry and Hermoine chose to track down Voldemort. + +Where would they start? From 6eb80fe859c7f6fd0dfc6bf4a19bd0d55e7b5322 Mon Sep 17 00:00:00 2001 From: Yordan Romeev Date: Mon, 11 Apr 2016 12:02:11 +0300 Subject: [PATCH 3065/5486] doc: add free runner choice details --- bulgarian/free_runner/free_runner.md | 4 +++- bulgarian/free_runner/ladder/ladder.md | 4 ++++ bulgarian/free_runner/tree/tree.md | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 bulgarian/free_runner/ladder/ladder.md create mode 100644 bulgarian/free_runner/tree/tree.md diff --git a/bulgarian/free_runner/free_runner.md b/bulgarian/free_runner/free_runner.md index e65f5b899c..7316981208 100644 --- a/bulgarian/free_runner/free_runner.md +++ b/bulgarian/free_runner/free_runner.md @@ -1,3 +1,5 @@ Хвърляш се през прозореца и от силният адреналин успяваш да се хванеш за една тръба. Оглеждаш се наоколо и виждаш прелитащ парапланер и преобличащата се съседка от долния етаж. -Концентрираш се и забелязваш странична стълба за аварийни случаи и дърво с голяма корона под теб. \ No newline at end of file +Концентрираш се и забелязваш странична стълба за аварийни случаи и дърво с голяма корона под теб. + [Опитваш се да достигнеш стълбата по тръбата] (ladder/ladder.md) + [Скачаш към дървото, надявайки се да омекоти падането] (tree/tree.md) \ No newline at end of file diff --git a/bulgarian/free_runner/ladder/ladder.md b/bulgarian/free_runner/ladder/ladder.md new file mode 100644 index 0000000000..22a5d55011 --- /dev/null +++ b/bulgarian/free_runner/ladder/ladder.md @@ -0,0 +1,4 @@ +Опитваш се да се пръплъзнеш по тръбата с помощта на веригата. +Шумът, който издаваш обаче привлича вниманието на попуголата жена. +Тя се разкрещява, очевидно останала с грешното впечатление, че си някакъв воайор. +Посяга към телефона си и започва да набира номер. \ No newline at end of file diff --git a/bulgarian/free_runner/tree/tree.md b/bulgarian/free_runner/tree/tree.md new file mode 100644 index 0000000000..1bd57784d4 --- /dev/null +++ b/bulgarian/free_runner/tree/tree.md @@ -0,0 +1,3 @@ +Докато падаш към дървото, забелязваш че от прозореца на твоята стая се подава мъжка глава и те вижда. +Успяваш да се хванеш за голям клон на дървото с помощта на веригата, но падането не минава без последствия. +Част от горната ти дреха се разкъсва и чак сега забелязваш, че целия ти торс е в синини. \ No newline at end of file From 2038ff0a9142a5e158ee3c12397eba3eb8e85196 Mon Sep 17 00:00:00 2001 From: Yordan Romeev Date: Mon, 11 Apr 2016 12:04:59 +0300 Subject: [PATCH 3066/5486] doc: fix free runner file layout --- bulgarian/free_runner/free_runner.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bulgarian/free_runner/free_runner.md b/bulgarian/free_runner/free_runner.md index 7316981208..9f9f54def6 100644 --- a/bulgarian/free_runner/free_runner.md +++ b/bulgarian/free_runner/free_runner.md @@ -1,5 +1,7 @@ Хвърляш се през прозореца и от силният адреналин успяваш да се хванеш за една тръба. Оглеждаш се наоколо и виждаш прелитащ парапланер и преобличащата се съседка от долния етаж. Концентрираш се и забелязваш странична стълба за аварийни случаи и дърво с голяма корона под теб. - [Опитваш се да достигнеш стълбата по тръбата] (ladder/ladder.md) - [Скачаш към дървото, надявайки се да омекоти падането] (tree/tree.md) \ No newline at end of file + + 1. [Опитваш се да достигнеш стълбата по тръбата] (ladder/ladder.md) + + 2. [Скачаш към дървото, надявайки се да омекоти падането] (tree/tree.md) \ No newline at end of file From 627d0b103ab074428e7b794d059449533304c529 Mon Sep 17 00:00:00 2001 From: Yordan Romeev Date: Mon, 11 Apr 2016 12:07:11 +0300 Subject: [PATCH 3067/5486] doc: fix free runner links --- bulgarian/free_runner/free_runner.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bulgarian/free_runner/free_runner.md b/bulgarian/free_runner/free_runner.md index 9f9f54def6..7630dd7e97 100644 --- a/bulgarian/free_runner/free_runner.md +++ b/bulgarian/free_runner/free_runner.md @@ -2,6 +2,6 @@ Оглеждаш се наоколо и виждаш прелитащ парапланер и преобличащата се съседка от долния етаж. Концентрираш се и забелязваш странична стълба за аварийни случаи и дърво с голяма корона под теб. - 1. [Опитваш се да достигнеш стълбата по тръбата] (ladder/ladder.md) + 1. [Опитваш се да достигнеш стълбата по тръбата](ladder/ladder.md) - 2. [Скачаш към дървото, надявайки се да омекоти падането] (tree/tree.md) \ No newline at end of file + 2. [Скачаш към дървото, надявайки се да омекоти падането](tree/tree.md) \ No newline at end of file From 28709acf881ced4a735fa965051040fef4ce08e3 Mon Sep 17 00:00:00 2001 From: yordan-romeev Date: Mon, 11 Apr 2016 12:07:58 +0300 Subject: [PATCH 3068/5486] Update free_runner.md --- bulgarian/free_runner/free_runner.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bulgarian/free_runner/free_runner.md b/bulgarian/free_runner/free_runner.md index 7630dd7e97..bdebd4a7d1 100644 --- a/bulgarian/free_runner/free_runner.md +++ b/bulgarian/free_runner/free_runner.md @@ -2,6 +2,6 @@ Оглеждаш се наоколо и виждаш прелитащ парапланер и преобличащата се съседка от долния етаж. Концентрираш се и забелязваш странична стълба за аварийни случаи и дърво с голяма корона под теб. - 1. [Опитваш се да достигнеш стълбата по тръбата](ladder/ladder.md) +1. [Опитваш се да достигнеш стълбата по тръбата](ladder/ladder.md) - 2. [Скачаш към дървото, надявайки се да омекоти падането](tree/tree.md) \ No newline at end of file +2. [Скачаш към дървото, надявайки се да омекоти падането](tree/tree.md) From 3a5bb25a107d125f0a4141f7d6dba4f2307ace32 Mon Sep 17 00:00:00 2001 From: SAAMW4 Date: Mon, 11 Apr 2016 16:57:38 +0200 Subject: [PATCH 3069/5486] Ajout de l'option du lait --- french/dessine/chocolat/essayer-ouvrir-chocolat.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/french/dessine/chocolat/essayer-ouvrir-chocolat.md b/french/dessine/chocolat/essayer-ouvrir-chocolat.md index 30ebd02f37..1d9f6006e6 100644 --- a/french/dessine/chocolat/essayer-ouvrir-chocolat.md +++ b/french/dessine/chocolat/essayer-ouvrir-chocolat.md @@ -1,4 +1,7 @@ Vous essayez de toutes vos forces mais en vain... La port en chocolat ne bouge pas ! Et comme il fallait s'y attendre la poignée commence même à fondre. -[Vous décidez de retourner manger cette porte en miel](../miel/manger-du-miel.md) \ No newline at end of file +[Vous décidez de retourner manger cette porte en miel](../miel/manger-du-miel.md) + +[Vous decidez d'envoyer du lait bouillant sur la porte afin de la faire fondre +entierement] From 4c1808b2dfa185daa3ba4161f469c420f19e472d Mon Sep 17 00:00:00 2001 From: rubenJS Date: Mon, 11 Apr 2016 17:02:03 +0200 Subject: [PATCH 3070/5486] Add options in zakmes dead-end to go to another story line --- dutch/over-het-hek/zakmes/zakmes.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dutch/over-het-hek/zakmes/zakmes.md b/dutch/over-het-hek/zakmes/zakmes.md index b527891f1e..e9a145ed69 100644 --- a/dutch/over-het-hek/zakmes/zakmes.md +++ b/dutch/over-het-hek/zakmes/zakmes.md @@ -1,3 +1,9 @@ Het zakmes bevat een ijzerzaag. Die is nog flijmscherp want je hebt hem nog nooit gebruikt. -Je probeert jezelf los te zagen, maar dit heeft geen effect wat je zit vastgeplakt aan het hek. \ No newline at end of file +Je probeert jezelf los te zagen, maar dit heeft geen effect wat je zit vastgeplakt aan het hek. + +Als zelfs een zaag niet helpt... Je overweegt je opties. + +- Dan maar de hulplijn bellen. Je reikt naar [de mobiele telefoon](../mobiel/mobiel.md) die je eerder had gevonden. + +- Je bedenkt wat je met [een flippo](../flippo/flippo.md) zou kunnen doen. From 88eec8d99bba663d523d719273eef6d2a05a51ec Mon Sep 17 00:00:00 2001 From: Christopher Reyes Date: Mon, 11 Apr 2016 15:25:16 -0500 Subject: [PATCH 3071/5486] Update texas.md --- english/texas/texas.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/texas/texas.md b/english/texas/texas.md index 323f0e66a3..f22e88a6fe 100644 --- a/english/texas/texas.md +++ b/english/texas/texas.md @@ -1,4 +1,5 @@ The man informs you that you are in Texas!! No wonder everything is so big. -Time to follow your [destiny](../destiny.destiny.md). -Or just [alchemy](../alchemy/alchemy.md) time! \ No newline at end of file +Time to follow your [destiny](../destiny/destiny.md). +

+Or just [alchemy](../alchemy/alchemy.md) time! From 28767f983abf60cd6fffd9c77c9e09f1d5bfe08b Mon Sep 17 00:00:00 2001 From: Moh-Nabil Date: Tue, 12 Apr 2016 02:19:27 +0200 Subject: [PATCH 3072/5486] Add link in salamoAlikom.md added new option amazed --- arabic/amazed/amazed.md | 1 + arabic/salamoAlikom.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 arabic/amazed/amazed.md diff --git a/arabic/amazed/amazed.md b/arabic/amazed/amazed.md new file mode 100644 index 0000000000..2cb1635ebe --- /dev/null +++ b/arabic/amazed/amazed.md @@ -0,0 +1 @@ +توقف لحظة لتنبهر بما تعلمت، توقف لحظة لتقدر تلك التكنولوجيا التي تمكننا من أن نتعاون دون أن نعرف بعضنا و دون أن نتقابل حتى. diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 834fa799e9..514c52fa2a 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -23,3 +23,5 @@ [freelancer](learn/learn.md) عايز اعرف اسماء مواقع كورسات فرى لانس [قرار شجاع](tough-decision/tough-decision.md) + +[لتنبهر](amazed/amazed.md) توقف لحظة \ No newline at end of file From 7394a6de0514d4b378d520edd34c5993bdb2d0d9 Mon Sep 17 00:00:00 2001 From: Moh-Nabil Date: Tue, 12 Apr 2016 02:25:25 +0200 Subject: [PATCH 3073/5486] Short the line --- arabic/amazed/amazed.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arabic/amazed/amazed.md b/arabic/amazed/amazed.md index 2cb1635ebe..580f53aba2 100644 --- a/arabic/amazed/amazed.md +++ b/arabic/amazed/amazed.md @@ -1 +1,2 @@ -توقف لحظة لتنبهر بما تعلمت، توقف لحظة لتقدر تلك التكنولوجيا التي تمكننا من أن نتعاون دون أن نعرف بعضنا و دون أن نتقابل حتى. +توقف لحظة لتنبهر بما تعلمت، توقف لحظة لتقدر تلك التكنولوجيا التي تمكننا من أن نتعاون + دون أن نعرف بعضنا و دون أن نتقابل حتى. From c3d50a9ee6928c082e1421b39651e6980654ddf4 Mon Sep 17 00:00:00 2001 From: berlixs Date: Tue, 12 Apr 2016 23:02:16 +0800 Subject: [PATCH 3074/5486] =?UTF-8?q?=E8=87=B3=E5=B0=8A=E5=AE=9D=E6=9D=A5?= =?UTF-8?q?=E5=88=B021=E4=B8=96=E7=BA=AA=EF=BC=8C=E4=BB=8A=E7=BB=AD?= =?UTF-8?q?=E5=89=8D=E7=BC=98=E3=80=82=E7=94=B1=E4=BD=A0=E6=9D=A5=E7=BC=96?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/Yifan/modernCity.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Chinese/Yifan/modernCity.md diff --git a/Chinese/Yifan/modernCity.md b/Chinese/Yifan/modernCity.md new file mode 100644 index 0000000000..838236fa75 --- /dev/null +++ b/Chinese/Yifan/modernCity.md @@ -0,0 +1,8 @@ +至尊宝穿越到了21世纪的河北！！！ +至尊宝：我勒个去》》》》这是神马情况。。。 +（他走到一个卖祖传贴膜的哥们前。。。） + + +请问大哥： + + From a72a4fe6f582b51d971406cc2d04146851aa77c0 Mon Sep 17 00:00:00 2001 From: berlixs Date: Tue, 12 Apr 2016 23:05:48 +0800 Subject: [PATCH 3075/5486] =?UTF-8?q?=E8=87=B3=E5=B0=8A=E5=AE=9D=E8=A2=AB?= =?UTF-8?q?=E4=BC=A0=E9=80=81=E5=88=B021=E4=B8=96=E7=BA=AA=EF=BC=8C?= =?UTF-8?q?=E4=B8=8E=E7=B4=AB=E9=9C=9E=E5=86=8D=E7=BB=AD=E5=89=8D=E7=BC=98?= =?UTF-8?q?=E3=80=82=E7=AD=89=E4=BD=A0=E6=9D=A5=E7=BC=96=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/ZZB/zzb.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Chinese/ZZB/zzb.md b/Chinese/ZZB/zzb.md index d54a0b5df7..6cd881ef17 100644 --- a/Chinese/ZZB/zzb.md +++ b/Chinese/ZZB/zzb.md @@ -13,4 +13,7 @@ 紫霞仙子说： 人都是失去了才懂得珍惜。 +话间，她突然打开月光宝盒，[将至尊宝传送到了21世纪。](../Yifan/modernCity.md) + + 那一位當家喜歡至尊寶?按[此](那一位當家喜歡至尊寶/那一位當家喜歡至尊寶.md)選擇 From 5230983028711d69d1d432207fe64143c9bd0b25 Mon Sep 17 00:00:00 2001 From: Eleftheria Tsipidi Date: Wed, 13 Apr 2016 08:11:09 +0100 Subject: [PATCH 3076/5486] Add a story with Marshmallow from Frozen. --- greek/frozen_marshmallow/frozen-marshmallow.md | 2 ++ greek/marshmallow.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 greek/frozen_marshmallow/frozen-marshmallow.md diff --git a/greek/frozen_marshmallow/frozen-marshmallow.md b/greek/frozen_marshmallow/frozen-marshmallow.md new file mode 100644 index 0000000000..262ea36502 --- /dev/null +++ b/greek/frozen_marshmallow/frozen-marshmallow.md @@ -0,0 +1,2 @@ +Εμφανίζεται ο Marshmallow από το Frozen. +Ουρλιάζει "Δε θα φας τον αδερφό μου!" \ No newline at end of file diff --git a/greek/marshmallow.md b/greek/marshmallow.md index d68a7bb5e6..25d10ae893 100644 --- a/greek/marshmallow.md +++ b/greek/marshmallow.md @@ -24,6 +24,8 @@ [Πιάνεις το σχοινί](use_the_rope/use_the_rope.md) +[Βλέπεις... τον Marshmallow από το Frozen](frozen_marshmallow/frozen-marshmallow.md) + Τελικά συνειδητοποιείς ότι ο Stay Puft Marshmallow Man από το Ghostbusters ήταν στη πραγματικότητα το ζαχαρωτό και σε πιάνει τρόμος ... μπου α χα χα... From 131cce9e114d097b2d6461aa6a5844439dc433f7 Mon Sep 17 00:00:00 2001 From: tongyun Date: Wed, 13 Apr 2016 13:41:31 +0200 Subject: [PATCH 3077/5486] writing something personal --- .../16fall_USA/Columbia_university/columbia I am coming.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Chinese/16fall_USA/Columbia_university/columbia I am coming.md diff --git a/Chinese/16fall_USA/Columbia_university/columbia I am coming.md b/Chinese/16fall_USA/Columbia_university/columbia I am coming.md new file mode 100644 index 0000000000..9e83aba790 --- /dev/null +++ b/Chinese/16fall_USA/Columbia_university/columbia I am coming.md @@ -0,0 +1,5 @@ +写于2016/4/13 比利时布鲁塞尔自由大学图书馆 +经历了一个不算满意的申请季，最后决定去哥大了。 +未来两年必须努力，争取能读david blei 或者collins 的phd. +也算正式转码了。 +[这个世界做事选对方向也很重要啊！](../the-right-way/to_be_a_coder.md) \ No newline at end of file From 8ae8f9cccd0a920b4650b98916276ee6222f3d66 Mon Sep 17 00:00:00 2001 From: tongyun Date: Wed, 13 Apr 2016 14:03:28 +0200 Subject: [PATCH 3078/5486] another try for adventure --- Chinese/16fall_USA/Columbia_university/columbia I am coming.md | 1 - "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Chinese/16fall_USA/Columbia_university/columbia I am coming.md b/Chinese/16fall_USA/Columbia_university/columbia I am coming.md index 9e83aba790..25da45d83c 100644 --- a/Chinese/16fall_USA/Columbia_university/columbia I am coming.md +++ b/Chinese/16fall_USA/Columbia_university/columbia I am coming.md @@ -2,4 +2,3 @@ 经历了一个不算满意的申请季，最后决定去哥大了。 未来两年必须努力，争取能读david blei 或者collins 的phd. 也算正式转码了。 -[这个世界做事选对方向也很重要啊！](../the-right-way/to_be_a_coder.md) \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 45c116e6b6..2186bf7766 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -104,4 +104,5 @@ [ZERO](ZERO/ZERO.md) -[小至尊宝](yixuanda/yixuanda.md) \ No newline at end of file +[小至尊宝](yixuanda/yixuanda.md) +[美帝征程](16fall_USA/Columbia_university/columia I am coming.md) \ No newline at end of file From 792cb78bd7e2358e6bf40b28424398abf7eb20a9 Mon Sep 17 00:00:00 2001 From: tongyun Date: Wed, 13 Apr 2016 17:17:57 +0200 Subject: [PATCH 3079/5486] add the blank line as suggested --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 1 + 1 file changed, 1 insertion(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 2186bf7766..665039f49e 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -105,4 +105,5 @@ [ZERO](ZERO/ZERO.md) [小至尊宝](yixuanda/yixuanda.md) + [美帝征程](16fall_USA/Columbia_university/columia I am coming.md) \ No newline at end of file From ab6ea970b8bb66160836a37a10e33cf0ce7f9b51 Mon Sep 17 00:00:00 2001 From: tongyun Date: Wed, 13 Apr 2016 17:21:16 +0200 Subject: [PATCH 3080/5486] fix the link to the page I created --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 665039f49e..d02f08a0b6 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -106,4 +106,4 @@ [小至尊宝](yixuanda/yixuanda.md) -[美帝征程](16fall_USA/Columbia_university/columia I am coming.md) \ No newline at end of file +[美帝征程](16fall_USA/Columbia_university/columbia I am coming.md) \ No newline at end of file From 7464d4df37cde60c8f32388225c703f6378566f3 Mon Sep 17 00:00:00 2001 From: IATW-UDA Date: Wed, 13 Apr 2016 10:51:30 -0700 Subject: [PATCH 3081/5486] Update beer-brewer.md --- english/beer-brewer/beer-brewer.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/beer-brewer/beer-brewer.md b/english/beer-brewer/beer-brewer.md index a3c3c1e01c..86fdbe00bc 100644 --- a/english/beer-brewer/beer-brewer.md +++ b/english/beer-brewer/beer-brewer.md @@ -10,4 +10,6 @@ Decide that its better to just give up and drink some [Beer](https://www.youtube Learn how to brew from some online [videos](https://www.youtube.com/watch?v=qCW-SVPCw4Y) +You hear a soft voice with an English accent that says, [use the force](use-the-force/force.md) + Give up and go back to the [beginning](../marshmallow.md) From f8a1613543e26be02bb0a038238db2ee01c00e8c Mon Sep 17 00:00:00 2001 From: IATW-UDA Date: Wed, 13 Apr 2016 10:54:03 -0700 Subject: [PATCH 3082/5486] Create force.md --- english/beer-brewer/use-the-force/force.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/beer-brewer/use-the-force/force.md diff --git a/english/beer-brewer/use-the-force/force.md b/english/beer-brewer/use-the-force/force.md new file mode 100644 index 0000000000..959a516e78 --- /dev/null +++ b/english/beer-brewer/use-the-force/force.md @@ -0,0 +1,6 @@ +Suddenly, a warm wave flows over your body and all of the objects around you are in sharp focus. You can +feel the your inner brewer start to explode into your reality. You intuitively know that brewing is an art +passed down from generation to generation, and that you are an Ale-i Knight and the beer force is strong with you. + +You also feel a slight shift in gravity - could you be slowly slipping toward the Dark Side? You try to resist, +but the urge to brew a porter is overwhelming. From 0b614934a9ba5b806ea6009cec611af6ab09638b Mon Sep 17 00:00:00 2001 From: IATW-UDA Date: Wed, 13 Apr 2016 10:56:46 -0700 Subject: [PATCH 3083/5486] Update beer-brewer.md --- english/beer-brewer/beer-brewer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/beer-brewer/beer-brewer.md b/english/beer-brewer/beer-brewer.md index 86fdbe00bc..e0598c9f6b 100644 --- a/english/beer-brewer/beer-brewer.md +++ b/english/beer-brewer/beer-brewer.md @@ -10,6 +10,6 @@ Decide that its better to just give up and drink some [Beer](https://www.youtube Learn how to brew from some online [videos](https://www.youtube.com/watch?v=qCW-SVPCw4Y) -You hear a soft voice with an English accent that says, [use the force](use-the-force/force.md) +You hear a soft voice with an English accent that says, "[Use the force.]"(use-the-force/force.md) Give up and go back to the [beginning](../marshmallow.md) From 8804cac2833e1647006f8c39fe115f85279c9f84 Mon Sep 17 00:00:00 2001 From: IATW-UDA Date: Wed, 13 Apr 2016 10:57:13 -0700 Subject: [PATCH 3084/5486] Update beer-brewer.md --- english/beer-brewer/beer-brewer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/beer-brewer/beer-brewer.md b/english/beer-brewer/beer-brewer.md index e0598c9f6b..1d4ac40da0 100644 --- a/english/beer-brewer/beer-brewer.md +++ b/english/beer-brewer/beer-brewer.md @@ -10,6 +10,6 @@ Decide that its better to just give up and drink some [Beer](https://www.youtube Learn how to brew from some online [videos](https://www.youtube.com/watch?v=qCW-SVPCw4Y) -You hear a soft voice with an English accent that says, "[Use the force.]"(use-the-force/force.md) +You hear a soft voice with an English accent that says, "[Use the force.](use-the-force/force.md)" Give up and go back to the [beginning](../marshmallow.md) From cdb14992d23f316b06c7d6ca44eb9ff626f82f71 Mon Sep 17 00:00:00 2001 From: akshar-patel Date: Thu, 14 Apr 2016 00:12:25 +0530 Subject: [PATCH 3085/5486] Add gujarati people --- ...25\340\253\213 \340\252\233\340\253\200\340\252\217.md" | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 "Gujarati/\340\252\205\340\252\256\340\253\207 \340\252\227\340\253\201\340\252\234\340\252\260\340\252\276\340\252\244\340\253\200 \340\252\262\340\253\213\340\252\225\340\253\213 \340\252\233\340\253\200\340\252\217/\340\252\205\340\252\256\340\253\207 \340\252\227\340\253\201\340\252\234\340\252\260\340\252\276\340\252\244\340\253\200 \340\252\262\340\253\213\340\252\225\340\253\213 \340\252\233\340\253\200\340\252\217.md" diff --git "a/Gujarati/\340\252\205\340\252\256\340\253\207 \340\252\227\340\253\201\340\252\234\340\252\260\340\252\276\340\252\244\340\253\200 \340\252\262\340\253\213\340\252\225\340\253\213 \340\252\233\340\253\200\340\252\217/\340\252\205\340\252\256\340\253\207 \340\252\227\340\253\201\340\252\234\340\252\260\340\252\276\340\252\244\340\253\200 \340\252\262\340\253\213\340\252\225\340\253\213 \340\252\233\340\253\200\340\252\217.md" "b/Gujarati/\340\252\205\340\252\256\340\253\207 \340\252\227\340\253\201\340\252\234\340\252\260\340\252\276\340\252\244\340\253\200 \340\252\262\340\253\213\340\252\225\340\253\213 \340\252\233\340\253\200\340\252\217/\340\252\205\340\252\256\340\253\207 \340\252\227\340\253\201\340\252\234\340\252\260\340\252\276\340\252\244\340\253\200 \340\252\262\340\253\213\340\252\225\340\253\213 \340\252\233\340\253\200\340\252\217.md" new file mode 100644 index 0000000000..a14937f9d2 --- /dev/null +++ "b/Gujarati/\340\252\205\340\252\256\340\253\207 \340\252\227\340\253\201\340\252\234\340\252\260\340\252\276\340\252\244\340\253\200 \340\252\262\340\253\213\340\252\225\340\253\213 \340\252\233\340\253\200\340\252\217/\340\252\205\340\252\256\340\253\207 \340\252\227\340\253\201\340\252\234\340\252\260\340\252\276\340\252\244\340\253\200 \340\252\262\340\253\213\340\252\225\340\253\213 \340\252\233\340\253\200\340\252\217.md" @@ -0,0 +1,7 @@ +અમે ગુજરાતી લોકો છીએ. ધંધો કરી પણ લઈએ અને બીજાને ધંધે પણ લગાડી દઈએ. + +અમારી વિષે વધારે [જાણો](https://en.wikipedia.org/wiki/Gujarati_people) + +[રજનીકાંત vs નરેશ કનોડિયા] (નરેશ કનોડિયા/નરેશ કનોડિયા.md) + +જો બકા ગીટહબ હોય કે ફેસબુક હોય અમારો [બકો](http://beebom.com/2014/09/gujarati-jo-baka-posters) તો બધે પ્રખ્યાત છે. From e9890696b3d0529f0f41b466f7166e75cf68a41b Mon Sep 17 00:00:00 2001 From: akshar-patel Date: Thu, 14 Apr 2016 00:33:52 +0530 Subject: [PATCH 3086/5486] Add link to gujarati people --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index 6ecfea8f0e..dcd48cb006 100644 --- a/language.md +++ b/language.md @@ -143,3 +143,5 @@ If you want learn Telugu, click [here](Telugu/Telugu.md). If you want to know more about IoT, click [here](english/iot/intro.md). If GibberisHkjsbckjsjcn,[hereeekdcskj](Gibberish/Gibberish.md) + +તમે ગુજરાતી છો તો [અહી](Gujarati/અમે ગુજરાતી લોકો છીએ/અમે ગુજરાતી લોકો છીએ.md) જાઓ From 3f5de8bf24ec07a69723f6e2cfde23252fdfa436 Mon Sep 17 00:00:00 2001 From: akshar-patel Date: Thu, 14 Apr 2016 00:35:57 +0530 Subject: [PATCH 3087/5486] Add naresh kanodiya --- ...253\213\340\252\241\340\252\277\340\252\257\340\252\276.md" | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 "Gujarati/\340\252\205\340\252\256\340\253\207 \340\252\227\340\253\201\340\252\234\340\252\260\340\252\276\340\252\244\340\253\200 \340\252\262\340\253\213\340\252\225\340\253\213 \340\252\233\340\253\200\340\252\217/\340\252\250\340\252\260\340\253\207\340\252\266 \340\252\225\340\252\250\340\253\213\340\252\241\340\252\277\340\252\257\340\252\276/\340\252\250\340\252\260\340\253\207\340\252\266 \340\252\225\340\252\250\340\253\213\340\252\241\340\252\277\340\252\257\340\252\276.md" diff --git "a/Gujarati/\340\252\205\340\252\256\340\253\207 \340\252\227\340\253\201\340\252\234\340\252\260\340\252\276\340\252\244\340\253\200 \340\252\262\340\253\213\340\252\225\340\253\213 \340\252\233\340\253\200\340\252\217/\340\252\250\340\252\260\340\253\207\340\252\266 \340\252\225\340\252\250\340\253\213\340\252\241\340\252\277\340\252\257\340\252\276/\340\252\250\340\252\260\340\253\207\340\252\266 \340\252\225\340\252\250\340\253\213\340\252\241\340\252\277\340\252\257\340\252\276.md" "b/Gujarati/\340\252\205\340\252\256\340\253\207 \340\252\227\340\253\201\340\252\234\340\252\260\340\252\276\340\252\244\340\253\200 \340\252\262\340\253\213\340\252\225\340\253\213 \340\252\233\340\253\200\340\252\217/\340\252\250\340\252\260\340\253\207\340\252\266 \340\252\225\340\252\250\340\253\213\340\252\241\340\252\277\340\252\257\340\252\276/\340\252\250\340\252\260\340\253\207\340\252\266 \340\252\225\340\252\250\340\253\213\340\252\241\340\252\277\340\252\257\340\252\276.md" new file mode 100644 index 0000000000..36b5536be3 --- /dev/null +++ "b/Gujarati/\340\252\205\340\252\256\340\253\207 \340\252\227\340\253\201\340\252\234\340\252\260\340\252\276\340\252\244\340\253\200 \340\252\262\340\253\213\340\252\225\340\253\213 \340\252\233\340\253\200\340\252\217/\340\252\250\340\252\260\340\253\207\340\252\266 \340\252\225\340\252\250\340\253\213\340\252\241\340\252\277\340\252\257\340\252\276/\340\252\250\340\252\260\340\253\207\340\252\266 \340\252\225\340\252\250\340\253\213\340\252\241\340\252\277\340\252\257\340\252\276.md" @@ -0,0 +1,3 @@ +રજનીકાંત: “ફેસબુકમાં મારે ૧,૦૦,૦૦,૦૦૦થી પણ વધારે મિત્રો છે!” + +નરેશ કનોડિયા: “હવે વાયડીનો થા મા, એટલા તો મારે ઓર્કુટમાં હતા!” From e2ec90d3fc094798151972a3d1c870b9878d0ed3 Mon Sep 17 00:00:00 2001 From: Niels Lindberg Date: Thu, 14 Apr 2016 00:37:02 +0200 Subject: [PATCH 3088/5486] Add relfections regarding taxation and link to wikipedia article. --- english/stopbernie/stopbernie.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/stopbernie/stopbernie.md b/english/stopbernie/stopbernie.md index 879023db2b..cd2b75a419 100644 --- a/english/stopbernie/stopbernie.md +++ b/english/stopbernie/stopbernie.md @@ -1,3 +1,9 @@ Nothing is free. [Even the middle class will pay more under Bernie Sanders](http://goo.gl/uZIN0d) -Go [back to menu](../marshmallow.md) \ No newline at end of file +Go [back to menu](../marshmallow.md) + +Instead of going back you wonder... Can the truth and validity about a tax plan +Be defined by whether or not it is free? Wouldn't that mean that all tax plans are bad? + +You decide that you wan't to educate yourself alittle before making strong oppinions by +reading up on the purpose of taxation [Wikipedia article on taxation](https://en.wikipedia.org/wiki/Tax) \ No newline at end of file From a20df73f5dc3c8877fdcde9f4bfb700a95d28c4b Mon Sep 17 00:00:00 2001 From: Dhanya Date: Wed, 13 Apr 2016 19:52:45 -0400 Subject: [PATCH 3089/5486] Add smores files --- english/marshmallow.md | 2 ++ english/toasted/smores_pie.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 english/toasted/smores_pie.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 30ff8c38c8..db846041dd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -908,3 +908,5 @@ And then you look up and see it, you can't bealive is him but there he is [stari [Do nothing.](nothing/do-nothing.md) [Rent a hydroplaning dog sled to get you to the other side of the world] (dog-sled/dogsled.md) + +Toasted [marshmallow](toasted/smores_pie.md) \ No newline at end of file diff --git a/english/toasted/smores_pie.md b/english/toasted/smores_pie.md new file mode 100644 index 0000000000..bc6adb51b5 --- /dev/null +++ b/english/toasted/smores_pie.md @@ -0,0 +1,4 @@ +The light brown color reminds me of s'mores brownie pie with fudgy +homemade brownies topped with a gooey toasted marshmallows piled inside +a buttery graham cracker's crust and I'm lost in the thought of s'mores +brownie pie and sweet [home](../marshmallow.md) \ No newline at end of file From bbb10a8bde40063203cbb9d374460fd206f380fd Mon Sep 17 00:00:00 2001 From: Ashish Kumar Date: Thu, 14 Apr 2016 09:26:34 +0530 Subject: [PATCH 3090/5486] Added a new quote in Life of this world. --- english/00-Life-of-this-world/Life of this world.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/00-Life-of-this-world/Life of this world.md b/english/00-Life-of-this-world/Life of this world.md index 1ab005a1f5..2ca58666a1 100644 --- a/english/00-Life-of-this-world/Life of this world.md +++ b/english/00-Life-of-this-world/Life of this world.md @@ -8,3 +8,5 @@ disbelievers, evil-doers), and (there is) Forgiveness from Allah and (His) Good Pleasure (for the believers, good-doers), whereas the life of this world is only a deceiving enjoyment“. [QURAN 57:20] + +"Life isn't that simple but you got to take every possible risk in life to achieve something." \ No newline at end of file From 4dadaebb02a6d4994b18ce865af41b362f9486ee Mon Sep 17 00:00:00 2001 From: Tom Zille Date: Thu, 14 Apr 2016 14:27:05 +0200 Subject: [PATCH 3091/5486] add option android to kobold arc --- german/Hilfeschrei/Vertrauen/insMaul/android/android.md | 8 ++++++++ german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 german/Hilfeschrei/Vertrauen/insMaul/android/android.md diff --git a/german/Hilfeschrei/Vertrauen/insMaul/android/android.md b/german/Hilfeschrei/Vertrauen/insMaul/android/android.md new file mode 100644 index 0000000000..f74332bc97 --- /dev/null +++ b/german/Hilfeschrei/Vertrauen/insMaul/android/android.md @@ -0,0 +1,8 @@ +Der kleine Kobold erkennt das er die ganze Zeit der falschen Verein angehört hat und fängt an über sein +Leben nachzudenken. + +Das ist für deine jetzige Situation natürlich nicht unbedingt toll da er auch nicht mehr mit dir reden will, +und du bist ja in einem Wal und auch die restliche Situation ist nicht unbedingt toll. + +Was machst du jetzt: + diff --git a/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md b/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md index f413d02978..c15694a59c 100644 --- a/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md +++ b/german/Hilfeschrei/Vertrauen/insMaul/ins_maul.md @@ -12,4 +12,6 @@ Du entgegnest: ["N'Scheiss kriegst du mein Handy" und haust ihm eine rein](reinhauen/reinhauen.md) -[Du tauschst dein Handy gegen das Glöckchen](gloeckchen/gloeckchen.md) \ No newline at end of file +[Du tauschst dein Handy gegen das Glöckchen](gloeckchen/gloeckchen.md) + +[Ich habe doch kein iPhone, Android 4 LIFE!](android/android.md) \ No newline at end of file From bb40fb9f7488c3ff85e0ebc8fd72e494bb642e67 Mon Sep 17 00:00:00 2001 From: Elie Shalhoub Date: Thu, 14 Apr 2016 15:37:25 +0300 Subject: [PATCH 3092/5486] Add the warriors record to the story --- english/marshmallow.md | 5 ++++- english/new_warriors_record/new_warriors_record.md | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 english/new_warriors_record/new_warriors_record.md diff --git a/english/marshmallow.md b/english/marshmallow.md index db846041dd..6fd5fa15e7 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -909,4 +909,7 @@ And then you look up and see it, you can't bealive is him but there he is [stari [Rent a hydroplaning dog sled to get you to the other side of the world] (dog-sled/dogsled.md) -Toasted [marshmallow](toasted/smores_pie.md) \ No newline at end of file +Toasted [marshmallow](toasted/smores_pie.md) + +While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. +[The new record is!][new_warriors_record/new_warriors_record.md] \ No newline at end of file diff --git a/english/new_warriors_record/new_warriors_record.md b/english/new_warriors_record/new_warriors_record.md new file mode 100644 index 0000000000..ac67ad7da1 --- /dev/null +++ b/english/new_warriors_record/new_warriors_record.md @@ -0,0 +1,3 @@ +The warriors broke the bull 1995/1996 72 wins 10 losses record. + +They acieved 73 wins with 9 losses this season. \ No newline at end of file From 803c0da51bf99c1ba8b29bea8095a4aac1929749 Mon Sep 17 00:00:00 2001 From: Elie Shalhoub Date: Thu, 14 Apr 2016 15:40:44 +0300 Subject: [PATCH 3093/5486] Add fix to typo error in link to new_warriors_record --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6fd5fa15e7..6c5ef08879 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -912,4 +912,4 @@ And then you look up and see it, you can't bealive is him but there he is [stari Toasted [marshmallow](toasted/smores_pie.md) While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. -[The new record is!][new_warriors_record/new_warriors_record.md] \ No newline at end of file +[The new record is!](new_warriors_record/new_warriors_record.md) \ No newline at end of file From efe49930e8ca7b8c229df5eda4ef020823bed51c Mon Sep 17 00:00:00 2001 From: Dhanya Date: Thu, 14 Apr 2016 12:53:24 -0400 Subject: [PATCH 3094/5486] Change a line in fire.md --- english/chocolate/chocolate.md | 1 + english/light-fire/fire.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/chocolate/chocolate.md diff --git a/english/chocolate/chocolate.md b/english/chocolate/chocolate.md new file mode 100644 index 0000000000..3448154762 --- /dev/null +++ b/english/chocolate/chocolate.md @@ -0,0 +1 @@ +Have chocolate coffee and enjoy your [morning.](../light-fire/fire.md) diff --git a/english/light-fire/fire.md b/english/light-fire/fire.md index c23c72e242..03ef3a9aff 100644 --- a/english/light-fire/fire.md +++ b/english/light-fire/fire.md @@ -41,4 +41,6 @@ The rat smiles and says, "Come on, let's go!" [Drink some coffee.](../coffee/coffee.md) [Sleep] +[Have some chocolate coffee.](../chocolate/chocolate.md) + From f981364415d23c8833fb9c50f754b22142801232 Mon Sep 17 00:00:00 2001 From: Dhanya Date: Thu, 14 Apr 2016 14:52:25 -0400 Subject: [PATCH 3095/5486] Add a line in fire.md --- english/chocolate/chocolate.md | 1 - english/coffee/coffee.md | 1 + english/light-fire/fire.md | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 english/chocolate/chocolate.md diff --git a/english/chocolate/chocolate.md b/english/chocolate/chocolate.md deleted file mode 100644 index 3448154762..0000000000 --- a/english/chocolate/chocolate.md +++ /dev/null @@ -1 +0,0 @@ -Have chocolate coffee and enjoy your [morning.](../light-fire/fire.md) diff --git a/english/coffee/coffee.md b/english/coffee/coffee.md index 3c96b95b5e..ba8ff371eb 100644 --- a/english/coffee/coffee.md +++ b/english/coffee/coffee.md @@ -42,3 +42,4 @@ After having your coffee do you want to: . Coffee creates a great medium for people to have conversations about ideas and visions. +Have chocolate coffee in the morning and [enjoy.](another-coffee/another-coffee.md) diff --git a/english/light-fire/fire.md b/english/light-fire/fire.md index 03ef3a9aff..69a08c1a6f 100644 --- a/english/light-fire/fire.md +++ b/english/light-fire/fire.md @@ -41,6 +41,6 @@ The rat smiles and says, "Come on, let's go!" [Drink some coffee.](../coffee/coffee.md) [Sleep] -[Have some chocolate coffee.](../chocolate/chocolate.md) +[Have some chocolate coffee.](../coffee/coffee.md) From 3b59329bdb344c2613b2a337c4875e8ba4902b35 Mon Sep 17 00:00:00 2001 From: Wang Chong Date: Fri, 15 Apr 2016 02:58:04 +0800 Subject: [PATCH 3096/5486] add a film of chinese named MonkeyKingHeroisBack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit chinese name is "大圣归来" --- Chinese/MonkeyKingHeroisBack.txt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Chinese/MonkeyKingHeroisBack.txt diff --git a/Chinese/MonkeyKingHeroisBack.txt b/Chinese/MonkeyKingHeroisBack.txt new file mode 100644 index 0000000000..38df22f68c --- /dev/null +++ b/Chinese/MonkeyKingHeroisBack.txt @@ -0,0 +1,9 @@ +简介: 这是一部国产动漫电影。影片讲述了已于五行山下寂寞沉潜五百年的孙悟空被儿时的唐僧——俗名江流儿的小和尚误打误撞地解除了封印， +在相互陪伴的冒险之旅中找回初心，完成自我救赎的故事。 + +江流儿和他师傅来到长安城，刚好有一个皮影表演——齐天大圣孙悟空大闹天宫，也许是听了太多的大圣的故事，江流儿对大圣已经崇拜到极点了， +于是这次半偷半抢了一个齐天大圣的皮影模具，很开心。 师傅到处找江流儿，恰巧在转角处发现了他. +然而，妖怪这个时候也快来了，混沌妖王的小娄娄…… + +小娄娄抓了许多小男孩，此时需要抓一个小女孩，然而这貌似仅有的小女孩被江流 儿给救了，妖怪当然不放过同是小孩的江流儿， +江流儿接着就开始了一段“滑雪冒 险”什么的.... From f54a1951665874fa16e4f91068b9a43fb094f80c Mon Sep 17 00:00:00 2001 From: proticom Date: Thu, 14 Apr 2016 17:21:31 -0700 Subject: [PATCH 3097/5486] Add Nap Option to Sandwich.md --- english/sandwich/sandwich.md | 2 ++ english/take-nap/cucumber-induced-nap.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 english/take-nap/cucumber-induced-nap.md diff --git a/english/sandwich/sandwich.md b/english/sandwich/sandwich.md index 6bd5a4fd0d..6ed8386adf 100644 --- a/english/sandwich/sandwich.md +++ b/english/sandwich/sandwich.md @@ -7,3 +7,5 @@ You strengthen your resolve and eat it anyway. You may need the energy later. Bolstered by the invigourating feeling of the sandwich in your belly, your senses tingle in anticipation of [continuing your adventure](../marshmallow.md). + +Or perhaps you decide to take a little [nap](../take-nap/cucumber-induced-nap.md) \ No newline at end of file diff --git a/english/take-nap/cucumber-induced-nap.md b/english/take-nap/cucumber-induced-nap.md new file mode 100644 index 0000000000..e235073504 --- /dev/null +++ b/english/take-nap/cucumber-induced-nap.md @@ -0,0 +1,4 @@ +You unpack your porta-bed that you got from [Costco](http://www.costco.com) +And lay your head on the [MyPillow](http://www.mypillow.com) that you bought +while you were recovering from an epic night of binge watching. You drift off +to slumber land thinking...man that My Pillow guy has one hell of a moustache. \ No newline at end of file From 0bba218f74dda5da2f30331cf727b1cff2e1f3a6 Mon Sep 17 00:00:00 2001 From: proticom Date: Thu, 14 Apr 2016 17:32:35 -0700 Subject: [PATCH 3098/5486] Add line between lines containing links. --- english/take-nap/cucumber-induced-nap.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/take-nap/cucumber-induced-nap.md b/english/take-nap/cucumber-induced-nap.md index e235073504..ca06d6db4f 100644 --- a/english/take-nap/cucumber-induced-nap.md +++ b/english/take-nap/cucumber-induced-nap.md @@ -1,4 +1,5 @@ -You unpack your porta-bed that you got from [Costco](http://www.costco.com) +You unpack your porta-bed that you got from [Costco](http://www.costco.com). + And lay your head on the [MyPillow](http://www.mypillow.com) that you bought while you were recovering from an epic night of binge watching. You drift off to slumber land thinking...man that My Pillow guy has one hell of a moustache. \ No newline at end of file From 4117bd40ea653170aae08772c60ea406e27c530a Mon Sep 17 00:00:00 2001 From: Wang Chong Date: Fri, 15 Apr 2016 09:46:50 +0800 Subject: [PATCH 3099/5486] fixed some format, and follow the guide line --- Chinese/MonkeyKingHeroisBack/MonkeyKingHeroisBack.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Chinese/MonkeyKingHeroisBack/MonkeyKingHeroisBack.md diff --git a/Chinese/MonkeyKingHeroisBack/MonkeyKingHeroisBack.md b/Chinese/MonkeyKingHeroisBack/MonkeyKingHeroisBack.md new file mode 100644 index 0000000000..38df22f68c --- /dev/null +++ b/Chinese/MonkeyKingHeroisBack/MonkeyKingHeroisBack.md @@ -0,0 +1,9 @@ +简介: 这是一部国产动漫电影。影片讲述了已于五行山下寂寞沉潜五百年的孙悟空被儿时的唐僧——俗名江流儿的小和尚误打误撞地解除了封印， +在相互陪伴的冒险之旅中找回初心，完成自我救赎的故事。 + +江流儿和他师傅来到长安城，刚好有一个皮影表演——齐天大圣孙悟空大闹天宫，也许是听了太多的大圣的故事，江流儿对大圣已经崇拜到极点了， +于是这次半偷半抢了一个齐天大圣的皮影模具，很开心。 师傅到处找江流儿，恰巧在转角处发现了他. +然而，妖怪这个时候也快来了，混沌妖王的小娄娄…… + +小娄娄抓了许多小男孩，此时需要抓一个小女孩，然而这貌似仅有的小女孩被江流 儿给救了，妖怪当然不放过同是小孩的江流儿， +江流儿接着就开始了一段“滑雪冒 险”什么的.... From 9de1997331384389a4639949d6a70b0d0614d473 Mon Sep 17 00:00:00 2001 From: Wang Chong Date: Fri, 15 Apr 2016 09:47:37 +0800 Subject: [PATCH 3100/5486] delete unformat file --- Chinese/MonkeyKingHeroisBack.txt | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Chinese/MonkeyKingHeroisBack.txt diff --git a/Chinese/MonkeyKingHeroisBack.txt b/Chinese/MonkeyKingHeroisBack.txt deleted file mode 100644 index 38df22f68c..0000000000 --- a/Chinese/MonkeyKingHeroisBack.txt +++ /dev/null @@ -1,9 +0,0 @@ -简介: 这是一部国产动漫电影。影片讲述了已于五行山下寂寞沉潜五百年的孙悟空被儿时的唐僧——俗名江流儿的小和尚误打误撞地解除了封印， -在相互陪伴的冒险之旅中找回初心，完成自我救赎的故事。 - -江流儿和他师傅来到长安城，刚好有一个皮影表演——齐天大圣孙悟空大闹天宫，也许是听了太多的大圣的故事，江流儿对大圣已经崇拜到极点了， -于是这次半偷半抢了一个齐天大圣的皮影模具，很开心。 师傅到处找江流儿，恰巧在转角处发现了他. -然而，妖怪这个时候也快来了，混沌妖王的小娄娄…… - -小娄娄抓了许多小男孩，此时需要抓一个小女孩，然而这貌似仅有的小女孩被江流 儿给救了，妖怪当然不放过同是小孩的江流儿， -江流儿接着就开始了一段“滑雪冒 险”什么的.... From 2916e57bbc104f42893e8ae30c193998b2de45b3 Mon Sep 17 00:00:00 2001 From: Wang Chong Date: Fri, 15 Apr 2016 09:51:13 +0800 Subject: [PATCH 3101/5486] =?UTF-8?q?Update=20=E5=A4=A7=E8=AF=9D=E8=A5=BF?= =?UTF-8?q?=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index d02f08a0b6..7810b9ff48 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -106,4 +106,6 @@ [小至尊宝](yixuanda/yixuanda.md) -[美帝征程](16fall_USA/Columbia_university/columbia I am coming.md) \ No newline at end of file +[美帝征程](16fall_USA/Columbia_university/columbia I am coming.md) + +[MonkeyKingHereisBack](MonkeyKingHeroisBack/MonkeyKingHeroisBack.md) From f54f72cc9079433e92b9fba025627c459ee4b4f6 Mon Sep 17 00:00:00 2001 From: Joshua Spaul Date: Fri, 15 Apr 2016 04:26:53 +0100 Subject: [PATCH 3102/5486] Added dead-or-alive page and updated schrodinger-cat page --- english/dead-or-alive/dead-or-alive.md | 5 +++++ english/schrodinger-cat/schrodinger-cat.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 english/dead-or-alive/dead-or-alive.md diff --git a/english/dead-or-alive/dead-or-alive.md b/english/dead-or-alive/dead-or-alive.md new file mode 100644 index 0000000000..94e90da006 --- /dev/null +++ b/english/dead-or-alive/dead-or-alive.md @@ -0,0 +1,5 @@ +You opened the box so you're alive. + +However the cat with you is dead. + +He wasn't quite so lucky. \ No newline at end of file diff --git a/english/schrodinger-cat/schrodinger-cat.md b/english/schrodinger-cat/schrodinger-cat.md index fce4f5e4bc..61e0ed16f0 100644 --- a/english/schrodinger-cat/schrodinger-cat.md +++ b/english/schrodinger-cat/schrodinger-cat.md @@ -5,3 +5,5 @@ You simultaneously are both dead and alive. Also known as Quantum Superposition It is only when you open the box that you become either dead or alive. + +So [open the box](../dead-or-alive/dead-or-alive.md). \ No newline at end of file From a89da4dc9a494d3570dab9c1cdfda6f049351285 Mon Sep 17 00:00:00 2001 From: Joshua Spaul Date: Fri, 15 Apr 2016 04:44:41 +0100 Subject: [PATCH 3103/5486] Moved dead-or-alive folder in schrodinger-cat and fixed link. --- english/dead-or-alive/dead-or-alive.md | 5 ----- english/schrodinger-cat/schrodinger-cat.md | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 english/dead-or-alive/dead-or-alive.md diff --git a/english/dead-or-alive/dead-or-alive.md b/english/dead-or-alive/dead-or-alive.md deleted file mode 100644 index 94e90da006..0000000000 --- a/english/dead-or-alive/dead-or-alive.md +++ /dev/null @@ -1,5 +0,0 @@ -You opened the box so you're alive. - -However the cat with you is dead. - -He wasn't quite so lucky. \ No newline at end of file diff --git a/english/schrodinger-cat/schrodinger-cat.md b/english/schrodinger-cat/schrodinger-cat.md index 61e0ed16f0..fb9d0dd8db 100644 --- a/english/schrodinger-cat/schrodinger-cat.md +++ b/english/schrodinger-cat/schrodinger-cat.md @@ -6,4 +6,4 @@ Also known as Quantum Superposition It is only when you open the box that you become either dead or alive. -So [open the box](../dead-or-alive/dead-or-alive.md). \ No newline at end of file +So [open the box](dead-or-alive/dead-or-alive.md). \ No newline at end of file From 2f6eeec45c298f522b77ce9645d63880d85cdec7 Mon Sep 17 00:00:00 2001 From: Joshua Spaul Date: Fri, 15 Apr 2016 04:49:11 +0100 Subject: [PATCH 3104/5486] Fixed missing dead-or-alive --- english/schrodinger-cat/dead-or-alive/dead-or-alive.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/schrodinger-cat/dead-or-alive/dead-or-alive.md diff --git a/english/schrodinger-cat/dead-or-alive/dead-or-alive.md b/english/schrodinger-cat/dead-or-alive/dead-or-alive.md new file mode 100644 index 0000000000..94e90da006 --- /dev/null +++ b/english/schrodinger-cat/dead-or-alive/dead-or-alive.md @@ -0,0 +1,5 @@ +You opened the box so you're alive. + +However the cat with you is dead. + +He wasn't quite so lucky. \ No newline at end of file From 5cced872cde36231efaa622bf0efd763a46c3bd5 Mon Sep 17 00:00:00 2001 From: Richard Macias Date: Fri, 15 Apr 2016 14:11:55 -0500 Subject: [PATCH 3105/5486] Added Interstellar Quote --- english/interstellar_quote/light.md | 26 ++++++++++++++++++++++++++ english/marshmallow.md | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 english/interstellar_quote/light.md diff --git a/english/interstellar_quote/light.md b/english/interstellar_quote/light.md new file mode 100644 index 0000000000..eef391218a --- /dev/null +++ b/english/interstellar_quote/light.md @@ -0,0 +1,26 @@ +Do not go gentle into that good night, +Old age should burn and rave at close of day; +Rage, rage against the dying of the light. + +Though wise men at their end know dark is right, +Because their words had forked no lightning they +Do not go gentle into that good night. + +Good men, the last wave by, crying how bright +Their frail deeds might have danced in a green bay, +Rage, rage against the dying of the light. + +Wild men who caught and sang the sun in flight, +And learn, too late, they grieved it on its way, +Do not go gentle into that good night. + +Grave men, near death, who see with blinding sight +Blind eyes could blaze like meteors and be gay, +Rage, rage against the dying of the light. + +And you, my father, there on that sad height, +Curse, bless, me now with your fierce tears, I pray. +Do not go gentle into that good night. +Rage, rage against the dying of the light. + +-Dylan Thomas \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 6c5ef08879..670012a20a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -912,4 +912,6 @@ And then you look up and see it, you can't bealive is him but there he is [stari Toasted [marshmallow](toasted/smores_pie.md) While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. -[The new record is!](new_warriors_record/new_warriors_record.md) \ No newline at end of file +[The new record is!](new_warriors_record/new_warriors_record.md) + +Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). \ No newline at end of file From 9969fd4f6d07c690a67f4236a5789b413b578844 Mon Sep 17 00:00:00 2001 From: John Laine Date: Sat, 16 Apr 2016 03:08:15 +0000 Subject: [PATCH 3106/5486] Add my adventure --- english/friendly-person/friendly-person.md | 4 ++++ english/marshmallow.md | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 english/friendly-person/friendly-person.md diff --git a/english/friendly-person/friendly-person.md b/english/friendly-person/friendly-person.md new file mode 100644 index 0000000000..d529a4fdf1 --- /dev/null +++ b/english/friendly-person/friendly-person.md @@ -0,0 +1,4 @@ +As you get closer, you suddenly realize that the person on the path is you! +You look different somehow. You look good, happy, peaceful. + +You ask yourself a question: \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 670012a20a..f5705a3962 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,6 +1,11 @@ Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. + +Down one path you see a person standing in the middle of the path. +They look familiar somehow, but you just can't figure out who they are. +They seem friendly so you decide to go [talk to them.](friendly-person/friendly-person.md) + Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) [Want to see my Quora profile](ismail-quora-profile/quora-profile.md) From 109a7e2affd326c863fc9d546891b59fac89baa8 Mon Sep 17 00:00:00 2001 From: crudamcode Date: Sat, 16 Apr 2016 01:40:37 -0500 Subject: [PATCH 3107/5486] Anadaadio un fregmento --- espanol/canudos.md | 12 +++++++----- espanol/escapo/escapo.md | 5 +++++ 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 espanol/escapo/escapo.md diff --git a/espanol/canudos.md b/espanol/canudos.md index f74e20bf35..c59c9ecc4d 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -41,7 +41,7 @@ and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyA [Subió a la torre](torre/torre.md) -Se cansó de la guerra y decidió alienarse de todo lo material, +Se cansó de la guerra y decidió alienarse de todo lo material, accediendo a un [estado de meditación transcendente](transcender/transcender.md) [Ordenó buscar al Capitán Trueno](capitan/trueno.md) @@ -100,7 +100,7 @@ accediendo a un [estado de meditación transcendente](transcender/transcender.md Al ojearlo, una duda lo emabargó...[¿Qué hago?](duda/duda.md) -Al despertar y enfocar la vista vió lo que había sucedido tras la +Al despertar y enfocar la vista vió lo que había sucedido tras la explosión [que pasó?](explosion/explosion.md) Salió corriendo y no se lo vio nunca más en el reino @@ -113,7 +113,7 @@ A pero si no leiste el cuento del cuco, entonces significa que no tienes [miedo] [Puso su mano derecha en su frente y se teletransportó al centro del ejército enemigo](pelea_epica/pelea_epica.md) -Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. +Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. - [Dark_side](dark_side/dark_side.md) @@ -126,10 +126,10 @@ No tuvo más opción que buscar refuerzos, luchadores incanzables que tuvieran l Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, la guerra no había hecho más que [comenzar](guerra/duracion.md). -"El que tenga rabo de paja ni que lo fajen chiquito", +"El que tenga rabo de paja ni que lo fajen chiquito", dijo el [curandero](curandero/curandero.md)... -Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", +Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", se atrevio a lo que nadie se [imaginó:](Mutantes/Mutantes.md) [Hizo un breve movimiento para llamar a sus ayudantes y](ayudantes/ayudantes.md) @@ -139,3 +139,5 @@ se atrevio a lo que nadie se [imaginó:](Mutantes/Mutantes.md) Y llego spiderman a salvar el dia. Con sus acrobáticos movimientos y osadas frases + +solo [Escapó](escapo/escapo.md) diff --git a/espanol/escapo/escapo.md b/espanol/escapo/escapo.md new file mode 100644 index 0000000000..4a544998f8 --- /dev/null +++ b/espanol/escapo/escapo.md @@ -0,0 +1,5 @@ +Escapó dejando su mundo atrás, pensado en esconderse corrió hasta que encontró +un pequeña casa a las afueras de la villa, entró y corrió a la ultima +habitacion cerro la puerta, se sentó en la rincón más alejado de la puerta y se +cubrió con la capa que llevaba puesta pero no pudo escapar del miedo que en él +habitaba. From 67fa35a8b2fa13ba6a63995ec477d48c6101c6c4 Mon Sep 17 00:00:00 2001 From: crudamcode Date: Sat, 16 Apr 2016 02:02:21 -0500 Subject: [PATCH 3108/5486] Reincertado espacios en blanco --- espanol/canudos.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index c59c9ecc4d..552ab2e10d 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -41,7 +41,7 @@ and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyA [Subió a la torre](torre/torre.md) -Se cansó de la guerra y decidió alienarse de todo lo material, +Se cansó de la guerra y decidió alienarse de todo lo material, accediendo a un [estado de meditación transcendente](transcender/transcender.md) [Ordenó buscar al Capitán Trueno](capitan/trueno.md) @@ -100,7 +100,7 @@ accediendo a un [estado de meditación transcendente](transcender/transcender.md Al ojearlo, una duda lo emabargó...[¿Qué hago?](duda/duda.md) -Al despertar y enfocar la vista vió lo que había sucedido tras la +Al despertar y enfocar la vista vió lo que había sucedido tras la explosión [que pasó?](explosion/explosion.md) Salió corriendo y no se lo vio nunca más en el reino @@ -113,7 +113,7 @@ A pero si no leiste el cuento del cuco, entonces significa que no tienes [miedo] [Puso su mano derecha en su frente y se teletransportó al centro del ejército enemigo](pelea_epica/pelea_epica.md) -Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. +Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. - [Dark_side](dark_side/dark_side.md) @@ -126,10 +126,10 @@ No tuvo más opción que buscar refuerzos, luchadores incanzables que tuvieran l Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, la guerra no había hecho más que [comenzar](guerra/duracion.md). -"El que tenga rabo de paja ni que lo fajen chiquito", +"El que tenga rabo de paja ni que lo fajen chiquito", dijo el [curandero](curandero/curandero.md)... -Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", +Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", se atrevio a lo que nadie se [imaginó:](Mutantes/Mutantes.md) [Hizo un breve movimiento para llamar a sus ayudantes y](ayudantes/ayudantes.md) From 7686f8e7c4872b996ff61b915dd343eaa86f235f Mon Sep 17 00:00:00 2001 From: shisaq Date: Sat, 16 Apr 2016 11:14:03 -0400 Subject: [PATCH 3109/5486] Becomes to a Front-end Engineer, like us --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 7810b9ff48..d4913d8001 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -1,5 +1,7 @@ 在1994年大话西游之月光宝盒的电影中，主角周星驰饰演的孙悟空在500年后转世成为： +前端攻城狮一枚。这枚攻城狮做出了很多网页，比如： + [PanicStation](PanicStation/panic.md) [Orascom](Orascom/Orascom.md) From 3706a9719c997c0b932c5c6b93e0fd914b78af22 Mon Sep 17 00:00:00 2001 From: kenshi Date: Sat, 16 Apr 2016 23:24:44 +0800 Subject: [PATCH 3110/5486] Add my adventure --- japanese/chasitsu.md | 4 +++- japanese/cold/cold.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 japanese/cold/cold.md diff --git a/japanese/chasitsu.md b/japanese/chasitsu.md index c381bd1a6d..9a431472b7 100644 --- a/japanese/chasitsu.md +++ b/japanese/chasitsu.md @@ -7,4 +7,6 @@ 今日食べた[カツ丼](katsudon/katsudon.md)美味しかったなー。 -[ここ](happy/happy.md)を踏むと幸せになれます。 \ No newline at end of file +[ここ](happy/happy.md)を踏むと幸せになれます。 + +[寒い](cold/cold.md) \ No newline at end of file diff --git a/japanese/cold/cold.md b/japanese/cold/cold.md new file mode 100644 index 0000000000..d8266dca3f --- /dev/null +++ b/japanese/cold/cold.md @@ -0,0 +1 @@ +なんか急に寒くなってきた。窓際から「助けて～」らしき女性の声を聞こえ振り向くと、白衣の女性が座っている。 \ No newline at end of file From 005948c06586b29d02bdb07f15cda983f01cad35 Mon Sep 17 00:00:00 2001 From: Rumokiga Date: Sat, 16 Apr 2016 17:51:36 +0100 Subject: [PATCH 3111/5486] Add content and an option to friendly-person --- english/friendly-person/friendly-person.md | 9 ++++++++- english/friendly-person/wave/wave.md | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 english/friendly-person/wave/wave.md diff --git a/english/friendly-person/friendly-person.md b/english/friendly-person/friendly-person.md index d529a4fdf1..2cec58bb37 100644 --- a/english/friendly-person/friendly-person.md +++ b/english/friendly-person/friendly-person.md @@ -1,4 +1,11 @@ As you get closer, you suddenly realize that the person on the path is you! You look different somehow. You look good, happy, peaceful. -You ask yourself a question: \ No newline at end of file +You ask yourself a question: + +Is this me in a parallel world maybe? + +You're about to start talking to them, when you realize you can't actually open +your mouth. It's kind of sealed. "What shall I do to communicate then?", you think: + +[Wave](wave/wave.md) frantically in front of them \ No newline at end of file diff --git a/english/friendly-person/wave/wave.md b/english/friendly-person/wave/wave.md new file mode 100644 index 0000000000..cf5d92474a --- /dev/null +++ b/english/friendly-person/wave/wave.md @@ -0,0 +1,2 @@ +You do wave, but... OMG! They don't seem to be seeing you at all! + From cd350f6f2e130bbe75f42d13606b2a53839e04c7 Mon Sep 17 00:00:00 2001 From: Ali Afshar Date: Sat, 16 Apr 2016 21:27:08 +0100 Subject: [PATCH 3112/5486] Add option to bail on Clara --- english/sonic-screwdriver/sonic-screwdriver.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/sonic-screwdriver/sonic-screwdriver.md b/english/sonic-screwdriver/sonic-screwdriver.md index 9aacb446df..3a186a4268 100644 --- a/english/sonic-screwdriver/sonic-screwdriver.md +++ b/english/sonic-screwdriver/sonic-screwdriver.md @@ -7,3 +7,5 @@ When you open the door back in Londo you realize that you left your trusty sidek Do you: [Go back and find the impossible girl?](../impossible-girl/impossible.md) + +[Go on without her...if the Tardis lets you](../sonic-screwdriver/sonic-screwdriver.md) From b5cec8ec4260e755d96b73ff965e0ad87aab644a Mon Sep 17 00:00:00 2001 From: Mani Date: Sun, 17 Apr 2016 02:25:46 +0530 Subject: [PATCH 3113/5486] added punjabi movies website --- punjabi/movies/movies.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 punjabi/movies/movies.md diff --git a/punjabi/movies/movies.md b/punjabi/movies/movies.md new file mode 100644 index 0000000000..d560104d87 --- /dev/null +++ b/punjabi/movies/movies.md @@ -0,0 +1 @@ +Click [here](https://www.youtube.com/results?search_query=punjabi+movies) to visit Punjabi movies on YouTube. Have fun guys. \ No newline at end of file From 451d562555b2915b1c9af3cba3d1bfaa0d24d9bf Mon Sep 17 00:00:00 2001 From: Mani Date: Sun, 17 Apr 2016 02:33:32 +0530 Subject: [PATCH 3114/5486] added punjabi movies website --- punjabi/movies/movies.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/punjabi/movies/movies.md b/punjabi/movies/movies.md index d560104d87..6a65726f52 100644 --- a/punjabi/movies/movies.md +++ b/punjabi/movies/movies.md @@ -1 +1 @@ -Click [here](https://www.youtube.com/results?search_query=punjabi+movies) to visit Punjabi movies on YouTube. Have fun guys. \ No newline at end of file +Click [here](https://www.youtube.com/results?search_query=punjabi+movies) watch Punjabi movies. \ No newline at end of file From 9f4cc41af50d9e9d0d58f949274b01b0b9d01d31 Mon Sep 17 00:00:00 2001 From: Mani Date: Sun, 17 Apr 2016 02:38:47 +0530 Subject: [PATCH 3115/5486] added punjabi movies website --- punjabi/movies/movies.md | 2 +- punjabi/punjabi.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/punjabi/movies/movies.md b/punjabi/movies/movies.md index 6a65726f52..109b992801 100644 --- a/punjabi/movies/movies.md +++ b/punjabi/movies/movies.md @@ -1 +1 @@ -Click [here](https://www.youtube.com/results?search_query=punjabi+movies) watch Punjabi movies. \ No newline at end of file +Click [here](https://www.youtube.com/results?search_query=punjabi+movies) see Punjabi movies. \ No newline at end of file diff --git a/punjabi/punjabi.md b/punjabi/punjabi.md index b3844b8718..217cd6b032 100644 --- a/punjabi/punjabi.md +++ b/punjabi/punjabi.md @@ -1,3 +1,5 @@ Click [here](ajit/ajitnews.md) for punjabi news -Click [here](pollywood/movies.md) for Punjabi movies \ No newline at end of file +Click [here](pollywood/movies.md) for Punjabi movies + +Click [here](movies/movies.md) for Punjabi movies \ No newline at end of file From 0ed1789117c570dae9b18c55fad9030d6572472a Mon Sep 17 00:00:00 2001 From: ugly muffin Date: Sat, 16 Apr 2016 17:41:36 -0700 Subject: [PATCH 3116/5486] Add how batman interacts with his neighbors --- english/batman/creepy-batman.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 english/batman/creepy-batman.md diff --git a/english/batman/creepy-batman.md b/english/batman/creepy-batman.md new file mode 100644 index 0000000000..e69de29bb2 From 99811a3f974a635aa5cb1cec0677ba869f810e2b Mon Sep 17 00:00:00 2001 From: ugly muffin Date: Sat, 16 Apr 2016 18:09:28 -0700 Subject: [PATCH 3117/5486] Add how batman interacts with his neighbors --- english/batman/creepy-batman.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/batman/creepy-batman.md b/english/batman/creepy-batman.md index e69de29bb2..2c074e46a6 100644 --- a/english/batman/creepy-batman.md +++ b/english/batman/creepy-batman.md @@ -0,0 +1 @@ +He also gets really weird with his [neighbors](http://imgur.com/gallery/Gi9cwgR). \ No newline at end of file From 77fc198a8206f90aa9a34df304c61f7c204259de Mon Sep 17 00:00:00 2001 From: Kinga Date: Sat, 16 Apr 2016 22:44:35 -0500 Subject: [PATCH 3118/5486] New option in kto-tam page --- Polish/przygoda/jedzenie/akap/kto-tam/kto-tam.md | 2 +- Polish/przygoda/jedzenie/akap/kto-tam/obrona/obrona.md | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 Polish/przygoda/jedzenie/akap/kto-tam/obrona/obrona.md diff --git a/Polish/przygoda/jedzenie/akap/kto-tam/kto-tam.md b/Polish/przygoda/jedzenie/akap/kto-tam/kto-tam.md index 0938840806..3935f128f8 100644 --- a/Polish/przygoda/jedzenie/akap/kto-tam/kto-tam.md +++ b/Polish/przygoda/jedzenie/akap/kto-tam/kto-tam.md @@ -3,6 +3,6 @@ Zostajesz zaatakowany przez Kelthuza za to, że masz na sobie czerwoną koszulk Co robisz? -Bronisz się +[Bronisz się](obrona/obrona.md) Umierasz diff --git a/Polish/przygoda/jedzenie/akap/kto-tam/obrona/obrona.md b/Polish/przygoda/jedzenie/akap/kto-tam/obrona/obrona.md new file mode 100644 index 0000000000..a298948c1a --- /dev/null +++ b/Polish/przygoda/jedzenie/akap/kto-tam/obrona/obrona.md @@ -0,0 +1,8 @@ +Czym prędzej biegniesz to swojego biurka i chwytasz za klawiaturę, to Twoja ostatnia nadzieja, +Twoje narzędzie obrony. + +Atakujący postępuje w Twoją stronę, a Ty... co robisz? + +Zmieniasz zdanie i chcesz schować się za biurkiem. + +Atakujesz pierwszy? \ No newline at end of file From b9e19f535b4b0a20cf66deedd4d2507d867b37cc Mon Sep 17 00:00:00 2001 From: Kinga Date: Sat, 16 Apr 2016 22:52:08 -0500 Subject: [PATCH 3119/5486] poprawka kto-tam --- Polish/przygoda/jedzenie/akap/kto-tam/kto-tam.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Polish/przygoda/jedzenie/akap/kto-tam/kto-tam.md b/Polish/przygoda/jedzenie/akap/kto-tam/kto-tam.md index 3935f128f8..d3212f0a96 100644 --- a/Polish/przygoda/jedzenie/akap/kto-tam/kto-tam.md +++ b/Polish/przygoda/jedzenie/akap/kto-tam/kto-tam.md @@ -3,6 +3,8 @@ Zostajesz zaatakowany przez Kelthuza za to, że masz na sobie czerwoną koszulk Co robisz? -[Bronisz się](obrona/obrona.md) +Bronisz się Umierasz + +[Jednak obrona](obrona/obrona.md) From cd8e56ee595b1b5db3b9667e7554602957eaf12e Mon Sep 17 00:00:00 2001 From: chcorbato Date: Sun, 17 Apr 2016 10:50:04 +0200 Subject: [PATCH 3120/5486] completed Jordi Hurtado story --- espanol/jordiHurtado/inmortal/inmortal.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/espanol/jordiHurtado/inmortal/inmortal.md b/espanol/jordiHurtado/inmortal/inmortal.md index 7fb817c18a..ea849e1185 100644 --- a/espanol/jordiHurtado/inmortal/inmortal.md +++ b/espanol/jordiHurtado/inmortal/inmortal.md @@ -1 +1,5 @@ -Y Jordi Hurtado creò una pociòn de inmmortalidad que terminò bebièndose èl. \ No newline at end of file +Y Jordi Hurtado creò una pociòn de inmmortalidad que terminò bebièndose èl. + +Tras dar buena cuenta de todo aquel ejército primero gracias a su inmortalidad, y tras otras múltples gestas y conquistas, Jordi estaba terriblemente aburrido. +¡Qué hacer con tantos siglos y milenios como tenía por delante! +[tuvo una idea brillante que cambiaría la parrilla de programación por toda la eternidad](saberYganar/saberYganar.md) \ No newline at end of file From e259207c77108901e8b5a4b1b68619ed7b99dd42 Mon Sep 17 00:00:00 2001 From: chcorbato Date: Sun, 17 Apr 2016 10:56:34 +0200 Subject: [PATCH 3121/5486] fixed lines too long --- espanol/jordiHurtado/inmortal/inmortal.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/espanol/jordiHurtado/inmortal/inmortal.md b/espanol/jordiHurtado/inmortal/inmortal.md index ea849e1185..dfb17addc5 100644 --- a/espanol/jordiHurtado/inmortal/inmortal.md +++ b/espanol/jordiHurtado/inmortal/inmortal.md @@ -1,5 +1,7 @@ Y Jordi Hurtado creò una pociòn de inmmortalidad que terminò bebièndose èl. -Tras dar buena cuenta de todo aquel ejército primero gracias a su inmortalidad, y tras otras múltples gestas y conquistas, Jordi estaba terriblemente aburrido. +Tras dar buena cuenta de todo aquel ejército primero gracias a su inmortalidad, +y tras otras múltples gestas y conquistas, Jordi estaba terriblemente aburrido. ¡Qué hacer con tantos siglos y milenios como tenía por delante! -[tuvo una idea brillante que cambiaría la parrilla de programación por toda la eternidad](saberYganar/saberYganar.md) \ No newline at end of file +tuvo una idea brillante que cambiaría la parrilla de programación por toda la +[eternidad](saberYganar/saberYganar.md) From c8321694cd193e30dfab8660bd68648bca91e45c Mon Sep 17 00:00:00 2001 From: chcorbato Date: Sun, 17 Apr 2016 11:00:22 +0200 Subject: [PATCH 3122/5486] changed link but unsure there is actually a problem --- espanol/jordiHurtado/inmortal/inmortal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/jordiHurtado/inmortal/inmortal.md b/espanol/jordiHurtado/inmortal/inmortal.md index dfb17addc5..25a4168c3f 100644 --- a/espanol/jordiHurtado/inmortal/inmortal.md +++ b/espanol/jordiHurtado/inmortal/inmortal.md @@ -4,4 +4,4 @@ Tras dar buena cuenta de todo aquel ejército primero gracias a su inmortalidad, y tras otras múltples gestas y conquistas, Jordi estaba terriblemente aburrido. ¡Qué hacer con tantos siglos y milenios como tenía por delante! tuvo una idea brillante que cambiaría la parrilla de programación por toda la -[eternidad](saberYganar/saberYganar.md) +[eternidad.](saberYganar/saberYganar.md) From 483cc7426476a9ad508e7b62173d537e2c8c2ec1 Mon Sep 17 00:00:00 2001 From: chcorbato Date: Sun, 17 Apr 2016 11:04:06 +0200 Subject: [PATCH 3123/5486] fixed link --- espanol/jordiHurtado/inmortal/inmortal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/jordiHurtado/inmortal/inmortal.md b/espanol/jordiHurtado/inmortal/inmortal.md index 25a4168c3f..9b4cf190d6 100644 --- a/espanol/jordiHurtado/inmortal/inmortal.md +++ b/espanol/jordiHurtado/inmortal/inmortal.md @@ -4,4 +4,4 @@ Tras dar buena cuenta de todo aquel ejército primero gracias a su inmortalidad, y tras otras múltples gestas y conquistas, Jordi estaba terriblemente aburrido. ¡Qué hacer con tantos siglos y milenios como tenía por delante! tuvo una idea brillante que cambiaría la parrilla de programación por toda la -[eternidad.](saberYganar/saberYganar.md) +[eternidad.](../saberYganar/saberYganar.md) From 83011390e0e482a0ece4806643388396f079af6e Mon Sep 17 00:00:00 2001 From: Marius Date: Sun, 17 Apr 2016 14:39:39 +0200 Subject: [PATCH 3124/5486] Add hessian storyline --- german/Einladen/Vorstellen/Hessen/aus_Hessen.md | 5 +++++ german/Einladen/Vorstellen/vorstellen.md | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 german/Einladen/Vorstellen/Hessen/aus_Hessen.md diff --git a/german/Einladen/Vorstellen/Hessen/aus_Hessen.md b/german/Einladen/Vorstellen/Hessen/aus_Hessen.md new file mode 100644 index 0000000000..afd11914e7 --- /dev/null +++ b/german/Einladen/Vorstellen/Hessen/aus_Hessen.md @@ -0,0 +1,5 @@ +Sie kommt wohl aus Hessen. + +Das mit der Musik und dem Handkäse kommt Ihnen aber verdächtig vor, +deshalb verabschieden Sie sich lieber von ihr und gehen noch ein Maß Bier trinken. + diff --git a/german/Einladen/Vorstellen/vorstellen.md b/german/Einladen/Vorstellen/vorstellen.md index 1f517448b1..7f281e6f15 100644 --- a/german/Einladen/Vorstellen/vorstellen.md +++ b/german/Einladen/Vorstellen/vorstellen.md @@ -3,6 +3,9 @@ Sie lacht. Sie schlgt vor: +[ppler trinken und Handks mit Musigg essen.](Hessen/aus_Hessen.md) + + [Kuchen essen dann Wodka trinken und dann Bier.](MeckPomm/aus_Meckpomm.md) From 9dfb43061100d283faf69100fa91c34698d31241 Mon Sep 17 00:00:00 2001 From: ugly muffin Date: Sun, 17 Apr 2016 09:14:22 -0700 Subject: [PATCH 3125/5486] Add how batman interacts with his neighbors --- english/batman/creepy-batman | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/batman/creepy-batman diff --git a/english/batman/creepy-batman b/english/batman/creepy-batman new file mode 100644 index 0000000000..2c074e46a6 --- /dev/null +++ b/english/batman/creepy-batman @@ -0,0 +1 @@ +He also gets really weird with his [neighbors](http://imgur.com/gallery/Gi9cwgR). \ No newline at end of file From 527c591303e6d8155e4b8b454163dadce0976e1b Mon Sep 17 00:00:00 2001 From: ugly muffin Date: Sun, 17 Apr 2016 09:16:30 -0700 Subject: [PATCH 3126/5486] Add how batman interacts with his neighbors --- english/batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index 48386a4367..9ad152e51c 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -31,3 +31,5 @@ Uncle Ben: With great power comes great responsibility. The real hero is alfred the butler.. Who is really [Luke Skywalker's](http://fellowshipoftheminds.com/2015/11/23/star-wars-goes-to-illuminati-dark-side/) son! + +He also gets really weird with his [neighbors](http://imgur.com/gallery/Gi9cwgR). \ No newline at end of file From 14c9ddbedc12e64520c18ccacba5f92c26d8a385 Mon Sep 17 00:00:00 2001 From: ugly muffin Date: Sun, 17 Apr 2016 09:26:20 -0700 Subject: [PATCH 3127/5486] Delete extra unnecessary file --- english/batman/creepy-batman.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 english/batman/creepy-batman.md diff --git a/english/batman/creepy-batman.md b/english/batman/creepy-batman.md deleted file mode 100644 index 2c074e46a6..0000000000 --- a/english/batman/creepy-batman.md +++ /dev/null @@ -1 +0,0 @@ -He also gets really weird with his [neighbors](http://imgur.com/gallery/Gi9cwgR). \ No newline at end of file From 8dc84f0ba8e276e6406a807979b66aac89c43fd9 Mon Sep 17 00:00:00 2001 From: ugly muffin Date: Sun, 17 Apr 2016 09:29:28 -0700 Subject: [PATCH 3128/5486] Delete extra file --- english/batman/creepy-batman | 1 - 1 file changed, 1 deletion(-) delete mode 100644 english/batman/creepy-batman diff --git a/english/batman/creepy-batman b/english/batman/creepy-batman deleted file mode 100644 index 2c074e46a6..0000000000 --- a/english/batman/creepy-batman +++ /dev/null @@ -1 +0,0 @@ -He also gets really weird with his [neighbors](http://imgur.com/gallery/Gi9cwgR). \ No newline at end of file From 9e3bb5cb16d7d3c6c51d99fd199ec8d7b6431792 Mon Sep 17 00:00:00 2001 From: ugly muffin Date: Sun, 17 Apr 2016 10:01:51 -0700 Subject: [PATCH 3129/5486] Add Batman to the Raiders game --- english/Raiders/LetsgoRaiders.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/Raiders/LetsgoRaiders.md b/english/Raiders/LetsgoRaiders.md index 26a9c50458..091c12b18c 100644 --- a/english/Raiders/LetsgoRaiders.md +++ b/english/Raiders/LetsgoRaiders.md @@ -1,3 +1,6 @@ Lets go Raiders! -[Here's the link](https://www.google.com) \ No newline at end of file +[Here's the link](https://www.google.com) + +You see Batman at the Raiders game you are attending and you decide +to go ask him some personal questions. [This is what you find](https://github.com/udacity/create-your-own-adventure/blob/master/english/batman/batman.md)! \ No newline at end of file From 1342831b3089f2536e56f7c590f906a2c794f671 Mon Sep 17 00:00:00 2001 From: ugly muffin Date: Sun, 17 Apr 2016 10:18:12 -0700 Subject: [PATCH 3130/5486] Correct syntax error and link --- english/Raiders/LetsgoRaiders.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/Raiders/LetsgoRaiders.md b/english/Raiders/LetsgoRaiders.md index 091c12b18c..69e6908e4b 100644 --- a/english/Raiders/LetsgoRaiders.md +++ b/english/Raiders/LetsgoRaiders.md @@ -3,4 +3,5 @@ Lets go Raiders! [Here's the link](https://www.google.com) You see Batman at the Raiders game you are attending and you decide -to go ask him some personal questions. [This is what you find](https://github.com/udacity/create-your-own-adventure/blob/master/english/batman/batman.md)! \ No newline at end of file +to go ask him some personal questions. [This is what you find]( +/batman/batman.md)! \ No newline at end of file From c6e3afebf7aa0829af7239c2ac1942b94d76ba28 Mon Sep 17 00:00:00 2001 From: ugly muffin Date: Sun, 17 Apr 2016 10:19:43 -0700 Subject: [PATCH 3131/5486] Fix syntax errors and link --- english/Raiders/LetsgoRaiders.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/Raiders/LetsgoRaiders.md b/english/Raiders/LetsgoRaiders.md index 091c12b18c..69e6908e4b 100644 --- a/english/Raiders/LetsgoRaiders.md +++ b/english/Raiders/LetsgoRaiders.md @@ -3,4 +3,5 @@ Lets go Raiders! [Here's the link](https://www.google.com) You see Batman at the Raiders game you are attending and you decide -to go ask him some personal questions. [This is what you find](https://github.com/udacity/create-your-own-adventure/blob/master/english/batman/batman.md)! \ No newline at end of file +to go ask him some personal questions. [This is what you find]( +/batman/batman.md)! \ No newline at end of file From 224599e81ac30b803c18190cd842cb894e58e3f0 Mon Sep 17 00:00:00 2001 From: Josiah Date: Mon, 18 Apr 2016 02:23:47 +0800 Subject: [PATCH 3132/5486] Add option to wake up from nightmare. --- english/shrooms/never-again.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/shrooms/never-again.md b/english/shrooms/never-again.md index aa706b604a..f887772897 100644 --- a/english/shrooms/never-again.md +++ b/english/shrooms/never-again.md @@ -18,3 +18,5 @@ Do you: [Pinch yourself to make sure the man is real?](../pinch/pinch.md) [Pinch the man to make sure your self is real?](../pinch/pinch.md) + +[Wake up from this nigthmare?](../wake-up/wake-up.md) \ No newline at end of file From 8d0bc29ed4e218429a089bf10c951a8193fef92b Mon Sep 17 00:00:00 2001 From: Kaylin Durmick Date: Sun, 17 Apr 2016 13:25:37 -0600 Subject: [PATCH 3133/5486] Add sentence to more_cowbell --- english/more_cowbell/more_cowbell.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/more_cowbell/more_cowbell.md b/english/more_cowbell/more_cowbell.md index da317787d3..0ad437ff9c 100644 --- a/english/more_cowbell/more_cowbell.md +++ b/english/more_cowbell/more_cowbell.md @@ -4,3 +4,5 @@ He has a [pocket watch](https://www.youtube.com/watch?v=YFtHjV4c4uw) in his hand He also hands you a [weapon](https://www.youtube.com/watch?v=wCDIYvFmgW8) +He doesn't care about time or weapons though. He wants to become a new type of man, one that trancends the current [reality](https://www.youtube.com/watch?v=j0MAa37aaQg) and feels time as though it is water and weapons as though they are air. + From 54dd4f91c685c08892fbd513baafc9cc451b8fc4 Mon Sep 17 00:00:00 2001 From: Kaylin Durmick Date: Sun, 17 Apr 2016 13:39:30 -0600 Subject: [PATCH 3134/5486] Remove url and space out line --- english/more_cowbell/more_cowbell.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/more_cowbell/more_cowbell.md b/english/more_cowbell/more_cowbell.md index 0ad437ff9c..07a101d8d7 100644 --- a/english/more_cowbell/more_cowbell.md +++ b/english/more_cowbell/more_cowbell.md @@ -4,5 +4,7 @@ He has a [pocket watch](https://www.youtube.com/watch?v=YFtHjV4c4uw) in his hand He also hands you a [weapon](https://www.youtube.com/watch?v=wCDIYvFmgW8) -He doesn't care about time or weapons though. He wants to become a new type of man, one that trancends the current [reality](https://www.youtube.com/watch?v=j0MAa37aaQg) and feels time as though it is water and weapons as though they are air. +He doesn't care about time or weapons though. + +He wants to become a new type of man, one that trancends the current reality and feels time as though it is water and weapons as though they are air. From b7d4e4b44b8b1d99fbfb23f25275859bc7e701ef Mon Sep 17 00:00:00 2001 From: Kaylin Durmick Date: Sun, 17 Apr 2016 13:45:44 -0600 Subject: [PATCH 3135/5486] Remove blank space --- english/more_cowbell/more_cowbell.md | 1 - 1 file changed, 1 deletion(-) diff --git a/english/more_cowbell/more_cowbell.md b/english/more_cowbell/more_cowbell.md index 07a101d8d7..1e04816a95 100644 --- a/english/more_cowbell/more_cowbell.md +++ b/english/more_cowbell/more_cowbell.md @@ -5,6 +5,5 @@ He has a [pocket watch](https://www.youtube.com/watch?v=YFtHjV4c4uw) in his hand He also hands you a [weapon](https://www.youtube.com/watch?v=wCDIYvFmgW8) He doesn't care about time or weapons though. - He wants to become a new type of man, one that trancends the current reality and feels time as though it is water and weapons as though they are air. From 114b6f5a5529cac4044723f16790570d1cb5d631 Mon Sep 17 00:00:00 2001 From: Kaylin Durmick Date: Sun, 17 Apr 2016 13:48:39 -0600 Subject: [PATCH 3136/5486] Broke up lines --- english/more_cowbell/more_cowbell.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/more_cowbell/more_cowbell.md b/english/more_cowbell/more_cowbell.md index 1e04816a95..54d11dec6a 100644 --- a/english/more_cowbell/more_cowbell.md +++ b/english/more_cowbell/more_cowbell.md @@ -5,5 +5,6 @@ He has a [pocket watch](https://www.youtube.com/watch?v=YFtHjV4c4uw) in his hand He also hands you a [weapon](https://www.youtube.com/watch?v=wCDIYvFmgW8) He doesn't care about time or weapons though. -He wants to become a new type of man, one that trancends the current reality and feels time as though it is water and weapons as though they are air. +He wants to become a man that trancends the current reality. +One that feels time as though it is water and weapons as though they are air. From 2fb1f7fc49b7278eec33ed7e34ea4df9e5cdd9dc Mon Sep 17 00:00:00 2001 From: Alex Carvalho Date: Sun, 17 Apr 2016 21:21:22 +0100 Subject: [PATCH 3137/5486] Adding a sapeca history --- portugues/colaborando.md | 2 ++ portugues/xvideos/xvideos.md | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 portugues/xvideos/xvideos.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index f8e12820f5..92ae493b6e 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -3,6 +3,8 @@ aplicativo, você detecta um bug. Você: +[Caguei, vou ver um video no xvideos](xvideos/xvideos.md) + [Procura o repositório do aplicativo?](colabora/colaborar.md) [Começa a pensar como solucionar o bug e resolve olhar no codigo fonte](pesquisa/codFonte.md) diff --git a/portugues/xvideos/xvideos.md b/portugues/xvideos/xvideos.md new file mode 100644 index 0000000000..423b3a9583 --- /dev/null +++ b/portugues/xvideos/xvideos.md @@ -0,0 +1,6 @@ +O Cartel das operadoras de internet/telofina brasileiras conseguiu colocar em +prática o seu plano maligno de limitar o seu volume tráfego de dados. +Com isto, a sua franquia estourou e você está sem acesso a internet. + +O que você faz? + From 58d89090b3b7804620c63e86352bb4cc92c1e8cf Mon Sep 17 00:00:00 2001 From: kevin Date: Sun, 17 Apr 2016 18:33:45 -0400 Subject: [PATCH 3138/5486] add a new line --- .../\346\221\270\351\207\221\346\240\241\345\260\211.md" | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git "a/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" "b/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" index 295e9d0de7..0b12a6f1b0 100644 --- "a/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" +++ "b/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" @@ -1 +1,2 @@ -500年后化身胡八一，继承了摸金校尉的香火！ \ No newline at end of file +1000年后化身胡八一，继承了摸金校尉的香火！ +寻找那彼岸之花。 \ No newline at end of file From 9ab8465fb85c43c4e1e74bc0666b2c181546d793 Mon Sep 17 00:00:00 2001 From: kevin Date: Sun, 17 Apr 2016 19:18:42 -0400 Subject: [PATCH 3139/5486] reset --- .../\346\221\270\351\207\221\346\240\241\345\260\211.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" "b/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" index 0b12a6f1b0..26ebec4ef8 100644 --- "a/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" +++ "b/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" @@ -1,2 +1,2 @@ -1000年后化身胡八一，继承了摸金校尉的香火！ +500年后化身胡八一，继承了摸金校尉的香火！ 寻找那彼岸之花。 \ No newline at end of file From 59d4834d675b0f502f9d2be78c3aed7386c64d92 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 17 Apr 2016 18:52:24 -0700 Subject: [PATCH 3140/5486] Add sentence and link to art --- english/liquid/liquid.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/liquid/liquid.md b/english/liquid/liquid.md index 2753ea71ee..f8535bf623 100644 --- a/english/liquid/liquid.md +++ b/english/liquid/liquid.md @@ -3,3 +3,5 @@ You can check him out on [Twitch](http://www.twitch.tv/liquidneo) Or not. TO know about vaporization go to [vaporization](../vaporization/vaporization.md) + +Here is where you will learn about [yourself](../art/art.md) From 8caba7f7b6eb310ad7aeba1d7149060a513322dc Mon Sep 17 00:00:00 2001 From: William Date: Sun, 17 Apr 2016 18:53:10 -0700 Subject: [PATCH 3141/5486] Add directory and file --- english/art/art.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/art/art.md diff --git a/english/art/art.md b/english/art/art.md new file mode 100644 index 0000000000..c277944b6d --- /dev/null +++ b/english/art/art.md @@ -0,0 +1 @@ +When it is time, it will be time. From 7990c03d091da3dca56eb5bd1882dcc257a77120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Qu=C3=A4bicker?= Date: Mon, 18 Apr 2016 10:04:19 +0200 Subject: [PATCH 3142/5486] added some more Gibberish --- Gibberish/Gibberish.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Gibberish/Gibberish.md b/Gibberish/Gibberish.md index a249b004e1..84e6b6584a 100644 --- a/Gibberish/Gibberish.md +++ b/Gibberish/Gibberish.md @@ -3,3 +3,9 @@ ksdbcksbdkjc cbskbckjbsdkcj wdc dckjbkbdckjbskjdbckbf ww djlsdbkjbsvdkjbkrjv ekrjberkjdber rekbvekjbre kbe kdjsbvkjsbdvjks dweskbqwobqwdlkasnlsanb + + +kalsjdlfj +aklsdf +ahsldfhasljdfö +alksdjfö From f8122ae6b50eb896815d70c6a8104e587dbbedd0 Mon Sep 17 00:00:00 2001 From: Ensermo Date: Mon, 18 Apr 2016 10:35:58 +0200 Subject: [PATCH 3143/5486] Change in Welkom text. Error with Iphone. It had no battery. --- dutch/welkom.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dutch/welkom.md b/dutch/welkom.md index 826f48dafc..502d1913a9 100644 --- a/dutch/welkom.md +++ b/dutch/welkom.md @@ -14,6 +14,10 @@ U denkt ... of u kijkt even op uw iphone of u een [mailtje heeft](check-mail/mail.md) +... maar de Iphone heeft weer geen batterij want deze gaat snel op. +Dus pak je maar je android die wel drie dagen lang meegaat! + + [Google translate NL](https://translate.google.com/#nl/en/) From 0cb3f9681f287d584b0f72ef5b0b1d95197bfeba Mon Sep 17 00:00:00 2001 From: Zenedar Date: Mon, 18 Apr 2016 21:29:17 +0300 Subject: [PATCH 3144/5486] feat: new stiry part about brevno added to vodka line --- russian/vodka/Brevno/brevno.md | 1 + russian/vodka/vodka.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 russian/vodka/Brevno/brevno.md diff --git a/russian/vodka/Brevno/brevno.md b/russian/vodka/Brevno/brevno.md new file mode 100644 index 0000000000..1c083c4851 --- /dev/null +++ b/russian/vodka/Brevno/brevno.md @@ -0,0 +1 @@ + , . . \ No newline at end of file diff --git a/russian/vodka/vodka.md b/russian/vodka/vodka.md index 6c9e33bc4f..99cf571969 100644 --- a/russian/vodka/vodka.md +++ b/russian/vodka/vodka.md @@ -1,2 +1,4 @@ Живительная влага мягко разливается по измученному организму и невероятным усилием воли получается наконец открыть глаза. +Глаза открыты, в руках топор. +[Я делаю бревно.](Brevno/brevno.md) \ No newline at end of file From a444cb01ae5aaf9100b7a8299617421f7cc02fcb Mon Sep 17 00:00:00 2001 From: ShiftInsert Date: Mon, 18 Apr 2016 22:30:37 +0300 Subject: [PATCH 3145/5486] feat: add zubaka story --- russian/speak_to_neighbor/bobro/bobro.md | 1 + russian/speak_to_neighbor/speak_to_neighbor.md | 5 +++++ russian/speak_to_neighbor/vedro/vedro.md | 1 + 3 files changed, 7 insertions(+) create mode 100644 russian/speak_to_neighbor/bobro/bobro.md create mode 100644 russian/speak_to_neighbor/vedro/vedro.md diff --git a/russian/speak_to_neighbor/bobro/bobro.md b/russian/speak_to_neighbor/bobro/bobro.md new file mode 100644 index 0000000000..fec16a7da5 --- /dev/null +++ b/russian/speak_to_neighbor/bobro/bobro.md @@ -0,0 +1 @@ + ! \ No newline at end of file diff --git a/russian/speak_to_neighbor/speak_to_neighbor.md b/russian/speak_to_neighbor/speak_to_neighbor.md index d0b92fdf96..6f98a4795d 100644 --- a/russian/speak_to_neighbor/speak_to_neighbor.md +++ b/russian/speak_to_neighbor/speak_to_neighbor.md @@ -1,2 +1,7 @@ Я вышел на лестничную площадку и позвонил соседям. Если ни ни кого из соседей на площадке не оказалось дома, то я [поднимусь этажом выше](upstairs/upstairs.md) + +Если же зубака дома, то я вручу ей: +[ведро бобров](vedro/vedro.md) +[бобро ведров](bobro/bobro.md) + diff --git a/russian/speak_to_neighbor/vedro/vedro.md b/russian/speak_to_neighbor/vedro/vedro.md new file mode 100644 index 0000000000..9fecd63d25 --- /dev/null +++ b/russian/speak_to_neighbor/vedro/vedro.md @@ -0,0 +1 @@ + , ! \ No newline at end of file From 439c90d37d68fa7c5575e45dcdde6f70d1074ecd Mon Sep 17 00:00:00 2001 From: ShiftInsert Date: Mon, 18 Apr 2016 22:36:59 +0300 Subject: [PATCH 3146/5486] fix: add a blank line between choices --- russian/speak_to_neighbor/speak_to_neighbor.md | 1 + 1 file changed, 1 insertion(+) diff --git a/russian/speak_to_neighbor/speak_to_neighbor.md b/russian/speak_to_neighbor/speak_to_neighbor.md index 6f98a4795d..5d0338d831 100644 --- a/russian/speak_to_neighbor/speak_to_neighbor.md +++ b/russian/speak_to_neighbor/speak_to_neighbor.md @@ -3,5 +3,6 @@ Если же зубака дома, то я вручу ей: [ведро бобров](vedro/vedro.md) + [бобро ведров](bobro/bobro.md) From 4df725ea3674e04468762d8fb68c91af59b65043 Mon Sep 17 00:00:00 2001 From: joaoaccarvalho Date: Mon, 18 Apr 2016 23:31:53 +0100 Subject: [PATCH 3147/5486] Add 'visitar Portugal link' --- portugues_pt/colaborar.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index f99a9958c9..823e09018d 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -25,3 +25,5 @@ Comprar tudo de [sorvete](sorvete/sorvete.md). Depois de muito sonhar apercebe-de de que (ainda) nâo ganhou o Euromilhões. Lembra-se que deixou a [chaleira a ferver água](chaleira/chaleira.md). + +Para visitar Portugal clica [aqui](https://www.visitportugal.com/pt-pt). \ No newline at end of file From f2b20eaadfbea5259d46d6120ef8b75d16fc49db Mon Sep 17 00:00:00 2001 From: joaoaccarvalho Date: Mon, 18 Apr 2016 23:45:29 +0100 Subject: [PATCH 3148/5486] Add 'O que fazer em Lisboa' --- portugues_pt/colaborar.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index 823e09018d..7057af80dc 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -26,4 +26,6 @@ Depois de muito sonhar apercebe-de de que (ainda) nâo ganhou o Euromilhões. Lembra-se que deixou a [chaleira a ferver água](chaleira/chaleira.md). -Para visitar Portugal clica [aqui](https://www.visitportugal.com/pt-pt). \ No newline at end of file +Para visitar Portugal clica [aqui](https://www.visitportugal.com/pt-pt). + +[O que fazer](http://www.timeout.com/city-guides/things-to-do-in-lisbon/) em Lisboa. \ No newline at end of file From b05123f46e74973a5346dfa3cde82cb29627068e Mon Sep 17 00:00:00 2001 From: Brian Futrell Date: Mon, 18 Apr 2016 22:31:46 -0400 Subject: [PATCH 3149/5486] Update story in the file --- english/bamboo/bamboo-shoots.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/bamboo/bamboo-shoots.md b/english/bamboo/bamboo-shoots.md index 87cd52ed5f..f79a0e501c 100644 --- a/english/bamboo/bamboo-shoots.md +++ b/english/bamboo/bamboo-shoots.md @@ -1,3 +1,6 @@ at the top of the bamboo trees you meet a whole panda family, they are friendly. they show you a path ahead out of the forest, which you take. As you venture deep into the forest -you start to realize these pandas may not be as friendly as you thought. \ No newline at end of file +you start to realize these pandas may not be as friendly as you thought. + +You turn around and the pandas all have evil grins. They climb down from the +bamboo and walk towards you. From a1a3a582d672dd72af0cb3e19b2437cde629dd84 Mon Sep 17 00:00:00 2001 From: J Date: Tue, 19 Apr 2016 06:51:24 -0400 Subject: [PATCH 3150/5486] Add minecraft option --- english/bird-salvation/bird.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/bird-salvation/bird.md b/english/bird-salvation/bird.md index 5e71b06cc1..66f404aaec 100644 --- a/english/bird-salvation/bird.md +++ b/english/bird-salvation/bird.md @@ -10,3 +10,7 @@ what appears to be a horse with a horn sprouting from its forehead... You really have only one option [Go ask Alice](../ask-to-alice/ask-to-alice.md) I think she'll know ... + +The pressing question is whether Alice can help in time to avoid nightfall and the inevitable zombies that sprout from dark corners. + +[Gather wood now to increase your chances of surviving the night.](../you-are-in-minecraft/gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md) From 316b28e1b48b7a1f0e043b79f37d51c223c70b65 Mon Sep 17 00:00:00 2001 From: J Date: Tue, 19 Apr 2016 07:00:15 -0400 Subject: [PATCH 3151/5486] Shortening lines to 120 char or less --- english/bird-salvation/bird.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/bird-salvation/bird.md b/english/bird-salvation/bird.md index 66f404aaec..92ae8ccc0d 100644 --- a/english/bird-salvation/bird.md +++ b/english/bird-salvation/bird.md @@ -11,6 +11,6 @@ You really have only one option [Go ask Alice](../ask-to-alice/ask-to-alice.md) I think she'll know ... -The pressing question is whether Alice can help in time to avoid nightfall and the inevitable zombies that sprout from dark corners. - -[Gather wood now to increase your chances of surviving the night.](../you-are-in-minecraft/gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md) +The pressing question is whether Alice can help in time to avoid nightfall +and the inevitable zombies that sprout from dark corners. +[Gather wood](../you-are-in-minecraft/gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md) From 14939f4e3235a7b3f70bf17cd4f56f65d6bf632b Mon Sep 17 00:00:00 2001 From: ERIC CHURCHILL Date: Tue, 19 Apr 2016 14:58:05 -0400 Subject: [PATCH 3152/5486] Change language of call-a-random-number file option --- english/call-a-random-number/answer.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/call-a-random-number/answer.md b/english/call-a-random-number/answer.md index 37b78657d9..6e6db6ec27 100644 --- a/english/call-a-random-number/answer.md +++ b/english/call-a-random-number/answer.md @@ -1,6 +1,10 @@ +Using your computer's pseudorandom number generator, you produce a stranger's phone number. + +Not completely sure why, you dial the number. + A seductive voice answers your call. -You +You: [Hang up](hang-up/regret.md) From 1ae01669d2f53d9b41f31d51bb153fed30297e34 Mon Sep 17 00:00:00 2001 From: ERIC CHURCHILL Date: Tue, 19 Apr 2016 15:06:03 -0400 Subject: [PATCH 3153/5486] Erase colon on line seven, after 'you' --- english/call-a-random-number/answer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/call-a-random-number/answer.md b/english/call-a-random-number/answer.md index 6e6db6ec27..742213909d 100644 --- a/english/call-a-random-number/answer.md +++ b/english/call-a-random-number/answer.md @@ -4,7 +4,7 @@ Not completely sure why, you dial the number. A seductive voice answers your call. -You: +You [Hang up](hang-up/regret.md) From ea1e888fef1c27f93409714aa2bcf300bf4a2086 Mon Sep 17 00:00:00 2001 From: Mamie Wang Date: Tue, 19 Apr 2016 16:58:31 -0500 Subject: [PATCH 3154/5486] Add adventure for elves and shoemaker --- english/elves-and-shoemaker/elves-and-shoemaker.md | 7 +++++++ english/marshmallow.md | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 english/elves-and-shoemaker/elves-and-shoemaker.md diff --git a/english/elves-and-shoemaker/elves-and-shoemaker.md b/english/elves-and-shoemaker/elves-and-shoemaker.md new file mode 100644 index 0000000000..b09192d6de --- /dev/null +++ b/english/elves-and-shoemaker/elves-and-shoemaker.md @@ -0,0 +1,7 @@ +There was once a shoemaker, who worked very hard and was honest, but still he could not earn enough to live upon. At last all he had in the world was gone, save just leather enough to make one pair of shoes. + +He cuts out the pieces of leather before going to bed, so that he can sew them into a pair of shoes. Elves come in the night and make the pair of shoes which he sells for more than his asking price the next day. + +Now he has just enough money to buy leather for two pair of shoes. He cuts the leather for two pairs and retires for the night. The elves come again and make two pairs of shoes. He gives away one pair to a needy person and sells the other pair to a referral from the first customer. + +He buys leather for three and stays up to find the elves making the shoes. The shoemaker and wife make clothes for the elves the next day, but the elves are freed when given clothers, so they leave, and the shoemaker and his wife never see them again. diff --git a/english/marshmallow.md b/english/marshmallow.md index f5705a3962..af8e51163d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -833,6 +833,8 @@ You look up and out to the ocean. In the distance you see a [mermaid](mermaid/me The mermaid above died, but [don't worry...](mermaid2/mermaid.md) +A fairy tale about [a shoemaker and elves](elves-and-shoemaker/elves-and-shoemaker.md) + The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) The understanding of git [go here](Booyah/booyah.md) @@ -919,4 +921,4 @@ Toasted [marshmallow](toasted/smores_pie.md) While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. [The new record is!](new_warriors_record/new_warriors_record.md) -Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). \ No newline at end of file +Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). From 79592519c653c9f2d9eb869b2cc6035e79f092bb Mon Sep 17 00:00:00 2001 From: Mamie Wang Date: Tue, 19 Apr 2016 19:00:56 -0500 Subject: [PATCH 3155/5486] fix: Fulfill the line length constraint --- english/elves-and-shoemaker/elves-and-shoemaker.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/english/elves-and-shoemaker/elves-and-shoemaker.md b/english/elves-and-shoemaker/elves-and-shoemaker.md index b09192d6de..a40757affe 100644 --- a/english/elves-and-shoemaker/elves-and-shoemaker.md +++ b/english/elves-and-shoemaker/elves-and-shoemaker.md @@ -1,7 +1,5 @@ -There was once a shoemaker, who worked very hard and was honest, but still he could not earn enough to live upon. At last all he had in the world was gone, save just leather enough to make one pair of shoes. +There was once a shoemaker, who worked very hard and was honest. +But still he could not earn enough to live upon. At last all he +had in the world was gone, save just leather enough to make one +pair of shoes... -He cuts out the pieces of leather before going to bed, so that he can sew them into a pair of shoes. Elves come in the night and make the pair of shoes which he sells for more than his asking price the next day. - -Now he has just enough money to buy leather for two pair of shoes. He cuts the leather for two pairs and retires for the night. The elves come again and make two pairs of shoes. He gives away one pair to a needy person and sells the other pair to a referral from the first customer. - -He buys leather for three and stays up to find the elves making the shoes. The shoemaker and wife make clothes for the elves the next day, but the elves are freed when given clothers, so they leave, and the shoemaker and his wife never see them again. From 324bb5c9fa40413a93ef577f8bf149d27093e881 Mon Sep 17 00:00:00 2001 From: William Sehorn Date: Tue, 19 Apr 2016 19:56:46 -0500 Subject: [PATCH 3156/5486] feat: add the option to attempt communication with the friendly person via telepathy --- english/friendly-person/friendly-person.md | 4 +++- english/friendly-person/telepathy/telepathy.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/friendly-person/telepathy/telepathy.md diff --git a/english/friendly-person/friendly-person.md b/english/friendly-person/friendly-person.md index 2cec58bb37..05664cd136 100644 --- a/english/friendly-person/friendly-person.md +++ b/english/friendly-person/friendly-person.md @@ -8,4 +8,6 @@ Is this me in a parallel world maybe? You're about to start talking to them, when you realize you can't actually open your mouth. It's kind of sealed. "What shall I do to communicate then?", you think: -[Wave](wave/wave.md) frantically in front of them \ No newline at end of file +[Wave](wave/wave.md) frantically in front of them. + +Or [attempt to communicate via telepathy](telepathy/telepathy.md). \ No newline at end of file diff --git a/english/friendly-person/telepathy/telepathy.md b/english/friendly-person/telepathy/telepathy.md new file mode 100644 index 0000000000..65c08c9cab --- /dev/null +++ b/english/friendly-person/telepathy/telepathy.md @@ -0,0 +1 @@ +You close your eyes and begin to concentrate. \ No newline at end of file From c75e322e0a26f1f62a24ea8da88651aa99ea9567 Mon Sep 17 00:00:00 2001 From: "J.T. Earl" Date: Tue, 19 Apr 2016 22:46:19 -0400 Subject: [PATCH 3157/5486] Added option to throw a rock at the person --- english/friendly-person/wave/wave.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/friendly-person/wave/wave.md b/english/friendly-person/wave/wave.md index cf5d92474a..28ba0878c4 100644 --- a/english/friendly-person/wave/wave.md +++ b/english/friendly-person/wave/wave.md @@ -1,2 +1,3 @@ You do wave, but... OMG! They don't seem to be seeing you at all! +[Throw a rock](throw-rock/throw-rock.md) to get their attention? \ No newline at end of file From 501557dea6bd099b8acf7fa3b3e144514ced7005 Mon Sep 17 00:00:00 2001 From: "J.T. Earl" Date: Tue, 19 Apr 2016 22:48:29 -0400 Subject: [PATCH 3158/5486] Added ending to throwing a rock --- english/friendly-person/wave/throw-rock/throw-rock.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/friendly-person/wave/throw-rock/throw-rock.md diff --git a/english/friendly-person/wave/throw-rock/throw-rock.md b/english/friendly-person/wave/throw-rock/throw-rock.md new file mode 100644 index 0000000000..d2f396190a --- /dev/null +++ b/english/friendly-person/wave/throw-rock/throw-rock.md @@ -0,0 +1 @@ +Thr rock passes right through the person. Are you a ghost or are they? \ No newline at end of file From ccec388760780563470d932c2d3f40202db33501 Mon Sep 17 00:00:00 2001 From: "J.T. Earl" Date: Tue, 19 Apr 2016 22:53:34 -0400 Subject: [PATCH 3159/5486] Fixed typo from thr to the --- english/friendly-person/wave/throw-rock/throw-rock.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/friendly-person/wave/throw-rock/throw-rock.md b/english/friendly-person/wave/throw-rock/throw-rock.md index d2f396190a..1cc0c60cdb 100644 --- a/english/friendly-person/wave/throw-rock/throw-rock.md +++ b/english/friendly-person/wave/throw-rock/throw-rock.md @@ -1 +1 @@ -Thr rock passes right through the person. Are you a ghost or are they? \ No newline at end of file +The rock passes right through the person. Are you a ghost or are they? \ No newline at end of file From 38a0065f8f4cee6c116a20dabb65608cb2d587b3 Mon Sep 17 00:00:00 2001 From: rong huang Date: Wed, 20 Apr 2016 11:49:46 +0800 Subject: [PATCH 3160/5486] add adventure of huluwa --- Chinese/oner0128/newstory/newstory.md | 1 + Chinese/oner0128/story.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Chinese/oner0128/newstory/newstory.md create mode 100644 Chinese/oner0128/story.md diff --git a/Chinese/oner0128/newstory/newstory.md b/Chinese/oner0128/newstory/newstory.md new file mode 100644 index 0000000000..dcfcc2318e --- /dev/null +++ b/Chinese/oner0128/newstory/newstory.md @@ -0,0 +1 @@ +然后没了，谢谢 - - \ No newline at end of file diff --git a/Chinese/oner0128/story.md b/Chinese/oner0128/story.md new file mode 100644 index 0000000000..773a472cb5 --- /dev/null +++ b/Chinese/oner0128/story.md @@ -0,0 +1,2 @@ +500年后孙悟空变成了葫芦娃的水娃，哈，然后 +他突然[干什么呢？](./newstory/newstory.md) \ No newline at end of file From 5cc9ba80b9277f9272f0653d9558dd5f05d5fd9d Mon Sep 17 00:00:00 2001 From: rong huang Date: Wed, 20 Apr 2016 11:52:31 +0800 Subject: [PATCH 3161/5486] =?UTF-8?q?add=20huluwa=20into=20=E5=A4=A7?= =?UTF-8?q?=E8=AF=9D=E8=A5=BF=E6=B8=B8.MD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 1 + 1 file changed, 1 insertion(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index d4913d8001..2f64b72a97 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -1,6 +1,7 @@ 在1994年大话西游之月光宝盒的电影中，主角周星驰饰演的孙悟空在500年后转世成为： 前端攻城狮一枚。这枚攻城狮做出了很多网页，比如： +[葫芦娃](oner0128/story.md) [PanicStation](PanicStation/panic.md) From a84b863b0528512405f7183b223818d042febdef Mon Sep 17 00:00:00 2001 From: rong huang Date: Wed, 20 Apr 2016 11:56:23 +0800 Subject: [PATCH 3162/5486] =?UTF-8?q?fix=20bug=20in=20=E5=A4=A7=E8=AF=9D?= =?UTF-8?q?=E8=A5=BF=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/oner0128/newstory/newstory.md | 2 +- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Chinese/oner0128/newstory/newstory.md b/Chinese/oner0128/newstory/newstory.md index dcfcc2318e..a28a6596ce 100644 --- a/Chinese/oner0128/newstory/newstory.md +++ b/Chinese/oner0128/newstory/newstory.md @@ -1 +1 @@ -然后没了，谢谢 - - \ No newline at end of file +然后没了，谢谢 - - Click [here](http://www.google.com) to visit Google \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 2f64b72a97..efc68b7d48 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -1,6 +1,7 @@ 在1994年大话西游之月光宝盒的电影中，主角周星驰饰演的孙悟空在500年后转世成为： 前端攻城狮一枚。这枚攻城狮做出了很多网页，比如： + [葫芦娃](oner0128/story.md) [PanicStation](PanicStation/panic.md) From 89f99d59319b62cf57a7fbad8c45e1444c2d7b4d Mon Sep 17 00:00:00 2001 From: icdlct Date: Wed, 20 Apr 2016 17:06:29 +0800 Subject: [PATCH 3163/5486] Add LP story --- english/wake-up/vigilante/getup/getup.md | 7 +++++++ english/wake-up/vigilante/vigilante.md | 19 +++++++++++++++++++ english/wake-up/wake-up.md | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 english/wake-up/vigilante/getup/getup.md create mode 100644 english/wake-up/vigilante/vigilante.md diff --git a/english/wake-up/vigilante/getup/getup.md b/english/wake-up/vigilante/getup/getup.md new file mode 100644 index 0000000000..b98859ad73 --- /dev/null +++ b/english/wake-up/vigilante/getup/getup.md @@ -0,0 +1,7 @@ +The handcuff is nothing to someone with your skill, you quickly uncuff yourself and sit up. + +You found your costumes are intact, the only thing missing is your weapons. But that is to be expected. + +You quickly get on your feet, but then a sereve dizziness hit you. The drug is stronger than you expected. + +Your world [turn complete dark](../vigilante.md) again. diff --git a/english/wake-up/vigilante/vigilante.md b/english/wake-up/vigilante/vigilante.md new file mode 100644 index 0000000000..9d51447c17 --- /dev/null +++ b/english/wake-up/vigilante/vigilante.md @@ -0,0 +1,19 @@ +You slowly open your eyes and found yourself in a dimly lit room, lying on an uncomfortable bed. + +You found your right hand is cuffed to the side of the bed. + +You also found yourself feeling quite dizzy, you captor must have drugged you after he knocked you out. + +Looking for clues, you were investigating a warehouse. + +That huge guy came out of no where and start attcking you. + +Being the more skillful fighter, you hit him twice and then kicked him in the face. + +But that seems to have little effect on him, he counter with a back-hand swing, and hit you on the side of your head. + +The next thing you remember is the strange dream of marshmallow and deserted island. + +[Lie down](wait/wait.md) again and wait for the effect of the drug to fade... + +Uncuff yourself and [get up](getup/getup.md) now... diff --git a/english/wake-up/wake-up.md b/english/wake-up/wake-up.md index af774f7da1..bc941766f8 100644 --- a/english/wake-up/wake-up.md +++ b/english/wake-up/wake-up.md @@ -19,3 +19,5 @@ to dawn on you that you really are still having a dream. ....... [Not quite.](wake-up-again/wake-up-again.md) [Stay in the dream and explore the island](dessert-island/explore-island.md) + +[Remember who you really are and wake up](vigilante/vigilante.md) From 2f65155f5aae0d794e5284a4fb39bf3c2e1d49f2 Mon Sep 17 00:00:00 2001 From: icdlct Date: Wed, 20 Apr 2016 17:18:25 +0800 Subject: [PATCH 3164/5486] Fix broken link --- english/wake-up/vigilante/wait/wait.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/wake-up/vigilante/wait/wait.md diff --git a/english/wake-up/vigilante/wait/wait.md b/english/wake-up/vigilante/wait/wait.md new file mode 100644 index 0000000000..684e27f7d7 --- /dev/null +++ b/english/wake-up/vigilante/wait/wait.md @@ -0,0 +1 @@ +Coming soon... From d47a5a635d739170d0769ff91e2c85fef927b800 Mon Sep 17 00:00:00 2001 From: Hugo Morales Arjon Date: Wed, 20 Apr 2016 13:35:17 -0500 Subject: [PATCH 3165/5486] =?UTF-8?q?Agrega=20la=20continuaci=C3=B3n=20're?= =?UTF-8?q?alidad'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/canudos.md | 2 ++ espanol/realidad/realidad.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 espanol/realidad/realidad.md diff --git a/espanol/canudos.md b/espanol/canudos.md index f74e20bf35..84d769bb82 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -139,3 +139,5 @@ se atrevio a lo que nadie se [imaginó:](Mutantes/Mutantes.md) Y llego spiderman a salvar el dia. Con sus acrobáticos movimientos y osadas frases + +Spiderman al no entender que era lo que [pasaba] (realidad/realidad.md) \ No newline at end of file diff --git a/espanol/realidad/realidad.md b/espanol/realidad/realidad.md new file mode 100644 index 0000000000..baddc9d279 --- /dev/null +++ b/espanol/realidad/realidad.md @@ -0,0 +1,2 @@ +Y al darse cuenta que su aparición no era mas que el capricho de un pobre +joven solitario decidió abandonar escena y continuar su camino. \ No newline at end of file From fda35a64c66bbe66d30806c316a1fd736b5d04ac Mon Sep 17 00:00:00 2001 From: Evan Simon Ross Date: Wed, 20 Apr 2016 15:13:22 -0400 Subject: [PATCH 3166/5486] Add a new haiku to /english/write-a-hiku/hiku.md --- english/write-a-hiku/hiku.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/write-a-hiku/hiku.md b/english/write-a-hiku/hiku.md index ad6ea0ae39..095cb78259 100644 --- a/english/write-a-hiku/hiku.md +++ b/english/write-a-hiku/hiku.md @@ -1,3 +1,7 @@ Git, so wonderful Its beautiful branch structure -five, seven, five, yay! \ No newline at end of file +five, seven, five, yay! + +What is a hiku? +In Japanese, it means "pull." +Like a pull request? \ No newline at end of file From 8f4fe16c5914cf769c7912b60cbae784a6c06dcc Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Wed, 20 Apr 2016 23:20:31 -0400 Subject: [PATCH 3167/5486] Add door path --- english/pinch/jacket/eatit/door/door.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/pinch/jacket/eatit/door/door.md diff --git a/english/pinch/jacket/eatit/door/door.md b/english/pinch/jacket/eatit/door/door.md new file mode 100644 index 0000000000..c0dd743198 --- /dev/null +++ b/english/pinch/jacket/eatit/door/door.md @@ -0,0 +1,6 @@ +You walk up to the first door, across from the hole in the wall you dove through and look at the sign. It reads: + +------------------ +Tobias Fünke, M.D. + ANALRAPIST +------------------ From 3a220e21bd58e67e4c3e8c47a6c2ba87d7032c8d Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Wed, 20 Apr 2016 23:21:01 -0400 Subject: [PATCH 3168/5486] Add hallway path --- english/pinch/jacket/eatit/hallway/hallway.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/pinch/jacket/eatit/hallway/hallway.md diff --git a/english/pinch/jacket/eatit/hallway/hallway.md b/english/pinch/jacket/eatit/hallway/hallway.md new file mode 100644 index 0000000000..cdec06cbe6 --- /dev/null +++ b/english/pinch/jacket/eatit/hallway/hallway.md @@ -0,0 +1 @@ +You begin walking down the hallway. The floor boards creak with every other step you take. You come across an open doorway, and inside it looks like a laboratory of some kind. There are many computers and strange machines humming away in the room. From db1b9dfde6d8cc8fcc6ce38bc2f025e07720cb96 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Wed, 20 Apr 2016 23:21:18 -0400 Subject: [PATCH 3169/5486] Add painting path --- english/pinch/jacket/eatit/painting/painting.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/pinch/jacket/eatit/painting/painting.md diff --git a/english/pinch/jacket/eatit/painting/painting.md b/english/pinch/jacket/eatit/painting/painting.md new file mode 100644 index 0000000000..4d67fdfaae --- /dev/null +++ b/english/pinch/jacket/eatit/painting/painting.md @@ -0,0 +1 @@ +Casting your gaze down the hallway, and one painting catches your interest. You walk up to the large painting, so big you could almost jump into it. It is of three strange looking black orbs with eyes, feet, and a strange hats. They are all marching single file in line on a nice sunny day with a few clouds in the background. From 679969e939cd2d9a6c3ac4fe0254ae42f237737c Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Wed, 20 Apr 2016 23:21:34 -0400 Subject: [PATCH 3170/5486] Add rug option --- english/pinch/jacket/eatit/rug/rug.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/pinch/jacket/eatit/rug/rug.md diff --git a/english/pinch/jacket/eatit/rug/rug.md b/english/pinch/jacket/eatit/rug/rug.md new file mode 100644 index 0000000000..7ef52e1f30 --- /dev/null +++ b/english/pinch/jacket/eatit/rug/rug.md @@ -0,0 +1,5 @@ +You bend over and pick up the the soft, but ragged red rug. As you lift it you notice a golden handle on the floor underneath. After further messing up the rug by pushing it aside some more, a hidden trap door is revealed and connected to the handle. Just as your fingers take hold of the cold gold metal handle, you hear voices coming from far down the hallway. + +The first voice had a moderate, smooth pitch, but was clearly irritated and berated to the other, "Listen man, all I wanna do is play some b-ball, but y'all hadda roll up and started making trouble in my neighborhood!" + +You, scared and confused, make the split second decision to open the trap door and climb down into the darkness, for fear of being noticed by the approaching voices. From a9d1c09572399f008b5724fe38a903d273e86029 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Wed, 20 Apr 2016 23:22:18 -0400 Subject: [PATCH 3171/5486] Add options to eatit path --- english/pinch/jacket/eatit/eatit.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/english/pinch/jacket/eatit/eatit.md b/english/pinch/jacket/eatit/eatit.md index 9f857dae38..d87b9982d7 100644 --- a/english/pinch/jacket/eatit/eatit.md +++ b/english/pinch/jacket/eatit/eatit.md @@ -1 +1,15 @@ You eat a hole through the Marshmallow wall. Looking through the hole you see a hallway. + +With a running start, you do a flip into a commando dive through the hole you just ate out. + +After brushing the dust off your uncomfortable jacket you look around. Your commando dive caused a red hallway rug to get kinda messed up and pushed aside. The hallway before you is long and dimly lit, but in a warm and romantic way. The walls and floors are made of old dark oak wood, and a vague old smokey smell fills your lungs. Lining the walls down the hallway are an alternating cascade of doors and beautiful oil paintings. + +What do you do? + +[Inspect the closest door](door/door.md) + +[Fix the rug](rug/rug.md) + +[Walk down the hallway](hallway/hallway.md) + +[Look at a painting](painting/painting.md) From 203c7a6228b0bb93f038afe2ee2b0d4fd4e8bac5 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Wed, 20 Apr 2016 23:34:24 -0400 Subject: [PATCH 3172/5486] Fix new directories structure --- english/door/door.md | 6 ++++++ english/hallway/hallway.md | 1 + english/painting/painting.md | 1 + english/pinch/jacket/eatit/eatit.md | 8 ++++---- english/rug/rug.md | 5 +++++ 5 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 english/door/door.md create mode 100644 english/hallway/hallway.md create mode 100644 english/painting/painting.md create mode 100644 english/rug/rug.md diff --git a/english/door/door.md b/english/door/door.md new file mode 100644 index 0000000000..c0dd743198 --- /dev/null +++ b/english/door/door.md @@ -0,0 +1,6 @@ +You walk up to the first door, across from the hole in the wall you dove through and look at the sign. It reads: + +------------------ +Tobias Fünke, M.D. + ANALRAPIST +------------------ diff --git a/english/hallway/hallway.md b/english/hallway/hallway.md new file mode 100644 index 0000000000..cdec06cbe6 --- /dev/null +++ b/english/hallway/hallway.md @@ -0,0 +1 @@ +You begin walking down the hallway. The floor boards creak with every other step you take. You come across an open doorway, and inside it looks like a laboratory of some kind. There are many computers and strange machines humming away in the room. diff --git a/english/painting/painting.md b/english/painting/painting.md new file mode 100644 index 0000000000..4d67fdfaae --- /dev/null +++ b/english/painting/painting.md @@ -0,0 +1 @@ +Casting your gaze down the hallway, and one painting catches your interest. You walk up to the large painting, so big you could almost jump into it. It is of three strange looking black orbs with eyes, feet, and a strange hats. They are all marching single file in line on a nice sunny day with a few clouds in the background. diff --git a/english/pinch/jacket/eatit/eatit.md b/english/pinch/jacket/eatit/eatit.md index d87b9982d7..860dfcbe54 100644 --- a/english/pinch/jacket/eatit/eatit.md +++ b/english/pinch/jacket/eatit/eatit.md @@ -6,10 +6,10 @@ After brushing the dust off your uncomfortable jacket you look around. Your comm What do you do? -[Inspect the closest door](door/door.md) +[Inspect the closest door](../../../door/door.md) -[Fix the rug](rug/rug.md) +[Fix the rug](../../../rug/rug.md) -[Walk down the hallway](hallway/hallway.md) +[Walk down the hallway](../../../hallway/hallway.md) -[Look at a painting](painting/painting.md) +[Look at a painting](../../../painting/painting.md) diff --git a/english/rug/rug.md b/english/rug/rug.md new file mode 100644 index 0000000000..7ef52e1f30 --- /dev/null +++ b/english/rug/rug.md @@ -0,0 +1,5 @@ +You bend over and pick up the the soft, but ragged red rug. As you lift it you notice a golden handle on the floor underneath. After further messing up the rug by pushing it aside some more, a hidden trap door is revealed and connected to the handle. Just as your fingers take hold of the cold gold metal handle, you hear voices coming from far down the hallway. + +The first voice had a moderate, smooth pitch, but was clearly irritated and berated to the other, "Listen man, all I wanna do is play some b-ball, but y'all hadda roll up and started making trouble in my neighborhood!" + +You, scared and confused, make the split second decision to open the trap door and climb down into the darkness, for fear of being noticed by the approaching voices. From d491fcb6481baf0003dbc2c5e08bd365b999287f Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Wed, 20 Apr 2016 23:43:29 -0400 Subject: [PATCH 3173/5486] Remove outdated files --- english/pinch/jacket/eatit/door/door.md | 6 ------ english/pinch/jacket/eatit/hallway/hallway.md | 1 - english/pinch/jacket/eatit/painting/painting.md | 1 - english/pinch/jacket/eatit/rug/rug.md | 5 ----- 4 files changed, 13 deletions(-) delete mode 100644 english/pinch/jacket/eatit/door/door.md delete mode 100644 english/pinch/jacket/eatit/hallway/hallway.md delete mode 100644 english/pinch/jacket/eatit/painting/painting.md delete mode 100644 english/pinch/jacket/eatit/rug/rug.md diff --git a/english/pinch/jacket/eatit/door/door.md b/english/pinch/jacket/eatit/door/door.md deleted file mode 100644 index c0dd743198..0000000000 --- a/english/pinch/jacket/eatit/door/door.md +++ /dev/null @@ -1,6 +0,0 @@ -You walk up to the first door, across from the hole in the wall you dove through and look at the sign. It reads: - ------------------- -Tobias Fünke, M.D. - ANALRAPIST ------------------- diff --git a/english/pinch/jacket/eatit/hallway/hallway.md b/english/pinch/jacket/eatit/hallway/hallway.md deleted file mode 100644 index cdec06cbe6..0000000000 --- a/english/pinch/jacket/eatit/hallway/hallway.md +++ /dev/null @@ -1 +0,0 @@ -You begin walking down the hallway. The floor boards creak with every other step you take. You come across an open doorway, and inside it looks like a laboratory of some kind. There are many computers and strange machines humming away in the room. diff --git a/english/pinch/jacket/eatit/painting/painting.md b/english/pinch/jacket/eatit/painting/painting.md deleted file mode 100644 index 4d67fdfaae..0000000000 --- a/english/pinch/jacket/eatit/painting/painting.md +++ /dev/null @@ -1 +0,0 @@ -Casting your gaze down the hallway, and one painting catches your interest. You walk up to the large painting, so big you could almost jump into it. It is of three strange looking black orbs with eyes, feet, and a strange hats. They are all marching single file in line on a nice sunny day with a few clouds in the background. diff --git a/english/pinch/jacket/eatit/rug/rug.md b/english/pinch/jacket/eatit/rug/rug.md deleted file mode 100644 index 7ef52e1f30..0000000000 --- a/english/pinch/jacket/eatit/rug/rug.md +++ /dev/null @@ -1,5 +0,0 @@ -You bend over and pick up the the soft, but ragged red rug. As you lift it you notice a golden handle on the floor underneath. After further messing up the rug by pushing it aside some more, a hidden trap door is revealed and connected to the handle. Just as your fingers take hold of the cold gold metal handle, you hear voices coming from far down the hallway. - -The first voice had a moderate, smooth pitch, but was clearly irritated and berated to the other, "Listen man, all I wanna do is play some b-ball, but y'all hadda roll up and started making trouble in my neighborhood!" - -You, scared and confused, make the split second decision to open the trap door and climb down into the darkness, for fear of being noticed by the approaching voices. From f01cd957f5fec727561352de6b3007e13971a08e Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Wed, 20 Apr 2016 23:47:48 -0400 Subject: [PATCH 3174/5486] Fix typos --- english/pinch/jacket/jacket.md | 5 ++--- english/pinch/pinch.md | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/english/pinch/jacket/jacket.md b/english/pinch/jacket/jacket.md index f1366a1553..f87139d58f 100644 --- a/english/pinch/jacket/jacket.md +++ b/english/pinch/jacket/jacket.md @@ -8,8 +8,8 @@ zzzzzz zzzzzz -You wake to the sound of a distant loud noise. Your still in the -marshmallow room, and your still in the uncomfortable jacket. +You wake to the sound of a distant loud noise. You're still in the +marshmallow room, and you're still in the uncomfortable jacket. Do you: @@ -18,4 +18,3 @@ Do you: [Eat your way out of the room?](eatit/eatit.md) [Use your mad magician skills to get out of the jacket?](magicianskills/magicianskills.md) - diff --git a/english/pinch/pinch.md b/english/pinch/pinch.md index 8e62a6bcbb..66144a29f5 100644 --- a/english/pinch/pinch.md +++ b/english/pinch/pinch.md @@ -8,10 +8,10 @@ The damn jacket itches like unprocessed wool soaking wet with boric acid. Do you: -[Try taking out your jacket?](jacket/jacket.md) +[Try taking off your jacket?](jacket/jacket.md) [Shout for help?](help/help.md) -[Go outside of the marshmallow room](go-out/go-out.md) +[Go outside of the marshmallow room?](go-out/go-out.md) [Think about Harry Potter and the amazing world of magic?](magic/harry-potter.md) From 4cfa395ad5257e2b6c0fc29a9dccb94191d4c0a8 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Wed, 20 Apr 2016 23:54:11 -0400 Subject: [PATCH 3175/5486] Fix accidental markdown use --- english/door/door.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/door/door.md b/english/door/door.md index c0dd743198..18b9537df6 100644 --- a/english/door/door.md +++ b/english/door/door.md @@ -1,6 +1,4 @@ You walk up to the first door, across from the hole in the wall you dove through and look at the sign. It reads: ------------------- Tobias Fünke, M.D. - ANALRAPIST ------------------- + ANALRAPIST From 396397620f5de03ff108f47e874e26f892844ef3 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Wed, 20 Apr 2016 23:56:48 -0400 Subject: [PATCH 3176/5486] Fix wording in painting.md --- english/painting/painting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/painting/painting.md b/english/painting/painting.md index 4d67fdfaae..7728d1b34c 100644 --- a/english/painting/painting.md +++ b/english/painting/painting.md @@ -1 +1 @@ -Casting your gaze down the hallway, and one painting catches your interest. You walk up to the large painting, so big you could almost jump into it. It is of three strange looking black orbs with eyes, feet, and a strange hats. They are all marching single file in line on a nice sunny day with a few clouds in the background. +Casting your gaze down the hallway, one painting catches your interest. You walk up to the large painting, so big you could almost jump into it. It is of three strange looking black orbs with eyes, feet, and a strange hats. They are all marching single file in line on a nice sunny day with a few clouds in the background. From 17593d738ec09b2ab02bad995494844ce3ece462 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:13:17 -0400 Subject: [PATCH 3177/5486] Unfix typos --- english/pinch/jacket/jacket.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/pinch/jacket/jacket.md b/english/pinch/jacket/jacket.md index f87139d58f..6c731976da 100644 --- a/english/pinch/jacket/jacket.md +++ b/english/pinch/jacket/jacket.md @@ -8,8 +8,8 @@ zzzzzz zzzzzz -You wake to the sound of a distant loud noise. You're still in the -marshmallow room, and you're still in the uncomfortable jacket. +You wake to the sound of a distant loud noise. Your still in the +marshmallow room, and your still in the uncomfortable jacket. Do you: From 9f871bbfc66450d4dc5de65d06294d111df94e0d Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:13:39 -0400 Subject: [PATCH 3178/5486] Unfix typo --- english/pinch/pinch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/pinch/pinch.md b/english/pinch/pinch.md index 66144a29f5..52f3556d19 100644 --- a/english/pinch/pinch.md +++ b/english/pinch/pinch.md @@ -8,7 +8,7 @@ The damn jacket itches like unprocessed wool soaking wet with boric acid. Do you: -[Try taking off your jacket?](jacket/jacket.md) +[Try taking out your jacket?](jacket/jacket.md) [Shout for help?](help/help.md) From e5461c7b319eb66456071472130d5f345e5b0073 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:14:08 -0400 Subject: [PATCH 3179/5486] Unfix style --- english/pinch/pinch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/pinch/pinch.md b/english/pinch/pinch.md index 52f3556d19..8e62a6bcbb 100644 --- a/english/pinch/pinch.md +++ b/english/pinch/pinch.md @@ -12,6 +12,6 @@ Do you: [Shout for help?](help/help.md) -[Go outside of the marshmallow room?](go-out/go-out.md) +[Go outside of the marshmallow room](go-out/go-out.md) [Think about Harry Potter and the amazing world of magic?](magic/harry-potter.md) From 54acebc9ed15e229cdcf4c0573dbf7e7dbb3a7a8 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:14:41 -0400 Subject: [PATCH 3180/5486] Break up line --- english/hallway/hallway.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/hallway/hallway.md b/english/hallway/hallway.md index cdec06cbe6..dd3f0ae47b 100644 --- a/english/hallway/hallway.md +++ b/english/hallway/hallway.md @@ -1 +1,2 @@ -You begin walking down the hallway. The floor boards creak with every other step you take. You come across an open doorway, and inside it looks like a laboratory of some kind. There are many computers and strange machines humming away in the room. +You begin walking down the hallway. The floor boards creak with every other step you take. +You come across an open doorway, and inside it looks like a laboratory of some kind. There are many computers and strange machines humming away in the room. From 1c7b360e9f7872a3fe338e71b814224522f5c065 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:15:17 -0400 Subject: [PATCH 3181/5486] Break up line --- english/painting/painting.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/painting/painting.md b/english/painting/painting.md index 7728d1b34c..c4b9a470ed 100644 --- a/english/painting/painting.md +++ b/english/painting/painting.md @@ -1 +1,2 @@ -Casting your gaze down the hallway, one painting catches your interest. You walk up to the large painting, so big you could almost jump into it. It is of three strange looking black orbs with eyes, feet, and a strange hats. They are all marching single file in line on a nice sunny day with a few clouds in the background. +Casting your gaze down the hallway, one painting catches your interest. You walk up to the large painting, so big you could almost jump into it. +It is of three strange looking black orbs with eyes, feet, and a strange hats. They are all marching single file in line on a nice sunny day with a few clouds in the background. From bf182c39fa8ae6fd82671c93f6aac329f0818d9f Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:16:04 -0400 Subject: [PATCH 3182/5486] Break up lines --- english/pinch/jacket/eatit/eatit.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/pinch/jacket/eatit/eatit.md b/english/pinch/jacket/eatit/eatit.md index 860dfcbe54..9dff80405a 100644 --- a/english/pinch/jacket/eatit/eatit.md +++ b/english/pinch/jacket/eatit/eatit.md @@ -2,7 +2,9 @@ You eat a hole through the Marshmallow wall. Looking through the hole you see a With a running start, you do a flip into a commando dive through the hole you just ate out. -After brushing the dust off your uncomfortable jacket you look around. Your commando dive caused a red hallway rug to get kinda messed up and pushed aside. The hallway before you is long and dimly lit, but in a warm and romantic way. The walls and floors are made of old dark oak wood, and a vague old smokey smell fills your lungs. Lining the walls down the hallway are an alternating cascade of doors and beautiful oil paintings. +After brushing the dust off your uncomfortable jacket you look around. Your commando dive caused a red hallway rug to get kinda messed up and pushed aside. +The hallway before you is long and dimly lit, but in a warm and romantic way. The walls and floors are made of old dark oak wood, and a vague old smokey smell fills your lungs. +Lining the walls down the hallway are an alternating cascade of doors and beautiful oil paintings. What do you do? From cb2e4103f41bfd3888c9703a4d0605a30d6720f6 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:16:40 -0400 Subject: [PATCH 3183/5486] Create blank line --- english/pinch/jacket/jacket.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/pinch/jacket/jacket.md b/english/pinch/jacket/jacket.md index 6c731976da..1feca0a9d6 100644 --- a/english/pinch/jacket/jacket.md +++ b/english/pinch/jacket/jacket.md @@ -18,3 +18,4 @@ Do you: [Eat your way out of the room?](eatit/eatit.md) [Use your mad magician skills to get out of the jacket?](magicianskills/magicianskills.md) + From 48cfc9e3f28591d4c2e77708da4511bfa9dcd150 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:18:06 -0400 Subject: [PATCH 3184/5486] Create line breaks --- english/rug/rug.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/english/rug/rug.md b/english/rug/rug.md index 7ef52e1f30..3d21c5f799 100644 --- a/english/rug/rug.md +++ b/english/rug/rug.md @@ -1,5 +1,9 @@ -You bend over and pick up the the soft, but ragged red rug. As you lift it you notice a golden handle on the floor underneath. After further messing up the rug by pushing it aside some more, a hidden trap door is revealed and connected to the handle. Just as your fingers take hold of the cold gold metal handle, you hear voices coming from far down the hallway. +You bend over and pick up the the soft, but ragged red rug. As you lift it you notice a golden handle on the floor underneath. +After further messing up the rug by pushing it aside some more, a hidden trap door is revealed and connected to the handle. +Just as your fingers take hold of the cold gold metal handle, you hear voices coming from far down the hallway. -The first voice had a moderate, smooth pitch, but was clearly irritated and berated to the other, "Listen man, all I wanna do is play some b-ball, but y'all hadda roll up and started making trouble in my neighborhood!" +The first voice had a moderate, smooth pitch, but was clearly irritated and berated to the other, +"Listen man, all I wanna do is play some b-ball, but y'all hadda roll up and started making trouble in my neighborhood!" -You, scared and confused, make the split second decision to open the trap door and climb down into the darkness, for fear of being noticed by the approaching voices. +You, scared and confused, make the split second decision to open the trap door and climb down into the darkness, +for fear of being noticed by the approaching voices. From 38923b72c0db3d2b865618809490ca1f9ff4d394 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:22:05 -0400 Subject: [PATCH 3185/5486] Revert jacket.md --- english/pinch/jacket/jacket.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/pinch/jacket/jacket.md b/english/pinch/jacket/jacket.md index f87139d58f..1feca0a9d6 100644 --- a/english/pinch/jacket/jacket.md +++ b/english/pinch/jacket/jacket.md @@ -8,8 +8,8 @@ zzzzzz zzzzzz -You wake to the sound of a distant loud noise. You're still in the -marshmallow room, and you're still in the uncomfortable jacket. +You wake to the sound of a distant loud noise. Your still in the +marshmallow room, and your still in the uncomfortable jacket. Do you: @@ -18,3 +18,4 @@ Do you: [Eat your way out of the room?](eatit/eatit.md) [Use your mad magician skills to get out of the jacket?](magicianskills/magicianskills.md) + From 041373a17c5ec9138f9d90c5ee7543d8ac22bd05 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:26:21 -0400 Subject: [PATCH 3186/5486] Revert jacket.md --- english/pinch/jacket/jacket.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/pinch/jacket/jacket.md b/english/pinch/jacket/jacket.md index 1feca0a9d6..f1366a1553 100644 --- a/english/pinch/jacket/jacket.md +++ b/english/pinch/jacket/jacket.md @@ -18,4 +18,4 @@ Do you: [Eat your way out of the room?](eatit/eatit.md) [Use your mad magician skills to get out of the jacket?](magicianskills/magicianskills.md) - + From 312524c212d79da47d18e996e76171287b727fc9 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:30:02 -0400 Subject: [PATCH 3187/5486] Revert jacket.md again --- english/pinch/jacket/jacket.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/pinch/jacket/jacket.md b/english/pinch/jacket/jacket.md index 6c731976da..f1366a1553 100644 --- a/english/pinch/jacket/jacket.md +++ b/english/pinch/jacket/jacket.md @@ -18,3 +18,4 @@ Do you: [Eat your way out of the room?](eatit/eatit.md) [Use your mad magician skills to get out of the jacket?](magicianskills/magicianskills.md) + From f4d05600c1acc3ba7cfb91495e4d45aa4e97466e Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:31:39 -0400 Subject: [PATCH 3188/5486] Break up line --- english/hallway/hallway.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/hallway/hallway.md b/english/hallway/hallway.md index dd3f0ae47b..cbb39ea4cc 100644 --- a/english/hallway/hallway.md +++ b/english/hallway/hallway.md @@ -1,2 +1,3 @@ You begin walking down the hallway. The floor boards creak with every other step you take. -You come across an open doorway, and inside it looks like a laboratory of some kind. There are many computers and strange machines humming away in the room. +You come across an open doorway, and inside it looks like a laboratory of some kind. +There are many computers and strange machines humming away in the room. From 58a6794bf5a8e9fa6663ac84e82742b324e648c8 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:31:57 -0400 Subject: [PATCH 3189/5486] Brea --- english/painting/painting.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/english/painting/painting.md b/english/painting/painting.md index c4b9a470ed..5a779ef5dc 100644 --- a/english/painting/painting.md +++ b/english/painting/painting.md @@ -1,2 +1,4 @@ -Casting your gaze down the hallway, one painting catches your interest. You walk up to the large painting, so big you could almost jump into it. -It is of three strange looking black orbs with eyes, feet, and a strange hats. They are all marching single file in line on a nice sunny day with a few clouds in the background. +Casting your gaze down the hallway, one painting catches your interest. +You walk up to the large painting, so big you could almost jump into it. +It is of three strange looking black orbs with eyes, feet, and a strange hats. +They are all marching single file in line on a nice sunny day with a few clouds in the background. From f01dab656644824515066e7be419c6f7e672728f Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:32:23 -0400 Subject: [PATCH 3190/5486] Break up lines --- english/pinch/jacket/eatit/eatit.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/english/pinch/jacket/eatit/eatit.md b/english/pinch/jacket/eatit/eatit.md index 9dff80405a..b8e639e0ab 100644 --- a/english/pinch/jacket/eatit/eatit.md +++ b/english/pinch/jacket/eatit/eatit.md @@ -2,8 +2,10 @@ You eat a hole through the Marshmallow wall. Looking through the hole you see a With a running start, you do a flip into a commando dive through the hole you just ate out. -After brushing the dust off your uncomfortable jacket you look around. Your commando dive caused a red hallway rug to get kinda messed up and pushed aside. -The hallway before you is long and dimly lit, but in a warm and romantic way. The walls and floors are made of old dark oak wood, and a vague old smokey smell fills your lungs. +After brushing the dust off your uncomfortable jacket you look around. +Your commando dive caused a red hallway rug to get kinda messed up and pushed aside. +The hallway before you is long and dimly lit, but in a warm and romantic way. +The walls and floors are made of old dark oak wood, and a vague old smokey smell fills your lungs. Lining the walls down the hallway are an alternating cascade of doors and beautiful oil paintings. What do you do? From 5f72e23099f99026a95bd778704c4f9dae521417 Mon Sep 17 00:00:00 2001 From: Kevin Rickard Date: Thu, 21 Apr 2016 00:33:05 -0400 Subject: [PATCH 3191/5486] Break up lines --- english/rug/rug.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/english/rug/rug.md b/english/rug/rug.md index 3d21c5f799..674b845c12 100644 --- a/english/rug/rug.md +++ b/english/rug/rug.md @@ -1,9 +1,14 @@ -You bend over and pick up the the soft, but ragged red rug. As you lift it you notice a golden handle on the floor underneath. -After further messing up the rug by pushing it aside some more, a hidden trap door is revealed and connected to the handle. -Just as your fingers take hold of the cold gold metal handle, you hear voices coming from far down the hallway. +You bend over and pick up the the soft, but ragged red rug. +As you lift it you notice a golden handle on the floor underneath. +After further messing up the rug by pushing it aside some more, +a hidden trap door is revealed and connected to the handle. +Just as your fingers take hold of the cold gold metal handle, +you hear voices coming from far down the hallway. The first voice had a moderate, smooth pitch, but was clearly irritated and berated to the other, -"Listen man, all I wanna do is play some b-ball, but y'all hadda roll up and started making trouble in my neighborhood!" +"Listen man, all I wanna do is play some b-ball, +but y'all hadda roll up and started making trouble in my neighborhood!" -You, scared and confused, make the split second decision to open the trap door and climb down into the darkness, +You, scared and confused, make the split second decision +to open the trap door and climb down into the darkness, for fear of being noticed by the approaching voices. From ebf12923a28c2fbf8a80be0def1875cd4a532614 Mon Sep 17 00:00:00 2001 From: Kilian Eckstein Date: Wed, 20 Apr 2016 21:36:41 -0700 Subject: [PATCH 3192/5486] Add Line to story concerning reconstruction of memories --- german/Alkohol/alkohol.md | 1 + 1 file changed, 1 insertion(+) diff --git a/german/Alkohol/alkohol.md b/german/Alkohol/alkohol.md index 64379bd211..a6ae5a2f62 100644 --- a/german/Alkohol/alkohol.md +++ b/german/Alkohol/alkohol.md @@ -2,6 +2,7 @@ Sie versuchen die letzte Nach zu rekonstruieren. Sie erinnern sich daran, dass Sie angetrunken mit Ihren 3 besten Freunde ins Boot gestiegen sind, können sich jedoch seitdem an nichts mehr erinnern. Schließlich hatten Sie acht Tequila. Vorab tranken sie bereits 5 Bier. +Von den zwei Cuba Libre ganz zu schweigen. Was ist passiert? From 7b171fe7fa7748483ba3019a589ad2477a07bb12 Mon Sep 17 00:00:00 2001 From: Kilian Eckstein Date: Wed, 20 Apr 2016 21:50:10 -0700 Subject: [PATCH 3193/5486] Change added sentence --- german/Alkohol/alkohol.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/Alkohol/alkohol.md b/german/Alkohol/alkohol.md index a6ae5a2f62..4ffaca176f 100644 --- a/german/Alkohol/alkohol.md +++ b/german/Alkohol/alkohol.md @@ -2,7 +2,7 @@ Sie versuchen die letzte Nach zu rekonstruieren. Sie erinnern sich daran, dass Sie angetrunken mit Ihren 3 besten Freunde ins Boot gestiegen sind, können sich jedoch seitdem an nichts mehr erinnern. Schließlich hatten Sie acht Tequila. Vorab tranken sie bereits 5 Bier. -Von den zwei Cuba Libre ganz zu schweigen. +Von dem Cuba Libre ganz zu schweigen. Was ist passiert? From 94fc15ec566e75685892bbef791ad2bdebf83e15 Mon Sep 17 00:00:00 2001 From: Palindar Date: Wed, 20 Apr 2016 23:09:05 -0700 Subject: [PATCH 3194/5486] Add option to go back to language selection --- german/ruderboot.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/german/ruderboot.md b/german/ruderboot.md index 55d08e4707..3d90f7971d 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -6,6 +6,8 @@ Sie bemerken, dass durch ein Loch in der Bootswand Wasser ins Boot dringt. Werden Sie: +[Festellen, dass Sie doch kein Deutsch sprechen](../language.md) + [Zunchst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) [Laut um Hilfe schreien?](Hilfeschrei/Hilfeschrei.md) From c7c08ae210759670f2073ab11c6952b975ab8b2c Mon Sep 17 00:00:00 2001 From: Varvarei Marius Razvan Date: Thu, 21 Apr 2016 12:31:05 +0300 Subject: [PATCH 3195/5486] Add the missing final words Sentence was incomplete --- romanian/pitigoi/pitigoi.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/romanian/pitigoi/pitigoi.md b/romanian/pitigoi/pitigoi.md index b9dc00b93e..af75119ac6 100644 --- a/romanian/pitigoi/pitigoi.md +++ b/romanian/pitigoi/pitigoi.md @@ -1 +1 @@ -Cel mai greu e curatatul incisivilor de sus, caci trebuie sa o faci zburand, iar daca-l gadili, atunci +Cel mai greu e curatatul incisivilor de sus, caci trebuie sa o faci zburand, iar daca-l gadili, atunci, ramai fara pene! From 50b4d7970956cecf090ef7a3e4a9736fe15fba92 Mon Sep 17 00:00:00 2001 From: Abbey Waldron Date: Thu, 21 Apr 2016 16:42:42 +0200 Subject: [PATCH 3196/5486] more polar bear story --- english/polar-bear-attack/polar-bear-attack.md | 4 +++- english/polar-bear-attack/polar-bear-attack.md~ | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/polar-bear-attack/polar-bear-attack.md~ diff --git a/english/polar-bear-attack/polar-bear-attack.md b/english/polar-bear-attack/polar-bear-attack.md index 1f2d80b51d..4b1a818e57 100644 --- a/english/polar-bear-attack/polar-bear-attack.md +++ b/english/polar-bear-attack/polar-bear-attack.md @@ -2,4 +2,6 @@ You leap and jump on the back of the polar bear. It bucks and tries to throw you off but fortunately your experience as an amateur bull-riding champion stands you in good stead. You tame the wild beast and charge at the marshmallow barrier before you. The polar bear rips and tears at your pink -and white squishy prison. Eventually you emerge in and entirely new place... +and white squishy prison. Eventually you emerge in and entirely new place, +riding a polar bear covered in delicious pink marshmallow. But wait, there +are bees... diff --git a/english/polar-bear-attack/polar-bear-attack.md~ b/english/polar-bear-attack/polar-bear-attack.md~ new file mode 100644 index 0000000000..1f2d80b51d --- /dev/null +++ b/english/polar-bear-attack/polar-bear-attack.md~ @@ -0,0 +1,5 @@ +You leap and jump on the back of the polar bear. It bucks and tries to throw +you off but fortunately your experience as an amateur bull-riding champion +stands you in good stead. You tame the wild beast and charge at the +marshmallow barrier before you. The polar bear rips and tears at your pink +and white squishy prison. Eventually you emerge in and entirely new place... From 3d43a7b8fdefb83960836fcd1d000e5eb4740488 Mon Sep 17 00:00:00 2001 From: Abbey Waldron Date: Thu, 21 Apr 2016 16:45:24 +0200 Subject: [PATCH 3197/5486] don't remove dots --- english/polar-bear-attack/polar-bear-attack.md | 6 +++--- english/polar-bear-attack/polar-bear-attack.md~ | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/english/polar-bear-attack/polar-bear-attack.md b/english/polar-bear-attack/polar-bear-attack.md index 4b1a818e57..d58aabbad4 100644 --- a/english/polar-bear-attack/polar-bear-attack.md +++ b/english/polar-bear-attack/polar-bear-attack.md @@ -2,6 +2,6 @@ You leap and jump on the back of the polar bear. It bucks and tries to throw you off but fortunately your experience as an amateur bull-riding champion stands you in good stead. You tame the wild beast and charge at the marshmallow barrier before you. The polar bear rips and tears at your pink -and white squishy prison. Eventually you emerge in and entirely new place, -riding a polar bear covered in delicious pink marshmallow. But wait, there -are bees... +and white squishy prison. Eventually you emerge in and entirely new place... +Now you are riding a polar bear covered in delicious pink marshmallow. But +wait, there are bees... diff --git a/english/polar-bear-attack/polar-bear-attack.md~ b/english/polar-bear-attack/polar-bear-attack.md~ index 1f2d80b51d..4b1a818e57 100644 --- a/english/polar-bear-attack/polar-bear-attack.md~ +++ b/english/polar-bear-attack/polar-bear-attack.md~ @@ -2,4 +2,6 @@ You leap and jump on the back of the polar bear. It bucks and tries to throw you off but fortunately your experience as an amateur bull-riding champion stands you in good stead. You tame the wild beast and charge at the marshmallow barrier before you. The polar bear rips and tears at your pink -and white squishy prison. Eventually you emerge in and entirely new place... +and white squishy prison. Eventually you emerge in and entirely new place, +riding a polar bear covered in delicious pink marshmallow. But wait, there +are bees... From 1511d595ddd2e12f8b208a93666b2862f38ea545 Mon Sep 17 00:00:00 2001 From: Abbey Waldron Date: Thu, 21 Apr 2016 16:48:20 +0200 Subject: [PATCH 3198/5486] move temporary file --- english/polar-bear-attack/polar-bear-attack.md~ | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 english/polar-bear-attack/polar-bear-attack.md~ diff --git a/english/polar-bear-attack/polar-bear-attack.md~ b/english/polar-bear-attack/polar-bear-attack.md~ deleted file mode 100644 index 4b1a818e57..0000000000 --- a/english/polar-bear-attack/polar-bear-attack.md~ +++ /dev/null @@ -1,7 +0,0 @@ -You leap and jump on the back of the polar bear. It bucks and tries to throw -you off but fortunately your experience as an amateur bull-riding champion -stands you in good stead. You tame the wild beast and charge at the -marshmallow barrier before you. The polar bear rips and tears at your pink -and white squishy prison. Eventually you emerge in and entirely new place, -riding a polar bear covered in delicious pink marshmallow. But wait, there -are bees... From 7c405cf047ccb13aaa84036c78d70f6ac7d67a14 Mon Sep 17 00:00:00 2001 From: Crystabelle Lopez Date: Thu, 21 Apr 2016 11:56:00 -0700 Subject: [PATCH 3199/5486] Add option to call Saul Goodman --- english/beer-brewer/beer-brewer.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/beer-brewer/beer-brewer.md b/english/beer-brewer/beer-brewer.md index a3c3c1e01c..d6fac922ef 100644 --- a/english/beer-brewer/beer-brewer.md +++ b/english/beer-brewer/beer-brewer.md @@ -10,4 +10,6 @@ Decide that its better to just give up and drink some [Beer](https://www.youtube Learn how to brew from some online [videos](https://www.youtube.com/watch?v=qCW-SVPCw4Y) +Go call [Saul Goodman](../better-call-saul/saul.md) + Give up and go back to the [beginning](../marshmallow.md) From 886833cec1944f286364c86322fab509e79c317b Mon Sep 17 00:00:00 2001 From: Anton Matrosov Date: Thu, 21 Apr 2016 23:00:15 +0300 Subject: [PATCH 3200/5486] Add new option to russian/close-eyes story --- russian/close-eyes/bite/bite.md | 4 ++++ russian/close-eyes/close-eyes.md | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 russian/close-eyes/bite/bite.md diff --git a/russian/close-eyes/bite/bite.md b/russian/close-eyes/bite/bite.md new file mode 100644 index 0000000000..12952033c3 --- /dev/null +++ b/russian/close-eyes/bite/bite.md @@ -0,0 +1,4 @@ +Вы впиваетесь в сладкий зефир и чувствуете, +как силы скоропостижно покидают вас. + +[Закрыть глаза](../../zefir.md) \ No newline at end of file diff --git a/russian/close-eyes/close-eyes.md b/russian/close-eyes/close-eyes.md index 6e178a1b94..200082cf74 100644 --- a/russian/close-eyes/close-eyes.md +++ b/russian/close-eyes/close-eyes.md @@ -9,3 +9,5 @@ Ваши действия: [Осмотреть зефирного человека](examine/examine-man.md) + +[Откусить от зефирного человека](bite/bite.md) \ No newline at end of file From 16b46b007c7012b9cf1f88f7f3d6cfabb4b9aa2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hajdu=20P=C3=A9ter?= Date: Fri, 22 Apr 2016 14:40:39 +0200 Subject: [PATCH 3201/5486] Adding substory eves --- hungarian/zuhanyzas/eves/eves.md | 5 +++++ hungarian/zuhanyzas/zuhanyzas.md | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 hungarian/zuhanyzas/eves/eves.md diff --git a/hungarian/zuhanyzas/eves/eves.md b/hungarian/zuhanyzas/eves/eves.md new file mode 100644 index 0000000000..5090a34c48 --- /dev/null +++ b/hungarian/zuhanyzas/eves/eves.md @@ -0,0 +1,5 @@ +Mivel szereted a mályvacukrot, nem látsz más kiutat, elkezdesz enni. + +Már jó ideje eszel, amikor eszedbe jut, hogy telefonálnál. + +[törülközőért nyúlsz](../telefon/telefon.md) diff --git a/hungarian/zuhanyzas/zuhanyzas.md b/hungarian/zuhanyzas/zuhanyzas.md index e7bdc9b535..8f26b87a47 100644 --- a/hungarian/zuhanyzas/zuhanyzas.md +++ b/hungarian/zuhanyzas/zuhanyzas.md @@ -7,3 +7,6 @@ Mihez kezdesz? [telefon segítséget kérsz](telefon/telefon.md) [törülközőért nyúlsz](torulkozo/torulkozo.md) + +[elkezdesz enni](eves/eves.md) + From 617e7a2a2ff3d1598a63624f85eb468f7729e486 Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 22 Apr 2016 10:43:41 -0400 Subject: [PATCH 3202/5486] made cahnge to gibberish --- Gibberish/Gibberish.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gibberish/Gibberish.md b/Gibberish/Gibberish.md index 84e6b6584a..be803a18bb 100644 --- a/Gibberish/Gibberish.md +++ b/Gibberish/Gibberish.md @@ -9,3 +9,5 @@ kalsjdlfj aklsdf ahsldfhasljdfö alksdjfö + +jibber jobber joober, gibberish is for goobers. From 209781593a4d3ad670ea33c404fe218822ce6606 Mon Sep 17 00:00:00 2001 From: renukaramkumar Date: Fri, 22 Apr 2016 09:42:01 -0700 Subject: [PATCH 3203/5486] Create LifePuzzle.md --- english/LifePuzzle/LifePuzzle.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/LifePuzzle/LifePuzzle.md diff --git a/english/LifePuzzle/LifePuzzle.md b/english/LifePuzzle/LifePuzzle.md new file mode 100644 index 0000000000..0390fe4437 --- /dev/null +++ b/english/LifePuzzle/LifePuzzle.md @@ -0,0 +1 @@ +Life is full of puzzles that we try to solve everyday! From e479bce32ffa002f3681e1a908fe60e1a2c3aa9c Mon Sep 17 00:00:00 2001 From: renukaramkumar Date: Fri, 22 Apr 2016 09:45:07 -0700 Subject: [PATCH 3204/5486] Update marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index af8e51163d..78a1fb1643 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -922,3 +922,5 @@ While having toasted marshmellows and watching the warriors beat the grizzlies, [The new record is!](new_warriors_record/new_warriors_record.md) Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). + +Life is full of [puzzles](LifePuzzle/LifePuzzle.md). From 2450893f9488e214b9eee88c3a43889576a4860a Mon Sep 17 00:00:00 2001 From: EsteveM Date: Sat, 23 Apr 2016 02:44:58 +0200 Subject: [PATCH 3205/5486] I have added a warning to the benefits of yoga, to indicate it is not a panacea. --- english/yoga/benefits/yoga_benefits.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/yoga/benefits/yoga_benefits.md b/english/yoga/benefits/yoga_benefits.md index 586907adc4..d204e3e5a6 100644 --- a/english/yoga/benefits/yoga_benefits.md +++ b/english/yoga/benefits/yoga_benefits.md @@ -20,3 +20,7 @@ Here we provide a list of benefits: 11. Increases focus. 12. Make you calm and manages anger. 13. Help you connect with your soul and inner god. + +It must be said though, that yoga is not a panacea. +It won't cure a serious illness, and we must be aware +of this too. \ No newline at end of file From 4b40dc18081be5052918b91c259052a0b20f5181 Mon Sep 17 00:00:00 2001 From: Zulu F Date: Sat, 23 Apr 2016 04:08:30 -0300 Subject: [PATCH 3206/5486] Initial story files --- english/marshmallow.md | 2 ++ english/zuluquest/choosequest.md | 11 +++++++++++ english/zuluquest/coffee.md | 1 + english/zuluquest/newpath.md | 1 + english/zuluquest/notomorrow.md | 1 + english/zuluquest/theend.md | 1 + 6 files changed, 17 insertions(+) create mode 100644 english/zuluquest/choosequest.md create mode 100644 english/zuluquest/coffee.md create mode 100644 english/zuluquest/newpath.md create mode 100644 english/zuluquest/notomorrow.md create mode 100644 english/zuluquest/theend.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 78a1fb1643..351e3851c5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -6,6 +6,8 @@ Down one path you see a person standing in the middle of the path. They look familiar somehow, but you just can't figure out who they are. They seem friendly so you decide to go [talk to them.](friendly-person/friendly-person.md) +Ask them to join you on a life changing [quest?](zuluquest/choosequest.md) + Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) [Want to see my Quora profile](ismail-quora-profile/quora-profile.md) diff --git a/english/zuluquest/choosequest.md b/english/zuluquest/choosequest.md new file mode 100644 index 0000000000..65211d7460 --- /dev/null +++ b/english/zuluquest/choosequest.md @@ -0,0 +1,11 @@ +Congratulations, you are now helping people to decide their destiny! You are a brave person! + +What sould they do? + +Stay on a tedious-corporate-kindofstable-job for life until it [ends?](theend.md) + +Maybe try a new career [path?](newpath.md) + +Forget about career and jump into startup world like there's no [tomorrow?](notomorrow.md) + +Invite you for a freshly ground [coffee](coffee.md) and discuss about life, anything else and the number 42? \ No newline at end of file diff --git a/english/zuluquest/coffee.md b/english/zuluquest/coffee.md new file mode 100644 index 0000000000..542efbf018 --- /dev/null +++ b/english/zuluquest/coffee.md @@ -0,0 +1 @@ +So now... \ No newline at end of file diff --git a/english/zuluquest/newpath.md b/english/zuluquest/newpath.md new file mode 100644 index 0000000000..542efbf018 --- /dev/null +++ b/english/zuluquest/newpath.md @@ -0,0 +1 @@ +So now... \ No newline at end of file diff --git a/english/zuluquest/notomorrow.md b/english/zuluquest/notomorrow.md new file mode 100644 index 0000000000..542efbf018 --- /dev/null +++ b/english/zuluquest/notomorrow.md @@ -0,0 +1 @@ +So now... \ No newline at end of file diff --git a/english/zuluquest/theend.md b/english/zuluquest/theend.md new file mode 100644 index 0000000000..542efbf018 --- /dev/null +++ b/english/zuluquest/theend.md @@ -0,0 +1 @@ +So now... \ No newline at end of file From ad38ca39913579fb483c5407de9969c9ba919431 Mon Sep 17 00:00:00 2001 From: Zulu F Date: Sat, 23 Apr 2016 04:33:54 -0300 Subject: [PATCH 3207/5486] Upload a first version --- english/zuluquest/coffee.md | 8 +++++++- english/zuluquest/newpath.md | 11 ++++++++++- english/zuluquest/notomorrow.md | 7 ++++++- english/zuluquest/theend.md | 4 +++- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/english/zuluquest/coffee.md b/english/zuluquest/coffee.md index 542efbf018..b13fb47b19 100644 --- a/english/zuluquest/coffee.md +++ b/english/zuluquest/coffee.md @@ -1 +1,7 @@ -So now... \ No newline at end of file +OK! We understand life is a little bit more complicated. + +So you are invited for a coffee once you are around Buenos Aires or when we get to your city. + +If you want to stay in touch, please follow this account on GitHub. + +Thanks for you help! \ No newline at end of file diff --git a/english/zuluquest/newpath.md b/english/zuluquest/newpath.md index 542efbf018..bf84d9078d 100644 --- a/english/zuluquest/newpath.md +++ b/english/zuluquest/newpath.md @@ -1 +1,10 @@ -So now... \ No newline at end of file +OK! So let's give you some extra background here... + +Let's say you worked for more than 10 years doing software for banks, insurance/pharmaceutical/motor companies and public sector. + +How would you get rid of the boring things and avoiding a heart attach? + +If you want to stay in touch and really give your suggestion please follow this account on GitHub. + +Thanks for you help! + diff --git a/english/zuluquest/notomorrow.md b/english/zuluquest/notomorrow.md index 542efbf018..713296e8e8 100644 --- a/english/zuluquest/notomorrow.md +++ b/english/zuluquest/notomorrow.md @@ -1 +1,6 @@ -So now... \ No newline at end of file +Do you believe anybody can make itself into entrepreneurship? + +If you want to stay in touch and share your suggestions and experiences, please follow this account on GitHub. + +Thanks for you help! + diff --git a/english/zuluquest/theend.md b/english/zuluquest/theend.md index 542efbf018..38cda0e743 100644 --- a/english/zuluquest/theend.md +++ b/english/zuluquest/theend.md @@ -1 +1,3 @@ -So now... \ No newline at end of file +OK! So let's face it... Lots of people will do no big thing from their life but... + +Could we make something better maybe? Just for the fun, hit the back button and choose another path.So now... \ No newline at end of file From 7b87a0616bd9328770621d671f2ddae1f982382c Mon Sep 17 00:00:00 2001 From: Zulu F Date: Sat, 23 Apr 2016 04:36:28 -0300 Subject: [PATCH 3208/5486] Update theend.md Remove typo in the last line --- english/zuluquest/theend.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/zuluquest/theend.md b/english/zuluquest/theend.md index 38cda0e743..27224daffc 100644 --- a/english/zuluquest/theend.md +++ b/english/zuluquest/theend.md @@ -1,3 +1,3 @@ OK! So let's face it... Lots of people will do no big thing from their life but... -Could we make something better maybe? Just for the fun, hit the back button and choose another path.So now... \ No newline at end of file +Could we make something better maybe? Just for the fun, hit the back button and choose another path. From 83165fbc98cbf543c2e578109751115d192500e1 Mon Sep 17 00:00:00 2001 From: Zulu F Date: Sat, 23 Apr 2016 04:51:20 -0300 Subject: [PATCH 3209/5486] Adjust directories as requested by Casey --- english/zuluquest/choosequest.md | 8 ++++---- english/zuluquest/{ => ground}/coffee.md | 0 english/zuluquest/{newpath.md => new/path.md} | 0 english/zuluquest/{notomorrow.md => no/tomorrow.md} | 0 english/zuluquest/{theend.md => the/end.md} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename english/zuluquest/{ => ground}/coffee.md (100%) rename english/zuluquest/{newpath.md => new/path.md} (100%) rename english/zuluquest/{notomorrow.md => no/tomorrow.md} (100%) rename english/zuluquest/{theend.md => the/end.md} (100%) diff --git a/english/zuluquest/choosequest.md b/english/zuluquest/choosequest.md index 65211d7460..d8611b7450 100644 --- a/english/zuluquest/choosequest.md +++ b/english/zuluquest/choosequest.md @@ -2,10 +2,10 @@ Congratulations, you are now helping people to decide their destiny! You are a b What sould they do? -Stay on a tedious-corporate-kindofstable-job for life until it [ends?](theend.md) +Stay on a tedious-corporate-kindofstable-job for life until it [ends?](the/end.md) -Maybe try a new career [path?](newpath.md) +Maybe try a new career [path?](new/path.md) -Forget about career and jump into startup world like there's no [tomorrow?](notomorrow.md) +Forget about career and jump into startup world like there's no [tomorrow?](no/tomorrow.md) -Invite you for a freshly ground [coffee](coffee.md) and discuss about life, anything else and the number 42? \ No newline at end of file +Invite you for a freshly ground [coffee](ground/coffee.md) and discuss about life, anything else and the number 42? \ No newline at end of file diff --git a/english/zuluquest/coffee.md b/english/zuluquest/ground/coffee.md similarity index 100% rename from english/zuluquest/coffee.md rename to english/zuluquest/ground/coffee.md diff --git a/english/zuluquest/newpath.md b/english/zuluquest/new/path.md similarity index 100% rename from english/zuluquest/newpath.md rename to english/zuluquest/new/path.md diff --git a/english/zuluquest/notomorrow.md b/english/zuluquest/no/tomorrow.md similarity index 100% rename from english/zuluquest/notomorrow.md rename to english/zuluquest/no/tomorrow.md diff --git a/english/zuluquest/theend.md b/english/zuluquest/the/end.md similarity index 100% rename from english/zuluquest/theend.md rename to english/zuluquest/the/end.md From 72956ff7d442486e8390bdb831cfa0f4f9dc9a04 Mon Sep 17 00:00:00 2001 From: Zulu F Date: Sat, 23 Apr 2016 04:58:07 -0300 Subject: [PATCH 3210/5486] Add line break as requested by Casey --- english/zuluquest/new/path.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/zuluquest/new/path.md b/english/zuluquest/new/path.md index bf84d9078d..a44b8e3877 100644 --- a/english/zuluquest/new/path.md +++ b/english/zuluquest/new/path.md @@ -1,6 +1,7 @@ OK! So let's give you some extra background here... -Let's say you worked for more than 10 years doing software for banks, insurance/pharmaceutical/motor companies and public sector. +Let's say you worked for more than 10 years doing software for banks, + insurance/pharmaceutical/motor companies and public sector. How would you get rid of the boring things and avoiding a heart attach? From db59dd228b0a058c8f8cc037a96590ee5f0994fc Mon Sep 17 00:00:00 2001 From: Gabor Meszaros Date: Sat, 23 Apr 2016 10:57:04 +0200 Subject: [PATCH 3211/5486] Add boszorkany storyline to the story --- hungarian/boszorkany/mezeskalacs-haz.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 hungarian/boszorkany/mezeskalacs-haz.md diff --git a/hungarian/boszorkany/mezeskalacs-haz.md b/hungarian/boszorkany/mezeskalacs-haz.md new file mode 100644 index 0000000000..313b3e6182 --- /dev/null +++ b/hungarian/boszorkany/mezeskalacs-haz.md @@ -0,0 +1,3 @@ +Korbenezek es minden jel arra utal, hogy a boszorkany mezeskalacs hazaban bagyok: Minden edessegbol van, Jancsi es +Juliska ott vannak egy ketrecben... hirtelen elfog a szorongas: lehet, hogy amnezias boszorkany vagyok? + From 28a9125ba7fdc954fbd7fa879f4120d87022edc3 Mon Sep 17 00:00:00 2001 From: Gabor Meszaros Date: Sat, 23 Apr 2016 11:02:18 +0200 Subject: [PATCH 3212/5486] Fix typo --- hungarian/boszorkany/mezeskalacs-haz.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hungarian/boszorkany/mezeskalacs-haz.md b/hungarian/boszorkany/mezeskalacs-haz.md index 313b3e6182..b7fe2da0f3 100644 --- a/hungarian/boszorkany/mezeskalacs-haz.md +++ b/hungarian/boszorkany/mezeskalacs-haz.md @@ -1,3 +1,3 @@ -Korbenezek es minden jel arra utal, hogy a boszorkany mezeskalacs hazaban bagyok: Minden edessegbol van, Jancsi es +Korbenezek es minden jel arra utal, hogy a boszorkany mezeskalacs hazaban vagyok: Minden edessegbol van, Jancsi es Juliska ott vannak egy ketrecben... hirtelen elfog a szorongas: lehet, hogy amnezias boszorkany vagyok? From adedbb0dd839ad9d570ba9a592123678015f8f9e Mon Sep 17 00:00:00 2001 From: Gabor Meszaros Date: Sat, 23 Apr 2016 11:02:35 +0200 Subject: [PATCH 3213/5486] Include my story element into the story --- hungarian/malyvacukor.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hungarian/malyvacukor.md b/hungarian/malyvacukor.md index b88ba642ce..567283cd14 100644 --- a/hungarian/malyvacukor.md +++ b/hungarian/malyvacukor.md @@ -10,4 +10,6 @@ Mit csinálsz? [megreggelizel](reggeli/reggeli.md) -Jól belerúgsz az [oxigén generátorba](oxygen/oxygen.md) \ No newline at end of file +[megnezem, hogy a boszorkany mezeskalacs hazaban vagyok-e](boszorkany/mezeskalacs-haz.md) + +Jól belerúgsz az [oxigén generátorba](oxygen/oxygen.md) From 8e3c1a646de4a738f58b8a7df26058b97f118298 Mon Sep 17 00:00:00 2001 From: Gabor Meszaros Date: Sat, 23 Apr 2016 11:05:06 +0200 Subject: [PATCH 3214/5486] Fix deletion which makes casey impossible to merge --- hungarian/malyvacukor.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hungarian/malyvacukor.md b/hungarian/malyvacukor.md index 567283cd14..3bbf0bf868 100644 --- a/hungarian/malyvacukor.md +++ b/hungarian/malyvacukor.md @@ -10,6 +10,6 @@ Mit csinálsz? [megreggelizel](reggeli/reggeli.md) -[megnezem, hogy a boszorkany mezeskalacs hazaban vagyok-e](boszorkany/mezeskalacs-haz.md) - Jól belerúgsz az [oxigén generátorba](oxygen/oxygen.md) + +[megnezem, hogy a boszorkany mezeskalacs hazaban vagyok-e](boszorkany/mezeskalacs-haz.md) From e997ca4e5a4aa60b05d70971b09ce80f6e2f0c24 Mon Sep 17 00:00:00 2001 From: Tacombel Date: Sat, 23 Apr 2016 12:41:29 +0200 Subject: [PATCH 3215/5486] Update jordiHurtado.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Añado un anueva opción --- espanol/jordiHurtado/jordiHurtado.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/jordiHurtado/jordiHurtado.md b/espanol/jordiHurtado/jordiHurtado.md index 01c0001921..c1cb490e05 100644 --- a/espanol/jordiHurtado/jordiHurtado.md +++ b/espanol/jordiHurtado/jordiHurtado.md @@ -1,3 +1,5 @@ [Y le dijo que organizara algo para entretener al ejèrcito que se avecinaba.](saberYganar/saberYganar.md) -[Le dijo que fabricara una pociòn para no morir durante el ataque.](inmortal/inmortal.md) \ No newline at end of file +[Le dijo que fabricara una pociòn para no morir durante el ataque.](inmortal/inmortal.md) + +[Enloquecido por un odio mortal que no podía entender, decidio matar a Jordi Hurtado.](muertedejordi/muertedejordi.md) From f3e9aa677786bba8b3fa40770fd36b13aa467686 Mon Sep 17 00:00:00 2001 From: Tacombel Date: Sat, 23 Apr 2016 12:46:33 +0200 Subject: [PATCH 3216/5486] Create muertedejordi.md --- espanol/jordiHurtado/muertedejordi/muertedejordi.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 espanol/jordiHurtado/muertedejordi/muertedejordi.md diff --git a/espanol/jordiHurtado/muertedejordi/muertedejordi.md b/espanol/jordiHurtado/muertedejordi/muertedejordi.md new file mode 100644 index 0000000000..409a100304 --- /dev/null +++ b/espanol/jordiHurtado/muertedejordi/muertedejordi.md @@ -0,0 +1,5 @@ +Mientras asestaba el golpe mortal tuve una revelación "estaba a punto de asestar un golpe mortal a una pieza angular del universo! + +Pero era tarde, al tiempo que su espada partia en dos a Jordi, vio fluir ante sus ojos los infinitos capitulos de Saber y Ganar que nunca +tendrían lugar y que paradojicamente eran el hilo que mantenía unido el espacio tiempo. +En un sencillo destello de luz octarina, el universo dejó de existir. From c496e79501bd83add8a5b02473b04b1f6fea681f Mon Sep 17 00:00:00 2001 From: Bill on Mac Date: Sat, 23 Apr 2016 12:43:07 -0400 Subject: [PATCH 3217/5486] Added peas to garden directory. --- english/garden/peas/peas.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 english/garden/peas/peas.md diff --git a/english/garden/peas/peas.md b/english/garden/peas/peas.md new file mode 100644 index 0000000000..87ebfbd838 --- /dev/null +++ b/english/garden/peas/peas.md @@ -0,0 +1,9 @@ +I thought to myself as I looked down at the peas. + +Peas are in pods. There are not just two peas in a pod. There are many peas in a pod. + +[Go to the kitchen.](../../kitchen/vegetables.md) + +[Go back to the garden.](../choose.md) + + From bd76c1dc799a9a99bd21e5c7481a864057f49ff6 Mon Sep 17 00:00:00 2001 From: Bill on Mac Date: Sat, 23 Apr 2016 13:15:59 -0400 Subject: [PATCH 3218/5486] added a link to choose.md to choose peas as an option --- english/garden/choose.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/garden/choose.md b/english/garden/choose.md index fce5b16d2d..4aaa79c92d 100644 --- a/english/garden/choose.md +++ b/english/garden/choose.md @@ -4,6 +4,8 @@ You can smell the damp earth and hear crickets in the distance. You bend over and inspect the plants. You decide to choose: +[Peas](peas/peas.md) + [Beans](beans/beans.md). [Carrots](carrots/carrots.md) @@ -11,3 +13,4 @@ You decide to choose: [Tomatoes](tomatoes/tomatoes.md) [Onions](onions/onions.md) + From 86f673657886f4ea6c09de8d54b7e92606eaf745 Mon Sep 17 00:00:00 2001 From: yuanjun221 Date: Sun, 24 Apr 2016 02:16:48 +0800 Subject: [PATCH 3219/5486] add link --- Chinese/firstChapter/poem.md | 6 ++++++ .../\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 Chinese/firstChapter/poem.md diff --git a/Chinese/firstChapter/poem.md b/Chinese/firstChapter/poem.md new file mode 100644 index 0000000000..173c160b08 --- /dev/null +++ b/Chinese/firstChapter/poem.md @@ -0,0 +1,6 @@ +诗曰： + +混沌未分天地乱，茫茫渺渺无人见。 +自从盘古破鸿蒙，开辟从兹清浊辨。 +覆载群生仰至仁，发明万物皆成善。 +欲知造化会元功，须看《西游释厄传》。 diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index efc68b7d48..00af9bce73 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -113,3 +113,5 @@ [美帝征程](16fall_USA/Columbia_university/columbia I am coming.md) [MonkeyKingHereisBack](MonkeyKingHeroisBack/MonkeyKingHeroisBack.md) + +[西游记第一回](firstChapter/poem.md) From 2b30fa1287acec8264c4fd4ffd9da08267833340 Mon Sep 17 00:00:00 2001 From: Jens Westerlund Date: Sun, 24 Apr 2016 01:27:51 +0200 Subject: [PATCH 3220/5486] add somna-om as an option --- swedish/somna-om/somna-om.md | 4 ++++ swedish/start.md | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 swedish/somna-om/somna-om.md diff --git a/swedish/somna-om/somna-om.md b/swedish/somna-om/somna-om.md new file mode 100644 index 0000000000..3e6a01b4f4 --- /dev/null +++ b/swedish/somna-om/somna-om.md @@ -0,0 +1,4 @@ +Du väljer att dra täcket över huvudet och somnar om, +men mardrömmen fortsätter och du drömmer nu om att... + +[du äter en stor marshmallow...](../marshmallowen/marshmallowen.md) \ No newline at end of file diff --git a/swedish/start.md b/swedish/start.md index cfe8cf6d04..f49ebaacd2 100644 --- a/swedish/start.md +++ b/swedish/start.md @@ -12,3 +12,5 @@ Vad nu, då? [Titta ut genom fönstret.](titta-ut/titta-ut.md) [Äter marshmallowen.](marshmallowen/marshmallowen.md) + +[Somna om](somna-om/somna-om.md) \ No newline at end of file From 474019a5198615a494887c0705e0f3402d4353c5 Mon Sep 17 00:00:00 2001 From: Herbert007 Date: Sun, 24 Apr 2016 20:12:45 +0200 Subject: [PATCH 3221/5486] add new option in welkom sms --- dutch/sms/sms.md | 2 ++ dutch/welkom.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 dutch/sms/sms.md diff --git a/dutch/sms/sms.md b/dutch/sms/sms.md new file mode 100644 index 0000000000..7082aab813 --- /dev/null +++ b/dutch/sms/sms.md @@ -0,0 +1,2 @@ +... het is een sms van een nummer dat je niet kent. + diff --git a/dutch/welkom.md b/dutch/welkom.md index 502d1913a9..ab06d21712 100644 --- a/dutch/welkom.md +++ b/dutch/welkom.md @@ -14,6 +14,8 @@ U denkt ... of u kijkt even op uw iphone of u een [mailtje heeft](check-mail/mail.md) +... u hoort uw iphone een geluidje maken en kijkt het is een sms [sm](sms/sms.md) + ... maar de Iphone heeft weer geen batterij want deze gaat snel op. Dus pak je maar je android die wel drie dagen lang meegaat! From eb0b3b5c09b5a92547108daee86d6547e74b7268 Mon Sep 17 00:00:00 2001 From: Jason Kim Date: Sun, 24 Apr 2016 11:55:40 -0700 Subject: [PATCH 3222/5486] Add charades option to friendly-person.md and create charades.md file. --- english/friendly-person/charades/charades.md | 3 +++ english/friendly-person/friendly-person.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/friendly-person/charades/charades.md diff --git a/english/friendly-person/charades/charades.md b/english/friendly-person/charades/charades.md new file mode 100644 index 0000000000..57e7f468fb --- /dev/null +++ b/english/friendly-person/charades/charades.md @@ -0,0 +1,3 @@ +You quickly realize charades is really easy when you are playing with your parralel universe self. + +You think to yourself they're parallel universe must have only diverged recently. \ No newline at end of file diff --git a/english/friendly-person/friendly-person.md b/english/friendly-person/friendly-person.md index 2cec58bb37..aa4a365d84 100644 --- a/english/friendly-person/friendly-person.md +++ b/english/friendly-person/friendly-person.md @@ -8,4 +8,6 @@ Is this me in a parallel world maybe? You're about to start talking to them, when you realize you can't actually open your mouth. It's kind of sealed. "What shall I do to communicate then?", you think: -[Wave](wave/wave.md) frantically in front of them \ No newline at end of file +[Wave](wave/wave.md) frantically in front of them + +You begin playing [charades](charades/charades.md). \ No newline at end of file From a0a44d2192ad33a62a0adca4448a90595691270b Mon Sep 17 00:00:00 2001 From: jrtapp Date: Sun, 24 Apr 2016 17:20:41 -0500 Subject: [PATCH 3223/5486] Added Adventure --- english/marshmallow.md | 4 +++- english/plugh/plugh.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/plugh/plugh.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 351e3851c5..fea14456d3 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -Your adventure begins. You realize there are hundreds of paths for you to choose from. +Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. @@ -926,3 +926,5 @@ While having toasted marshmellows and watching the warriors beat the grizzlies, Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). Life is full of [puzzles](LifePuzzle/LifePuzzle.md). + +You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". \ No newline at end of file diff --git a/english/plugh/plugh.md b/english/plugh/plugh.md new file mode 100644 index 0000000000..4dc98baf68 --- /dev/null +++ b/english/plugh/plugh.md @@ -0,0 +1 @@ +Suddenly, you find yourself on a hill looking at a small building. What a relief! \ No newline at end of file From a95efd2c429a81c214b04e80a5c430dd8b2d1f14 Mon Sep 17 00:00:00 2001 From: John Tapp Date: Sun, 24 Apr 2016 17:25:47 -0500 Subject: [PATCH 3224/5486] Fix extra character? --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index fea14456d3..f0e01babe2 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -Your adventure begins. You realize there are hundreds of paths for you to choose from. +Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. @@ -927,4 +927,4 @@ Of Course you must reach the end of your story, but remember [this](interstellar Life is full of [puzzles](LifePuzzle/LifePuzzle.md). -You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". \ No newline at end of file +You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". From 2f974d1e0d71415bcdd4d64d4f59562301d6dc01 Mon Sep 17 00:00:00 2001 From: kblackadar Date: Sun, 24 Apr 2016 20:29:44 -0400 Subject: [PATCH 3225/5486] Add more info regarding froboznia --- english/froboznia/froboznia.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/froboznia/froboznia.md b/english/froboznia/froboznia.md index aaf41a3872..b1d2d86713 100644 --- a/english/froboznia/froboznia.md +++ b/english/froboznia/froboznia.md @@ -6,4 +6,7 @@ You deftly spin around the clumsy officer's hand and rush out the doorway on the other side of the room. You enter a huge, poorly lit cavern and desperately search for an escape route. You see a rickety bridge spanning a bottomless chasm. -[Take the Bridge] (../get-away/get-away.md) \ No newline at end of file +At the bottom of the chasm you hear squeaks and squeals that resemble howler +monkeys. + +[Take the Bridge] (../get-away/get-away.md) From b94bfe7a2dfa1c38a73155fc67e97df926684b94 Mon Sep 17 00:00:00 2001 From: kblackadar Date: Sun, 24 Apr 2016 21:06:00 -0400 Subject: [PATCH 3226/5486] Modify froboznia.md --- english/froboznia/froboznia.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/english/froboznia/froboznia.md b/english/froboznia/froboznia.md index b1d2d86713..84eafa9529 100644 --- a/english/froboznia/froboznia.md +++ b/english/froboznia/froboznia.md @@ -6,7 +6,6 @@ You deftly spin around the clumsy officer's hand and rush out the doorway on the other side of the room. You enter a huge, poorly lit cavern and desperately search for an escape route. You see a rickety bridge spanning a bottomless chasm. -At the bottom of the chasm you hear squeaks and squeals that resemble howler -monkeys. - [Take the Bridge] (../get-away/get-away.md) + +The bridge sways and squeaks in the dusty, hot wind. From 5d967289d3d4025b602bb09dbd029ab869f14400 Mon Sep 17 00:00:00 2001 From: fernando Date: Mon, 25 Apr 2016 10:03:30 +0200 Subject: [PATCH 3227/5486] =?UTF-8?q?A=C3=B1ade=20la=20rotura=20de=20la=20?= =?UTF-8?q?vela=20mayor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/kraken/kraken.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/kraken/kraken.md b/espanol/kraken/kraken.md index e9d3507934..4e9dff673d 100644 --- a/espanol/kraken/kraken.md +++ b/espanol/kraken/kraken.md @@ -1 +1,2 @@ -"Soltad al Kraken" grito!!!!! \ No newline at end of file +"Soltad al Kraken" grito!!!!! +Pero la mayor ya se desgarraba en el viento huracanado \ No newline at end of file From 2eaa2d11618960bd53bd367547f7d983ba45ebd5 Mon Sep 17 00:00:00 2001 From: blanar Date: Mon, 25 Apr 2016 13:45:06 +0200 Subject: [PATCH 3228/5486] =?UTF-8?q?Kutya=20beszalad=20a=20tusol=C3=B3ba?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hungarian/zuhanyzas/telefon/felvesz/felvesz.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hungarian/zuhanyzas/telefon/felvesz/felvesz.md b/hungarian/zuhanyzas/telefon/felvesz/felvesz.md index 4b433a84eb..c09a194d12 100644 --- a/hungarian/zuhanyzas/telefon/felvesz/felvesz.md +++ b/hungarian/zuhanyzas/telefon/felvesz/felvesz.md @@ -1,3 +1,7 @@ Megpróbálod felvenni a telefont. -De az kicsúszik a kezedből és a padlóra esik. \ No newline at end of file +De az kicsúszik a kezedből és a padlóra esik. + +Lehajolsz érte. Ekkor beszalad a kutyád, a hátadra ugrik, +és nyalni kezdi a füledből a mályvacukrot. A telefonból egy hang szólal meg: +- Te meg mit művelsz meztelenül a kutyáddal!?!? From 7da11f663de08daf3fd32c80b3af1c25cbdefbbb Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 25 Apr 2016 20:29:59 +0200 Subject: [PATCH 3229/5486] Add giocare/computer.md in caramelle.md --- Italian/caramelle.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Italian/caramelle.md b/Italian/caramelle.md index b23327076e..e4e6a816e6 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -18,3 +18,5 @@ Che fai? [Spuntini] (spuntini/spuntini.md) [Alice non abita più qui] (alice/alice.md) + +[Cerco un computer] (giocare/computer.md) \ No newline at end of file From 2dc042949cce77f4a47398cb17eab5d72c8282f8 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 25 Apr 2016 20:30:43 +0200 Subject: [PATCH 3230/5486] Add Italian/giocare/computer --- Italian/giocare/computer.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Italian/giocare/computer.md diff --git a/Italian/giocare/computer.md b/Italian/giocare/computer.md new file mode 100644 index 0000000000..169563220b --- /dev/null +++ b/Italian/giocare/computer.md @@ -0,0 +1 @@ +Vabb alla fine scialla, partitozzo a League of Legends. \ No newline at end of file From 25b06dd8c57c6291addc6f74b64c94f5687a5498 Mon Sep 17 00:00:00 2001 From: raymichaud Date: Mon, 25 Apr 2016 14:44:56 -0400 Subject: [PATCH 3231/5486] Add lost ticket option to English/Powerball scenario --- english/powerball/lost-ticket/lost-ticket.md | 1 + english/powerball/powerball.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/powerball/lost-ticket/lost-ticket.md diff --git a/english/powerball/lost-ticket/lost-ticket.md b/english/powerball/lost-ticket/lost-ticket.md new file mode 100644 index 0000000000..1607ca060f --- /dev/null +++ b/english/powerball/lost-ticket/lost-ticket.md @@ -0,0 +1 @@ +Bruno, your pitbull, is licking his chops, a tiny piece of your ticket on his lower lip. \ No newline at end of file diff --git a/english/powerball/powerball.md b/english/powerball/powerball.md index d3e0d0a89a..26002d465a 100644 --- a/english/powerball/powerball.md +++ b/english/powerball/powerball.md @@ -4,4 +4,6 @@ And the winning numbers are: [I won, I won!](won/won.md) -[I'm a loser, baby.](lost/lost.md) \ No newline at end of file +[I'm a loser, baby.](lost/lost.md) + +[I can't find my ticket!](lost-ticket/lost-ticket.md) \ No newline at end of file From a3bf10b58b8b0406f5fd3129770cc3ccc0095a00 Mon Sep 17 00:00:00 2001 From: deveshub Date: Tue, 26 Apr 2016 00:59:20 +0530 Subject: [PATCH 3232/5486] On branch add-story Changes to be committed: new file: Marathi/ganesh/ganeshotsav.md modified: Marathi/marathi.md --- Marathi/ganesh/ganeshotsav.md | 3 +++ Marathi/marathi.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 Marathi/ganesh/ganeshotsav.md diff --git a/Marathi/ganesh/ganeshotsav.md b/Marathi/ganesh/ganeshotsav.md new file mode 100644 index 0000000000..ca8065cb7c --- /dev/null +++ b/Marathi/ganesh/ganeshotsav.md @@ -0,0 +1,3 @@ +मंगलमुर्ती मोरया ! पुढच्या वर्षी लवकर या ! + +जय गजानन ! श्री गजानन ! \ No newline at end of file diff --git a/Marathi/marathi.md b/Marathi/marathi.md index b4ad1eb92e..7b2314eda0 100644 --- a/Marathi/marathi.md +++ b/Marathi/marathi.md @@ -6,4 +6,6 @@ mazi story [ethe](mi_marathi/mi_marathi.md)ahe. -Want to meet Maharashtrians in Seattle? Go [here](seattle/seattle.md) \ No newline at end of file +Want to meet Maharashtrians in Seattle? Go [here](seattle/seattle.md) + +पुण्यामध्ये [गणेशोत्सव](ganesh/ganeshotsav.md) खूप उत्साहात साजरा झाला ! सगळ्यांचे आभार ! \ No newline at end of file From ada596d8a66f39ebef43eed9cbe1f7770b6ac063 Mon Sep 17 00:00:00 2001 From: Matheus Facure Alves Date: Tue, 26 Apr 2016 09:07:31 -0300 Subject: [PATCH 3233/5486] =?UTF-8?q?adciciona=20op=C3=A7ao=20dor=20de=20b?= =?UTF-8?q?arriga=20em=20comer=20joaninha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/spray/joaninha/comer/comer.md | 4 +++- .../spray/joaninha/comer/dor-de-barriga/dor-de-barriga.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 portugues/spray/joaninha/comer/dor-de-barriga/dor-de-barriga.md diff --git a/portugues/spray/joaninha/comer/comer.md b/portugues/spray/joaninha/comer/comer.md index 66b7283491..0134ad38e3 100644 --- a/portugues/spray/joaninha/comer/comer.md +++ b/portugues/spray/joaninha/comer/comer.md @@ -1 +1,3 @@ -Hm... o sabor parece bem exótico! \ No newline at end of file +Hm... o sabor parece bem exótico! + +[Ficou com dor de barriga?](joaninha/comer/comer/dor-de-barriga.md) \ No newline at end of file diff --git a/portugues/spray/joaninha/comer/dor-de-barriga/dor-de-barriga.md b/portugues/spray/joaninha/comer/dor-de-barriga/dor-de-barriga.md new file mode 100644 index 0000000000..1a3ca19521 --- /dev/null +++ b/portugues/spray/joaninha/comer/dor-de-barriga/dor-de-barriga.md @@ -0,0 +1 @@ +Você vai para o banheiro, mas a dor não passa. \ No newline at end of file From 5e921ccfbc32a677c22cfc8612ed301f90bba85f Mon Sep 17 00:00:00 2001 From: Matheus Facure Alves Date: Tue, 26 Apr 2016 09:17:29 -0300 Subject: [PATCH 3234/5486] =?UTF-8?q?deleta=20descri=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/spray/joaninha/comer/dor-de-barriga/dor-de-barriga.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 portugues/spray/joaninha/comer/dor-de-barriga/dor-de-barriga.md diff --git a/portugues/spray/joaninha/comer/dor-de-barriga/dor-de-barriga.md b/portugues/spray/joaninha/comer/dor-de-barriga/dor-de-barriga.md deleted file mode 100644 index 1a3ca19521..0000000000 --- a/portugues/spray/joaninha/comer/dor-de-barriga/dor-de-barriga.md +++ /dev/null @@ -1 +0,0 @@ -Você vai para o banheiro, mas a dor não passa. \ No newline at end of file From e7166f616988a20ef65d0a024c2a906a8edb9037 Mon Sep 17 00:00:00 2001 From: Matheus Facure Alves Date: Tue, 26 Apr 2016 09:19:51 -0300 Subject: [PATCH 3235/5486] Adiciona texto em comer --- portugues/spray/joaninha/comer/comer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/spray/joaninha/comer/comer.md b/portugues/spray/joaninha/comer/comer.md index 0134ad38e3..5345147ff7 100644 --- a/portugues/spray/joaninha/comer/comer.md +++ b/portugues/spray/joaninha/comer/comer.md @@ -1,3 +1,3 @@ Hm... o sabor parece bem exótico! -[Ficou com dor de barriga?](joaninha/comer/comer/dor-de-barriga.md) \ No newline at end of file +Mas, oh! Parece que você ficou com dor de barriga!!! \ No newline at end of file From d48dd120eb6b669d2706336741b3c3e2dfd67365 Mon Sep 17 00:00:00 2001 From: jota Date: Tue, 26 Apr 2016 17:25:30 +0200 Subject: [PATCH 3236/5486] Add mortos to galicium --- galician/dixital/dixital.md | 2 ++ galician/dixital/mortos/mortos.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 galician/dixital/mortos/mortos.md diff --git a/galician/dixital/dixital.md b/galician/dixital/dixital.md index b66e3b1517..9b633ff696 100644 --- a/galician/dixital/dixital.md +++ b/galician/dixital/dixital.md @@ -3,3 +3,5 @@ Polas rañuras da porta alumeaman alternativamente raiolas de luz artificial, as A viaxe espacial a través do canal dixital comezara. A información recollida dos cúmulos estelares iniciaba unha nova era. + +[O asomarse](mortos/mortos.md) diff --git a/galician/dixital/mortos/mortos.md b/galician/dixital/mortos/mortos.md new file mode 100644 index 0000000000..13832c905e --- /dev/null +++ b/galician/dixital/mortos/mortos.md @@ -0,0 +1,4 @@ +O asomarse pola ventana veu que os seus donos estaban no sillon, mortos. + +Outra vez a epidemia conseguira entrar polas conexions dixitais + From 8fe48a1df1b4aca3f0b4b5a8f81ba600cce09ca9 Mon Sep 17 00:00:00 2001 From: "Kehinde O. Akiode" Date: Tue, 26 Apr 2016 17:48:48 +0100 Subject: [PATCH 3237/5486] Add option to become an undead by not opening the box --- english/schrodinger-cat/schrodinger-cat.md | 4 +++- english/schrodinger-cat/undead/undead.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/schrodinger-cat/undead/undead.md diff --git a/english/schrodinger-cat/schrodinger-cat.md b/english/schrodinger-cat/schrodinger-cat.md index fb9d0dd8db..0854302afe 100644 --- a/english/schrodinger-cat/schrodinger-cat.md +++ b/english/schrodinger-cat/schrodinger-cat.md @@ -6,4 +6,6 @@ Also known as Quantum Superposition It is only when you open the box that you become either dead or alive. -So [open the box](dead-or-alive/dead-or-alive.md). \ No newline at end of file +So [open the box](dead-or-alive/dead-or-alive.md). + +Or, [weld the box shut](undead/undead.md) and become an immortal undead. diff --git a/english/schrodinger-cat/undead/undead.md b/english/schrodinger-cat/undead/undead.md new file mode 100644 index 0000000000..94413a6215 --- /dev/null +++ b/english/schrodinger-cat/undead/undead.md @@ -0,0 +1 @@ +You remain an undead as long as the box is unopened. From 4dbdb98e918f8b95425678cf863538d8e099aa55 Mon Sep 17 00:00:00 2001 From: Yang Ji Date: Wed, 27 Apr 2016 16:36:44 -0700 Subject: [PATCH 3238/5486] Create Brainteaser fold contain polar bear --- .../polar_bear.md" | 1 + 1 file changed, 1 insertion(+) create mode 100644 "Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" new file mode 100644 index 0000000000..64f43a361a --- /dev/null +++ "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" @@ -0,0 +1 @@ +为什么北极熊不吃企鹅？ [答案](../an_polar_bear.md) \ No newline at end of file From 3b344a787495b57a54ea2250c2b75580622be494 Mon Sep 17 00:00:00 2001 From: Yang Ji Date: Wed, 27 Apr 2016 16:38:08 -0700 Subject: [PATCH 3239/5486] Create answer to polar bear --- .../an_polar_bear.md" | 1 + 1 file changed, 1 insertion(+) create mode 100644 "Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/an_polar_bear.md" diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/an_polar_bear.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/an_polar_bear.md" new file mode 100644 index 0000000000..51682d433d --- /dev/null +++ "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/an_polar_bear.md" @@ -0,0 +1 @@ +因为北极熊在北极，企鹅在南极。 \ No newline at end of file From 9168783b3b66812f31c7cff9119adf12424bdaea Mon Sep 17 00:00:00 2001 From: icelemon1989 Date: Wed, 27 Apr 2016 16:40:46 -0700 Subject: [PATCH 3240/5486] Fix the link --- .../polar_bear.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" index 64f43a361a..f091a02172 100644 --- "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" +++ "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" @@ -1 +1 @@ -为什么北极熊不吃企鹅？ [答案](../an_polar_bear.md) \ No newline at end of file +为什么北极熊不吃企鹅？ [答案](./an_polar_bear.md) From 03738cb202d5dacbb1908f18e15c2d86947a17c0 Mon Sep 17 00:00:00 2001 From: Yang Ji Date: Wed, 27 Apr 2016 16:49:28 -0700 Subject: [PATCH 3241/5486] Update link, make new directory for answer --- .../answers/an_polar_bear.md" | 1 + .../polar_bear.md" | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 "Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_polar_bear.md" diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_polar_bear.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_polar_bear.md" new file mode 100644 index 0000000000..ddd7930153 --- /dev/null +++ "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_polar_bear.md" @@ -0,0 +1 @@ +北极熊在北极，企鹅在南极。[下一个](../tree.md) \ No newline at end of file diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" index f091a02172..68ac753030 100644 --- "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" +++ "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" @@ -1 +1 @@ -为什么北极熊不吃企鹅？ [答案](./an_polar_bear.md) +为什么北极熊不吃企鹅？ [答案](./answers/an_polar_bear.md) From e286dff0d6e770e38ba4ce4c442c0cde354905e0 Mon Sep 17 00:00:00 2001 From: Cortez Xavier Mack Date: Wed, 27 Apr 2016 18:51:41 -0500 Subject: [PATCH 3242/5486] Update bernie tax view page --- english/stopbernie/stopbernie.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/stopbernie/stopbernie.md b/english/stopbernie/stopbernie.md index cd2b75a419..1ae567a7d6 100644 --- a/english/stopbernie/stopbernie.md +++ b/english/stopbernie/stopbernie.md @@ -6,4 +6,8 @@ Instead of going back you wonder... Can the truth and validity about a tax plan Be defined by whether or not it is free? Wouldn't that mean that all tax plans are bad? You decide that you wan't to educate yourself alittle before making strong oppinions by -reading up on the purpose of taxation [Wikipedia article on taxation](https://en.wikipedia.org/wiki/Tax) \ No newline at end of file +reading up on the purpose of taxation [Wikipedia article on taxation](https://en.wikipedia.org/wiki/Tax) + +[Sanders plan is fine.](https://berniesanders.com/issues/how-bernie-pays-for-his-proposals/) +The non-rich will get more while the currently rich will remain rich. +And despite a few less dollars for the rich, we will all be better off. From 8f2f62f8419ca99df08321e4242d12a65377b521 Mon Sep 17 00:00:00 2001 From: Yang Ji Date: Wed, 27 Apr 2016 16:55:40 -0700 Subject: [PATCH 3243/5486] Add a new brainteaser and answer --- .../answers/an_tree.md" | 1 + .../tree.md" | 1 + 2 files changed, 2 insertions(+) create mode 100644 "Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_tree.md" create mode 100644 "Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/tree.md" diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_tree.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_tree.md" new file mode 100644 index 0000000000..3e51a44f9a --- /dev/null +++ "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_tree.md" @@ -0,0 +1 @@ +0。因为香瓜不长树上。 \ No newline at end of file diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/tree.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/tree.md" new file mode 100644 index 0000000000..52a6dacab2 --- /dev/null +++ "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/tree.md" @@ -0,0 +1 @@ +如果有棵香瓜树，曾小贤爬上去摘香瓜，一分钟摘三个掉下一个，一天摘几个？[答案](./answers/an_tree.md) \ No newline at end of file From 1f94e18e81d1e636a6207a742ba6a5716dbf5965 Mon Sep 17 00:00:00 2001 From: Yang Ji Date: Wed, 27 Apr 2016 17:00:38 -0700 Subject: [PATCH 3244/5486] Move files to the correct position --- .../an_polar_bear.md" | 1 - .../answers/an_polar_bear.md" | 2 +- .../questions/tree.md" | 2 ++ .../tree.md" | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 "Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/an_polar_bear.md" create mode 100644 "Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/questions/tree.md" delete mode 100644 "Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/tree.md" diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/an_polar_bear.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/an_polar_bear.md" deleted file mode 100644 index 51682d433d..0000000000 --- "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/an_polar_bear.md" +++ /dev/null @@ -1 +0,0 @@ -因为北极熊在北极，企鹅在南极。 \ No newline at end of file diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_polar_bear.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_polar_bear.md" index ddd7930153..1b8e6a8e6c 100644 --- "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_polar_bear.md" +++ "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_polar_bear.md" @@ -1 +1 @@ -北极熊在北极，企鹅在南极。[下一个](../tree.md) \ No newline at end of file +北极熊在北极，企鹅在南极。[下一个](../questions/tree.md) \ No newline at end of file diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/questions/tree.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/questions/tree.md" new file mode 100644 index 0000000000..2b17987a71 --- /dev/null +++ "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/questions/tree.md" @@ -0,0 +1,2 @@ +如果有棵香瓜树，曾小贤爬上去摘香瓜，一分钟摘三个掉下一个， +一天摘几个？[答案](../answers/an_tree.md) \ No newline at end of file diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/tree.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/tree.md" deleted file mode 100644 index 52a6dacab2..0000000000 --- "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/tree.md" +++ /dev/null @@ -1 +0,0 @@ -如果有棵香瓜树，曾小贤爬上去摘香瓜，一分钟摘三个掉下一个，一天摘几个？[答案](./answers/an_tree.md) \ No newline at end of file From 99cfcc659fb83821405da1667233c9e21786345e Mon Sep 17 00:00:00 2001 From: Leo Generali Date: Wed, 27 Apr 2016 23:02:52 -0400 Subject: [PATCH 3245/5486] Add extension to charade --- .../charades/charades-update/charades-update.md | 3 +++ english/friendly-person/charades/charades.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/friendly-person/charades/charades-update/charades-update.md diff --git a/english/friendly-person/charades/charades-update/charades-update.md b/english/friendly-person/charades/charades-update/charades-update.md new file mode 100644 index 0000000000..137e133736 --- /dev/null +++ b/english/friendly-person/charades/charades-update/charades-update.md @@ -0,0 +1,3 @@ +After frantically playing for 13 minutes, you come to the conclusion that your attempt was fruitless. + +You take a sit an ponder your existence for long while. \ No newline at end of file diff --git a/english/friendly-person/charades/charades.md b/english/friendly-person/charades/charades.md index 57e7f468fb..885477d5ef 100644 --- a/english/friendly-person/charades/charades.md +++ b/english/friendly-person/charades/charades.md @@ -1,3 +1,5 @@ You quickly realize charades is really easy when you are playing with your parralel universe self. -You think to yourself they're parallel universe must have only diverged recently. \ No newline at end of file +You think to yourself they're parallel universe must have only diverged recently. + +You decide you want to try and [trick yourself](create-your-own-adventure/english/friendly-person/charades/charades-update/charades-update.md). \ No newline at end of file From a83c5cdfe56dd34dadd6b80cd7214195c86da774 Mon Sep 17 00:00:00 2001 From: Leo Generali Date: Wed, 27 Apr 2016 23:09:34 -0400 Subject: [PATCH 3246/5486] Fix link mistake --- english/friendly-person/charades/charades.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/friendly-person/charades/charades.md b/english/friendly-person/charades/charades.md index 885477d5ef..899a2260d7 100644 --- a/english/friendly-person/charades/charades.md +++ b/english/friendly-person/charades/charades.md @@ -2,4 +2,4 @@ You quickly realize charades is really easy when you are playing with your parra You think to yourself they're parallel universe must have only diverged recently. -You decide you want to try and [trick yourself](create-your-own-adventure/english/friendly-person/charades/charades-update/charades-update.md). \ No newline at end of file +You decide you want to try and [trick yourself](charades-update/charades-update.md). \ No newline at end of file From ba878c1821828975cff9b322037117e9636f9131 Mon Sep 17 00:00:00 2001 From: Good day Date: Thu, 28 Apr 2016 13:56:59 +0800 Subject: [PATCH 3247/5486] Add Guku --- Chinese/Goku/Guku_arrives.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/Goku/Guku_arrives.md diff --git a/Chinese/Goku/Guku_arrives.md b/Chinese/Goku/Guku_arrives.md new file mode 100644 index 0000000000..7a5cfd703c --- /dev/null +++ b/Chinese/Goku/Guku_arrives.md @@ -0,0 +1 @@ + һ죬մ罵ٵٻʦϿȣ״ʦ \ No newline at end of file From 0e5f23fa28fb25bcc68c5bee0118b39106d9ceea Mon Sep 17 00:00:00 2001 From: Good day Date: Thu, 28 Apr 2016 13:57:44 +0800 Subject: [PATCH 3248/5486] =?UTF-8?q?Update=20=E5=A4=A7=E8=AF=9D=E8=A5=BF?= =?UTF-8?q?=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 00af9bce73..213e0fd087 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -115,3 +115,5 @@ [MonkeyKingHereisBack](MonkeyKingHeroisBack/MonkeyKingHeroisBack.md) [西游记第一回](firstChapter/poem.md) + +[悟空](Goku/Guku_arrives.md) From d167a7a09e92b71f33c7bf22ba2f9830062bcff0 Mon Sep 17 00:00:00 2001 From: Yang Ji Date: Wed, 27 Apr 2016 23:36:40 -0700 Subject: [PATCH 3249/5486] =?UTF-8?q?Add=20to=20=E5=A4=A7=E8=AF=9D?= =?UTF-8?q?=E8=A5=BF=E6=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 00af9bce73..f90e05a516 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -115,3 +115,5 @@ [MonkeyKingHereisBack](MonkeyKingHeroisBack/MonkeyKingHeroisBack.md) [西游记第一回](firstChapter/poem.md) + +[为什么北极熊不吃企鹅？](polar_bear/an_polar_bear.md) From 11ee3e550d5322c88511132ae86e7eff396d8d8c Mon Sep 17 00:00:00 2001 From: Yang Ji Date: Wed, 27 Apr 2016 23:50:21 -0700 Subject: [PATCH 3250/5486] Remove old files --- .../answers/an_polar_bear.md" | 1 - .../answers/an_tree.md" | 1 - .../polar_bear.md" | 1 - .../questions/tree.md" | 2 -- 4 files changed, 5 deletions(-) delete mode 100644 "Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_polar_bear.md" delete mode 100644 "Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_tree.md" delete mode 100644 "Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" delete mode 100644 "Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/questions/tree.md" diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_polar_bear.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_polar_bear.md" deleted file mode 100644 index 1b8e6a8e6c..0000000000 --- "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_polar_bear.md" +++ /dev/null @@ -1 +0,0 @@ -北极熊在北极，企鹅在南极。[下一个](../questions/tree.md) \ No newline at end of file diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_tree.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_tree.md" deleted file mode 100644 index 3e51a44f9a..0000000000 --- "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/answers/an_tree.md" +++ /dev/null @@ -1 +0,0 @@ -0。因为香瓜不长树上。 \ No newline at end of file diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" deleted file mode 100644 index 68ac753030..0000000000 --- "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/polar_bear.md" +++ /dev/null @@ -1 +0,0 @@ -为什么北极熊不吃企鹅？ [答案](./answers/an_polar_bear.md) diff --git "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/questions/tree.md" "b/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/questions/tree.md" deleted file mode 100644 index 2b17987a71..0000000000 --- "a/Chinese/\350\204\221\347\273\217\346\200\245\350\275\254\345\274\257\346\216\245\351\276\231/questions/tree.md" +++ /dev/null @@ -1,2 +0,0 @@ -如果有棵香瓜树，曾小贤爬上去摘香瓜，一分钟摘三个掉下一个， -一天摘几个？[答案](../answers/an_tree.md) \ No newline at end of file From e17d00af672d08d1eb1ff02b9d25e748cf2d311f Mon Sep 17 00:00:00 2001 From: Yang Ji Date: Wed, 27 Apr 2016 23:52:00 -0700 Subject: [PATCH 3251/5486] Add answer and give a new set of brainteaser --- Chinese/answer/an_tree.md | 1 + Chinese/polar_bear/an_polar_bear.md | 1 + Chinese/xianggua/tree.md | 2 ++ 3 files changed, 4 insertions(+) create mode 100644 Chinese/answer/an_tree.md create mode 100644 Chinese/polar_bear/an_polar_bear.md create mode 100644 Chinese/xianggua/tree.md diff --git a/Chinese/answer/an_tree.md b/Chinese/answer/an_tree.md new file mode 100644 index 0000000000..3e51a44f9a --- /dev/null +++ b/Chinese/answer/an_tree.md @@ -0,0 +1 @@ +0。因为香瓜不长树上。 \ No newline at end of file diff --git a/Chinese/polar_bear/an_polar_bear.md b/Chinese/polar_bear/an_polar_bear.md new file mode 100644 index 0000000000..408042e860 --- /dev/null +++ b/Chinese/polar_bear/an_polar_bear.md @@ -0,0 +1 @@ +北极熊在北极，企鹅在南极。[下一个](../xianggua/tree.md) \ No newline at end of file diff --git a/Chinese/xianggua/tree.md b/Chinese/xianggua/tree.md new file mode 100644 index 0000000000..2b17987a71 --- /dev/null +++ b/Chinese/xianggua/tree.md @@ -0,0 +1,2 @@ +如果有棵香瓜树，曾小贤爬上去摘香瓜，一分钟摘三个掉下一个， +一天摘几个？[答案](../answers/an_tree.md) \ No newline at end of file From 787aeb803a8b212d23c6083d5f66872a0143760c Mon Sep 17 00:00:00 2001 From: Yang Ji Date: Wed, 27 Apr 2016 23:54:39 -0700 Subject: [PATCH 3252/5486] Fix the link unreachable --- Chinese/xianggua/tree.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/xianggua/tree.md b/Chinese/xianggua/tree.md index 2b17987a71..e108913f38 100644 --- a/Chinese/xianggua/tree.md +++ b/Chinese/xianggua/tree.md @@ -1,2 +1,2 @@ 如果有棵香瓜树，曾小贤爬上去摘香瓜，一分钟摘三个掉下一个， -一天摘几个？[答案](../answers/an_tree.md) \ No newline at end of file +一天摘几个？[答案](../answer/an_tree.md) \ No newline at end of file From 9ed444998f6cb134cd3a94175d3d85e407f0c84a Mon Sep 17 00:00:00 2001 From: PaVou Date: Thu, 28 Apr 2016 15:05:51 +0300 Subject: [PATCH 3253/5486] Greek version brave_guy Zombie apocalypse --- .../set_it_on_fire/brave_guy/brave_guy.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md index 2e3795d886..351d742f56 100644 --- a/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/brave_guy/brave_guy.md @@ -2,3 +2,6 @@ Δένεις το σχοινί στον τοίχο, το πετάς στο κενό απο την τρύπα που άνοιξες και προσπαθείς να κατέβεις το κενό. Ξαφνικά ο αισθάνεσαι κάτι στα πόδια σου. + +Τελικά ο πάτος ήταν πιο ψήλα από ότι φαινόταν. Μόλις πατάς τα πόδια σου +κάτω ξανά 'ναβεις τον αναπτήρα και βλέπεις παντού γύρο σου ζόμπι. \ No newline at end of file From b293e720fb8bd9ccf1328a88b6a06b57cb2226b7 Mon Sep 17 00:00:00 2001 From: Yang Ji Date: Thu, 28 Apr 2016 12:15:36 -0700 Subject: [PATCH 3254/5486] Add option of new brainteaser to Polar bear. --- Chinese/answer/an_tree.md | 2 +- Chinese/carans/carans.md | 1 + Chinese/carowner/car.md | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Chinese/carans/carans.md create mode 100644 Chinese/carowner/car.md diff --git a/Chinese/answer/an_tree.md b/Chinese/answer/an_tree.md index 3e51a44f9a..707994667b 100644 --- a/Chinese/answer/an_tree.md +++ b/Chinese/answer/an_tree.md @@ -1 +1 @@ -0。因为香瓜不长树上。 \ No newline at end of file +0。因为香瓜不长树上。[下一个](./carowner/car.md) \ No newline at end of file diff --git a/Chinese/carans/carans.md b/Chinese/carans/carans.md new file mode 100644 index 0000000000..cfd3744a15 --- /dev/null +++ b/Chinese/carans/carans.md @@ -0,0 +1 @@ +答案就是“如果”。 \ No newline at end of file diff --git a/Chinese/carowner/car.md b/Chinese/carowner/car.md new file mode 100644 index 0000000000..2fafd54c21 --- /dev/null +++ b/Chinese/carowner/car.md @@ -0,0 +1,2 @@ +如果有一辆汽车，小明在开车，小红和小兰坐在后座， +请问车主是谁[答案](./carans/carans.md) \ No newline at end of file From 547ff4bf8285b240c2233aa6dbbe6f6995fdaf52 Mon Sep 17 00:00:00 2001 From: Yang Ji Date: Thu, 28 Apr 2016 12:19:05 -0700 Subject: [PATCH 3255/5486] Fix link in carowner fold --- Chinese/carowner/car.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/carowner/car.md b/Chinese/carowner/car.md index 2fafd54c21..bb5919dbba 100644 --- a/Chinese/carowner/car.md +++ b/Chinese/carowner/car.md @@ -1,2 +1,2 @@ 如果有一辆汽车，小明在开车，小红和小兰坐在后座， -请问车主是谁[答案](./carans/carans.md) \ No newline at end of file +请问车主是谁[答案](../carans/carans.md) \ No newline at end of file From 0e6bc4ce4de7fe7bfca7121443e908dbef30301c Mon Sep 17 00:00:00 2001 From: Yang Ji Date: Thu, 28 Apr 2016 12:24:35 -0700 Subject: [PATCH 3256/5486] Fix link in tree brainteaser --- Chinese/answer/an_tree.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/answer/an_tree.md b/Chinese/answer/an_tree.md index 707994667b..e1881a3dd9 100644 --- a/Chinese/answer/an_tree.md +++ b/Chinese/answer/an_tree.md @@ -1 +1 @@ -0。因为香瓜不长树上。[下一个](./carowner/car.md) \ No newline at end of file +0。因为香瓜不长树上。[下一个](../carowner/car.md) \ No newline at end of file From 9aca9f8c9dd6885a3054efb2341eb302fc5f1f0c Mon Sep 17 00:00:00 2001 From: icelemon1989 Date: Thu, 28 Apr 2016 12:29:50 -0700 Subject: [PATCH 3257/5486] Update an_tree.md --- Chinese/answer/an_tree.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Chinese/answer/an_tree.md b/Chinese/answer/an_tree.md index e1881a3dd9..54787d1eff 100644 --- a/Chinese/answer/an_tree.md +++ b/Chinese/answer/an_tree.md @@ -1 +1,2 @@ -0。因为香瓜不长树上。[下一个](../carowner/car.md) \ No newline at end of file +0。因为香瓜不长树上。 +[下一个](../carowner/car.md) From 57d1b2844efad1fd925b9d84188ade20de04e21c Mon Sep 17 00:00:00 2001 From: Eric Thomas Date: Thu, 28 Apr 2016 12:54:02 -0700 Subject: [PATCH 3258/5486] Add Disney story to main story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index f0e01babe2..220118cced 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -928,3 +928,5 @@ Of Course you must reach the end of your story, but remember [this](interstellar Life is full of [puzzles](LifePuzzle/LifePuzzle.md). You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". + +A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) \ No newline at end of file From 99bb292f42c862e1687aec28a77c6639f6609a52 Mon Sep 17 00:00:00 2001 From: Eric Thomas Date: Thu, 28 Apr 2016 12:55:08 -0700 Subject: [PATCH 3259/5486] Add Disney story --- english/disney/disney.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/disney/disney.md diff --git a/english/disney/disney.md b/english/disney/disney.md new file mode 100644 index 0000000000..ba04dc30a4 --- /dev/null +++ b/english/disney/disney.md @@ -0,0 +1,5 @@ +You realize that you are looking at Sleeping Beauty's Castle. +Somehow you have been transported to Disneyland. +You find yourself on Main Street surrounded by people. +All of a sudden you remember you have a job to do still... +Click [Job to do](https://disneyland.disney.go.com/) \ No newline at end of file From b00405d129fd8fb2ef17ab9edf3d6a55929671cc Mon Sep 17 00:00:00 2001 From: popo z Date: Thu, 28 Apr 2016 14:19:22 -0700 Subject: [PATCH 3260/5486] update rare --- english/talk_to_neighbour/woman/say-hi/rare.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/talk_to_neighbour/woman/say-hi/rare.md b/english/talk_to_neighbour/woman/say-hi/rare.md index f0c95d90c7..e1669296a4 100644 --- a/english/talk_to_neighbour/woman/say-hi/rare.md +++ b/english/talk_to_neighbour/woman/say-hi/rare.md @@ -3,3 +3,5 @@ The alien seems surprised that you said hello and replies: "Because you were nice, I will increase your intelligence by 10%" Suddenly, you feel 10% sadder. +Since you feel sad, you think it's not a good idea to stay with them. +Then you decide to [Drive away](../hop-into-car/drive.md) From 1360ecd558be5d0d8fe48b3df91a0f549b12cc2c Mon Sep 17 00:00:00 2001 From: 7sa <7sa@users.noreply.github.com> Date: Fri, 29 Apr 2016 09:19:36 -0400 Subject: [PATCH 3261/5486] add panic 'dead end' page --- english/friendly-person/panic/panic.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/friendly-person/panic/panic.md diff --git a/english/friendly-person/panic/panic.md b/english/friendly-person/panic/panic.md new file mode 100644 index 0000000000..7f2e5f7895 --- /dev/null +++ b/english/friendly-person/panic/panic.md @@ -0,0 +1 @@ +You realize that if you were to get a stuffy nose right now you could suffocate to death. You begin hyperventilating through your nose, which only makes it harder to breathe. You begin to feel light-headed and fall to your knees. Other You begins turning to face your direction. From d15d2b0c5bde6b190d23b0f1d76401fcce99379e Mon Sep 17 00:00:00 2001 From: 7sa <7sa@users.noreply.github.com> Date: Fri, 29 Apr 2016 09:21:19 -0400 Subject: [PATCH 3262/5486] add link to 'Panic' dead-end --- english/friendly-person/friendly-person.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/friendly-person/friendly-person.md b/english/friendly-person/friendly-person.md index aa4a365d84..d4e10d694d 100644 --- a/english/friendly-person/friendly-person.md +++ b/english/friendly-person/friendly-person.md @@ -10,4 +10,6 @@ your mouth. It's kind of sealed. "What shall I do to communicate then?", you thi [Wave](wave/wave.md) frantically in front of them -You begin playing [charades](charades/charades.md). \ No newline at end of file +You begin playing [charades](charades/charades.md). + +[Panic!!](panic/panic.md) \ No newline at end of file From 804c1b23105bd3af26b74945c15a367a97767ce4 Mon Sep 17 00:00:00 2001 From: 7sa <7sa@users.noreply.github.com> Date: Fri, 29 Apr 2016 09:30:34 -0400 Subject: [PATCH 3263/5486] edit text lightly and ensure 120char length --- english/friendly-person/panic/panic.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/friendly-person/panic/panic.md b/english/friendly-person/panic/panic.md index 7f2e5f7895..9163c89d69 100644 --- a/english/friendly-person/panic/panic.md +++ b/english/friendly-person/panic/panic.md @@ -1 +1,3 @@ -You realize that if you were to get a stuffy nose right now you could suffocate to death. You begin hyperventilating through your nose, which only makes it harder to breathe. You begin to feel light-headed and fall to your knees. Other You begins turning to face your direction. +You realize that if you were to get a stuffy nose right now you could suffocate. You hyperventilate through your nose, +which only makes it harder to breathe. Starting to to feel light-headed, you fall to your knees; Other You begins to +turn in your direction. From 1cd7e5455b6a0c9f2bb3f5e1225a32d5b001789a Mon Sep 17 00:00:00 2001 From: 7sa <7sa@users.noreply.github.com> Date: Fri, 29 Apr 2016 09:48:54 -0400 Subject: [PATCH 3264/5486] added a line of text --- english/stopbernie/stopbernie.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/stopbernie/stopbernie.md b/english/stopbernie/stopbernie.md index 1ae567a7d6..bc251e6343 100644 --- a/english/stopbernie/stopbernie.md +++ b/english/stopbernie/stopbernie.md @@ -11,3 +11,5 @@ reading up on the purpose of taxation [Wikipedia article on taxation](https://en [Sanders plan is fine.](https://berniesanders.com/issues/how-bernie-pays-for-his-proposals/) The non-rich will get more while the currently rich will remain rich. And despite a few less dollars for the rich, we will all be better off. + +You chuckle to yourself reading the additions, and are suddenly reminded of wiki talk pages. \ No newline at end of file From e517c4d51eff462e25739ffbd202fc1d75a1f65c Mon Sep 17 00:00:00 2001 From: Tom Lodge Date: Fri, 29 Apr 2016 16:51:17 +0200 Subject: [PATCH 3265/5486] Add story --- english/existence/existence.md | 1 + english/marshmallow.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/existence/existence.md diff --git a/english/existence/existence.md b/english/existence/existence.md new file mode 100644 index 0000000000..160dda3b39 --- /dev/null +++ b/english/existence/existence.md @@ -0,0 +1 @@ +You wake up. The grey walls surrounding you look brighter than usual. The monotony continues. You question the nature of porridge. diff --git a/english/marshmallow.md b/english/marshmallow.md index 220118cced..66f5a8dbc7 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -2,6 +2,8 @@ Your adventure begins. You realize there are hundreds of paths for you to choose Which way should you go? Only you can decide. +Keith the Unicorn approaches you. He asks you regretfully for a cigarette. Do you [wake up](existence/existence.md)? + Down one path you see a person standing in the middle of the path. They look familiar somehow, but you just can't figure out who they are. They seem friendly so you decide to go [talk to them.](friendly-person/friendly-person.md) @@ -929,4 +931,4 @@ Life is full of [puzzles](LifePuzzle/LifePuzzle.md). You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". -A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) \ No newline at end of file +A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) From e02d8805819d4e59225c14d5812f10ec5cea2bb1 Mon Sep 17 00:00:00 2001 From: Tom Lodge Date: Fri, 29 Apr 2016 17:01:24 +0200 Subject: [PATCH 3266/5486] Edit file to comply with 120 character limit --- english/existence/existence.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/existence/existence.md b/english/existence/existence.md index 160dda3b39..0d40318e47 100644 --- a/english/existence/existence.md +++ b/english/existence/existence.md @@ -1 +1,2 @@ -You wake up. The grey walls surrounding you look brighter than usual. The monotony continues. You question the nature of porridge. +You wake up. The grey walls surrounding you look brighter than usual. The monotony continues. You question the nature of +porridge. From 8a70cf559d76f849171795deb360efa3d268eb3a Mon Sep 17 00:00:00 2001 From: Tom Lodge Date: Fri, 29 Apr 2016 17:07:07 +0200 Subject: [PATCH 3267/5486] Rephrase line to remove unnecessary question --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 66f5a8dbc7..cd004ef650 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -2,7 +2,7 @@ Your adventure begins. You realize there are hundreds of paths for you to choose Which way should you go? Only you can decide. -Keith the Unicorn approaches you. He asks you regretfully for a cigarette. Do you [wake up](existence/existence.md)? +Keith the Unicorn approaches you. He asks you regretfully for a cigarette. You [wake up](existence/existence.md). Down one path you see a person standing in the middle of the path. They look familiar somehow, but you just can't figure out who they are. From 3e3d7e41f5e8ac1c7d2e4075695d799aa1c75d7e Mon Sep 17 00:00:00 2001 From: Tom Lodge Date: Fri, 29 Apr 2016 17:11:44 +0200 Subject: [PATCH 3268/5486] Remove unnecessary duplicity --- english/existence/existence.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/english/existence/existence.md b/english/existence/existence.md index 0d40318e47..087874d14e 100644 --- a/english/existence/existence.md +++ b/english/existence/existence.md @@ -1,2 +1 @@ -You wake up. The grey walls surrounding you look brighter than usual. The monotony continues. You question the nature of -porridge. +The grey walls surrounding you look brighter than usual. The monotony continues. You question the nature of porridge. From e0e78d47728d6ea3349a76991efc3519ea3d0d5b Mon Sep 17 00:00:00 2001 From: Tom Lodge Date: Fri, 29 Apr 2016 17:45:17 +0200 Subject: [PATCH 3269/5486] Add options and move files to unicorn directory --- english/marshmallow.md | 2 +- english/{ => unicorn}/existence/existence.md | 0 english/unicorn/no/no.md | 3 +++ english/unicorn/thebigquestion/thebigquestion.md | 7 +++++++ english/unicorn/yes/yes.md | 3 +++ 5 files changed, 14 insertions(+), 1 deletion(-) rename english/{ => unicorn}/existence/existence.md (100%) create mode 100644 english/unicorn/no/no.md create mode 100644 english/unicorn/thebigquestion/thebigquestion.md create mode 100644 english/unicorn/yes/yes.md diff --git a/english/marshmallow.md b/english/marshmallow.md index cd004ef650..26235e714f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -2,7 +2,7 @@ Your adventure begins. You realize there are hundreds of paths for you to choose Which way should you go? Only you can decide. -Keith the Unicorn approaches you. He asks you regretfully for a cigarette. You [wake up](existence/existence.md). +Keith the Unicorn approaches you. He looks a little forlorn so you decide to [cheer him up](unicorn/thebigquestion/thebigquestion.md). Down one path you see a person standing in the middle of the path. They look familiar somehow, but you just can't figure out who they are. diff --git a/english/existence/existence.md b/english/unicorn/existence/existence.md similarity index 100% rename from english/existence/existence.md rename to english/unicorn/existence/existence.md diff --git a/english/unicorn/no/no.md b/english/unicorn/no/no.md new file mode 100644 index 0000000000..c3a3298d4e --- /dev/null +++ b/english/unicorn/no/no.md @@ -0,0 +1,3 @@ +You lie and say that you're all out. Keith the Unicorns looks at you suspiciously and says he doesn't believe you. + +You feel awkward and realise that unicorns named Keith are overrated so [you wake up](../existence/existence.md). diff --git a/english/unicorn/thebigquestion/thebigquestion.md b/english/unicorn/thebigquestion/thebigquestion.md new file mode 100644 index 0000000000..88e885480d --- /dev/null +++ b/english/unicorn/thebigquestion/thebigquestion.md @@ -0,0 +1,7 @@ +Keith asks you regretfully for a cigarette. You have a pack but you aren't sure how to respond. + +Do you [give him one?](../yes/yes.md) + +Do you say [no?](../no/no.md) + +Or do you [wake up?](../existence/existence.md) diff --git a/english/unicorn/yes/yes.md b/english/unicorn/yes/yes.md new file mode 100644 index 0000000000..1256cafb59 --- /dev/null +++ b/english/unicorn/yes/yes.md @@ -0,0 +1,3 @@ +Keith the Unicorn looks at you with disgust. "Dude, you know I gave up last week. I thought you were my friend man. You know my dad just died from cancer and that I decided to give up and make a positive change in my life and you just said sure?! You're meant to support me man, I'm dissapointed..." + +You feel awkward, realise that unicorns named Keith are overrated and decide to [wake up](../existence/existence.md). From 86f85e7bff7b8df3f357d1a8a94e07ea9ec87b32 Mon Sep 17 00:00:00 2001 From: Tom Lodge Date: Fri, 29 Apr 2016 18:00:07 +0200 Subject: [PATCH 3270/5486] Spelling correction --- english/unicorn/no/no.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/unicorn/no/no.md b/english/unicorn/no/no.md index c3a3298d4e..06096615cb 100644 --- a/english/unicorn/no/no.md +++ b/english/unicorn/no/no.md @@ -1,3 +1,3 @@ -You lie and say that you're all out. Keith the Unicorns looks at you suspiciously and says he doesn't believe you. +You lie and say that you're all out. Keith the Unicorn looks at you suspiciously and says he doesn't believe you. You feel awkward and realise that unicorns named Keith are overrated so [you wake up](../existence/existence.md). From 5abfd72c9dcc3f4d48e39064a140f18cfa856815 Mon Sep 17 00:00:00 2001 From: Tom Lodge Date: Fri, 29 Apr 2016 18:02:11 +0200 Subject: [PATCH 3271/5486] Remove third option to skip decision --- english/unicorn/thebigquestion/thebigquestion.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/unicorn/thebigquestion/thebigquestion.md b/english/unicorn/thebigquestion/thebigquestion.md index 88e885480d..821bcb460a 100644 --- a/english/unicorn/thebigquestion/thebigquestion.md +++ b/english/unicorn/thebigquestion/thebigquestion.md @@ -2,6 +2,4 @@ Keith asks you regretfully for a cigarette. You have a pack but you aren't sure Do you [give him one?](../yes/yes.md) -Do you say [no?](../no/no.md) - -Or do you [wake up?](../existence/existence.md) +Or do you say [no?](../no/no.md) From 03393cad5f738b756c5208e44047ca33e64e7525 Mon Sep 17 00:00:00 2001 From: Tom Lodge Date: Fri, 29 Apr 2016 18:11:38 +0200 Subject: [PATCH 3272/5486] Edit text to comply with 120 character line limit --- english/unicorn/yes/yes.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/unicorn/yes/yes.md b/english/unicorn/yes/yes.md index 1256cafb59..1de4a9f829 100644 --- a/english/unicorn/yes/yes.md +++ b/english/unicorn/yes/yes.md @@ -1,3 +1,5 @@ -Keith the Unicorn looks at you with disgust. "Dude, you know I gave up last week. I thought you were my friend man. You know my dad just died from cancer and that I decided to give up and make a positive change in my life and you just said sure?! You're meant to support me man, I'm dissapointed..." +Keith the Unicorn looks at you with disgust. "Dude, you know I gave up last week. I thought you were my friend man. You +know my dad just died from cancer and that I decided to give up and make a positive change in my life and you just said +sure? You're meant to support me man, I'm dissapointed..." You feel awkward, realise that unicorns named Keith are overrated and decide to [wake up](../existence/existence.md). From 50da922f101d0f21ff4be3f466d5c4e4b77a83a0 Mon Sep 17 00:00:00 2001 From: Tom Lodge Date: Fri, 29 Apr 2016 18:33:09 +0200 Subject: [PATCH 3273/5486] Shorten line to fit 120 character limit --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 26235e714f..236d45bdd1 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -2,7 +2,8 @@ Your adventure begins. You realize there are hundreds of paths for you to choose Which way should you go? Only you can decide. -Keith the Unicorn approaches you. He looks a little forlorn so you decide to [cheer him up](unicorn/thebigquestion/thebigquestion.md). +Keith the Unicorn approaches you. +He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) Down one path you see a person standing in the middle of the path. They look familiar somehow, but you just can't figure out who they are. From 53f255b180c61c51f1cf763e3025b317c0b8d189 Mon Sep 17 00:00:00 2001 From: jmb Date: Fri, 29 Apr 2016 13:35:29 -0400 Subject: [PATCH 3274/5486] Addyay iceray ispiekray otay igpay atinlay --- pig-latin/arshmallowmay.md | 2 ++ pig-latin/iceray-ispiekray/iceray-ispiekray.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 pig-latin/iceray-ispiekray/iceray-ispiekray.md diff --git a/pig-latin/arshmallowmay.md b/pig-latin/arshmallowmay.md index e06a59f7bd..195bfc97a2 100644 --- a/pig-latin/arshmallowmay.md +++ b/pig-latin/arshmallowmay.md @@ -9,3 +9,5 @@ Oday ouyay: [Ogay ackbay otay eepslay](eepslay/arshmallowmay.md)? [Ixfay ourselfyay ayay upcay ofyay othay ocolatechay](othay-ocolatechay/ocolatechay.md)? + +[akemay iceray ispiekray eatstray](iceray-ispiekray/iceray-ispiekray.md)? diff --git a/pig-latin/iceray-ispiekray/iceray-ispiekray.md b/pig-latin/iceray-ispiekray/iceray-ispiekray.md new file mode 100644 index 0000000000..5f84674e96 --- /dev/null +++ b/pig-latin/iceray-ispiekray/iceray-ispiekray.md @@ -0,0 +1,4 @@ +ybay ixingmay iceray ispieskray andyay utterbay intoyay hetay allway, enthay icingslay hetay allway +intoyay ubescay, youyay ancay etgay outyay ofyay hetay oomray. Urtherfay, youyay areyay ownay +arryingcay ayay astytay eattray! + From 79887b10bd0e912abd9f532d960f2cd2c00437ef Mon Sep 17 00:00:00 2001 From: Jose Lovaglio Date: Fri, 29 Apr 2016 17:14:20 -0700 Subject: [PATCH 3275/5486] =?UTF-8?q?Continuaci=C3=B3n=20de=20la=20histori?= =?UTF-8?q?a=20desde=20'apuntalar'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/muralla/apuntalar/abrid_fuego/abrid_fuego.md | 1 + espanol/muralla/apuntalar/alto_al_fuego/alto_al_fuego.md | 1 + espanol/muralla/apuntalar/apuntalar.md | 9 ++++++++- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 espanol/muralla/apuntalar/abrid_fuego/abrid_fuego.md create mode 100644 espanol/muralla/apuntalar/alto_al_fuego/alto_al_fuego.md diff --git a/espanol/muralla/apuntalar/abrid_fuego/abrid_fuego.md b/espanol/muralla/apuntalar/abrid_fuego/abrid_fuego.md new file mode 100644 index 0000000000..f69f81da80 --- /dev/null +++ b/espanol/muralla/apuntalar/abrid_fuego/abrid_fuego.md @@ -0,0 +1 @@ +En ese momento, una lluvia de flechas cayó sobre los visitantes, creando zumbidos estremecedores que se conjugaban con los gritos de aquellos alcanzados por ellas. \ No newline at end of file diff --git a/espanol/muralla/apuntalar/alto_al_fuego/alto_al_fuego.md b/espanol/muralla/apuntalar/alto_al_fuego/alto_al_fuego.md new file mode 100644 index 0000000000..359a4cd451 --- /dev/null +++ b/espanol/muralla/apuntalar/alto_al_fuego/alto_al_fuego.md @@ -0,0 +1 @@ +En ese momento, el consejero fijó la mirada en uno de los visitantes. Al principio creyó estar equivocado, pero sus sospechas se confirmaron al acercarse los visitantes mas y mas. Entre los visitantes estaba su padre. \ No newline at end of file diff --git a/espanol/muralla/apuntalar/apuntalar.md b/espanol/muralla/apuntalar/apuntalar.md index 6559d628f1..be83351a00 100644 --- a/espanol/muralla/apuntalar/apuntalar.md +++ b/espanol/muralla/apuntalar/apuntalar.md @@ -1 +1,8 @@ -Los soldados apuntalaron la muralla y los arqueros apuntaron a los visitantes desde lo alto de la colmena \ No newline at end of file +Los soldados apuntalaron la muralla y los arqueros apuntaron a los visitantes desde lo alto de la colmena + +En ese momento, el consejero se apresuró a subir a las paredes fortificadas, y con ojos de furia mirando al exterior dijo: + +[Abrid fuego contra todos los enemigos!](abrid_fuego/abrid_fuego.md) + + +[Alto al fuego! estos visitantes son conocidos mios!](alto_al_fuego/alto_al_fuego.md) \ No newline at end of file From c3e81e03d7fef07a3d394f60fd3393420b28840d Mon Sep 17 00:00:00 2001 From: Jose Lovaglio Date: Fri, 29 Apr 2016 17:21:02 -0700 Subject: [PATCH 3276/5486] Shortened lines as per Casey's request --- espanol/muralla/apuntalar/abrid_fuego/abrid_fuego.md | 5 ++++- espanol/muralla/apuntalar/alto_al_fuego/alto_al_fuego.md | 5 ++++- espanol/muralla/apuntalar/apuntalar.md | 7 +++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/espanol/muralla/apuntalar/abrid_fuego/abrid_fuego.md b/espanol/muralla/apuntalar/abrid_fuego/abrid_fuego.md index f69f81da80..60ef5f45f9 100644 --- a/espanol/muralla/apuntalar/abrid_fuego/abrid_fuego.md +++ b/espanol/muralla/apuntalar/abrid_fuego/abrid_fuego.md @@ -1 +1,4 @@ -En ese momento, una lluvia de flechas cayó sobre los visitantes, creando zumbidos estremecedores que se conjugaban con los gritos de aquellos alcanzados por ellas. \ No newline at end of file +En ese momento, una lluvia de flechas cayó sobre +los visitantes, creando zumbidos estremecedores que + se conjugaban con los gritos de aquellos + alcanzados por ellas. \ No newline at end of file diff --git a/espanol/muralla/apuntalar/alto_al_fuego/alto_al_fuego.md b/espanol/muralla/apuntalar/alto_al_fuego/alto_al_fuego.md index 359a4cd451..fc6d8dc162 100644 --- a/espanol/muralla/apuntalar/alto_al_fuego/alto_al_fuego.md +++ b/espanol/muralla/apuntalar/alto_al_fuego/alto_al_fuego.md @@ -1 +1,4 @@ -En ese momento, el consejero fijó la mirada en uno de los visitantes. Al principio creyó estar equivocado, pero sus sospechas se confirmaron al acercarse los visitantes mas y mas. Entre los visitantes estaba su padre. \ No newline at end of file +En ese momento, el consejero fijó la mirada en uno +de los visitantes. Al principio creyó estar equivocado, + pero sus sospechas se confirmaron al acercarse + los visitantes mas y mas. Entre los visitantes estaba su padre. \ No newline at end of file diff --git a/espanol/muralla/apuntalar/apuntalar.md b/espanol/muralla/apuntalar/apuntalar.md index be83351a00..abcdadf9a4 100644 --- a/espanol/muralla/apuntalar/apuntalar.md +++ b/espanol/muralla/apuntalar/apuntalar.md @@ -1,6 +1,9 @@ -Los soldados apuntalaron la muralla y los arqueros apuntaron a los visitantes desde lo alto de la colmena +Los soldados apuntalaron la muralla y los arqueros +apuntaron a los visitantes desde lo alto de la colmena -En ese momento, el consejero se apresuró a subir a las paredes fortificadas, y con ojos de furia mirando al exterior dijo: +En ese momento, el consejero se apresuró a subir +a las paredes fortificadas, y con ojos de furia +mirando al exterior dijo: [Abrid fuego contra todos los enemigos!](abrid_fuego/abrid_fuego.md) From 3f935e2b11ad14be7679569e1090bb2f417dd5da Mon Sep 17 00:00:00 2001 From: Jose Lovaglio Date: Fri, 29 Apr 2016 17:26:55 -0700 Subject: [PATCH 3277/5486] Making changes to have this auto-merged --- espanol/muralla/apuntalar/apuntalar.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/espanol/muralla/apuntalar/apuntalar.md b/espanol/muralla/apuntalar/apuntalar.md index abcdadf9a4..6e72089d79 100644 --- a/espanol/muralla/apuntalar/apuntalar.md +++ b/espanol/muralla/apuntalar/apuntalar.md @@ -1,5 +1,4 @@ -Los soldados apuntalaron la muralla y los arqueros -apuntaron a los visitantes desde lo alto de la colmena +Los soldados apuntalaron la muralla y los arqueros apuntaron a los visitantes desde lo alto de la colmena En ese momento, el consejero se apresuró a subir a las paredes fortificadas, y con ojos de furia From a63e9c9325ba494f9beef6e0b965e2a2af08018c Mon Sep 17 00:00:00 2001 From: krishnappan95 Date: Sat, 30 Apr 2016 11:36:01 +0530 Subject: [PATCH 3278/5486] Story about Rupinder Pal Singh --- english/Rupinderpal/rupinder.md | 4 ++++ english/marshmallow.md | 1 + 2 files changed, 5 insertions(+) create mode 100644 english/Rupinderpal/rupinder.md diff --git a/english/Rupinderpal/rupinder.md b/english/Rupinderpal/rupinder.md new file mode 100644 index 0000000000..aac5d68a19 --- /dev/null +++ b/english/Rupinderpal/rupinder.md @@ -0,0 +1,4 @@ +Rupinderpal is Indian Hockey player +To know more about him click [here](https://en.wikipedia.org/wiki/Rupinder_Pal_Singh) +[twitter profile](https://twitter.com/rupinderbob3?lang=en) +[instagram profile](https://www.instagram.com/rupinderbob3/) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 236d45bdd1..108eef24bf 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -933,3 +933,4 @@ Life is full of [puzzles](LifePuzzle/LifePuzzle.md). You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) + Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) \ No newline at end of file From 555dde3a6677b9c8a8aaedc38c18d5ddf4b1c8fb Mon Sep 17 00:00:00 2001 From: krishnappan95 Date: Sat, 30 Apr 2016 12:09:29 +0530 Subject: [PATCH 3279/5486] Story about Rupinder --- english/Rupinderpal/rupinder.md | 4 ++++ english/marshmallow.md | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/english/Rupinderpal/rupinder.md b/english/Rupinderpal/rupinder.md index aac5d68a19..53f2e38be0 100644 --- a/english/Rupinderpal/rupinder.md +++ b/english/Rupinderpal/rupinder.md @@ -1,4 +1,8 @@ Rupinderpal is Indian Hockey player To know more about him click [here](https://en.wikipedia.org/wiki/Rupinder_Pal_Singh) + + [twitter profile](https://twitter.com/rupinderbob3?lang=en) + + [instagram profile](https://www.instagram.com/rupinderbob3/) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 108eef24bf..b34e5fcedf 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -933,4 +933,5 @@ Life is full of [puzzles](LifePuzzle/LifePuzzle.md). You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) - Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) \ No newline at end of file + +Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) \ No newline at end of file From eb53d5487562b5afadf65899b22e3b39f408c7c8 Mon Sep 17 00:00:00 2001 From: Andrea Mazzarella Date: Sat, 30 Apr 2016 23:10:43 +0100 Subject: [PATCH 3280/5486] Add ho_fame scenario --- Italian/aiuto/aiuto.md | 4 +++- Italian/aiuto/ho_fame/ho_fame.md | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 Italian/aiuto/ho_fame/ho_fame.md diff --git a/Italian/aiuto/aiuto.md b/Italian/aiuto/aiuto.md index 9e9b775cf1..683038da74 100644 --- a/Italian/aiuto/aiuto.md +++ b/Italian/aiuto/aiuto.md @@ -4,4 +4,6 @@ Benvenuto straniero, risponde una voce da sotto il letto!. Come posso aiutarti? [Chi sei](chi/chi.md) -[Come esco da qui](uscita/uscita.md) \ No newline at end of file +[Come esco da qui](uscita/uscita.md) + +[Ho Fame] (ho_fame/ho_fame.md) diff --git a/Italian/aiuto/ho_fame/ho_fame.md b/Italian/aiuto/ho_fame/ho_fame.md new file mode 100644 index 0000000000..0c7fa6c93c --- /dev/null +++ b/Italian/aiuto/ho_fame/ho_fame.md @@ -0,0 +1,5 @@ +L'uomo sotto al letto si butta dalla finestra + +ma mentre se ne va ti mostra la via per trovare cibo + +[Spuntini] (../../spuntini/spuntini.md) From 177f7ef338005446fc7fcb8841c2dcba9c8bb802 Mon Sep 17 00:00:00 2001 From: Travis Heatwole Date: Sat, 30 Apr 2016 15:55:20 -0700 Subject: [PATCH 3281/5486] Add new option for pig latin story. Add a choice for "start eating" after selecting "light fire". --- .../ightlay-irefay/artstay-eatingyay/artstay-eatingyay.md | 7 +++++++ pig-latin/ightlay-irefay/irefay.md | 4 ++++ 2 files changed, 11 insertions(+) create mode 100644 pig-latin/ightlay-irefay/artstay-eatingyay/artstay-eatingyay.md diff --git a/pig-latin/ightlay-irefay/artstay-eatingyay/artstay-eatingyay.md b/pig-latin/ightlay-irefay/artstay-eatingyay/artstay-eatingyay.md new file mode 100644 index 0000000000..b53c410d13 --- /dev/null +++ b/pig-latin/ightlay-irefay/artstay-eatingyay/artstay-eatingyay.md @@ -0,0 +1,7 @@ +You realize this is what you have been waiting for your whole life. Now is your +time to shine! You begin eating the slightly burnt goodness of eight hundred pounds of marshmallows. + +Youyay ealizeray isthay isyay atwhay ouyay avehay eenbay aitingway orfay ouryay +olewhay ifelay. Ownay isyay ouryay imetay otay ineshay! Youyay eginbay +eatingyay ethay ightlyslay urntbay oodnessgay ofyay eightyay undredhay +oundspay ofyay arshmallowsmay. \ No newline at end of file diff --git a/pig-latin/ightlay-irefay/irefay.md b/pig-latin/ightlay-irefay/irefay.md index ac717b5729..f9a3ca773c 100644 --- a/pig-latin/ightlay-irefay/irefay.md +++ b/pig-latin/ightlay-irefay/irefay.md @@ -5,3 +5,7 @@ ecomesbay everyay osay ightlyslay ownbray ustjay aboveyay ethay irefay. Ethay allsway aroundyay youyay eginbay otay eltmay, obsglay ofyay amingflay arshmallowmay allingfay allyay aroundyay youyay. + +Oday ouyay: + +[Ogay ithway ethay owflay andyay artstay eatingyay](artstay-eatingyay/artstay-eatingyay.md)? \ No newline at end of file From b9aad3e499877731368cb57d2cc5347bd37ec873 Mon Sep 17 00:00:00 2001 From: Travis Heatwole Date: Sat, 30 Apr 2016 16:02:58 -0700 Subject: [PATCH 3282/5486] Add new option for pig latin story. Add a choice for "start eating" after selecting "light fire". --- .../ightlay-irefay/artstay-eatingyay/artstay-eatingyay.md | 4 ++++ pig-latin/ightlay-irefay/irefay.md | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 pig-latin/ightlay-irefay/artstay-eatingyay/artstay-eatingyay.md diff --git a/pig-latin/ightlay-irefay/artstay-eatingyay/artstay-eatingyay.md b/pig-latin/ightlay-irefay/artstay-eatingyay/artstay-eatingyay.md new file mode 100644 index 0000000000..421ed7377e --- /dev/null +++ b/pig-latin/ightlay-irefay/artstay-eatingyay/artstay-eatingyay.md @@ -0,0 +1,4 @@ +Youyay ealizeray isthay isyay atwhay ouyay avehay eenbay aitingway orfay ouryay +olewhay ifelay. Ownay isyay ouryay imetay otay ineshay! Youyay eginbay +eatingyay ethay ightlyslay urntbay oodnessgay ofyay eightyay undredhay +oundspay ofyay arshmallowsmay. \ No newline at end of file diff --git a/pig-latin/ightlay-irefay/irefay.md b/pig-latin/ightlay-irefay/irefay.md index ac717b5729..f9a3ca773c 100644 --- a/pig-latin/ightlay-irefay/irefay.md +++ b/pig-latin/ightlay-irefay/irefay.md @@ -5,3 +5,7 @@ ecomesbay everyay osay ightlyslay ownbray ustjay aboveyay ethay irefay. Ethay allsway aroundyay youyay eginbay otay eltmay, obsglay ofyay amingflay arshmallowmay allingfay allyay aroundyay youyay. + +Oday ouyay: + +[Ogay ithway ethay owflay andyay artstay eatingyay](artstay-eatingyay/artstay-eatingyay.md)? \ No newline at end of file From 5d78cb39bba6b6696030fe2faab924a59ffeca85 Mon Sep 17 00:00:00 2001 From: Devakara Date: Sun, 1 May 2016 02:59:01 -0500 Subject: [PATCH 3283/5486] Add new file containing prayer in telugu. --- telugu/prayer-telugu/prayer-telugu.md | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 telugu/prayer-telugu/prayer-telugu.md diff --git a/telugu/prayer-telugu/prayer-telugu.md b/telugu/prayer-telugu/prayer-telugu.md new file mode 100644 index 0000000000..a0f678a632 --- /dev/null +++ b/telugu/prayer-telugu/prayer-telugu.md @@ -0,0 +1,30 @@ +There is not telugu story added as of yet. So, I'll just start the thread by adding a prayer. +ముదా కరాత్తమోదకం సదా విముక్తిసాధకం +కళాధరావతంసకం విలాసిలోకరక్షకమ్ | +అనాయకైకనాయకం వినాశితేభదైత్యకం +నతాశుభాశునాశకం నమామి తం వినాయకమ్ || ౧ || + +నతేతరాతిభీకరం నవోదితార్కభాస్వరం +నమత్సురారినిర్జరం నతాధికాపదుద్ధరమ్ | +సురేశ్వరం నిధీశ్వరం గజేశ్వరం గణేశ్వరం +మహేశ్వరం తమాశ్రయే పరాత్పరం నిరంతరమ్ || ౨ || + +సమస్తలోకశంకరం నిరస్తదైత్యకుంజరం +దరేతరోదరం వరం వరేభవక్త్రమక్షరమ్ | +కృపాకరం క్షమాకరం ముదాకరం యశస్కరం +మనస్కరం నమస్కృతాం నమస్కరోమి భాస్వరమ్ || ౩ || + +అకించనార్తిమార్జనం చిరంతనోక్తిభాజనం +పురారిపూర్వనందనం సురారిగర్వచర్వణమ్ | +ప్రపంచనాశభీషణం ధనంజయాదిభూషణం +కపోలదానవారణం భజే పురాణవారణమ్ || ౪ || + +నితాంతకాంతదంతకాంతిమంతకాంతకాత్మజం +అచింత్యరూపమంతహీనమంతరాయకృంతనమ్ | +హృదంతరే నిరంతరం వసంతమేవ యోగినాం +తమేకదంతమేవ తం విచింతయామి సంతతమ్ || ౫ || + +మహాగణేశపంచరత్నమాదరేణ యోzన్వహం +ప్రజల్పతి ప్రభాతకే హృది స్మరన్గణేశ్వరమ్ | +అరోగతామదోషతాం సుసాహితీం సుపుత్రతాం +సమాహితాయురష్టభూతిమభ్యుపైతి సోచిరాత్ || ౬ || \ No newline at end of file From 1acc9bb472036ade29f1a05c849739cbdc782a08 Mon Sep 17 00:00:00 2001 From: Devakara Date: Sun, 1 May 2016 03:00:38 -0500 Subject: [PATCH 3284/5486] Update telugu file to have correct spelling. --- telugu/prayer-telugu/prayer-telugu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telugu/prayer-telugu/prayer-telugu.md b/telugu/prayer-telugu/prayer-telugu.md index a0f678a632..7564bafc7b 100644 --- a/telugu/prayer-telugu/prayer-telugu.md +++ b/telugu/prayer-telugu/prayer-telugu.md @@ -1,4 +1,4 @@ -There is not telugu story added as of yet. So, I'll just start the thread by adding a prayer. +There is no telugu story added as of yet. So, I'll just start the thread by adding a prayer. ముదా కరాత్తమోదకం సదా విముక్తిసాధకం కళాధరావతంసకం విలాసిలోకరక్షకమ్ | అనాయకైకనాయకం వినాశితేభదైత్యకం From cf36c511d007e86ec2b230c8be38d7835e64c326 Mon Sep 17 00:00:00 2001 From: Devakara Date: Sun, 1 May 2016 03:17:26 -0500 Subject: [PATCH 3285/5486] Update file to link to the prayer page. --- telugu/telangana-telugu/Telanganatelugu.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/telugu/telangana-telugu/Telanganatelugu.md b/telugu/telangana-telugu/Telanganatelugu.md index 8b07f07a76..83e33f0fea 100644 --- a/telugu/telangana-telugu/Telanganatelugu.md +++ b/telugu/telangana-telugu/Telanganatelugu.md @@ -11,4 +11,6 @@ అస్తిత్వాన్ని చాటుకోవడమే. ఇదంతా కవి అంతర్గత, బాహ్య వలసాధిపత్యాలను వ్యతిరేకించే - క్రమంలో చేసే కవితా గానమే. \ No newline at end of file + క్రమంలో చేసే కవితా గానమే. + +Starting with a prayer. Please click [here](telugu/prayer-telugu/prayer-telugu.md). From 2cde8bb8b13c9dc3394d26adb8e6c2e3305897b5 Mon Sep 17 00:00:00 2001 From: Devakara Date: Sun, 1 May 2016 03:24:46 -0500 Subject: [PATCH 3286/5486] Update the link to point to the correct page. --- telugu/telangana-telugu/Telanganatelugu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telugu/telangana-telugu/Telanganatelugu.md b/telugu/telangana-telugu/Telanganatelugu.md index 83e33f0fea..4800635e25 100644 --- a/telugu/telangana-telugu/Telanganatelugu.md +++ b/telugu/telangana-telugu/Telanganatelugu.md @@ -13,4 +13,4 @@ వలసాధిపత్యాలను వ్యతిరేకించే క్రమంలో చేసే కవితా గానమే. -Starting with a prayer. Please click [here](telugu/prayer-telugu/prayer-telugu.md). +Starting with a prayer. Please click [here](../prayer-telugu/prayer-telugu.md). From e4e363760164ea251b57291909421ca4f30b7aa2 Mon Sep 17 00:00:00 2001 From: Akshar Dave Date: Sun, 1 May 2016 16:20:36 +0530 Subject: [PATCH 3287/5486] Add DhoklaStellar Fafda --- Gujarati/DhoklaStellarFafda~/CS.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Gujarati/DhoklaStellarFafda~/CS.md diff --git a/Gujarati/DhoklaStellarFafda~/CS.md b/Gujarati/DhoklaStellarFafda~/CS.md new file mode 100644 index 0000000000..a5b684e200 --- /dev/null +++ b/Gujarati/DhoklaStellarFafda~/CS.md @@ -0,0 +1,8 @@ +//akshar314 +Are we rushing in or going sneaky beaky like... +go go go mf.. + + + + +Go [back to the room]?(../marshmallow.md) \ No newline at end of file From 6de0d8f113c2df8d168957ce20134d66844666fc Mon Sep 17 00:00:00 2001 From: Akshar Dave Date: Sun, 1 May 2016 16:36:44 +0530 Subject: [PATCH 3288/5486] Add DhoklaStellar Fafda --- Gujarati/DhoklaStellarFafda~/CS.md | 1 - 1 file changed, 1 deletion(-) diff --git a/Gujarati/DhoklaStellarFafda~/CS.md b/Gujarati/DhoklaStellarFafda~/CS.md index a5b684e200..68e3da4e93 100644 --- a/Gujarati/DhoklaStellarFafda~/CS.md +++ b/Gujarati/DhoklaStellarFafda~/CS.md @@ -1,4 +1,3 @@ -//akshar314 Are we rushing in or going sneaky beaky like... go go go mf.. From c947de1fce96d1349d63d3b91f7bfd48388fb548 Mon Sep 17 00:00:00 2001 From: Akshar Dave Date: Sun, 1 May 2016 16:45:35 +0530 Subject: [PATCH 3289/5486] Add DhoklaStellar Fafda --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b34e5fcedf..6fbdf0039b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -934,4 +934,6 @@ You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.m A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) -Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) \ No newline at end of file +Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) + +yo [cs](DhoklaStellarFafda~/CS.md) \ No newline at end of file From c0c6a21f7b170cc3ce7e9015afcf8c7a490027d4 Mon Sep 17 00:00:00 2001 From: Akshar Dave Date: Sun, 1 May 2016 16:50:49 +0530 Subject: [PATCH 3290/5486] Add DhoklaStellar Fafda --- Gujarati/gujarati.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gujarati/gujarati.md b/Gujarati/gujarati.md index 9223382af6..4e0f37ead4 100644 --- a/Gujarati/gujarati.md +++ b/Gujarati/gujarati.md @@ -10,4 +10,6 @@ Gujarati language is great. Lord Krishna spoke or led to it. Mahatma Gandhi spok ગુજરાતી ભાષાનાં પરાક્રમી સફરોમાં આપનું સ્વાગત છે. અગણીત સફરો માંથી તમે કયું પસંદ કરશો? તમારી ખરી કસોટી શરુ થાય છે. તમને ખુબ શુભકામના. -[ઉત્તરાયણમાં ખેંચ કે ઢીલ?](ઉત્તરાયણ/ઉત્તરાયણમાં ખેંચ કે ઢીલ.md) \ No newline at end of file +[ઉત્તરાયણમાં ખેંચ કે ઢીલ?](ઉત્તરાયણ/ઉત્તરાયણમાં ખેંચ કે ઢીલ.md) + +[yo](DhoklaStellarFafda~/CS.md) \ No newline at end of file From e41b0248926cffa3eebf1efd0fc8d465a2db3d9c Mon Sep 17 00:00:00 2001 From: Akshar Dave Date: Sun, 1 May 2016 17:04:20 +0530 Subject: [PATCH 3291/5486] Add DhoklaStellar Fafda --- Gujarati/DhoklaStellarFafda~/CS.md | 2 +- Gujarati/gujarati.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gujarati/DhoklaStellarFafda~/CS.md b/Gujarati/DhoklaStellarFafda~/CS.md index 68e3da4e93..d9d984509b 100644 --- a/Gujarati/DhoklaStellarFafda~/CS.md +++ b/Gujarati/DhoklaStellarFafda~/CS.md @@ -4,4 +4,4 @@ go go go mf.. -Go [back to the room]?(../marshmallow.md) \ No newline at end of file +ghar bhegta thaav[click here]?(../gujarati.md) \ No newline at end of file diff --git a/Gujarati/gujarati.md b/Gujarati/gujarati.md index 4e0f37ead4..c679e08e7b 100644 --- a/Gujarati/gujarati.md +++ b/Gujarati/gujarati.md @@ -12,4 +12,4 @@ Gujarati language is great. Lord Krishna spoke or led to it. Mahatma Gandhi spok [ઉત્તરાયણમાં ખેંચ કે ઢીલ?](ઉત્તરાયણ/ઉત્તરાયણમાં ખેંચ કે ઢીલ.md) -[yo](DhoklaStellarFafda~/CS.md) \ No newline at end of file +CS [go here](DhoklaStellarFafda~/CS.md) \ No newline at end of file From 99a28f2de84effe95ee720c1359046ad678bf90e Mon Sep 17 00:00:00 2001 From: Akshar Dave Date: Sun, 1 May 2016 17:09:02 +0530 Subject: [PATCH 3292/5486] Add DhoklaStellar Fafda --- Gujarati/DhoklaStellarFafda~/CS.md | 2 +- english/marshmallow.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Gujarati/DhoklaStellarFafda~/CS.md b/Gujarati/DhoklaStellarFafda~/CS.md index d9d984509b..6428513788 100644 --- a/Gujarati/DhoklaStellarFafda~/CS.md +++ b/Gujarati/DhoklaStellarFafda~/CS.md @@ -4,4 +4,4 @@ go go go mf.. -ghar bhegta thaav[click here]?(../gujarati.md) \ No newline at end of file +ghar bhegta thaav[click here](../gujarati.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 6fbdf0039b..fe7455dac0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -936,4 +936,3 @@ A light appears all around you and something comes into focus in the distance. [ Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) -yo [cs](DhoklaStellarFafda~/CS.md) \ No newline at end of file From 9c3e7d43b2beeed9e303a0ed02bf583f9c076557 Mon Sep 17 00:00:00 2001 From: James Yannotta Date: Sun, 1 May 2016 19:35:13 +0000 Subject: [PATCH 3293/5486] add line about Accupunture --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index fe7455dac0..c5ec1bdf37 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -936,3 +936,4 @@ A light appears all around you and something comes into focus in the distance. [ Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) +If you have read this far, then you must be in pain. Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. From c43d83f8c085b0625f9022f5cced13d04d1207ab Mon Sep 17 00:00:00 2001 From: James Yannotta Date: Sun, 1 May 2016 19:38:59 +0000 Subject: [PATCH 3294/5486] Line was too long --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index c5ec1bdf37..6ac8bfcad4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -936,4 +936,5 @@ A light appears all around you and something comes into focus in the distance. [ Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) -If you have read this far, then you must be in pain. Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. +If you have read this far, then you must be in pain. +Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. From e720c86c25e4f1c663414aa5e3c9b26befa0df0e Mon Sep 17 00:00:00 2001 From: Andrea Finch Date: Sun, 1 May 2016 16:09:21 -0400 Subject: [PATCH 3295/5486] Add additional lines to panic storyline. --- english/friendly-person/panic/panic.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/english/friendly-person/panic/panic.md b/english/friendly-person/panic/panic.md index 9163c89d69..b321e1fba7 100644 --- a/english/friendly-person/panic/panic.md +++ b/english/friendly-person/panic/panic.md @@ -1,3 +1,13 @@ You realize that if you were to get a stuffy nose right now you could suffocate. You hyperventilate through your nose, which only makes it harder to breathe. Starting to to feel light-headed, you fall to your knees; Other You begins to turn in your direction. + +As you fall, you see Other You pull a box out of a pocket and begin to walk in your direction. + +Do you... + +[Scrabble](Scrabble/Scrabble.md) away? + +or + +[Accept the box](Accept-box/Accept-box.md)? From 82ef2f35ed5e72ae4c3b721fd7f2dc3752c3f0ff Mon Sep 17 00:00:00 2001 From: Andrea Finch Date: Sun, 1 May 2016 16:17:33 -0400 Subject: [PATCH 3296/5486] Add Scrabble option to story. --- english/friendly-person/panic/Scrabble/Scrabble.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/friendly-person/panic/Scrabble/Scrabble.md diff --git a/english/friendly-person/panic/Scrabble/Scrabble.md b/english/friendly-person/panic/Scrabble/Scrabble.md new file mode 100644 index 0000000000..62956c30d2 --- /dev/null +++ b/english/friendly-person/panic/Scrabble/Scrabble.md @@ -0,0 +1,3 @@ +You scrabble desperately to get away, but as you do you see that it was actually the box for the board game "Scrabble"... + +Other You sets up the game on a nearby stump to see how well Other You can fare against yourself. \ No newline at end of file From 5cfb7e737226165b3a7751e133b85077279540bb Mon Sep 17 00:00:00 2001 From: Andrea Finch Date: Sun, 1 May 2016 16:18:14 -0400 Subject: [PATCH 3297/5486] Add Accept-box option to story. --- english/friendly-person/panic/Accept-box/Accept-box.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/friendly-person/panic/Accept-box/Accept-box.md diff --git a/english/friendly-person/panic/Accept-box/Accept-box.md b/english/friendly-person/panic/Accept-box/Accept-box.md new file mode 100644 index 0000000000..8147fa30fb --- /dev/null +++ b/english/friendly-person/panic/Accept-box/Accept-box.md @@ -0,0 +1,2 @@ +Other You hands you the box which you promptly opent to find a handkerchief embroidered with your initials. With the +stuffy nose situation resolved and the panic over, you can turn back to the business at hand. \ No newline at end of file From f48aa16a65950bd278c97b8f6245b623b3a3e2d9 Mon Sep 17 00:00:00 2001 From: Andrea Finch Date: Sun, 1 May 2016 16:25:40 -0400 Subject: [PATCH 3298/5486] Reduce the line length in the file for easier reading. --- english/friendly-person/panic/Scrabble/Scrabble.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/friendly-person/panic/Scrabble/Scrabble.md b/english/friendly-person/panic/Scrabble/Scrabble.md index 62956c30d2..48b5c0e6e0 100644 --- a/english/friendly-person/panic/Scrabble/Scrabble.md +++ b/english/friendly-person/panic/Scrabble/Scrabble.md @@ -1,3 +1,4 @@ -You scrabble desperately to get away, but as you do you see that it was actually the box for the board game "Scrabble"... +You scrabble desperately to get away, but as you do you see that it was +actually the box for the board game "Scrabble"... Other You sets up the game on a nearby stump to see how well Other You can fare against yourself. \ No newline at end of file From b25c2a7542fc0bc1bf5275004e44b7c7eb4a340b Mon Sep 17 00:00:00 2001 From: Shan Date: Sun, 1 May 2016 17:39:14 -0400 Subject: [PATCH 3299/5486] Add pinch option --- english/friendly-person/wave/pinch/pinch.md | 1 + english/friendly-person/wave/wave.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/friendly-person/wave/pinch/pinch.md diff --git a/english/friendly-person/wave/pinch/pinch.md b/english/friendly-person/wave/pinch/pinch.md new file mode 100644 index 0000000000..ae5a755ccc --- /dev/null +++ b/english/friendly-person/wave/pinch/pinch.md @@ -0,0 +1 @@ +They ran away! What should you do?! \ No newline at end of file diff --git a/english/friendly-person/wave/wave.md b/english/friendly-person/wave/wave.md index 28ba0878c4..9c9d98a05c 100644 --- a/english/friendly-person/wave/wave.md +++ b/english/friendly-person/wave/wave.md @@ -1,3 +1,5 @@ You do wave, but... OMG! They don't seem to be seeing you at all! -[Throw a rock](throw-rock/throw-rock.md) to get their attention? \ No newline at end of file +[Throw a rock](throw-rock/throw-rock.md) to get their attention? + +[Pinch](pinch/pinch.md) them to get their attention? \ No newline at end of file From b61a16964e93ab662fe9558806669d443b387496 Mon Sep 17 00:00:00 2001 From: Janna Brettingen Date: Mon, 2 May 2016 11:15:00 +0200 Subject: [PATCH 3300/5486] Add choice 'Wach auf und geh zum Oktoberfest' to the option 'Hilfeschrei' --- german/Hilfeschrei/Hilfeschrei.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/german/Hilfeschrei/Hilfeschrei.md b/german/Hilfeschrei/Hilfeschrei.md index abd873da6e..17e07ed4f8 100644 --- a/german/Hilfeschrei/Hilfeschrei.md +++ b/german/Hilfeschrei/Hilfeschrei.md @@ -13,3 +13,5 @@ Werden Sie sich umentscheiden und [zurück zur Auswahl](../ruderboot.md) gehen? dem [Blauwal vertrauen](Vertrauen/Vertrauen-zum-Blauwal.md)? + +[Aus dem Traum aufwachen und Oktoberfest besuchen](../Oktoberfest/oktoberfest.md) From 0610b5aeba8da7cf8ef32436b2d0bcba691e6c87 Mon Sep 17 00:00:00 2001 From: Divyansh Singhvi Date: Mon, 2 May 2016 19:30:04 +0530 Subject: [PATCH 3301/5486] Ask-for-dance --- english/karaoke/karaoke/ask-for-dance/ask-for-dance.md | 9 +++++++++ english/karaoke/karaoke/sing.md | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 english/karaoke/karaoke/ask-for-dance/ask-for-dance.md diff --git a/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md b/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md new file mode 100644 index 0000000000..2d63111b5a --- /dev/null +++ b/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md @@ -0,0 +1,9 @@ +You are full of emotions. First time in your life you got such a response from people and you are very +happy about it and the girl for which you were longing for your entire life.You think +she is very impressed by your song and best time to ask her for a dance.With gathering all +the courage you move towards her and just when you were about to reach her , +the worst happen : +1)You fell +2)Her boyfriend came +3)She passed out +4)You puke on her \ No newline at end of file diff --git a/english/karaoke/karaoke/sing.md b/english/karaoke/karaoke/sing.md index 47d37f6191..a03e4a361d 100644 --- a/english/karaoke/karaoke/sing.md +++ b/english/karaoke/karaoke/sing.md @@ -7,6 +7,8 @@ on your courage. Your eyes meet with the girl of your dreams. Do you: +[ask her for a dance](ask-for-dance/ask-for-dance.md) + [propose to her](propose-to-her/propose-to-her.md) [puke on the mike](puke-on-the-mike/puke-on-the-mike.md) From 675b7a8bb13b1fe38739f19fe188ee3b0e3aabac Mon Sep 17 00:00:00 2001 From: divyanshsinghvi Date: Mon, 2 May 2016 19:33:36 +0530 Subject: [PATCH 3302/5486] proper spacing --- english/karaoke/karaoke/ask-for-dance/ask-for-dance.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md b/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md index 2d63111b5a..f99bfa797c 100644 --- a/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md +++ b/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md @@ -3,7 +3,11 @@ happy about it and the girl for which you were longing for your entire life.You she is very impressed by your song and best time to ask her for a dance.With gathering all the courage you move towards her and just when you were about to reach her , the worst happen : + 1)You fell + 2)Her boyfriend came + 3)She passed out -4)You puke on her \ No newline at end of file + +4)You puke on her From d951208d79a7b2f1ac52539cee96b2f8e717cf1f Mon Sep 17 00:00:00 2001 From: divyanshsinghvi Date: Mon, 2 May 2016 19:39:14 +0530 Subject: [PATCH 3303/5486] ADD ON to the story or add new options New options could be instead of falling 1)you puke on her 2)her boyfriend came --- .../karaoke/karaoke/ask-for-dance/ask-for-dance.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md b/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md index f99bfa797c..2b81bbad64 100644 --- a/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md +++ b/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md @@ -2,12 +2,5 @@ You are full of emotions. First time in your life you got such a response from p happy about it and the girl for which you were longing for your entire life.You think she is very impressed by your song and best time to ask her for a dance.With gathering all the courage you move towards her and just when you were about to reach her , -the worst happen : - -1)You fell - -2)Her boyfriend came - -3)She passed out - -4)You puke on her +the worst happen you fell .And now you are in very embarassing state and in dilemma should I ask her or not. +But just when you were thinking about it , she came to help you and you finally took some courage and asked her . From 049c37babffeb0bdfc63dfd88f4446dea7db8bc7 Mon Sep 17 00:00:00 2001 From: divyanshsinghvi Date: Mon, 2 May 2016 19:42:50 +0530 Subject: [PATCH 3304/5486] ADD ON to the story or add new options --- .../karaoke/karaoke/ask-for-dance/ask-for-dance.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md b/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md index 2b81bbad64..dbe9f550dd 100644 --- a/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md +++ b/english/karaoke/karaoke/ask-for-dance/ask-for-dance.md @@ -1,6 +1,7 @@ You are full of emotions. First time in your life you got such a response from people and you are very -happy about it and the girl for which you were longing for your entire life.You think -she is very impressed by your song and best time to ask her for a dance.With gathering all -the courage you move towards her and just when you were about to reach her , -the worst happen you fell .And now you are in very embarassing state and in dilemma should I ask her or not. -But just when you were thinking about it , she came to help you and you finally took some courage and asked her . +happy about it and the girl for which you were longing for your entire life, you think she is +very impressed by your song and it's best time to ask her for a dance.After gathering all the courage +you move towards her and just when you were about to reach her , the worst happen you fell .And +now you are in very embarassing state and you are are in a dilemma should I ask her or not or.But +just when you were thinking about it , she came to help you and you finally took some courage and asked her . +And she accepted it! From f10e6474dd6c72fd7c9fac3a80d7861a290c6fa5 Mon Sep 17 00:00:00 2001 From: Maryna Date: Mon, 2 May 2016 12:56:33 -0700 Subject: [PATCH 3305/5486] New knife story is with references to alder ones. --- ukrainian/despaired.md | 5 +++++ ukrainian/despaired/desparate.md | 5 +++++ ukrainian/knife/knife.md | 9 +++++++++ ukrainian/marshmallow.md | 4 +++- 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ukrainian/despaired.md create mode 100644 ukrainian/despaired/desparate.md create mode 100644 ukrainian/knife/knife.md diff --git a/ukrainian/despaired.md b/ukrainian/despaired.md new file mode 100644 index 0000000000..40719e4da9 --- /dev/null +++ b/ukrainian/despaired.md @@ -0,0 +1,5 @@ +З'ївши ніж, ти розумієш, що нічого не залишається, як: + +[Взяти мобілочку та перевірити новини у фуйсбуці](../facebook/facebook.md) + +[Взяти телефон та сфоткати все на телефон](../photo/photo.md) \ No newline at end of file diff --git a/ukrainian/despaired/desparate.md b/ukrainian/despaired/desparate.md new file mode 100644 index 0000000000..8619d540f8 --- /dev/null +++ b/ukrainian/despaired/desparate.md @@ -0,0 +1,5 @@ +З'ївши ніж, ти розумієш, що нічого не залишається, як + +Взяти мобілочку та перевірити новини у фуйсбуці.(facebook/facebook.md) + +Взяти телефон та сфоткати все на телефон (photo/photo.md) \ No newline at end of file diff --git a/ukrainian/knife/knife.md b/ukrainian/knife/knife.md new file mode 100644 index 0000000000..666597d69b --- /dev/null +++ b/ukrainian/knife/knife.md @@ -0,0 +1,9 @@ +Виявилося, що ніж із мармеладу. + +[З'їм ніж](despaired/despaired.md) + +[Візьму виделку](./make-a-hole/in-the-wall.md) + +[Розженуся та спробую прорватися крізь одну з стін](./break-through-wall/break-through-wall.md) + + \ No newline at end of file diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 393285d62e..2c8993d7ae 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -1,6 +1,6 @@ Ви прокинулися в дивній кімнаті стіни стеля та підлога в ній зроблені з зефіру. -Продерши очі, ви знайшли поряд із собою: мобілочку, виделку, запальничку та мотузку. +Продерши очі, ви знайшли поряд із собою: мобілочку, виделку, запальничку, ніж та мотузку. Що будете робити? @@ -29,3 +29,5 @@ І, так, я теж не розумію, для чого мотузка, але в голову лізуть підозрілі думки! [Look around](look-around/look-around.md) + +[Спробую прорізати вікну ножем](knife/knife.md) \ No newline at end of file From 77505a4e5abe3f73d2ba47ac5316da10343e6ce1 Mon Sep 17 00:00:00 2001 From: Maryna Date: Mon, 2 May 2016 13:05:04 -0700 Subject: [PATCH 3306/5486] Folder name changed to shorter 'despair'. --- ukrainian/{despaired.md => despair/despair.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ukrainian/{despaired.md => despair/despair.md} (100%) diff --git a/ukrainian/despaired.md b/ukrainian/despair/despair.md similarity index 100% rename from ukrainian/despaired.md rename to ukrainian/despair/despair.md From df8598fe4b4da491a5bc4bac602c78ec24b5f5b9 Mon Sep 17 00:00:00 2001 From: Maryna Date: Mon, 2 May 2016 13:10:17 -0700 Subject: [PATCH 3307/5486] Get rid of bad folder --- ukrainian/despaired/desparate.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 ukrainian/despaired/desparate.md diff --git a/ukrainian/despaired/desparate.md b/ukrainian/despaired/desparate.md deleted file mode 100644 index 8619d540f8..0000000000 --- a/ukrainian/despaired/desparate.md +++ /dev/null @@ -1,5 +0,0 @@ -З'ївши ніж, ти розумієш, що нічого не залишається, як - -Взяти мобілочку та перевірити новини у фуйсбуці.(facebook/facebook.md) - -Взяти телефон та сфоткати все на телефон (photo/photo.md) \ No newline at end of file From 9c991fb1a5f25696fac8b362ecfc5db29872dc32 Mon Sep 17 00:00:00 2001 From: cavilosa Date: Mon, 2 May 2016 13:19:29 -0700 Subject: [PATCH 3308/5486] Typo fix --- ukrainian/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 2c8993d7ae..239abcafbb 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -30,4 +30,4 @@ [Look around](look-around/look-around.md) -[Спробую прорізати вікну ножем](knife/knife.md) \ No newline at end of file +[Спробую прорізати вікнo ножем](knife/knife.md) From 824b02064ff7e87ce964a4a785bd9d31797d2b00 Mon Sep 17 00:00:00 2001 From: Maryna Date: Mon, 2 May 2016 13:26:52 -0700 Subject: [PATCH 3309/5486] Typos fixed --- ukrainian/knife/knife.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ukrainian/knife/knife.md b/ukrainian/knife/knife.md index 666597d69b..60b12e3cb0 100644 --- a/ukrainian/knife/knife.md +++ b/ukrainian/knife/knife.md @@ -1,9 +1,9 @@ Виявилося, що ніж із мармеладу. -[З'їм ніж](despaired/despaired.md) +[З'їм ніж](despair/despair.md) -[Візьму виделку](./make-a-hole/in-the-wall.md) +[Візьму виделку](../make-a-hole/in-the-wall.md) -[Розженуся та спробую прорватися крізь одну з стін](./break-through-wall/break-through-wall.md) +[Розженуся та спробую прорватися крізь одну з стін](../break-through-wall/break-through-wall.md) \ No newline at end of file From 368c5daed54a00e7e8dac80a5aaaaa8e577ae80b Mon Sep 17 00:00:00 2001 From: Maryna Date: Mon, 2 May 2016 13:27:20 -0700 Subject: [PATCH 3310/5486] New commit --- ukrainian/knife/despair/despair.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 ukrainian/knife/despair/despair.md diff --git a/ukrainian/knife/despair/despair.md b/ukrainian/knife/despair/despair.md new file mode 100644 index 0000000000..40719e4da9 --- /dev/null +++ b/ukrainian/knife/despair/despair.md @@ -0,0 +1,5 @@ +З'ївши ніж, ти розумієш, що нічого не залишається, як: + +[Взяти мобілочку та перевірити новини у фуйсбуці](../facebook/facebook.md) + +[Взяти телефон та сфоткати все на телефон](../photo/photo.md) \ No newline at end of file From 1098b8dcb2e10e311938f4192831aa302eba07e5 Mon Sep 17 00:00:00 2001 From: Maryna Date: Mon, 2 May 2016 13:32:58 -0700 Subject: [PATCH 3311/5486] Deletion --- ukrainian/despair/despair.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 ukrainian/despair/despair.md diff --git a/ukrainian/despair/despair.md b/ukrainian/despair/despair.md deleted file mode 100644 index 40719e4da9..0000000000 --- a/ukrainian/despair/despair.md +++ /dev/null @@ -1,5 +0,0 @@ -З'ївши ніж, ти розумієш, що нічого не залишається, як: - -[Взяти мобілочку та перевірити новини у фуйсбуці](../facebook/facebook.md) - -[Взяти телефон та сфоткати все на телефон](../photo/photo.md) \ No newline at end of file From 4deaf720de3adb9727116a272c91f1a5aaab0327 Mon Sep 17 00:00:00 2001 From: crudamcode Date: Mon, 2 May 2016 23:47:12 -0500 Subject: [PATCH 3312/5486] restaurado archivo --- espanol/canudos.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 11df44abe5..035bb786ab 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -41,7 +41,7 @@ and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyA [Subió a la torre](torre/torre.md) -Se cansó de la guerra y decidió alienarse de todo lo material, +Se cansó de la guerra y decidió alienarse de todo lo material, accediendo a un [estado de meditación transcendente](transcender/transcender.md) [Ordenó buscar al Capitán Trueno](capitan/trueno.md) @@ -100,7 +100,7 @@ accediendo a un [estado de meditación transcendente](transcender/transcender.md Al ojearlo, una duda lo emabargó...[¿Qué hago?](duda/duda.md) -Al despertar y enfocar la vista vió lo que había sucedido tras la +Al despertar y enfocar la vista vió lo que había sucedido tras la explosión [que pasó?](explosion/explosion.md) Salió corriendo y no se lo vio nunca más en el reino @@ -113,7 +113,7 @@ A pero si no leiste el cuento del cuco, entonces significa que no tienes [miedo] [Puso su mano derecha en su frente y se teletransportó al centro del ejército enemigo](pelea_epica/pelea_epica.md) -Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. +Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. - [Dark_side](dark_side/dark_side.md) @@ -126,10 +126,10 @@ No tuvo más opción que buscar refuerzos, luchadores incanzables que tuvieran l Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, la guerra no había hecho más que [comenzar](guerra/duracion.md). -"El que tenga rabo de paja ni que lo fajen chiquito", +"El que tenga rabo de paja ni que lo fajen chiquito", dijo el [curandero](curandero/curandero.md)... -Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", +Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", se atrevio a lo que nadie se [imaginó:](Mutantes/Mutantes.md) [Hizo un breve movimiento para llamar a sus ayudantes y](ayudantes/ayudantes.md) @@ -143,3 +143,4 @@ Con sus acrobáticos movimientos y osadas frases Spiderman al no entender que era lo que [pasaba] (realidad/realidad.md) solo [Escapó](escapo/escapo.md) + From d995d40b6e60e93b302ee2b695bb663a7490e625 Mon Sep 17 00:00:00 2001 From: Siddharth Venu Date: Tue, 3 May 2016 15:45:59 +0530 Subject: [PATCH 3313/5486] Add Thirukkural's say about Education and Learning --- Tamil/Learning.txt | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Tamil/Learning.txt diff --git a/Tamil/Learning.txt b/Tamil/Learning.txt new file mode 100644 index 0000000000..fa07cb8cab --- /dev/null +++ b/Tamil/Learning.txt @@ -0,0 +1,32 @@ +திருக்குறள் +=============================================================================== +பால்: பொருட்பால் +அதிகாரம்/Chapter: கல்வி / Learning + +குறள் 391: +கற்க கசடறக் கற்பவை கற்றபின் +நிற்க அதற்குத் தக. + +Let a man learn thoroughly whatever he may learn, and let his conduct be worthy +of his learning. + +குறள் 392: +எண்ணென்ப ஏனை எழுத்தென்ப இவ்விரண்டும் +கண்ணென்ப வாழும் உயிர்க்கு. + +Letters and numbers are the two eyes of man. + +குறள் 393: +கண்ணுடையர் என்பவர் கற்றோர் முகத்திரண்டு +புண்ணுடையர் கல்லா தவர். + +The learned are said to have eyes, but the unlearned have (merely) two sores +in their face. + +குறள் 394: +உவப்பத் தலைக்கூடி உள்ளப் பிரிதல் +அனைத்தே புலவர் தொழில். + +It is the part of the learned to give joy to those whom they meet, and on +leaving, to make them think (Oh! when shall we meet them again). + From ee697ab69df0656aa73a4531f4bd51646917d4eb Mon Sep 17 00:00:00 2001 From: Siddharth Venu Date: Tue, 3 May 2016 16:01:09 +0530 Subject: [PATCH 3314/5486] Fix file extension issues and add link in language.md --- Tamil/{Learning.txt => Thirukkural_Learning/Learning.md} | 0 language.md | 2 ++ 2 files changed, 2 insertions(+) rename Tamil/{Learning.txt => Thirukkural_Learning/Learning.md} (100%) diff --git a/Tamil/Learning.txt b/Tamil/Thirukkural_Learning/Learning.md similarity index 100% rename from Tamil/Learning.txt rename to Tamil/Thirukkural_Learning/Learning.md diff --git a/language.md b/language.md index dcd48cb006..94d6687882 100644 --- a/language.md +++ b/language.md @@ -6,6 +6,8 @@ Nhar mai sai to, [nsit mai wefo](maibrat/tinyi.md) If you speak Telugu, మీరు తెలుగులొ మాట్లాడుతార [ఇక్కడ నొక్కండి](telugu/telangana-telugu/Telanganatelugu.md). +If you understand Tamil, for Thirukural in Education [இங்கே அழுத்தவும்](Tamil/Thirukkural_Learning/Learning.md) + If you understand Tamil, தமிழ் வணக்கம் [இங்கே அழுத்தவும்](Tamil/Thirukural.md) தமிழ் வணக்கம்! To view Tamil Proverb about Friendship [Click Here](Tamil/Thirukural.md) From 021bc63dacaf892de3f9d3ecd9621436a3edfc6b Mon Sep 17 00:00:00 2001 From: Gabriel Rodriguez Date: Tue, 3 May 2016 13:24:54 +0200 Subject: [PATCH 3315/5486] Aniadida opcion sobre lo que los exploradores vieron --- espanol/torre/exploradores/estampida/estampida.md | 1 + espanol/torre/exploradores/exploradores.md | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 espanol/torre/exploradores/estampida/estampida.md diff --git a/espanol/torre/exploradores/estampida/estampida.md b/espanol/torre/exploradores/estampida/estampida.md new file mode 100644 index 0000000000..ce4d185c16 --- /dev/null +++ b/espanol/torre/exploradores/estampida/estampida.md @@ -0,0 +1 @@ +Los elefantes se acercaban a toda velocidad al campamento, debían evacuarlo. diff --git a/espanol/torre/exploradores/exploradores.md b/espanol/torre/exploradores/exploradores.md index d3e6b81481..ef40ae1877 100644 --- a/espanol/torre/exploradores/exploradores.md +++ b/espanol/torre/exploradores/exploradores.md @@ -4,4 +4,14 @@ ejercito. Los exploradores debian ser cuidadosos y acercarse por el costado de la montaña sin ser vistos ya que si el ejercito resultaba ser enemigo esta seria su -ultima misiòn. \ No newline at end of file +ultima misiòn. + +Los exploradores vieron claramente lo que era aquel ejercito: + +Los exploradores volvieron al puesto e informaron de que el ejercito era: + +[Una estampida de elefantes](estampida/estampida.md) + + + + From e6e64406112714d1d671818b08945f206bbabfec Mon Sep 17 00:00:00 2001 From: cavilosa Date: Tue, 3 May 2016 10:22:57 -0700 Subject: [PATCH 3316/5486] Fix in files tree structure --- ukrainian/knife/despair/despair.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ukrainian/knife/despair/despair.md b/ukrainian/knife/despair/despair.md index 40719e4da9..8b57f48dd8 100644 --- a/ukrainian/knife/despair/despair.md +++ b/ukrainian/knife/despair/despair.md @@ -1,5 +1,5 @@ З'ївши ніж, ти розумієш, що нічого не залишається, як: -[Взяти мобілочку та перевірити новини у фуйсбуці](../facebook/facebook.md) +[Взяти мобілочку та перевірити новини у фуйсбуці](../../facebook/facebook.md) -[Взяти телефон та сфоткати все на телефон](../photo/photo.md) \ No newline at end of file +[Взяти телефон та сфоткати все на телефон](../../photo/photo.md) From 763fd6f0f458e1978f12a49eca195f3c8fdee8cd Mon Sep 17 00:00:00 2001 From: cavilosa Date: Tue, 3 May 2016 10:29:58 -0700 Subject: [PATCH 3317/5486] New line instead of line modifications. --- ukrainian/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 239abcafbb..125e6bfd4a 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -1,6 +1,8 @@ Ви прокинулися в дивній кімнаті стіни стеля та підлога в ній зроблені з зефіру. -Продерши очі, ви знайшли поряд із собою: мобілочку, виделку, запальничку, ніж та мотузку. +Продерши очі, ви знайшли поряд із собою: мобілочку, виделку, запальничку та мотузку. + +Поряд з ними лежить блискучий, різний ніж. Що будете робити? From 6593b7f94fed1ee0052d8ca27b1f0914011fc415 Mon Sep 17 00:00:00 2001 From: kopant Date: Tue, 3 May 2016 20:10:25 -0700 Subject: [PATCH 3318/5486] Add option to signup page 'resign thyself' --- english/candyland/obamacare/signup.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/candyland/obamacare/signup.md b/english/candyland/obamacare/signup.md index 6ca3cb3f1c..583269fe47 100644 --- a/english/candyland/obamacare/signup.md +++ b/english/candyland/obamacare/signup.md @@ -7,3 +7,5 @@ The system was always fixed - the little guy always gets screwed. But now's your chance to get back at the man! Free Health Care! Paid for by...oh, the little guy again. Go ahead, eat all the marshmallow stuff, it's too late anyway. + +[Resign thyself](english/candyland/obamacare/hillary/hillary-appears.md) \ No newline at end of file From 0f5d25e6b538b8b14eaad99fc757d666fd1e26b1 Mon Sep 17 00:00:00 2001 From: kopant Date: Tue, 3 May 2016 20:11:53 -0700 Subject: [PATCH 3319/5486] Add page for Hillary Clinton appears --- english/candyland/obamacare/hillary/hillary-appears.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/candyland/obamacare/hillary/hillary-appears.md diff --git a/english/candyland/obamacare/hillary/hillary-appears.md b/english/candyland/obamacare/hillary/hillary-appears.md new file mode 100644 index 0000000000..fb1c6e445f --- /dev/null +++ b/english/candyland/obamacare/hillary/hillary-appears.md @@ -0,0 +1,4 @@ +After passing out from a lack of insulin, you realize that someone is standing over you. It's Hillary Clinton, holding out a cup of grape juice befitted with a straw. +"So you don't spill on yourself," she says. +"Not so fast!" Hillary chastises you as you slurp down the sticky purple liquid greedily. "You'll get brain freeze!" + From b11570869c61808777af12e9c2f57dc5fa7c01db Mon Sep 17 00:00:00 2001 From: kopant Date: Tue, 3 May 2016 20:14:29 -0700 Subject: [PATCH 3320/5486] Fix line breaks --- english/candyland/obamacare/hillary/hillary-appears.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/candyland/obamacare/hillary/hillary-appears.md b/english/candyland/obamacare/hillary/hillary-appears.md index fb1c6e445f..3d29073ee6 100644 --- a/english/candyland/obamacare/hillary/hillary-appears.md +++ b/english/candyland/obamacare/hillary/hillary-appears.md @@ -1,4 +1,6 @@ After passing out from a lack of insulin, you realize that someone is standing over you. It's Hillary Clinton, holding out a cup of grape juice befitted with a straw. + "So you don't spill on yourself," she says. + "Not so fast!" Hillary chastises you as you slurp down the sticky purple liquid greedily. "You'll get brain freeze!" From ea4dd215ab939c6b29184a3cb526bf993133de97 Mon Sep 17 00:00:00 2001 From: kopant Date: Tue, 3 May 2016 20:20:44 -0700 Subject: [PATCH 3321/5486] Add line break --- english/candyland/obamacare/hillary/hillary-appears.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/candyland/obamacare/hillary/hillary-appears.md b/english/candyland/obamacare/hillary/hillary-appears.md index 3d29073ee6..bb25b12ceb 100644 --- a/english/candyland/obamacare/hillary/hillary-appears.md +++ b/english/candyland/obamacare/hillary/hillary-appears.md @@ -1,4 +1,6 @@ -After passing out from a lack of insulin, you realize that someone is standing over you. It's Hillary Clinton, holding out a cup of grape juice befitted with a straw. +After passing out from a lack of insulin, you realize that someone is standing over you. + +It's Hillary Clinton, holding out a cup of grape juice befitted with a straw. "So you don't spill on yourself," she says. From 41bf151b15626c76dd7a9596823066a424fedcb7 Mon Sep 17 00:00:00 2001 From: kopant Date: Tue, 3 May 2016 20:23:47 -0700 Subject: [PATCH 3322/5486] Fix broken link --- english/candyland/obamacare/signup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/candyland/obamacare/signup.md b/english/candyland/obamacare/signup.md index 583269fe47..4c90a61b0b 100644 --- a/english/candyland/obamacare/signup.md +++ b/english/candyland/obamacare/signup.md @@ -8,4 +8,4 @@ But now's your chance to get back at the man! Free Health Care! Paid for by... Go ahead, eat all the marshmallow stuff, it's too late anyway. -[Resign thyself](english/candyland/obamacare/hillary/hillary-appears.md) \ No newline at end of file +[Resign thyself](hillary/hillary-appears.md) \ No newline at end of file From f16bbf00e3a790899264843fbffd101baab131b3 Mon Sep 17 00:00:00 2001 From: Mornay Date: Wed, 4 May 2016 09:40:01 +0100 Subject: [PATCH 3323/5486] Add adventure files for robot help --- english/happy-robot/happy-robot.md | 4 ++++ english/robot-help/refreshments.md | 4 ++++ english/robot-help/robot-weapon.md | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 english/robot-help/refreshments.md create mode 100644 english/robot-help/robot-weapon.md diff --git a/english/happy-robot/happy-robot.md b/english/happy-robot/happy-robot.md index b57eefea19..1caa0abb26 100644 --- a/english/happy-robot/happy-robot.md +++ b/english/happy-robot/happy-robot.md @@ -2,3 +2,7 @@ A happy robot helps people. It was a dark and stormy night. A scream is heard. A happy robot, let's name him "George," wakes up to the sound. "Someone needs my help!" + +He jumps up, but before he rushes out the door he... +a) Grabs a [weapon](robot-help/robot-weapon.md), or +b) Enjoys some [refreshments](robot-help/refreshments.md). \ No newline at end of file diff --git a/english/robot-help/refreshments.md b/english/robot-help/refreshments.md new file mode 100644 index 0000000000..dc81173048 --- /dev/null +++ b/english/robot-help/refreshments.md @@ -0,0 +1,4 @@ +The happy robot thinks he might need some 'assistance' to help anyone that might be in trouble. + +He opts for the Super-strength skinny latte. +But he is also considering the Increased Voice Control Smoothie. \ No newline at end of file diff --git a/english/robot-help/robot-weapon.md b/english/robot-help/robot-weapon.md new file mode 100644 index 0000000000..f18eb4b4e4 --- /dev/null +++ b/english/robot-help/robot-weapon.md @@ -0,0 +1,4 @@ +Now what shall the happy robot need if there is a possible fight, to defend himself? + +Should he go for the Reverse-gravity Exploder, to take away their weapons? +Or should he use the Alternate-dimension Ripple Gun instead, to send them temporarily away from the scene? \ No newline at end of file From cb4b5446e1bd194166f30a25ec56c1a95a0ff295 Mon Sep 17 00:00:00 2001 From: Mornay Date: Wed, 4 May 2016 10:09:26 +0100 Subject: [PATCH 3324/5486] Adding extra lines and checking links --- english/happy-robot/happy-robot.md | 1 + english/robot-help/refreshments.md | 1 + english/robot-help/robot-weapon.md | 1 + 3 files changed, 3 insertions(+) diff --git a/english/happy-robot/happy-robot.md b/english/happy-robot/happy-robot.md index 1caa0abb26..168ebb9b2a 100644 --- a/english/happy-robot/happy-robot.md +++ b/english/happy-robot/happy-robot.md @@ -5,4 +5,5 @@ It was a dark and stormy night. A scream is heard. A happy robot, let's name h He jumps up, but before he rushes out the door he... a) Grabs a [weapon](robot-help/robot-weapon.md), or + b) Enjoys some [refreshments](robot-help/refreshments.md). \ No newline at end of file diff --git a/english/robot-help/refreshments.md b/english/robot-help/refreshments.md index dc81173048..2f8488c482 100644 --- a/english/robot-help/refreshments.md +++ b/english/robot-help/refreshments.md @@ -1,4 +1,5 @@ The happy robot thinks he might need some 'assistance' to help anyone that might be in trouble. He opts for the Super-strength skinny latte. + But he is also considering the Increased Voice Control Smoothie. \ No newline at end of file diff --git a/english/robot-help/robot-weapon.md b/english/robot-help/robot-weapon.md index f18eb4b4e4..035eacdca7 100644 --- a/english/robot-help/robot-weapon.md +++ b/english/robot-help/robot-weapon.md @@ -1,4 +1,5 @@ Now what shall the happy robot need if there is a possible fight, to defend himself? Should he go for the Reverse-gravity Exploder, to take away their weapons? + Or should he use the Alternate-dimension Ripple Gun instead, to send them temporarily away from the scene? \ No newline at end of file From 7c01a56bcfdaab2d633781db190965bf400f1d94 Mon Sep 17 00:00:00 2001 From: Mornay Date: Wed, 4 May 2016 10:26:24 +0100 Subject: [PATCH 3325/5486] Move refreshments file to separate directory. --- english/robot-refresh/refreshments.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/robot-refresh/refreshments.md diff --git a/english/robot-refresh/refreshments.md b/english/robot-refresh/refreshments.md new file mode 100644 index 0000000000..2f8488c482 --- /dev/null +++ b/english/robot-refresh/refreshments.md @@ -0,0 +1,5 @@ +The happy robot thinks he might need some 'assistance' to help anyone that might be in trouble. + +He opts for the Super-strength skinny latte. + +But he is also considering the Increased Voice Control Smoothie. \ No newline at end of file From 0841009ef1321c956c6ca50d79cd2cf98d3b38f7 Mon Sep 17 00:00:00 2001 From: Mornay Date: Wed, 4 May 2016 10:30:09 +0100 Subject: [PATCH 3326/5486] Update links to main directories instead of sub-directory --- english/happy-robot/happy-robot.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/happy-robot/happy-robot.md b/english/happy-robot/happy-robot.md index 168ebb9b2a..e52055a3a3 100644 --- a/english/happy-robot/happy-robot.md +++ b/english/happy-robot/happy-robot.md @@ -4,6 +4,6 @@ It was a dark and stormy night. A scream is heard. A happy robot, let's name h "Someone needs my help!" He jumps up, but before he rushes out the door he... -a) Grabs a [weapon](robot-help/robot-weapon.md), or +a) Grabs a [weapon](./robot-help/robot-weapon.md), or -b) Enjoys some [refreshments](robot-help/refreshments.md). \ No newline at end of file +b) Enjoys some [refreshments](./robot-help/refreshments.md). \ No newline at end of file From dda79d1339d1434e406a703cb43853412dcd1ac2 Mon Sep 17 00:00:00 2001 From: Mornay Date: Wed, 4 May 2016 10:34:17 +0100 Subject: [PATCH 3327/5486] delete refreshments duplicate --- english/robot-help/refreshments.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 english/robot-help/refreshments.md diff --git a/english/robot-help/refreshments.md b/english/robot-help/refreshments.md deleted file mode 100644 index 2f8488c482..0000000000 --- a/english/robot-help/refreshments.md +++ /dev/null @@ -1,5 +0,0 @@ -The happy robot thinks he might need some 'assistance' to help anyone that might be in trouble. - -He opts for the Super-strength skinny latte. - -But he is also considering the Increased Voice Control Smoothie. \ No newline at end of file From eca9d08d683aa9c1e6960abd902c469eee4021a2 Mon Sep 17 00:00:00 2001 From: Mornay Date: Wed, 4 May 2016 10:39:15 +0100 Subject: [PATCH 3328/5486] Move weapons and refreshments folders to happy-robot sub --- english/{ => happy-robot}/robot-help/robot-weapon.md | 0 english/{ => happy-robot}/robot-refresh/refreshments.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename english/{ => happy-robot}/robot-help/robot-weapon.md (100%) rename english/{ => happy-robot}/robot-refresh/refreshments.md (100%) diff --git a/english/robot-help/robot-weapon.md b/english/happy-robot/robot-help/robot-weapon.md similarity index 100% rename from english/robot-help/robot-weapon.md rename to english/happy-robot/robot-help/robot-weapon.md diff --git a/english/robot-refresh/refreshments.md b/english/happy-robot/robot-refresh/refreshments.md similarity index 100% rename from english/robot-refresh/refreshments.md rename to english/happy-robot/robot-refresh/refreshments.md From 2d4d33be293e9ae23de6a4cdbfaf8c27b3b2f933 Mon Sep 17 00:00:00 2001 From: Mornay Date: Wed, 4 May 2016 10:43:01 +0100 Subject: [PATCH 3329/5486] Link to refreshments updated --- english/happy-robot/happy-robot.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/happy-robot/happy-robot.md b/english/happy-robot/happy-robot.md index e52055a3a3..c4f6ef70e4 100644 --- a/english/happy-robot/happy-robot.md +++ b/english/happy-robot/happy-robot.md @@ -6,4 +6,4 @@ It was a dark and stormy night. A scream is heard. A happy robot, let's name h He jumps up, but before he rushes out the door he... a) Grabs a [weapon](./robot-help/robot-weapon.md), or -b) Enjoys some [refreshments](./robot-help/refreshments.md). \ No newline at end of file +b) Enjoys some [refreshments](./robot-refresh/refreshments.md). \ No newline at end of file From 39ba40257e7c9655b09e748221a3cec39ada049e Mon Sep 17 00:00:00 2001 From: mangowolf Date: Wed, 4 May 2016 15:03:22 -0700 Subject: [PATCH 3330/5486] Update Stargate with GateDial --- english/stargate/GateDial.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/stargate/GateDial.md diff --git a/english/stargate/GateDial.md b/english/stargate/GateDial.md new file mode 100644 index 0000000000..84d31f006d --- /dev/null +++ b/english/stargate/GateDial.md @@ -0,0 +1,5 @@ +Before you stands the Stargate's control panel, giving you access to the universe. One last symbol remains to activate the dial, which symbol will you choose? + +1. Triangle[../triangle/TundraWorld.md] + +2. Circle[../circle/JungleWorld.md] \ No newline at end of file From c4dcc2939f2175a1598087776fb00d21cc822416 Mon Sep 17 00:00:00 2001 From: mangowolf Date: Wed, 4 May 2016 15:04:00 -0700 Subject: [PATCH 3331/5486] Update Stargate with Jungleworld --- english/stargate/circle/JungleWorld.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/stargate/circle/JungleWorld.md diff --git a/english/stargate/circle/JungleWorld.md b/english/stargate/circle/JungleWorld.md new file mode 100644 index 0000000000..a964b4662b --- /dev/null +++ b/english/stargate/circle/JungleWorld.md @@ -0,0 +1 @@ +Entering in the symbol for Circle, the gate spins and locks in the last symbol. You enter and arrive on a Jungle world and are immediately surrounded by raptor like creatures eyeing you as their next meal. \ No newline at end of file From 116bc69351f3a06b89290bff758c0b5b51d6a05d Mon Sep 17 00:00:00 2001 From: mangowolf Date: Wed, 4 May 2016 15:04:47 -0700 Subject: [PATCH 3332/5486] Update Stargate with Tundraworld --- english/stargate/triangle/TundraWorld.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/stargate/triangle/TundraWorld.md diff --git a/english/stargate/triangle/TundraWorld.md b/english/stargate/triangle/TundraWorld.md new file mode 100644 index 0000000000..ad10206c51 --- /dev/null +++ b/english/stargate/triangle/TundraWorld.md @@ -0,0 +1 @@ +You enter in the Triangle symbol and the gate dial spins, locking into place. The gate comes to life, projecting a water like substance before settling down. You enter the gate and arrive in an near inhospitipal Tundra world. \ No newline at end of file From 75f4591530a586afd51bd96ebb8d58cbe3210c2c Mon Sep 17 00:00:00 2001 From: Linh Stars Date: Thu, 5 May 2016 00:48:48 +0200 Subject: [PATCH 3333/5486] Add more lines in the story --- vietnamese/Hai-Phong/Hai_Phong_thanh_pho_cang.md | 1 + vietnamese/haloi/toi_la_nguoi_ha_loi_goc.md | 1 + vietnamese/kechuyen.md | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 vietnamese/Hai-Phong/Hai_Phong_thanh_pho_cang.md create mode 100644 vietnamese/haloi/toi_la_nguoi_ha_loi_goc.md diff --git a/vietnamese/Hai-Phong/Hai_Phong_thanh_pho_cang.md b/vietnamese/Hai-Phong/Hai_Phong_thanh_pho_cang.md new file mode 100644 index 0000000000..607564e702 --- /dev/null +++ b/vietnamese/Hai-Phong/Hai_Phong_thanh_pho_cang.md @@ -0,0 +1 @@ +Hải Phòng là một thành phố với những nét đặc trưng riêng biệt diff --git a/vietnamese/haloi/toi_la_nguoi_ha_loi_goc.md b/vietnamese/haloi/toi_la_nguoi_ha_loi_goc.md new file mode 100644 index 0000000000..fc884b6b62 --- /dev/null +++ b/vietnamese/haloi/toi_la_nguoi_ha_loi_goc.md @@ -0,0 +1 @@ +Quê gốc của tôi không phải ở Hà Nội, mà là Hải Phòng, tôi vừa nói dối đấy diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index a816e8bc7d..d47168822a 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -14,4 +14,6 @@ Tôi biết Tiền Giang rất đẹp, Quê tôi thì ở [Đà Nẵng](DaNang/D Nhưng hiện tại thì tôi rời xa Đà Nẵng từ nhỏ và đang sống ở [Sài Gòn](SaiGon/SaiGon.md) -Nhắc tới Sài Gòn, không thể không nhắc tới [Cà phê bệt](https://www.youtube.com/watch?v=avJk5KnEpaY) nhỉ? \ No newline at end of file +Nhắc tới Sài Gòn, không thể không nhắc tới [Cà phê bệt](https://www.youtube.com/watch?v=avJk5KnEpaY) nhỉ? + +Tôi thì chưa từng đến Sài Gòn, tôi là người [Hà Lội gốc](haloi/toi_la_nguoi_ha_loi_goc.md), rể [Hải Phòng](Hai-Phong/Hai_Phong_thanh_pho_cang.md) From f37d34dca866ba2ae9c69bcdf176b6a27871da39 Mon Sep 17 00:00:00 2001 From: mangowolf Date: Wed, 4 May 2016 15:52:15 -0700 Subject: [PATCH 3334/5486] Update all Stargate files to be under 120 Chars --- english/stargate/GateDial.md | 3 ++- english/stargate/circle/JungleWorld.md | 4 +++- english/stargate/triangle/TundraWorld.md | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/english/stargate/GateDial.md b/english/stargate/GateDial.md index 84d31f006d..16bd482a9d 100644 --- a/english/stargate/GateDial.md +++ b/english/stargate/GateDial.md @@ -1,4 +1,5 @@ -Before you stands the Stargate's control panel, giving you access to the universe. One last symbol remains to activate the dial, which symbol will you choose? +Before you stands the Stargate's control panel, giving you access to the universe. +One last symbol remains to activate the dial, which symbol will you choose? 1. Triangle[../triangle/TundraWorld.md] diff --git a/english/stargate/circle/JungleWorld.md b/english/stargate/circle/JungleWorld.md index a964b4662b..0f80382e3c 100644 --- a/english/stargate/circle/JungleWorld.md +++ b/english/stargate/circle/JungleWorld.md @@ -1 +1,3 @@ -Entering in the symbol for Circle, the gate spins and locks in the last symbol. You enter and arrive on a Jungle world and are immediately surrounded by raptor like creatures eyeing you as their next meal. \ No newline at end of file +Entering in the symbol for Circle, the gate spins and locks in the last symbol. +You enter and arrive on a Jungle world and are immediately surrounded by raptor like +creatures eyeing you as their next meal. \ No newline at end of file diff --git a/english/stargate/triangle/TundraWorld.md b/english/stargate/triangle/TundraWorld.md index ad10206c51..effc224ba6 100644 --- a/english/stargate/triangle/TundraWorld.md +++ b/english/stargate/triangle/TundraWorld.md @@ -1 +1,3 @@ -You enter in the Triangle symbol and the gate dial spins, locking into place. The gate comes to life, projecting a water like substance before settling down. You enter the gate and arrive in an near inhospitipal Tundra world. \ No newline at end of file +You enter in the Triangle symbol and the gate dial spins, locking into place. +The gate comes to life, projecting a water like substance before settling down. +You enter the gate and arrive in an near inhospitipal Tundra world. \ No newline at end of file From b352e5c8981f7c89c898daf13b44137fa510247b Mon Sep 17 00:00:00 2001 From: Linh Stars Date: Thu, 5 May 2016 00:58:11 +0200 Subject: [PATCH 3335/5486] Create a new Ha-Noi directory and move the page to that --- vietnamese/{haloi => Ha-Noi}/toi_la_nguoi_ha_loi_goc.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename vietnamese/{haloi => Ha-Noi}/toi_la_nguoi_ha_loi_goc.md (100%) diff --git a/vietnamese/haloi/toi_la_nguoi_ha_loi_goc.md b/vietnamese/Ha-Noi/toi_la_nguoi_ha_loi_goc.md similarity index 100% rename from vietnamese/haloi/toi_la_nguoi_ha_loi_goc.md rename to vietnamese/Ha-Noi/toi_la_nguoi_ha_loi_goc.md From 7137c1e61ce05e0b717df23270e01603067e0e52 Mon Sep 17 00:00:00 2001 From: Linh Stars Date: Thu, 5 May 2016 01:00:12 +0200 Subject: [PATCH 3336/5486] Correct the story to make it conform the guideline --- vietnamese/kechuyen.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index d47168822a..ec8c662cb3 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -16,4 +16,6 @@ Nhưng hiện tại thì tôi rời xa Đà Nẵng từ nhỏ và đang sống Nhắc tới Sài Gòn, không thể không nhắc tới [Cà phê bệt](https://www.youtube.com/watch?v=avJk5KnEpaY) nhỉ? -Tôi thì chưa từng đến Sài Gòn, tôi là người [Hà Lội gốc](haloi/toi_la_nguoi_ha_loi_goc.md), rể [Hải Phòng](Hai-Phong/Hai_Phong_thanh_pho_cang.md) +Tôi thì chưa từng đến Sài Gòn, tôi là người [Hà Nội gốc](Ha-Noi/toi_la_nguoi_ha_loi_goc.md). + +Nhưng tôi là rể [Hải Phòng](Hai-Phong/Hai_Phong_thanh_pho_cang.md) From 912f4c6b79a199ad77706057411507f2e07a5762 Mon Sep 17 00:00:00 2001 From: mangowolf Date: Wed, 4 May 2016 16:13:35 -0700 Subject: [PATCH 3337/5486] Updated Marshmallow with Stargate Link. --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6ac8bfcad4..decf9c1a5e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -938,3 +938,5 @@ Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) If you have read this far, then you must be in pain. Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. + +As you approach the [Stargate](stargate/gatedial.md) with trepidation, you can hear the troops getting closer. \ No newline at end of file From 0f3e55a54b66fa820906a158d2fed84295469b39 Mon Sep 17 00:00:00 2001 From: mangowolf Date: Wed, 4 May 2016 16:24:27 -0700 Subject: [PATCH 3338/5486] Updated link in marshmallow --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index decf9c1a5e..b7caed35eb 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -939,4 +939,4 @@ Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) If you have read this far, then you must be in pain. Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. -As you approach the [Stargate](stargate/gatedial.md) with trepidation, you can hear the troops getting closer. \ No newline at end of file +As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. \ No newline at end of file From 5817f6fe6a259f2d7ff7f8b7a3651ba9a0ba6d0f Mon Sep 17 00:00:00 2001 From: mangowolf Date: Wed, 4 May 2016 16:27:36 -0700 Subject: [PATCH 3339/5486] Updated GateDial.md links --- english/stargate/GateDial.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/stargate/GateDial.md b/english/stargate/GateDial.md index 16bd482a9d..53ecfacbf4 100644 --- a/english/stargate/GateDial.md +++ b/english/stargate/GateDial.md @@ -1,6 +1,6 @@ Before you stands the Stargate's control panel, giving you access to the universe. One last symbol remains to activate the dial, which symbol will you choose? -1. Triangle[../triangle/TundraWorld.md] +1. [Triangle](triangle/TundraWorld.md) -2. Circle[../circle/JungleWorld.md] \ No newline at end of file +2. [Circle](circle/JungleWorld.md) \ No newline at end of file From c6de8ebe43b5f0e9e4fa0bd1d258c0cb02f15ab2 Mon Sep 17 00:00:00 2001 From: Maryna Kalachova Date: Thu, 5 May 2016 01:47:41 -0400 Subject: [PATCH 3340/5486] Add hunger feeling --- russian/hunger/feel-hunger.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 russian/hunger/feel-hunger.md diff --git a/russian/hunger/feel-hunger.md b/russian/hunger/feel-hunger.md new file mode 100644 index 0000000000..dd1afbefe1 --- /dev/null +++ b/russian/hunger/feel-hunger.md @@ -0,0 +1,4 @@ +В животе бурчит явно не тромбон. Очень хочется кушать, а сладкого-то вы не едите. + +Ваши действия: + From 197c6b5444da79f5e63c6d26353d772793d78178 Mon Sep 17 00:00:00 2001 From: Maryna Kalachova Date: Thu, 5 May 2016 01:48:57 -0400 Subject: [PATCH 3341/5486] Add options to look for other food or to eat marshmallow --- russian/hunger/feel-hunger.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/hunger/feel-hunger.md b/russian/hunger/feel-hunger.md index dd1afbefe1..684fcb5241 100644 --- a/russian/hunger/feel-hunger.md +++ b/russian/hunger/feel-hunger.md @@ -2,3 +2,5 @@ Ваши действия: +[Отправиться на поиски солененького] (salty/look-for-salty.md) +[Фиг с фигурой, буду есть зефирки] (diet/bye-bye-diet.md) \ No newline at end of file From 0630fff7910737d9d890c276834326a2ee43a754 Mon Sep 17 00:00:00 2001 From: Maryna Kalachova Date: Thu, 5 May 2016 01:53:34 -0400 Subject: [PATCH 3342/5486] Add junk food --- russian/hunger/salty/look-for-salty.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 russian/hunger/salty/look-for-salty.md diff --git a/russian/hunger/salty/look-for-salty.md b/russian/hunger/salty/look-for-salty.md new file mode 100644 index 0000000000..e1fee4be94 --- /dev/null +++ b/russian/hunger/salty/look-for-salty.md @@ -0,0 +1 @@ +Вы выходите из зефирной комнаты и попадаете в чипсовую. Через полчаса одной стенки уже нет... \ No newline at end of file From de92c84a88c9722a94768705fea1c5986a4100cb Mon Sep 17 00:00:00 2001 From: rwenor Date: Thu, 5 May 2016 10:27:22 +0200 Subject: [PATCH 3343/5486] Faller i vannet --- norwegian/faller/faller.md | 3 +++ norwegian/start.md | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 norwegian/faller/faller.md diff --git a/norwegian/faller/faller.md b/norwegian/faller/faller.md new file mode 100644 index 0000000000..d8f7a5e01f --- /dev/null +++ b/norwegian/faller/faller.md @@ -0,0 +1,3 @@ +Når jeg går tilbake til stranda sklir jeg på en stein og detter i vannet. + +... diff --git a/norwegian/start.md b/norwegian/start.md index 12eead6990..9af3230066 100644 --- a/norwegian/start.md +++ b/norwegian/start.md @@ -7,3 +7,6 @@ Du sitter på en stein i vannkanten og ser noe flyte i fjæra. En måke skrikker over deg, det er da du ser meg. Jeg går ned i fjæra og plukker opp gjennstanden som fløyt der. + + +[faller i vannet](faller/faller.md) From e6dbe2405a08dc318c65354a822bb5c87d951042 Mon Sep 17 00:00:00 2001 From: Maryna Kalachova Date: Thu, 5 May 2016 12:57:25 -0400 Subject: [PATCH 3344/5486] Add bye-bye diet choice --- russian/hunger/diet/bye-bye-diet.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 russian/hunger/diet/bye-bye-diet.md diff --git a/russian/hunger/diet/bye-bye-diet.md b/russian/hunger/diet/bye-bye-diet.md new file mode 100644 index 0000000000..de63603320 --- /dev/null +++ b/russian/hunger/diet/bye-bye-diet.md @@ -0,0 +1 @@ +Через какое-то время объедания вы понимаее, что, чтобы пройти в дверной проем, вам придется его сьесть. \ No newline at end of file From 7156c3f88317fce55b8775a2c67a58f906acfc31 Mon Sep 17 00:00:00 2001 From: Karthik Date: Thu, 5 May 2016 22:47:05 +0530 Subject: [PATCH 3345/5486] Health and Life Quotes --- english/health/Life-Quotes/life-quotes.md | 1 + english/health/health.md | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 english/health/Life-Quotes/life-quotes.md create mode 100644 english/health/health.md diff --git a/english/health/Life-Quotes/life-quotes.md b/english/health/Life-Quotes/life-quotes.md new file mode 100644 index 0000000000..4c4660f0b0 --- /dev/null +++ b/english/health/Life-Quotes/life-quotes.md @@ -0,0 +1 @@ +Do not dwell in the past, do not dream of the future, concentrate the mind on the present moment. \ No newline at end of file diff --git a/english/health/health.md b/english/health/health.md new file mode 100644 index 0000000000..34d8bbe2d2 --- /dev/null +++ b/english/health/health.md @@ -0,0 +1,4 @@ +Quote 1: +Being in control of your life and having realistic expectations about your day-to-day challenges are the keys to stress management, which is perhaps the most important ingredient to living a happy, healthy and rewarding life. + +[Quote 2:](Life-Quotes/life-quotes.md) \ No newline at end of file From 53f0bc48dedf5f1b837b6169687c87dfdf9af256 Mon Sep 17 00:00:00 2001 From: Karthik Date: Thu, 5 May 2016 22:59:10 +0530 Subject: [PATCH 3346/5486] Please review this, @casey-collab --- english/health/health.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/health/health.md b/english/health/health.md index 34d8bbe2d2..08ecc0d48a 100644 --- a/english/health/health.md +++ b/english/health/health.md @@ -1,4 +1,4 @@ Quote 1: -Being in control of your life and having realistic expectations about your day-to-day challenges are the keys to stress management, which is perhaps the most important ingredient to living a happy, healthy and rewarding life. +Life is really simple, but we insist on making it complicated. [Quote 2:](Life-Quotes/life-quotes.md) \ No newline at end of file From fe40b536df39b6eccb28b0244be5ebd6b9ae13c7 Mon Sep 17 00:00:00 2001 From: Maryna Kalachova Date: Thu, 5 May 2016 13:41:52 -0400 Subject: [PATCH 3347/5486] Add a line separator --- russian/hunger/feel-hunger.md | 1 + 1 file changed, 1 insertion(+) diff --git a/russian/hunger/feel-hunger.md b/russian/hunger/feel-hunger.md index 684fcb5241..3fa3242a06 100644 --- a/russian/hunger/feel-hunger.md +++ b/russian/hunger/feel-hunger.md @@ -3,4 +3,5 @@ Ваши действия: [Отправиться на поиски солененького] (salty/look-for-salty.md) + [Фиг с фигурой, буду есть зефирки] (diet/bye-bye-diet.md) \ No newline at end of file From be34b46a618e38b5f15f538a4efc1e81d5291dfe Mon Sep 17 00:00:00 2001 From: Karthik Date: Thu, 5 May 2016 23:14:45 +0530 Subject: [PATCH 3348/5486] Updated marshmallow --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b7caed35eb..32c2f64b2e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -939,4 +939,6 @@ Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) If you have read this far, then you must be in pain. Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. -As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. \ No newline at end of file +As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. + +Health and Life Lovely [Quotes](./health/health.md) \ No newline at end of file From 61bd4f3e1f095ee40d1d8b54950d017ac3bd34fb Mon Sep 17 00:00:00 2001 From: Maryna Kalachova Date: Thu, 5 May 2016 13:56:21 -0400 Subject: [PATCH 3349/5486] Add path to the hunger file from the language page --- russian/zefir.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/zefir.md b/russian/zefir.md index ceb6b5404f..07c4c1d15b 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -84,4 +84,6 @@ [Открою Instagram](instagram/instagram.md) -[Бросить "уделанную" футболку Slayer в стирку и отправиться на заутреннюю молитву](prayer/morning_prayer.md) \ No newline at end of file +[Бросить "уделанную" футболку Slayer в стирку и отправиться на заутреннюю молитву](prayer/morning_prayer.md) + +[Почувствуете ужасный голод] (hunger/feel-hunger.md) \ No newline at end of file From 90fcba19654ec507a8c7eed1d1933cf4abba73e1 Mon Sep 17 00:00:00 2001 From: Maryna Kalachova Date: Thu, 5 May 2016 14:03:30 -0400 Subject: [PATCH 3350/5486] Revert "Add path to the hunger file from the language page" This reverts commit 61bd4f3e1f095ee40d1d8b54950d017ac3bd34fb. --- russian/zefir.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/russian/zefir.md b/russian/zefir.md index 07c4c1d15b..ceb6b5404f 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -84,6 +84,4 @@ [Открою Instagram](instagram/instagram.md) -[Бросить "уделанную" футболку Slayer в стирку и отправиться на заутреннюю молитву](prayer/morning_prayer.md) - -[Почувствуете ужасный голод] (hunger/feel-hunger.md) \ No newline at end of file +[Бросить "уделанную" футболку Slayer в стирку и отправиться на заутреннюю молитву](prayer/morning_prayer.md) \ No newline at end of file From c09db3970fd94e00d48f32a6fbb703e7cea4aefc Mon Sep 17 00:00:00 2001 From: Maryna Kalachova Date: Thu, 5 May 2016 14:08:08 -0400 Subject: [PATCH 3351/5486] Add path to hunger file from language file --- russian/zefir.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/zefir.md b/russian/zefir.md index ceb6b5404f..07c4c1d15b 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -84,4 +84,6 @@ [Открою Instagram](instagram/instagram.md) -[Бросить "уделанную" футболку Slayer в стирку и отправиться на заутреннюю молитву](prayer/morning_prayer.md) \ No newline at end of file +[Бросить "уделанную" футболку Slayer в стирку и отправиться на заутреннюю молитву](prayer/morning_prayer.md) + +[Почувствуете ужасный голод] (hunger/feel-hunger.md) \ No newline at end of file From f2a615a7a59ab594d41bdd3a1ff4d1cec46e4175 Mon Sep 17 00:00:00 2001 From: David Borrell Date: Fri, 6 May 2016 12:48:15 +0200 Subject: [PATCH 3352/5486] =?UTF-8?q?Afegir=20opci=C3=B3=20de=20transforma?= =?UTF-8?q?ci=C3=B3=20de=20super=20guerrer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- catala/aixecar/aixecar.md | 4 +++- catala/aixecar/guerrer/guerrer.md | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 catala/aixecar/guerrer/guerrer.md diff --git a/catala/aixecar/aixecar.md b/catala/aixecar/aixecar.md index 596ba0cc5e..a9993a1521 100644 --- a/catala/aixecar/aixecar.md +++ b/catala/aixecar/aixecar.md @@ -6,4 +6,6 @@ Què fas? [agafes el mòbil per fer una foto](../pessigar-se/foto/foto.md) -[busques una sortida](../sortir/sortir.md) \ No newline at end of file +[busques una sortida](../sortir/sortir.md) + +[Intentes convertirte en super guerrer](guerrer/guerrer.md) \ No newline at end of file diff --git a/catala/aixecar/guerrer/guerrer.md b/catala/aixecar/guerrer/guerrer.md new file mode 100644 index 0000000000..2322e698b6 --- /dev/null +++ b/catala/aixecar/guerrer/guerrer.md @@ -0,0 +1,7 @@ +Et sents acorralat i penses que l'única forma de sortir d'aquí és transformarte en super guerrer... + +Respires profundament i comences a cridar com tants cops has vist per televisió... + +De sobte, un fort soroll et retorna a la realitat. Et despertes al llit de casa teva i te'n adones que t'has cagat a sobre! + +Clica [aquí](../catala.md) per tornar a començar... \ No newline at end of file From 8b3134c776aba04198a7ae0330f28d28416503a7 Mon Sep 17 00:00:00 2001 From: Juan Torrico Date: Fri, 6 May 2016 16:40:37 -0300 Subject: [PATCH 3353/5486] Huida mas informacion --- espanol/huida/puerta.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/espanol/huida/puerta.md b/espanol/huida/puerta.md index c3c4833986..5afe986f86 100644 --- a/espanol/huida/puerta.md +++ b/espanol/huida/puerta.md @@ -1,6 +1,11 @@ Te encuentras con un hombre con ropas extrañas y la cara tapada. Te pide dos monedas de oro a cambio de dejarte salir. +Pero son las ultimas 2 monedas que el consejero posee. +El consejero piensa dos veces antes de decidir. + +Es este alto, ronco y extraño hombre alguien en quien confiar ? + [Un presentimiento te dice que confies en él. Le das las dos monedas.](pagar/pagar.md) [El consejero puede hacer lo que le plazca. Decides no pagar.](rechazar/rechazar.md) From 0adf91b60904ac37f9a758370086bf0b593af9de Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 6 May 2016 16:32:26 -0800 Subject: [PATCH 3354/5486] feat: Add meditate option to the story --- russian/meditate/meditate.md | 8 ++++++++ russian/zefir.md | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 russian/meditate/meditate.md diff --git a/russian/meditate/meditate.md b/russian/meditate/meditate.md new file mode 100644 index 0000000000..2b2c379391 --- /dev/null +++ b/russian/meditate/meditate.md @@ -0,0 +1,8 @@ +У каждого человека есть сознательный разум, глубинное квантовое я бесконечных возможностей, +и полевой разум, включающий окружающих людей. Когда реальность меняется и старые карты перестают работать, +сознательному управленческому разуму можно отойти в сторону, давая пространство глубинному бессознательному +я, создателю новых карт реальности. Можно расслабиться, соединяясь с ощущением центра, как это делают +профессиональные спортсмены. Затем можно соединиться с позитивной целью, выраженной в пяти словах или меньше. +После этого соединиться с ресурсами: приятными воспоминаниями, символами или людьми, которые много для вас значат. + +[Узнать больше о порождающих состояниях осознания](http://stephengilligan.com/) diff --git a/russian/zefir.md b/russian/zefir.md index 07c4c1d15b..aa4e12c0d7 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -86,4 +86,6 @@ [Бросить "уделанную" футболку Slayer в стирку и отправиться на заутреннюю молитву](prayer/morning_prayer.md) -[Почувствуете ужасный голод] (hunger/feel-hunger.md) \ No newline at end of file +[Почувствуете ужасный голод] (hunger/feel-hunger.md) + +[Начнёте медитировать](meditate/meditate.md) From e3c1e49cf69b24ddc4ce36eb070eeaa033b45269 Mon Sep 17 00:00:00 2001 From: utsavks Date: Sat, 7 May 2016 11:10:16 +0530 Subject: [PATCH 3355/5486] Add burn-brightly to fire.md --- english/light-fire/burn-brightly/burn-brightly.md | 4 ++++ english/light-fire/fire.md | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 english/light-fire/burn-brightly/burn-brightly.md diff --git a/english/light-fire/burn-brightly/burn-brightly.md b/english/light-fire/burn-brightly/burn-brightly.md new file mode 100644 index 0000000000..a4e7372a4e --- /dev/null +++ b/english/light-fire/burn-brightly/burn-brightly.md @@ -0,0 +1,4 @@ +You enjoy the sweet hot marshmallows for some seconds and then the pain overcomes your taste-buds. You start shrieking horribly and you realise it's too late. Like the marshmallows you too are BURNING BRIGHTLY!! + +Your adventure ends... + \ No newline at end of file diff --git a/english/light-fire/fire.md b/english/light-fire/fire.md index 69a08c1a6f..423cd4924c 100644 --- a/english/light-fire/fire.md +++ b/english/light-fire/fire.md @@ -31,6 +31,8 @@ The rat smiles and says, "Come on, let's go!" [Stop, drop, and roll.](stop-drop-roll/stop-drop-roll.md) +[Burn brightly](burn-brightly/burn-brightly.md) + [Call the marshmallow wall repair guy, Marshall M. Aloe](call-marshall/call-marshall.md) [Pull graham crackers from inside your jacket](graham-crackers/graham-crackers.md) From 1263b78cb8d530327bac0827549e008962f3487c Mon Sep 17 00:00:00 2001 From: utsavks Date: Sat, 7 May 2016 11:19:10 +0530 Subject: [PATCH 3356/5486] Revert "Add burn-brightly to fire.md" --- english/light-fire/burn-brightly/burn-brightly.md | 4 ---- english/light-fire/fire.md | 2 -- 2 files changed, 6 deletions(-) delete mode 100644 english/light-fire/burn-brightly/burn-brightly.md diff --git a/english/light-fire/burn-brightly/burn-brightly.md b/english/light-fire/burn-brightly/burn-brightly.md deleted file mode 100644 index a4e7372a4e..0000000000 --- a/english/light-fire/burn-brightly/burn-brightly.md +++ /dev/null @@ -1,4 +0,0 @@ -You enjoy the sweet hot marshmallows for some seconds and then the pain overcomes your taste-buds. You start shrieking horribly and you realise it's too late. Like the marshmallows you too are BURNING BRIGHTLY!! - -Your adventure ends... - \ No newline at end of file diff --git a/english/light-fire/fire.md b/english/light-fire/fire.md index 423cd4924c..69a08c1a6f 100644 --- a/english/light-fire/fire.md +++ b/english/light-fire/fire.md @@ -31,8 +31,6 @@ The rat smiles and says, "Come on, let's go!" [Stop, drop, and roll.](stop-drop-roll/stop-drop-roll.md) -[Burn brightly](burn-brightly/burn-brightly.md) - [Call the marshmallow wall repair guy, Marshall M. Aloe](call-marshall/call-marshall.md) [Pull graham crackers from inside your jacket](graham-crackers/graham-crackers.md) From fa605be017020131a440f6c228398c06c4c2744b Mon Sep 17 00:00:00 2001 From: utsavks Date: Sat, 7 May 2016 12:36:17 +0530 Subject: [PATCH 3357/5486] Add burn-brightly to fire.md --- english/light-fire/burn-brightly/burn-brightly.md | 4 ++++ english/light-fire/fire.md | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 english/light-fire/burn-brightly/burn-brightly.md diff --git a/english/light-fire/burn-brightly/burn-brightly.md b/english/light-fire/burn-brightly/burn-brightly.md new file mode 100644 index 0000000000..a4e7372a4e --- /dev/null +++ b/english/light-fire/burn-brightly/burn-brightly.md @@ -0,0 +1,4 @@ +You enjoy the sweet hot marshmallows for some seconds and then the pain overcomes your taste-buds. You start shrieking horribly and you realise it's too late. Like the marshmallows you too are BURNING BRIGHTLY!! + +Your adventure ends... + \ No newline at end of file diff --git a/english/light-fire/fire.md b/english/light-fire/fire.md index 69a08c1a6f..423cd4924c 100644 --- a/english/light-fire/fire.md +++ b/english/light-fire/fire.md @@ -31,6 +31,8 @@ The rat smiles and says, "Come on, let's go!" [Stop, drop, and roll.](stop-drop-roll/stop-drop-roll.md) +[Burn brightly](burn-brightly/burn-brightly.md) + [Call the marshmallow wall repair guy, Marshall M. Aloe](call-marshall/call-marshall.md) [Pull graham crackers from inside your jacket](graham-crackers/graham-crackers.md) From 42ca1d00bb7233742746eba2a624977723b1d6c6 Mon Sep 17 00:00:00 2001 From: utsavks Date: Sat, 7 May 2016 12:43:55 +0530 Subject: [PATCH 3358/5486] Change line length to be shorter --- english/light-fire/burn-brightly/burn-brightly.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/light-fire/burn-brightly/burn-brightly.md b/english/light-fire/burn-brightly/burn-brightly.md index a4e7372a4e..e50c3ac29a 100644 --- a/english/light-fire/burn-brightly/burn-brightly.md +++ b/english/light-fire/burn-brightly/burn-brightly.md @@ -1,4 +1,7 @@ -You enjoy the sweet hot marshmallows for some seconds and then the pain overcomes your taste-buds. You start shrieking horribly and you realise it's too late. Like the marshmallows you too are BURNING BRIGHTLY!! +You enjoy the sweet hot marshmallows for some seconds +and then the pain overcomes your taste-buds. You start +shrieking horribly and you realise it's too late. Like +the marshmallows you too are BURNING BRIGHTLY!! Your adventure ends... \ No newline at end of file From b0892e73e4805fda0794a5dc7988c58d70e72bd4 Mon Sep 17 00:00:00 2001 From: Aaron Bednar Date: Sat, 7 May 2016 13:47:55 +0200 Subject: [PATCH 3359/5486] How we will know what time it is? --- english/art/art.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/art/art.md b/english/art/art.md index c277944b6d..38dd99ca65 100644 --- a/english/art/art.md +++ b/english/art/art.md @@ -1 +1,3 @@ When it is time, it will be time. + +But is it time yet? [How will we know?](http://www.campingdude.com/content/skit/is_it_time_yet-101.asp) From 58ca94901092953a5eff5806dca5d2f9c079fd33 Mon Sep 17 00:00:00 2001 From: Maryna Kalachova Date: Sat, 7 May 2016 08:24:05 -0400 Subject: [PATCH 3360/5486] Add programming option --- russian/programming/to-program.md | 1 + russian/zefir.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 russian/programming/to-program.md diff --git a/russian/programming/to-program.md b/russian/programming/to-program.md new file mode 100644 index 0000000000..13d9a449ad --- /dev/null +++ b/russian/programming/to-program.md @@ -0,0 +1 @@ +Вы решаете, что в любой непонятной ситуации нужно писать код, и отправляетесь на поиски комьютера. \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index 07c4c1d15b..709f5ded5d 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -86,4 +86,6 @@ [Бросить "уделанную" футболку Slayer в стирку и отправиться на заутреннюю молитву](prayer/morning_prayer.md) -[Почувствуете ужасный голод] (hunger/feel-hunger.md) \ No newline at end of file +[Почувствуете ужасный голод] (hunger/feel-hunger.md) + +[Решите программировать] (programming/to-program.md) \ No newline at end of file From fd7d6a32b6e7fecea8950bd048eaa76fd663dfd4 Mon Sep 17 00:00:00 2001 From: Graham Williams Date: Sat, 7 May 2016 16:39:48 +0100 Subject: [PATCH 3361/5486] Update climbing with new option --- english/climbing/climbing.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/climbing/climbing.md b/english/climbing/climbing.md index 386e4bd867..6786ceb4d9 100644 --- a/english/climbing/climbing.md +++ b/english/climbing/climbing.md @@ -9,3 +9,5 @@ Click [here](../marshmallow.md) to lower yourself back down into the pit of desp Click [here](../dance/dance.md) to dance. Click [here] (../jump/jump.md) to jump. + +Click [here](../fly-falcon/fly-falcon.md) to spread your wings. From 89ae9a75c888db211dcf50d593fd3fe9ca166778 Mon Sep 17 00:00:00 2001 From: Graham Williams Date: Sat, 7 May 2016 16:40:31 +0100 Subject: [PATCH 3362/5486] Add new story section from climbing --- english/fly-falcon/fly-falcon.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/fly-falcon/fly-falcon.md diff --git a/english/fly-falcon/fly-falcon.md b/english/fly-falcon/fly-falcon.md new file mode 100644 index 0000000000..4619dfbdc3 --- /dev/null +++ b/english/fly-falcon/fly-falcon.md @@ -0,0 +1,4 @@ +You spread your arms out to the sides, stretching them as +far as you can. +You transform in to a majestic falcon, lifting yourself in to +the air - you fly to freedom (and the end of the Udacity course)! From 9447b9e37b2fdb03dd3dac8a62be762895b835b5 Mon Sep 17 00:00:00 2001 From: Ievgenii Kudko Date: Sat, 7 May 2016 23:23:07 -0400 Subject: [PATCH 3363/5486] Add friendly person talk --- english/friendly-person/friendly-person.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/english/friendly-person/friendly-person.md b/english/friendly-person/friendly-person.md index cb7225f5de..13970f0245 100644 --- a/english/friendly-person/friendly-person.md +++ b/english/friendly-person/friendly-person.md @@ -5,6 +5,14 @@ You ask yourself a question: Is this me in a parallel world maybe? +But then you notice that on of them pulls a gun on you. +All of a sudden he starts talking to you and you hear this strange, full of despise voice. He says: +I know what you're thinking: "Did he fire six shots or only five?" +Well, to tell you the truth, in all this excitement, I've kinda lost track myself. +But being this is a .44 Magnum, the most powerful handgun in the world, and +would blow your head clean off, you've got to ask yourself one question: +'Do I feel lucky?' Well, do ya, punk? + You're about to start talking to them, when you realize you can't actually open your mouth. It's kind of sealed. "What shall I do to communicate then?", you think: From f8a93be68695cff8b79caaefe7f911db169632e3 Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 7 May 2016 20:53:34 -0700 Subject: [PATCH 3364/5486] Added cracker surfing extension to Wonka Construction option --- .../wonka-construction/surfthecrackers/surfthecrackers.md | 3 +++ .../sprinkler/wonka-construction/wonka-construction.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 english/light-fire/sprinkler/wonka-construction/surfthecrackers/surfthecrackers.md diff --git a/english/light-fire/sprinkler/wonka-construction/surfthecrackers/surfthecrackers.md b/english/light-fire/sprinkler/wonka-construction/surfthecrackers/surfthecrackers.md new file mode 100644 index 0000000000..55b84ee8dd --- /dev/null +++ b/english/light-fire/sprinkler/wonka-construction/surfthecrackers/surfthecrackers.md @@ -0,0 +1,3 @@ +Using surplus graham crackers left over by the Wonka crew, you build an ad-hoc surfboard and float it in the pool. + +You take a bold step and hop on! \ No newline at end of file diff --git a/english/light-fire/sprinkler/wonka-construction/wonka-construction.md b/english/light-fire/sprinkler/wonka-construction/wonka-construction.md index edab662179..928a0dfd74 100644 --- a/english/light-fire/sprinkler/wonka-construction/wonka-construction.md +++ b/english/light-fire/sprinkler/wonka-construction/wonka-construction.md @@ -8,3 +8,5 @@ Start eating the graham grackers? Ask the Wonk constuction work crew to identify themselves? Fill the chocolate pool with graham crackers? + +[Make a graham cracker surfboard and go for a ride] (surfthecrackers/surfthecrackers.md)? \ No newline at end of file From c26d3f4480c9185b1f0f2eb027d68f506335e927 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 7 May 2016 21:45:53 -0800 Subject: [PATCH 3365/5486] feat: Add meditative states of consciousness --- english/zuluquest/choosequest.md | 4 +++- english/zuluquest/experience/meditative_states.md | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 english/zuluquest/experience/meditative_states.md diff --git a/english/zuluquest/choosequest.md b/english/zuluquest/choosequest.md index d8611b7450..38b2af31fd 100644 --- a/english/zuluquest/choosequest.md +++ b/english/zuluquest/choosequest.md @@ -8,4 +8,6 @@ Maybe try a new career [path?](new/path.md) Forget about career and jump into startup world like there's no [tomorrow?](no/tomorrow.md) -Invite you for a freshly ground [coffee](ground/coffee.md) and discuss about life, anything else and the number 42? \ No newline at end of file +Invite you for a freshly ground [coffee](ground/coffee.md) and discuss about life, anything else and the number 42? + +Experience [generative states of meditative consciousness](experience/meditative_states.md) diff --git a/english/zuluquest/experience/meditative_states.md b/english/zuluquest/experience/meditative_states.md new file mode 100644 index 0000000000..a900c71844 --- /dev/null +++ b/english/zuluquest/experience/meditative_states.md @@ -0,0 +1,15 @@ +People have a conscious managerial mind of classical world of space, time, forms and ideas, +a deep quantum self of infinite possibilities, and a field mind that includes surrounding people. + +When things change and old maps of reality no longer work, it can be helpful to allow the +conscious managerial mind to temporarily step aside and allow the creative deep self to +come up with new maps of reality. + +To do so, you can let yourself connect to your felt body center in a relaxed and focused way, +like professional athletes do. Then you can connect to your positive goal, stated in 5 words +or less. After that connect to your resources: pleasurable memories, symbols or people who +mean a lot for you. + +Just allow the flow of generative process to happen. + +[Learn more about generative states of consciousness](http://stephengilligan.com) From 134a82942be2f258fb66e53dd4df6bc8ab3770b2 Mon Sep 17 00:00:00 2001 From: joonho Date: Sun, 8 May 2016 17:44:52 +0900 Subject: [PATCH 3366/5486] Add a new story about cafe sungsu. --- korean/cafe-sungsu/cafe-sungsu.md | 1 + korean/marshmallow.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 korean/cafe-sungsu/cafe-sungsu.md diff --git a/korean/cafe-sungsu/cafe-sungsu.md b/korean/cafe-sungsu/cafe-sungsu.md new file mode 100644 index 0000000000..5b1083409b --- /dev/null +++ b/korean/cafe-sungsu/cafe-sungsu.md @@ -0,0 +1 @@ +아이고 집 밖에 나오니 개고생이다. 다시 [방으로 돌아간다.](../marshmallow.md) \ No newline at end of file diff --git a/korean/marshmallow.md b/korean/marshmallow.md index 1dcbc6003f..1c1f8892c2 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -40,4 +40,6 @@ [내가 나비인지 나비가 나인지 철학적인 고민을 한다](philosophy/philosophy.md) -[방을 둘러본다](look-around/look-around.md) \ No newline at end of file +[방을 둘러본다](look-around/look-around.md) + +[카페 성수에 간다](cafe-sungsu/cafe-sungsu.md) \ No newline at end of file From b9873540a7bb07e706e503f921a9235299cfe10e Mon Sep 17 00:00:00 2001 From: roolerzz Date: Sun, 8 May 2016 14:19:55 +0530 Subject: [PATCH 3367/5486] Add my story of game of thrones --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 32c2f64b2e..23d42aa6dd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -941,4 +941,6 @@ Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupunct As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. -Health and Life Lovely [Quotes](./health/health.md) \ No newline at end of file +Health and Life Lovely [Quotes](./health/health.md) + +The lannisters always pays thier debts, says tyrion lannister. Interesting [character] he is.(./gameofthrones/tyrion.md) \ No newline at end of file From aeb581a3c86cb6be361bbd5a42e27f4d03cb14d8 Mon Sep 17 00:00:00 2001 From: roolerzz Date: Sun, 8 May 2016 14:20:13 +0530 Subject: [PATCH 3368/5486] feat: Add story and characters --- english/gameofthrones/characters/shae.md | 1 + english/gameofthrones/tyrion.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 english/gameofthrones/characters/shae.md create mode 100644 english/gameofthrones/tyrion.md diff --git a/english/gameofthrones/characters/shae.md b/english/gameofthrones/characters/shae.md new file mode 100644 index 0000000000..d97a67d516 --- /dev/null +++ b/english/gameofthrones/characters/shae.md @@ -0,0 +1 @@ +This is westeros and people here wanted to hurt me and they will look for any weakness they could find. I love you and I don;t want us hurt. It would be better if you would leave westeros for ive. You will have your own house, servants and what not. You could start a new life all together, says tyrion to shae. \ No newline at end of file diff --git a/english/gameofthrones/tyrion.md b/english/gameofthrones/tyrion.md new file mode 100644 index 0000000000..6d2779cbaa --- /dev/null +++ b/english/gameofthrones/tyrion.md @@ -0,0 +1 @@ +I am yours and you are mine, says tyrion to shae. These were the words that were reflecting while he was standing in the courtroom proving his innocence in front of his fater and her evil [whore].(./characters/shae) \ No newline at end of file From c93a1722ccef5828eb062f1936f3c7ffe3057513 Mon Sep 17 00:00:00 2001 From: roolerzz Date: Sun, 8 May 2016 14:23:17 +0530 Subject: [PATCH 3369/5486] fix: Correct references. --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 23d42aa6dd..8ba8962029 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -943,4 +943,4 @@ As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can h Health and Life Lovely [Quotes](./health/health.md) -The lannisters always pays thier debts, says tyrion lannister. Interesting [character] he is.(./gameofthrones/tyrion.md) \ No newline at end of file +The lannisters always pays thier debts, says tyrion lannister. Interesting [character](./gameofthrones/tyrion.md) he is. \ No newline at end of file From 80634851f8da9f210bffc00c3ec18f058d2957f1 Mon Sep 17 00:00:00 2001 From: roolerzz Date: Sun, 8 May 2016 14:24:38 +0530 Subject: [PATCH 3370/5486] fix: Correct reference --- english/gameofthrones/tyrion.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/gameofthrones/tyrion.md b/english/gameofthrones/tyrion.md index 6d2779cbaa..1341cb5bac 100644 --- a/english/gameofthrones/tyrion.md +++ b/english/gameofthrones/tyrion.md @@ -1 +1 @@ -I am yours and you are mine, says tyrion to shae. These were the words that were reflecting while he was standing in the courtroom proving his innocence in front of his fater and her evil [whore].(./characters/shae) \ No newline at end of file +I am yours and you are mine, says tyrion to shae. These were the words that were reflecting while he was standing in the courtroom proving his innocence in front of his fater and her evil [whore](./characters/shae). \ No newline at end of file From 135b7d7a4cde9e2f0f7d3ed124860c21f8158ce2 Mon Sep 17 00:00:00 2001 From: roolerzz Date: Sun, 8 May 2016 14:25:58 +0530 Subject: [PATCH 3371/5486] fix: correct spell --- english/gameofthrones/tyrion.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/gameofthrones/tyrion.md b/english/gameofthrones/tyrion.md index 1341cb5bac..6cdaad0f67 100644 --- a/english/gameofthrones/tyrion.md +++ b/english/gameofthrones/tyrion.md @@ -1 +1 @@ -I am yours and you are mine, says tyrion to shae. These were the words that were reflecting while he was standing in the courtroom proving his innocence in front of his fater and her evil [whore](./characters/shae). \ No newline at end of file +I am yours and you are mine, says tyrion to shae. These were the words that were reflecting while he was standing in the courtroom proving his innocence in front of his fater and her evil [whore](characters/shae). \ No newline at end of file From f68c86d32c11f3e4915f6998d9d2b4b8fab1d04a Mon Sep 17 00:00:00 2001 From: roolerzz Date: Sun, 8 May 2016 14:28:20 +0530 Subject: [PATCH 3372/5486] fix: Correct reference --- english/gameofthrones/tyrion.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/gameofthrones/tyrion.md b/english/gameofthrones/tyrion.md index 6cdaad0f67..667d4e2e36 100644 --- a/english/gameofthrones/tyrion.md +++ b/english/gameofthrones/tyrion.md @@ -1 +1 @@ -I am yours and you are mine, says tyrion to shae. These were the words that were reflecting while he was standing in the courtroom proving his innocence in front of his fater and her evil [whore](characters/shae). \ No newline at end of file +I am yours and you are mine, says tyrion to shae. These were the words that were reflecting while he was standing in the courtroom proving his innocence in front of his fater and her evil [whore](characters/shae.md). \ No newline at end of file From 527e5b9983e72f6ff2e7dcca7fc166584523b403 Mon Sep 17 00:00:00 2001 From: roolerzz Date: Sun, 8 May 2016 14:34:09 +0530 Subject: [PATCH 3373/5486] fix: make line smaller than 120 characters --- english/gameofthrones/tyrion.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/gameofthrones/tyrion.md b/english/gameofthrones/tyrion.md index 667d4e2e36..f7b0f0cc5a 100644 --- a/english/gameofthrones/tyrion.md +++ b/english/gameofthrones/tyrion.md @@ -1 +1,3 @@ -I am yours and you are mine, says tyrion to shae. These were the words that were reflecting while he was standing in the courtroom proving his innocence in front of his fater and her evil [whore](characters/shae.md). \ No newline at end of file +I am yours and you are mine, says tyrion to shae. +These were the words that were reflecting while he was standing in the courtroom. +He was proving his innocence in front of his father and her evil [whore](characters/shae.md). \ No newline at end of file From d0c06656dd31f5e45960c1936be7943c99e6bf3a Mon Sep 17 00:00:00 2001 From: roolerzz Date: Sun, 8 May 2016 14:35:29 +0530 Subject: [PATCH 3374/5486] fix: make line smaller than 120 characters --- english/gameofthrones/characters/shae.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/gameofthrones/characters/shae.md b/english/gameofthrones/characters/shae.md index d97a67d516..b818025d74 100644 --- a/english/gameofthrones/characters/shae.md +++ b/english/gameofthrones/characters/shae.md @@ -1 +1,4 @@ -This is westeros and people here wanted to hurt me and they will look for any weakness they could find. I love you and I don;t want us hurt. It would be better if you would leave westeros for ive. You will have your own house, servants and what not. You could start a new life all together, says tyrion to shae. \ No newline at end of file +This is westeros and people here wanted to hurt me and they will look for any weakness they could find. +I love you and I don't want them to us hurt. +It would be better if you would leave westeros for ive. +You will have your own house, servants and what not. You could start a new life all together, says tyrion to shae. \ No newline at end of file From ad1a24e0cc3e61388a3293e798334030eece62fd Mon Sep 17 00:00:00 2001 From: sri1219 Date: Sun, 8 May 2016 15:58:20 +0530 Subject: [PATCH 3375/5486] add link to telanganatelugu --- telugu/telugu.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/telugu/telugu.md b/telugu/telugu.md index 6aad17f93c..9fdcd23951 100644 --- a/telugu/telugu.md +++ b/telugu/telugu.md @@ -4,4 +4,5 @@ ప్రపంచవ్యాప్తంగా 7.4 కోట్లు మందికి మాతృభాషగా ఉంది.[2] మొదటి భాషగా మాట్లాడతారు. అతి ప్రాచీన దేశ భాషలలో సంస్కృతము, తమిళములతో బాటు తెలుగు భాషను అక్టోబరు 31, 2008న భారత ప్రభుత్వము చేర్చింది. అసలు కథ ఏంటంటే ఇది కేవలం మనకు గిట్ మరియు గిట్ హబ్ గురించి నేర్చుకునేందుకు ఏర్పాటు చేసిన కథ మాత్రమే. -అందుచేత ఇందులో ఏ అర్థాలూ వెతకొద్దు ప్లీజ్. చేతనయితే మీరు కూడా కొన్ని లైన్లు వ్రాసి బాగా నేర్చుకోండి. \ No newline at end of file +అందుచేత ఇందులో ఏ అర్థాలూ వెతకొద్దు ప్లీజ్. చేతనయితే మీరు కూడా కొన్ని లైన్లు వ్రాసి బాగా నేర్చుకోండి. +Click [here](../telangana-telugu/Telanganatelugu.md) From b799bf053dae1e76bb7544c88b0423e44f9af671 Mon Sep 17 00:00:00 2001 From: sri1219 Date: Sun, 8 May 2016 16:01:38 +0530 Subject: [PATCH 3376/5486] update the telangana telugu link Update link to point to correct link --- telugu/telugu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telugu/telugu.md b/telugu/telugu.md index 9fdcd23951..f29103e08e 100644 --- a/telugu/telugu.md +++ b/telugu/telugu.md @@ -5,4 +5,4 @@ తమిళములతో బాటు తెలుగు భాషను అక్టోబరు 31, 2008న భారత ప్రభుత్వము చేర్చింది. అసలు కథ ఏంటంటే ఇది కేవలం మనకు గిట్ మరియు గిట్ హబ్ గురించి నేర్చుకునేందుకు ఏర్పాటు చేసిన కథ మాత్రమే. అందుచేత ఇందులో ఏ అర్థాలూ వెతకొద్దు ప్లీజ్. చేతనయితే మీరు కూడా కొన్ని లైన్లు వ్రాసి బాగా నేర్చుకోండి. -Click [here](../telangana-telugu/Telanganatelugu.md) +Click [here](..telugu/telangana-telugu/Telanganatelugu.md) From d7bba0ec4fccf6b178386713fe7d088a6a755da1 Mon Sep 17 00:00:00 2001 From: sri1219 Date: Sun, 8 May 2016 16:03:10 +0530 Subject: [PATCH 3377/5486] update link --- telugu/telugu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telugu/telugu.md b/telugu/telugu.md index f29103e08e..e2ae0fdbd9 100644 --- a/telugu/telugu.md +++ b/telugu/telugu.md @@ -5,4 +5,4 @@ తమిళములతో బాటు తెలుగు భాషను అక్టోబరు 31, 2008న భారత ప్రభుత్వము చేర్చింది. అసలు కథ ఏంటంటే ఇది కేవలం మనకు గిట్ మరియు గిట్ హబ్ గురించి నేర్చుకునేందుకు ఏర్పాటు చేసిన కథ మాత్రమే. అందుచేత ఇందులో ఏ అర్థాలూ వెతకొద్దు ప్లీజ్. చేతనయితే మీరు కూడా కొన్ని లైన్లు వ్రాసి బాగా నేర్చుకోండి. -Click [here](..telugu/telangana-telugu/Telanganatelugu.md) +Click [here](../telugu/telangana-telugu/Telanganatelugu.md) From d9fa00fe7af9b257b78ddcb0dc531663e5fb228d Mon Sep 17 00:00:00 2001 From: hermione Date: Sun, 8 May 2016 18:38:14 +0800 Subject: [PATCH 3378/5486] commit Hermione story --- Chinese/DesertHell/OldStory/Cat2Dog/music/ago/ago.md | 1 + Chinese/DesertHell/OldStory/Cat2Dog/music/music.md | 4 ++++ Chinese/DesertHell/OldStory/Cat2Dog/music/pity/pity.md | 1 + .../\345\217\230\346\210\220\347\213\227\344\272\206.md" | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Chinese/DesertHell/OldStory/Cat2Dog/music/ago/ago.md create mode 100644 Chinese/DesertHell/OldStory/Cat2Dog/music/music.md create mode 100644 Chinese/DesertHell/OldStory/Cat2Dog/music/pity/pity.md diff --git a/Chinese/DesertHell/OldStory/Cat2Dog/music/ago/ago.md b/Chinese/DesertHell/OldStory/Cat2Dog/music/ago/ago.md new file mode 100644 index 0000000000..de3da0a9a1 --- /dev/null +++ b/Chinese/DesertHell/OldStory/Cat2Dog/music/ago/ago.md @@ -0,0 +1 @@ +港科那麼大，我不認識你。 diff --git a/Chinese/DesertHell/OldStory/Cat2Dog/music/music.md b/Chinese/DesertHell/OldStory/Cat2Dog/music/music.md new file mode 100644 index 0000000000..42fcaf3ead --- /dev/null +++ b/Chinese/DesertHell/OldStory/Cat2Dog/music/music.md @@ -0,0 +1,4 @@ +說道：昨晚聽到音樂又被戳中了 +楊千嬅的“祈求天地放過一雙戀人，怕發生的永遠別發生” +[然而..](pity/pity.md) +[兩年前..](ago/ago.md) diff --git a/Chinese/DesertHell/OldStory/Cat2Dog/music/pity/pity.md b/Chinese/DesertHell/OldStory/Cat2Dog/music/pity/pity.md new file mode 100644 index 0000000000..d9f156d2b7 --- /dev/null +++ b/Chinese/DesertHell/OldStory/Cat2Dog/music/pity/pity.md @@ -0,0 +1 @@ +怕發生的還是發生了。 diff --git "a/Chinese/DesertHell/OldStory/Cat2Dog/\345\217\230\346\210\220\347\213\227\344\272\206.md" "b/Chinese/DesertHell/OldStory/Cat2Dog/\345\217\230\346\210\220\347\213\227\344\272\206.md" index a2c2446d83..367278a7ec 100644 --- "a/Chinese/DesertHell/OldStory/Cat2Dog/\345\217\230\346\210\220\347\213\227\344\272\206.md" +++ "b/Chinese/DesertHell/OldStory/Cat2Dog/\345\217\230\346\210\220\347\213\227\344\272\206.md" @@ -1,2 +1,2 @@ -这只猫变成了一只狗。它很茫然。它就去找白胡子老头，白胡子老头说，说什么呢？ +这只猫变成了一只狗。它很茫然。它就去找白胡子老头，白胡子老头说，[说什么呢？](music/music.md) From d8e452c7f845a6ebd68828919fb310f51962e129 Mon Sep 17 00:00:00 2001 From: hermione Date: Sun, 8 May 2016 19:06:47 +0800 Subject: [PATCH 3379/5486] asert blank between lines and edit first file as robit cannot tell if I modify or delte line --- Chinese/DesertHell/OldStory/Cat2Dog/music/music.md | 1 + .../\345\217\230\346\210\220\347\213\227\344\272\206.md" | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/DesertHell/OldStory/Cat2Dog/music/music.md b/Chinese/DesertHell/OldStory/Cat2Dog/music/music.md index 42fcaf3ead..6c126573b8 100644 --- a/Chinese/DesertHell/OldStory/Cat2Dog/music/music.md +++ b/Chinese/DesertHell/OldStory/Cat2Dog/music/music.md @@ -1,4 +1,5 @@ 說道：昨晚聽到音樂又被戳中了 楊千嬅的“祈求天地放過一雙戀人，怕發生的永遠別發生” [然而..](pity/pity.md) + [兩年前..](ago/ago.md) diff --git "a/Chinese/DesertHell/OldStory/Cat2Dog/\345\217\230\346\210\220\347\213\227\344\272\206.md" "b/Chinese/DesertHell/OldStory/Cat2Dog/\345\217\230\346\210\220\347\213\227\344\272\206.md" index 367278a7ec..d5df44d23e 100644 --- "a/Chinese/DesertHell/OldStory/Cat2Dog/\345\217\230\346\210\220\347\213\227\344\272\206.md" +++ "b/Chinese/DesertHell/OldStory/Cat2Dog/\345\217\230\346\210\220\347\213\227\344\272\206.md" @@ -1,2 +1,3 @@ -这只猫变成了一只狗。它很茫然。它就去找白胡子老头，白胡子老头说，[说什么呢？](music/music.md) +这只猫变成了一只狗。它很茫然。它就去找白胡子老头，白胡子老头说，说什么呢？ +[他](music/music.md) From 17e3e816628c2eae73fadfdd8d343e9c24e541e4 Mon Sep 17 00:00:00 2001 From: rkaahean Date: Sun, 8 May 2016 18:55:56 +0530 Subject: [PATCH 3380/5486] Add Full Metal Alchemist --- english/Full Metal Alchemist/fma.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/Full Metal Alchemist/fma.md diff --git a/english/Full Metal Alchemist/fma.md b/english/Full Metal Alchemist/fma.md new file mode 100644 index 0000000000..d444bb2c7e --- /dev/null +++ b/english/Full Metal Alchemist/fma.md @@ -0,0 +1,3 @@ +Fullmetal Alchemist (Japanese: 鋼の錬金術師 Hepburn: Hagane no Renkinjutsushi?, lit. "Alchemist of Steel") is a Japanese manga series written and illustrated by Hiromu Arakawa. It was serialized in Square Enix's Monthly Shōnen Gangan magazine between August 2001 and June 2010; the publisher later collected the individual chapters into twenty-seven tankōbon volumes. The world of Fullmetal Alchemist is styled after the European Industrial Revolution. Set in a fictional universe in which alchemy is one of the most advanced scientific techniques, the story follows the Elric brothers Edward and Alphonse, who are searching for a philosopher's stone to restore their bodies after a failed attempt to bring their mother back to life using alchemy. + +Click [here](../alchemhy/alchemy.md) to learn more about alchemy. From 723ee2fcfb7ea68911020609b613dddc2ce1dd45 Mon Sep 17 00:00:00 2001 From: rkaahean Date: Sun, 8 May 2016 18:59:12 +0530 Subject: [PATCH 3381/5486] Fix typo in alchemy --- english/Full Metal Alchemist/fma.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/Full Metal Alchemist/fma.md b/english/Full Metal Alchemist/fma.md index d444bb2c7e..e301f2f109 100644 --- a/english/Full Metal Alchemist/fma.md +++ b/english/Full Metal Alchemist/fma.md @@ -1,3 +1,3 @@ Fullmetal Alchemist (Japanese: 鋼の錬金術師 Hepburn: Hagane no Renkinjutsushi?, lit. "Alchemist of Steel") is a Japanese manga series written and illustrated by Hiromu Arakawa. It was serialized in Square Enix's Monthly Shōnen Gangan magazine between August 2001 and June 2010; the publisher later collected the individual chapters into twenty-seven tankōbon volumes. The world of Fullmetal Alchemist is styled after the European Industrial Revolution. Set in a fictional universe in which alchemy is one of the most advanced scientific techniques, the story follows the Elric brothers Edward and Alphonse, who are searching for a philosopher's stone to restore their bodies after a failed attempt to bring their mother back to life using alchemy. -Click [here](../alchemhy/alchemy.md) to learn more about alchemy. +Click [here](../alchemy/alchemy.md) to learn more about alchemy. From f01cf85d0399936ac5a31ea8242a0c9991478a5c Mon Sep 17 00:00:00 2001 From: rkaahean Date: Sun, 8 May 2016 19:12:28 +0530 Subject: [PATCH 3382/5486] Add line spacing --- english/Full Metal Alchemist/fma.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/english/Full Metal Alchemist/fma.md b/english/Full Metal Alchemist/fma.md index e301f2f109..c42ee42063 100644 --- a/english/Full Metal Alchemist/fma.md +++ b/english/Full Metal Alchemist/fma.md @@ -1,3 +1,10 @@ -Fullmetal Alchemist (Japanese: 鋼の錬金術師 Hepburn: Hagane no Renkinjutsushi?, lit. "Alchemist of Steel") is a Japanese manga series written and illustrated by Hiromu Arakawa. It was serialized in Square Enix's Monthly Shōnen Gangan magazine between August 2001 and June 2010; the publisher later collected the individual chapters into twenty-seven tankōbon volumes. The world of Fullmetal Alchemist is styled after the European Industrial Revolution. Set in a fictional universe in which alchemy is one of the most advanced scientific techniques, the story follows the Elric brothers Edward and Alphonse, who are searching for a philosopher's stone to restore their bodies after a failed attempt to bring their mother back to life using alchemy. +Fullmetal Alchemist (Japanese: 鋼の錬金術師 Hepburn: Hagane no Renkinjutsushi?, lit. "Alchemist of Steel") is a Japanese +manga series written and illustrated by Hiromu Arakawa. + + It was serialized in Square Enix's Monthly Shōnen Gangan magazine between August 2001 and June 2010; the publisher later collected the individual + chapters into twenty-seven tankōbon volumes. + The world of Fullmetal Alchemist is styled after the European Industrial Revolution. +Set in a fictional universe in which alchemy is one of the most advanced scientific techniques, the story follows the Elric brothers Edward and Alphonse, + who are searching for a philosopher's stone to restore their bodies after a failed attempt to bring their mother back to life using alchemy. Click [here](../alchemy/alchemy.md) to learn more about alchemy. From 6c97ffa944d4c4b9f14d3e3d99f12fa19ccd8960 Mon Sep 17 00:00:00 2001 From: rkaahean Date: Sun, 8 May 2016 19:14:29 +0530 Subject: [PATCH 3383/5486] Add reference to another anime --- english/naruto/seventh-hokage.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/naruto/seventh-hokage.md b/english/naruto/seventh-hokage.md index 38aaa8b70b..31011285b3 100644 --- a/english/naruto/seventh-hokage.md +++ b/english/naruto/seventh-hokage.md @@ -11,4 +11,6 @@ the main factors in winning the Fourth Shinobi World War, leading him to achieve his dream and become the village's Seventh Hokage (七代目火影, Nanadaime Hokage, Literally meaning: Seventh Fire Shadow). +However, [Full metal](../Full Metal Alchemist/fma.md) is way better :) + Click [here](http://naruto.wikia.com/wiki/Naruto_Uzumaki) for more info. From 47301a2f21e552e96a078d27ebe6299ecd3b9cf8 Mon Sep 17 00:00:00 2001 From: rkaahean Date: Sun, 8 May 2016 19:18:27 +0530 Subject: [PATCH 3384/5486] Fix line spacing (1) --- english/Full Metal Alchemist/fma.md | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/english/Full Metal Alchemist/fma.md b/english/Full Metal Alchemist/fma.md index c42ee42063..3d871c7633 100644 --- a/english/Full Metal Alchemist/fma.md +++ b/english/Full Metal Alchemist/fma.md @@ -1,10 +1,18 @@ -Fullmetal Alchemist (Japanese: 鋼の錬金術師 Hepburn: Hagane no Renkinjutsushi?, lit. "Alchemist of Steel") is a Japanese +Fullmetal Alchemist (Japanese: 鋼の錬金術師 Hepburn: + Hagane no Renkinjutsushi?, lit. "Alchemist of Steel") is a Japanese manga series written and illustrated by Hiromu Arakawa. - It was serialized in Square Enix's Monthly Shōnen Gangan magazine between August 2001 and June 2010; the publisher later collected the individual + It was serialized in Square Enix's Monthly Shōnen Gangan + magazine between August 2001 and June 2010; + the publisher later collected the individual chapters into twenty-seven tankōbon volumes. - The world of Fullmetal Alchemist is styled after the European Industrial Revolution. -Set in a fictional universe in which alchemy is one of the most advanced scientific techniques, the story follows the Elric brothers Edward and Alphonse, - who are searching for a philosopher's stone to restore their bodies after a failed attempt to bring their mother back to life using alchemy. + The world of Fullmetal Alchemist is styled after + the European Industrial Revolution. +Set in a fictional universe in which alchemy + is one of the most advanced scientific techniques, + the story follows the Elric brothers Edward and Alphonse, + who are searching for a philosopher's stone to restore + their bodies after a failed attempt to bring their +mother back to life using alchemy. Click [here](../alchemy/alchemy.md) to learn more about alchemy. From 497c625981b5c9cfd21c7a3b5e61014b5074323b Mon Sep 17 00:00:00 2001 From: hermione Date: Sun, 8 May 2016 23:56:44 +0800 Subject: [PATCH 3385/5486] add my test branch --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 1 + 1 file changed, 1 insertion(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 36d219dc95..68c2f649df 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -120,3 +120,4 @@ [悟空](Goku/Guku_arrives.md) +[测试](test/test.md) From be5916b2ee7ae2f834847e57189dd122380e227f Mon Sep 17 00:00:00 2001 From: hermione Date: Mon, 9 May 2016 00:17:37 +0800 Subject: [PATCH 3386/5486] onceagain --- Chinese/test/test.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/test/test.md diff --git a/Chinese/test/test.md b/Chinese/test/test.md new file mode 100644 index 0000000000..300f957728 --- /dev/null +++ b/Chinese/test/test.md @@ -0,0 +1 @@ +这是一个测试 From a88644d3725c942371ff11461eef09bb88013546 Mon Sep 17 00:00:00 2001 From: Casey Li Date: Sun, 8 May 2016 15:05:41 -0400 Subject: [PATCH 3387/5486] Create /Canada/Canada.md, add to stopbernie.md + marshmallow.md --- english/Canada/Canada.md | 14 ++++++++++++++ english/marshmallow.md | 4 +++- english/stopbernie/stopbernie.md | 4 +++- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 english/Canada/Canada.md diff --git a/english/Canada/Canada.md b/english/Canada/Canada.md new file mode 100644 index 0000000000..516e482dee --- /dev/null +++ b/english/Canada/Canada.md @@ -0,0 +1,14 @@ +Well, looks like the end of a long and beautiful empire. (Insert name of politician you don't like) has won. What do you do? + +Alright. You're ready. Let's head off to the [true north strong and free](https://www.youtube.com/watch?v=9yFs7K27kZI). + +Make sure to brush up on your English: it's [zed, not zee](https://www.youtube.com/watch?v=BRI-A3vakVg). + +Perhaps [applying for status as a political refugee](http://www.cic.gc.ca/english/refugees/outside/index.asp) would be one way to go? + +Or maybe you work in a [NAFTA profession](http://www.cic.gc.ca/english/work/special-business.asp)? + +Thinking about marrying that cute Canadian student who sits next to you in class to get away from all this chaos? [Sorry buddy, I've got bad news](http://www.cic.gc.ca/english/helpcentre/answer.asp?qnum=357&top=5). + +No dice? Yikes. Guess you'll have to stick around and [enjoy all this freedom](http://weknowmemes.com/wp-content/uploads/2011/12/damn-right-im-free-this-is-america.png), eh? + diff --git a/english/marshmallow.md b/english/marshmallow.md index 8ba8962029..0ee2fd5552 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -943,4 +943,6 @@ As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can h Health and Life Lovely [Quotes](./health/health.md) -The lannisters always pays thier debts, says tyrion lannister. Interesting [character](./gameofthrones/tyrion.md) he is. \ No newline at end of file +The lannisters always pays thier debts, says tyrion lannister. Interesting [character](./gameofthrones/tyrion.md) he is. + +Time to [move to Canada](Canada/Canada.md), eh? \ No newline at end of file diff --git a/english/stopbernie/stopbernie.md b/english/stopbernie/stopbernie.md index bc251e6343..4ae37e04ec 100644 --- a/english/stopbernie/stopbernie.md +++ b/english/stopbernie/stopbernie.md @@ -12,4 +12,6 @@ reading up on the purpose of taxation [Wikipedia article on taxation](https://en The non-rich will get more while the currently rich will remain rich. And despite a few less dollars for the rich, we will all be better off. -You chuckle to yourself reading the additions, and are suddenly reminded of wiki talk pages. \ No newline at end of file +You chuckle to yourself reading the additions, and are suddenly reminded of wiki talk pages. + +Hey, if the guy from the other party wins, you could always [move to Canada](../Canada/Canada.md). \ No newline at end of file From 7d57f0cf6d5c3f4632cb9aa0b633b1606f8e62f1 Mon Sep 17 00:00:00 2001 From: Casey Li Date: Sun, 8 May 2016 15:12:11 -0400 Subject: [PATCH 3388/5486] Shorten lines --- english/Canada/Canada.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/english/Canada/Canada.md b/english/Canada/Canada.md index 516e482dee..b741bc23a6 100644 --- a/english/Canada/Canada.md +++ b/english/Canada/Canada.md @@ -1,14 +1,20 @@ -Well, looks like the end of a long and beautiful empire. (Insert name of politician you don't like) has won. What do you do? +Well, looks like the end of a long and beautiful empire. +(Insert name of politician you don't like) has won. What do you do? -Alright. You're ready. Let's head off to the [true north strong and free](https://www.youtube.com/watch?v=9yFs7K27kZI). +Alright. You're ready. +Let's head off to the [true north strong and free](https://www.youtube.com/watch?v=9yFs7K27kZI). Make sure to brush up on your English: it's [zed, not zee](https://www.youtube.com/watch?v=BRI-A3vakVg). -Perhaps [applying for status as a political refugee](http://www.cic.gc.ca/english/refugees/outside/index.asp) would be one way to go? +Perhaps [applying for status as a political refugee](http://www.cic.gc.ca/english/refugees/outside/index.asp) +would be one way to go? Or maybe you work in a [NAFTA profession](http://www.cic.gc.ca/english/work/special-business.asp)? -Thinking about marrying that cute Canadian student who sits next to you in class to get away from all this chaos? [Sorry buddy, I've got bad news](http://www.cic.gc.ca/english/helpcentre/answer.asp?qnum=357&top=5). +Thinking about marrying that cute Canadian student +who sits next to you in class to get away from all this chaos? +[Sorry buddy, I've got bad news](http://www.cic.gc.ca/english/helpcentre/answer.asp?qnum=357&top=5). -No dice? Yikes. Guess you'll have to stick around and [enjoy all this freedom](http://weknowmemes.com/wp-content/uploads/2011/12/damn-right-im-free-this-is-america.png), eh? +No dice? Yikes. +Guess you'll have to stick around and [enjoy all this freedom](http://weknowmemes.com/wp-content/uploads/2011/12/damn-right-im-free-this-is-america.png), eh? From 314948c4006ad4135d15e691f5880893bd70c72a Mon Sep 17 00:00:00 2001 From: Casey Li Date: Sun, 8 May 2016 15:15:46 -0400 Subject: [PATCH 3389/5486] Break up last line --- english/Canada/Canada.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/Canada/Canada.md b/english/Canada/Canada.md index b741bc23a6..6a8cd390a5 100644 --- a/english/Canada/Canada.md +++ b/english/Canada/Canada.md @@ -16,5 +16,6 @@ who sits next to you in class to get away from all this chaos? [Sorry buddy, I've got bad news](http://www.cic.gc.ca/english/helpcentre/answer.asp?qnum=357&top=5). No dice? Yikes. -Guess you'll have to stick around and [enjoy all this freedom](http://weknowmemes.com/wp-content/uploads/2011/12/damn-right-im-free-this-is-america.png), eh? +Guess you'll have to stick around and +[enjoy all this freedom](http://weknowmemes.com/wp-content/uploads/2011/12/damn-right-im-free-this-is-america.png), eh? From 4b445a8854fa6bae959d1ce21f5c807595c8f2de Mon Sep 17 00:00:00 2001 From: davidborrell74 Date: Mon, 9 May 2016 13:02:15 +0200 Subject: [PATCH 3390/5486] split in more lines --- catala/aixecar/guerrer/guerrer.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/catala/aixecar/guerrer/guerrer.md b/catala/aixecar/guerrer/guerrer.md index 2322e698b6..0ef8ef006e 100644 --- a/catala/aixecar/guerrer/guerrer.md +++ b/catala/aixecar/guerrer/guerrer.md @@ -2,6 +2,8 @@ Et sents acorralat i penses que l'única forma de sortir d'aquí és transformar Respires profundament i comences a cridar com tants cops has vist per televisió... -De sobte, un fort soroll et retorna a la realitat. Et despertes al llit de casa teva i te'n adones que t'has cagat a sobre! +De sobte, un fort soroll et retorna a la realitat... -Clica [aquí](../catala.md) per tornar a començar... \ No newline at end of file +Et despertes al llit de casa teva i te'n adones que t'has cagat a sobre! + +Clica [aquí](../catala.md) per tornar a començar... From d9cdb52b499f1d6d33c2595e183c5430ae8d7f63 Mon Sep 17 00:00:00 2001 From: David Borrell Date: Mon, 9 May 2016 13:08:28 +0200 Subject: [PATCH 3391/5486] link changes --- catala/aixecar/guerrer/guerrer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catala/aixecar/guerrer/guerrer.md b/catala/aixecar/guerrer/guerrer.md index 2322e698b6..86977d47e3 100644 --- a/catala/aixecar/guerrer/guerrer.md +++ b/catala/aixecar/guerrer/guerrer.md @@ -4,4 +4,4 @@ Respires profundament i comences a cridar com tants cops has vist per televisió De sobte, un fort soroll et retorna a la realitat. Et despertes al llit de casa teva i te'n adones que t'has cagat a sobre! -Clica [aquí](../catala.md) per tornar a començar... \ No newline at end of file +Clica [aquí](../../catala.md) per tornar a començar... \ No newline at end of file From e4bfcb76956dfa39c657d5d0ffeb6c0aecdb86d4 Mon Sep 17 00:00:00 2001 From: Yuriy Date: Mon, 9 May 2016 22:47:44 +0300 Subject: [PATCH 3392/5486] Add new story section - lace --- ukrainian/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 125e6bfd4a..8c0ae2640f 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -33,3 +33,5 @@ [Look around](look-around/look-around.md) [Спробую прорізати вікнo ножем](knife/knife.md) + +[Зав'яжу на кінці мотузки здоровенний вузел і кину в стіну](lace/lace.md) From 8ea4a597839b80bbfb225623101fc0b5de797ab6 Mon Sep 17 00:00:00 2001 From: Yuriy Date: Tue, 10 May 2016 00:20:57 +0300 Subject: [PATCH 3393/5486] Fix new section story - lace --- .../lace/break-through-wall/break-through-wall.md | 6 ++++++ ukrainian/lace/fork/fork.md | 5 +++++ ukrainian/lace/knife/knife.md | 1 + ukrainian/lace/lace.md | 13 +++++++++++++ ukrainian/lace/lighter/lighter.md | 7 +++++++ ukrainian/lace/phone/phone.md | 2 ++ 6 files changed, 34 insertions(+) create mode 100644 ukrainian/lace/break-through-wall/break-through-wall.md create mode 100644 ukrainian/lace/fork/fork.md create mode 100644 ukrainian/lace/knife/knife.md create mode 100644 ukrainian/lace/lace.md create mode 100644 ukrainian/lace/lighter/lighter.md create mode 100644 ukrainian/lace/phone/phone.md diff --git a/ukrainian/lace/break-through-wall/break-through-wall.md b/ukrainian/lace/break-through-wall/break-through-wall.md new file mode 100644 index 0000000000..f445181c55 --- /dev/null +++ b/ukrainian/lace/break-through-wall/break-through-wall.md @@ -0,0 +1,6 @@ +Ви вдарилися головою пробуючи проламати стіну, зефір достатньо вже зачерствів, потрібно щось +гостре щоб проламати стіну... + +[Візьму ніж](../knife/knife.md) + +[Візьму виделку](../fork/fork.md) \ No newline at end of file diff --git a/ukrainian/lace/fork/fork.md b/ukrainian/lace/fork/fork.md new file mode 100644 index 0000000000..2de729cbd2 --- /dev/null +++ b/ukrainian/lace/fork/fork.md @@ -0,0 +1,5 @@ +Намагаючись зробити дірку в стіні вам захотілося спробувати на смак зефір. Ви захопилися, що +не змогли відірватися і наїлися так, що вам стало зле... + +[Візьму телефон](../lace/phone/phone.md) + diff --git a/ukrainian/lace/knife/knife.md b/ukrainian/lace/knife/knife.md new file mode 100644 index 0000000000..b39ec994bf --- /dev/null +++ b/ukrainian/lace/knife/knife.md @@ -0,0 +1 @@ +Ви почали прорізати отвір в стіні і яскраве світло засліпило вас, ви прокинулись, згодом зрозумівши, що це був тільки сон... \ No newline at end of file diff --git a/ukrainian/lace/lace.md b/ukrainian/lace/lace.md new file mode 100644 index 0000000000..84b30f699c --- /dev/null +++ b/ukrainian/lace/lace.md @@ -0,0 +1,13 @@ +Мотузка застрягла в стіні, не пробивши стіну. Виявилося, що стіни куди міцніші, аніж здається. + +[Візьму ніж](knife/knife.md) + +[Візьму виделку](fork/fork.md) + +[Візьму телефон](phone/phone.md) + +[Візьму запальничку](lighter/lighter.md) + +[Розженуся та спробую прорватися крізь одну із стін](break-through-wall/break-through-wall.md) + + \ No newline at end of file diff --git a/ukrainian/lace/lighter/lighter.md b/ukrainian/lace/lighter/lighter.md new file mode 100644 index 0000000000..5ab45a5282 --- /dev/null +++ b/ukrainian/lace/lighter/lighter.md @@ -0,0 +1,7 @@ +Ви почали підсмажувати стінки зефіру, але нічого путнього із цього не вийшло, він просто почорнів.. + +[Візьму ніж](../lace/knife/knife.md) + +[Візьму виделку](../lace/fork/fork.md) + +[Візьму телефон](../lace/phone/phone.md) \ No newline at end of file diff --git a/ukrainian/lace/phone/phone.md b/ukrainian/lace/phone/phone.md new file mode 100644 index 0000000000..85fa127739 --- /dev/null +++ b/ukrainian/lace/phone/phone.md @@ -0,0 +1,2 @@ +Ви хочете зробити важливий дзвінок, але зайшли у фб і зависли там на декілька годин забувши +про все, що вас турбувало і про те, де ви знаходитеся. \ No newline at end of file From a97a2bada06ca537a519073850e20bd3791ad84a Mon Sep 17 00:00:00 2001 From: spinweb1 Date: Mon, 9 May 2016 18:34:52 -0400 Subject: [PATCH 3394/5486] Add lines about getting a hedgehog --- english/animal/animal.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/english/animal/animal.md b/english/animal/animal.md index d18d88c00a..c01c803917 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -26,3 +26,11 @@ one more animal. Maybe two more bites... oh! i have a great idea. why don't we get ourselves a mouse? me and the cat would be both satisfied... + + +No. No. A hedgehog would be the far superior choice, as hedgehogs make great pets +and all the girls would stop and ask you what it is. You could chat them up. Maybe get their +phone numbers? + +This could happen. And you could exchange phone numbers and maybe spend the rest of your lives +together, just because you chose to get a hedgehog, rather than a mouse!! From 944c1dfea96b5a3c69f64988b847d644e00b90bb Mon Sep 17 00:00:00 2001 From: Yuriy Date: Tue, 10 May 2016 01:43:06 +0300 Subject: [PATCH 3395/5486] Fix directory structure error --- ukrainian/lace/fork/fork.md | 2 +- ukrainian/lace/lighter/lighter.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ukrainian/lace/fork/fork.md b/ukrainian/lace/fork/fork.md index 2de729cbd2..f71a7e99c7 100644 --- a/ukrainian/lace/fork/fork.md +++ b/ukrainian/lace/fork/fork.md @@ -1,5 +1,5 @@ Намагаючись зробити дірку в стіні вам захотілося спробувати на смак зефір. Ви захопилися, що не змогли відірватися і наїлися так, що вам стало зле... -[Візьму телефон](../lace/phone/phone.md) +[Візьму телефон](../phone/phone.md) diff --git a/ukrainian/lace/lighter/lighter.md b/ukrainian/lace/lighter/lighter.md index 5ab45a5282..dc63ac88c9 100644 --- a/ukrainian/lace/lighter/lighter.md +++ b/ukrainian/lace/lighter/lighter.md @@ -1,7 +1,7 @@ Ви почали підсмажувати стінки зефіру, але нічого путнього із цього не вийшло, він просто почорнів.. -[Візьму ніж](../lace/knife/knife.md) +[Візьму ніж](../knife/knife.md) -[Візьму виделку](../lace/fork/fork.md) +[Візьму виделку](../fork/fork.md) -[Візьму телефон](../lace/phone/phone.md) \ No newline at end of file +[Візьму телефон](../phone/phone.md) \ No newline at end of file From ba720d8dad9d0653c3bab72fa09cc7611fabdaef Mon Sep 17 00:00:00 2001 From: Yuriy Date: Tue, 10 May 2016 02:23:21 +0300 Subject: [PATCH 3396/5486] Make line shorter --- ukrainian/lace/knife/knife.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ukrainian/lace/knife/knife.md b/ukrainian/lace/knife/knife.md index b39ec994bf..163d5e8687 100644 --- a/ukrainian/lace/knife/knife.md +++ b/ukrainian/lace/knife/knife.md @@ -1 +1,2 @@ -Ви почали прорізати отвір в стіні і яскраве світло засліпило вас, ви прокинулись, згодом зрозумівши, що це був тільки сон... \ No newline at end of file +Ви почали прорізати отвір в стіні і яскраве світло засліпило вас, +ви прокинулись, згодом зрозумівши, що це був тільки сон... \ No newline at end of file From 392574c85f2301e9e43ae590f718c9cb67ebfd6e Mon Sep 17 00:00:00 2001 From: Michael Lehotay Date: Tue, 10 May 2016 00:42:13 -0400 Subject: [PATCH 3397/5486] Add future plans for cucumber sandwiches --- english/sandwich/sandwich.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/sandwich/sandwich.md b/english/sandwich/sandwich.md index 6ed8386adf..646f33f4c5 100644 --- a/english/sandwich/sandwich.md +++ b/english/sandwich/sandwich.md @@ -3,6 +3,8 @@ for the journey. It's gone a bit soggy though. +You make a mental note to skip the mayonnaise next time. + You strengthen your resolve and eat it anyway. You may need the energy later. Bolstered by the invigourating feeling of the sandwich in your belly, From 5274fd8304163e91bea2a3348eaaa216e262dc6b Mon Sep 17 00:00:00 2001 From: Joshua Kairu Date: Tue, 10 May 2016 20:21:19 +0300 Subject: [PATCH 3398/5486] Initial commit of tembelea jw nukta org --- swahili/swahili.md | 2 ++ swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md diff --git a/swahili/swahili.md b/swahili/swahili.md index 4d37981a23..7a9e672b86 100644 --- a/swahili/swahili.md +++ b/swahili/swahili.md @@ -1 +1,3 @@ Mambo ndiyo hayo basi. Swahili lipo wavutini. Jiskia huru kuongezea stori... + +Na basi ndipo ukakata shauri (kutembelea jw nukta org)[tembelea-jw-nukta-org/tembelea-jw-nukta-org.md]. diff --git a/swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md b/swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md new file mode 100644 index 0000000000..8e3d184146 --- /dev/null +++ b/swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md @@ -0,0 +1 @@ +Ulipotembelea tuvuti hiyo ya [jw nukta org](www.jw.org/sw) ukapata majibu yaliyokufariji ya maswali muhimu maishani. From c4df060f7d83d5bdb90ba75bec9167001cfd4560 Mon Sep 17 00:00:00 2001 From: joshuawk Date: Tue, 10 May 2016 20:28:54 +0300 Subject: [PATCH 3399/5486] Update jw nukta org link in swahili.md --- swahili/swahili.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swahili/swahili.md b/swahili/swahili.md index 7a9e672b86..2216b4543a 100644 --- a/swahili/swahili.md +++ b/swahili/swahili.md @@ -1,3 +1,3 @@ Mambo ndiyo hayo basi. Swahili lipo wavutini. Jiskia huru kuongezea stori... -Na basi ndipo ukakata shauri (kutembelea jw nukta org)[tembelea-jw-nukta-org/tembelea-jw-nukta-org.md]. +Na basi ndipo ukakata shauri [kutembelea jw nukta org](tembelea-jw-nukta-org/tembelea-jw-nukta-org.md). From b5e68de95ef96090d30a98549ef7d00a8ee7a5ac Mon Sep 17 00:00:00 2001 From: joshuawk Date: Tue, 10 May 2016 20:32:44 +0300 Subject: [PATCH 3400/5486] Update link in tembelea-jw-nukta-org.md --- swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md b/swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md index 8e3d184146..967bbef6ae 100644 --- a/swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md +++ b/swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md @@ -1 +1 @@ -Ulipotembelea tuvuti hiyo ya [jw nukta org](www.jw.org/sw) ukapata majibu yaliyokufariji ya maswali muhimu maishani. +Ulipotembelea tuvuti hiyo ya [jw nukta org](https://www.jw.org/en/) ukapata majibu yaliyokufariji ya maswali muhimu maishani. From 354cc7483fd8548174a3e4dc427a3fb92f09b94c Mon Sep 17 00:00:00 2001 From: joshuawk Date: Tue, 10 May 2016 20:35:47 +0300 Subject: [PATCH 3401/5486] Break lines in tembelea-jw-nukta-org.md --- swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md b/swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md index 967bbef6ae..ae838b8e79 100644 --- a/swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md +++ b/swahili/tembelea-jw-nukta-org/tembelea-jw-nukta-org.md @@ -1 +1,2 @@ -Ulipotembelea tuvuti hiyo ya [jw nukta org](https://www.jw.org/en/) ukapata majibu yaliyokufariji ya maswali muhimu maishani. +Ulipotembelea tuvuti hiyo ya [jw nukta org](https://www.jw.org/en/) +ukapata majibu yaliyokufariji ya maswali muhimu maishani. From 7f673af60054783a56b4b9bc52604e1a93bf21d2 Mon Sep 17 00:00:00 2001 From: Joshua Kairu Date: Tue, 10 May 2016 21:22:57 +0300 Subject: [PATCH 3402/5486] Commit marshmallow --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0ee2fd5552..c5652813f6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -945,4 +945,6 @@ Health and Life Lovely [Quotes](./health/health.md) The lannisters always pays thier debts, says tyrion lannister. Interesting [character](./gameofthrones/tyrion.md) he is. -Time to [move to Canada](Canada/Canada.md), eh? \ No newline at end of file +Time to [move to Canada](Canada/Canada.md), eh? + + From 8a642fc18c41db04ba9dd4a39c8d313ae9b8b559 Mon Sep 17 00:00:00 2001 From: Drew Meyer Date: Tue, 10 May 2016 17:55:05 -0400 Subject: [PATCH 3403/5486] Add initial english option "end" --- english/end/despair/despair.md | 2 ++ english/end/end.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/end/despair/despair.md create mode 100644 english/end/end.md diff --git a/english/end/despair/despair.md b/english/end/despair/despair.md new file mode 100644 index 0000000000..0b3b65d96a --- /dev/null +++ b/english/end/despair/despair.md @@ -0,0 +1,2 @@ +As you lie on the ground dying, with bits of brain scattered around you from shooting yourself, you +realize this task was too important and regret your decision. \ No newline at end of file diff --git a/english/end/end.md b/english/end/end.md new file mode 100644 index 0000000000..a783b37213 --- /dev/null +++ b/english/end/end.md @@ -0,0 +1 @@ +The crushing weight of all the options causes you to [end your life](despair/despair.md) \ No newline at end of file From 013899afbbabb2c74c3f07b237734739c921a049 Mon Sep 17 00:00:00 2001 From: Drew Meyer Date: Tue, 10 May 2016 18:15:16 -0400 Subject: [PATCH 3404/5486] Remove despair.md file --- english/end/despair/despair.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 english/end/despair/despair.md diff --git a/english/end/despair/despair.md b/english/end/despair/despair.md deleted file mode 100644 index 0b3b65d96a..0000000000 --- a/english/end/despair/despair.md +++ /dev/null @@ -1,2 +0,0 @@ -As you lie on the ground dying, with bits of brain scattered around you from shooting yourself, you -realize this task was too important and regret your decision. \ No newline at end of file From ad1fe4be4579688de15841f91cef3c0bb77aff43 Mon Sep 17 00:00:00 2001 From: Drew Meyer Date: Tue, 10 May 2016 18:16:32 -0400 Subject: [PATCH 3405/5486] Fix no link to end.md --- english/end/end.md | 3 ++- english/marshmallow.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/english/end/end.md b/english/end/end.md index a783b37213..0b3b65d96a 100644 --- a/english/end/end.md +++ b/english/end/end.md @@ -1 +1,2 @@ -The crushing weight of all the options causes you to [end your life](despair/despair.md) \ No newline at end of file +As you lie on the ground dying, with bits of brain scattered around you from shooting yourself, you +realize this task was too important and regret your decision. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index c5652813f6..749f71f843 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -947,4 +947,4 @@ The lannisters always pays thier debts, says tyrion lannister. Interesting [char Time to [move to Canada](Canada/Canada.md), eh? - +The crushing weight of all these options causes you to [end your life](end/end.md) From 123f59eaa96433e0b0e815c3301d57c5b47f2c1e Mon Sep 17 00:00:00 2001 From: drewsmeyer Date: Tue, 10 May 2016 18:21:10 -0400 Subject: [PATCH 3406/5486] Keep whitespace --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 749f71f843..df831fca0e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -947,4 +947,5 @@ The lannisters always pays thier debts, says tyrion lannister. Interesting [char Time to [move to Canada](Canada/Canada.md), eh? -The crushing weight of all these options causes you to [end your life](end/end.md) + +The crushing weight of all these options causes you to [end your life.](end/end.md) From db7dc481d2d97433b9346783748ffb71ec6284f8 Mon Sep 17 00:00:00 2001 From: derek Date: Tue, 10 May 2016 18:31:21 -0400 Subject: [PATCH 3407/5486] Added my story to code/code.md --- english/code/code.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/code/code.md b/english/code/code.md index ffa5c4ec8f..65613a4658 100644 --- a/english/code/code.md +++ b/english/code/code.md @@ -16,4 +16,6 @@ This also worked! You then decide to change the transparency program to slowly alternate between 100% and 25%. -Some time passes and an opportunity arises to [follow your destiny.](../destiny/destiny.md) +Some time passes and an opportunity arises to [follow your destiny.](../destiny/destiny.md) + +This is always easier whenever you drink [coffee!](../coffee/coffee.md) \ No newline at end of file From 16bf590a2a9184674b36855ee1024d308d2511c8 Mon Sep 17 00:00:00 2001 From: derek Date: Tue, 10 May 2016 18:55:57 -0400 Subject: [PATCH 3408/5486] Corrected accidental change to another user's story --- english/code/code.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/code/code.md b/english/code/code.md index 65613a4658..7809f3ef6f 100644 --- a/english/code/code.md +++ b/english/code/code.md @@ -16,6 +16,6 @@ This also worked! You then decide to change the transparency program to slowly alternate between 100% and 25%. -Some time passes and an opportunity arises to [follow your destiny.](../destiny/destiny.md) +Some time passes and an opportunity arises to [follow your destiny.](../destiny/destiny.md) -This is always easier whenever you drink [coffee!](../coffee/coffee.md) \ No newline at end of file +This is always easier whenever you drink [coffee!](../coffee/coffee.md) \ No newline at end of file From 6165ca959f07933839b067d6ba7acb0d50d77e29 Mon Sep 17 00:00:00 2001 From: Benon Garuka Date: Tue, 10 May 2016 22:43:59 -0400 Subject: [PATCH 3409/5486] edit: adding gibberish --- Gibberish/Gibberish.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Gibberish/Gibberish.md b/Gibberish/Gibberish.md index be803a18bb..e5804c1925 100644 --- a/Gibberish/Gibberish.md +++ b/Gibberish/Gibberish.md @@ -11,3 +11,4 @@ ahsldfhasljdfö alksdjfö jibber jobber joober, gibberish is for goobers. +kdnavna knakdn knakdn ind faondf alkd fadk From 16c35db872c28c7a56d93d3a97dfdc78b82981f2 Mon Sep 17 00:00:00 2001 From: Tianqing <442034859@qq.com> Date: Wed, 11 May 2016 15:03:31 +0800 Subject: [PATCH 3410/5486] =?UTF-8?q?"=E6=96=B0=E4=B8=96=E7=95=8C"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/DesertHell/OldStory/Cat2Dog/music/ago/ago.md | 2 ++ Chinese/youBecomeGay/youBecomeGay.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 Chinese/youBecomeGay/youBecomeGay.md diff --git a/Chinese/DesertHell/OldStory/Cat2Dog/music/ago/ago.md b/Chinese/DesertHell/OldStory/Cat2Dog/music/ago/ago.md index de3da0a9a1..1530da70c5 100644 --- a/Chinese/DesertHell/OldStory/Cat2Dog/music/ago/ago.md +++ b/Chinese/DesertHell/OldStory/Cat2Dog/music/ago/ago.md @@ -1 +1,3 @@ 港科那麼大，我不認識你。 + +[待我遇见你](../../../../../youBecomeGay/youBecomeGay.md) \ No newline at end of file diff --git a/Chinese/youBecomeGay/youBecomeGay.md b/Chinese/youBecomeGay/youBecomeGay.md new file mode 100644 index 0000000000..3aec10703e --- /dev/null +++ b/Chinese/youBecomeGay/youBecomeGay.md @@ -0,0 +1,3 @@ +你却成了🐔。 + +唧唧复唧唧，可愿作我妻？ \ No newline at end of file From e91d1feab67443b7b2fa9b136b358bf7f122b42b Mon Sep 17 00:00:00 2001 From: Vitaliy Senenko Date: Wed, 11 May 2016 11:04:32 +0300 Subject: [PATCH 3411/5486] Add new option 'deamon' --- ukrainian/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 8c0ae2640f..3b1a72f954 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -35,3 +35,5 @@ [Спробую прорізати вікнo ножем](knife/knife.md) [Зав'яжу на кінці мотузки здоровенний вузел і кину в стіну](lace/lace.md) + +[Викличу потусторонні сили](daemon/daemon.md) \ No newline at end of file From b505255cf50595e08933682cb2df0a6780e3c8d4 Mon Sep 17 00:00:00 2001 From: Vitaliy Senenko Date: Wed, 11 May 2016 11:11:10 +0300 Subject: [PATCH 3412/5486] End of the story --- ukrainian/daemon/daemon.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 ukrainian/daemon/daemon.md diff --git a/ukrainian/daemon/daemon.md b/ukrainian/daemon/daemon.md new file mode 100644 index 0000000000..31670fab86 --- /dev/null +++ b/ukrainian/daemon/daemon.md @@ -0,0 +1 @@ +Зявився демон Девіда Боуі і заспівав вам пісню. \ No newline at end of file From 6b6238fd44ca3ac32243d484eb63bcde7efa5443 Mon Sep 17 00:00:00 2001 From: nilanshu96 Date: Wed, 11 May 2016 23:45:02 +0530 Subject: [PATCH 3413/5486] Vote the president --- english/marshmallow.md | 4 ++++ english/vote-the-president/Hillary.md | 1 + english/vote-the-president/Trump.md | 1 + 3 files changed, 6 insertions(+) create mode 100644 english/vote-the-president/Hillary.md create mode 100644 english/vote-the-president/Trump.md diff --git a/english/marshmallow.md b/english/marshmallow.md index df831fca0e..3bf5d5522d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -2,6 +2,10 @@ Your adventure begins. You realize there are hundreds of paths for you to choose Which way should you go? Only you can decide. +January 2017 approaches. You have two presidential candidates to vote for. +[Click](vote-the-president/Trump.md) here to vote for Donald Trump. +[Click](vote-the-president/Hillary.md) here to vote for Hillary Clinton. + Keith the Unicorn approaches you. He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) diff --git a/english/vote-the-president/Hillary.md b/english/vote-the-president/Hillary.md new file mode 100644 index 0000000000..462f4c0463 --- /dev/null +++ b/english/vote-the-president/Hillary.md @@ -0,0 +1 @@ +Congratulations. You made another clinton president again. Get ready to see some great extra marital affairs that will give a lots of money to media and spicy news for the Americans. \ No newline at end of file diff --git a/english/vote-the-president/Trump.md b/english/vote-the-president/Trump.md new file mode 100644 index 0000000000..b98a1c23cd --- /dev/null +++ b/english/vote-the-president/Trump.md @@ -0,0 +1 @@ +You made America great again. Now its time to build a wall. Call 987654321 to contact Bob the builder. \ No newline at end of file From 06c7ef75ba055fe907e256fee722abb0578f3065 Mon Sep 17 00:00:00 2001 From: nilanshu96 Date: Wed, 11 May 2016 23:56:33 +0530 Subject: [PATCH 3414/5486] committed new changes --- english/marshmallow.md | 6 ++++-- english/vote-the-president/Hillary.md | 1 - english/vote-the-president/hillary/Hillary.md | 1 + english/vote-the-president/{Trump.md => trump/trump.md} | 0 4 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 english/vote-the-president/Hillary.md create mode 100644 english/vote-the-president/hillary/Hillary.md rename english/vote-the-president/{Trump.md => trump/trump.md} (100%) diff --git a/english/marshmallow.md b/english/marshmallow.md index 3bf5d5522d..5e9a5c137c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -3,8 +3,10 @@ Which way should you go? Only you can decide. January 2017 approaches. You have two presidential candidates to vote for. -[Click](vote-the-president/Trump.md) here to vote for Donald Trump. -[Click](vote-the-president/Hillary.md) here to vote for Hillary Clinton. + +[Click](vote-the-president/trump/Trump.md) here to vote for Donald Trump. + +[Click](vote-the-president/hillary/Hillary.md) here to vote for Hillary Clinton. Keith the Unicorn approaches you. He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) diff --git a/english/vote-the-president/Hillary.md b/english/vote-the-president/Hillary.md deleted file mode 100644 index 462f4c0463..0000000000 --- a/english/vote-the-president/Hillary.md +++ /dev/null @@ -1 +0,0 @@ -Congratulations. You made another clinton president again. Get ready to see some great extra marital affairs that will give a lots of money to media and spicy news for the Americans. \ No newline at end of file diff --git a/english/vote-the-president/hillary/Hillary.md b/english/vote-the-president/hillary/Hillary.md new file mode 100644 index 0000000000..3931d5968b --- /dev/null +++ b/english/vote-the-president/hillary/Hillary.md @@ -0,0 +1 @@ +Congratulations. You made another Clinton president again. 99% of Hillary voters are actually Trump haters. \ No newline at end of file diff --git a/english/vote-the-president/Trump.md b/english/vote-the-president/trump/trump.md similarity index 100% rename from english/vote-the-president/Trump.md rename to english/vote-the-president/trump/trump.md From d89694ab28a01b94035564df3d30c90bdb52891b Mon Sep 17 00:00:00 2001 From: nilanshu96 Date: Wed, 11 May 2016 23:59:30 +0530 Subject: [PATCH 3415/5486] there was a typo --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5e9a5c137c..a10d5fb3ed 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -4,7 +4,7 @@ Which way should you go? Only you can decide. January 2017 approaches. You have two presidential candidates to vote for. -[Click](vote-the-president/trump/Trump.md) here to vote for Donald Trump. +[Click](vote-the-president/trump/trump.md) here to vote for Donald Trump. [Click](vote-the-president/hillary/Hillary.md) here to vote for Hillary Clinton. From 705bed08c03a55e0d64bfe295d092c74ea98b435 Mon Sep 17 00:00:00 2001 From: ricardojlcaetano Date: Thu, 12 May 2016 11:58:13 +0100 Subject: [PATCH 3416/5486] my adventure --- portugues_pt/colaborar.md | 1 + portugues_pt/probabilidade/probabilidade.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 portugues_pt/probabilidade/probabilidade.md diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index 7057af80dc..e5bf7fa540 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -5,6 +5,7 @@ pode ser muito interessante... Então vamos lá! Se hoje ganhasse um jackpot do Euromilhões, o que faria? +[Tentava perceber](probabilidade/probabilidade.md) a probabilidade de ganhar o Euromilhões. Fazia como o Willy Fog e [Viajava pelo Mundo](mundo/voltaaomundo.md) diff --git a/portugues_pt/probabilidade/probabilidade.md b/portugues_pt/probabilidade/probabilidade.md new file mode 100644 index 0000000000..62dae7698c --- /dev/null +++ b/portugues_pt/probabilidade/probabilidade.md @@ -0,0 +1 @@ +Descobria que a probabilidade de ganha o Euromilhões é de aproximadamente 1 em 76 milhões. \ No newline at end of file From 67161dc01dbc7aaba3954352b507256cb3f7b18e Mon Sep 17 00:00:00 2001 From: ricardojlcaetano Date: Thu, 12 May 2016 12:05:18 +0100 Subject: [PATCH 3417/5486] typo --- portugues_pt/probabilidade/probabilidade.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues_pt/probabilidade/probabilidade.md b/portugues_pt/probabilidade/probabilidade.md index 62dae7698c..08d78fde51 100644 --- a/portugues_pt/probabilidade/probabilidade.md +++ b/portugues_pt/probabilidade/probabilidade.md @@ -1 +1 @@ -Descobria que a probabilidade de ganha o Euromilhões é de aproximadamente 1 em 76 milhões. \ No newline at end of file +Descobria que a probabilidade de ganhar o Euromilhões é de aproximadamente 1 em 76 milhões. \ No newline at end of file From f3e962c9eb742facd05875ad3a17dea660e40154 Mon Sep 17 00:00:00 2001 From: Jim_OfficeComp Date: Thu, 12 May 2016 10:44:41 -0400 Subject: [PATCH 3418/5486] Fix: corrected teh to the --- .../steep-slope/stone-tunnel/stone-tunnel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/lunge-for-the-lighter/steep-slope/stone-tunnel/stone-tunnel.md b/english/lunge-for-the-lighter/steep-slope/stone-tunnel/stone-tunnel.md index 086ceff94d..1dadecbbc3 100644 --- a/english/lunge-for-the-lighter/steep-slope/stone-tunnel/stone-tunnel.md +++ b/english/lunge-for-the-lighter/steep-slope/stone-tunnel/stone-tunnel.md @@ -3,5 +3,5 @@ grey, raccoon-like creatures "talking" to one another. The smaller of the two, a eye for a moment, and hands you a half-meter long, sharpened, metal rod with unintelligble markings on it. The simplistic designs lead you to believe that the raccoons made these markings. Each of them has one of the rods too. They "speak" to you, and they gesture down the tunnel. As they turn and walk away further into the tunnel, -you get teh feeling that they want you to follow them. +you get the feeling that they want you to follow them. From c2b06b97bb3eb3f4c43caaccd2f3159c9efefee0 Mon Sep 17 00:00:00 2001 From: developerking Date: Thu, 12 May 2016 16:58:17 -0400 Subject: [PATCH 3419/5486] Add reincarnation as green starfish --- english/marshmallow.md | 2 ++ english/starfish/starfish.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/starfish/starfish.md diff --git a/english/marshmallow.md b/english/marshmallow.md index a10d5fb3ed..d0e116e19f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -955,3 +955,5 @@ Time to [move to Canada](Canada/Canada.md), eh? The crushing weight of all these options causes you to [end your life.](end/end.md) + +You're reincarnated as a green starfish but wish you were [blue instead.](starfish/starfish.md) diff --git a/english/starfish/starfish.md b/english/starfish/starfish.md new file mode 100644 index 0000000000..b7ae09a2f6 --- /dev/null +++ b/english/starfish/starfish.md @@ -0,0 +1 @@ +You think, "it's not easy being green." Your starfish mother tells you about a long line of green starfish ancestors that have achieved great things and now it's your turn to make your mark. You feel proud to be green now. You won't let the green starfish family down. \ No newline at end of file From 2238f34f944810e46e86081d2712b06eedeedde9 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 13 May 2016 13:33:50 +0600 Subject: [PATCH 3420/5486] Add new story line to "gusly" story --- russian/gusli/bath/bath.md | 6 ++++++ russian/gusli/boots/boots.md | 7 +++++++ russian/gusli/gusli.md | 7 +++++++ russian/gusli/vodka/vodka.md | 5 +++++ 4 files changed, 25 insertions(+) create mode 100644 russian/gusli/bath/bath.md create mode 100644 russian/gusli/boots/boots.md create mode 100644 russian/gusli/vodka/vodka.md diff --git a/russian/gusli/bath/bath.md b/russian/gusli/bath/bath.md new file mode 100644 index 0000000000..da4e0eb489 --- /dev/null +++ b/russian/gusli/bath/bath.md @@ -0,0 +1,6 @@ +Вы тщательно ищете баню в этом окаянном зефирном доме. +После часового безрезультатного поиска вы решаете: + +[Испить водки](../vodka/vodka.md) + +[Катать валенки](../boots/boots.md) \ No newline at end of file diff --git a/russian/gusli/boots/boots.md b/russian/gusli/boots/boots.md new file mode 100644 index 0000000000..829856b4c8 --- /dev/null +++ b/russian/gusli/boots/boots.md @@ -0,0 +1,7 @@ +В поисках материала для валяния валенок вы проводите оставшийся день. + +Выбившисьиз сил вы решаете, что, в общем-то, не особо холодно, да и дом зефирный. + +Вам остается: + +[Испить водки](../vodka/vodka.md) \ No newline at end of file diff --git a/russian/gusli/gusli.md b/russian/gusli/gusli.md index 970b4f6a7e..e2adfb9c43 100644 --- a/russian/gusli/gusli.md +++ b/russian/gusli/gusli.md @@ -6,3 +6,10 @@ И запах. Исчез запах marshmallow. И возникает этот новый, резкий запах. «Здесь русский дух, здесь Русью пахнет…» +Вы решаете: + +[Затопить печь](bath/bath.md) + +[Катать валенки](boots/boots.md) + +[Испить водки](vodka/vodka.md) diff --git a/russian/gusli/vodka/vodka.md b/russian/gusli/vodka/vodka.md new file mode 100644 index 0000000000..ed292aae90 --- /dev/null +++ b/russian/gusli/vodka/vodka.md @@ -0,0 +1,5 @@ +Наконец-то вы добралсь до полторалитровой мутной самогонки, выгнанной судя по всему из зефира. +Оторвав кусок зефира от стены, вы делаете несколько глотков прямо из сосуда и занюхиваете зефиром. +"Что-то не то" - думаете вы. Быстрыми проворными движениями вы придаете зефиру форму шпротины и с жадностью заедаете выпитое. +После успешного превращения зефира в шпротину вас уже не остановить. Вскоре на столе появляется остальная банка шпрот, банка кильки в томатном соусе, соленые огурчики, маринованый хрен, краюха черного хлеба и тд и тп. +Вдоволь поев и выпив остатки самогона, вы решаете пойти за второй... \ No newline at end of file From cc70e8acf5cbbceb3c01bb0391070f9f4e45b99c Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 13 May 2016 13:37:59 +0600 Subject: [PATCH 3421/5486] Fix typo in boots.md --- russian/gusli/boots/boots.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/gusli/boots/boots.md b/russian/gusli/boots/boots.md index 829856b4c8..836d96e1e8 100644 --- a/russian/gusli/boots/boots.md +++ b/russian/gusli/boots/boots.md @@ -1,6 +1,6 @@ В поисках материала для валяния валенок вы проводите оставшийся день. -Выбившисьиз сил вы решаете, что, в общем-то, не особо холодно, да и дом зефирный. +Выбившись из сил вы решаете, что, в общем-то, не особо холодно, да и дом зефирный. Вам остается: From ef4f7af719dd728971d5e33c1dfcb6100e5021fb Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 13 May 2016 13:44:57 +0600 Subject: [PATCH 3422/5486] Fix large line lenght --- russian/gusli/vodka/vodka.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/russian/gusli/vodka/vodka.md b/russian/gusli/vodka/vodka.md index ed292aae90..7b7f6683fa 100644 --- a/russian/gusli/vodka/vodka.md +++ b/russian/gusli/vodka/vodka.md @@ -1,5 +1,8 @@ Наконец-то вы добралсь до полторалитровой мутной самогонки, выгнанной судя по всему из зефира. Оторвав кусок зефира от стены, вы делаете несколько глотков прямо из сосуда и занюхиваете зефиром. -"Что-то не то" - думаете вы. Быстрыми проворными движениями вы придаете зефиру форму шпротины и с жадностью заедаете выпитое. -После успешного превращения зефира в шпротину вас уже не остановить. Вскоре на столе появляется остальная банка шпрот, банка кильки в томатном соусе, соленые огурчики, маринованый хрен, краюха черного хлеба и тд и тп. +"Что-то не то" - думаете вы. +Быстрыми проворными движениями вы придаете зефиру форму шпротины и с жадностью заедаетевыпитое. +После успешного превращения зефира в шпротину вас уже не остановить. +Вскоре на столе появляется остальная банка шпрот, банка кильки в томатном соусе, соленые огурчики, +маринованый хрен, краюха черного хлеба и тд и тп. Вдоволь поев и выпив остатки самогона, вы решаете пойти за второй... \ No newline at end of file From 2d89ab34ae72630c0d3c23808c623620ed938c75 Mon Sep 17 00:00:00 2001 From: Fabian Marquardt Date: Fri, 13 May 2016 11:40:20 +0200 Subject: [PATCH 3423/5486] Fix typo --- german/Leichen/Leichen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 02fd00b7c3..9a560446dc 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -1,7 +1,7 @@ Sie schauen ängstlich um sich, sehen aber keine andere Menschenseele außer den beiden völlig durchlöcherten Leichnamen neben sich, deren Blut sie mittlerweile grosszügig an die Lebewesen im See gespendet haben. Ihr Boot ist bereits in leichter Schieflage und hastig -werfen die beiden Leichen aus dem Boot. +werfen Sie die beiden Leichen aus dem Boot. Sie schnaufen einmal kräftig durch während ihnen tausend Gedanken durch den Kopf gehen... From a476831aab09f25cbf8882c92d7468f2d36cd649 Mon Sep 17 00:00:00 2001 From: Fabian Marquardt Date: Fri, 13 May 2016 11:48:34 +0200 Subject: [PATCH 3424/5486] Add clownfish piranhas to storyline --- german/Leichen/Leichen.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 9a560446dc..17be42f9e0 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -1,11 +1,12 @@ Sie schauen ängstlich um sich, sehen aber keine andere Menschenseele außer den beiden völlig durchlöcherten Leichnamen neben sich, deren Blut sie mittlerweile grosszügig an die Lebewesen im See gespendet haben. Ihr Boot ist bereits in leichter Schieflage und hastig -werfen Sie die beiden Leichen aus dem Boot. +werfen die beiden Leichen aus dem Boot. Sie schnaufen einmal kräftig durch während ihnen tausend Gedanken durch den Kopf gehen... Schnell, aber unbemerkt versuchen Sie an Land zu kommen, aber es scheint nicht näher zu kommen.... +Stattdessen sehe ich immer wieder einen kleinen Clownfisch-Piranha-Mischling an mir vorbeischwimmen und genüsslich an meinen Sachen nagen. Was tun Sie? From 80bb8726deea85241b7833b8c3577d790b626b7b Mon Sep 17 00:00:00 2001 From: Fabian Marquardt Date: Fri, 13 May 2016 11:51:44 +0200 Subject: [PATCH 3425/5486] Add line break --- german/Leichen/Leichen.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 17be42f9e0..45d1d54f24 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -6,7 +6,8 @@ werfen die beiden Leichen aus dem Boot. Sie schnaufen einmal kräftig durch während ihnen tausend Gedanken durch den Kopf gehen... Schnell, aber unbemerkt versuchen Sie an Land zu kommen, aber es scheint nicht näher zu kommen.... -Stattdessen sehe ich immer wieder einen kleinen Clownfisch-Piranha-Mischling an mir vorbeischwimmen und genüsslich an meinen Sachen nagen. +Stattdessen sehe ich immer wieder einen kleinen Clownfisch-Piranha-Mischling an mir vorbeischwimmen +und genüsslich an meinen Sachen nagen. Was tun Sie? From 94d94a5e4f39cb5ad4670ca360908f8e62eafc24 Mon Sep 17 00:00:00 2001 From: warren-braganza Date: Fri, 13 May 2016 16:26:38 +0530 Subject: [PATCH 3426/5486] created new multi choice story. --- english/captain/captain.md | 1 + english/ironman/ironman.md | 1 + english/marshmallow.md | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 english/captain/captain.md create mode 100644 english/ironman/ironman.md diff --git a/english/captain/captain.md b/english/captain/captain.md new file mode 100644 index 0000000000..8e3515d6ee --- /dev/null +++ b/english/captain/captain.md @@ -0,0 +1 @@ +Good Choice. \ No newline at end of file diff --git a/english/ironman/ironman.md b/english/ironman/ironman.md new file mode 100644 index 0000000000..919018204e --- /dev/null +++ b/english/ironman/ironman.md @@ -0,0 +1 @@ +Wrong Choice. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index a10d5fb3ed..97a42c40ea 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,6 +1,11 @@ Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. +Who is better? + +[Click Here](captain/captain.md) to vote for Captain America + +[Click Here] (ironman/ironman.md) to vote for Iron Man January 2017 approaches. You have two presidential candidates to vote for. From d8b1d312ec80fbc4d0d64238ab4721af13dcdeed Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 13 May 2016 15:14:31 +0300 Subject: [PATCH 3427/5486] Fix typo in russian translation --- russian/gusli/vodka/vodka.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/gusli/vodka/vodka.md b/russian/gusli/vodka/vodka.md index 7b7f6683fa..4e537f051d 100644 --- a/russian/gusli/vodka/vodka.md +++ b/russian/gusli/vodka/vodka.md @@ -1,7 +1,7 @@ Наконец-то вы добралсь до полторалитровой мутной самогонки, выгнанной судя по всему из зефира. Оторвав кусок зефира от стены, вы делаете несколько глотков прямо из сосуда и занюхиваете зефиром. "Что-то не то" - думаете вы. -Быстрыми проворными движениями вы придаете зефиру форму шпротины и с жадностью заедаетевыпитое. +Быстрыми проворными движениями вы придаете зефиру форму шпротины и с жадностью заедаете выпитое. После успешного превращения зефира в шпротину вас уже не остановить. Вскоре на столе появляется остальная банка шпрот, банка кильки в томатном соусе, соленые огурчики, маринованый хрен, краюха черного хлеба и тд и тп. From acb61b0101f865505e1fed4cbd78e0a2b787c686 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 13 May 2016 15:38:17 +0300 Subject: [PATCH 3428/5486] Add swim in the pool option in russian story --- russian/go-to-swim/go-to-swim.md | 5 +++++ russian/zefir.md | 1 + 2 files changed, 6 insertions(+) create mode 100644 russian/go-to-swim/go-to-swim.md diff --git a/russian/go-to-swim/go-to-swim.md b/russian/go-to-swim/go-to-swim.md new file mode 100644 index 0000000000..c64071c17a --- /dev/null +++ b/russian/go-to-swim/go-to-swim.md @@ -0,0 +1,5 @@ +Оказалось, что Вы не очень любите сладкое, но не прочь поплавать. +Прекрасный бассейн, с прозрачной, слегка голубоватой водой помог Вам +освежиться и взбодрил Вас. +После 30 минут плавания Вы замечаете что в дальнем углу бассейна есть две двери. +Одна с натписью "Массаж", а другая "Парилка". \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index ca8422adc5..7b956d9abb 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -15,6 +15,7 @@ Это была всего лишь банка с вишневым компотом. Ваши действия: +[Пойти поплавать](go-to-swim/go-to-swim.md) [Начать танцевать Лезгинку](dance_lezginka/dance.md) From 5b9c3c2d81f32e115c792c5e9aba53fd3af9978e Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 13 May 2016 15:42:15 +0300 Subject: [PATCH 3429/5486] Fix typo --- russian/go-to-swim/go-to-swim.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/go-to-swim/go-to-swim.md b/russian/go-to-swim/go-to-swim.md index c64071c17a..991115a78c 100644 --- a/russian/go-to-swim/go-to-swim.md +++ b/russian/go-to-swim/go-to-swim.md @@ -2,4 +2,4 @@ Прекрасный бассейн, с прозрачной, слегка голубоватой водой помог Вам освежиться и взбодрил Вас. После 30 минут плавания Вы замечаете что в дальнем углу бассейна есть две двери. -Одна с натписью "Массаж", а другая "Парилка". \ No newline at end of file +Одна с надписью "Массаж", а другая "Парилка". \ No newline at end of file From c1030c6d31c475d8fee6b483a63718cdfb63d71e Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 13 May 2016 16:03:41 +0300 Subject: [PATCH 3430/5486] Undo typo fix --- russian/gusli/vodka/vodka.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/gusli/vodka/vodka.md b/russian/gusli/vodka/vodka.md index 4e537f051d..7b7f6683fa 100644 --- a/russian/gusli/vodka/vodka.md +++ b/russian/gusli/vodka/vodka.md @@ -1,7 +1,7 @@ Наконец-то вы добралсь до полторалитровой мутной самогонки, выгнанной судя по всему из зефира. Оторвав кусок зефира от стены, вы делаете несколько глотков прямо из сосуда и занюхиваете зефиром. "Что-то не то" - думаете вы. -Быстрыми проворными движениями вы придаете зефиру форму шпротины и с жадностью заедаете выпитое. +Быстрыми проворными движениями вы придаете зефиру форму шпротины и с жадностью заедаетевыпитое. После успешного превращения зефира в шпротину вас уже не остановить. Вскоре на столе появляется остальная банка шпрот, банка кильки в томатном соусе, соленые огурчики, маринованый хрен, краюха черного хлеба и тд и тп. From 9ca1bb408b5c4a9a6368f99a51750e3dde764ca7 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 13 May 2016 16:11:09 +0300 Subject: [PATCH 3431/5486] Fix missed line --- russian/zefir.md | 1 + 1 file changed, 1 insertion(+) diff --git a/russian/zefir.md b/russian/zefir.md index 7b956d9abb..b921b62e85 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -15,6 +15,7 @@ Это была всего лишь банка с вишневым компотом. Ваши действия: + [Пойти поплавать](go-to-swim/go-to-swim.md) [Начать танцевать Лезгинку](dance_lezginka/dance.md) From bcb0f9a37f08f3b79b59c29460fdab72f66bbad7 Mon Sep 17 00:00:00 2001 From: King Date: Fri, 13 May 2016 11:35:10 -0400 Subject: [PATCH 3432/5486] Update starfish.md --- english/starfish/starfish.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/starfish/starfish.md b/english/starfish/starfish.md index b7ae09a2f6..a8cad552c9 100644 --- a/english/starfish/starfish.md +++ b/english/starfish/starfish.md @@ -1 +1,3 @@ -You think, "it's not easy being green." Your starfish mother tells you about a long line of green starfish ancestors that have achieved great things and now it's your turn to make your mark. You feel proud to be green now. You won't let the green starfish family down. \ No newline at end of file +You think, "it's not easy being green." +Your starfish mother tells you about a long line of green starfish ancestors that have achieved great things and now it's your turn to make your mark. +You feel proud to be green now. You won't let the green starfish family down. From 025ec70c2ea6190461606d545752e85d1e02aa9c Mon Sep 17 00:00:00 2001 From: King Date: Fri, 13 May 2016 11:36:32 -0400 Subject: [PATCH 3433/5486] Update starfish.md --- english/starfish/starfish.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/starfish/starfish.md b/english/starfish/starfish.md index a8cad552c9..a2e6659152 100644 --- a/english/starfish/starfish.md +++ b/english/starfish/starfish.md @@ -1,3 +1,4 @@ You think, "it's not easy being green." -Your starfish mother tells you about a long line of green starfish ancestors that have achieved great things and now it's your turn to make your mark. +Your starfish mother tells you about a long line of green starfish ancestors that have achieved great things. +Now it's your turn to make your mark. You feel proud to be green now. You won't let the green starfish family down. From c2cd8f50c0bb419067cc75c934061ea3ce473bc8 Mon Sep 17 00:00:00 2001 From: sandiaPop Date: Fri, 13 May 2016 13:51:20 -0500 Subject: [PATCH 3434/5486] add: File fuerza to file templo to file espanol --- espanol/templo/fuerza/fuerza.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 espanol/templo/fuerza/fuerza.md diff --git a/espanol/templo/fuerza/fuerza.md b/espanol/templo/fuerza/fuerza.md new file mode 100644 index 0000000000..28dfbe9683 --- /dev/null +++ b/espanol/templo/fuerza/fuerza.md @@ -0,0 +1,3 @@ +Nuevamente comenzaron a vibrar +intensamente con determinación +para seguir adelante en la vida... From 61c68c82f6ce46f29281a81c0b34d86e7b0a26b9 Mon Sep 17 00:00:00 2001 From: sandiaPop Date: Fri, 13 May 2016 14:01:21 -0500 Subject: [PATCH 3435/5486] add: Relative link - Los corazones dolidos - to templo.md --- espanol/templo/templo.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/templo/templo.md b/espanol/templo/templo.md index 2851bd2c11..cec406385a 100644 --- a/espanol/templo/templo.md +++ b/espanol/templo/templo.md @@ -7,3 +7,5 @@ Cuando de pronto... [Se oyó un grito que decía ](grito/grito.md) [Todos vieron cómo venía un ejercito](../ejercito/ejercito.md) + +[Los corazones dolidos](fuerza/fuerza.md) From 6d069a673d19c82d9e6f10afe8de042acab485fb Mon Sep 17 00:00:00 2001 From: Ali Esmaeili Date: Sat, 14 May 2016 07:01:47 +0430 Subject: [PATCH 3436/5486] Add a dream to persian adventures --- persian/dream/dasht/pahnavar.md | 4 ++++ persian/dream/index.md | 1 + persian/otagheh-basteh.md | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 persian/dream/dasht/pahnavar.md create mode 100644 persian/dream/index.md diff --git a/persian/dream/dasht/pahnavar.md b/persian/dream/dasht/pahnavar.md new file mode 100644 index 0000000000..86b5de1df5 --- /dev/null +++ b/persian/dream/dasht/pahnavar.md @@ -0,0 +1,4 @@ +شب بود و من در دشتی وسیع در کنار یکی از دوستانم در جاده ای که انتهای آن نامشخص بود قدم میزدیم +نسیم خنکی صورت هایمان را نوازش میداد. آسمان به طرز شگفت انگیزی پر از ستاره های درخشان بود +ناگهان رنگ تیره ی آسمان از سمت افق به سرخی و روشنی گرایید و این روشنایی بیشتر و بیشتر میشد و ما را محو خود کرده بود +چیزی به ما نزدیک میشد یا از آسمان میگذشت. ما در ته قلبمان عاشقش شده بودیم diff --git a/persian/dream/index.md b/persian/dream/index.md new file mode 100644 index 0000000000..9f50212b82 --- /dev/null +++ b/persian/dream/index.md @@ -0,0 +1 @@ +درون یک دشت بودم، [به اینجا بروید](dasht/pahnavar.md) diff --git a/persian/otagheh-basteh.md b/persian/otagheh-basteh.md index ac1f11b377..adee4767cf 100644 --- a/persian/otagheh-basteh.md +++ b/persian/otagheh-basteh.md @@ -1,2 +1,4 @@ + داشتم یک رؤیا میدیدم، [به اینجا بروید](dream/index.md) + چشم‌هایم را در یک اتاق کوچک و بسته باز کردم. نگاهی به اطراف انداختم. نمی‌دانستم کجا هستم و چگونه وارد این اتاق شده‌ام. -هیچ در و پنجره‌ای در این اتاق کوچک ندیدم و هیچ صدایی نمی‌شنیدم. ترسیده بودم و نمی دانستم چکار کنم \ No newline at end of file +هیچ در و پنجره‌ای در این اتاق کوچک ندیدم و هیچ صدایی نمی‌شنیدم. ترسیده بودم و نمی دانستم چکار کنم From 47713aedd099f9c2509ca2eef679de508b687f7e Mon Sep 17 00:00:00 2001 From: Zeebs Date: Sat, 14 May 2016 19:11:08 +0200 Subject: [PATCH 3437/5486] Update yellow-baby-buggy-bumpers.md --- .../yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md b/english/yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md index 3f11a94747..601496dd56 100644 --- a/english/yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md +++ b/english/yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md @@ -8,4 +8,8 @@ you suddenly make a decision. You want to take a bumper car ride while dressed i favorite yellow suit and sucking your thumb. You're not sure it is the best decision for your career but you know it's the right thing to do. -You then start walking towards the amusement park. \ No newline at end of file +You then start walking towards the amusement park. + +As you approach the park, you get a foreboding sense that not all is right. +You see the park in the distance. It is night, and the park is full of lights. +The ferris wheel is turning. From 7b5d2d20bc5ea496a12c84844613b4defc57157d Mon Sep 17 00:00:00 2001 From: rodrigoaps Date: Sat, 14 May 2016 17:29:48 -0300 Subject: [PATCH 3438/5486] Add files via upload --- portugues/toalha/nave.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 portugues/toalha/nave.md diff --git a/portugues/toalha/nave.md b/portugues/toalha/nave.md new file mode 100644 index 0000000000..808042fa65 --- /dev/null +++ b/portugues/toalha/nave.md @@ -0,0 +1,5 @@ +Ao entrar no banheiro, você vê gigantescas coisas amarelas no céu. O que você faz? + +[Limpa o celular com a tolhas](limpar/limpar.md) + +[Tenta pegar uma carona numa das coisas amarelas.](carona/carona.md) From 6eece2d9403e95c0ca7126eabafed50f4573136f Mon Sep 17 00:00:00 2001 From: rodrigoaps Date: Sat, 14 May 2016 17:31:24 -0300 Subject: [PATCH 3439/5486] typo --- portugues/toalha/nave.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portugues/toalha/nave.md b/portugues/toalha/nave.md index 808042fa65..1119ea3247 100644 --- a/portugues/toalha/nave.md +++ b/portugues/toalha/nave.md @@ -1,5 +1,5 @@ Ao entrar no banheiro, você vê gigantescas coisas amarelas no céu. O que você faz? -[Limpa o celular com a tolhas](limpar/limpar.md) +[Ignora e limpa o celular com a tolha](limpar/limpar.md) -[Tenta pegar uma carona numa das coisas amarelas.](carona/carona.md) +[Tenta pegar uma carona numa dessas coisas amarelas.](carona/carona.md) From f02cf05f5de93e0ce2cabd032ec098880d60fb43 Mon Sep 17 00:00:00 2001 From: rodrigoaps Date: Sat, 14 May 2016 17:40:31 -0300 Subject: [PATCH 3440/5486] New files --- portugues/toalha/carona/carona.md | 1 + portugues/toalha/limpar/limpar.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 portugues/toalha/carona/carona.md create mode 100644 portugues/toalha/limpar/limpar.md diff --git a/portugues/toalha/carona/carona.md b/portugues/toalha/carona/carona.md new file mode 100644 index 0000000000..666a519040 --- /dev/null +++ b/portugues/toalha/carona/carona.md @@ -0,0 +1 @@ +Você consegue a carona e descobre que a coisa amarela é uma nave dos Vogons, uma raça alienígena um tanto bisonha. Infelizmente, os vogons são conhecidos como os quarto piores programadores da galáxia, e não podem resolver o bug. Acho que você vai ter que escutar poesia por alguns anos ... \ No newline at end of file diff --git a/portugues/toalha/limpar/limpar.md b/portugues/toalha/limpar/limpar.md new file mode 100644 index 0000000000..f0d9ff4ddf --- /dev/null +++ b/portugues/toalha/limpar/limpar.md @@ -0,0 +1 @@ +Você olha para o celular e descobre que funcionou, o bug foi resolvido! Muito feliz, você decide ir tomar um banho. Por uma triste conhecidência, porém, a Terra é explodida alguns segundos depois. \ No newline at end of file From 81f9f68b46b91c6b88b62ec9c11d760aaa7af993 Mon Sep 17 00:00:00 2001 From: rodrigoaps Date: Sat, 14 May 2016 17:41:21 -0300 Subject: [PATCH 3441/5486] Add new option --- portugues/colaborando.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 92ae493b6e..4641e550fe 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -25,6 +25,8 @@ Você: [Mas esse navio não pode ter bugs!](titanic/iceberg.md) +[Vai ao banheiro pegar sua toalha](toalha/nave.md) + Na verdade, isto tudo é a sua imaginação. Você vive em 1991 e usa MS-DOS 5.0 e um modem de 9600 baud. A sua linha telefônica está uma droga hoje e você tem que baixar a ultima versão do XTree para enciumar os seus amigos. From 84935a5b71e7966ad647c6693810284c7caadbf1 Mon Sep 17 00:00:00 2001 From: rodrigoaps Date: Sat, 14 May 2016 17:41:46 -0300 Subject: [PATCH 3442/5486] typo --- portugues/colaborando.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 4641e550fe..f07d65fb51 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -25,7 +25,7 @@ Você: [Mas esse navio não pode ter bugs!](titanic/iceberg.md) -[Vai ao banheiro pegar sua toalha](toalha/nave.md) +[Vai ao banheiro e pega sua toalha](toalha/nave.md) Na verdade, isto tudo é a sua imaginação. Você vive em 1991 e usa MS-DOS 5.0 e um modem de 9600 baud. From 970d88e4cad109e23ddb65e4f4ba8e5bfa6c180e Mon Sep 17 00:00:00 2001 From: rodrigoaps Date: Sat, 14 May 2016 17:42:05 -0300 Subject: [PATCH 3443/5486] Update nave.md --- portugues/toalha/nave.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/toalha/nave.md b/portugues/toalha/nave.md index 1119ea3247..c20138cb23 100644 --- a/portugues/toalha/nave.md +++ b/portugues/toalha/nave.md @@ -1,5 +1,5 @@ Ao entrar no banheiro, você vê gigantescas coisas amarelas no céu. O que você faz? -[Ignora e limpa o celular com a tolha](limpar/limpar.md) +[Ignora e limpa o celular com a tolha.](limpar/limpar.md) [Tenta pegar uma carona numa dessas coisas amarelas.](carona/carona.md) From 67dc4984a8a4008c65eaeef9aa5fc414c04ef4d5 Mon Sep 17 00:00:00 2001 From: rodrigoaps Date: Sat, 14 May 2016 17:43:19 -0300 Subject: [PATCH 3444/5486] change vogon phrase --- portugues/toalha/carona/carona.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/toalha/carona/carona.md b/portugues/toalha/carona/carona.md index 666a519040..253f8cfbfd 100644 --- a/portugues/toalha/carona/carona.md +++ b/portugues/toalha/carona/carona.md @@ -1 +1 @@ -Você consegue a carona e descobre que a coisa amarela é uma nave dos Vogons, uma raça alienígena um tanto bisonha. Infelizmente, os vogons são conhecidos como os quarto piores programadores da galáxia, e não podem resolver o bug. Acho que você vai ter que escutar poesia por alguns anos ... \ No newline at end of file +Você consegue a carona e descobre que a coisa amarela é uma nave dos Vogons, uma raça alienígena um tanto bisonha. Infelizmente, os vogons são conhecidos como os quarto piores programadores da galáxia, e não tem a menor chance de resolver o bug. Acho que você vai ter que escutar poesia por alguns anos ... From 4086b91322040f669db2bea62ee3bcd78c0f3700 Mon Sep 17 00:00:00 2001 From: Rodrigo Souza Date: Sat, 14 May 2016 18:07:55 -0300 Subject: [PATCH 3445/5486] Break up the lines --- portugues/toalha/carona/carona.md | 4 +++- portugues/toalha/limpar/limpar.md | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/portugues/toalha/carona/carona.md b/portugues/toalha/carona/carona.md index 253f8cfbfd..469511eb3f 100644 --- a/portugues/toalha/carona/carona.md +++ b/portugues/toalha/carona/carona.md @@ -1 +1,3 @@ -Você consegue a carona e descobre que a coisa amarela é uma nave dos Vogons, uma raça alienígena um tanto bisonha. Infelizmente, os vogons são conhecidos como os quarto piores programadores da galáxia, e não tem a menor chance de resolver o bug. Acho que você vai ter que escutar poesia por alguns anos ... +Você consegue a carona e descobre que a coisa amarela é uma nave dos Vogons, uma raça alienígena um tanto +bisonha. Infelizmente, os vogons são conhecidos como os quarto piores programadores da galáxia, e não tem +a menor chance de resolver o bug. Acho que você vai ter que escutar poesia por alguns anos ... diff --git a/portugues/toalha/limpar/limpar.md b/portugues/toalha/limpar/limpar.md index f0d9ff4ddf..485b1f7d43 100644 --- a/portugues/toalha/limpar/limpar.md +++ b/portugues/toalha/limpar/limpar.md @@ -1 +1,2 @@ -Você olha para o celular e descobre que funcionou, o bug foi resolvido! Muito feliz, você decide ir tomar um banho. Por uma triste conhecidência, porém, a Terra é explodida alguns segundos depois. \ No newline at end of file +Você olha para o celular e descobre que funcionou, o bug foi resolvido! Muito feliz, você decide ir +tomar um banho. Por uma triste conhecidência, porém, a Terra é explodida alguns segundos depois. \ No newline at end of file From 7b3f19aa0e4f80e77201978f66944f44a9b12259 Mon Sep 17 00:00:00 2001 From: Giesch Date: Sat, 14 May 2016 17:38:18 -0500 Subject: [PATCH 3446/5486] Add decision to existence.md --- english/unicorn/existence/existence.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/unicorn/existence/existence.md b/english/unicorn/existence/existence.md index 087874d14e..42e84e3fd2 100644 --- a/english/unicorn/existence/existence.md +++ b/english/unicorn/existence/existence.md @@ -1 +1,5 @@ The grey walls surrounding you look brighter than usual. The monotony continues. You question the nature of porridge. + +The porridge, at least, is [real](realporridge/porridge.md). + +This room, too, is an [illusion](fakeporridge/descartes.md). \ No newline at end of file From be3c943303def94915bd767ce13400f4a7d7dbac Mon Sep 17 00:00:00 2001 From: Giesch Date: Sat, 14 May 2016 17:39:38 -0500 Subject: [PATCH 3447/5486] Add pages for 2 decisions from existence.md --- english/unicorn/existence/fakeporridge/descartes.md | 6 ++++++ english/unicorn/existence/realporridge/porridge.md | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 english/unicorn/existence/fakeporridge/descartes.md create mode 100644 english/unicorn/existence/realporridge/porridge.md diff --git a/english/unicorn/existence/fakeporridge/descartes.md b/english/unicorn/existence/fakeporridge/descartes.md new file mode 100644 index 0000000000..77ed133b65 --- /dev/null +++ b/english/unicorn/existence/fakeporridge/descartes.md @@ -0,0 +1,6 @@ +No. There is no reason to assume this place is more real than the others. +Could not Descartes' demon make this place as well? Keith agrees. + +"Yeah, man. I don't know why you even trust your senses any more." Your porridge glows blue, faintly. + +"Are you going to eat that, man?" \ No newline at end of file diff --git a/english/unicorn/existence/realporridge/porridge.md b/english/unicorn/existence/realporridge/porridge.md new file mode 100644 index 0000000000..09ac02234c --- /dev/null +++ b/english/unicorn/existence/realporridge/porridge.md @@ -0,0 +1,3 @@ +Yes, whatever reality's faults, one must hold fast to what is. Any other way leads to madness. + +The porridge is plain and tasteless. You crave a cigarrette. \ No newline at end of file From dcefb0c15fc0c63238041f4603128c057f2431d5 Mon Sep 17 00:00:00 2001 From: Giesch Date: Sat, 14 May 2016 17:47:10 -0500 Subject: [PATCH 3448/5486] Tweaks to story text --- english/unicorn/existence/fakeporridge/descartes.md | 4 ++-- english/unicorn/existence/realporridge/porridge.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/english/unicorn/existence/fakeporridge/descartes.md b/english/unicorn/existence/fakeporridge/descartes.md index 77ed133b65..11362c84a1 100644 --- a/english/unicorn/existence/fakeporridge/descartes.md +++ b/english/unicorn/existence/fakeporridge/descartes.md @@ -1,6 +1,6 @@ No. There is no reason to assume this place is more real than the others. Could not Descartes' demon make this place as well? Keith agrees. -"Yeah, man. I don't know why you even trust your senses any more." Your porridge glows blue, faintly. +"Yeah, man. I don't know why you even trust your senses any more." Your porridge glows blue, faintly. Keith licks his tobbaco-stained teeth. -"Are you going to eat that, man?" \ No newline at end of file +"Are you going to eat that, man? I've got the munchies something fierce." diff --git a/english/unicorn/existence/realporridge/porridge.md b/english/unicorn/existence/realporridge/porridge.md index 09ac02234c..fe337ec8cf 100644 --- a/english/unicorn/existence/realporridge/porridge.md +++ b/english/unicorn/existence/realporridge/porridge.md @@ -1,3 +1,3 @@ -Yes, whatever reality's faults, one must hold fast to what is. Any other way leads to madness. +Yes. Whatever reality's faults, one must hold fast to what is. Any other way leads to madness. The porridge is plain and tasteless. You crave a cigarrette. \ No newline at end of file From a657506852f5d2e98a877c21425eedd203383c77 Mon Sep 17 00:00:00 2001 From: Giesch Date: Sat, 14 May 2016 17:49:08 -0500 Subject: [PATCH 3449/5486] Fix line length --- english/unicorn/existence/fakeporridge/descartes.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/unicorn/existence/fakeporridge/descartes.md b/english/unicorn/existence/fakeporridge/descartes.md index 11362c84a1..d40cea5377 100644 --- a/english/unicorn/existence/fakeporridge/descartes.md +++ b/english/unicorn/existence/fakeporridge/descartes.md @@ -1,6 +1,8 @@ No. There is no reason to assume this place is more real than the others. Could not Descartes' demon make this place as well? Keith agrees. -"Yeah, man. I don't know why you even trust your senses any more." Your porridge glows blue, faintly. Keith licks his tobbaco-stained teeth. +"Yeah, man. I don't know why you even trust your senses any more." Your porridge glows blue, faintly. + +Keith licks his tobbaco-stained teeth and snorts. "Are you going to eat that, man? I've got the munchies something fierce." From b9a67dee393703e4d3ee63d4282f2ec9f0243464 Mon Sep 17 00:00:00 2001 From: t-kubrak Date: Sat, 14 May 2016 22:19:29 -0400 Subject: [PATCH 3450/5486] Add answer in ukrainian/question/wtf --- ukrainian/question/wtf.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ukrainian/question/wtf.md b/ukrainian/question/wtf.md index 5ae352b2ab..68cca2a149 100644 --- a/ukrainian/question/wtf.md +++ b/ukrainian/question/wtf.md @@ -1 +1,3 @@ "Якщо ти - це я, то всі мої запитання тобі вже відомі. А відтак я чекаю на відповіді!" + +- "Слухайся свого серця, вибір завжди за тобою." From d4eb58af862e286ff693b82c60174e86f5a131e2 Mon Sep 17 00:00:00 2001 From: Belve Marks Date: Sun, 15 May 2016 00:05:06 -0500 Subject: [PATCH 3451/5486] Added my own branch to the adventure... --- english/doug-adams/arthur-dent.md | 11 +++++++++++ english/doug-adams/ford-prefect.md | 14 ++++++++++++++ english/marshmallow.md | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 english/doug-adams/arthur-dent.md create mode 100644 english/doug-adams/ford-prefect.md diff --git a/english/doug-adams/arthur-dent.md b/english/doug-adams/arthur-dent.md new file mode 100644 index 0000000000..1ca299164b --- /dev/null +++ b/english/doug-adams/arthur-dent.md @@ -0,0 +1,11 @@ +You find yourself, still dressed in pajamas and robe, lying in the dirt in +front of a bulldozer, blocking it from destroying your house. + +This must be Thursday. You never could get the hang of Thursdays. + +You friend Ford appears. + +"C'mon. Let's go to the [Pub](./ford-prefect.md). He said they +won't destroy your house until they've finished the beers." Ford says. + +Simply motion to the [bulldozer](../marshmallows.md). diff --git a/english/doug-adams/ford-prefect.md b/english/doug-adams/ford-prefect.md new file mode 100644 index 0000000000..a4e54b5196 --- /dev/null +++ b/english/doug-adams/ford-prefect.md @@ -0,0 +1,14 @@ +The Hitchhiker's Guide to the Galaxy is a wholly remarkable book, +perhaps the most remarkable, certainly the most successful book ever to come out +of the great publishing corporations of Ursa Minor. +More popular than the CELESTIAL HOME CARE OMNIBUS, better selling than 53 MORE +THINGS TO DO IN ZERO GRAVITY, and more controversial than Oolon Colluphid's +trilogy of philosophical blockbusters, WHERE GOD WENT WRONG, SOME MORE OF GOD'S +GREATEST MISTAKES, and WHO IS THIS GOD PERSON, ANYWAY? +In many of the more relaxed civilizations on the Outer Eastern Rim of the Galaxy, +the Hitchhiker's Guide has already supplanted the great Encyclopedia +Galactica as the standard repository of all knowledge and wisdom. For though it +has many omissions, and contains much which is apocryphal, or at least wildly +inaccurate, it scores over the older, more pedestrian work in two important respects. +First, it is slightly cheaper. And second, it has the words ["DON'T PANIC"](../alchemy/alchemy.md) printed in +large friendly letters on its cover. diff --git a/english/marshmallow.md b/english/marshmallow.md index ac73285e0c..c2c225da94 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -81,6 +81,8 @@ The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtu Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. +Or a [Wednesday...](make_changes_GitHub/make_changes_GitHub.md) [Thursday...](doug-adams/arthur-dent.md) maybe even a Friday, but definetely not a Saturday. + Ok, we have to consider Saturday too. [this crazy thought popped into your head](yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md) From 28d378e85756796729a7406d239d02fd060d99b9 Mon Sep 17 00:00:00 2001 From: Belve Marks Date: Sun, 15 May 2016 00:21:06 -0500 Subject: [PATCH 3452/5486] Rewrote to readme specifications --- english/doug-adams/arthur-dent/arthur-dent.md | 11 +++++++++++ english/doug-adams/ford-prefect/ford-prefect.md | 14 ++++++++++++++ english/marshmallow.md | 4 +++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 english/doug-adams/arthur-dent/arthur-dent.md create mode 100644 english/doug-adams/ford-prefect/ford-prefect.md diff --git a/english/doug-adams/arthur-dent/arthur-dent.md b/english/doug-adams/arthur-dent/arthur-dent.md new file mode 100644 index 0000000000..94f78794ec --- /dev/null +++ b/english/doug-adams/arthur-dent/arthur-dent.md @@ -0,0 +1,11 @@ +You find yourself, still dressed in pajamas and robe, lying in the dirt in +front of a bulldozer, blocking it from destroying your house. + +This must be Thursday. You never could get the hang of Thursdays. + +You friend Ford appears. + +"C'mon. Let's go to the [Pub](./ford-prefect/ford-prefect.md). He said they +won't destroy your house until they've finished the beers." Ford says. + +Simply motion to the [bulldozer](./marshmallows.md). diff --git a/english/doug-adams/ford-prefect/ford-prefect.md b/english/doug-adams/ford-prefect/ford-prefect.md new file mode 100644 index 0000000000..a4e54b5196 --- /dev/null +++ b/english/doug-adams/ford-prefect/ford-prefect.md @@ -0,0 +1,14 @@ +The Hitchhiker's Guide to the Galaxy is a wholly remarkable book, +perhaps the most remarkable, certainly the most successful book ever to come out +of the great publishing corporations of Ursa Minor. +More popular than the CELESTIAL HOME CARE OMNIBUS, better selling than 53 MORE +THINGS TO DO IN ZERO GRAVITY, and more controversial than Oolon Colluphid's +trilogy of philosophical blockbusters, WHERE GOD WENT WRONG, SOME MORE OF GOD'S +GREATEST MISTAKES, and WHO IS THIS GOD PERSON, ANYWAY? +In many of the more relaxed civilizations on the Outer Eastern Rim of the Galaxy, +the Hitchhiker's Guide has already supplanted the great Encyclopedia +Galactica as the standard repository of all knowledge and wisdom. For though it +has many omissions, and contains much which is apocryphal, or at least wildly +inaccurate, it scores over the older, more pedestrian work in two important respects. +First, it is slightly cheaper. And second, it has the words ["DON'T PANIC"](../alchemy/alchemy.md) printed in +large friendly letters on its cover. diff --git a/english/marshmallow.md b/english/marshmallow.md index c2c225da94..c4553237bd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -81,7 +81,9 @@ The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtu Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. -Or a [Wednesday...](make_changes_GitHub/make_changes_GitHub.md) [Thursday...](doug-adams/arthur-dent.md) maybe even a Friday, but definetely not a Saturday. +Or a [Wednesday](make_changes_GitHub/make_changes_GitHub.md)... + +[Thursday](doug-adams/arthur-dent/arthur-dent.md)... maybe even a Friday, but definetely not a Saturday. Ok, we have to consider Saturday too. From d97faa894895665c08b984e79e1aaca000bca215 Mon Sep 17 00:00:00 2001 From: Belve Marks Date: Sun, 15 May 2016 00:26:56 -0500 Subject: [PATCH 3453/5486] Fixed a broken link (I think) --- english/doug-adams/arthur-dent/arthur-dent.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/doug-adams/arthur-dent/arthur-dent.md b/english/doug-adams/arthur-dent/arthur-dent.md index 94f78794ec..b7aa0e63b5 100644 --- a/english/doug-adams/arthur-dent/arthur-dent.md +++ b/english/doug-adams/arthur-dent/arthur-dent.md @@ -8,4 +8,4 @@ You friend Ford appears. "C'mon. Let's go to the [Pub](./ford-prefect/ford-prefect.md). He said they won't destroy your house until they've finished the beers." Ford says. -Simply motion to the [bulldozer](./marshmallows.md). +Simply motion to the [bulldozer](../../../marshmallows.md). From f29f85aeeef98de8c1a6ea139a791adab66c10e5 Mon Sep 17 00:00:00 2001 From: Belve Marks Date: Sun, 15 May 2016 00:28:20 -0500 Subject: [PATCH 3454/5486] Seriously now. Broken Link fixed --- english/doug-adams/arthur-dent/arthur-dent.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/doug-adams/arthur-dent/arthur-dent.md b/english/doug-adams/arthur-dent/arthur-dent.md index b7aa0e63b5..ed5048f1e1 100644 --- a/english/doug-adams/arthur-dent/arthur-dent.md +++ b/english/doug-adams/arthur-dent/arthur-dent.md @@ -8,4 +8,4 @@ You friend Ford appears. "C'mon. Let's go to the [Pub](./ford-prefect/ford-prefect.md). He said they won't destroy your house until they've finished the beers." Ford says. -Simply motion to the [bulldozer](../../../marshmallows.md). +Simply motion to the [bulldozer](../../marshmallows.md). From e8eb5b6caac41400f8fccce8058eaf126bc1795f Mon Sep 17 00:00:00 2001 From: Belve Marks Date: Sun, 15 May 2016 00:29:56 -0500 Subject: [PATCH 3455/5486] Fixed a typo in a link. --- english/doug-adams/arthur-dent/arthur-dent.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/doug-adams/arthur-dent/arthur-dent.md b/english/doug-adams/arthur-dent/arthur-dent.md index ed5048f1e1..161da96e2e 100644 --- a/english/doug-adams/arthur-dent/arthur-dent.md +++ b/english/doug-adams/arthur-dent/arthur-dent.md @@ -8,4 +8,4 @@ You friend Ford appears. "C'mon. Let's go to the [Pub](./ford-prefect/ford-prefect.md). He said they won't destroy your house until they've finished the beers." Ford says. -Simply motion to the [bulldozer](../../marshmallows.md). +Simply motion to the [bulldozer](../../marshmallow.md). From c5f6996da2eda2e94edfdb94c5f906412ba1e7b0 Mon Sep 17 00:00:00 2001 From: Belve Marks Date: Sun, 15 May 2016 00:31:18 -0500 Subject: [PATCH 3456/5486] Another typo fix --- english/doug-adams/arthur-dent/arthur-dent.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/doug-adams/arthur-dent/arthur-dent.md b/english/doug-adams/arthur-dent/arthur-dent.md index 161da96e2e..768d9fa37d 100644 --- a/english/doug-adams/arthur-dent/arthur-dent.md +++ b/english/doug-adams/arthur-dent/arthur-dent.md @@ -5,7 +5,7 @@ This must be Thursday. You never could get the hang of Thursdays. You friend Ford appears. -"C'mon. Let's go to the [Pub](./ford-prefect/ford-prefect.md). He said they +"C'mon. Let's go to the [Pub](../ford-prefect/ford-prefect.md). He said they won't destroy your house until they've finished the beers." Ford says. Simply motion to the [bulldozer](../../marshmallow.md). From a76f9c1de6ac7ee9d4c3f7e833512281d0428e75 Mon Sep 17 00:00:00 2001 From: Belve Marks Date: Sun, 15 May 2016 00:32:55 -0500 Subject: [PATCH 3457/5486] Fixed one last typo. --- english/doug-adams/ford-prefect/ford-prefect.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/doug-adams/ford-prefect/ford-prefect.md b/english/doug-adams/ford-prefect/ford-prefect.md index a4e54b5196..1be253dd49 100644 --- a/english/doug-adams/ford-prefect/ford-prefect.md +++ b/english/doug-adams/ford-prefect/ford-prefect.md @@ -10,5 +10,5 @@ the Hitchhiker's Guide has already supplanted the great Encyclopedia Galactica as the standard repository of all knowledge and wisdom. For though it has many omissions, and contains much which is apocryphal, or at least wildly inaccurate, it scores over the older, more pedestrian work in two important respects. -First, it is slightly cheaper. And second, it has the words ["DON'T PANIC"](../alchemy/alchemy.md) printed in +First, it is slightly cheaper. And second, it has the words ["DON'T PANIC"](../../alchemy/alchemy.md) printed in large friendly letters on its cover. From 8ed7b306ba2c440f86fa12972feea9e59cedb99a Mon Sep 17 00:00:00 2001 From: Onodric Date: Sun, 15 May 2016 00:41:32 -0500 Subject: [PATCH 3458/5486] Delete arthur-dent.md --- english/doug-adams/arthur-dent.md | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 english/doug-adams/arthur-dent.md diff --git a/english/doug-adams/arthur-dent.md b/english/doug-adams/arthur-dent.md deleted file mode 100644 index 1ca299164b..0000000000 --- a/english/doug-adams/arthur-dent.md +++ /dev/null @@ -1,11 +0,0 @@ -You find yourself, still dressed in pajamas and robe, lying in the dirt in -front of a bulldozer, blocking it from destroying your house. - -This must be Thursday. You never could get the hang of Thursdays. - -You friend Ford appears. - -"C'mon. Let's go to the [Pub](./ford-prefect.md). He said they -won't destroy your house until they've finished the beers." Ford says. - -Simply motion to the [bulldozer](../marshmallows.md). From 7aeeb272796c409021fecf2c0dba1d2bd914204c Mon Sep 17 00:00:00 2001 From: Onodric Date: Sun, 15 May 2016 00:41:47 -0500 Subject: [PATCH 3459/5486] Delete ford-prefect.md --- english/doug-adams/ford-prefect.md | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 english/doug-adams/ford-prefect.md diff --git a/english/doug-adams/ford-prefect.md b/english/doug-adams/ford-prefect.md deleted file mode 100644 index a4e54b5196..0000000000 --- a/english/doug-adams/ford-prefect.md +++ /dev/null @@ -1,14 +0,0 @@ -The Hitchhiker's Guide to the Galaxy is a wholly remarkable book, -perhaps the most remarkable, certainly the most successful book ever to come out -of the great publishing corporations of Ursa Minor. -More popular than the CELESTIAL HOME CARE OMNIBUS, better selling than 53 MORE -THINGS TO DO IN ZERO GRAVITY, and more controversial than Oolon Colluphid's -trilogy of philosophical blockbusters, WHERE GOD WENT WRONG, SOME MORE OF GOD'S -GREATEST MISTAKES, and WHO IS THIS GOD PERSON, ANYWAY? -In many of the more relaxed civilizations on the Outer Eastern Rim of the Galaxy, -the Hitchhiker's Guide has already supplanted the great Encyclopedia -Galactica as the standard repository of all knowledge and wisdom. For though it -has many omissions, and contains much which is apocryphal, or at least wildly -inaccurate, it scores over the older, more pedestrian work in two important respects. -First, it is slightly cheaper. And second, it has the words ["DON'T PANIC"](../alchemy/alchemy.md) printed in -large friendly letters on its cover. From 86de9356541d8fda5ee21837bb87149213abd7ef Mon Sep 17 00:00:00 2001 From: Filip Korling Date: Sun, 15 May 2016 21:57:27 +0200 Subject: [PATCH 3460/5486] Expand marshmallow story --- swedish/marshmallowen/marshmallowen.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swedish/marshmallowen/marshmallowen.md b/swedish/marshmallowen/marshmallowen.md index 23f6502cf8..445cf82110 100644 --- a/swedish/marshmallowen/marshmallowen.md +++ b/swedish/marshmallowen/marshmallowen.md @@ -4,4 +4,6 @@ Huvudet vrider sig och dina tanker bullra. Du märker att du har börjat tänker på engelska. Din svenska försvinner. +Why is this happening to me ..... + [Du blunda och huvudet träffar kudden.](../../english/marshmallow.md) \ No newline at end of file From 26a63034e7226a89ac4ed165fa07e62e467a590d Mon Sep 17 00:00:00 2001 From: mmchambers06 Date: Sun, 15 May 2016 19:41:24 -0500 Subject: [PATCH 3461/5486] added a new line --- english/adipose/awake/awake.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/adipose/awake/awake.md b/english/adipose/awake/awake.md index 11e1a10186..ece3664a26 100644 --- a/english/adipose/awake/awake.md +++ b/english/adipose/awake/awake.md @@ -11,4 +11,6 @@ anything is better then your eternal loneliness, so you move on to the white dwarf two parsecs over. Then, you died in your dreams. -Just adding a line this time. \ No newline at end of file +Just adding a line this time. + +Adding another line. \ No newline at end of file From 9c0afe3e39589562bb3b95001d64b3356470541b Mon Sep 17 00:00:00 2001 From: George Richardson Date: Sun, 15 May 2016 21:50:43 -0700 Subject: [PATCH 3462/5486] Add staircase option story --- english/lunge-for-the-lighter/staircase/staircase.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/lunge-for-the-lighter/staircase/staircase.md diff --git a/english/lunge-for-the-lighter/staircase/staircase.md b/english/lunge-for-the-lighter/staircase/staircase.md new file mode 100644 index 0000000000..bfbd8d98cf --- /dev/null +++ b/english/lunge-for-the-lighter/staircase/staircase.md @@ -0,0 +1 @@ +You run up the staircase hoping to find some solace and a chance to catch your breath. You reach the top and to your relief find your feet land on a reassuringly solid parquet floor. You pause to pick clumps of marshmallow from the tread in your boots and contemplate your new situation. You find yourself looking around and realise that you're now standing in the living room of a penthouse apartment. On the wall, hangs a picture of a man with a mullet sporting a pair of aviators, and next to it hangs a calendar reading "31st December 1985". Ahead of you there is a corridor lined with a series of white marble sculptures. To your right you notice a fluttering curtain and see that the roof terrace door is slightly ajar. You pick up a Mars Bar laying that's on the coffee table, peel open the wrapper and decisively bite the end of the bar, covering for your indecision over which direction to explore. \ No newline at end of file From e12632d34036553abee124369d5cf80f5c060f91 Mon Sep 17 00:00:00 2001 From: George Richardson Date: Sun, 15 May 2016 21:52:21 -0700 Subject: [PATCH 3463/5486] Add link for staircase option --- english/lunge-for-the-lighter/lunge-for-the-lighter.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/lunge-for-the-lighter/lunge-for-the-lighter.md b/english/lunge-for-the-lighter/lunge-for-the-lighter.md index 8420c6812d..1af1cbaca6 100644 --- a/english/lunge-for-the-lighter/lunge-for-the-lighter.md +++ b/english/lunge-for-the-lighter/lunge-for-the-lighter.md @@ -12,3 +12,5 @@ At one end, a marshmallow staircase going up. At the other a steep slope downwar You grab the rope, fork, and remains of the leather jacket and get ready to run. [Run to the opening with the steep slope](steep-slope/steep-slope.md) + +[Run to the marshmallow staircase](staircase/staircase.md) \ No newline at end of file From b84fbb396892173f3b8bdfe2b7fd469e41b40d73 Mon Sep 17 00:00:00 2001 From: George Richardson Date: Sun, 15 May 2016 22:00:20 -0700 Subject: [PATCH 3464/5486] Break text into multiple lines --- .../lunge-for-the-lighter/staircase/staircase.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/english/lunge-for-the-lighter/staircase/staircase.md b/english/lunge-for-the-lighter/staircase/staircase.md index bfbd8d98cf..9c3fc81dc3 100644 --- a/english/lunge-for-the-lighter/staircase/staircase.md +++ b/english/lunge-for-the-lighter/staircase/staircase.md @@ -1 +1,12 @@ -You run up the staircase hoping to find some solace and a chance to catch your breath. You reach the top and to your relief find your feet land on a reassuringly solid parquet floor. You pause to pick clumps of marshmallow from the tread in your boots and contemplate your new situation. You find yourself looking around and realise that you're now standing in the living room of a penthouse apartment. On the wall, hangs a picture of a man with a mullet sporting a pair of aviators, and next to it hangs a calendar reading "31st December 1985". Ahead of you there is a corridor lined with a series of white marble sculptures. To your right you notice a fluttering curtain and see that the roof terrace door is slightly ajar. You pick up a Mars Bar laying that's on the coffee table, peel open the wrapper and decisively bite the end of the bar, covering for your indecision over which direction to explore. \ No newline at end of file +You run up the staircase hoping to find some solace and a chance to catch your +breath. You reach the top and to your relief find your feet land on a +reassuringly solid parquet floor. You pause to pick clumps of marshmallow from +the tread in your boots and contemplate your new situation. You find yourself +looking around and realise that you're now standing in the living room of a +penthouse apartment. On the wall, hangs a picture of a man with a mullet +sporting a pair of aviators, and next to it hangs a calendar reading "31st +December 1985". Ahead of you there is a corridor lined with a series of white +marble sculptures. To your right you notice a fluttering curtain and see that +the roof terrace door is slightly ajar. You pick up a Mars Bar laying that's on +the coffee table, peel open the wrapper and decisively bite the end of the bar, +covering for your indecision over which direction to explore. \ No newline at end of file From 27e4d056f7859b1c0b17fb1bf5b3c980640cf163 Mon Sep 17 00:00:00 2001 From: Nam Date: Mon, 16 May 2016 16:06:32 +1000 Subject: [PATCH 3465/5486] Add 00_8_Agent directory --- english/00_8_Agent/The_name_is_Bond_Milton_Bond.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/00_8_Agent/The_name_is_Bond_Milton_Bond.md diff --git a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md new file mode 100644 index 0000000000..7fc3c25f68 --- /dev/null +++ b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md @@ -0,0 +1,7 @@ +You have entered into the world of one of Her Majesty's secret agent. Codename Agent 008; his name is Bond, Milton Bond and he's the pencil pushing assistant of his more well-known cousin, [James](http://www.007.com/characters/the-bonds/). While James is out stopping evil-doers, rescusing damsels in distress, and having the occasional martini, Milton is responsible for making sure all of James' paperwork is in order. + +Need the requisite form for a new [Aston-Martin](http://www.astonmartin.com/) for that high speed car chase? Ask Milton. + +Special ordering a bespoke tuxedo for a fancy dinner and with a side of [fisticuffs](http://www.merriam-webster.com/dictionary/fisticuffs)? Milton's your man. + +Need someone to send in your end of mission expense report, complete with [TPS cover letter](https://en.wikipedia.org/wiki/File:Office_space_poster.jpg#/media/File:Office_space_poster.jpg)? Milton's already one step ahead of you. \ No newline at end of file From 9030c85802a893fe9d282cf925968aa1fbc0ad7e Mon Sep 17 00:00:00 2001 From: Nam Date: Mon, 16 May 2016 16:13:15 +1000 Subject: [PATCH 3466/5486] Update marshmallow.md to include Special Agent 008 --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index c4553237bd..c557f15751 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -7,6 +7,8 @@ Who is better? [Click Here] (ironman/ironman.md) to vote for Iron Man +[Click here] (00_8_Agent/The_name_is_Bond_Milton_Bond.md) to vote for a Special Agent + January 2017 approaches. You have two presidential candidates to vote for. [Click](vote-the-president/trump/trump.md) here to vote for Donald Trump. From b38f8b0368b0997734091bf5c7fdfb8b02d79f1f Mon Sep 17 00:00:00 2001 From: Nam Date: Mon, 16 May 2016 16:39:12 +1000 Subject: [PATCH 3467/5486] Update document to meet 120 character requirement --- .../00_8_Agent/The_name_is_Bond_Milton_Bond.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md index 7fc3c25f68..ce38cf1eec 100644 --- a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md +++ b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md @@ -1,7 +1,11 @@ -You have entered into the world of one of Her Majesty's secret agent. Codename Agent 008; his name is Bond, Milton Bond and he's the pencil pushing assistant of his more well-known cousin, [James](http://www.007.com/characters/the-bonds/). While James is out stopping evil-doers, rescusing damsels in distress, and having the occasional martini, Milton is responsible for making sure all of James' paperwork is in order. - -Need the requisite form for a new [Aston-Martin](http://www.astonmartin.com/) for that high speed car chase? Ask Milton. - -Special ordering a bespoke tuxedo for a fancy dinner and with a side of [fisticuffs](http://www.merriam-webster.com/dictionary/fisticuffs)? Milton's your man. - -Need someone to send in your end of mission expense report, complete with [TPS cover letter](https://en.wikipedia.org/wiki/File:Office_space_poster.jpg#/media/File:Office_space_poster.jpg)? Milton's already one step ahead of you. \ No newline at end of file +You have entered into the world of one of Her Majesty's secret agent. +Codename Agent 008; his name is Bond, Milton Bond. +He's the pencil pushing assistant of his more well-known cousin, [James](http://www.007.com/characters/the-bonds/). +While James is out stopping evil-doers, rescusing damsels in distress, and having the occasional martini. +Milton is responsible for making sure all of James' paperwork is in order. +Need the requisite form for a new Aston-Martin for that high speed car chase? +Ask Milton! +Special ordering a bespoke tuxedo for a fancy dinner and with a side of fisticuffs? +Milton's your man. +Need someone to send in your end of mission expense report, complete with TPS cover letter. +Milton's already one step ahead of you. \ No newline at end of file From 247b4417497f38ed960e24b52f84fe1bb04eda68 Mon Sep 17 00:00:00 2001 From: Yaron Date: Mon, 16 May 2016 14:25:00 +0200 Subject: [PATCH 3468/5486] Add suchness --- english/unicorn/existence/existence.md | 4 +++- english/unicorn/existence/justporridge/suchness.md | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 english/unicorn/existence/justporridge/suchness.md diff --git a/english/unicorn/existence/existence.md b/english/unicorn/existence/existence.md index 42e84e3fd2..9e9abf2df9 100644 --- a/english/unicorn/existence/existence.md +++ b/english/unicorn/existence/existence.md @@ -2,4 +2,6 @@ The grey walls surrounding you look brighter than usual. The monotony continues. The porridge, at least, is [real](realporridge/porridge.md). -This room, too, is an [illusion](fakeporridge/descartes.md). \ No newline at end of file +This room, too, is an [illusion](fakeporridge/descartes.md). + +Does it really [matter](justporridge/truth.md)? \ No newline at end of file diff --git a/english/unicorn/existence/justporridge/suchness.md b/english/unicorn/existence/justporridge/suchness.md new file mode 100644 index 0000000000..612984c80f --- /dev/null +++ b/english/unicorn/existence/justporridge/suchness.md @@ -0,0 +1,9 @@ +Things are what they are and they are not. +The porridge is real and it is not real. +The room is real and it is an illusion. +The terms we use are meaningless and meaningfull. + +It matters and it does not. + +There is no nature to porridge. +There is no you to ponder it. \ No newline at end of file From 57b360dbd4da11ee873d57f69d72f4d75faaf67e Mon Sep 17 00:00:00 2001 From: Yaron Date: Mon, 16 May 2016 14:34:53 +0200 Subject: [PATCH 3469/5486] Add link --- english/unicorn/existence/existence.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/unicorn/existence/existence.md b/english/unicorn/existence/existence.md index 9e9abf2df9..e311915ac6 100644 --- a/english/unicorn/existence/existence.md +++ b/english/unicorn/existence/existence.md @@ -4,4 +4,4 @@ The porridge, at least, is [real](realporridge/porridge.md). This room, too, is an [illusion](fakeporridge/descartes.md). -Does it really [matter](justporridge/truth.md)? \ No newline at end of file +Does it really [matter](justporridge/suchness.md)? \ No newline at end of file From ffa7c300c77d0eb7dba64f6f59040b61b78a0034 Mon Sep 17 00:00:00 2001 From: ctnswb Date: Mon, 16 May 2016 14:48:33 -0700 Subject: [PATCH 3470/5486] added brainteaser to puzzle page --- english/LifePuzzle/LifePuzzle.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/LifePuzzle/LifePuzzle.md b/english/LifePuzzle/LifePuzzle.md index 0390fe4437..f738925d98 100644 --- a/english/LifePuzzle/LifePuzzle.md +++ b/english/LifePuzzle/LifePuzzle.md @@ -1 +1,3 @@ Life is full of puzzles that we try to solve everyday! + +You are shrunk to the height of a nickel and your mass is proportionally reduced so as to maintain your original density. You are then thrown into an empty glass blender. The blades will start moving in 60 seconds. What do you do? \ No newline at end of file From 02bee223da933b827eb48e00428837310a7d74ca Mon Sep 17 00:00:00 2001 From: ctnswb Date: Mon, 16 May 2016 15:03:06 -0700 Subject: [PATCH 3471/5486] Broke up into multiple lines --- english/LifePuzzle/LifePuzzle.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/english/LifePuzzle/LifePuzzle.md b/english/LifePuzzle/LifePuzzle.md index f738925d98..7872dc2315 100644 --- a/english/LifePuzzle/LifePuzzle.md +++ b/english/LifePuzzle/LifePuzzle.md @@ -1,3 +1,8 @@ Life is full of puzzles that we try to solve everyday! -You are shrunk to the height of a nickel and your mass is proportionally reduced so as to maintain your original density. You are then thrown into an empty glass blender. The blades will start moving in 60 seconds. What do you do? \ No newline at end of file +You are shrunk to the height of a nickel +and your mass is proportionally reduced +so as to maintain your original density. +You are then thrown into an empty glass blender. +The blades will start moving in 60 seconds. +What do you do? \ No newline at end of file From 07d637f74eecff3c211c1cef2cf800f73f55466d Mon Sep 17 00:00:00 2001 From: Austin B Date: Mon, 16 May 2016 18:39:01 -0600 Subject: [PATCH 3472/5486] added options to name the elephant --- .../gather_wood/tame_the_elephant/esparanza/esparanza.md | 2 ++ .../gather_wood/tame_the_elephant/george/george.md | 1 + .../gather_wood/tame_the_elephant/tame_the_elephant.md | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/you-are-in-minecraft/gather_wood/tame_the_elephant/esparanza/esparanza.md create mode 100644 english/you-are-in-minecraft/gather_wood/tame_the_elephant/george/george.md diff --git a/english/you-are-in-minecraft/gather_wood/tame_the_elephant/esparanza/esparanza.md b/english/you-are-in-minecraft/gather_wood/tame_the_elephant/esparanza/esparanza.md new file mode 100644 index 0000000000..f0c6b6a47a --- /dev/null +++ b/english/you-are-in-minecraft/gather_wood/tame_the_elephant/esparanza/esparanza.md @@ -0,0 +1,2 @@ +Esparanza is a fantastic name for and elephant! You become best friends and go on many wacky +adventures. diff --git a/english/you-are-in-minecraft/gather_wood/tame_the_elephant/george/george.md b/english/you-are-in-minecraft/gather_wood/tame_the_elephant/george/george.md new file mode 100644 index 0000000000..02258cc91a --- /dev/null +++ b/english/you-are-in-minecraft/gather_wood/tame_the_elephant/george/george.md @@ -0,0 +1 @@ +George is a fantastic name for an elephant! You become best friends and go on many crazy adventures. diff --git a/english/you-are-in-minecraft/gather_wood/tame_the_elephant/tame_the_elephant.md b/english/you-are-in-minecraft/gather_wood/tame_the_elephant/tame_the_elephant.md index bb1c33a4a9..e23eee8733 100644 --- a/english/you-are-in-minecraft/gather_wood/tame_the_elephant/tame_the_elephant.md +++ b/english/you-are-in-minecraft/gather_wood/tame_the_elephant/tame_the_elephant.md @@ -1,2 +1,4 @@ You know you always wanted to have a pet elephant in minecraft, so you can kill all those zombies with a single whip. -You decide to tame it. +You decide to tame it. But it needs a name! Do you name it: +[George](george/george.md)? +[Esparanza](esparanza/esparanza.md)? From 5c34e6b3fa8fd90266e8e03b76ee4304f53ee9ba Mon Sep 17 00:00:00 2001 From: Austin B Date: Mon, 16 May 2016 18:49:36 -0600 Subject: [PATCH 3473/5486] fixed for @casey-collab --- .../gather_wood/tame_the_elephant/tame_the_elephant.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/you-are-in-minecraft/gather_wood/tame_the_elephant/tame_the_elephant.md b/english/you-are-in-minecraft/gather_wood/tame_the_elephant/tame_the_elephant.md index e23eee8733..def8a1add1 100644 --- a/english/you-are-in-minecraft/gather_wood/tame_the_elephant/tame_the_elephant.md +++ b/english/you-are-in-minecraft/gather_wood/tame_the_elephant/tame_the_elephant.md @@ -1,4 +1,6 @@ You know you always wanted to have a pet elephant in minecraft, so you can kill all those zombies with a single whip. -You decide to tame it. But it needs a name! Do you name it: +You decide to tame it. +But it needs a name! Do you name it: [George](george/george.md)? + [Esparanza](esparanza/esparanza.md)? From 1debd191ba236da51d74171c09c2b83664883ea4 Mon Sep 17 00:00:00 2001 From: Dore Chen Date: Tue, 17 May 2016 18:44:53 +1200 Subject: [PATCH 3474/5486] Add bear path option to shotgun --- english/shotgun/shotgun.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/shotgun/shotgun.md b/english/shotgun/shotgun.md index e7346143d0..c44668c225 100644 --- a/english/shotgun/shotgun.md +++ b/english/shotgun/shotgun.md @@ -5,3 +5,6 @@ You see sunlight peeking through. After a while the wall is gone and you are free. You find you are on an island surrounded by a sea of hot chocolate. The chocolate foams and steams. + +Scoop up the remains with a mug and [drink that bear](../bear/bear.md). + From 084a90f6f490591b7fc5bf6bf494193a29e7837a Mon Sep 17 00:00:00 2001 From: Ill's Macbook Date: Tue, 17 May 2016 08:50:59 -0400 Subject: [PATCH 3475/5486] english unicorn existance --- english/unicorn/existence/realporridge/porridge.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/unicorn/existence/realporridge/porridge.md b/english/unicorn/existence/realporridge/porridge.md index fe337ec8cf..0d6e8a4285 100644 --- a/english/unicorn/existence/realporridge/porridge.md +++ b/english/unicorn/existence/realporridge/porridge.md @@ -1,3 +1,5 @@ Yes. Whatever reality's faults, one must hold fast to what is. Any other way leads to madness. -The porridge is plain and tasteless. You crave a cigarrette. \ No newline at end of file +The porridge is plain and tasteless. You crave a cigarrette. + +Maybe you should try Nicorette, might prevent you from going insane. From bf9e78dd9b56b0b17f9cd9b728683c7ad349ab89 Mon Sep 17 00:00:00 2001 From: yash Date: Tue, 17 May 2016 22:35:18 +0530 Subject: [PATCH 3476/5486] Add story in readme(Motivate) --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index ac73285e0c..273e3c072a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -962,3 +962,5 @@ Time to [move to Canada](Canada/Canada.md), eh? The crushing weight of all these options causes you to [end your life.](end/end.md) You're reincarnated as a green starfish but wish you were [blue instead.](starfish/starfish.md) + +[Motivate yourself](Motivate/Motivate.md) From 208469cfb3ff93b8d6f7252aa6d9bab236c3418f Mon Sep 17 00:00:00 2001 From: yash Date: Tue, 17 May 2016 22:50:51 +0530 Subject: [PATCH 3477/5486] Add folder for the link "Motivate yourself" --- english/Motivate/Motivate.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/Motivate/Motivate.md diff --git a/english/Motivate/Motivate.md b/english/Motivate/Motivate.md new file mode 100644 index 0000000000..e236a26567 --- /dev/null +++ b/english/Motivate/Motivate.md @@ -0,0 +1,2 @@ +Always do your best. What you plant now, you will harvest later + From b7626f6ff2be8ababac8efc5f64d3c00932fb7e2 Mon Sep 17 00:00:00 2001 From: Qiannan Yin Date: Tue, 17 May 2016 21:15:28 -0400 Subject: [PATCH 3478/5486] Add a continue page to the snow white story in Chinese. --- Chinese/snow_white/continue/continue.md | 1 + Chinese/snow_white/story.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Chinese/snow_white/continue/continue.md diff --git a/Chinese/snow_white/continue/continue.md b/Chinese/snow_white/continue/continue.md new file mode 100644 index 0000000000..2da2c6ed49 --- /dev/null +++ b/Chinese/snow_white/continue/continue.md @@ -0,0 +1 @@ +因为王子是个宅男没有出门 diff --git a/Chinese/snow_white/story.md b/Chinese/snow_white/story.md index 5fb88c3bb3..bba1fc7615 100644 --- a/Chinese/snow_white/story.md +++ b/Chinese/snow_white/story.md @@ -1 +1 @@ - 从此白雪公主 和 七个小矮人 过上了 幸福的生活 + 从此白雪公主 和 七个小矮人 过上了 幸福的生活 [为什么](continue/continue.md) From b373d188d5240c81e16d360017e76fd557a06395 Mon Sep 17 00:00:00 2001 From: Qiannan Yin Date: Tue, 17 May 2016 21:17:22 -0400 Subject: [PATCH 3479/5486] Change story to two lines. --- Chinese/snow_white/story.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/snow_white/story.md b/Chinese/snow_white/story.md index bba1fc7615..5e5484043a 100644 --- a/Chinese/snow_white/story.md +++ b/Chinese/snow_white/story.md @@ -1 +1,3 @@ - 从此白雪公主 和 七个小矮人 过上了 幸福的生活 [为什么](continue/continue.md) + 从此白雪公主 和 七个小矮人 过上了 幸福的生活 + + [为什么](continue/continue.md) From e0eec094bf205f67a961fc90ecd269d75adf2a46 Mon Sep 17 00:00:00 2001 From: David Liu Date: Wed, 18 May 2016 00:28:17 -0500 Subject: [PATCH 3480/5486] Take 2 of all changes from previous effort. --- english/magicaladventure/avada_kedavra/avada_kedavra.md | 9 +++++++++ english/magicaladventure/decision_time/decision_time.md | 9 +++++++++ english/magicaladventure/surrender/surrender.md | 3 +++ .../wingardium_leviosa/wingardium_leviosa.md | 1 + english/marshmallow.md | 2 ++ 5 files changed, 24 insertions(+) create mode 100644 english/magicaladventure/avada_kedavra/avada_kedavra.md create mode 100644 english/magicaladventure/decision_time/decision_time.md create mode 100644 english/magicaladventure/surrender/surrender.md create mode 100644 english/magicaladventure/wingardium_leviosa/wingardium_leviosa.md diff --git a/english/magicaladventure/avada_kedavra/avada_kedavra.md b/english/magicaladventure/avada_kedavra/avada_kedavra.md new file mode 100644 index 0000000000..bfb095ef80 --- /dev/null +++ b/english/magicaladventure/avada_kedavra/avada_kedavra.md @@ -0,0 +1,9 @@ +No, Luke ... I mean Harry ... don't choose the way to the dark I mean Death Eater side. + +Voldemort dies from your vengeful response, and your lust for revenge is satiated. + +- - - - - - 20 years later + +You're the Minister of Magic, having crushed the opposition +and determine to let no one ever commit anything you call injustice. +Dumbledore weeps in his grave over what you've become. \ No newline at end of file diff --git a/english/magicaladventure/decision_time/decision_time.md b/english/magicaladventure/decision_time/decision_time.md new file mode 100644 index 0000000000..4e71baf08e --- /dev/null +++ b/english/magicaladventure/decision_time/decision_time.md @@ -0,0 +1,9 @@ +You need to do something! + +Do you toss down your wand and [surrender](../surrender/surrender.md)? + +Or try [wingardium leviosa](../wingardium_leviosa/wingardium_leviosa.md)? + +Get angry about Voldemort's unforgivable murder of your parents [avada kedavra](../avada_kedavra/avada_kedavra.md) + +Or last (but maybe not least - hint, hint) cast [expelliarmus](../expelliarmus/expelliarmus.md) to disarm Voldemort \ No newline at end of file diff --git a/english/magicaladventure/surrender/surrender.md b/english/magicaladventure/surrender/surrender.md new file mode 100644 index 0000000000..708835dea0 --- /dev/null +++ b/english/magicaladventure/surrender/surrender.md @@ -0,0 +1,3 @@ +You've chosen to surrender to Voldemort? + +You should know he has nno mercy - he laughs in your face, says "You fool!" and then casts Avada Kedavara \ No newline at end of file diff --git a/english/magicaladventure/wingardium_leviosa/wingardium_leviosa.md b/english/magicaladventure/wingardium_leviosa/wingardium_leviosa.md new file mode 100644 index 0000000000..56266f3728 --- /dev/null +++ b/english/magicaladventure/wingardium_leviosa/wingardium_leviosa.md @@ -0,0 +1 @@ +Wingardium leviosa is not very effective - Voldemort laughs in your face, casts Crucio, and you become incapacitated. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index c557f15751..f77cde2336 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -968,3 +968,5 @@ Time to [move to Canada](Canada/Canada.md), eh? The crushing weight of all these options causes you to [end your life.](end/end.md) You're reincarnated as a green starfish but wish you were [blue instead.](starfish/starfish.md) + +You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) \ No newline at end of file From a32b2c42d9071e43c9242cf4b49c3c4165c62be9 Mon Sep 17 00:00:00 2001 From: David Liu Date: Wed, 18 May 2016 00:33:39 -0500 Subject: [PATCH 3481/5486] Adds final expelliarmus option which was accidentally left off. --- english/magicaladventure/expelliarmus/expelliarmus.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/magicaladventure/expelliarmus/expelliarmus.md diff --git a/english/magicaladventure/expelliarmus/expelliarmus.md b/english/magicaladventure/expelliarmus/expelliarmus.md new file mode 100644 index 0000000000..020137711f --- /dev/null +++ b/english/magicaladventure/expelliarmus/expelliarmus.md @@ -0,0 +1,7 @@ +You cast Expelliarmus as soon as Voldemort casts Avada Kedavra. + +Once you hear those words, you know it's over. There's no blocking that. + +But magically, the spell rebounds and kills Voldemort - victory! + +Now you and Ginny can live happily ever after. \ No newline at end of file From 2f6fc407554f8369252ff2936669ae1386fbc15e Mon Sep 17 00:00:00 2001 From: David Liu Date: Wed, 18 May 2016 00:36:54 -0500 Subject: [PATCH 3482/5486] Breaks lengthy prompt line in marshmallow.md --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index f77cde2336..11c1f22d05 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -969,4 +969,5 @@ The crushing weight of all these options causes you to [end your life.](end/end. You're reincarnated as a green starfish but wish you were [blue instead.](starfish/starfish.md) -You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) \ No newline at end of file +You wake up as Harry Potter ... and are facing Voldemort in a duel? +What should you [do](magicaladventure/decision_time/decision_time.md) \ No newline at end of file From a63b9e0bb689631989fde706f74bb9a2e9e74f3e Mon Sep 17 00:00:00 2001 From: Ronald Date: Wed, 18 May 2016 16:08:45 -0500 Subject: [PATCH 3483/5486] Add el rey --- espanol/torre/rey/rey.md | 1 + espanol/torre/torre.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 espanol/torre/rey/rey.md diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md new file mode 100644 index 0000000000..84eb141fe7 --- /dev/null +++ b/espanol/torre/rey/rey.md @@ -0,0 +1 @@ +El rey, al saber que el imperio acechaba decidió convocar a su ejército. diff --git a/espanol/torre/torre.md b/espanol/torre/torre.md index f3375bf9b9..ef0ba43088 100644 --- a/espanol/torre/torre.md +++ b/espanol/torre/torre.md @@ -12,3 +12,5 @@ Entonces el consejero decidió: [Preparar su ejercito y ejecutar la estrategia establecida](estrategia/estrategia.md) [Huir de la escena](huida/huida.md) + +[Avisar al rey](rey/rey.md) From d60a5783c3ac69af00ebc0893dc985d42fa76959 Mon Sep 17 00:00:00 2001 From: lauosi Date: Thu, 19 May 2016 09:42:23 +0200 Subject: [PATCH 3484/5486] Pomysl na biznes. --- Polish/przygoda/jedzenie/biznes/biznes.md | 1 + Polish/przygoda/jedzenie/jedzenie.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Polish/przygoda/jedzenie/biznes/biznes.md diff --git a/Polish/przygoda/jedzenie/biznes/biznes.md b/Polish/przygoda/jedzenie/biznes/biznes.md new file mode 100644 index 0000000000..91ac3b8910 --- /dev/null +++ b/Polish/przygoda/jedzenie/biznes/biznes.md @@ -0,0 +1 @@ +Chcesz wykorzystać potencjał ptasiego mleczka i jeszcze na tym zarobić. Zabierasz się za biznesplan! Co robisz? diff --git a/Polish/przygoda/jedzenie/jedzenie.md b/Polish/przygoda/jedzenie/jedzenie.md index 66f9dae76c..470715bfd5 100644 --- a/Polish/przygoda/jedzenie/jedzenie.md +++ b/Polish/przygoda/jedzenie/jedzenie.md @@ -3,6 +3,8 @@ Jego cudowne właściwości odblokowują ukryty potencjał twojego umysłu. Twoje myśli błądzą pomiędzy ziemią a innymi planetami. Gdy całe ptasie mleczko jest już zjedzone, dochodzisz do oczywistych wniosków. Brzmią one: +[Może być z tego dobry biznes!](biznes/biznes.md) + [Korwin Krul!](korwin/korwin.md) [Człowiek bez RiGCzu jest jak dżentelmen bez kapelusza, lub dama bez torebki](akap/akap.md) From 4219d4f8ff7d00a8ebaa428c6f2ca3dfbd5c1fdb Mon Sep 17 00:00:00 2001 From: Elvis Presley Date: Thu, 19 May 2016 15:45:48 -0400 Subject: [PATCH 3485/5486] Huge wall --- english/vote-the-president/trump/trump.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/vote-the-president/trump/trump.md b/english/vote-the-president/trump/trump.md index b98a1c23cd..8c206891b6 100644 --- a/english/vote-the-president/trump/trump.md +++ b/english/vote-the-president/trump/trump.md @@ -1 +1,3 @@ -You made America great again. Now its time to build a wall. Call 987654321 to contact Bob the builder. \ No newline at end of file +You made America great again. Now its time to build a wall. Call 987654321 to contact Bob the builder. + +It's gonna be huuuuge! \ No newline at end of file From 92907ddd83f43148a90b82ce18ddc9ba7583c95e Mon Sep 17 00:00:00 2001 From: mikeyenhuang Date: Thu, 19 May 2016 15:49:37 -0700 Subject: [PATCH 3486/5486] expanded swim story --- english/swim/swim.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/swim/swim.md b/english/swim/swim.md index c46368ddf4..da597870a9 100644 --- a/english/swim/swim.md +++ b/english/swim/swim.md @@ -1 +1,3 @@ Swim while sleeping is really cool but dangerous. You swam for 10 min and decided to give it up. + +But then you decided to try again, and jumped into the water whilst sleeping. From a78bfb513bccb0b0094359d07747757b031a1132 Mon Sep 17 00:00:00 2001 From: Lazbaj Date: Fri, 20 May 2016 15:21:40 +0200 Subject: [PATCH 3487/5486] Edit ending "resisti-ancora" --- .../scappare/raccogli/resisti/resisti-ancora/resisti-ancora.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Italian/scappare/raccogli/resisti/resisti-ancora/resisti-ancora.md b/Italian/scappare/raccogli/resisti/resisti-ancora/resisti-ancora.md index 53fb36c9e5..fcb304b39b 100644 --- a/Italian/scappare/raccogli/resisti/resisti-ancora/resisti-ancora.md +++ b/Italian/scappare/raccogli/resisti/resisti-ancora/resisti-ancora.md @@ -1,2 +1,3 @@ Continui a resistere, mentre il sangue continua a scorrere. Senti che i sensi ti stanno abbandonando, la vista si offusca. Cadi a terra e muori dissanguato. +L'ultima cosa che vedi è il soffitto della stanza che si espande a dismisura fino ad inghiottire tutto quanto. From 86f157e6a74912d6f148615b25158983cb69a91b Mon Sep 17 00:00:00 2001 From: "Alexandra A. Martines" Date: Fri, 20 May 2016 15:22:45 -0400 Subject: [PATCH 3488/5486] feat: Add a few options to a dead-end page. --- english/transform/transform.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/english/transform/transform.md b/english/transform/transform.md index c7330bf824..d0a64a1ba7 100644 --- a/english/transform/transform.md +++ b/english/transform/transform.md @@ -5,4 +5,9 @@ tower over you. Clearly, you have shrunk. You feel... spongy. Squishy, even. You try to hold up your hands, but you don't have any! Looking down, you see the golden ring around your waist like a belt. The rest of you is white, soft, and cylindrical. -You have turned into a marshmallow! The fear of chocolate and graham crackers fills you. +You have turned into a marshmallow! The fear of chocolate and graham crackers fills you. +How will you escape this delicious nightmare? + +[Accept your fate and settle in to watch some netflix](../netflix/netflix.md) +[Dance your blues away](../hammertime/hammertime.md) +[Try to boot up your marshmallow-y brain and think yourself out of this situation](../ponder/ponder-about-life.md) From d734de45aab86dbe6f01c4cc7d303024672617c9 Mon Sep 17 00:00:00 2001 From: "Alexandra A. Martines" Date: Fri, 20 May 2016 15:29:10 -0400 Subject: [PATCH 3489/5486] fix: Add lines between links. --- english/transform/transform.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/transform/transform.md b/english/transform/transform.md index d0a64a1ba7..dff853ac80 100644 --- a/english/transform/transform.md +++ b/english/transform/transform.md @@ -6,8 +6,11 @@ You feel... spongy. Squishy, even. You try to hold up your hands, but you don't golden ring around your waist like a belt. The rest of you is white, soft, and cylindrical. You have turned into a marshmallow! The fear of chocolate and graham crackers fills you. + How will you escape this delicious nightmare? [Accept your fate and settle in to watch some netflix](../netflix/netflix.md) + [Dance your blues away](../hammertime/hammertime.md) + [Try to boot up your marshmallow-y brain and think yourself out of this situation](../ponder/ponder-about-life.md) From 61ef6deac57b46d2c72984f151ead6825731394f Mon Sep 17 00:00:00 2001 From: "Alexandra A. Martines" Date: Fri, 20 May 2016 15:33:09 -0400 Subject: [PATCH 3490/5486] fix: add a space at the end of an old line. --- english/transform/transform.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/transform/transform.md b/english/transform/transform.md index dff853ac80..3dd44ba390 100644 --- a/english/transform/transform.md +++ b/english/transform/transform.md @@ -5,7 +5,7 @@ tower over you. Clearly, you have shrunk. You feel... spongy. Squishy, even. You try to hold up your hands, but you don't have any! Looking down, you see the golden ring around your waist like a belt. The rest of you is white, soft, and cylindrical. -You have turned into a marshmallow! The fear of chocolate and graham crackers fills you. +You have turned into a marshmallow! The fear of chocolate and graham crackers fills you. How will you escape this delicious nightmare? From 5a0e6f4942ea893ff50c0c890827254a82eb811d Mon Sep 17 00:00:00 2001 From: "Alexandra A. Martines" Date: Fri, 20 May 2016 15:41:28 -0400 Subject: [PATCH 3491/5486] fix: Not even sure what I did, but it sure broke something. --- english/transform/transform.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/transform/transform.md b/english/transform/transform.md index 3dd44ba390..789d0e1ad2 100644 --- a/english/transform/transform.md +++ b/english/transform/transform.md @@ -13,4 +13,4 @@ How will you escape this delicious nightmare? [Dance your blues away](../hammertime/hammertime.md) -[Try to boot up your marshmallow-y brain and think yourself out of this situation](../ponder/ponder-about-life.md) +[Try to boot up your marshmallow-y brain and think yourself out of this situation](../ponder/ponder-about-life.md) \ No newline at end of file From 91eb2549011870130088a98c608a68fa8dfaf74d Mon Sep 17 00:00:00 2001 From: Emil Date: Fri, 20 May 2016 23:19:03 -0400 Subject: [PATCH 3492/5486] Add stan page and entry with link --- english/marshmallow.md | 1 + english/stan/stan.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 english/stan/stan.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 6d6ef53b2b..90d1507e42 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -974,3 +974,4 @@ You're reincarnated as a green starfish but wish you were [blue instead.](starfi You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) +My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... diff --git a/english/stan/stan.md b/english/stan/stan.md new file mode 100644 index 0000000000..4be971ccaa --- /dev/null +++ b/english/stan/stan.md @@ -0,0 +1 @@ +The morning rain clouds up my window, and I can't see at all! \ No newline at end of file From c9cfda9b44e578c7ba7d5c1f93f0a381da105e85 Mon Sep 17 00:00:00 2001 From: Subrata Sarker Date: Sat, 21 May 2016 14:43:24 +0900 Subject: [PATCH 3493/5486] Update language.md for bangla --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index 94d6687882..25252ec217 100644 --- a/language.md +++ b/language.md @@ -147,3 +147,5 @@ If you want to know more about IoT, click [here](english/iot/intro.md). If GibberisHkjsbckjsjcn,[hereeekdcskj](Gibberish/Gibberish.md) તમે ગુજરાતી છો તો [અહી](Gujarati/અમે ગુજરાતી લોકો છીએ/અમે ગુજરાતી લોકો છીએ.md) જાઓ + +To explore the বাংলা (bangla/bengali) search engine, news portals, and blogs [click here](bangla/bangla-portals.md). \ No newline at end of file From b70c99404fd1f3e9976e34ca1e65d0b06556603c Mon Sep 17 00:00:00 2001 From: Subrata Sarker Date: Sat, 21 May 2016 14:44:01 +0900 Subject: [PATCH 3494/5486] Add bangla/bangla-portals.md --- bangla/bangla-portals.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 bangla/bangla-portals.md diff --git a/bangla/bangla-portals.md b/bangla/bangla-portals.md new file mode 100644 index 0000000000..508761d060 --- /dev/null +++ b/bangla/bangla-portals.md @@ -0,0 +1,5 @@ +http://www.pipilika.com/ + +http://www.somewhereinblog.net/ + +http://www.priyo.com/ From 0405c71a9c91c3f1969133e7369bb7b43752a24e Mon Sep 17 00:00:00 2001 From: Mia Wang Date: Sat, 21 May 2016 21:53:34 +0800 Subject: [PATCH 3495/5486] Add a new option in Chinese/DesertHell/NewWorld.md --- Chinese/DesertHell/NewWorld.md | 2 ++ Chinese/DesertHell/Walk/Walk.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 Chinese/DesertHell/Walk/Walk.md diff --git a/Chinese/DesertHell/NewWorld.md b/Chinese/DesertHell/NewWorld.md index 7932a80228..1a0db0e915 100644 --- a/Chinese/DesertHell/NewWorld.md +++ b/Chinese/DesertHell/NewWorld.md @@ -4,3 +4,5 @@ Let’s start from beginning end 一个白胡子老头正在讲故事， [他讲的什么？](./OldStory/Story.md) + +[我不想听，继续往前走。](./Walk/Walk.md) diff --git a/Chinese/DesertHell/Walk/Walk.md b/Chinese/DesertHell/Walk/Walk.md new file mode 100644 index 0000000000..0b65aa94d1 --- /dev/null +++ b/Chinese/DesertHell/Walk/Walk.md @@ -0,0 +1,3 @@ +前面是死胡同。。。 + +[还是回去吧。。。](../NewWorld.md) From ffbf872b90b17e6ba9103bb497a7555b39e59b0d Mon Sep 17 00:00:00 2001 From: dojha Date: Sat, 21 May 2016 21:27:54 +0530 Subject: [PATCH 3496/5486] Added a king story. --- hindi/bollywood.md | 2 ++ hindi/king.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 hindi/king.md diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 13276be738..8098185afd 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -26,3 +26,5 @@ Art of Living [Know More](art-of-living/art-of-living.md) [Sunny Deol](Sunny_Deol/sunny.md) [चुटकुला पढो](joke/joke.md) और मुस्कुराते रहो + +Click [Here](king/king.md) to read the story of a great King. diff --git a/hindi/king.md b/hindi/king.md new file mode 100644 index 0000000000..dc3770f82d --- /dev/null +++ b/hindi/king.md @@ -0,0 +1,5 @@ +Once upon a time there was a great king in the far away galaxy called "Swarg". +And then one day he came to another galaxy called "Milky Way" on a vocation. +After long wondering he found earth... +and now days he is busy in writing stories on GitHub. +To read more about him click [Here](www.google.com) and search for him. From d49373be66fec232a50fb565cd4b211de937f2af Mon Sep 17 00:00:00 2001 From: dojha Date: Sat, 21 May 2016 21:48:58 +0530 Subject: [PATCH 3497/5486] Incorporated the changes suggested by Udacity. --- hindi/{ => king}/king.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hindi/{ => king}/king.md (100%) diff --git a/hindi/king.md b/hindi/king/king.md similarity index 100% rename from hindi/king.md rename to hindi/king/king.md From e4095143ee6d55de044c88e21168c5d65e03399e Mon Sep 17 00:00:00 2001 From: dojha Date: Sat, 21 May 2016 21:55:00 +0530 Subject: [PATCH 3498/5486] Changed the broken link. --- hindi/king/king.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hindi/king/king.md b/hindi/king/king.md index dc3770f82d..26a16b0702 100644 --- a/hindi/king/king.md +++ b/hindi/king/king.md @@ -2,4 +2,4 @@ Once upon a time there was a great king in the far away galaxy called "Swarg". And then one day he came to another galaxy called "Milky Way" on a vocation. After long wondering he found earth... and now days he is busy in writing stories on GitHub. -To read more about him click [Here](www.google.com) and search for him. +To read more about him click [Here](http://www.google.com) and search for him. From b0f9268500dd6a101ff4f4717494dbbef0ae9765 Mon Sep 17 00:00:00 2001 From: Kevin Michael Jansen Date: Sat, 21 May 2016 17:32:36 -0500 Subject: [PATCH 3499/5486] Bernie Sanders wins the presidency --- english/marshmallow.md | 2 ++ english/vote-the-president/bernie/Bernie.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/vote-the-president/bernie/Bernie.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 90d1507e42..5475afca69 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -975,3 +975,5 @@ You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... + +[Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. diff --git a/english/vote-the-president/bernie/Bernie.md b/english/vote-the-president/bernie/Bernie.md new file mode 100644 index 0000000000..ecfc86b4f4 --- /dev/null +++ b/english/vote-the-president/bernie/Bernie.md @@ -0,0 +1 @@ +Bernie wins, solving income-inequality and giving free hugs and college to all Americans! From 10abd0f42af714330445ae8ba7bd17c41d1ec119 Mon Sep 17 00:00:00 2001 From: erols Date: Sun, 22 May 2016 00:55:08 +0200 Subject: [PATCH 3500/5486] Add whirling dervish to lucid dream --- english/lucidream/luciddream.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/lucidream/luciddream.md b/english/lucidream/luciddream.md index e299a9a0f0..39a644b51e 100644 --- a/english/lucidream/luciddream.md +++ b/english/lucidream/luciddream.md @@ -15,3 +15,5 @@ Yells and become super saiyan Flys to the moon [Turn into a potato](potato/potato.md) + +Spin like a Whirling Dervish \ No newline at end of file From fd3a52ffc49f6984fbf3017be2af21c0bc5f6b4f Mon Sep 17 00:00:00 2001 From: Hoang Vinh Dinh Date: Sun, 22 May 2016 18:17:32 +1000 Subject: [PATCH 3501/5486] Edit danang.md file --- vietnamese/DaNang/DaNang.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vietnamese/DaNang/DaNang.md b/vietnamese/DaNang/DaNang.md index 8196905126..1490e61a1f 100644 --- a/vietnamese/DaNang/DaNang.md +++ b/vietnamese/DaNang/DaNang.md @@ -1 +1,3 @@ -Đà Nãng là một thành phố du lịch sạch đẹp, có bãi biển dài ở Việt Nam. Nếu bạn đến Việt Nam hãy đến đó 1 lần. \ No newline at end of file +Đà Nãng là một thành phố du lịch sạch đẹp, có bãi biển dài ở Việt Nam. Nếu bạn đến Việt Nam hãy đến đó 1 lần. + +Đà Nẵng là thành phố sạch nhất Việt Nam. \ No newline at end of file From 16201bb30c4f660a5d7f277eab00e35c0a57768e Mon Sep 17 00:00:00 2001 From: Antonio Gonzalez Date: Sun, 22 May 2016 21:31:57 +0200 Subject: [PATCH 3502/5486] Add option Spanish --- espanol/cansancio/cansancio.md | 3 +++ espanol/canudos.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 espanol/cansancio/cansancio.md diff --git a/espanol/cansancio/cansancio.md b/espanol/cansancio/cansancio.md new file mode 100644 index 0000000000..c791e347e9 --- /dev/null +++ b/espanol/cansancio/cansancio.md @@ -0,0 +1,3 @@ +He hecho la lección en un solo día Beatito. No busco gloria o reconocimiento... Solo quiero descansar. +No sé si el ejercito es nuestro ejercito regresando triunfante, o el ejercito invasor que viene a Destruir. +Yo quiero dormir..... \ No newline at end of file diff --git a/espanol/canudos.md b/espanol/canudos.md index 035bb786ab..005055e6d9 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -2,6 +2,8 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del i república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: +Hizo un gesto de [cansancio](cansancio/cansancio.md) + [Hizo un gesto a Beatito](revolucion/revolucion.md) [Mandó llamar a Jordi Hurtado](jordiHurtado/jordiHurtado.md) From 4154414fba48c7e6f203c833ee2c9541e4b1ecd1 Mon Sep 17 00:00:00 2001 From: Luiz Felippe Date: Mon, 23 May 2016 01:11:54 -0300 Subject: [PATCH 3503/5486] Adicionado a aventura do assaltante --- portugues/colaborando.md | 2 + portugues/ladrao/assalto.md | 7 + portugues/ladrao/res/bruce.md | 265 +++++++++++++++++++++++++++++++ portugues/ladrao/res/gg.md | 5 + portugues/ladrao/res/panqueca.md | 1 + 5 files changed, 280 insertions(+) create mode 100644 portugues/ladrao/assalto.md create mode 100644 portugues/ladrao/res/bruce.md create mode 100644 portugues/ladrao/res/gg.md create mode 100644 portugues/ladrao/res/panqueca.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index f07d65fb51..54ea68b63c 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -47,3 +47,5 @@ Vende seu PC? Um tijolo pesa 1 quilo mais meio tijolo. Quanto pesa 1 tijolo e meio? BR BR BR Hue hue hue!!!! + +[Você foi assaltado](ladrao/assalto.md) \ No newline at end of file diff --git a/portugues/ladrao/assalto.md b/portugues/ladrao/assalto.md new file mode 100644 index 0000000000..c11f5521e6 --- /dev/null +++ b/portugues/ladrao/assalto.md @@ -0,0 +1,7 @@ +O ladrão chega com a arma apontando no seu peito e fala "vou te roubei". O que você faz? + +[Dou uma esquivada estilo Bruce Lee e retruco "vou te peguei"](ladrao/res/bruce.md) + +[Peço licença, tiro a ropa, me cubro de margarina e farinha e me jogo na frigideira](ladrao/res/panqueca.md) + +[Ele já te roubou](ladrao/res/gg.md) \ No newline at end of file diff --git a/portugues/ladrao/res/bruce.md b/portugues/ladrao/res/bruce.md new file mode 100644 index 0000000000..58d3be1e5a --- /dev/null +++ b/portugues/ladrao/res/bruce.md @@ -0,0 +1,265 @@ +265Y6ZN s ScZYSYc;5;ENNNEN62c;cc255556YZPHPPY6SSYHZ22sc;c22SSYYYY65;scc566666222c5cEDY6EYNHEHHHPH6Pc52sScPZPDYS6c6sEEHNDEDPPH52s 2225c;cs5SYDPDDDDPZ266555c252SS5Sc2 6sS6PZEH6D:css525262S565YSS66 +2S5656N s.2:S6SZss: SDEN65 sccc2S6c2s26SPZSSYPNEPDPDPZ66cc:: . . :;:: . :;::: . c:65::2sZZZPPPDPDZYS222cS5P6NNNNDZYYENPP5:2s22; . c6SPZDPYS5SSZZZZZPDHHDP6625 :Z6Z665SPcY ss;ZYS66252S5S6YSY +ss:65cY5E:c. 2;6sPYDDSYPPZ66YSP66: 5ZS5s cD5:5PYSSS62222ss.. .cssc;ssscc . ;; :.2s656666ZSNHNNNNNHNNNNEHcs ..SDDPHNHZHNYc26S66c; sYYHZ2255DDZDDDZYEPNNZHsZ2SYS622265S5YSYSYYY +22cSS6YPNsY :; 2:Y5EPNNc:6YPDYZS6SY55;. sY2;6DPS6cc2csssssc2255252265c2.:. s; : 22YP6Y:s 6Y6sNNNNHH66s 6S5c6YPHP2DNHDPPY:SNH6ZYSY6;s65HEPEDH6YNDNNDNcZ;5sc65S5Y6ZYZYZYZYZ +DZZZZYP2S2D : 5;NNPPHHHHPZDHNNNN626YPEHNZsSNSs22c22S622c56SPPDDZY25YS6Y;cs;S626;s52..:;.s.;62EDDE66656525;c . . 2s6ZPHDHPSEHY2SPSYc 5HNNNNP.YNNYY;s2266PYPZ56 ; 5sNDNNYH2Z:sS5S2ZSYSYYYYZYZ +HDEPDPD55SH ; 66666;NNHNYc;:5SZP52c2YHHHHYDN6 SN5 :c5EZDYSS66555552222css25s252ZY5S.:::ccZY6Z:ss;S5YZ55SS6625;c . .: 2s22SSYD6c66DEHNPYS26ZZEEEHHDZY262SDDNNNNEDZP2S;cS2NEHNPN6P:s5s6cS2YS6665Y6Z +NDDYZ6SSSDN6ZZ6NNNNZ2DE2c66YYPPPDDHDEDH5 s: 6Ns S6DPDDPZSS2222YYHDYYDP5Sc2YSSZ6SYPc2YS6Ys2 ::;2555YS665625c5;c.: .: ;:. s;6Z526S6cSPPDNNNNEPPSENNcYZPZDEHNNNNEHNNSD25S5DZ6Y6Y26.;62S2ZSYYSYY6ZSP +ZZS6522SSYPSYZZDEZPS2S666HNNNNNNNNNNNNE6: :S52YNs :ZYYYYY6S55SSDPNHHHNNEHYYDPPEEHNNDNEEHPDZs5 . ;scs5c666S2Ss2:s .: . cScc52: ;6SYNNNNHNP5ZNHsSPY6656ZY2626NP : ;:s2.csc662562Z6PYPPYYYSDYD +.YsNDNNNNDHHHPZs:..6SDPNHSs;sSDDH52 ;5; sYc.:cs:SND2cs::::scs:.::ss2c.;HZNHDDPZ22 s s NNNNDH;66P . 6cY5YS6Zc5;c . 26; ; ;cZNZc6P62DND25Y5 2DZYYSYHZ;; :ZZEHPDNNEH:2 :ccss2sS2PYZZSYS6ZSE + Y.NNNNDHs22s6Y6YYZDZ6cSSHNNN62;s:s;;ss:.s6s sYc 2DY6ZNH6YD6 PZHP:: 5sEZDZDENNNNHN.6 5cNNNN65;c 2sEHPEsc . . :;:s :..;2665666SYDDPDPDDPZPYYDDNNNN6YNNNNNNYD2Yss::sscc626c65222265S + 5 D5Z5HN26PSNNNN6662ZZDEDESYc2;s. :66Z5;c6s sSc:::;:s66S6665566YYDPsc s Y265;c66NNNNYHcS.; : ZZNNHH5c: :.ss2ss;s.:. ::ss;s: ;: s6ZNDDZ56c2scsc22Y6PYYY66YYYYYZZPYPZPDPEEc265Y6PYPZZPSYS + s 2.NN6SYSNNNNSS65NNPZS6252S25cscsc2s ;5cs2566PNHDP22:::cPZHP.: S5DPYY . D6PP.s::Z6DPDN6E:2 ZY5sDZNNNNPDSS22:.;ss2;s:.. ...:. 2S66522scsc525222;; ;;5c6255Y6ccss;ssc55S6YYZPs22252Y6PYYZ5Yc + ; P6HZNDENYPS6PEPHPPDES562SPSEs; .: .scS2scc2665c ;5s .65PY : .5c2266 ; 5sZSc2 5sDH2Pc2PP;5 ; SS5Sc22525cc;:;s:; ;c652s::;s6SPY62:; ;22S56566DPZZYY6655666665666Sc2cc5sY6YZ5Yc +YNPNNYSDSNNENY6DHEN6c s:YHYH. . ..sc6P6cc2: .. :6s :65SSYSZS52YS26 . :;ZZYY:; ;s EZNNc5 : ;: .::;;;;s:;:.. . . ;26ZYZSc6HP6S6SSSPYZYZZPPHHDDZPZPYYZZZYZYHHYP5665ZSZPYD6 +6NNNN;sZ6NNZN;;;; ::22HNPH 5P2:2Z5sSDScSHSs6SS52:s6655scPYPZYYYSPDNNNN2S ;;cS6ZZ.; ; NDNNYSc2csSSYZ55:: :;;;:;;;c225;; .:::. .:scss: ;DZPYSS66S6PYPZ6SSSYYYYYY5665S6ZYHEYDPDZYPPZPSP5 + NHNNDNPEDN;6 YYPEDENNY6 ;2. 5NYs625S6N5 sss:: ;DZ25::5;65s2EZYZDDNNEN.6 2s66:;626P 6 NHNN22 ::2625526S;:ss;;ss2255cc.. ..: ;s5255Y6Y5:s;;PSSS2566ZYDPPPYZYYZYPZPZPDSYPPYE6YSYc + Z.NNPN;6 P5NNNNP5 :S2sccc:PNY:. YNNNY :scc5S6Ps ; S2 Z652 : EEcD 5:.; ZE s : ZYY562SS56ss22YD2266666265ZPHNNNHDPS5cs;:::.;ss6s.:c5HYsscsDP5S6SYSZYPPEENNNNNNNNDPNNYZNNPN:sDD6 + s SY.Y s DSNNPN: 2DS62s :6c:2;ZNNNPs662.5NPP2 Y6ND .;:sc s PS:6 NYYSc.6Y : ; . ZcNNHH65s;;cc6cscc::. :.25YZPDS6SYZPPPYS2;;:::cZ6;2DDNNNNNN2YDDYYZYYYYYYSZYPZDDPPNNHHNNSN;cDYZ + s:26:5 :::.2;PYEHDN.: SH6cSYENS.ss6SPNPZS222s :56EZs6S565DZs5EP6Y.s2sDY6Y;2:s. 5:P5HYNN6DsD : ZsNHEDNHNNNN65cc55662c2ccs:: ;2css;;;.. 5s .6YNNNNNN5YDDYYYSZY6666Y6ZYDPZPHHEEHN6Es2ZYP +HYP.s s.S5YYS5DZEH5S :c2.SZc:YPNNE:6SYE5;; cZYHDYYs6HEDHNE22S6c6NESP:2s;5265DZDDYE S;NENNNNNN5N ; c ;: P6NNNN556SYYPPPPZYYS52s;5Y2:: :;c66S2ss. .S2NNDEDDZPEDNHNNNNNHNHNNEESYPPZDPEDHSSD +HsS 5s62552sS6YP:2 s2c;sc. 6PYSZY6YS6YYZN6.c YNNNNNE.sss sPZSPNNDHEDs5.s .. ; Z2ED5D :; Ssc PP2YSE2P S5SYs;: s;6YZEcscc;;:.ss6SZDDES62s2s6YPHDEY55;; .; NZDDPZ66ZYDPEEPDPZDPHDNNSYHEZDDDHNSYH +Z;5.:c.DYPPZPSS656Y2Y225sSSZE6.DNNNNNHEEEEDNNP;c PNNNEYZYZYY6YNN6ZNNZZ565Y2S22;;c;NPNNYH6D;:YSc:NHc2HEDN26655526;: ssPDS6SSSS5255YZPDPPDHZ65c225655556Y6:;:s6s Ys52YSHDEDHDPDYPZYDZHEHNYZNNPEYYZD::E +;c266EYHPZP6Z2c2c6S5Ycc2;S6DNY;ENNNNNZ2ZHPZYZ6262SPYEEHNNNEHNHED5666s5EPZP5YSYPPS6P6DPYHENEEPP52YS65EPDN6P;;56s22266; 2sYYYYPPDEDPS62ccc26YEEHP65c2255555s6P5 .;: c:2cZSNHEENNNNPDDPNHNNPH6YYZ6Y66PDPDY +:55226;Z6YY2Sc2526Y2S. 2sS6ENPSEHHHHNSsZNDPZZZYPPPZPHHNHDP5YEDDEPEDEYPNNDD6ZYYDDYYZ6PPPN .2ccccccc2c2c;26EscYZccc;5S . SY626566562ccc5S556YZPPYYSS6SSSPS 2D6 sZ6cc622cS2NPZZHDHHSYPYNEHHNNPHZPDEDDNHNNY +2PZ222.EPPDPEPPDPDHSPcs6cHNNNNNNPNNEHPSENNNNNNNNNNNNHHHHHNDHNNNNEHPD25DZNNZDZPHEDPHDHHDNc2HPNNNNNNNNNNNNs6 .c2;;2cYZY6DPDPPZDPHNHNNNNNNNNND65s6ZPEZ6YPDND :6s c;ss;:: : NZ66PYEDZZHDNHDEEN6PZZZP6S6S5Y; +sEPYYYcNNHNHHEEHEHNDHZYP6ENEPHNDSHNDPPYENHHHHEEEHEEEEDEEEEYPHEDEPPPP25PYNNZEZPPPZZEPEESDZZNPDD6Y22S2DZHN6P5S25666SSSZSHHY6ZZHHNNNNNNNHHNEHDYS565SYYYYYSZY5SZ5 .::cc ;62Y2NPSYPZHENNNNNNHNNNZDEDNNZEZPZD5 + DYYYZ2NNNNHNEDEEHHHNHHHHHNPSDNDZHNHHEDEHEEDDDPDDDDEHHNEZZ6SPZYPPPNNDHNNNNPEDEPEZZHDNHYEPPNENNDHDDHDNNNNNNNNZZHEZD5cY6YYZZDPZZYYYSZZPDDN62SZYZ6c22YDPPSs6ZZDZ5SYYEE:5PYP6NP6SPZNENNNNNNPHNNZDNENNHNEHHNZ + NYEEPSNNHHEHHEHHHHHNNNNNHHEEEDHNNNNNNNNHHHHEHEEEHHHNNNNNNHNNNPDPPNHPPHHNNEHNNDNYZNDNNDN;sP6HDHHHHNHEEPPDDDNS6NNHNY6NHNHNNNNHHPYYSPDHNNNZ2YPDEPZYSZZPDPZYSSPPPEPDNN ;5s2sNEYZDPNHPEDEZEc6;2 ; 52.c :;;; + NNNNHENHEDDPHHNNNNNHHHHHDPNNEPHNY2ZEHHHHHHHNNNNNNNHEDEENHPENHZPDDNNPDNHDEEHNNPD25PYNHPNYZNDNNNHHHNNDEZYPPHNS5NNNN5;DEDEHHNNNNNNNHNNHEZYENNNNNNNNP6s5SPNNNNNHHDSZEE Y5PZNNNNNNNNPD2YsZ cs2 ss ; : +;PcDPYZPPNHNNNNHHDDEEHHDDEHEEHNHNNNNEPZDHHNEDPZPZDEEHHHHEEEEDHNNNNNNNNHHNNHHEHENNNNEHEHNYZPYPYPZDDPDDEDDHHDDDDHDPEEHHDNN6c66YYPEEEEEEEHNNNNDPSYPDNNHNEDHENNNNNN5SYP s;.2.s:S6EPDH6YNN;Y;c;s;;6256.;;;22: +6HZNNNNS6ZSEDEHHHHHNNNNNHNHHHHNHNHHHHHHEEDDDEEDEHHNNNNNHEHHHEEHHHHNHHHHHEEEEHEEEEEEEEEEHHNNNNNNNNNNNNNNNNHNNHHHHNNNNNNHHHHNHHHHHHHHEHHHHPZDDHNNNPS2.ss5PPHDDDNDSYPD ;;:Z666EZNEEN26NN 2;cSZ65ZSYP5SS6YZ2 +DZSDYHNDENHNNHHEEDDPPDDEHHNHHEEDPDPEEHNHHHHHEEHHEEEEHHHHEHHHHHEEDDDDHENHPDDDEEHHHHHHHHHHDEEDEEDDDEPDPDZZEDNNHNDPHDNNHNZ6NNHHHNHHEEEDDDEHDPDDHHNNHHEPPSYSPNHPENNNNNN 655NE2SHPNNNN6ZNNsYPP5S22S6SY25S5SYc +HDDEPNNDDEDHHHHHHHHHEHHEDEEEHDDZYZYDDHNNNNHHHEEEEDPPPPDDEHHHHHEEPPPPEDNHDEHHHHNNNNHHEHEEEEEEEEDEPDPDZPZZPYHHEHYZDZHNDN6sEHHEEEDDDDDPDDEHNNNHDPENNNNNNNNDDHD6ZHEHHNN 622NP:cS6EPNN5YHN;SDD5Yc2S6SY22S6YZc +EEEEDHEEEEDHHHHHHNNNNNNNNNHHNHHEDDDHHNNHHDZPPDHEHEDDDENHEHNHHHEEDDPPEEHHNNNNNNNNNHEHEHEHHHHHHNEHEEEHDDDEDZHEHNDDDPHNENZSHHHHHHHHHHHHNNNNHEHNNNNNEZZYPPDNEDPSZEDEENN 5scEZ6S66PYNH6YPH cSSc6:scs25ss2s56: +PDDZYYSNNNNNNHHHEEDEDPPHNNNNNNNNNNNNHHHHHDZPZENNNHEHHHNHEEHEEEEEHHHHEEEEEEHHDDDEEEHHNNNHHHDDDEDDDDDDEEEEEENHNNHNDEDPEENNHENHNHHHNNHHHHHHEDEHHHEPPYYSYZPHHHNNNNNDHNN:Y66PZNNYZZYNNEHNN 6SSc6.s;;sc::s;s2 +DNNNNNNHEDDDDDDHHHHNNNNHEEDEEHHHHNNHEDPENNHHEHNNNHEEEEHHNHEEDEHHNNNNHHPDEEEDEHDHHHNNNNNHNNEHEHHNNHNHNNNNEEEDHENNEHPZDDNNDPDPHHEHHHEEPPDDNNHEPYYZDENNNNNDEHHHNNHZPHH.5s225NDs522NPNDNN 656ZPcS256622655S; +NNNHNHNHDHHNNHHDDDPDDEHHHHHHEEEDDDDDEEEDPENNNHEDPENNNHEEHHDEEEHHEHHHNNZPPDNNNNHNZDZP6S2.NEHHEHDEDDNHHHHNEHZYEDHNHNHENNEHYY62HNDPPYHNZ6DHEDEHNNNDYs56ZNHDEPZYYYZDPZDYD66c2SS;c2:s HPNN;Pc5ZZs6.:::cssc:ss +EEEPESSEDHHHHHHEEEEHHHHHNHHHHNNNHHHNNHHEEEHHHHHHHEDEHHHEHEZDHHNHPDEENNEHPPSPYZZPYP6Z6SY:NHNNNNDEDPNHNNEEDDNHNNDEYYHNNNEEHNEPNNHEEDHNEEHNEPDEHNNNNNNNNNEYZPPZPPPDDDDYP6YSSSY:sDSHPNENN2E.cYYs6:s2s22c2scs +PNHHNYSHEEDNHHHHHHHHHHNDDDEDDDEEEEEEEHHHNHDDDHNNNHDDDENNNNHNNNNHDDDDHNDNNNYH6YYYYP;2;s2 NPNHNHNHHNEHHEHHNNNNNNEEDENNNNNNNNNNNNNNNNNNNNDZEPHNHNDPDHHNNNNHNNNNNHHHEDD6Y565S6S ;NDNNDDNN6N sYSc6cc6266c5s2s +YNNNNDDHEEDHEHHNNNNHHHNPZDDDDEDEEHHEEHHHNHDEDHNNNHEHHHNNNHYZYYPPDDNHHH6PNNsY ;sssc . : Y2 S NHNN5YS2NNPPEEPZEENN6Sc:PYDDYD265266ZP6S;:c.SEPHPYZZYYYSPHDZZYZDDHHNNHNNNNN6Y.sNDNNSYHNSN:266c522S5SS56252 +ZHEHHDDEEEEHEHHHHHHEHDDDDHHHEHNNHNNNNHHHNHHHHHHNNHHHEHHNNHSZYZEENNNNNNZDSY:6 ;::cccc2c6256. S NHNNDHDPNNDZEDZZNNNN2S; PSNNNNs2: :.22ZNYYc SNNNNNNNNHD6ZHDZPPPDDNHNNHHDEEHYPc5NPNHZPEN5DcS562552S5SS56556 +EEDHEHNEEDDDDEEHHEHPDYYPPPPDDEHHHHHHHEEDDEHHHDPDEHNHNHDEDDSPPDNHHEDPZPs6c5s6.s :.5c666S :s:2 S.D6NHHEYYY5NNNNDDNNYPs Y6HNNN;s s;ZN62; 5NDHPSDNHEY;5PY6S6SZYHDNHDEDEDHZDZYHPDDNNNNsZSP5S255265665565S +DEDHHNNHHHHHHEEEHEHEEEDEEHHHHHHEEEEEEHHHNHHEEDPPZENNNHYPZZ6YZY66:s65ZZ;5c2s5:c::;:cscs;s .;:;.; 5.P6DZZYDZNNNNDEDHZEZYDYDDZH262ccss:s2. 22SPSS62566666SPY6S6SPZNDHEEEDDZDSZDPNNEENNNN2D5Y5SSSSSYSS6S6YSP +DEDNHNHHHHHEHHNHEHHHHNNNHHHNNHHHHEEHHHHHHEPDDPZPYDHDED5YSY6SY625 :62PPs522sc;c;scsss;;:;ss;;;:c:5;6sZ6PPS265c6:s.::csc: ;s.:.:::::.. ;;;;;ssc;:::ssc2cccs2PZNHNNNNNNDEc6YSNEPPDZNNcPs5c222665656S6ZSZ +HHHHHEDHHHHEEEEEHHHHHEDHHHHHHHHHHEEEEHHDPZYPEEEEPENHEPc6s2s26522.;2s22 .::.: . . ;:.. . : : ;.22sc:s.:;sc2:; ::;::. .::cDZNHNNEHEEYP6YS6NDZPEDNN2D5Y222255252222526 +NHHDEPPHEHHEHHHHHHHEEEEHHEEHHHHHEHHEDDDHNHHHNNNNHNNNNH6S:cccccscssss : :. . 62NDHDPDZPSPZDPPNHDEDDHN2P5YZZZZYYSS5655222 +EEEHHHHHHEEEHHHEHEEEEEEHHHHEEHHHHHHEEEPHNNHNNHHEDENNNH6Ys252scss62c2 . . ::::sssc:: :s ccNDNNNNNNNNDDYZNEPDDDPN:Sc5SS666666666S665 +DEEHHHHHHHHHHEEEEEEEEEEHHHHHEHHHHHHDEDZDNEDEHEEDPPDPZY:22252.;::S2s2 . .. . . . . .: .::;sssc2S5:2YSNHNHDEPDYPHHPPNNNNNNENcZ6Sscccsc22666S6Y5 +EDDPPPZHHHHHHEEEEEEDDDDNNHHEEHNHHEEPPYSPEDPHNNNNNHHEZS ;2c2: ZY25 .: .s266SZHZ:2SZNEHDZDPZ26YZ55NDEDEEDN;Z6YYYSYSSS6S625;c: +NNNNNHHEEEEEEEEHHHHNNNNY6ENHNEDHHNNNNNNNHHNDPS2525S5s2 s225666ss . 26 : :: . ..:. ::s2YENNNNNNEPPYYYPDP55SSNHPESENNc555NEEENNNN:S.;6S6S2522656S266 +EEEEEDEDEEEEEEEHHHEEEHNPYHNHNEPHHHHEDEHHNNNNNNEHHNNNDEs666YSS6:; . ; 2c22sccs62SS.:..:.2;6556c626:; . ..;:56SYZPPDPPZZYSYY6:sss sZYNNNN2SDPEEEDNNHNDEHNsP5S22c2cc2s5266665 +HEEHHNNEEHEEEHHHHHHHHHNPZHNHHEDEHEHDPEEP6PHEHDYPPDNHYY ;:;cc2c:s .ss66PYc2Y6EPDP662262YYccZSPYPYEDNNDNSP6Y26c2s2;c.: :.sc55YYZPDHEHDDZS5ss:: :;NDHHs66SNHHENNPEYPDNsY6Y25252265S6S6SSS +HPDPPEEEEHHHHHHEEEHEEEHDPHNHEEDEHDEDZEHEDNNNNNNNNNNNPP ; .::....::cs2cc2225265SSZYPZDPDPHPNNNNNNHENNPN6YYP6Y25c5;2.; . s;66YYYSSYZPZPS6c;. . :sNDNNYDHDPPPPNHZDSYZE;65S566S66666666666 +HPPPPPPEEHHEEHHHHHHEEEDHEHNHEHEHNDEDZHNEEEEEHEDDHDEPsc .....:ssYSEPZZc6PZ66c22266ZYZYS5EYHDNEEDDDDEPD66ZD6Y6S6Sc6;s.:.. . . :.cc66SZYYS62s: . .. s66NHNNSZEPPZZZNNENPDENsY6Y26662556cccccs2 +NHNNNNNHEHHHHHHHHEHEHEDHEHNHEHEHNHHDPHNNNNHEPNNNNNHH6Y;s ..:sc2ZYDPZZ2522sc::. s::.;.2s22cccs6SSZ5S6SSY6Y25scss:...:.::s;cscccc .. :sNSHD6YDPNNHHNNENNNNN5D6Zs2555626c2cc526 +EENNNNHNHEDNHHHHHHNDPDPNNNNNHNNNNHEEDHNHEYcc;5ZYES22 . :;sss:. : .. . ;.c2:; ...;s:s.: ..:.;:;sssss;;:.SPNNNNNNNNNNNNNNNPP62 .N6NNENNNNNDHNHEEEENN5PYP2666SS6Y5666YSY +NPN2sP2NNPZNNDPPPHNZSHNHHHHEEDPPPDDHHHHHNNNNNNNEHSsc :;;;;:... ..... . .::::;::.. 66.::;sssc;s.;:::::;::. cs25c:ssc2s:ssZNNENNS YNE2ZNEPYcc H6NNSYZYNH56c2PP25HN.6PD56666656c2222c5 +N ;. 2 NNDPNNNNNHHNDDNNYSYYSYYYPPDEEHHNHEDEPZZZYP5;s ::ss;s:;;:;;;;:::: s:5c625;DYEPNNNN2Yccs5.s:;;s;s:s:;::...:.. :.:;:.cs6Y6SSY6s22ZNEPYPs :sYYS6:; 2 NZYZDDNNPEPPNN6YEN sss56666S562555226 +N 6cYsDDccHPNNNNNNPYEHHHHHNNNNNNNNNNNNHNHNDZYSSZ2;c :s;::::....:::::::. ;:52PPNNNNNHNNNNNNNNHNNNYNs5s2s2;c;s:;::::.... :.;ss:52ZDPD2s :2ZNZ5c ;5s :2s.: NPHNNHHDYPPPNNZDNN.S66SS6656256655565 +N 62Z6PPc55sNENNNNNHHENNNNNNNNHHHHDPDPENNNEPY5662;s ;c; . :.::;;:;65ZSDPYZsc . . NYDP;c5H .ND6ZcY;2s2:s.: . : ;s;:ss562226; :5 5. .:s. NNNNZDNNNNNNNNYPNN 666666S56556556562 +N 2s;66SYc6 5cZ6NNNHHHHHHHHHHEHHHHHHEEDHZS5;s;:.: ;: ..::s;cs2c22SSPZDP26 . NDNNNNYN : SSZN.s : : .c: s5 ..:. NEZZs5NHHHEEHNSYNN2PPZSS5S2552S66S262 +N 6 6Y cS : 5;NNHPHHHHHHHHEDDEEHHHEDDNDZ6;ss:.: ;. ..cs5266S5s;:: ..::s;s.. 6S ;;c2;DD;c.s : ..:; . :c . .:c; :cs:. . NS66ssS26SZZPDc5NN;YSSZZ6Y2665SSYZSY2 +N5N 2 c s;s:;.s:6sDZEDHHHHPZDEHHHHHHPZDNEDY5c:;:. . . . . .... ;:;::.. :: :; . .; . :.:;.:.. . . :c: .......: . NZDDDDNDNEYPHNSYDH cssSS5S222255c2222 +NDNcE ScS665S5Y;NNEPHNHENNNNEDNNHHHNDY5;;.:.. : ssssss;:...: . . . ;::: ... .::::.. NYDPZPNNNNZDNNEHHN:S66SY56566625sccc5 +NENsP s PcDDYZ65ZcNNNDNNHEHEDDPYENHNEDY62:;.:....... . ;.s;;:s;;;;;:;:;.:.: .. . ...... ........ :. N5S6c5DZNNPENNYPNNcZYY6S5655665S25526 +HENSE5N c. ZsZZ2S . Y6NHNNY6YZENNNNNZZ65cs: . ...: NDNHZZ55NNPDDE5SDN:625c2sccs22c5scss5 +HEHENHN ; S;PPZDs6 2;ENNNNNNNHDHNEHZ62c; . . ...; NDHHSZYSNHPDHH5YPH 22225c22c5226s2cc2 +HEHNNNN 2:S6PDYE YENNNNHDY6ENNNNHYS2:: . ;:;;:::....:.: . . :s NYZZs5EPNHYZNNZEZN 2S6562552S626c5cc2 +EEEEEEN ; 5D6S62 s2SYPDDDPZEN5:ZNHP5;s:;::...:;;s;.. . . ::.....:.:.:.:.: :s . . . NPZZ;2PSS6:cNNNNPN ;YS2622226626:s:;s +HNNNNPN . 6ZScZYY6S2DHNNNNNNNNDEPDc . ; ;:.. ..:.:.::.:..:.:.:::: . :s. :.. NYNH26PSPDYYHD.csY c55scscssssscs2sc; +ENNHNNNcD;Y ; ss;s ..:.2566PYNNNNHPZYDNHEDH5 ::. .2; .s::. . . .....: . .. . . ..: . : :. NPHE2SNNNNYPNNYEDNcY6S2525222c2222c2s +PNHHNHNPNYN .SPHNNNNNHHHNZ;cs. .s;::::::.:.. . .....: : ;;;s:s:;.: . .:. NS66:cNEDD5SNN6DPN:5sc2525c2222222c2c +PHEDEPDHNNN c :s :.ss52ZPPEEENNHZYZs ... .......: . . . s.22;c:s.: ... .:::. : NDYZSSNEHHYPNN2PYH.52225c2s2ss2cccc2s +ENHEEDDHHNN2H:s s226652c; . ;s6DDPNNNNNNY s:: . ....... . : ; 2;26:s.s ..::.. ..;. .;5;NNZPNEDDNHPDNNcY6P 25222s2;ssscsccccs +DNHNHHNEDHNNNYP26 s ;;PEZY62PNNNNNE2Sc2:;.:::.... . . ; 2;5c22c5 s : ...:... s ND2SNNDDEDSYNNsY2Z ;::52s2;sssssccccc +ZDPHHNNHHZYNNNNNNNN :scs:: scc5s c6ZDNNE66c5sc;ss;;;::.:...::. :. . s S2SS56s2.s ..... ;. ..;:::. s: ..:S;NESZNNNNNNPENNZNPN:Ssc66c2scsc2222522 +HHEDDDDPPNNNNHHHNNNNNNNs.;5 .2; sss256c:. :2PPY6:;.:::::::::::...:::::::......... : c:5s5ccc:;.;:s.. :;:;::;s:.::scss: scZH62; ... ;. ;NDNNZPNDPPNNHHEHNNSN;Ss2;scc5522;s::s;c +HHHEHEEEDNNHHEEEDHNNNNNNNNNNNHN6;25: ::;css:.. ..;2scs.: ....... . . . . s 2;cscc;s;s;s :.S5NHNNNNNNHNS666552cs;;:;::s.. . . : E2EY26PZPDNEEEEEEN6H:6s2sc2222c2scscccc +EEEHHEEDDPPEEHNHNDDDEHNPZENDEZN; :;. ;;;c;;. .s;ss:: ...... . : s::; . . :.;.c:6s6522.: ;;;;. :;:: . :...:. ;sNZNHDENHZZHEEEDDEN5E:6c5c222c2c2s2sssss +EHHEEHHNNEHEHNNNNNNEDEEEENNNNHN2.;;::;:;;:;:.. ..;:;;:::::::......... .. . . :: . ss:: :.; .;:; ssHYNHEENHZZHEEEPDEN2D:5c2scsc;sss;s;s;s: +HHHHHHHNNEHSYS6ZYHHNNNNNNNNNNNNc sc;s : ...... ss;;;;::::................ ... ...:... . . :.s:ssss;s;s:.;;sssss;ssssss;;;;;;::.. : :Z5HYDPZZ6SDPNHHHDHPN5E.5s2ccsc;s;;;s;s:;: +HHHHHHNEENNEHZSYSHHNNDPEHDZPDDN: s52S; :cs;::.. :......:.:::::::;;;:::::.:.:.. ..: : ::;;:;.: c2cscc562c;.:.c5s;ssss;::.... . .ssEYNEHEDD6YDPNNNNHNPNcP.2c255c2scccc2c2sc: +NHHHHHNEDHHNNNNNEHHEHDDHNHEHHNNYS6Y22;.s2csss;:. ..:::.:::::::::.:...::::........:; . ... :.:.;:s;;s;s;s::ccssss;;::. ::sccsccsss;;::::.. NZEPEENNEHHENHYPNHDN6H.5scSS26252222c2sc; +HEHDDDDHHHHDEEHHHEEEEEEEEEDEEENHNSS:.::;:;;;s;;:.. . ..:;;;;;:::::.. ... :::s :::... . . . s;cs556656sc.: :::::::::::..... . NZPZDPNNENHENHc6NNDNZN:622cc;c:;.:::::.:: +EEEEEEDHHHHHHEEHHEEEEEHDDHNHHHHNNPHc:ss;.:::;:;:::::::::::::::::::::::::::.. . ::::.:.: . s:5266: . .: .;s;::::s;255655: .::;:::::.:;. .NPEDEDPP26c2DP56HD6Z2D s22;s:s:;;;s;csccc +EHHHHNNHHHHHHHHHHHHHHHNDPHNHEEDHNHN2;:::::::;;sss;;;::..........:::::::;;; : . s:;s.: : 2s5c2scss;6665cs.: ..c2YZs:s;;;ss2556cc::c266SYSS5c;:. . . :22NDNHNHEE6SS6PPZZHHYPPN ssc66562565S6YSYY6 +ENNHHHHHHHHHHHHHHHHHHHHEENNHEEEHNHN25. :;;ss;ss;;;;:.. .::..:.::::::;:;:;;.:..:.s;;s.; 2c2s5s5s5s2;s;;:;:cs65YYSYSSYYYYYYDDNNNNNNNNNNDP625556552s;:. Y2ZYHPNHNNPENNNNNNNNNNNN Y66c2scsssscscsccc +EHHDEDDEEHHHEHHEEHHHHHHHNHEHHHHEDHNYH: ;s;;;;;::;::::: .:::::...:.:.::;;::::::;:;;:;.:. s::.: ; 2;Y6EDNHPZEDNNNNNNNNNNEEDPHEEHDDY62c:: ...::::... N625PYEDHHZDNNEHNHDNDPNN 266s2c5sccs2c2c2cc +NNNNNDDEDDDDEHNNNHHEHHHNNZ6ENNNZ2PNNN2 : .:;::::::;;;:. ..::::..::s;s;::.. ... :.s:2s5c5266S6DD66s:: ;;;c:s:;. ss;s .:. ::s:. :ND6YHENHNEZPDPYZNNYD26NN .YY;cscsscc2c52522 +ZZZPDDEEENNNNDPZYEEHHPPENEPDDDHHDNNZH;:s:scs;: .:s222c;: .::;;:;::.:::::;:;:;;;;;;;s;;::cccs2s6265c2:; ;;.:..:.::.: . .::. ;2ZNNNNDYS65SNE:cDDNNHNHHPNsY6Ss5c5sccs2c52522 +HNNNNNNDDDDPDPPDDHHNNNNHHEEEEDDEENNHNYP2 :;;;;::::::;;cs.:;;ss;s:;::::::;:;:;:;;;s;;:;::.. . :.:: : . .. . ......... . 2SNHNNNENNNNNNZZ:s;c:6:556:s.; ...:.s:s;s +NNNHNEHEHPDPPEEEHDPDDNNHNHHHHEHEDHNNNNNY.: . :;:;. .:cs;ss;s;;;;;::::::::;:;:s;;;:;:;::ss;;:::::; : . . . :.;::;:;::::s;ccc2c2cccccc;;:. :;:;::. EZEDNHDZHEDEZDDH6D c ::;:;.:..:.;:;;; +HHHEHPDNNDEDPHHEHPZZSEEHNHENNHHDPEEHNDNZ6s. :;s;.. .;;;;ssss;;::.:..:.::;:::;;;;:;::::;;::::.: . . :.;:;;;;;;ss2c252522csssss;;:.. :s;s;:: ::HPHDNNNNNNHN5D 2:;c2scsssscs2c22c +EHHHNHNEHPPDDEEEHDDEDHHHNEDHNNNEPPZPDYYPNYc; :ss;;....::;:;;:;.:.....:::::;:;;;;:;:::::.::::.: . . :.::::;;sssscscc22c2ss::... :::.. ..:;;s:.. 65DPHDNPHHcP 2c2c2scssss2sccccs +EHHHNHNPPDDDEEDEENNNNNNHHDPHHNNEDDDEHDPENDP6:;.: :::;:::::::;;;;::::::::..::::;:;:::::.:;:c;2c25s2;c:;;s::s;cscccccc226622552522sc;;;:::::.....:::::... DSNNEN;6ssss;s;;;:s;ss;s: +EEEEHZZHHNNNNEDDDHNHNPYHNPSPPDHEENNNNNNNNNNPY2 . ;scs::;;ssss;;::;;s; .:..::;;;::::.: . s;ss:s.: . ::::....::ss:::;;;:: ...::;;::... : 5sPD5YSS52cs;:::;;:::.: +HHHEHEHDPEDHHHNHEDDDDEHEHNNNNNNHHDPPPPPENHHNN2 s5c:::;2css;:::::;;ssss;s2ccc.:..;:;;:;sss;;:::.::;ss22sc;;.. . . . :5ccs:: s:S5S652cs2c6 +EEHDDDEDDEEHHHNHHHHNNNNHEHHHNHNHNHHHNNNHNEDPN2 ...::..;;ssssss;;ssssssss:;cssc.;.:;::;::::::::.; : .....:.: . .....: . . .:.:::. . .2;;;::.: . : 2s65Y6ZSY +HEHHHHHHEHHEEEEDDDDEEEHEEEEHHHHHHHHHHHHHHEEEN6 ;s: . .;:.:::::;;;;;;;;;;;;cssc:s::;:;;::s;ss;s:; : . . . ...; .::;::::... .2sssccss:; : c +NHHNNHHHHHHEDEEEEHHHHHHHNHHHHHHHHHHHHHHEEHNHNP2SPs .::s: ..:::;;;;;;;;;;;;cscc;s;;;;;;::ssss;s:s : . .: . .::: .::;;;:::::.:2scccccc;s . +EDDPPDDDDDDHHHHNNNNNNNNNNNNNNNNNHNNHHHHHHHNHNHDDN5 :;;;;;;;;sssssssscccs::2sccscsscssc;s.:::::.; : . . .. . .::::;::::::;;;;;cscc2c22cc:s.: . +HPDDPEDNNHHHHHHHNHNDDYSHHDPPPPPDEEHEEEEHHHNHHNNNN6 .:: .;;;:.. ..::;;ss::2s22ccssccccsc:;cs22c2;2:s:;;;;;::::;;ssss:: :; ::ssss;;:::.::;;;ss2c22225222c2;csc +NHNHHHEHEEEHEDDDEPPYY65PPDDPZPPPPDEDEDPENNNEPDDENS s .. ......;:cs2ccccs2cc2sc;;s;ssscsc;s;sssssssssss;s;;::: c2ss;;;;;;;;s;ssssssss;:::::;;;sscc22525565665525:s.: +EDEPDDPEPDPHEEHEEEHHNNNNHNNNNNHHDHNHNEDEHHNDYY6ZNZ55 s: ..::;;;;::.. :.s:s;;;cs5c2c;:c;;;:;:;:s:;;s::cscc22cc:;::::;:ss;sss;;::::::::::;;;s;;;::::;;;:::s;s;sscc5255c2;s:; . +PYZ6Y5cNHNHNNNNNNNNHHNNHENNHNHHHHNNHNHEDZDNHEEPPH5:s ;: ...::::::.: . : :.:.;.2s2cc;EPPPYZYZ6Y562522cc225525c2cccc222222222222222ccc;:::... ..:::;;sscccccc22S66626s2cc;s : +NNNPD62HEEEHHEHDDDDEEEHHHHHHHHHEEHHHHHEEEHNNHHEENZSS s.:.::::.::.: . ..;.;:::c:6cY6S2EPPPYZYZ6Y6S2525sscs2c2222252556cscc22222522csss:...... .:;;cssc2ccssc2c656655;sss;s:s : +PNNNNEDHDDDEEDDDDDDDDEEEEEDDDEEEEEDDDEEHNHNEDDPENEEPs2 ..:::::::::...... :.:::.s:6s65522cccc2c2scscscsc;;;;;;ssssscsssc..:::::::;:::...::::::.....::;;c; . . ;:;;.;ssccc2c2c2sc:;.. +sEPHNHHNENHHHHHHEHEHHHHDEDPDPEEEEDDDPEEHHDDPZPPPDDND66 .:::::::::::::::: . :.. : s:s;::::::::;;;;;s;sss;s:;::::;;;s:;::.....:..........:::;:::::::::;;s; :::::.:::s;:;.. .....: : . . . +YNNNNPZHHHHHHHNEEHHNNNNEEPPPPEHEEDPDDHHEEDDDHNHHPDEP65 : ;;ss;;::::::;;; ;:s;::;:s;;;. s:;:;:;:;;scc2225625cccssssc;s::;;;;:::::.:::::; .:::::.. ...:: .::;:::;;cs;; ..:::::::::.. +PDYPZDDEEHHEHDDZZS6S666HNNHHDHHHNNNHEDDPPENHHZ266ZNHNHSS . ::cs2css::sss;;;s;s;;:::;:s;2s52666625scss::::;;sssc;s:;. sssssssssssssssssss;;;;;s;;;;:::. . +6S2DZNHHHEHHHHHNNNNNNNNHEEHHEHNHHHHHNNNNNNNNHDYDHNNNNNNE ::...:.;:s;;;;;;;;;;;s;s;s;sss;cscs2c5225c2scsc:::;;:s;ss;s:;. ;;;;;;;;;;sss;;;;s;;:::::;;;::::;::::::;:::.. .... .. +YYSHPNHEPYZ6SYSYYDDDDDDEDHHNNNNHEDDHHNNHHEDEENNNNNNNYZ52 .:::::.....;:s;s;s;s;cscs2ccc2c22cc22c2scsc;ssc;s;;;;;;ss:;::. ::::::::;:;;;;;;;s:::::.::::::::: +DYS655cNNNNNNNNNNNNHNDZNNNNNNHHEDEEEEDDDEPPEHNNNN6 ;:;:.: .::;:s;s;sscs2c2222222222ccssss;sssssss;s;;;;;;:;::..::::::::::;;;;;;;s;::.:..:::::::: . +DEEPPYYYYYYZYDDHHHHDEZYEHEEPPPZDDNNHNDPNNNNNHED2. ::s;:;:.:.::;;s;sscscs2c2222c2ccscsc;s;s;;;s;;:;::::::::::::::::::::;:;;;;;;;s;;:::::::::::::::::.. +DNNNNNNSSSSPPEDNNNNNNNNEPPDPPYYZYEHHNDEHNEY2 ::s;;;::::::::;:;:s;sscscc22scccscsc;s;s;s;s:;:;.:..::::;;;:;;;;;;;;;;;;;;;:;;;;;:;s;;;;;:::. +ENNDDc62ZPY52sss;ccSSZYDDNNNNPY5c5SZHNN5 ..:;css;;:sscscs::::;:;;s;ssssss::;;scccsc;s:;;s:;.: . ::;;s;ss;;ssss;;:;:::::;;::;;ssccss;;::::::.. +PZSEHNNSP2:NNY5ZP665cPPNNNEHNHNNNNNDZ Zc : . ..:2csssss;s;s;s;ss22ccsssssc;s:;.::::;;ssss;ssssccccccss;;;;;;;;;s:.:;c2cc;;:...::: . +SHPHEDN2Y6:NNPYNNEHPZZY5255ZHDNPP2s .P5.: c;cs:: s:::;:;;s;cscccsccscscssscsc:s:;:::::::::.;;s;ss;;;;;s;;;;ssssssccss;::;;ssss;:.. +6NNNNNNSZD6NNHDNNHNDEZZDHNNNNNN: .65Y5:; s:2s;; .s;;;s;sscscccccc22scscssscsc:s:;::::::;:;:;;;;ss:;;;;;;;;;;;ss;;s;:::.:;scccs;:. +YNHNNEN66D6NNPSENYSENDENNZ2 .;Yc . . s:ssss2ccc2ccccccccccs22s2scssss;s;s;;;;;;s;sssssssssc;;;;:::::::::::::.:ss2c2cs: +Z62522666HDHHDYNNDDNNNNZE . : : cscccccs2c2cccccss;;22s2:s;;;s;s:;::sssssscscsccccccssss;;;::::::::.s256SZ65; +P66Y6EN66EEZZZ6NNPDEN c:s:.. ..;:s;s;ss;;s;cc;c:;:::;:;::::::;:s;s;;;;;:::.;;;;;;s;sscc22225522cs: +PYZNDNN56SY56ZZNNYP:c 2;s; : ;.s:s;sssssc;c:s;s;;;;::::::;:::s;;;;;:;;:;;;;sscc2255666S22s;. +E6SYSDEYDYDDHEH25 : c:;;;;;;:::.;:c;2c2225;cs2:c;s::::::;;::;:;:;:s;ssssssc2cc222256665222ss;:. +NYP66SZ6D6EcS : s;ss;;;;s;s:c;2s525526;2:c ; . :.;:;s::::::::;:s;sscs25c2ccccccss;;;;:;::. +NHNDHPHZN.5 :.:.::s:;:c;5s6566565Y:c:s ; . . ;:ss....... :.;:ssccscss;;;:::::. +NHNDNDN:Y . :.;.c:2s6255c2s2:s:s:s:s:;::::.:..... :.:.::;;;s::..... . . +DZH6DcN : : c:2s52c2;2:;ss;c:c:s.;.: . . :.:::.::.: +EPNZN6N s:; s.2s6525;2::52;2.s . .. : ;:;;ssss::.... +NYN s.6s5cccs2:s S5:2 ; ....: . . +N S s.Sc65c5:2.; 65:c : .:::: . +N ;:; 6;PS6Y s .;.ss.s : ...: : . .. . +N ;:. 2.Z66Y s cc : : . .. . . .. +N ... ... : s 62c5 ;..25 .. . . +N . : : ;::; : . :; +N ;P662;: ;:2css .. . +s : 6NYs. . . ::.: . ;s . +c ::;6: . .. . . +c ;c:; . .. . +2 :c. . . .. . +c . : . .. . . +5 cD: .... ;:.. . +6 cD: .. ;:.: . . +2 6EHN2: .. . :. . . +2 ;;66PE6Y. :. . . +5 scSZS625.: . . . +2 ; 5555ss;s.: .: +; : sc26255Scc. + . sc26sssc:: . +6 . ssc5;; +S . . :.ssc6sc. +6 s:ccs;c2c2;s.. +D c;22ccc2ss:;.. .. +N 222222ss::::.. +c cc::c5;;..::.: + 56s;sc.. .::; + ; YSSY2256c2;: + s 56ccccc5ss::. + 5c6Y;;scsc;s::. + 666Z::;s;s:;.. . + ; 665S;c:;::::.:.. + s DH52cc2Z ....:.. + 6 PEcscc5Z. ..... . + Zs55sc26 .:s;;:: . + Zs6Yscc6.:...:.: . . . . . + Pc6Yccc6.:...:.:.. ..................::: + Ps6Sc226:s:;::.. . ..:::.::::::::: + Pc6Yc22Y:;:;::.: . . . . :.:.::::::;;::: + D5SYs22S:;...:.. .... . . ..:.:::::: :.:.;:;:::::: + ; ZsYZ26;2 .::::.:.. :.....:.:.::::::::::::::::::::: + ; S:YZ6Z:; .;;::::.. :.......:.:.::::;;::::::::::::: + : 6:SS6Z;c:.;s::::.. . ....:...::::::::::::::::::::::;:;:; + : 2 662S;2::;s::::::.. . . ..:...;:::::::::;:;:::.::::::::::.s:s + . . c 525S;c::;s::::::.:.. ....:::.::::::::::::::::..::::::..;.s:c + :. ; 2s56s2;;sc:::;::.:.... . . ..........::::::::::::::::..:.;:::..; c:2 + :. ; 62SYc2;;;s .:;::...:. . .....:::.::..:::;;;;;;;:::...::;:ss:: . c:5 + .: ;:;;. : 22s5;:s2:;. :;;c. :;;;: .. . .. ::5SZPZYZZ62c;;;::. .;::... ;: :.;; . :.s:2s2s2 + . : .. ; 22s2;:sc:s. :::s. .:.:. ..:.;.cs56562sYDZYS665cs: .:.........:....::.. . :.:: ...:.:.;.c;csc + : .. : 2cccs:25s5:.:::s. . :;.. :.s;cs65YYSS65s:;ss22656652c22s..::::;;:;::.. .......:.:.:.:..:..:.:.;.;.s;s;c + :.:; : 2ccc2;SS5Ys:;:;s:...:;.. . . ::s;2cSSYZYS65666SSY6652s:;.. .:.::;:::.:.. ....::::::::::.:.::.::;:s:s;s;s + . s:;s..; 2s2c5sYSSPccs:;s:.:::s. .... . .... .. :.c26YYYDHNNNNHEPY65c:: ...::::::.. . ..::::::::::::.:::;:;:s;s;ss; + : ;::s . s:s:c:Y6PN2c;:;s;:::;s. .:...... .. . ................ . . .. ..;ss;csc55S65566S666ss::::::::::::::::....:.:.::::::;;..::;:s:;;s;::; + : ;:.; ;.;.c:S2EN62;::;:::;:s .:.... . . . .......... . ..:::: . ..:. .;::. .;;;;;::::::;:;;;::::......::;:;;.::.;:;;s;;;:;; + ;::; ; s:522:6S6Y52:..:;s:; .::::::::::.:..:. . .... . . . .....:..... ..::. .:.....:;;::;;ss;::::::::::::.. .::;:::;:;:;;s;ss;ss;sss;sssssss + . cs;s.; ; cscs2c2525ssssssss;;;;;;;:::;::::::::::::::::...:.... . ..:.:.:: . . . :......:. ..::.....:... .........::.:.:.:;::::::........:;;;;;;;;;;;;:;::.:::::;;;;s;;;sssss;sscscsccccs + . : 2c:s ; . s:cc:.sc5655ccssssc2s;sss;;;;;:::;;::;;;;ssssss;;::::.:....... :.::;; .:.:.::::::::::....::::::::....:.::::::::::::::scsss;;::::::::;;;;;;s;ss;sss;;s;..::;;s;sssssssssssscsccccccccc + . : cs.s : s.26:.ss256652s;ssc5c;;;;;;;;;;;;;:::s;;sssssss;s:;::::.:.. ..;:;:::::;:;;;;;;:;::::::::::::::::::;;::;;;;;;;;;;;;;s;;;:::;;;sssccs:;:;;;;::::;;;:;.:;:s;ccccccss;s:;s;s;;;s;ss;;; + . . 2c.s : : 26:::.:.ssc2cccsscsscssssss;;;;:;;;;;;;;;;;::::::::::.: . . . . : s;;:;;;;;;;;::::;;;;:;::::;:;;;:sssss;;;s;;;ssss::......::::;;;s;:;;;;;;;ssss;;ss;;;;s;ssss;s;;;;.:::;:;:;;;;;;; +...... S6;c s . sc:; .:5SYZS52cssssss;ssss;;::::::::.... ..:::;::::;::.:....:.. ;:::::::::::::. ;:::........::;:sssssss;;;;;;;;;::;;;;;;;;;;;:;::;;;;;sssccc2cc22ccssss;;;;;;;sss:;;:s;sssssssss +: . 5c:c : cc.; ..;;22YDS5566S66552225265ccss;;;;;;;;::::;;.::::::::::.;.s;s;s;;;:;::..: sssssssssssssss;cssssssscsccccccsssccc222ccsss;:;2222222cccss;s;;s;;s;s;;:;:;:::::;;:;:::::::::: +;.: .. 2s.c . c2;c. ;;SP62252522css;sc262c2ccccscss;s:;..;; :..::::..::s:s;s;2s2csss;s;s;sscsssccccsssssssscccccccc22222cccccccccccccccsscsssscsss;s;;:;:::;;;;;s;;;:::::::::::::::::.::: +;::... S5;5 : s;25;:. . . sS6S6655222c25565c2ccccccccss;s:;ss:;.:;;:;:::.s;;:c;2s2c656566SY222225222225222222522222252222226Y66522ccscc25562.::::;;;ss;s;;;;;;:;::.::.::::::....:.;:;;s;sss +. S5s6 : . c2;:. .. . :Z6SSS6S6255555652222ccccccccss;sss:s:;;;:;.::.s:;:s;2s2c2c5265SS6666S6SSSSSS6SSS5252222522222552565552222ccccccccssccccccccscsccs.:.: :.:.;:::::;:;:s;s;sss +: . S2s6 ; ::........ .5ssc2c2cssssssccc2ccccccccscss;;ss:;.::;:: ...;:;:;:s;;;;:s:s;ccssccccccccccccc2cccccccccc22ccccs;sssccccccss;;:;sssscsss;;::.:.:.... . . . :.;:s;;;;;;:;:;:;:; +; : 6cs5 s ..:;::... :ssc266S56522222cccscssssssss;s:;;;.; .:: . :.... .... . : :: . ....::::::::..::::::;:;;;;;s:.:::;;sss;;:::.:::::::::.. . . . .... :.:.::::;:::;:;:;:;:; +. 5ss6 s :;c2cc:. .;s: ..:cc6552sc;s;sssssssssssscsc;sss:: . . . :: ...::::::; ......::::. ..:;;: ..::::::;:;:;:: ..::;::.:::. :.;:s:s;s;s +s 2;s2 : ..:;.. .:.. :s2ccsscccss:s22ccss;sss;s:;.. . :: . .. ..::::::::.:.. ::... ....::::;;;sssssss;s;::;:;:;;:::: . :.:::..:.::;;;;::cs:; : ;.s:;:: +: . . 2;s5 : :;:::.::.. :ss5c2cc222ccss::::.:...:.. . :: . .. .:.. ..:::::;:::;;;;ss;;s;s;::;:::::::.:.... ::.:. : s:c;ss; + .: 6ss5 : .:::;:;.: .:;ss2c2cccccssss.:::...... . . .. . .. .. . ..:.::;;;:;;;;;;;s;;;;;s;.:::::::.:...... . . . . : s:s;sss + :s 6cs6 : ::;;;s::. ;sssc222c2cscssss;;;;;;:;::.:.::. . .. . .. .. . ..::::;;;;;;;;;;;;;;;;;;;;;.:..:.:...............:.:.;::::::.:.:.::;:;:;:; +.c2.: S2sS ; .:;;;;::::;ss;scc525css;sss::::::.. . .........: . .... . . . . ......:::::;;;;;;;;;;;;;::::::: ... . .. . . . ::....:.;:s:;::::.:.: + ::. c Z62Z s ..:s::::;;:;;:;sc6562sc:;;: ..:.. . ..... ..:::::::; ....::::...... ....:::::::::;:::::::::::::...... ... . . : ;:;;:::.::; + s PY6P c . :;::::ss;:..;;c65S2ss.::::;;;:: . :.... . :.:::;:: .::::::.: . scss;;::.. ...::::::::::::::;:::;::::..... ..... . .. :.:..... :.;:::::s;s + ::. 2c ; ; . :ssc;.::s2s:;.;cs2cccsc2c;ss;;;:: :.::;;s;;;::.. 22;s.:..;:ss;s;:;;:;;;;sss;s;;s;;;;;::::.:... ..::......:.. :.... . :::::.:.:.::;:::: + . ; 65:c ; :;;s. :.;2s;ssc5262c2sccs :::::::.: .::::::::;:;;;;s;:;;:s;:;::;:s;;s;;::s;;s;;;;;;;;;;;;:::::::::::;:;;;:............ .... . . ..:.. :.::;:::::: +. ; 52:c : :;;s: :::;;:;;;sscs;;::;: ..::::::::::::::::;:s;s;ssssss;;s;sscs2cccscssccccscscssssssss;;;;;;;;;;;;;;;s. . . . .. . :.....:.::::::::::: + . c;:; . :;;s::;c: :::;;;;;;;;:::: .::::::::.. ..:.::;:s;sssssc:;ss2ccccc22ccsscc22c2scscscssssscssssss;;::...:. .... . . . :.:::.::::::::::: + ;.::.; : :;scs;c5; ;sc2ccccc2222cccsss;;;:;;;;::..::::;:;:s;ssssc2sscsccc2scssssccccssscss;s;;;;;;ss;s;;::.... .:...:. ...:.::::::...... . . ... :...:.:::.::::::::: + c:s;sc;s . ;sscs:s5; :sc2ccccc2c22ss2css:;;;ssccscss;;;;;;s;s;cccsccsscc22s2:;::s;c2ssss;s;s:;;;:::;.:::.:::........ ..:::::. ...::::;::;::.:.... . . . :.:.:.::::::::::::: + :: ;.c;cc;s:: . . ;s;::s. :c;s;:s5cccscS522ccccsccc2222ccsccs2cc2ss2c66s2scsc;s;;;;s;sc;;:;:;:;::::::.: ... ... ..:.::::::::::::::.::: ..... ......:.::::::::::::::: + .: : s;:;.::; .:;;:::: .5ss; s6cccc2Y66622ccccsssssc52sccc5222sscsSSs2;c:s:;s;ssss;s;;:;:;:;::::...: . . ...::;;;;:::::.....:: ........ ..... ;:::::::::::::: + :; : ::;;:s . ..:;;s; s6ccs.s6cccsc52222222c222ccsc22cccc22c2sscs25:c;c.;::::;;:;:;;;;;;;:;::::.:.: . . ...::;;;;::::::::::::::;; ..... . ......::::::::::::::: + .: ;:ss;c . :;. :2::: ;6cccsscc2255555522c2ccccccc2cc;ssss;c2.;.;.:.....:.... . . . ... ..:::::::;:::::::::::;;::;; ..... . ......::::::::::::;:: + . s:sc;s.: .; 2: . ;6c2csscscc2c222222scscsscccc;s;;s;sssc.;.;.:...:.: . . :::;:::::::.....::::::::::::::::; ..... . ......::::::::;:;:;:; +S . ;;:;::::.: .: :5: . ;6c2c:sssssccccssss;s;s::s;ss.;::s;s;:;;s:;:;::::.: : ..... :;;:;;;;:;:::::.:;:::::::::............ . ......::::::::;:;:;:; +N ;;;;;;scs2 .:s;.cZc:. :6ccs.;ssssssss;;;;;ss; s;ss.:..cscs:;;s:s:;;;;;:;.:.... . ..... .... ...:::;;;;;;;;;:::::::.... ...... ..:...:.:.:.;:;:;;sss +N ::;:::.; :;;s::s;2625c;scsss;sssss;;::::::::::::..:.::;:;;:;.:.. . . .:::.:.:.. . ..::::;:;;;;;;;s;;;;;:;:;;;;;:. . .. .............. ;:::;:;::::::.: +N :.:::; .:;:: :s;5ccs;;;;:;;;;;;;::..::::::::..:.;:s;ccsc:;;;;;;s:;..:......... . . ......:::::::;:;;;:::::::.:::::::.. .:::: .. ........... ;:::;:::::::::: +N ..:::;. .::: ;:2scs:;::::::::::.: ...:.::.:.::.;:s;;s:;:;::;;:;:;::::::::...: . . ... .......:::::::::::;:::::::.:...:::::.. .:.:: .............. :::.:.::::::::: +D .:::.: :.. . :;:cscs;;;;::::;:;:::::..::::::.:::s:ss.:.:....::::.:.:..::::::::.:... ::..:::.::::::;;:::;:::;:;:::::.:::;:::.. . . . ........ :.:.:.::::::::: +2 . . . .. . ;......::;;;cscsscss;;;;ss;;;;;;::::::::::::;:ss;s;s::;:;;;;;s:;::::::::::::::: ;:::::::;;;;;;;;;;;;;s;;;;:::::::::;:::.. . .. :.:.:.::::::::: +: :s ::.. . .s:.. ..:;;2s2cscss;;;;;;ssss;;;;;;;s:;::::s;ssscss;ss;ssss;s;;:::::::::::::::.;;;;::::::::;;;;;sssssss;;;;::::: .::.... .. . . ..... :.:.;:::::: + : .: :.cc:: . :5;:. :;52Y2;s::.:.::;;;ss;;ssccss;s::;:s;s;ss:;.:..::.. . ..:.::::::::::: :::::::::.::::;:ssssscccscss;;::. ..::s; . . . :.::::;:;:: + ;:c2s5 ;ssc;: :::s. :s;: Y2sc22ccss;;;;;;;;csss;s;;:;.. csssssss;;;sssss;ss;;;;;;;;;;;;:252c2c2c255552222cccss;;:::::::;;:;;:::.. . ::::.. ..:.::::. . :.: + s s;:c :: . :;:: . .:Y2ssssss:;:;::::::;;;;;s;ssssssssssssssssssssssssc;ss;sssssssssss;ccsss;ssccccccccccccsss;;;;;:::::::::::::.:..:..... :.::.:....:.;::::::.;:; + ; s;:c .:.: .: .6c5222ccscssssssss::::;;;;sscscccc;;s;sscscsccccc2ssssccccccccc222ccsssscs2c222222c2ccccss;;;;::::::;;;;:;;:;;;;;;;;;.: .. :.::::;;..:.;:;:;:;:s:s + : s:;;s2.s sc .:;s. : cs6222ccscssssssss;;;;;;;;;;;;ss;s;;;:s;s;ccssccccsssssssscccc222222c2cccscc2222ccccccsss;;;:::::::::::::::::::;;;;;;::.. :.::;;;;.:;:;:;;;;;:s:s + : s:s;25:2 .: .. ::5sssss:;.:.:::::;;;;;;;;;:::::::::;:s;csssscsssscssscscccccc2cccc2ccssccccssssss;;;;;;::::::::::::.::::::::::::::;;::.:::::;::::;..:.;:;;::;:c;s + : :.s;:::2 .. :Z2ccssss;;:;;;;:;;;;s;;;;;;;;;;;s;cscs2c22c2scss522222222222222c562222ccccccss:;.....::::::::::::::::::::::::::::::.:.:::;;;;::.. :.;:;:::;:s;s + : ;:s;22s2.; .:: :Y5Z6;c22sc22.:52;s;;;;sscsssccsscscs2c222225222c555552555525222c55c2c2ccscss;s;;;ss;;::::::::::::s;;;;;;;:;:;:;:;;;::::::::.... ...:.;:;;;:;:;:s + s:s;s:cs;:22c5 . :Y6EY:s55:s65 .65scsc;sss2c52c2s;2222222225c2c2cccs222c555522cccs22sc;;;;;;;;;;;;sss;;:::::;;sssssssssssss;;:;:;::::::.. . . ::;;:::.:.:.;:;:;:; +.s;;:: s;s:ZZPHSY26 : .DSZS66ZY.s52sc2cccccsscc2c2222cc52222222s2;c:;::;;s;ssssssss;s;:sc;s;;;::::;::::. .::;sssss;;;;;;;;;;:;::::;;:;:;::;;s;cscs;;;;:::.:.s:2c2 +.s;css:S65c52c2226Zs6 ;..sDZNE:cscS6sc22222222222222222222c2sc;s:;.:.:::..::::.:.:... .: . . .... .::.... ...:... .;:;;;;s;;;;;::.:s;;;::::...... .;:;:;:;:;:s:;:s + 2s2c5c655255cccs6P;S ZSEZ55;sZSc2c22222c2c2cccccc;;sssssc;c:s:;:;::::::::.:........ .. . . ..::;:::::;;;;s;;;;;::::... ....:..::::::::;:sscsc;s;;:: +.2s52552s62SY66S5PHcP : D625SSc5sc2c22c2scssssccssssss;ssc:s:s:;::::.:.:.......... . .....:.. ..:;ssscccss;;;:::::::::::;:;;;ssscccssssss;;;;s;cs5c62622 +;52522ccsY6YYcs2sDNYH NNHPS6:s:;sc2525ss;;sscc222222c2sc;c:s:;::::.:.. .:::::::;s;s;;:.;;::..:::;;;;ssss2css::.:.::;cc22:;;:.. : 626 +ss;s;cc2c2c5265Y6SY5Z6P:;.. : PSDZ566655s2;s;sssssss:.:.::;;:;.; : ..:::::: .;sccccc22s;: ::.::;;;;:.. +2525266222c62S6YYYY6S6Y2P ;:S6ZS55s2:s.:..::....s;sssssssc:s:;::c2sc;;::. :s;;;;:::::....::.::. .sscc;2S655cs;;;;:: . +25266656565S6SSYYSYSS65PN 6255c5;c;s;;;;;:::;:::;::;:;::.:.: ..::::::.... . .:::;;;;:;;;;;;;ss2cccs. +s2c22csS6S6SSYYYYYYSSY6DNs cs:s.:::;;ssccss2cccccccccscscss::.. ...:.:::::: ..:;ss;;ssc22655s;. +s65562cS6YSSSSSSSS6YSYSYD66:: .... . ss;;....::::... sccssss;;;::::..:: +cYSSY55S666SS6S556666SY55YDPHcc +cY66Scc66666555222265SS2cYPHNZD +62sZP665252S6YYSY6552YP5c6S566H +6c;YZc2SSS6PYZPYZSSYSPDYSYZ65ZN2s +S2sZZ256665S6YZSY66YSZPY6YP62YPZEc2 +62sZZ2252225266665566SSZYENPYS2HNHNs. +5s:SSssYY5565SSYYSSS6YS5c6Y66: 5PPN5S . :: +5c;YZ2cYY6665YYYYSS5265DEZ6HNEZNNDPNNNN2 ss62 +565YP52Y6S666SYSS65SSY6YY6cZEYS6666PNZP2 :. ;:ss;;:: +2ZYSY22YSPDPDS62c66YYPZDEDPDPPDYYDEPP22ZEZ5; sscs +2YYYP65ZSSS565566ZYZZS6DHZ6ZDNNNNY6266Ps +2S6562cYSSS66SSZYDDEEPPS6PEHNY6s:5Z5Y +5YS6S55ZYPPDEZYS6656666ZDZPS6;:. s6;s ;66S6ss +6ZZZZZYc:226S6SSSZPZDDHNN6; s565ss .s2D5 :c5PDNHEZ6c 55NNNNNNNNNNNNNNHN;Y +SZYYYS2HEEHDDPZPZDHPHPDss;ss;. ..c6s2 ::2: :;;:::.;. ccZYDPNHNNNNNNNNHHNHNNYPDHHNPN6H2Y222 +265665sNNPD6SZZNNNNSY .;;;5656s ;s:c . c;;;2s:; NNNNNNNNNNNNNNNNHEPPPPHENNDEDDHHHNENDNNHN +YDPEDEZHEZDZPPDZDSZs2.. :;s2;.s2cS .;. :Y22262:c .cDENPS6YPNNNNHHNHEHHHDEHHHHHHHNEHHENHNNHNDEHDN +PDZHEHHPDDHENYP;s .;s252s2222s;25c6. : .:S252YSc6 .:s2SZDNNNNNNNNNNNNNNNNHP25YPNNNHEEDEHHNNNNHHPDSYZYEDHNHNHHNEN +SYSPYDEDHPHSP26:s...:::cc22222s55SPSP66s 6s2sY65S .;YDNNNNNNNNNNNNNNNNNHHEEHHHNNNNNZZ5626NHEHHHHHHHHHHHEHDEHEEHDEDDEDHEN +SYYPPENZH6Y:s;;c25Sc2;:. :s:::.26SP6Sc2: 2;c;PYYD . HNNNNNDPPPPDEHHHHHEEEPDDENNNHZPHNNNHE.sNHHHNNHHPDDDHHNNNNNNHNDEPPHEHEH +PPDZPPHc6s2:;ss556Y55cccs6Z22; c6;2 :Y2S5NEHN s HNNNNNNNHDHNHNNNNNNNNNHNEDPYENNDPYDNNNNEEZHNHNEHHNHHHDEEEHHNNEDHHPDZPPZDPPDZ +HPH6Zc5 ::c25522sss256c:6Z22; 5Z2S :c2HYHDNNNN 2 6SNENNNNEYENHEHNEDDDDPDEHNHHHHEPZSPNNNNDDPDNNNNYZEDPDDENNNNNNDDYZZZHENNHNNNNNNNP +Zc6.s 22YS6655556655ss2c6Zs:6P52cS. HYNPDPNN ZYNNNNNHEHNNNNHHNNHHHHNNHHHHHHHNNNNHEDDDDEEEDDDDEHHNNHHEDPPEDEEHHNNEDHDNNHHEEPPDEE +Sc5s2sscs2c25cccsc2scss;:c6;:s6. ESNDNHNN 2.DDNNNNNNHHHHHHHHEEEEEDEEEEEEEHHHEEEEEEHHHHHNNHHHHNNHHHHHHEHEEEEHEHHEHEHEEHENNEHEHEEEEH \ No newline at end of file diff --git a/portugues/ladrao/res/gg.md b/portugues/ladrao/res/gg.md new file mode 100644 index 0000000000..46403fe50e --- /dev/null +++ b/portugues/ladrao/res/gg.md @@ -0,0 +1,5 @@ +Ele já te roubou fera, não tem mais o que fazer. + +Só aceita. + +GG \ No newline at end of file diff --git a/portugues/ladrao/res/panqueca.md b/portugues/ladrao/res/panqueca.md new file mode 100644 index 0000000000..2f821531ff --- /dev/null +++ b/portugues/ladrao/res/panqueca.md @@ -0,0 +1 @@ +Wat? \ No newline at end of file From 4e8c92bc6fa6091de9b051838875004f7987f9d8 Mon Sep 17 00:00:00 2001 From: JenniferCruz Date: Mon, 23 May 2016 14:53:56 -0500 Subject: [PATCH 3504/5486] Create destino.md --- espanol/transcender/destino.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 espanol/transcender/destino.md diff --git a/espanol/transcender/destino.md b/espanol/transcender/destino.md new file mode 100644 index 0000000000..09978f09f9 --- /dev/null +++ b/espanol/transcender/destino.md @@ -0,0 +1,5 @@ +Justo antes de ver a Beatito había estado con Magola. El medio de una guerra no era el mejor momento para probar hongos alucinogénos por primera vez. +Pero el Consejero sabía que era muy probable que esta fuera su última oportunidad de elegir algo en esta vida. +Con el guayabo existencial que le causaba todo esto, el único control que se autoimpuso fue en la dosis. +Si le hubiera puesto caso a Magola, hasta de estos pensamientos tormentosos se hubiera podido desprender... +Aunque fuera solo para morir al recuperar la conciencia. From 98a3316cfdfd9b19215f920dbb25b70c1b34fc3f Mon Sep 17 00:00:00 2001 From: JenniferCruz Date: Mon, 23 May 2016 15:05:58 -0500 Subject: [PATCH 3505/5486] Add twist --- espanol/transcender/transcender.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/transcender/transcender.md b/espanol/transcender/transcender.md index 4c0806f3ef..61229f5d1c 100644 --- a/espanol/transcender/transcender.md +++ b/espanol/transcender/transcender.md @@ -5,4 +5,6 @@ su existencia el Consejero. Una de las últimas figuras que, por así decir, des ya no era mas que una masa de colores amorfa que aún se diferenciaba del "fondo". Pero aún persistian sus pensamientos. Debería desprenderse de esos también, si quería transcender -debidamente. \ No newline at end of file +debidamente. + +Y lo hubiera hecho... Sin embargo, una hora antes había sellado su propio [destino](destino.md). From c4b85b79c94f18daa19dbd3b9c90318bd379bbbb Mon Sep 17 00:00:00 2001 From: JenniferCruz Date: Mon, 23 May 2016 15:09:22 -0500 Subject: [PATCH 3506/5486] Add twist --- espanol/transcender/transcender.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/transcender/transcender.md b/espanol/transcender/transcender.md index 61229f5d1c..a1cc64b220 100644 --- a/espanol/transcender/transcender.md +++ b/espanol/transcender/transcender.md @@ -7,4 +7,4 @@ ya no era mas que una masa de colores amorfa que aún se diferenciaba del "fondo Pero aún persistian sus pensamientos. Debería desprenderse de esos también, si quería transcender debidamente. -Y lo hubiera hecho... Sin embargo, una hora antes había sellado su propio [destino](destino.md). +Y lo hubiera hecho... Sin embargo, [una hora antes había sellado su propio destino](destino.md). From 0fb2820e33b1076f0ea0ad6d9aa36754a074c6e6 Mon Sep 17 00:00:00 2001 From: JenniferCruz Date: Mon, 23 May 2016 15:17:18 -0500 Subject: [PATCH 3507/5486] Add 'destino' twist --- espanol/transcender/destino/destino.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 espanol/transcender/destino/destino.md diff --git a/espanol/transcender/destino/destino.md b/espanol/transcender/destino/destino.md new file mode 100644 index 0000000000..81dec6bac2 --- /dev/null +++ b/espanol/transcender/destino/destino.md @@ -0,0 +1,11 @@ +Justo antes de ver a Beatito había estado con Magola. + +El medio de una guerra no era el mejor momento para probar hongos alucinogénos por primera vez. + +Pero el Consejero sabía que era muy probable que esta fuera su última oportunidad de elegir algo en esta vida. + +Con el guayabo existencial que le causaba todo esto, el único control que se autoimpuso fue en la dosis. + +Si le hubiera puesto caso a Magola, hasta de estos pensamientos tormentosos se hubiera podido desprender... + +Aunque fuera solo para morir al recuperar la conciencia. From 68e49c9888651d4478cd553fd3d928ad2cefd394 Mon Sep 17 00:00:00 2001 From: JenniferCruz Date: Mon, 23 May 2016 15:17:31 -0500 Subject: [PATCH 3508/5486] Delete file in wrong directory --- espanol/transcender/destino.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 espanol/transcender/destino.md diff --git a/espanol/transcender/destino.md b/espanol/transcender/destino.md deleted file mode 100644 index 09978f09f9..0000000000 --- a/espanol/transcender/destino.md +++ /dev/null @@ -1,5 +0,0 @@ -Justo antes de ver a Beatito había estado con Magola. El medio de una guerra no era el mejor momento para probar hongos alucinogénos por primera vez. -Pero el Consejero sabía que era muy probable que esta fuera su última oportunidad de elegir algo en esta vida. -Con el guayabo existencial que le causaba todo esto, el único control que se autoimpuso fue en la dosis. -Si le hubiera puesto caso a Magola, hasta de estos pensamientos tormentosos se hubiera podido desprender... -Aunque fuera solo para morir al recuperar la conciencia. From 08bf32f46ef70e3a03756a8bd5828500efbe10cc Mon Sep 17 00:00:00 2001 From: JenniferCruz Date: Mon, 23 May 2016 15:17:45 -0500 Subject: [PATCH 3509/5486] Update 'destino' url --- espanol/transcender/transcender.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/transcender/transcender.md b/espanol/transcender/transcender.md index a1cc64b220..61edd8f832 100644 --- a/espanol/transcender/transcender.md +++ b/espanol/transcender/transcender.md @@ -7,4 +7,4 @@ ya no era mas que una masa de colores amorfa que aún se diferenciaba del "fondo Pero aún persistian sus pensamientos. Debería desprenderse de esos también, si quería transcender debidamente. -Y lo hubiera hecho... Sin embargo, [una hora antes había sellado su propio destino](destino.md). +Y lo hubiera hecho... Sin embargo, [una hora antes había sellado su propio destino](destino/destino.md). From 05b2c85a77438012bbea3b7bfad022bd9ab2180f Mon Sep 17 00:00:00 2001 From: kirk Date: Mon, 23 May 2016 17:27:07 -0400 Subject: [PATCH 3510/5486] correct the spelling of krazy --- english/crazy/crazy.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/crazy/crazy.md b/english/crazy/crazy.md index 54083a4e91..56075db850 100644 --- a/english/crazy/crazy.md +++ b/english/crazy/crazy.md @@ -12,4 +12,6 @@ Do you... [Hide](../hide/hide-chk.md) -Eat some [ice cream?](../ice-cream/ice-cream.md) \ No newline at end of file +Eat some [ice cream?](../ice-cream/ice-cream.md) + +ummm crazy should be spelled krazy with a k \ No newline at end of file From 8679cb381d9a9155e1f1c8e4d2eda3c44ed188b3 Mon Sep 17 00:00:00 2001 From: Luiz Felippe Date: Mon, 23 May 2016 19:30:58 -0300 Subject: [PATCH 3511/5486] Reduced the quantity of lines --- portugues/ladrao/res/bruce.md | 299 ++++------------------------------ 1 file changed, 34 insertions(+), 265 deletions(-) diff --git a/portugues/ladrao/res/bruce.md b/portugues/ladrao/res/bruce.md index 58d3be1e5a..6cdec68170 100644 --- a/portugues/ladrao/res/bruce.md +++ b/portugues/ladrao/res/bruce.md @@ -1,265 +1,34 @@ -265Y6ZN s ScZYSYc;5;ENNNEN62c;cc255556YZPHPPY6SSYHZ22sc;c22SSYYYY65;scc566666222c5cEDY6EYNHEHHHPH6Pc52sScPZPDYS6c6sEEHNDEDPPH52s 2225c;cs5SYDPDDDDPZ266555c252SS5Sc2 6sS6PZEH6D:css525262S565YSS66 -2S5656N s.2:S6SZss: SDEN65 sccc2S6c2s26SPZSSYPNEPDPDPZ66cc:: . . :;:: . :;::: . c:65::2sZZZPPPDPDZYS222cS5P6NNNNDZYYENPP5:2s22; . c6SPZDPYS5SSZZZZZPDHHDP6625 :Z6Z665SPcY ss;ZYS66252S5S6YSY -ss:65cY5E:c. 2;6sPYDDSYPPZ66YSP66: 5ZS5s cD5:5PYSSS62222ss.. .cssc;ssscc . ;; :.2s656666ZSNHNNNNNHNNNNEHcs ..SDDPHNHZHNYc26S66c; sYYHZ2255DDZDDDZYEPNNZHsZ2SYS622265S5YSYSYYY -22cSS6YPNsY :; 2:Y5EPNNc:6YPDYZS6SY55;. sY2;6DPS6cc2csssssc2255252265c2.:. s; : 22YP6Y:s 6Y6sNNNNHH66s 6S5c6YPHP2DNHDPPY:SNH6ZYSY6;s65HEPEDH6YNDNNDNcZ;5sc65S5Y6ZYZYZYZYZ -DZZZZYP2S2D : 5;NNPPHHHHPZDHNNNN626YPEHNZsSNSs22c22S622c56SPPDDZY25YS6Y;cs;S626;s52..:;.s.;62EDDE66656525;c . . 2s6ZPHDHPSEHY2SPSYc 5HNNNNP.YNNYY;s2266PYPZ56 ; 5sNDNNYH2Z:sS5S2ZSYSYYYYZYZ -HDEPDPD55SH ; 66666;NNHNYc;:5SZP52c2YHHHHYDN6 SN5 :c5EZDYSS66555552222css25s252ZY5S.:::ccZY6Z:ss;S5YZ55SS6625;c . .: 2s22SSYD6c66DEHNPYS26ZZEEEHHDZY262SDDNNNNEDZP2S;cS2NEHNPN6P:s5s6cS2YS6665Y6Z -NDDYZ6SSSDN6ZZ6NNNNZ2DE2c66YYPPPDDHDEDH5 s: 6Ns S6DPDDPZSS2222YYHDYYDP5Sc2YSSZ6SYPc2YS6Ys2 ::;2555YS665625c5;c.: .: ;:. s;6Z526S6cSPPDNNNNEPPSENNcYZPZDEHNNNNEHNNSD25S5DZ6Y6Y26.;62S2ZSYYSYY6ZSP -ZZS6522SSYPSYZZDEZPS2S666HNNNNNNNNNNNNE6: :S52YNs :ZYYYYY6S55SSDPNHHHNNEHYYDPPEEHNNDNEEHPDZs5 . ;scs5c666S2Ss2:s .: . cScc52: ;6SYNNNNHNP5ZNHsSPY6656ZY2626NP : ;:s2.csc662562Z6PYPPYYYSDYD -.YsNDNNNNDHHHPZs:..6SDPNHSs;sSDDH52 ;5; sYc.:cs:SND2cs::::scs:.::ss2c.;HZNHDDPZ22 s s NNNNDH;66P . 6cY5YS6Zc5;c . 26; ; ;cZNZc6P62DND25Y5 2DZYYSYHZ;; :ZZEHPDNNEH:2 :ccss2sS2PYZZSYS6ZSE - Y.NNNNDHs22s6Y6YYZDZ6cSSHNNN62;s:s;;ss:.s6s sYc 2DY6ZNH6YD6 PZHP:: 5sEZDZDENNNNHN.6 5cNNNN65;c 2sEHPEsc . . :;:s :..;2665666SYDDPDPDDPZPYYDDNNNN6YNNNNNNYD2Yss::sscc626c65222265S - 5 D5Z5HN26PSNNNN6662ZZDEDESYc2;s. :66Z5;c6s sSc:::;:s66S6665566YYDPsc s Y265;c66NNNNYHcS.; : ZZNNHH5c: :.ss2ss;s.:. ::ss;s: ;: s6ZNDDZ56c2scsc22Y6PYYY66YYYYYZZPYPZPDPEEc265Y6PYPZZPSYS - s 2.NN6SYSNNNNSS65NNPZS6252S25cscsc2s ;5cs2566PNHDP22:::cPZHP.: S5DPYY . D6PP.s::Z6DPDN6E:2 ZY5sDZNNNNPDSS22:.;ss2;s:.. ...:. 2S66522scsc525222;; ;;5c6255Y6ccss;ssc55S6YYZPs22252Y6PYYZ5Yc - ; P6HZNDENYPS6PEPHPPDES562SPSEs; .: .scS2scc2665c ;5s .65PY : .5c2266 ; 5sZSc2 5sDH2Pc2PP;5 ; SS5Sc22525cc;:;s:; ;c652s::;s6SPY62:; ;22S56566DPZZYY6655666665666Sc2cc5sY6YZ5Yc -YNPNNYSDSNNENY6DHEN6c s:YHYH. . ..sc6P6cc2: .. :6s :65SSYSZS52YS26 . :;ZZYY:; ;s EZNNc5 : ;: .::;;;;s:;:.. . . ;26ZYZSc6HP6S6SSSPYZYZZPPHHDDZPZPYYZZZYZYHHYP5665ZSZPYD6 -6NNNN;sZ6NNZN;;;; ::22HNPH 5P2:2Z5sSDScSHSs6SS52:s6655scPYPZYYYSPDNNNN2S ;;cS6ZZ.; ; NDNNYSc2csSSYZ55:: :;;;:;;;c225;; .:::. .:scss: ;DZPYSS66S6PYPZ6SSSYYYYYY5665S6ZYHEYDPDZYPPZPSP5 - NHNNDNPEDN;6 YYPEDENNY6 ;2. 5NYs625S6N5 sss:: ;DZ25::5;65s2EZYZDDNNEN.6 2s66:;626P 6 NHNN22 ::2625526S;:ss;;ss2255cc.. ..: ;s5255Y6Y5:s;;PSSS2566ZYDPPPYZYYZYPZPZPDSYPPYE6YSYc - Z.NNPN;6 P5NNNNP5 :S2sccc:PNY:. YNNNY :scc5S6Ps ; S2 Z652 : EEcD 5:.; ZE s : ZYY562SS56ss22YD2266666265ZPHNNNHDPS5cs;:::.;ss6s.:c5HYsscsDP5S6SYSZYPPEENNNNNNNNDPNNYZNNPN:sDD6 - s SY.Y s DSNNPN: 2DS62s :6c:2;ZNNNPs662.5NPP2 Y6ND .;:sc s PS:6 NYYSc.6Y : ; . ZcNNHH65s;;cc6cscc::. :.25YZPDS6SYZPPPYS2;;:::cZ6;2DDNNNNNN2YDDYYZYYYYYYSZYPZDDPPNNHHNNSN;cDYZ - s:26:5 :::.2;PYEHDN.: SH6cSYENS.ss6SPNPZS222s :56EZs6S565DZs5EP6Y.s2sDY6Y;2:s. 5:P5HYNN6DsD : ZsNHEDNHNNNN65cc55662c2ccs:: ;2css;;;.. 5s .6YNNNNNN5YDDYYYSZY6666Y6ZYDPZPHHEEHN6Es2ZYP -HYP.s s.S5YYS5DZEH5S :c2.SZc:YPNNE:6SYE5;; cZYHDYYs6HEDHNE22S6c6NESP:2s;5265DZDDYE S;NENNNNNN5N ; c ;: P6NNNN556SYYPPPPZYYS52s;5Y2:: :;c66S2ss. .S2NNDEDDZPEDNHNNNNNHNHNNEESYPPZDPEDHSSD -HsS 5s62552sS6YP:2 s2c;sc. 6PYSZY6YS6YYZN6.c YNNNNNE.sss sPZSPNNDHEDs5.s .. ; Z2ED5D :; Ssc PP2YSE2P S5SYs;: s;6YZEcscc;;:.ss6SZDDES62s2s6YPHDEY55;; .; NZDDPZ66ZYDPEEPDPZDPHDNNSYHEZDDDHNSYH -Z;5.:c.DYPPZPSS656Y2Y225sSSZE6.DNNNNNHEEEEDNNP;c PNNNEYZYZYY6YNN6ZNNZZ565Y2S22;;c;NPNNYH6D;:YSc:NHc2HEDN26655526;: ssPDS6SSSS5255YZPDPPDHZ65c225655556Y6:;:s6s Ys52YSHDEDHDPDYPZYDZHEHNYZNNPEYYZD::E -;c266EYHPZP6Z2c2c6S5Ycc2;S6DNY;ENNNNNZ2ZHPZYZ6262SPYEEHNNNEHNHED5666s5EPZP5YSYPPS6P6DPYHENEEPP52YS65EPDN6P;;56s22266; 2sYYYYPPDEDPS62ccc26YEEHP65c2255555s6P5 .;: c:2cZSNHEENNNNPDDPNHNNPH6YYZ6Y66PDPDY -:55226;Z6YY2Sc2526Y2S. 2sS6ENPSEHHHHNSsZNDPZZZYPPPZPHHNHDP5YEDDEPEDEYPNNDD6ZYYDDYYZ6PPPN .2ccccccc2c2c;26EscYZccc;5S . SY626566562ccc5S556YZPPYYSS6SSSPS 2D6 sZ6cc622cS2NPZZHDHHSYPYNEHHNNPHZPDEDDNHNNY -2PZ222.EPPDPEPPDPDHSPcs6cHNNNNNNPNNEHPSENNNNNNNNNNNNHHHHHNDHNNNNEHPD25DZNNZDZPHEDPHDHHDNc2HPNNNNNNNNNNNNs6 .c2;;2cYZY6DPDPPZDPHNHNNNNNNNNND65s6ZPEZ6YPDND :6s c;ss;:: : NZ66PYEDZZHDNHDEEN6PZZZP6S6S5Y; -sEPYYYcNNHNHHEEHEHNDHZYP6ENEPHNDSHNDPPYENHHHHEEEHEEEEDEEEEYPHEDEPPPP25PYNNZEZPPPZZEPEESDZZNPDD6Y22S2DZHN6P5S25666SSSZSHHY6ZZHHNNNNNNNHHNEHDYS565SYYYYYSZY5SZ5 .::cc ;62Y2NPSYPZHENNNNNNHNNNZDEDNNZEZPZD5 - DYYYZ2NNNNHNEDEEHHHNHHHHHNPSDNDZHNHHEDEHEEDDDPDDDDEHHNEZZ6SPZYPPPNNDHNNNNPEDEPEZZHDNHYEPPNENNDHDDHDNNNNNNNNZZHEZD5cY6YYZZDPZZYYYSZZPDDN62SZYZ6c22YDPPSs6ZZDZ5SYYEE:5PYP6NP6SPZNENNNNNNPHNNZDNENNHNEHHNZ - NYEEPSNNHHEHHEHHHHHNNNNNHHEEEDHNNNNNNNNHHHHEHEEEHHHNNNNNNHNNNPDPPNHPPHHNNEHNNDNYZNDNNDN;sP6HDHHHHNHEEPPDDDNS6NNHNY6NHNHNNNNHHPYYSPDHNNNZ2YPDEPZYSZZPDPZYSSPPPEPDNN ;5s2sNEYZDPNHPEDEZEc6;2 ; 52.c :;;; - NNNNHENHEDDPHHNNNNNHHHHHDPNNEPHNY2ZEHHHHHHHNNNNNNNHEDEENHPENHZPDDNNPDNHDEEHNNPD25PYNHPNYZNDNNNHHHNNDEZYPPHNS5NNNN5;DEDEHHNNNNNNNHNNHEZYENNNNNNNNP6s5SPNNNNNHHDSZEE Y5PZNNNNNNNNPD2YsZ cs2 ss ; : -;PcDPYZPPNHNNNNHHDDEEHHDDEHEEHNHNNNNEPZDHHNEDPZPZDEEHHHHEEEEDHNNNNNNNNHHNNHHEHENNNNEHEHNYZPYPYPZDDPDDEDDHHDDDDHDPEEHHDNN6c66YYPEEEEEEEHNNNNDPSYPDNNHNEDHENNNNNN5SYP s;.2.s:S6EPDH6YNN;Y;c;s;;6256.;;;22: -6HZNNNNS6ZSEDEHHHHHNNNNNHNHHHHNHNHHHHHHEEDDDEEDEHHNNNNNHEHHHEEHHHHNHHHHHEEEEHEEEEEEEEEEHHNNNNNNNNNNNNNNNNHNNHHHHNNNNNNHHHHNHHHHHHHHEHHHHPZDDHNNNPS2.ss5PPHDDDNDSYPD ;;:Z666EZNEEN26NN 2;cSZ65ZSYP5SS6YZ2 -DZSDYHNDENHNNHHEEDDPPDDEHHNHHEEDPDPEEHNHHHHHEEHHEEEEHHHHEHHHHHEEDDDDHENHPDDDEEHHHHHHHHHHDEEDEEDDDEPDPDZZEDNNHNDPHDNNHNZ6NNHHHNHHEEEDDDEHDPDDHHNNHHEPPSYSPNHPENNNNNN 655NE2SHPNNNN6ZNNsYPP5S22S6SY25S5SYc -HDDEPNNDDEDHHHHHHHHHEHHEDEEEHDDZYZYDDHNNNNHHHEEEEDPPPPDDEHHHHHEEPPPPEDNHDEHHHHNNNNHHEHEEEEEEEEDEPDPDZPZZPYHHEHYZDZHNDN6sEHHEEEDDDDDPDDEHNNNHDPENNNNNNNNDDHD6ZHEHHNN 622NP:cS6EPNN5YHN;SDD5Yc2S6SY22S6YZc -EEEEDHEEEEDHHHHHHNNNNNNNNNHHNHHEDDDHHNNHHDZPPDHEHEDDDENHEHNHHHEEDDPPEEHHNNNNNNNNNHEHEHEHHHHHHNEHEEEHDDDEDZHEHNDDDPHNENZSHHHHHHHHHHHHNNNNHEHNNNNNEZZYPPDNEDPSZEDEENN 5scEZ6S66PYNH6YPH cSSc6:scs25ss2s56: -PDDZYYSNNNNNNHHHEEDEDPPHNNNNNNNNNNNNHHHHHDZPZENNNHEHHHNHEEHEEEEEHHHHEEEEEEHHDDDEEEHHNNNHHHDDDEDDDDDDEEEEEENHNNHNDEDPEENNHENHNHHHNNHHHHHHEDEHHHEPPYYSYZPHHHNNNNNDHNN:Y66PZNNYZZYNNEHNN 6SSc6.s;;sc::s;s2 -DNNNNNNHEDDDDDDHHHHNNNNHEEDEEHHHHNNHEDPENNHHEHNNNHEEEEHHNHEEDEHHNNNNHHPDEEEDEHDHHHNNNNNHNNEHEHHNNHNHNNNNEEEDHENNEHPZDDNNDPDPHHEHHHEEPPDDNNHEPYYZDENNNNNDEHHHNNHZPHH.5s225NDs522NPNDNN 656ZPcS256622655S; -NNNHNHNHDHHNNHHDDDPDDEHHHHHHEEEDDDDDEEEDPENNNHEDPENNNHEEHHDEEEHHEHHHNNZPPDNNNNHNZDZP6S2.NEHHEHDEDDNHHHHNEHZYEDHNHNHENNEHYY62HNDPPYHNZ6DHEDEHNNNDYs56ZNHDEPZYYYZDPZDYD66c2SS;c2:s HPNN;Pc5ZZs6.:::cssc:ss -EEEPESSEDHHHHHHEEEEHHHHHNHHHHNNNHHHNNHHEEEHHHHHHHEDEHHHEHEZDHHNHPDEENNEHPPSPYZZPYP6Z6SY:NHNNNNDEDPNHNNEEDDNHNNDEYYHNNNEEHNEPNNHEEDHNEEHNEPDEHNNNNNNNNNEYZPPZPPPDDDDYP6YSSSY:sDSHPNENN2E.cYYs6:s2s22c2scs -PNHHNYSHEEDNHHHHHHHHHHNDDDEDDDEEEEEEEHHHNHDDDHNNNHDDDENNNNHNNNNHDDDDHNDNNNYH6YYYYP;2;s2 NPNHNHNHHNEHHEHHNNNNNNEEDENNNNNNNNNNNNNNNNNNNNDZEPHNHNDPDHHNNNNHNNNNNHHHEDD6Y565S6S ;NDNNDDNN6N sYSc6cc6266c5s2s -YNNNNDDHEEDHEHHNNNNHHHNPZDDDDEDEEHHEEHHHNHDEDHNNNHEHHHNNNHYZYYPPDDNHHH6PNNsY ;sssc . : Y2 S NHNN5YS2NNPPEEPZEENN6Sc:PYDDYD265266ZP6S;:c.SEPHPYZZYYYSPHDZZYZDDHHNNHNNNNN6Y.sNDNNSYHNSN:266c522S5SS56252 -ZHEHHDDEEEEHEHHHHHHEHDDDDHHHEHNNHNNNNHHHNHHHHHHNNHHHEHHNNHSZYZEENNNNNNZDSY:6 ;::cccc2c6256. S NHNNDHDPNNDZEDZZNNNN2S; PSNNNNs2: :.22ZNYYc SNNNNNNNNHD6ZHDZPPPDDNHNNHHDEEHYPc5NPNHZPEN5DcS562552S5SS56556 -EEDHEHNEEDDDDEEHHEHPDYYPPPPDDEHHHHHHHEEDDEHHHDPDEHNHNHDEDDSPPDNHHEDPZPs6c5s6.s :.5c666S :s:2 S.D6NHHEYYY5NNNNDDNNYPs Y6HNNN;s s;ZN62; 5NDHPSDNHEY;5PY6S6SZYHDNHDEDEDHZDZYHPDDNNNNsZSP5S255265665565S -DEDHHNNHHHHHHEEEHEHEEEDEEHHHHHHEEEEEEHHHNHHEEDPPZENNNHYPZZ6YZY66:s65ZZ;5c2s5:c::;:cscs;s .;:;.; 5.P6DZZYDZNNNNDEDHZEZYDYDDZH262ccss:s2. 22SPSS62566666SPY6S6SPZNDHEEEDDZDSZDPNNEENNNN2D5Y5SSSSSYSS6S6YSP -DEDNHNHHHHHEHHNHEHHHHNNNHHHNNHHHHEEHHHHHHEPDDPZPYDHDED5YSY6SY625 :62PPs522sc;c;scsss;;:;ss;;;:c:5;6sZ6PPS265c6:s.::csc: ;s.:.:::::.. ;;;;;ssc;:::ssc2cccs2PZNHNNNNNNDEc6YSNEPPDZNNcPs5c222665656S6ZSZ -HHHHHEDHHHHEEEEEHHHHHEDHHHHHHHHHHEEEEHHDPZYPEEEEPENHEPc6s2s26522.;2s22 .::.: . . ;:.. . : : ;.22sc:s.:;sc2:; ::;::. .::cDZNHNNEHEEYP6YS6NDZPEDNN2D5Y222255252222526 -NHHDEPPHEHHEHHHHHHHEEEEHHEEHHHHHEHHEDDDHNHHHNNNNHNNNNH6S:cccccscssss : :. . 62NDHDPDZPSPZDPPNHDEDDHN2P5YZZZZYYSS5655222 -EEEHHHHHHEEEHHHEHEEEEEEHHHHEEHHHHHHEEEPHNNHNNHHEDENNNH6Ys252scss62c2 . . ::::sssc:: :s ccNDNNNNNNNNDDYZNEPDDDPN:Sc5SS666666666S665 -DEEHHHHHHHHHHEEEEEEEEEEHHHHHEHHHHHHDEDZDNEDEHEEDPPDPZY:22252.;::S2s2 . .. . . . . .: .::;sssc2S5:2YSNHNHDEPDYPHHPPNNNNNNENcZ6Sscccsc22666S6Y5 -EDDPPPZHHHHHHEEEEEEDDDDNNHHEEHNHHEEPPYSPEDPHNNNNNHHEZS ;2c2: ZY25 .: .s266SZHZ:2SZNEHDZDPZ26YZ55NDEDEEDN;Z6YYYSYSSS6S625;c: -NNNNNHHEEEEEEEEHHHHNNNNY6ENHNEDHHNNNNNNNHHNDPS2525S5s2 s225666ss . 26 : :: . ..:. ::s2YENNNNNNEPPYYYPDP55SSNHPESENNc555NEEENNNN:S.;6S6S2522656S266 -EEEEEDEDEEEEEEEHHHEEEHNPYHNHNEPHHHHEDEHHNNNNNNEHHNNNDEs666YSS6:; . ; 2c22sccs62SS.:..:.2;6556c626:; . ..;:56SYZPPDPPZZYSYY6:sss sZYNNNN2SDPEEEDNNHNDEHNsP5S22c2cc2s5266665 -HEEHHNNEEHEEEHHHHHHHHHNPZHNHHEDEHEHDPEEP6PHEHDYPPDNHYY ;:;cc2c:s .ss66PYc2Y6EPDP662262YYccZSPYPYEDNNDNSP6Y26c2s2;c.: :.sc55YYZPDHEHDDZS5ss:: :;NDHHs66SNHHENNPEYPDNsY6Y25252265S6S6SSS -HPDPPEEEEHHHHHHEEEHEEEHDPHNHEEDEHDEDZEHEDNNNNNNNNNNNPP ; .::....::cs2cc2225265SSZYPZDPDPHPNNNNNNHENNPN6YYP6Y25c5;2.; . s;66YYYSSYZPZPS6c;. . :sNDNNYDHDPPPPNHZDSYZE;65S566S66666666666 -HPPPPPPEEHHEEHHHHHHEEEDHEHNHEHEHNDEDZHNEEEEEHEDDHDEPsc .....:ssYSEPZZc6PZ66c22266ZYZYS5EYHDNEEDDDDEPD66ZD6Y6S6Sc6;s.:.. . . :.cc66SZYYS62s: . .. s66NHNNSZEPPZZZNNENPDENsY6Y26662556cccccs2 -NHNNNNNHEHHHHHHHHEHEHEDHEHNHEHEHNHHDPHNNNNHEPNNNNNHH6Y;s ..:sc2ZYDPZZ2522sc::. s::.;.2s22cccs6SSZ5S6SSY6Y25scss:...:.::s;cscccc .. :sNSHD6YDPNNHHNNENNNNN5D6Zs2555626c2cc526 -EENNNNHNHEDNHHHHHHNDPDPNNNNNHNNNNHEEDHNHEYcc;5ZYES22 . :;sss:. : .. . ;.c2:; ...;s:s.: ..:.;:;sssss;;:.SPNNNNNNNNNNNNNNNPP62 .N6NNENNNNNDHNHEEEENN5PYP2666SS6Y5666YSY -NPN2sP2NNPZNNDPPPHNZSHNHHHHEEDPPPDDHHHHHNNNNNNNEHSsc :;;;;:... ..... . .::::;::.. 66.::;sssc;s.;:::::;::. cs25c:ssc2s:ssZNNENNS YNE2ZNEPYcc H6NNSYZYNH56c2PP25HN.6PD56666656c2222c5 -N ;. 2 NNDPNNNNNHHNDDNNYSYYSYYYPPDEEHHNHEDEPZZZYP5;s ::ss;s:;;:;;;;:::: s:5c625;DYEPNNNN2Yccs5.s:;;s;s:s:;::...:.. :.:;:.cs6Y6SSY6s22ZNEPYPs :sYYS6:; 2 NZYZDDNNPEPPNN6YEN sss56666S562555226 -N 6cYsDDccHPNNNNNNPYEHHHHHNNNNNNNNNNNNHNHNDZYSSZ2;c :s;::::....:::::::. ;:52PPNNNNNHNNNNNNNNHNNNYNs5s2s2;c;s:;::::.... :.;ss:52ZDPD2s :2ZNZ5c ;5s :2s.: NPHNNHHDYPPPNNZDNN.S66SS6656256655565 -N 62Z6PPc55sNENNNNNHHENNNNNNNNHHHHDPDPENNNEPY5662;s ;c; . :.::;;:;65ZSDPYZsc . . NYDP;c5H .ND6ZcY;2s2:s.: . : ;s;:ss562226; :5 5. .:s. NNNNZDNNNNNNNNYPNN 666666S56556556562 -N 2s;66SYc6 5cZ6NNNHHHHHHHHHHEHHHHHHEEDHZS5;s;:.: ;: ..::s;cs2c22SSPZDP26 . NDNNNNYN : SSZN.s : : .c: s5 ..:. NEZZs5NHHHEEHNSYNN2PPZSS5S2552S66S262 -N 6 6Y cS : 5;NNHPHHHHHHHHEDDEEHHHEDDNDZ6;ss:.: ;. ..cs5266S5s;:: ..::s;s.. 6S ;;c2;DD;c.s : ..:; . :c . .:c; :cs:. . NS66ssS26SZZPDc5NN;YSSZZ6Y2665SSYZSY2 -N5N 2 c s;s:;.s:6sDZEDHHHHPZDEHHHHHHPZDNEDY5c:;:. . . . . .... ;:;::.. :: :; . .; . :.:;.:.. . . :c: .......: . NZDDDDNDNEYPHNSYDH cssSS5S222255c2222 -NDNcE ScS665S5Y;NNEPHNHENNNNEDNNHHHNDY5;;.:.. : ssssss;:...: . . . ;::: ... .::::.. NYDPZPNNNNZDNNEHHN:S66SY56566625sccc5 -NENsP s PcDDYZ65ZcNNNDNNHEHEDDPYENHNEDY62:;.:....... . ;.s;;:s;;;;;:;:;.:.: .. . ...... ........ :. N5S6c5DZNNPENNYPNNcZYY6S5655665S25526 -HENSE5N c. ZsZZ2S . Y6NHNNY6YZENNNNNZZ65cs: . ...: NDNHZZ55NNPDDE5SDN:625c2sccs22c5scss5 -HEHENHN ; S;PPZDs6 2;ENNNNNNNHDHNEHZ62c; . . ...; NDHHSZYSNHPDHH5YPH 22225c22c5226s2cc2 -HEHNNNN 2:S6PDYE YENNNNHDY6ENNNNHYS2:: . ;:;;:::....:.: . . :s NYZZs5EPNHYZNNZEZN 2S6562552S626c5cc2 -EEEEEEN ; 5D6S62 s2SYPDDDPZEN5:ZNHP5;s:;::...:;;s;.. . . ::.....:.:.:.:.: :s . . . NPZZ;2PSS6:cNNNNPN ;YS2622226626:s:;s -HNNNNPN . 6ZScZYY6S2DHNNNNNNNNDEPDc . ; ;:.. ..:.:.::.:..:.:.:::: . :s. :.. NYNH26PSPDYYHD.csY c55scscssssscs2sc; -ENNHNNNcD;Y ; ss;s ..:.2566PYNNNNHPZYDNHEDH5 ::. .2; .s::. . . .....: . .. . . ..: . : :. NPHE2SNNNNYPNNYEDNcY6S2525222c2222c2s -PNHHNHNPNYN .SPHNNNNNHHHNZ;cs. .s;::::::.:.. . .....: : ;;;s:s:;.: . .:. NS66:cNEDD5SNN6DPN:5sc2525c2222222c2c -PHEDEPDHNNN c :s :.ss52ZPPEEENNHZYZs ... .......: . . . s.22;c:s.: ... .:::. : NDYZSSNEHHYPNN2PYH.52225c2s2ss2cccc2s -ENHEEDDHHNN2H:s s226652c; . ;s6DDPNNNNNNY s:: . ....... . : ; 2;26:s.s ..::.. ..;. .;5;NNZPNEDDNHPDNNcY6P 25222s2;ssscsccccs -DNHNHHNEDHNNNYP26 s ;;PEZY62PNNNNNE2Sc2:;.:::.... . . ; 2;5c22c5 s : ...:... s ND2SNNDDEDSYNNsY2Z ;::52s2;sssssccccc -ZDPHHNNHHZYNNNNNNNN :scs:: scc5s c6ZDNNE66c5sc;ss;;;::.:...::. :. . s S2SS56s2.s ..... ;. ..;:::. s: ..:S;NESZNNNNNNPENNZNPN:Ssc66c2scsc2222522 -HHEDDDDPPNNNNHHHNNNNNNNs.;5 .2; sss256c:. :2PPY6:;.:::::::::::...:::::::......... : c:5s5ccc:;.;:s.. :;:;::;s:.::scss: scZH62; ... ;. ;NDNNZPNDPPNNHHEHNNSN;Ss2;scc5522;s::s;c -HHHEHEEEDNNHHEEEDHNNNNNNNNNNNHN6;25: ::;css:.. ..;2scs.: ....... . . . . s 2;cscc;s;s;s :.S5NHNNNNNNHNS666552cs;;:;::s.. . . : E2EY26PZPDNEEEEEEN6H:6s2sc2222c2scscccc -EEEHHEEDDPPEEHNHNDDDEHNPZENDEZN; :;. ;;;c;;. .s;ss:: ...... . : s::; . . :.;.c:6s6522.: ;;;;. :;:: . :...:. ;sNZNHDENHZZHEEEDDEN5E:6c5c222c2c2s2sssss -EHHEEHHNNEHEHNNNNNNEDEEEENNNNHN2.;;::;:;;:;:.. ..;:;;:::::::......... .. . . :: . ss:: :.; .;:; ssHYNHEENHZZHEEEPDEN2D:5c2scsc;sss;s;s;s: -HHHHHHHNNEHSYS6ZYHHNNNNNNNNNNNNc sc;s : ...... ss;;;;::::................ ... ...:... . . :.s:ssss;s;s:.;;sssss;ssssss;;;;;;::.. : :Z5HYDPZZ6SDPNHHHDHPN5E.5s2ccsc;s;;;s;s:;: -HHHHHHNEENNEHZSYSHHNNDPEHDZPDDN: s52S; :cs;::.. :......:.:::::::;;;:::::.:.:.. ..: : ::;;:;.: c2cscc562c;.:.c5s;ssss;::.... . .ssEYNEHEDD6YDPNNNNHNPNcP.2c255c2scccc2c2sc: -NHHHHHNEDHHNNNNNEHHEHDDHNHEHHNNYS6Y22;.s2csss;:. ..:::.:::::::::.:...::::........:; . ... :.:.;:s;;s;s;s::ccssss;;::. ::sccsccsss;;::::.. NZEPEENNEHHENHYPNHDN6H.5scSS26252222c2sc; -HEHDDDDHHHHDEEHHHEEEEEEEEEDEEENHNSS:.::;:;;;s;;:.. . ..:;;;;;:::::.. ... :::s :::... . . . s;cs556656sc.: :::::::::::..... . NZPZDPNNENHENHc6NNDNZN:622cc;c:;.:::::.:: -EEEEEEDHHHHHHEEHHEEEEEHDDHNHHHHNNPHc:ss;.:::;:;:::::::::::::::::::::::::::.. . ::::.:.: . s:5266: . .: .;s;::::s;255655: .::;:::::.:;. .NPEDEDPP26c2DP56HD6Z2D s22;s:s:;;;s;csccc -EHHHHNNHHHHHHHHHHHHHHHNDPHNHEEDHNHN2;:::::::;;sss;;;::..........:::::::;;; : . s:;s.: : 2s5c2scss;6665cs.: ..c2YZs:s;;;ss2556cc::c266SYSS5c;:. . . :22NDNHNHEE6SS6PPZZHHYPPN ssc66562565S6YSYY6 -ENNHHHHHHHHHHHHHHHHHHHHEENNHEEEHNHN25. :;;ss;ss;;;;:.. .::..:.::::::;:;:;;.:..:.s;;s.; 2c2s5s5s5s2;s;;:;:cs65YYSYSSYYYYYYDDNNNNNNNNNNDP625556552s;:. Y2ZYHPNHNNPENNNNNNNNNNNN Y66c2scsssscscsccc -EHHDEDDEEHHHEHHEEHHHHHHHNHEHHHHEDHNYH: ;s;;;;;::;::::: .:::::...:.:.::;;::::::;:;;:;.:. s::.: ; 2;Y6EDNHPZEDNNNNNNNNNNEEDPHEEHDDY62c:: ...::::... N625PYEDHHZDNNEHNHDNDPNN 266s2c5sccs2c2c2cc -NNNNNDDEDDDDEHNNNHHEHHHNNZ6ENNNZ2PNNN2 : .:;::::::;;;:. ..::::..::s;s;::.. ... :.s:2s5c5266S6DD66s:: ;;;c:s:;. ss;s .:. ::s:. :ND6YHENHNEZPDPYZNNYD26NN .YY;cscsscc2c52522 -ZZZPDDEEENNNNDPZYEEHHPPENEPDDDHHDNNZH;:s:scs;: .:s222c;: .::;;:;::.:::::;:;:;;;;;;;s;;::cccs2s6265c2:; ;;.:..:.::.: . .::. ;2ZNNNNDYS65SNE:cDDNNHNHHPNsY6Ss5c5sccs2c52522 -HNNNNNNDDDDPDPPDDHHNNNNHHEEEEDDEENNHNYP2 :;;;;::::::;;cs.:;;ss;s:;::::::;:;:;:;;;s;;:;::.. . :.:: : . .. . ......... . 2SNHNNNENNNNNNZZ:s;c:6:556:s.; ...:.s:s;s -NNNHNEHEHPDPPEEEHDPDDNNHNHHHHEHEDHNNNNNY.: . :;:;. .:cs;ss;s;;;;;::::::::;:;:s;;;:;:;::ss;;:::::; : . . . :.;::;:;::::s;ccc2c2cccccc;;:. :;:;::. EZEDNHDZHEDEZDDH6D c ::;:;.:..:.;:;;; -HHHEHPDNNDEDPHHEHPZZSEEHNHENNHHDPEEHNDNZ6s. :;s;.. .;;;;ssss;;::.:..:.::;:::;;;;:;::::;;::::.: . . :.;:;;;;;;ss2c252522csssss;;:.. :s;s;:: ::HPHDNNNNNNHN5D 2:;c2scsssscs2c22c -EHHHNHNEHPPDDEEEHDDEDHHHNEDHNNNEPPZPDYYPNYc; :ss;;....::;:;;:;.:.....:::::;:;;;;:;:::::.::::.: . . :.::::;;sssscscc22c2ss::... :::.. ..:;;s:.. 65DPHDNPHHcP 2c2c2scssss2sccccs -EHHHNHNPPDDDEEDEENNNNNNHHDPHHNNEDDDEHDPENDP6:;.: :::;:::::::;;;;::::::::..::::;:;:::::.:;:c;2c25s2;c:;;s::s;cscccccc226622552522sc;;;:::::.....:::::... DSNNEN;6ssss;s;;;:s;ss;s: -EEEEHZZHHNNNNEDDDHNHNPYHNPSPPDHEENNNNNNNNNNPY2 . ;scs::;;ssss;;::;;s; .:..::;;;::::.: . s;ss:s.: . ::::....::ss:::;;;:: ...::;;::... : 5sPD5YSS52cs;:::;;:::.: -HHHEHEHDPEDHHHNHEDDDDEHEHNNNNNNHHDPPPPPENHHNN2 s5c:::;2css;:::::;;ssss;s2ccc.:..;:;;:;sss;;:::.::;ss22sc;;.. . . . :5ccs:: s:S5S652cs2c6 -EEHDDDEDDEEHHHNHHHHNNNNHEHHHNHNHNHHHNNNHNEDPN2 ...::..;;ssssss;;ssssssss:;cssc.;.:;::;::::::::.; : .....:.: . .....: . . .:.:::. . .2;;;::.: . : 2s65Y6ZSY -HEHHHHHHEHHEEEEDDDDEEEHEEEEHHHHHHHHHHHHHHEEEN6 ;s: . .;:.:::::;;;;;;;;;;;;cssc:s::;:;;::s;ss;s:; : . . . ...; .::;::::... .2sssccss:; : c -NHHNNHHHHHHEDEEEEHHHHHHHNHHHHHHHHHHHHHHEEHNHNP2SPs .::s: ..:::;;;;;;;;;;;;cscc;s;;;;;;::ssss;s:s : . .: . .::: .::;;;:::::.:2scccccc;s . -EDDPPDDDDDDHHHHNNNNNNNNNNNNNNNNNHNNHHHHHHHNHNHDDN5 :;;;;;;;;sssssssscccs::2sccscsscssc;s.:::::.; : . . .. . .::::;::::::;;;;;cscc2c22cc:s.: . -HPDDPEDNNHHHHHHHNHNDDYSHHDPPPPPDEEHEEEEHHHNHHNNNN6 .:: .;;;:.. ..::;;ss::2s22ccssccccsc:;cs22c2;2:s:;;;;;::::;;ssss:: :; ::ssss;;:::.::;;;ss2c22225222c2;csc -NHNHHHEHEEEHEDDDEPPYY65PPDDPZPPPPDEDEDPENNNEPDDENS s .. ......;:cs2ccccs2cc2sc;;s;ssscsc;s;sssssssssss;s;;::: c2ss;;;;;;;;s;ssssssss;:::::;;;sscc22525565665525:s.: -EDEPDDPEPDPHEEHEEEHHNNNNHNNNNNHHDHNHNEDEHHNDYY6ZNZ55 s: ..::;;;;::.. :.s:s;;;cs5c2c;:c;;;:;:;:s:;;s::cscc22cc:;::::;:ss;sss;;::::::::::;;;s;;;::::;;;:::s;s;sscc5255c2;s:; . -PYZ6Y5cNHNHNNNNNNNNHHNNHENNHNHHHHNNHNHEDZDNHEEPPH5:s ;: ...::::::.: . : :.:.;.2s2cc;EPPPYZYZ6Y562522cc225525c2cccc222222222222222ccc;:::... ..:::;;sscccccc22S66626s2cc;s : -NNNPD62HEEEHHEHDDDDEEEHHHHHHHHHEEHHHHHEEEHNNHHEENZSS s.:.::::.::.: . ..;.;:::c:6cY6S2EPPPYZYZ6Y6S2525sscs2c2222252556cscc22222522csss:...... .:;;cssc2ccssc2c656655;sss;s:s : -PNNNNEDHDDDEEDDDDDDDDEEEEEDDDEEEEEDDDEEHNHNEDDPENEEPs2 ..:::::::::...... :.:::.s:6s65522cccc2c2scscscsc;;;;;;ssssscsssc..:::::::;:::...::::::.....::;;c; . . ;:;;.;ssccc2c2c2sc:;.. -sEPHNHHNENHHHHHHEHEHHHHDEDPDPEEEEDDDPEEHHDDPZPPPDDND66 .:::::::::::::::: . :.. : s:s;::::::::;;;;;s;sss;s:;::::;;;s:;::.....:..........:::;:::::::::;;s; :::::.:::s;:;.. .....: : . . . -YNNNNPZHHHHHHHNEEHHNNNNEEPPPPEHEEDPDDHHEEDDDHNHHPDEP65 : ;;ss;;::::::;;; ;:s;::;:s;;;. s:;:;:;:;;scc2225625cccssssc;s::;;;;:::::.:::::; .:::::.. ...:: .::;:::;;cs;; ..:::::::::.. -PDYPZDDEEHHEHDDZZS6S666HNNHHDHHHNNNHEDDPPENHHZ266ZNHNHSS . ::cs2css::sss;;;s;s;;:::;:s;2s52666625scss::::;;sssc;s:;. sssssssssssssssssss;;;;;s;;;;:::. . -6S2DZNHHHEHHHHHNNNNNNNNHEEHHEHNHHHHHNNNNNNNNHDYDHNNNNNNE ::...:.;:s;;;;;;;;;;;s;s;s;sss;cscs2c5225c2scsc:::;;:s;ss;s:;. ;;;;;;;;;;sss;;;;s;;:::::;;;::::;::::::;:::.. .... .. -YYSHPNHEPYZ6SYSYYDDDDDDEDHHNNNNHEDDHHNNHHEDEENNNNNNNYZ52 .:::::.....;:s;s;s;s;cscs2ccc2c22cc22c2scsc;ssc;s;;;;;;ss:;::. ::::::::;:;;;;;;;s:::::.::::::::: -DYS655cNNNNNNNNNNNNHNDZNNNNNNHHEDEEEEDDDEPPEHNNNN6 ;:;:.: .::;:s;s;sscs2c2222222222ccssss;sssssss;s;;;;;;:;::..::::::::::;;;;;;;s;::.:..:::::::: . -DEEPPYYYYYYZYDDHHHHDEZYEHEEPPPZDDNNHNDPNNNNNHED2. ::s;:;:.:.::;;s;sscscs2c2222c2ccscsc;s;s;;;s;;:;::::::::::::::::::::;:;;;;;;;s;;:::::::::::::::::.. -DNNNNNNSSSSPPEDNNNNNNNNEPPDPPYYZYEHHNDEHNEY2 ::s;;;::::::::;:;:s;sscscc22scccscsc;s;s;s;s:;:;.:..::::;;;:;;;;;;;;;;;;;;;:;;;;;:;s;;;;;:::. -ENNDDc62ZPY52sss;ccSSZYDDNNNNPY5c5SZHNN5 ..:;css;;:sscscs::::;:;;s;ssssss::;;scccsc;s:;;s:;.: . ::;;s;ss;;ssss;;:;:::::;;::;;ssccss;;::::::.. -PZSEHNNSP2:NNY5ZP665cPPNNNEHNHNNNNNDZ Zc : . ..:2csssss;s;s;s;ss22ccsssssc;s:;.::::;;ssss;ssssccccccss;;;;;;;;;s:.:;c2cc;;:...::: . -SHPHEDN2Y6:NNPYNNEHPZZY5255ZHDNPP2s .P5.: c;cs:: s:::;:;;s;cscccsccscscssscsc:s:;:::::::::.;;s;ss;;;;;s;;;;ssssssccss;::;;ssss;:.. -6NNNNNNSZD6NNHDNNHNDEZZDHNNNNNN: .65Y5:; s:2s;; .s;;;s;sscscccccc22scscssscsc:s:;::::::;:;:;;;;ss:;;;;;;;;;;;ss;;s;:::.:;scccs;:. -YNHNNEN66D6NNPSENYSENDENNZ2 .;Yc . . s:ssss2ccc2ccccccccccs22s2scssss;s;s;;;;;;s;sssssssssc;;;;:::::::::::::.:ss2c2cs: -Z62522666HDHHDYNNDDNNNNZE . : : cscccccs2c2cccccss;;22s2:s;;;s;s:;::sssssscscsccccccssss;;;::::::::.s256SZ65; -P66Y6EN66EEZZZ6NNPDEN c:s:.. ..;:s;s;ss;;s;cc;c:;:::;:;::::::;:s;s;;;;;:::.;;;;;;s;sscc22225522cs: -PYZNDNN56SY56ZZNNYP:c 2;s; : ;.s:s;sssssc;c:s;s;;;;::::::;:::s;;;;;:;;:;;;;sscc2255666S22s;. -E6SYSDEYDYDDHEH25 : c:;;;;;;:::.;:c;2c2225;cs2:c;s::::::;;::;:;:;:s;ssssssc2cc222256665222ss;:. -NYP66SZ6D6EcS : s;ss;;;;s;s:c;2s525526;2:c ; . :.;:;s::::::::;:s;sscs25c2ccccccss;;;;:;::. -NHNDHPHZN.5 :.:.::s:;:c;5s6566565Y:c:s ; . . ;:ss....... :.;:ssccscss;;;:::::. -NHNDNDN:Y . :.;.c:2s6255c2s2:s:s:s:s:;::::.:..... :.:.::;;;s::..... . . -DZH6DcN : : c:2s52c2;2:;ss;c:c:s.;.: . . :.:::.::.: -EPNZN6N s:; s.2s6525;2::52;2.s . .. : ;:;;ssss::.... -NYN s.6s5cccs2:s S5:2 ; ....: . . -N S s.Sc65c5:2.; 65:c : .:::: . -N ;:; 6;PS6Y s .;.ss.s : ...: : . .. . -N ;:. 2.Z66Y s cc : : . .. . . .. -N ... ... : s 62c5 ;..25 .. . . -N . : : ;::; : . :; -N ;P662;: ;:2css .. . -s : 6NYs. . . ::.: . ;s . -c ::;6: . .. . . -c ;c:; . .. . -2 :c. . . .. . -c . : . .. . . -5 cD: .... ;:.. . -6 cD: .. ;:.: . . -2 6EHN2: .. . :. . . -2 ;;66PE6Y. :. . . -5 scSZS625.: . . . -2 ; 5555ss;s.: .: -; : sc26255Scc. - . sc26sssc:: . -6 . ssc5;; -S . . :.ssc6sc. -6 s:ccs;c2c2;s.. -D c;22ccc2ss:;.. .. -N 222222ss::::.. -c cc::c5;;..::.: - 56s;sc.. .::; - ; YSSY2256c2;: - s 56ccccc5ss::. - 5c6Y;;scsc;s::. - 666Z::;s;s:;.. . - ; 665S;c:;::::.:.. - s DH52cc2Z ....:.. - 6 PEcscc5Z. ..... . - Zs55sc26 .:s;;:: . - Zs6Yscc6.:...:.: . . . . . - Pc6Yccc6.:...:.:.. ..................::: - Ps6Sc226:s:;::.. . ..:::.::::::::: - Pc6Yc22Y:;:;::.: . . . . :.:.::::::;;::: - D5SYs22S:;...:.. .... . . ..:.:::::: :.:.;:;:::::: - ; ZsYZ26;2 .::::.:.. :.....:.:.::::::::::::::::::::: - ; S:YZ6Z:; .;;::::.. :.......:.:.::::;;::::::::::::: - : 6:SS6Z;c:.;s::::.. . ....:...::::::::::::::::::::::;:;:; - : 2 662S;2::;s::::::.. . . ..:...;:::::::::;:;:::.::::::::::.s:s - . . c 525S;c::;s::::::.:.. ....:::.::::::::::::::::..::::::..;.s:c - :. ; 2s56s2;;sc:::;::.:.... . . ..........::::::::::::::::..:.;:::..; c:2 - :. ; 62SYc2;;;s .:;::...:. . .....:::.::..:::;;;;;;;:::...::;:ss:: . c:5 - .: ;:;;. : 22s5;:s2:;. :;;c. :;;;: .. . .. ::5SZPZYZZ62c;;;::. .;::... ;: :.;; . :.s:2s2s2 - . : .. ; 22s2;:sc:s. :::s. .:.:. ..:.;.cs56562sYDZYS665cs: .:.........:....::.. . :.:: ...:.:.;.c;csc - : .. : 2cccs:25s5:.:::s. . :;.. :.s;cs65YYSS65s:;ss22656652c22s..::::;;:;::.. .......:.:.:.:..:..:.:.;.;.s;s;c - :.:; : 2ccc2;SS5Ys:;:;s:...:;.. . . ::s;2cSSYZYS65666SSY6652s:;.. .:.::;:::.:.. ....::::::::::.:.::.::;:s:s;s;s - . s:;s..; 2s2c5sYSSPccs:;s:.:::s. .... . .... .. :.c26YYYDHNNNNHEPY65c:: ...::::::.. . ..::::::::::::.:::;:;:s;s;ss; - : ;::s . s:s:c:Y6PN2c;:;s;:::;s. .:...... .. . ................ . . .. ..;ss;csc55S65566S666ss::::::::::::::::....:.:.::::::;;..::;:s:;;s;::; - : ;:.; ;.;.c:S2EN62;::;:::;:s .:.... . . . .......... . ..:::: . ..:. .;::. .;;;;;::::::;:;;;::::......::;:;;.::.;:;;s;;;:;; - ;::; ; s:522:6S6Y52:..:;s:; .::::::::::.:..:. . .... . . . .....:..... ..::. .:.....:;;::;;ss;::::::::::::.. .::;:::;:;:;;s;ss;ss;sss;sssssss - . cs;s.; ; cscs2c2525ssssssss;;;;;;;:::;::::::::::::::::...:.... . ..:.:.:: . . . :......:. ..::.....:... .........::.:.:.:;::::::........:;;;;;;;;;;;;:;::.:::::;;;;s;;;sssss;sscscsccccs - . : 2c:s ; . s:cc:.sc5655ccssssc2s;sss;;;;;:::;;::;;;;ssssss;;::::.:....... :.::;; .:.:.::::::::::....::::::::....:.::::::::::::::scsss;;::::::::;;;;;;s;ss;sss;;s;..::;;s;sssssssssssscsccccccccc - . : cs.s : s.26:.ss256652s;ssc5c;;;;;;;;;;;;;:::s;;sssssss;s:;::::.:.. ..;:;:::::;:;;;;;;:;::::::::::::::::::;;::;;;;;;;;;;;;;s;;;:::;;;sssccs:;:;;;;::::;;;:;.:;:s;ccccccss;s:;s;s;;;s;ss;;; - . . 2c.s : : 26:::.:.ssc2cccsscsscssssss;;;;:;;;;;;;;;;;::::::::::.: . . . . : s;;:;;;;;;;;::::;;;;:;::::;:;;;:sssss;;;s;;;ssss::......::::;;;s;:;;;;;;;ssss;;ss;;;;s;ssss;s;;;;.:::;:;:;;;;;;; -...... S6;c s . sc:; .:5SYZS52cssssss;ssss;;::::::::.... ..:::;::::;::.:....:.. ;:::::::::::::. ;:::........::;:sssssss;;;;;;;;;::;;;;;;;;;;;:;::;;;;;sssccc2cc22ccssss;;;;;;;sss:;;:s;sssssssss -: . 5c:c : cc.; ..;;22YDS5566S66552225265ccss;;;;;;;;::::;;.::::::::::.;.s;s;s;;;:;::..: sssssssssssssss;cssssssscsccccccsssccc222ccsss;:;2222222cccss;s;;s;;s;s;;:;:;:::::;;:;:::::::::: -;.: .. 2s.c . c2;c. ;;SP62252522css;sc262c2ccccscss;s:;..;; :..::::..::s:s;s;2s2csss;s;s;sscsssccccsssssssscccccccc22222cccccccccccccccsscsssscsss;s;;:;:::;;;;;s;;;:::::::::::::::::.::: -;::... S5;5 : s;25;:. . . sS6S6655222c25565c2ccccccccss;s:;ss:;.:;;:;:::.s;;:c;2s2c656566SY222225222225222222522222252222226Y66522ccscc25562.::::;;;ss;s;;;;;;:;::.::.::::::....:.;:;;s;sss -. S5s6 : . c2;:. .. . :Z6SSS6S6255555652222ccccccccss;sss:s:;;;:;.::.s:;:s;2s2c2c5265SS6666S6SSSSSS6SSS5252222522222552565552222ccccccccssccccccccscsccs.:.: :.:.;:::::;:;:s;s;sss -: . S2s6 ; ::........ .5ssc2c2cssssssccc2ccccccccscss;;ss:;.::;:: ...;:;:;:s;;;;:s:s;ccssccccccccccccc2cccccccccc22ccccs;sssccccccss;;:;sssscsss;;::.:.:.... . . . :.;:s;;;;;;:;:;:;:; -; : 6cs5 s ..:;::... :ssc266S56522222cccscssssssss;s:;;;.; .:: . :.... .... . : :: . ....::::::::..::::::;:;;;;;s:.:::;;sss;;:::.:::::::::.. . . . .... :.:.::::;:::;:;:;:;:; -. 5ss6 s :;c2cc:. .;s: ..:cc6552sc;s;sssssssssssscsc;sss:: . . . :: ...::::::; ......::::. ..:;;: ..::::::;:;:;:: ..::;::.:::. :.;:s:s;s;s -s 2;s2 : ..:;.. .:.. :s2ccsscccss:s22ccss;sss;s:;.. . :: . .. ..::::::::.:.. ::... ....::::;;;sssssss;s;::;:;:;;:::: . :.:::..:.::;;;;::cs:; : ;.s:;:: -: . . 2;s5 : :;:::.::.. :ss5c2cc222ccss::::.:...:.. . :: . .. .:.. ..:::::;:::;;;;ss;;s;s;::;:::::::.:.... ::.:. : s:c;ss; - .: 6ss5 : .:::;:;.: .:;ss2c2cccccssss.:::...... . . .. . .. .. . ..:.::;;;:;;;;;;;s;;;;;s;.:::::::.:...... . . . . : s:s;sss - :s 6cs6 : ::;;;s::. ;sssc222c2cscssss;;;;;;:;::.:.::. . .. . .. .. . ..::::;;;;;;;;;;;;;;;;;;;;;.:..:.:...............:.:.;::::::.:.:.::;:;:;:; -.c2.: S2sS ; .:;;;;::::;ss;scc525css;sss::::::.. . .........: . .... . . . . ......:::::;;;;;;;;;;;;;::::::: ... . .. . . . ::....:.;:s:;::::.:.: - ::. c Z62Z s ..:s::::;;:;;:;sc6562sc:;;: ..:.. . ..... ..:::::::; ....::::...... ....:::::::::;:::::::::::::...... ... . . : ;:;;:::.::; - s PY6P c . :;::::ss;:..;;c65S2ss.::::;;;:: . :.... . :.:::;:: .::::::.: . scss;;::.. ...::::::::::::::;:::;::::..... ..... . .. :.:..... :.;:::::s;s - ::. 2c ; ; . :ssc;.::s2s:;.;cs2cccsc2c;ss;;;:: :.::;;s;;;::.. 22;s.:..;:ss;s;:;;:;;;;sss;s;;s;;;;;::::.:... ..::......:.. :.... . :::::.:.:.::;:::: - . ; 65:c ; :;;s. :.;2s;ssc5262c2sccs :::::::.: .::::::::;:;;;;s;:;;:s;:;::;:s;;s;;::s;;s;;;;;;;;;;;;:::::::::::;:;;;:............ .... . . ..:.. :.::;:::::: -. ; 52:c : :;;s: :::;;:;;;sscs;;::;: ..::::::::::::::::;:s;s;ssssss;;s;sscs2cccscssccccscscssssssss;;;;;;;;;;;;;;;s. . . . .. . :.....:.::::::::::: - . c;:; . :;;s::;c: :::;;;;;;;;:::: .::::::::.. ..:.::;:s;sssssc:;ss2ccccc22ccsscc22c2scscscssssscssssss;;::...:. .... . . . :.:::.::::::::::: - ;.::.; : :;scs;c5; ;sc2ccccc2222cccsss;;;:;;;;::..::::;:;:s;ssssc2sscsccc2scssssccccssscss;s;;;;;;ss;s;;::.... .:...:. ...:.::::::...... . . ... :...:.:::.::::::::: - c:s;sc;s . ;sscs:s5; :sc2ccccc2c22ss2css:;;;ssccscss;;;;;;s;s;cccsccsscc22s2:;::s;c2ssss;s;s:;;;:::;.:::.:::........ ..:::::. ...::::;::;::.:.... . . . :.:.:.::::::::::::: - :: ;.c;cc;s:: . . ;s;::s. :c;s;:s5cccscS522ccccsccc2222ccsccs2cc2ss2c66s2scsc;s;;;;s;sc;;:;:;:;::::::.: ... ... ..:.::::::::::::::.::: ..... ......:.::::::::::::::: - .: : s;:;.::; .:;;:::: .5ss; s6cccc2Y66622ccccsssssc52sccc5222sscsSSs2;c:s:;s;ssss;s;;:;:;:;::::...: . . ...::;;;;:::::.....:: ........ ..... ;:::::::::::::: - :; : ::;;:s . ..:;;s; s6ccs.s6cccsc52222222c222ccsc22cccc22c2sscs25:c;c.;::::;;:;:;;;;;;;:;::::.:.: . . ...::;;;;::::::::::::::;; ..... . ......::::::::::::::: - .: ;:ss;c . :;. :2::: ;6cccsscc2255555522c2ccccccc2cc;ssss;c2.;.;.:.....:.... . . . ... ..:::::::;:::::::::::;;::;; ..... . ......::::::::::::;:: - . s:sc;s.: .; 2: . ;6c2csscscc2c222222scscsscccc;s;;s;sssc.;.;.:...:.: . . :::;:::::::.....::::::::::::::::; ..... . ......::::::::;:;:;:; -S . ;;:;::::.: .: :5: . ;6c2c:sssssccccssss;s;s::s;ss.;::s;s;:;;s:;:;::::.: : ..... :;;:;;;;:;:::::.:;:::::::::............ . ......::::::::;:;:;:; -N ;;;;;;scs2 .:s;.cZc:. :6ccs.;ssssssss;;;;;ss; s;ss.:..cscs:;;s:s:;;;;;:;.:.... . ..... .... ...:::;;;;;;;;;:::::::.... ...... ..:...:.:.:.;:;:;;sss -N ::;:::.; :;;s::s;2625c;scsss;sssss;;::::::::::::..:.::;:;;:;.:.. . . .:::.:.:.. . ..::::;:;;;;;;;s;;;;;:;:;;;;;:. . .. .............. ;:::;:;::::::.: -N :.:::; .:;:: :s;5ccs;;;;:;;;;;;;::..::::::::..:.;:s;ccsc:;;;;;;s:;..:......... . . ......:::::::;:;;;:::::::.:::::::.. .:::: .. ........... ;:::;:::::::::: -N ..:::;. .::: ;:2scs:;::::::::::.: ...:.::.:.::.;:s;;s:;:;::;;:;:;::::::::...: . . ... .......:::::::::::;:::::::.:...:::::.. .:.:: .............. :::.:.::::::::: -D .:::.: :.. . :;:cscs;;;;::::;:;:::::..::::::.:::s:ss.:.:....::::.:.:..::::::::.:... ::..:::.::::::;;:::;:::;:;:::::.:::;:::.. . . . ........ :.:.:.::::::::: -2 . . . .. . ;......::;;;cscsscss;;;;ss;;;;;;::::::::::::;:ss;s;s::;:;;;;;s:;::::::::::::::: ;:::::::;;;;;;;;;;;;;s;;;;:::::::::;:::.. . .. :.:.:.::::::::: -: :s ::.. . .s:.. ..:;;2s2cscss;;;;;;ssss;;;;;;;s:;::::s;ssscss;ss;ssss;s;;:::::::::::::::.;;;;::::::::;;;;;sssssss;;;;::::: .::.... .. . . ..... :.:.;:::::: - : .: :.cc:: . :5;:. :;52Y2;s::.:.::;;;ss;;ssccss;s::;:s;s;ss:;.:..::.. . ..:.::::::::::: :::::::::.::::;:ssssscccscss;;::. ..::s; . . . :.::::;:;:: - ;:c2s5 ;ssc;: :::s. :s;: Y2sc22ccss;;;;;;;;csss;s;;:;.. csssssss;;;sssss;ss;;;;;;;;;;;;:252c2c2c255552222cccss;;:::::::;;:;;:::.. . ::::.. ..:.::::. . :.: - s s;:c :: . :;:: . .:Y2ssssss:;:;::::::;;;;;s;ssssssssssssssssssssssssc;ss;sssssssssss;ccsss;ssccccccccccccsss;;;;;:::::::::::::.:..:..... :.::.:....:.;::::::.;:; - ; s;:c .:.: .: .6c5222ccscssssssss::::;;;;sscscccc;;s;sscscsccccc2ssssccccccccc222ccsssscs2c222222c2ccccss;;;;::::::;;;;:;;:;;;;;;;;;.: .. :.::::;;..:.;:;:;:;:s:s - : s:;;s2.s sc .:;s. : cs6222ccscssssssss;;;;;;;;;;;;ss;s;;;:s;s;ccssccccsssssssscccc222222c2cccscc2222ccccccsss;;;:::::::::::::::::::;;;;;;::.. :.::;;;;.:;:;:;;;;;:s:s - : s:s;25:2 .: .. ::5sssss:;.:.:::::;;;;;;;;;:::::::::;:s;csssscsssscssscscccccc2cccc2ccssccccssssss;;;;;;::::::::::::.::::::::::::::;;::.:::::;::::;..:.;:;;::;:c;s - : :.s;:::2 .. :Z2ccssss;;:;;;;:;;;;s;;;;;;;;;;;s;cscs2c22c2scss522222222222222c562222ccccccss:;.....::::::::::::::::::::::::::::::.:.:::;;;;::.. :.;:;:::;:s;s - : ;:s;22s2.; .:: :Y5Z6;c22sc22.:52;s;;;;sscsssccsscscs2c222225222c555552555525222c55c2c2ccscss;s;;;ss;;::::::::::::s;;;;;;;:;:;:;:;;;::::::::.... ...:.;:;;;:;:;:s - s:s;s:cs;:22c5 . :Y6EY:s55:s65 .65scsc;sss2c52c2s;2222222225c2c2cccs222c555522cccs22sc;;;;;;;;;;;;sss;;:::::;;sssssssssssss;;:;:;::::::.. . . ::;;:::.:.:.;:;:;:; -.s;;:: s;s:ZZPHSY26 : .DSZS66ZY.s52sc2cccccsscc2c2222cc52222222s2;c:;::;;s;ssssssss;s;:sc;s;;;::::;::::. .::;sssss;;;;;;;;;;:;::::;;:;:;::;;s;cscs;;;;:::.:.s:2c2 -.s;css:S65c52c2226Zs6 ;..sDZNE:cscS6sc22222222222222222222c2sc;s:;.:.:::..::::.:.:... .: . . .... .::.... ...:... .;:;;;;s;;;;;::.:s;;;::::...... .;:;:;:;:;:s:;:s - 2s2c5c655255cccs6P;S ZSEZ55;sZSc2c22222c2c2cccccc;;sssssc;c:s:;:;::::::::.:........ .. . . ..::;:::::;;;;s;;;;;::::... ....:..::::::::;:sscsc;s;;:: -.2s52552s62SY66S5PHcP : D625SSc5sc2c22c2scssssccssssss;ssc:s:s:;::::.:.:.......... . .....:.. ..:;ssscccss;;;:::::::::::;:;;;ssscccssssss;;;;s;cs5c62622 -;52522ccsY6YYcs2sDNYH NNHPS6:s:;sc2525ss;;sscc222222c2sc;c:s:;::::.:.. .:::::::;s;s;;:.;;::..:::;;;;ssss2css::.:.::;cc22:;;:.. : 626 -ss;s;cc2c2c5265Y6SY5Z6P:;.. : PSDZ566655s2;s;sssssss:.:.::;;:;.; : ..:::::: .;sccccc22s;: ::.::;;;;:.. -2525266222c62S6YYYY6S6Y2P ;:S6ZS55s2:s.:..::....s;sssssssc:s:;::c2sc;;::. :s;;;;:::::....::.::. .sscc;2S655cs;;;;:: . -25266656565S6SSYYSYSS65PN 6255c5;c;s;;;;;:::;:::;::;:;::.:.: ..::::::.... . .:::;;;;:;;;;;;;ss2cccs. -s2c22csS6S6SSYYYYYYSSY6DNs cs:s.:::;;ssccss2cccccccccscscss::.. ...:.:::::: ..:;ss;;ssc22655s;. -s65562cS6YSSSSSSSS6YSYSYD66:: .... . ss;;....::::... sccssss;;;::::..:: -cYSSY55S666SS6S556666SY55YDPHcc -cY66Scc66666555222265SS2cYPHNZD -62sZP665252S6YYSY6552YP5c6S566H -6c;YZc2SSS6PYZPYZSSYSPDYSYZ65ZN2s -S2sZZ256665S6YZSY66YSZPY6YP62YPZEc2 -62sZZ2252225266665566SSZYENPYS2HNHNs. -5s:SSssYY5565SSYYSSS6YS5c6Y66: 5PPN5S . :: -5c;YZ2cYY6665YYYYSS5265DEZ6HNEZNNDPNNNN2 ss62 -565YP52Y6S666SYSS65SSY6YY6cZEYS6666PNZP2 :. ;:ss;;:: -2ZYSY22YSPDPDS62c66YYPZDEDPDPPDYYDEPP22ZEZ5; sscs -2YYYP65ZSSS565566ZYZZS6DHZ6ZDNNNNY6266Ps -2S6562cYSSS66SSZYDDEEPPS6PEHNY6s:5Z5Y -5YS6S55ZYPPDEZYS6656666ZDZPS6;:. s6;s ;66S6ss -6ZZZZZYc:226S6SSSZPZDDHNN6; s565ss .s2D5 :c5PDNHEZ6c 55NNNNNNNNNNNNNNHN;Y -SZYYYS2HEEHDDPZPZDHPHPDss;ss;. ..c6s2 ::2: :;;:::.;. ccZYDPNHNNNNNNNNHHNHNNYPDHHNPN6H2Y222 -265665sNNPD6SZZNNNNSY .;;;5656s ;s:c . c;;;2s:; NNNNNNNNNNNNNNNNHEPPPPHENNDEDDHHHNENDNNHN -YDPEDEZHEZDZPPDZDSZs2.. :;s2;.s2cS .;. :Y22262:c .cDENPS6YPNNNNHHNHEHHHDEHHHHHHHNEHHENHNNHNDEHDN -PDZHEHHPDDHENYP;s .;s252s2222s;25c6. : .:S252YSc6 .:s2SZDNNNNNNNNNNNNNNNNHP25YPNNNHEEDEHHNNNNHHPDSYZYEDHNHNHHNEN -SYSPYDEDHPHSP26:s...:::cc22222s55SPSP66s 6s2sY65S .;YDNNNNNNNNNNNNNNNNNHHEEHHHNNNNNZZ5626NHEHHHHHHHHHHHEHDEHEEHDEDDEDHEN -SYYPPENZH6Y:s;;c25Sc2;:. :s:::.26SP6Sc2: 2;c;PYYD . HNNNNNDPPPPDEHHHHHEEEPDDENNNHZPHNNNHE.sNHHHNNHHPDDDHHNNNNNNHNDEPPHEHEH -PPDZPPHc6s2:;ss556Y55cccs6Z22; c6;2 :Y2S5NEHN s HNNNNNNNHDHNHNNNNNNNNNHNEDPYENNDPYDNNNNEEZHNHNEHHNHHHDEEEHHNNEDHHPDZPPZDPPDZ -HPH6Zc5 ::c25522sss256c:6Z22; 5Z2S :c2HYHDNNNN 2 6SNENNNNEYENHEHNEDDDDPDEHNHHHHEPZSPNNNNDDPDNNNNYZEDPDDENNNNNNDDYZZZHENNHNNNNNNNP -Zc6.s 22YS6655556655ss2c6Zs:6P52cS. HYNPDPNN ZYNNNNNHEHNNNNHHNNHHHHNNHHHHHHHNNNNHEDDDDEEEDDDDEHHNNHHEDPPEDEEHHNNEDHDNNHHEEPPDEE -Sc5s2sscs2c25cccsc2scss;:c6;:s6. ESNDNHNN 2.DDNNNNNNHHHHHHHHEEEEEDEEEEEEEHHHEEEEEEHHHHHNNHHHHNNHHHHHHEHEEEEHEHHEHEHEEHENNEHEHEEEEH \ No newline at end of file + __--~~--_ _--~~--__ + _-~ \---/ ~-_ + /~ __--~~\ /~~--__ ~\ + / _-~~ | | ~~-_ \ + | /~ | | ~\ | + | / o | | o \ | + | | | | | | + \ \_ _/ \_ _/ / + ~-_~--___--~ b d ~--___--~_-~ + / ~~--- _________ ---~~ \ + / ~~--- _________ ---~~ \ + / __---~~~~ ~~~~---__ \ + _-~~ ~~-_ + /~ ~\ + (_-~ ~-_) + \ / + _-~-_ _-~-_ + / ~~--___ ___--~~ \ + / ~~~~-------~~~~ \ + | | + | | + ___ | | ___ + _-~~ ~~~-| / \ |-~~~ ~~-_ + / | | | | \ + ( ,--~~--_ | | | | _--~~--, ) + \ ~-| | | |-~ / + ~-_ | | | | _-~ + ~-_ \ \ / / _-~ + ~-__ / ) ( \ __-~ + _--_~~_-~ (~-_ _-~) ~-_~~_--_ + _-------( ~~_- \ ~~--___ _-_ ___--~~ / -_~~ )-------_ + ( ,---~~~~~-__-~ ~-_ )~~~ ~~~( _-~~- __ -~~~~~---, ) + ( __---~~~( _-~/ |\ )--~~ ~~--( /| \~-_) ~~~---__ ) + ( _-~~~~--~ ( | ~-~ ~-~ | )~--~~~~-_ ) \ No newline at end of file From 39d455ab64f7944b8b1d87fa541cf43ec7b7ecad Mon Sep 17 00:00:00 2001 From: Luiz Felippe Date: Mon, 23 May 2016 19:38:31 -0300 Subject: [PATCH 3512/5486] Links e pastas redirecionadas --- portugues/ladrao/assalto.md | 6 +++--- portugues/ladrao/{res => bruce}/bruce.md | 0 portugues/ladrao/{res => gg}/gg.md | 0 portugues/ladrao/{res => panqueca}/panqueca.md | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename portugues/ladrao/{res => bruce}/bruce.md (100%) rename portugues/ladrao/{res => gg}/gg.md (100%) rename portugues/ladrao/{res => panqueca}/panqueca.md (100%) diff --git a/portugues/ladrao/assalto.md b/portugues/ladrao/assalto.md index c11f5521e6..a554a68172 100644 --- a/portugues/ladrao/assalto.md +++ b/portugues/ladrao/assalto.md @@ -1,7 +1,7 @@ O ladrão chega com a arma apontando no seu peito e fala "vou te roubei". O que você faz? -[Dou uma esquivada estilo Bruce Lee e retruco "vou te peguei"](ladrao/res/bruce.md) +[Dou uma esquivada estilo Bruce Lee e retruco "vou te peguei"](res/bruce.md) -[Peço licença, tiro a ropa, me cubro de margarina e farinha e me jogo na frigideira](ladrao/res/panqueca.md) +[Peço licença, tiro a ropa, me cubro de margarina e farinha e me jogo na frigideira](res/panqueca.md) -[Ele já te roubou](ladrao/res/gg.md) \ No newline at end of file +[Ele já te roubou](res/gg.md) \ No newline at end of file diff --git a/portugues/ladrao/res/bruce.md b/portugues/ladrao/bruce/bruce.md similarity index 100% rename from portugues/ladrao/res/bruce.md rename to portugues/ladrao/bruce/bruce.md diff --git a/portugues/ladrao/res/gg.md b/portugues/ladrao/gg/gg.md similarity index 100% rename from portugues/ladrao/res/gg.md rename to portugues/ladrao/gg/gg.md diff --git a/portugues/ladrao/res/panqueca.md b/portugues/ladrao/panqueca/panqueca.md similarity index 100% rename from portugues/ladrao/res/panqueca.md rename to portugues/ladrao/panqueca/panqueca.md From d3b6ca0eb8ca63faefca902bd33003cff04e09aa Mon Sep 17 00:00:00 2001 From: Luiz Felippe Date: Mon, 23 May 2016 19:41:25 -0300 Subject: [PATCH 3513/5486] Links correction --- portugues/ladrao/assalto.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/portugues/ladrao/assalto.md b/portugues/ladrao/assalto.md index a554a68172..1e6dc569ac 100644 --- a/portugues/ladrao/assalto.md +++ b/portugues/ladrao/assalto.md @@ -1,7 +1,7 @@ O ladrão chega com a arma apontando no seu peito e fala "vou te roubei". O que você faz? -[Dou uma esquivada estilo Bruce Lee e retruco "vou te peguei"](res/bruce.md) +[Dou uma esquivada estilo Bruce Lee e retruco "vou te peguei"](bruce/bruce.md) -[Peço licença, tiro a ropa, me cubro de margarina e farinha e me jogo na frigideira](res/panqueca.md) +[Peço licença, tiro a ropa, me cubro de margarina e farinha e me jogo na frigideira](panqueca/panqueca.md) -[Ele já te roubou](res/gg.md) \ No newline at end of file +[Ele já te roubou](gg/gg.md) \ No newline at end of file From ef13456dda75f7d39850237a20e11cbc15760ed6 Mon Sep 17 00:00:00 2001 From: patarida Date: Tue, 24 May 2016 11:18:27 +0700 Subject: [PATCH 3514/5486] Add travel --- Thai/Cuisine/TomYumKung.md | 2 ++ Thai/travel.md | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 Thai/travel.md diff --git a/Thai/Cuisine/TomYumKung.md b/Thai/Cuisine/TomYumKung.md index 7beb8fe6c2..3bc72729f5 100644 --- a/Thai/Cuisine/TomYumKung.md +++ b/Thai/Cuisine/TomYumKung.md @@ -15,4 +15,6 @@ Do you: [ดูทีวี eat Thai food and watch TV](https://www.youtube.com) +[I will fly to Thailand to have it there](../travel.md) + Actually I prefer Thai Green Curry better! diff --git a/Thai/travel.md b/Thai/travel.md new file mode 100644 index 0000000000..8c316ec579 --- /dev/null +++ b/Thai/travel.md @@ -0,0 +1,9 @@ +It is amazingly beautiful. +We have plenty of stunning beaches and crystal clear water. +Imagine you are at the sea now, what would you like to do? + +What do you want to do? + +[Just have a chocolate while stroll on the beach](../english/chocolateOrSleep/chocolateOrSleep.md) + + [Have Tom Yum Kung. The food is as spicy as the weather.](Cuisine/TomYumKung.md) \ No newline at end of file From 99c1e8a5081442f0fdb095e0624da74734864571 Mon Sep 17 00:00:00 2001 From: Rapeed Date: Tue, 24 May 2016 17:21:06 +0300 Subject: [PATCH 3515/5486] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D1=8B=D0=B9=20?= =?UTF-8?q?=D1=81=D1=86=D0=B5=D0=BD=D0=B0=D1=80=D0=B8=D0=B9=20=C2=AB=D0=94?= =?UTF-8?q?=D0=BE=D1=80=D0=BE=D0=B3=D0=B0=D1=8F,=20=D1=83=D1=89=D0=B5?= =?UTF-8?q?=D0=BF=D0=BD=D0=B8=20=D0=BC=D0=B5=D0=BD=D1=8F=C2=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- russian/girlfriend-pinch-you/girlfriend-pinch-you.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 russian/girlfriend-pinch-you/girlfriend-pinch-you.md diff --git a/russian/girlfriend-pinch-you/girlfriend-pinch-you.md b/russian/girlfriend-pinch-you/girlfriend-pinch-you.md new file mode 100644 index 0000000000..3f17374954 --- /dev/null +++ b/russian/girlfriend-pinch-you/girlfriend-pinch-you.md @@ -0,0 +1,3 @@ +От увиденного в комнате вам становится дурно. Стены из зефира, шолокоданая глазурь, +звуки тромбона ... В голове лишь одна мысль: «Дорогая, ущепни меня, неужели я сплю?». +Вы привычно оборачиваетесь и вдруг осознаете что вы в комнате один! Где ваша девушка? \ No newline at end of file From 4eef3c1cb8e115cf4360b56ce2a64670b884d272 Mon Sep 17 00:00:00 2001 From: Rapeed Date: Tue, 24 May 2016 17:34:45 +0300 Subject: [PATCH 3516/5486] Add new link to "girlfriend-pinch-you" --- russian/zefir.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/zefir.md b/russian/zefir.md index b921b62e85..a2c810cdd6 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -16,6 +16,8 @@ Ваши действия: +[Попросите девушку ущепнуть вас](girlfriend-pinch-you/girlfriend-pinch-you.md) + [Пойти поплавать](go-to-swim/go-to-swim.md) [Начать танцевать Лезгинку](dance_lezginka/dance.md) From 6c1391a5bd89a05a18cf5492b79bb11f9e1b5534 Mon Sep 17 00:00:00 2001 From: Claudia Cimenti Date: Wed, 25 May 2016 00:05:21 +0200 Subject: [PATCH 3517/5486] mehr im deutschen Abenteuer --- german/Stopfen/stopfen.md | 2 ++ german/suchen/suchen.md | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 german/suchen/suchen.md diff --git a/german/Stopfen/stopfen.md b/german/Stopfen/stopfen.md index e2f0a1a0cf..3013c01064 100644 --- a/german/Stopfen/stopfen.md +++ b/german/Stopfen/stopfen.md @@ -5,6 +5,8 @@ die Ruder?! Sie stellen fest, dass die Paddel nicht im Boot sind. Was machen Sie nun? +[Im Boot nach was suchen was als Paddel gebraucht werden kann] (.../suchen/suchen.md) + [Laut um Hilfe schreien](../Hilfeschrei/Hilfeschrei.md)? [Aus dem Boot springen und nach Norden schwimmen?](../schwimmen/schwimmen.md) diff --git a/german/suchen/suchen.md b/german/suchen/suchen.md new file mode 100644 index 0000000000..8b77c8349d --- /dev/null +++ b/german/suchen/suchen.md @@ -0,0 +1,6 @@ +Ich suche im Boot herum und entdecke einen alten Ordenr, den ich als Paddel benutzen kann. + +Was mache ich jetzt? + +[Ich fange an damit zu paddeln.] (../paddeln/paddeln.md) +[Ich werfe den Ordner ueberbord, denn es ist zuviel Arbeit zu paddeln] (../werfen/werfen.md) \ No newline at end of file From c42860848a98ffd0a3bf33d82e915a55edc19d6c Mon Sep 17 00:00:00 2001 From: Claudia Cimenti Date: Wed, 25 May 2016 00:13:19 +0200 Subject: [PATCH 3518/5486] beseitige Pull Request Fehler --- german/Stopfen/stopfen.md | 2 +- german/suchen/suchen.md | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/german/Stopfen/stopfen.md b/german/Stopfen/stopfen.md index 3013c01064..4437764646 100644 --- a/german/Stopfen/stopfen.md +++ b/german/Stopfen/stopfen.md @@ -5,7 +5,7 @@ die Ruder?! Sie stellen fest, dass die Paddel nicht im Boot sind. Was machen Sie nun? -[Im Boot nach was suchen was als Paddel gebraucht werden kann] (.../suchen/suchen.md) +[Im Boot nach was suchen was als Paddel gebraucht werden kann] (../suchen/suchen.md) [Laut um Hilfe schreien](../Hilfeschrei/Hilfeschrei.md)? diff --git a/german/suchen/suchen.md b/german/suchen/suchen.md index 8b77c8349d..1ceda5683e 100644 --- a/german/suchen/suchen.md +++ b/german/suchen/suchen.md @@ -1,6 +1,7 @@ -Ich suche im Boot herum und entdecke einen alten Ordenr, den ich als Paddel benutzen kann. +Ich suche im Boot herum und entdecke einen alten Ordner, den ich als Paddel benutzen kann. Was mache ich jetzt? -[Ich fange an damit zu paddeln.] (../paddeln/paddeln.md) -[Ich werfe den Ordner ueberbord, denn es ist zuviel Arbeit zu paddeln] (../werfen/werfen.md) \ No newline at end of file +1. Ich fange an damit zu paddeln.] (../paddeln/paddeln.md) + +2. Ich werfe den Ordner ueberbord, denn es ist zuviel Arbeit zu paddeln. \ No newline at end of file From dc8afe7e83ecfd3eee6f43ee8adb739cb8a03033 Mon Sep 17 00:00:00 2001 From: Gelin Eguinosa Date: Tue, 24 May 2016 21:36:38 -0400 Subject: [PATCH 3519/5486] Win or die, there is no middle grounds. --- espanol/canudos.md | 2 ++ espanol/thrones/daynerys.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 espanol/thrones/daynerys.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 005055e6d9..2847e6bb1b 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -146,3 +146,5 @@ Spiderman al no entender que era lo que [pasaba] (realidad/realidad.md) solo [Escapó](escapo/escapo.md) +Y llego [Daynerys Targaryen](thrones/daynerys) + diff --git a/espanol/thrones/daynerys.md b/espanol/thrones/daynerys.md new file mode 100644 index 0000000000..71fbaa10ae --- /dev/null +++ b/espanol/thrones/daynerys.md @@ -0,0 +1,3 @@ +La reina hablo, dio un discurso como nunca antes se habia oido, todos los hombres y mujeres presentes estuvieron completamente deacuerdo con ella, y asi la +historia sigio y consigio todo lo que queria, logro la libertad y abolir la esclavitud a nivel mundial, recupero su trono y despues volo a otra galaxia junto con +su dragones. From eaee8fb6a74555781d90798e183d5948ed739983 Mon Sep 17 00:00:00 2001 From: Gelin Eguinosa Date: Tue, 24 May 2016 22:00:13 -0400 Subject: [PATCH 3520/5486] What is dead may never die. --- espanol/canudos.md | 2 +- espanol/thrones/daynerys.md | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 2847e6bb1b..9323fdacb8 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -146,5 +146,5 @@ Spiderman al no entender que era lo que [pasaba] (realidad/realidad.md) solo [Escapó](escapo/escapo.md) -Y llego [Daynerys Targaryen](thrones/daynerys) +Y llego [Daynerys Targaryen](thrones/daynerys.md) diff --git a/espanol/thrones/daynerys.md b/espanol/thrones/daynerys.md index 71fbaa10ae..210dcdc2f4 100644 --- a/espanol/thrones/daynerys.md +++ b/espanol/thrones/daynerys.md @@ -1,3 +1,10 @@ -La reina hablo, dio un discurso como nunca antes se habia oido, todos los hombres y mujeres presentes estuvieron completamente deacuerdo con ella, y asi la -historia sigio y consigio todo lo que queria, logro la libertad y abolir la esclavitud a nivel mundial, recupero su trono y despues volo a otra galaxia junto con -su dragones. +La reina hablo, dio un discurso como nunca antes se habia oido, todos los hombres y mujeres presentes estuvieron +completamente deacuerdo con ella, y asi lahistoria sigio y consigio todo lo que queria, logro la libertad y abolir + la esclavitud a nivel mundial, recupero su trono y despues volo a otra galaxia junto con su dragones. + +De ella se cantaron canciones, todos se enamoraron de ella, nadie jamas la olvida, hasta el dia de hoy se habla + de la leyenda de los dragones. Incluso hoy su historia causa tanto furor que cuando se adapto su historia a una + serie, esa serie bate todos los records. + + Fuego y Sangre. Winter is coming. + From 413fc2d0008da5f49ba5df76373a7caf1a93f23c Mon Sep 17 00:00:00 2001 From: edewit2 Date: Wed, 25 May 2016 00:19:23 -0400 Subject: [PATCH 3521/5486] Add meditation story --- english/meditation/meditation.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/meditation/meditation.md diff --git a/english/meditation/meditation.md b/english/meditation/meditation.md new file mode 100644 index 0000000000..ea8fb118cc --- /dev/null +++ b/english/meditation/meditation.md @@ -0,0 +1,3 @@ +You should relax, you completed the git course, good job! + +Click [here](https://www.youtube.com/watch?v=2u86NS3NtMw)! \ No newline at end of file From 5f4c1c2eeb8dee4b08bbd0abdefeb4e2f7570d86 Mon Sep 17 00:00:00 2001 From: edewit2 Date: Wed, 25 May 2016 00:24:28 -0400 Subject: [PATCH 3522/5486] Add meditation.md story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5475afca69..4b9faf958f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,6 +1,8 @@ Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. +Take some [time](meditation/meditation.md) off! + Who is better? [Click Here](captain/captain.md) to vote for Captain America From 80eea17d88d5dda1bcfc6df67c75e2cf0215a7f6 Mon Sep 17 00:00:00 2001 From: Grzegorz Paszko Date: Wed, 25 May 2016 18:12:31 -0400 Subject: [PATCH 3523/5486] Add focusing on breathing --- english/yoga/mind/yoga_mind.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/yoga/mind/yoga_mind.md b/english/yoga/mind/yoga_mind.md index 88c3e2b900..72720d03ac 100644 --- a/english/yoga/mind/yoga_mind.md +++ b/english/yoga/mind/yoga_mind.md @@ -6,6 +6,8 @@ Want to know about Yoga lifestyle? Click [here](../lifestyle/yoga_lifestyle.md) Most people have discovered that exercising can lift their mood. +By focusing on breathing only you can take your mind into the present moment. + Meditation is simply training your mind to focus and concentrate However, you are now calm and just as you begin to meditate you notice you From ad432d0455fcf351f9723177131a8d4271340f50 Mon Sep 17 00:00:00 2001 From: Wouter Trioen Date: Thu, 26 May 2016 08:57:54 +0200 Subject: [PATCH 3524/5486] add to welkeWereld --- dutch/over-het-hek/sleutel/wereld/welkeWereld.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dutch/over-het-hek/sleutel/wereld/welkeWereld.md b/dutch/over-het-hek/sleutel/wereld/welkeWereld.md index 5b8f1d0a51..c81cd1c864 100644 --- a/dutch/over-het-hek/sleutel/wereld/welkeWereld.md +++ b/dutch/over-het-hek/sleutel/wereld/welkeWereld.md @@ -1 +1,3 @@ -Asjemenou, terwijl je dit gebeuren overdenkt vergaat de wereld onder je voeten en wat verschijnt daar? \ No newline at end of file +Asjemenou, terwijl je dit gebeuren overdenkt vergaat de wereld onder je voeten en wat verschijnt daar? + +Sterren! Waar je ook kijkt zie je sterren in alle kleuren, geuren en maten. \ No newline at end of file From c96c2872c474cd333ab213f9143e564441e73aa3 Mon Sep 17 00:00:00 2001 From: Jared Armes Date: Thu, 26 May 2016 11:34:15 -0400 Subject: [PATCH 3525/5486] Add panic option --- english/cliff/cliff.md | 4 +++- english/cliff/panic/panic.md | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 english/cliff/panic/panic.md diff --git a/english/cliff/cliff.md b/english/cliff/cliff.md index 75df8a9651..fe7270797e 100644 --- a/english/cliff/cliff.md +++ b/english/cliff/cliff.md @@ -9,4 +9,6 @@ Grabbing the excess fabric you pull it tight and begin to glide, unfortunately, You're enjoying the sensation of the wind rushing past you. You think you can control your glide and steer yourself, but you're tempted to just close your eyes and enjoy the ride. -[You decide to close your eyes and see what magical place the wind will take you](close-eyes/close-eyes.md). \ No newline at end of file +[You decide to close your eyes and see what magical place the wind will take you](close-eyes/close-eyes.md). + +[You begin to panic as you realize that you are actually terrifed of heights](panic/panic.md). \ No newline at end of file diff --git a/english/cliff/panic/panic.md b/english/cliff/panic/panic.md new file mode 100644 index 0000000000..9a0e15c39f --- /dev/null +++ b/english/cliff/panic/panic.md @@ -0,0 +1,9 @@ +You begin to panic. + +Flailing your arms in a frenzy, you suddenly lose altitude. + +You begin falling at terminal velocity. Now you've done it. You shouldn't have panicked. + +... + +THE END \ No newline at end of file From 6674981ea0a69ec1f403d4b87e152eb2b6f8d1e1 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 26 May 2016 22:59:39 -0400 Subject: [PATCH 3526/5486] Add more info from marshmallow chief about sticks --- english/wake-up/wake-up-again/dream2/dream2.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/wake-up/wake-up-again/dream2/dream2.md b/english/wake-up/wake-up-again/dream2/dream2.md index d25ca90b59..f586e264e9 100644 --- a/english/wake-up/wake-up-again/dream2/dream2.md +++ b/english/wake-up/wake-up-again/dream2/dream2.md @@ -4,4 +4,6 @@ Suddenly an aircraft flies by. In the shiny underbelly of the airplane you see a sea of white cyclinders stretched across the landscape. You realize that you are just a marshmallow among thousands in a vast island of marshmallows. Another marshmallow takes you to the marshmallow chief, who explains to you that -the dangers of sticks. \ No newline at end of file +the dangers of sticks. +Sticks are truly evil. Who Knew? This dream just got.... REAL! You feel a sharp pain, you turn BAMMM! +Dang stick gotcha again. "Better luck next time champ." says Dane Mane the marshmallow chief. \ No newline at end of file From 6b4b2945cffeec5385e8a29bbcecd2c2a4a2088b Mon Sep 17 00:00:00 2001 From: sycarion Date: Fri, 27 May 2016 16:50:13 -0500 Subject: [PATCH 3527/5486] Add link to chess and bear-story from dimension --- english/00-Life-of-this-world/Life of this world.md | 4 +++- english/dimensions/dimension.md | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/english/00-Life-of-this-world/Life of this world.md b/english/00-Life-of-this-world/Life of this world.md index 2ca58666a1..369618787e 100644 --- a/english/00-Life-of-this-world/Life of this world.md +++ b/english/00-Life-of-this-world/Life of this world.md @@ -9,4 +9,6 @@ Allah and (His) Good Pleasure (for the believers, good-doers), whereas the life of this world is only a deceiving enjoyment“. [QURAN 57:20] -"Life isn't that simple but you got to take every possible risk in life to achieve something." \ No newline at end of file +"Life isn't that simple but you got to take every possible risk in life to achieve something." + +"Explore another dimension[dimension](../dimensions/dimension.md). It's fun" diff --git a/english/dimensions/dimension.md b/english/dimensions/dimension.md index 8ea29a712d..9c50349281 100644 --- a/english/dimensions/dimension.md +++ b/english/dimensions/dimension.md @@ -1 +1,7 @@ -And here you enter a new [dimension](https://www.youtube.com/watch?v=sea8yNCDqWo.) \ No newline at end of file +And here you enter a new [dimension](https://www.youtube.com/watch?v=sea8yNCDqWo.) + +Or decide to play a game of chess [chess](../chess/chess.md). + +Or decide to learn about the world of bears [bears](../bear-story/bear-story.md) + +Or decide the learn about life of this world [life of this world](../00-Life-of-this-world/Life of this world.md) From c3a5c9eb8ae722835ce838e27a8711161ca86599 Mon Sep 17 00:00:00 2001 From: Bowei Zheng Date: Fri, 27 May 2016 23:13:27 -0500 Subject: [PATCH 3528/5486] =?UTF-8?q?Add=20changes=20to=20Chinese/?= =?UTF-8?q?=E5=A4=A7=E8=AF=9D=E8=A5=BF=E6=B8=B8.md=20at=20the=20end?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 68c2f649df..51927ee7ee 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -121,3 +121,5 @@ [悟空](Goku/Guku_arrives.md) [测试](test/test.md) + +后端程序元辛苦的工作虽然很少得到人重视，却是必不可少的一部分. From ed3ffe0ee7182721371f7a46d2acbda7f3924c2e Mon Sep 17 00:00:00 2001 From: Adam Taylor Date: Sat, 28 May 2016 13:12:03 -0400 Subject: [PATCH 3529/5486] Add sentence to english/unicorn/existence/fakeporridge/descartes.md --- english/unicorn/existence/fakeporridge/descartes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/unicorn/existence/fakeporridge/descartes.md b/english/unicorn/existence/fakeporridge/descartes.md index d40cea5377..1ac2f7a5f4 100644 --- a/english/unicorn/existence/fakeporridge/descartes.md +++ b/english/unicorn/existence/fakeporridge/descartes.md @@ -6,3 +6,5 @@ Could not Descartes' demon make this place as well? Keith agrees. Keith licks his tobbaco-stained teeth and snorts. "Are you going to eat that, man? I've got the munchies something fierce." + +You push the bowl toward him, having completely lost your appetite as well as your mind. \ No newline at end of file From c6bfeda74d139aa500a99bf67aaf6b813c4c4a0a Mon Sep 17 00:00:00 2001 From: Anuja Shirsat Date: Sat, 28 May 2016 11:39:57 -0600 Subject: [PATCH 3530/5486] Added a spiritual quote --- english/quote-of-the-day/life/life.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/quote-of-the-day/life/life.md b/english/quote-of-the-day/life/life.md index 165b74137f..9c70e31b06 100644 --- a/english/quote-of-the-day/life/life.md +++ b/english/quote-of-the-day/life/life.md @@ -4,4 +4,10 @@ it's all the matters. Smile, breathe, and go slowly. -[Go back](../quote.md) \ No newline at end of file +[Go back](../quote.md) + +Making Life A Celebration: +The source of your mind is +love and whatever you do to +go to that source is a +spiritual practise.-Sri Sri From 0602c721134901c39903f8cdbd42cb2f8d2460fb Mon Sep 17 00:00:00 2001 From: root Date: Sun, 29 May 2016 20:09:05 +1200 Subject: [PATCH 3531/5486] When wil the old ones rise? --- english/madness/cthulhu.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/madness/cthulhu.md b/english/madness/cthulhu.md index 2e55543276..d0d5852fa4 100644 --- a/english/madness/cthulhu.md +++ b/english/madness/cthulhu.md @@ -12,4 +12,6 @@ Accept instant death at the hands of the [Yog-Sothoth] (yogsothoth/yog-sothoth.m [Boil] (boil/boil.md) your own flesh with the heat of one million suns -All the while the call of cthulhu can be heard, ominously accompanying your fate \ No newline at end of file +All the while the call of cthulhu can be heard, ominously accompanying your fate + +When will the old ones rise? From df5439a19d2aa2917095eb4db3bd92729bec91bb Mon Sep 17 00:00:00 2001 From: Georkouk Date: Sun, 29 May 2016 19:19:48 +0300 Subject: [PATCH 3532/5486] Add story --- .../offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md index 9e148b2fd1..8b45e5fdf7 100644 --- a/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md +++ b/greek/offer_marshmallow_a_cigar/set_it_on_fire/set_it_on_fire.md @@ -6,6 +6,8 @@ αντικρύζεις είναι τόσο φρικιαστικό που θέλεις να ξαναμπείς μέσα και να κλείσεις το άνοιγμα για πάντα. +Όμως το άνοιγμα δεν κλείνει. + Τι κάνεις; [Χριστέ μου! Τι είναι αυτό; Δεν βγαίνω με τίποτα απο δώ!](stay_inside/stay_inside.md) From 8e285cf05bfa3d1fdf6a75500f10ad8c7d978950 Mon Sep 17 00:00:00 2001 From: Jonathan Gregg Date: Sun, 29 May 2016 23:04:40 -0400 Subject: [PATCH 3533/5486] added one line --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 4b9faf958f..d07af800f0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -111,7 +111,7 @@ Was it the sound of birds? It sounded like it could have been a [heffalump](heffalump/heffalump.md) -No... perhaps not. +No... perhaps not. Not at all. I think it was an [animal](animal/animal.md). From 6f22efff122cd9418123d5c372062bc8e75a009f Mon Sep 17 00:00:00 2001 From: Jonathan Gregg Date: Sun, 29 May 2016 23:07:39 -0400 Subject: [PATCH 3534/5486] adding only --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index d07af800f0..b56989795d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -111,7 +111,9 @@ Was it the sound of birds? It sounded like it could have been a [heffalump](heffalump/heffalump.md) -No... perhaps not. Not at all. +No... perhaps not. + +Not at all. I think it was an [animal](animal/animal.md). From 2f1cb37bfbf2a6c146a53b835b52275c6669ed8b Mon Sep 17 00:00:00 2001 From: jszem Date: Mon, 30 May 2016 15:10:53 +0200 Subject: [PATCH 3535/5486] crazy but we're weird --- english/crazy/crazy.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/crazy/crazy.md b/english/crazy/crazy.md index 56075db850..b953552b1b 100644 --- a/english/crazy/crazy.md +++ b/english/crazy/crazy.md @@ -14,4 +14,6 @@ Do you... Eat some [ice cream?](../ice-cream/ice-cream.md) -ummm crazy should be spelled krazy with a k \ No newline at end of file +ummm crazy should be spelled krazy with a k + +something is seriously wrong with us From 8ab4daae201842cedc8b07cf0be6dcddffe929c9 Mon Sep 17 00:00:00 2001 From: Dickinson Date: Mon, 30 May 2016 20:18:56 +0200 Subject: [PATCH 3536/5486] Add trailers to captain america and iron man --- english/captain/captain.md | 4 +++- english/ironman/ironman.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/english/captain/captain.md b/english/captain/captain.md index 8e3515d6ee..6069a7cf05 100644 --- a/english/captain/captain.md +++ b/english/captain/captain.md @@ -1 +1,3 @@ -Good Choice. \ No newline at end of file +Good Choice. + +A man of honour beats a genius billionaire playboy philanthropist. Let's watch the trailer of him fighting iron man [here](https://youtu.be/uVdV-lxRPFo). \ No newline at end of file diff --git a/english/ironman/ironman.md b/english/ironman/ironman.md index 919018204e..5adf0f08a8 100644 --- a/english/ironman/ironman.md +++ b/english/ironman/ironman.md @@ -1 +1,3 @@ -Wrong Choice. \ No newline at end of file +Wrong Choice. + +A man of honour beats a genius billionaire playboy philanthropist. Let's watch the trailer of him fighting captain america [here](https://youtu.be/uVdV-lxRPFo). \ No newline at end of file From 5b59feca4dc1a3a0a5fdc17fb21845c859ae57e0 Mon Sep 17 00:00:00 2001 From: Dickinson Date: Mon, 30 May 2016 20:31:14 +0200 Subject: [PATCH 3537/5486] Reduce line lengths --- english/captain/captain.md | 3 ++- english/ironman/ironman.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/english/captain/captain.md b/english/captain/captain.md index 6069a7cf05..cf1b489d3b 100644 --- a/english/captain/captain.md +++ b/english/captain/captain.md @@ -1,3 +1,4 @@ Good Choice. -A man of honour beats a genius billionaire playboy philanthropist. Let's watch the trailer of him fighting iron man [here](https://youtu.be/uVdV-lxRPFo). \ No newline at end of file +A man of honour beats a genius billionaire playboy philanthropist. +Let's watch the trailer of him fighting iron man [here](https://youtu.be/uVdV-lxRPFo). \ No newline at end of file diff --git a/english/ironman/ironman.md b/english/ironman/ironman.md index 5adf0f08a8..72d42f0dca 100644 --- a/english/ironman/ironman.md +++ b/english/ironman/ironman.md @@ -1,3 +1,4 @@ Wrong Choice. -A man of honour beats a genius billionaire playboy philanthropist. Let's watch the trailer of him fighting captain america [here](https://youtu.be/uVdV-lxRPFo). \ No newline at end of file +A man of honour beats a genius billionaire playboy philanthropist. +Let's watch the trailer of him fighting captain america [here](https://youtu.be/uVdV-lxRPFo). \ No newline at end of file From 8450853de4bfed76511a8e259c946cc7636c035a Mon Sep 17 00:00:00 2001 From: sycarion Date: Tue, 31 May 2016 08:25:16 -0500 Subject: [PATCH 3538/5486] fixed life of this world to match master --- english/00-Life-of-this-world/Life of this world.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/00-Life-of-this-world/Life of this world.md b/english/00-Life-of-this-world/Life of this world.md index 369618787e..a94efabdb8 100644 --- a/english/00-Life-of-this-world/Life of this world.md +++ b/english/00-Life-of-this-world/Life of this world.md @@ -9,6 +9,4 @@ Allah and (His) Good Pleasure (for the believers, good-doers), whereas the life of this world is only a deceiving enjoyment“. [QURAN 57:20] -"Life isn't that simple but you got to take every possible risk in life to achieve something." - "Explore another dimension[dimension](../dimensions/dimension.md). It's fun" From 56b19def11a42b493c49a6e3aa5cbb4bc45d9c2a Mon Sep 17 00:00:00 2001 From: sycarion Date: Tue, 31 May 2016 08:29:25 -0500 Subject: [PATCH 3539/5486] fixed life of this world to match master again --- english/00-Life-of-this-world/Life of this world.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/00-Life-of-this-world/Life of this world.md b/english/00-Life-of-this-world/Life of this world.md index a94efabdb8..369618787e 100644 --- a/english/00-Life-of-this-world/Life of this world.md +++ b/english/00-Life-of-this-world/Life of this world.md @@ -9,4 +9,6 @@ Allah and (His) Good Pleasure (for the believers, good-doers), whereas the life of this world is only a deceiving enjoyment“. [QURAN 57:20] +"Life isn't that simple but you got to take every possible risk in life to achieve something." + "Explore another dimension[dimension](../dimensions/dimension.md). It's fun" From a851fdce656e72cd692bd1f16d4174463d1f981f Mon Sep 17 00:00:00 2001 From: Naman Nanavati Date: Wed, 1 Jun 2016 00:21:43 +1000 Subject: [PATCH 3540/5486] Add my favourite Gujarati proverb --- Gujarati/gujarati.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Gujarati/gujarati.md b/Gujarati/gujarati.md index c679e08e7b..b471525c29 100644 --- a/Gujarati/gujarati.md +++ b/Gujarati/gujarati.md @@ -12,4 +12,7 @@ Gujarati language is great. Lord Krishna spoke or led to it. Mahatma Gandhi spok [ઉત્તરાયણમાં ખેંચ કે ઢીલ?](ઉત્તરાયણ/ઉત્તરાયણમાં ખેંચ કે ઢીલ.md) -CS [go here](DhoklaStellarFafda~/CS.md) \ No newline at end of file +CS [go here](DhoklaStellarFafda~/CS.md) + +ટીપે ટીપે સરોવર બંધાય , કાંકરે કાંકરે પાડ બંધાય +This is my favourite Gujarati proverb copied from [here](http://gujarati-proverbs.tumblr.com/) \ No newline at end of file From 2c550cb5ccec3979093cd009a760e9045cea0903 Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 31 May 2016 17:24:57 +0200 Subject: [PATCH 3541/5486] MODs ruderboot.md to link to the new adventure "Dorf" ADDs new adventure "Dorf" including 4 files and a solution to get back Features optional background music --- german/Dorf/Haupthaus/haupthaus.md | 12 ++++++++++++ german/Dorf/Tempel/tempel.md | 14 ++++++++++++++ german/Dorf/Werft/werft.md | 18 ++++++++++++++++++ german/Dorf/dorf.md | 27 +++++++++++++++++++++++++++ german/ruderboot.md | 4 +++- 5 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 german/Dorf/Haupthaus/haupthaus.md create mode 100644 german/Dorf/Tempel/tempel.md create mode 100644 german/Dorf/Werft/werft.md create mode 100644 german/Dorf/dorf.md diff --git a/german/Dorf/Haupthaus/haupthaus.md b/german/Dorf/Haupthaus/haupthaus.md new file mode 100644 index 0000000000..915dc9a87f --- /dev/null +++ b/german/Dorf/Haupthaus/haupthaus.md @@ -0,0 +1,12 @@ +Sie treten näher an das Große, Punktvoll aussehende Haupthaus heran. + +Zwei mit Streitaxt bewaffnete finster drein schauende Krieger versperren ihnen den Weg. + +"Hier wohnt der Jarl, er ist im Kampf verwundet worden und darf nicht gestört werden!", +sagt eine der Wachen zu euch. + +Ihr könnt hier nichts ausrichten oder weiteres erfahren was euch beim Problem mit dem Ruderboot hilft. + +----------------------------------------------------------------------------------------------------------------------- + +[Zurück zum Steg](../dorf.md) \ No newline at end of file diff --git a/german/Dorf/Tempel/tempel.md b/german/Dorf/Tempel/tempel.md new file mode 100644 index 0000000000..0995628595 --- /dev/null +++ b/german/Dorf/Tempel/tempel.md @@ -0,0 +1,14 @@ +Ihr tretet an ein Grundstück mit einem großem Gebäude in der mitte herran. + +Auf dem Rasen sind viele große Steine verteilt auf dem ihr eingemeißelte Runen erkennen könnt. + +Als ihr näher an das Gebäude herrantreten wollt, kommt eine Blasse mit Schwarzen Mustern Bemalte Person auf euch zu. +Es scheint eine art Priester zu sein. + +Er Sprich: "Nur wer mit Odin geht darf den heilligen Ort betreten". + +Mit diesen Worten schickt er euch wieder vom Grundstück. + +----------------------------------------------------------------------------------------------------------------------- + +[Zurück zum Steg](../dorf.md) \ No newline at end of file diff --git a/german/Dorf/Werft/werft.md b/german/Dorf/Werft/werft.md new file mode 100644 index 0000000000..221366040a --- /dev/null +++ b/german/Dorf/Werft/werft.md @@ -0,0 +1,18 @@ +Ihr tretet näher an das Gebäude am Wasser. Es sieht aus wie ein Haus eines Fleißigen Handwerkers. + +Vor dem Haus stehen viele unfertige Boote auf Gerüsten. Der Bewohner scheint wohl Bootsbauer zu sein. + +In dem Moment wo ihr eure Aufmerksamkeit wieder ans hier und jetzt richtet steht eine Person vor euch. + +"Ich bin Floki, du bist nicht hier um mich zu bestehlen sonst hättest du eine Waffe bei dir. Wie kann ich dir helfen" + +... Ihr erklärt ihm eure Situation ... + +"Da hast du aber Glück gehabt du alter Streuner. Wie man unschwer erkennen kann bin ich Bootsbauer. +Deine Kleine Nussschale hab ich wohl im Handumdrehen wieder heile." + +----------------------------------------------------------------------------------------------------------------------- + +[Zurück zum Steg](../dorf.md) + +[Mit dem Heilem Boot zurückrudern](../../ruderboot.md) \ No newline at end of file diff --git a/german/Dorf/dorf.md b/german/Dorf/dorf.md new file mode 100644 index 0000000000..4819675932 --- /dev/null +++ b/german/Dorf/dorf.md @@ -0,0 +1,27 @@ +Mit einem Fuß auf dem Leck, einer Landkarte in der einen und einem Fernglas in der anderen Hand werden sie fündig! + +Ganz in der Nähe scheint ein kleines altes Dorf zu sein. + +Sie behalten den Fuß auf dem Leck und nähern sich rudernd dem Dorf ... es scheint alt zu sein - sehr alt. + +Eingebettet in eine schöne Umgebung in einer bucht, aber doch sehr abgeschnitten von jeglicher Zivilisation. + +Vom Anschein wirkt es wie ein Wikinger Dorf. + +Sie befinden sich mittlerweile an der Anlegestelle der Siedlung. + +Nach dem Festmachen gehen sie zu/zum/zur: + +----------------------------------------------------------------------------------------------------------------------- + +[Optional: Musik dazu im neuen Tab aufmachen](https://www.youtube.com/watch?v=jiwuQ6UHMQg) + +----------------------------------------------------------------------------------------------------------------------- + +[Zurück zum Ruderboot und Rudern wieder zurück](../ruderboot.md) + +[Haupthaus: In diesem wohnt warscheinlich eine wichtige Person](Haupthaus/haupthaus.md) + +[Tempel: Ein mystisch aussehendes Grundstück](Tempel/tempel.md) + +[Werft: Ein Handwerksgebäude am Wasser mit einer Art Ablaufbahn](Werft/werft.md) \ No newline at end of file diff --git a/german/ruderboot.md b/german/ruderboot.md index 3d90f7971d..04defbd28a 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -30,4 +30,6 @@ Werden Sie: [Sie spren einen hllischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) -[Kopfber ins Wasser springen](Kopfsprung/Kopfsprung.md) \ No newline at end of file +[Kopfber ins Wasser springen](Kopfsprung/Kopfsprung.md) + +[Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) \ No newline at end of file From 8ec291f37d67c63ec5afc376e9cce24ec508f715 Mon Sep 17 00:00:00 2001 From: Fahad Date: Tue, 31 May 2016 12:38:58 -0400 Subject: [PATCH 3542/5486] Add one piece directory and md file --- english/onepiece/op.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/onepiece/op.md diff --git a/english/onepiece/op.md b/english/onepiece/op.md new file mode 100644 index 0000000000..95aff4869e --- /dev/null +++ b/english/onepiece/op.md @@ -0,0 +1,3 @@ +One Piece is a Japanese manga series written and illustrated by Eiichiro Oda. It has been serialized in Shueisha's Weekly Shōnen Jump magazine since July 19, 1997, with the chapters collected into eighty-one tankōbon volumes to date. One Piece follows the adventures of Monkey D. Luffy, a funny young man whose body gained the properties of rubber after unintentionally eating a Devil Fruit. With his diverse crew of pirates, named the Straw Hat Pirates, Luffy explores the grand line in search of the world's ultimate treasure known as "One Piece" in order to become the next King of the Pirates. -Wikipedia + +Learn about devil fruits [here](https://github.com/udacity/create-your-own-adventure/blob/master/english/fruit/devilfruits/df.md) \ No newline at end of file From 075035b9f8f79d4ac038345504cfe342e6c52025 Mon Sep 17 00:00:00 2001 From: Fahad Date: Tue, 31 May 2016 12:46:47 -0400 Subject: [PATCH 3543/5486] Add summary about devil fruits --- english/fruit/devilfruits/df.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/fruit/devilfruits/df.md diff --git a/english/fruit/devilfruits/df.md b/english/fruit/devilfruits/df.md new file mode 100644 index 0000000000..bd89cdd692 --- /dev/null +++ b/english/fruit/devilfruits/df.md @@ -0,0 +1,3 @@ +A Devil Fruit (悪魔の実 Akuma no Mi) is a type of fruit that, which when eaten, confers a power on the consumer. There are three categories of Devil Fruits; Zoan (動物系ゾオン Zoon) fruits allow the user to fully and partially transform into a specific animal; as well as real-life animals. Some Zoan fruits allow the user to transform into mythical creatures. Logia (自然系ロギア Rogia) fruits give control over and allow the user "to change their living body structure into the powers of nature". Paramecia (超人系パラミシア Paramishia) is a category for fruits that give the user superhuman abilities. They are said to be incarnations of the sea devil himself, and as a result, Devil Fruit users cannot swim in sea water, as "they are hated by the sea". + +There is never more than one devil fruit available in the world. If a user of a certain devil fruit dies, than that particular devil fruit will grow some place else in the world (usually in a location that fits its personality). Although logia devil fruits are rare, mystical zoan fruits such as the pheonix fruit is far more rarer (and in most cases powerful). \ No newline at end of file From b04968d239c3bec0402af3490d077a8e74ca4bbc Mon Sep 17 00:00:00 2001 From: Fahad Date: Tue, 31 May 2016 13:03:33 -0400 Subject: [PATCH 3544/5486] Delete devilfruits and edit onepiece --- english/fruit/devilfruits/df.md | 3 --- english/marshmallow.md | 2 ++ english/onepiece/op.md | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 english/fruit/devilfruits/df.md diff --git a/english/fruit/devilfruits/df.md b/english/fruit/devilfruits/df.md deleted file mode 100644 index bd89cdd692..0000000000 --- a/english/fruit/devilfruits/df.md +++ /dev/null @@ -1,3 +0,0 @@ -A Devil Fruit (悪魔の実 Akuma no Mi) is a type of fruit that, which when eaten, confers a power on the consumer. There are three categories of Devil Fruits; Zoan (動物系ゾオン Zoon) fruits allow the user to fully and partially transform into a specific animal; as well as real-life animals. Some Zoan fruits allow the user to transform into mythical creatures. Logia (自然系ロギア Rogia) fruits give control over and allow the user "to change their living body structure into the powers of nature". Paramecia (超人系パラミシア Paramishia) is a category for fruits that give the user superhuman abilities. They are said to be incarnations of the sea devil himself, and as a result, Devil Fruit users cannot swim in sea water, as "they are hated by the sea". - -There is never more than one devil fruit available in the world. If a user of a certain devil fruit dies, than that particular devil fruit will grow some place else in the world (usually in a location that fits its personality). Although logia devil fruits are rare, mystical zoan fruits such as the pheonix fruit is far more rarer (and in most cases powerful). \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index b56989795d..ca92a67017 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -981,3 +981,5 @@ What should you [do](magicaladventure/decision_time/decision_time.md) My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... [Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. + +You decide you want to be a pirate and remember a show called [onepiece](https://github.com/udacity/create-your-own-adventure/blob/master/english/onepiece/op.md) \ No newline at end of file diff --git a/english/onepiece/op.md b/english/onepiece/op.md index 95aff4869e..6259dcf5d8 100644 --- a/english/onepiece/op.md +++ b/english/onepiece/op.md @@ -1,3 +1,3 @@ -One Piece is a Japanese manga series written and illustrated by Eiichiro Oda. It has been serialized in Shueisha's Weekly Shōnen Jump magazine since July 19, 1997, with the chapters collected into eighty-one tankōbon volumes to date. One Piece follows the adventures of Monkey D. Luffy, a funny young man whose body gained the properties of rubber after unintentionally eating a Devil Fruit. With his diverse crew of pirates, named the Straw Hat Pirates, Luffy explores the grand line in search of the world's ultimate treasure known as "One Piece" in order to become the next King of the Pirates. -Wikipedia - -Learn about devil fruits [here](https://github.com/udacity/create-your-own-adventure/blob/master/english/fruit/devilfruits/df.md) \ No newline at end of file +One Piece follows the adventures of Monkey D. Luffy, a funny young man whose body gained the properties of rubber after unintentionally eating a Devil Fruit. +With his diverse crew of pirates, named the Straw Hat Pirates, Luffy explores the grand line in search of the world's ultimate treasure known as "One Piece" in +order to become the next King of the Pirates. -Wikipedia \ No newline at end of file From 461449ba73a0c07685ad037f8aa4513a44845137 Mon Sep 17 00:00:00 2001 From: Fahad Date: Tue, 31 May 2016 13:24:29 -0400 Subject: [PATCH 3545/5486] Shorten lines --- english/marshmallow.md | 3 ++- english/onepiece/op.md | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index ca92a67017..924eb68b3f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -982,4 +982,5 @@ My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... [Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. -You decide you want to be a pirate and remember a show called [onepiece](https://github.com/udacity/create-your-own-adventure/blob/master/english/onepiece/op.md) \ No newline at end of file +You decide you want to be a pirate and remember a show called +[onepiece](https://github.com/udacity/create-your-own-adventure/blob/testbranch/english/onepiece/op.md) \ No newline at end of file diff --git a/english/onepiece/op.md b/english/onepiece/op.md index 6259dcf5d8..10c2c9390b 100644 --- a/english/onepiece/op.md +++ b/english/onepiece/op.md @@ -1,3 +1,6 @@ -One Piece follows the adventures of Monkey D. Luffy, a funny young man whose body gained the properties of rubber after unintentionally eating a Devil Fruit. -With his diverse crew of pirates, named the Straw Hat Pirates, Luffy explores the grand line in search of the world's ultimate treasure known as "One Piece" in +One Piece follows the adventures of Monkey D. Luffy, a funny young man whose body +gained the properties of rubber after unintentionally eating a Devil Fruit. + +With his diverse crew of pirates, named the Straw Hat Pirates, Luffy explores +the grand line in search of the world's ultimate treasure known as "One Piece" in order to become the next King of the Pirates. -Wikipedia \ No newline at end of file From b5b780be860af2b4e82de52ccc6495645a60aa62 Mon Sep 17 00:00:00 2001 From: Fahad Date: Tue, 31 May 2016 13:30:45 -0400 Subject: [PATCH 3546/5486] Change url --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 924eb68b3f..11fd2d9129 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -983,4 +983,4 @@ My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... [Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. You decide you want to be a pirate and remember a show called -[onepiece](https://github.com/udacity/create-your-own-adventure/blob/testbranch/english/onepiece/op.md) \ No newline at end of file +[onepiece](https://github.com/fahadhd/create-your-own-adventure/blob/testbranch/english/onepiece/op.md) \ No newline at end of file From d7871a279f6bba5ba86118824b9786bf6873acc9 Mon Sep 17 00:00:00 2001 From: Fahad Date: Tue, 31 May 2016 13:35:55 -0400 Subject: [PATCH 3547/5486] Change url to relative --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 11fd2d9129..01bd44698b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -983,4 +983,4 @@ My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... [Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. You decide you want to be a pirate and remember a show called -[onepiece](https://github.com/fahadhd/create-your-own-adventure/blob/testbranch/english/onepiece/op.md) \ No newline at end of file +[onepiece](english/onepiece/op.md) \ No newline at end of file From e14e8a961dab28891930ca2e012c15d0950d5ce8 Mon Sep 17 00:00:00 2001 From: Fahad Date: Tue, 31 May 2016 13:40:14 -0400 Subject: [PATCH 3548/5486] Fix url --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 01bd44698b..df6f1997bc 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -983,4 +983,4 @@ My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... [Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. You decide you want to be a pirate and remember a show called -[onepiece](english/onepiece/op.md) \ No newline at end of file +[onepiece](onepiece/op.md) \ No newline at end of file From 435fb304dc8c803a1f84e086f1f6bee43e94ea47 Mon Sep 17 00:00:00 2001 From: George Liu Date: Tue, 31 May 2016 14:31:00 -0400 Subject: [PATCH 3549/5486] Add new lines for the Winnie the Pooh story. --- Chinese/xinwang/xin.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Chinese/xinwang/xin.md b/Chinese/xinwang/xin.md index e2d050808c..0c1ea4451d 100644 --- a/Chinese/xinwang/xin.md +++ b/Chinese/xinwang/xin.md @@ -8,3 +8,5 @@ 它想去走走。 吃得太飽撐得動也動不了, 只好用滾的. + +可是，維尼用盡全身力氣，卻怎麼也滾不動......這下改怎麼辦呢？“要不我躺著睡一會兒算了”維尼想到。 From d5b35f5f19e35386434ee6b9b5339570feda78df Mon Sep 17 00:00:00 2001 From: applewct Date: Wed, 1 Jun 2016 13:43:33 +0800 Subject: [PATCH 3550/5486] Create trip-to-taiwan.md --- english/trip-to-Taiwan/trip-to-taiwan.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/trip-to-Taiwan/trip-to-taiwan.md diff --git a/english/trip-to-Taiwan/trip-to-taiwan.md b/english/trip-to-Taiwan/trip-to-taiwan.md new file mode 100644 index 0000000000..6480212bdd --- /dev/null +++ b/english/trip-to-Taiwan/trip-to-taiwan.md @@ -0,0 +1,2 @@ +hi there, Taiwan is a place full of delicious foods and friendly people, +wanna know [more](https://en.wikipedia.org/wiki/Taiwan) ? From 6bd74ba25264c8345c8ad8b8148676b4f5d54f83 Mon Sep 17 00:00:00 2001 From: applewct Date: Wed, 1 Jun 2016 13:45:35 +0800 Subject: [PATCH 3551/5486] Add trip to Taiwan --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index df6f1997bc..0ae59568b5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -983,4 +983,6 @@ My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... [Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. You decide you want to be a pirate and remember a show called -[onepiece](onepiece/op.md) \ No newline at end of file +[onepiece](onepiece/op.md) + +You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Taiwan.md)! From 56ccaedc3a282c398830ec973461a2bdd3683bde Mon Sep 17 00:00:00 2001 From: applewct Date: Wed, 1 Jun 2016 13:46:30 +0800 Subject: [PATCH 3552/5486] Rename trip-to-taiwan.md to trip-to-Taiwan.md --- english/trip-to-Taiwan/{trip-to-taiwan.md => trip-to-Taiwan.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/trip-to-Taiwan/{trip-to-taiwan.md => trip-to-Taiwan.md} (100%) diff --git a/english/trip-to-Taiwan/trip-to-taiwan.md b/english/trip-to-Taiwan/trip-to-Taiwan.md similarity index 100% rename from english/trip-to-Taiwan/trip-to-taiwan.md rename to english/trip-to-Taiwan/trip-to-Taiwan.md From b8be1130ae4c8c6b2c54b215a39b7d4596757f6a Mon Sep 17 00:00:00 2001 From: Adrian Williams Date: Wed, 1 Jun 2016 14:50:37 +0100 Subject: [PATCH 3553/5486] docs: Add free vs nano --- english/love-udacity/love-udacity.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/love-udacity/love-udacity.md b/english/love-udacity/love-udacity.md index c47f24974e..83adbffd53 100644 --- a/english/love-udacity/love-udacity.md +++ b/english/love-udacity/love-udacity.md @@ -4,4 +4,4 @@ Getting books and buying courses didn't help until I met Udacity. She has been the difference and now I am confident I can be a developer. -I am glad you also met [Udacity](http://www.udacity.com) \ No newline at end of file +The question is do you keep using the free courses or plump for the nano-degree? From ee580b0737684850b7e8e655643d914ac1ffda94 Mon Sep 17 00:00:00 2001 From: Adrian Williams Date: Wed, 1 Jun 2016 15:12:35 +0100 Subject: [PATCH 3554/5486] docs: Re-add line to allow auto merge --- english/love-udacity/love-udacity.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/love-udacity/love-udacity.md b/english/love-udacity/love-udacity.md index 83adbffd53..6ebc24db86 100644 --- a/english/love-udacity/love-udacity.md +++ b/english/love-udacity/love-udacity.md @@ -4,4 +4,6 @@ Getting books and buying courses didn't help until I met Udacity. She has been the difference and now I am confident I can be a developer. +I am glad you also met [Udacity](http://www.udacity.com) + The question is do you keep using the free courses or plump for the nano-degree? From 40301aa668e9bcc2b5301c3dda60f8d638cf69fa Mon Sep 17 00:00:00 2001 From: Marco Date: Wed, 1 Jun 2016 17:12:35 +0200 Subject: [PATCH 3555/5486] Add a new storyline (spanish) --- espanol/canudos.md | 2 ++ espanol/pasadizo/pasadizo.md | 11 +++++++++++ espanol/pasadizo/ruta/caida/aires.md | 5 +++++ espanol/pasadizo/ruta/caida/escalera.md | 5 +++++ espanol/pasadizo/ruta/plaza.md | 10 ++++++++++ espanol/pasadizo/ruta/sotano.md | 6 ++++++ 6 files changed, 39 insertions(+) create mode 100644 espanol/pasadizo/pasadizo.md create mode 100644 espanol/pasadizo/ruta/caida/aires.md create mode 100644 espanol/pasadizo/ruta/caida/escalera.md create mode 100644 espanol/pasadizo/ruta/plaza.md create mode 100644 espanol/pasadizo/ruta/sotano.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 9323fdacb8..ae2b19b55e 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -148,3 +148,5 @@ solo [Escapó](escapo/escapo.md) Y llego [Daynerys Targaryen](thrones/daynerys.md) +[Temeroso, ordenó que lo guiaran al pasadizo que le llevaría fuera de la ciudad](pasadizo/pasadizo.md) + diff --git a/espanol/pasadizo/pasadizo.md b/espanol/pasadizo/pasadizo.md new file mode 100644 index 0000000000..cbb9f56c05 --- /dev/null +++ b/espanol/pasadizo/pasadizo.md @@ -0,0 +1,11 @@ +l y sus sbditos bajaron corriendo las escaleras de la torre en la que se encontraban. +Sus pasos eran lentos, pues la gordura del Consejero impeda que sus lacayos se +movieran con rapidez; acostumbraba a ir sentado en un asiento, llevado a hombros de +cuatro varones vrgenes. + +Al llegar a la plaza de la torre, ya se oan el ruido de las armaduras y los gritos +de dolor. Apremiados por la situacin, decidieron: + +[Cruzar la plaza, despistando al enemigo acercndose a l](ruta/plaza.md) + +[Seguir bajando hasta el stano de la torre](ruta/sotano.md) \ No newline at end of file diff --git a/espanol/pasadizo/ruta/caida/aires.md b/espanol/pasadizo/ruta/caida/aires.md new file mode 100644 index 0000000000..72a9c3bbc4 --- /dev/null +++ b/espanol/pasadizo/ruta/caida/aires.md @@ -0,0 +1,5 @@ +El Consejero vol todos los metros que le permita su masa corporal, estreyndose +contra el suelo. +Su blando cuerpo, inmvil en el pavimento, no fue capaz de soportar la fuerza del impacto. +Los vrgenes y el resto de integrantes del grupo huyeron aliviados, felices al haber +dejado atrs tan pesada carga. \ No newline at end of file diff --git a/espanol/pasadizo/ruta/caida/escalera.md b/espanol/pasadizo/ruta/caida/escalera.md new file mode 100644 index 0000000000..5120852a02 --- /dev/null +++ b/espanol/pasadizo/ruta/caida/escalera.md @@ -0,0 +1,5 @@ +El Consejero rod escaleras abajo, sufriendo el impacto contra los mltiples escalones. +Desgraciadamente, su blando cuerpo no pudo soportar la presin, rompindose el +cuello con los golpes. +Los vrgenes y el resto de integrantes del grupo, entonces, rompieron en un estallido +de jbilo, huyendo libres de la carga que soportaban. \ No newline at end of file diff --git a/espanol/pasadizo/ruta/plaza.md b/espanol/pasadizo/ruta/plaza.md new file mode 100644 index 0000000000..de50877dc8 --- /dev/null +++ b/espanol/pasadizo/ruta/plaza.md @@ -0,0 +1,10 @@ +El Consejero y su corte cruzaron corriendo la plaza, esperando confundir al enemigo +al no esperar encontrarlos tan cerca. +Bajaron corriendo los 50 escalones que los separaban de la siguiente etapa de su huida, +pero el Consejero pesaba demasiado. Uno de los vrgenes, uno de los pilares de su trono, +sucumbi ante el cansancio y se derrumb. El consorte restante no pudo soportar el +peso, cayendo escaleras abajo y viendo como el Consejero descubra qu es la gravedad. +Ante sus sorprendidos ojos: + +[Vieron como volaba por los aires](caida/aires.md) +[Vieron como rodaba escalera abajo](caida/escalera.md) \ No newline at end of file diff --git a/espanol/pasadizo/ruta/sotano.md b/espanol/pasadizo/ruta/sotano.md new file mode 100644 index 0000000000..4fc48f888b --- /dev/null +++ b/espanol/pasadizo/ruta/sotano.md @@ -0,0 +1,6 @@ +En el stano tiraron la estantera, aquella que tapaba la puerta al pasadizo. El +tiempo corra en su contra, no podan perder tiempo volviendo a tapar la entrada. +Tras un viaje sofocante, salieron al aire fresco, en aquellas verdes colinas situadas +detrs de la ciudad. Estaban exahustos, pero a salvo; slo les quedaba llegar a la +ciudad vecina, Npolis, y pedir ayuda al Rey. +El tiempo dir si el gordo Consejero podr salvarse de lo que iba a ser su destino. \ No newline at end of file From fff6b2c8a13145bea3dcc82c7533783414618ab8 Mon Sep 17 00:00:00 2001 From: Marco Date: Wed, 1 Jun 2016 17:25:19 +0200 Subject: [PATCH 3556/5486] Fix typo in plaza.md --- espanol/pasadizo/ruta/plaza.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/pasadizo/ruta/plaza.md b/espanol/pasadizo/ruta/plaza.md index de50877dc8..597f4ff2d1 100644 --- a/espanol/pasadizo/ruta/plaza.md +++ b/espanol/pasadizo/ruta/plaza.md @@ -7,4 +7,5 @@ peso, cayendo escaleras abajo y viendo como el Consejero descubr Ante sus sorprendidos ojos: [Vieron como volaba por los aires](caida/aires.md) + [Vieron como rodaba escalera abajo](caida/escalera.md) \ No newline at end of file From da5ae5db41bddefd60e6a646f88d7ab9e76dd367 Mon Sep 17 00:00:00 2001 From: Scott Date: Wed, 1 Jun 2016 12:57:26 -0230 Subject: [PATCH 3557/5486] Add option to change decision to open box --- english/schrodinger-cat/undead/undead.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/schrodinger-cat/undead/undead.md b/english/schrodinger-cat/undead/undead.md index 94413a6215..eee0348939 100644 --- a/english/schrodinger-cat/undead/undead.md +++ b/english/schrodinger-cat/undead/undead.md @@ -1 +1,3 @@ You remain an undead as long as the box is unopened. + +So [open it!](../dead-or-alive/dead-or-alive.md) From 91de0d3181be5a1cd43a24388d86d3241a6e5320 Mon Sep 17 00:00:00 2001 From: Marco Date: Wed, 1 Jun 2016 17:41:34 +0200 Subject: [PATCH 3558/5486] Fix structure of the storyline --- espanol/pasadizo/pasadizo.md | 4 ++-- espanol/pasadizo/{ruta/caida => plaza/aires}/aires.md | 0 espanol/pasadizo/{ruta/caida => plaza/escaleras}/escalera.md | 0 espanol/pasadizo/{ruta => plaza}/plaza.md | 4 ++-- espanol/pasadizo/{ruta => sotano}/sotano.md | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename espanol/pasadizo/{ruta/caida => plaza/aires}/aires.md (100%) rename espanol/pasadizo/{ruta/caida => plaza/escaleras}/escalera.md (100%) rename espanol/pasadizo/{ruta => plaza}/plaza.md (82%) rename espanol/pasadizo/{ruta => sotano}/sotano.md (100%) diff --git a/espanol/pasadizo/pasadizo.md b/espanol/pasadizo/pasadizo.md index cbb9f56c05..9a93c101b1 100644 --- a/espanol/pasadizo/pasadizo.md +++ b/espanol/pasadizo/pasadizo.md @@ -6,6 +6,6 @@ cuatro varones v Al llegar a la plaza de la torre, ya se oan el ruido de las armaduras y los gritos de dolor. Apremiados por la situacin, decidieron: -[Cruzar la plaza, despistando al enemigo acercndose a l](ruta/plaza.md) +[Cruzar la plaza, despistando al enemigo acercndose a l](plaza/plaza.md) -[Seguir bajando hasta el stano de la torre](ruta/sotano.md) \ No newline at end of file +[Seguir bajando hasta el stano de la torre](sotano/sotano.md) \ No newline at end of file diff --git a/espanol/pasadizo/ruta/caida/aires.md b/espanol/pasadizo/plaza/aires/aires.md similarity index 100% rename from espanol/pasadizo/ruta/caida/aires.md rename to espanol/pasadizo/plaza/aires/aires.md diff --git a/espanol/pasadizo/ruta/caida/escalera.md b/espanol/pasadizo/plaza/escaleras/escalera.md similarity index 100% rename from espanol/pasadizo/ruta/caida/escalera.md rename to espanol/pasadizo/plaza/escaleras/escalera.md diff --git a/espanol/pasadizo/ruta/plaza.md b/espanol/pasadizo/plaza/plaza.md similarity index 82% rename from espanol/pasadizo/ruta/plaza.md rename to espanol/pasadizo/plaza/plaza.md index 597f4ff2d1..be796c96e9 100644 --- a/espanol/pasadizo/ruta/plaza.md +++ b/espanol/pasadizo/plaza/plaza.md @@ -6,6 +6,6 @@ sucumbi peso, cayendo escaleras abajo y viendo como el Consejero descubra qu es la gravedad. Ante sus sorprendidos ojos: -[Vieron como volaba por los aires](caida/aires.md) +[Vieron como volaba por los aires](aires/aires.md) -[Vieron como rodaba escalera abajo](caida/escalera.md) \ No newline at end of file +[Vieron como rodaba escalera abajo](escalera/escalera.md) \ No newline at end of file diff --git a/espanol/pasadizo/ruta/sotano.md b/espanol/pasadizo/sotano/sotano.md similarity index 100% rename from espanol/pasadizo/ruta/sotano.md rename to espanol/pasadizo/sotano/sotano.md From 6c8ee230758f9667e31d26b41bd126cbe35a186a Mon Sep 17 00:00:00 2001 From: Marco Date: Wed, 1 Jun 2016 17:44:39 +0200 Subject: [PATCH 3559/5486] Fix typo in 'escalera/escalera.md' --- espanol/pasadizo/plaza/escalera/escalera.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 espanol/pasadizo/plaza/escalera/escalera.md diff --git a/espanol/pasadizo/plaza/escalera/escalera.md b/espanol/pasadizo/plaza/escalera/escalera.md new file mode 100644 index 0000000000..5120852a02 --- /dev/null +++ b/espanol/pasadizo/plaza/escalera/escalera.md @@ -0,0 +1,5 @@ +El Consejero rod escaleras abajo, sufriendo el impacto contra los mltiples escalones. +Desgraciadamente, su blando cuerpo no pudo soportar la presin, rompindose el +cuello con los golpes. +Los vrgenes y el resto de integrantes del grupo, entonces, rompieron en un estallido +de jbilo, huyendo libres de la carga que soportaban. \ No newline at end of file From adeddc1c5cef54d05ec8abbbcd83afcfce65c037 Mon Sep 17 00:00:00 2001 From: Marco Date: Wed, 1 Jun 2016 17:55:42 +0200 Subject: [PATCH 3560/5486] Removed unused file 'escaleras/escalera.md' --- espanol/pasadizo/plaza/escaleras/escalera.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 espanol/pasadizo/plaza/escaleras/escalera.md diff --git a/espanol/pasadizo/plaza/escaleras/escalera.md b/espanol/pasadizo/plaza/escaleras/escalera.md deleted file mode 100644 index 5120852a02..0000000000 --- a/espanol/pasadizo/plaza/escaleras/escalera.md +++ /dev/null @@ -1,5 +0,0 @@ -El Consejero rod escaleras abajo, sufriendo el impacto contra los mltiples escalones. -Desgraciadamente, su blando cuerpo no pudo soportar la presin, rompindose el -cuello con los golpes. -Los vrgenes y el resto de integrantes del grupo, entonces, rompieron en un estallido -de jbilo, huyendo libres de la carga que soportaban. \ No newline at end of file From e9fe57a95c31b5ff61fb8d81738bbd2c90fe6138 Mon Sep 17 00:00:00 2001 From: dfarina Date: Wed, 1 Jun 2016 22:14:43 -0500 Subject: [PATCH 3561/5486] =?UTF-8?q?Agregar=20la=20opci=C3=B3n=20de=20que?= =?UTF-8?q?=20el=20ej=C3=A9rcito=20estuviera=20dormido?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/torre/rey/dormidos/dormidos.md | 3 +++ espanol/torre/rey/rey.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 espanol/torre/rey/dormidos/dormidos.md diff --git a/espanol/torre/rey/dormidos/dormidos.md b/espanol/torre/rey/dormidos/dormidos.md new file mode 100644 index 0000000000..ff1d0628c1 --- /dev/null +++ b/espanol/torre/rey/dormidos/dormidos.md @@ -0,0 +1,3 @@ +Pero todo el ejército estaba dormido, como resultado del copioso almuerzo que acababan de +disfrutar y de la inmensa cantidad de vino que habían ingerido por motivo de la celebración +de las fiestas de la Comunidad del Fuego que habían comenzando una semana antes. diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index 84eb141fe7..0f37a9f156 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -1 +1,3 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. + +[Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) From 50a9886b2f7b906590526a9c343e13c179538f2b Mon Sep 17 00:00:00 2001 From: Jason Costa Date: Fri, 3 Jun 2016 01:52:52 -0400 Subject: [PATCH 3562/5486] Add detail about decision to deny cigarette to unicorn. --- english/unicorn/no/no.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/unicorn/no/no.md b/english/unicorn/no/no.md index 06096615cb..fb77838539 100644 --- a/english/unicorn/no/no.md +++ b/english/unicorn/no/no.md @@ -1,3 +1,4 @@ You lie and say that you're all out. Keith the Unicorn looks at you suspiciously and says he doesn't believe you. +His eyes are jaundiced, and he's better off without the smoke, but you worry that he may have the power to read minds. You feel awkward and realise that unicorns named Keith are overrated so [you wake up](../existence/existence.md). From 9314a8f16e6f4c55c84ec8d5bb207e96af3c6549 Mon Sep 17 00:00:00 2001 From: Konstantin Zhidkovskiy Date: Sat, 4 Jun 2016 13:13:14 +0300 Subject: [PATCH 3563/5486] Add story about my Zefir Dream --- russian/dream/dream.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/dream/dream.md b/russian/dream/dream.md index 07e5303e0d..5d5f4c0420 100644 --- a/russian/dream/dream.md +++ b/russian/dream/dream.md @@ -1,2 +1,3 @@ ...А во сне увижу, как просыпаюсь в комнате со стенами из зефира. -Зеваю, откусываю кусок и снова засыпаю... \ No newline at end of file +Зеваю, откусываю кусок и снова засыпаю... +И снова снится мне Зефир!!!!!!!!!!!...... \ No newline at end of file From 165c4f89e3ed23d87ad00c5005ac3614dd95bd68 Mon Sep 17 00:00:00 2001 From: copperware Date: Sat, 4 Jun 2016 20:57:43 +0600 Subject: [PATCH 3564/5486] Added a few lines to telepathy --- english/friendly-person/telepathy/telepathy.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/friendly-person/telepathy/telepathy.md b/english/friendly-person/telepathy/telepathy.md index 65c08c9cab..bf14a80a85 100644 --- a/english/friendly-person/telepathy/telepathy.md +++ b/english/friendly-person/telepathy/telepathy.md @@ -1 +1,5 @@ -You close your eyes and begin to concentrate. \ No newline at end of file +You close your eyes and begin to concentrate. +But for a long time you can't figure out what to concentrate on. +Your breathing? +Your feeling of utter confusion and terror? +Or the totally alien sensation associated with having a sealed mouth? \ No newline at end of file From 93657b4ea1b9fe1827066442bdc328658d92a852 Mon Sep 17 00:00:00 2001 From: Pajama Programmer Date: Sat, 4 Jun 2016 19:26:45 -0400 Subject: [PATCH 3565/5486] Marcel needs a new pair of shoes --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0ae59568b5..a7d199991d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -854,6 +854,7 @@ So shall you reap, and the [steelers](steelers/steelers.md) know that all too we Until you realize that even marshmallows need [LOVE](https://www.youtube.com/watch?v=i5fZ__mnHbU). +Marcel needs a new pair of shoes, will you buy shoes for [Marcel](https://www.youtube.com/watch?v=VF9-sEbqDvU)? You look up and out to the ocean. In the distance you see a [mermaid](mermaid/mermaid.md) From 8d06729989db1576b04c2118f26a9d1b2628982b Mon Sep 17 00:00:00 2001 From: Alrashed Date: Sat, 4 Jun 2016 19:51:31 -0700 Subject: [PATCH 3566/5486] Add batmetal option to batman.md --- english/I'm-batman/batman.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index 4798983b69..80010d48df 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -5,4 +5,6 @@ Be careful of the Joker! [Realize that you are Batman and have the Utility Belt on you. Yeah!!!](https://youtu.be/YpIQQeL2ZYk?t=22s) Alfred Pennyworth: Why do we fall sir? So we might learn to pick ourselves up. -Bruce Wayne: You still haven't given up on [me](https://www.youtube.com/watch?v=u843KNE-exo)? +Bruce Wayne: You still haven't given up on [me](https://www.youtube.com/watch?v=u843KNE-exo)? + +Batman: [It's time...](../batmetal/batmetal.md) From bb63d014d9bf3303df95516d6c4ce60283f112d6 Mon Sep 17 00:00:00 2001 From: Alrashed Date: Sat, 4 Jun 2016 19:56:47 -0700 Subject: [PATCH 3567/5486] Add batmetal link to batmetal.md --- english/I'm-batman/batmetal/batmetal.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/I'm-batman/batmetal/batmetal.md diff --git a/english/I'm-batman/batmetal/batmetal.md b/english/I'm-batman/batmetal/batmetal.md new file mode 100644 index 0000000000..3562247c8c --- /dev/null +++ b/english/I'm-batman/batmetal/batmetal.md @@ -0,0 +1 @@ +[I AM BE DANGEROUS NOW](https://www.youtube.com/watch?v=qatmJtIJAPw). From cceb3d9384b22b022af86cf05e717b447660af3a Mon Sep 17 00:00:00 2001 From: Alrashed Date: Sat, 4 Jun 2016 20:03:45 -0700 Subject: [PATCH 3568/5486] Fix link to batmetal --- english/I'm-batman/batman.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index 80010d48df..de6105e830 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -7,4 +7,4 @@ Be careful of the Joker! Alfred Pennyworth: Why do we fall sir? So we might learn to pick ourselves up. Bruce Wayne: You still haven't given up on [me](https://www.youtube.com/watch?v=u843KNE-exo)? -Batman: [It's time...](../batmetal/batmetal.md) +Batman: [It's time...](/batmetal/batmetal.md) From 490d46184326095ef933c96a17103d734796fba7 Mon Sep 17 00:00:00 2001 From: Alrashed Date: Sat, 4 Jun 2016 20:10:41 -0700 Subject: [PATCH 3569/5486] Fix batmetal.md directory and its link in batman.md --- english/I'm-batman/batman.md | 2 +- english/batmetal/batmetal.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 english/batmetal/batmetal.md diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index de6105e830..80010d48df 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -7,4 +7,4 @@ Be careful of the Joker! Alfred Pennyworth: Why do we fall sir? So we might learn to pick ourselves up. Bruce Wayne: You still haven't given up on [me](https://www.youtube.com/watch?v=u843KNE-exo)? -Batman: [It's time...](/batmetal/batmetal.md) +Batman: [It's time...](../batmetal/batmetal.md) diff --git a/english/batmetal/batmetal.md b/english/batmetal/batmetal.md new file mode 100644 index 0000000000..3562247c8c --- /dev/null +++ b/english/batmetal/batmetal.md @@ -0,0 +1 @@ +[I AM BE DANGEROUS NOW](https://www.youtube.com/watch?v=qatmJtIJAPw). From 4b3c66cba35ba88761b3070965a7a135e83aaf6f Mon Sep 17 00:00:00 2001 From: Alrashed Date: Sat, 4 Jun 2016 20:18:34 -0700 Subject: [PATCH 3570/5486] Delete batmetal file from I'm batman file --- english/I'm-batman/batmetal/batmetal.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 english/I'm-batman/batmetal/batmetal.md diff --git a/english/I'm-batman/batmetal/batmetal.md b/english/I'm-batman/batmetal/batmetal.md deleted file mode 100644 index 3562247c8c..0000000000 --- a/english/I'm-batman/batmetal/batmetal.md +++ /dev/null @@ -1 +0,0 @@ -[I AM BE DANGEROUS NOW](https://www.youtube.com/watch?v=qatmJtIJAPw). From 890463b249847ceb4192192f0844629d1e28ed5a Mon Sep 17 00:00:00 2001 From: Chanchana Sornsoontorn Date: Sun, 5 Jun 2016 12:28:05 +0700 Subject: [PATCH 3571/5486] Add more song MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5 นาทีบรรลุธรรม --- Thai/Songs/ThaiSong_FanJa.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Thai/Songs/ThaiSong_FanJa.md b/Thai/Songs/ThaiSong_FanJa.md index c06765d126..2e938ad119 100644 --- a/Thai/Songs/ThaiSong_FanJa.md +++ b/Thai/Songs/ThaiSong_FanJa.md @@ -22,4 +22,15 @@ Do you: [a-academy](http://www.a-academy.net/) by Torr Nov 7, 2015 -##################################### \ No newline at end of file +##################################### + +================================= +ผมชอบเพลงนี้มากกว่าครับ + +[5 นาทีบรรลุธรรม](https://www.youtube.com/watch?v=3aIcqeZ1ktY) + +หากผู้ใดผ่านคอร์สยูดาซิตี้นี้เหมือนกัน กรุณามาเพิ่มเพลงเพราะๆให้ฟังด้วย tag ผมด้วยนะจ๊ะ + +Git/GitHub จงเจริญ โย่วๆ + +by [Off](http://www.facebook.com/off99555) อิอิ เทส ฮัลโหล ทดสอบ สตอรี่ บอทจงมา accept this pull request now From 868acd0c8ecbabd97090b275876915f52c0026d1 Mon Sep 17 00:00:00 2001 From: Alrashed Date: Sun, 5 Jun 2016 03:36:06 -0700 Subject: [PATCH 3572/5486] Revert "Add batmetal option to batman.md" This reverts commit 8d06729989db1576b04c2118f26a9d1b2628982b. --- english/I'm-batman/batman.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index 80010d48df..4798983b69 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -5,6 +5,4 @@ Be careful of the Joker! [Realize that you are Batman and have the Utility Belt on you. Yeah!!!](https://youtu.be/YpIQQeL2ZYk?t=22s) Alfred Pennyworth: Why do we fall sir? So we might learn to pick ourselves up. -Bruce Wayne: You still haven't given up on [me](https://www.youtube.com/watch?v=u843KNE-exo)? - -Batman: [It's time...](../batmetal/batmetal.md) +Bruce Wayne: You still haven't given up on [me](https://www.youtube.com/watch?v=u843KNE-exo)? From d11af29ecdeeff358fc9721d6e56a77dbef44380 Mon Sep 17 00:00:00 2001 From: Alrashed Date: Sun, 5 Jun 2016 03:56:32 -0700 Subject: [PATCH 3573/5486] Add batmetal page link to batman.md --- english/I'm-batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index 4798983b69..5ac0201bc7 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -6,3 +6,5 @@ Be careful of the Joker! Alfred Pennyworth: Why do we fall sir? So we might learn to pick ourselves up. Bruce Wayne: You still haven't given up on [me](https://www.youtube.com/watch?v=u843KNE-exo)? + +Batman: [It's time...](../batmetal/batmetal.md) From 4d9b8ebd61a57f2b7cd649aaaa7355c0e9b870f3 Mon Sep 17 00:00:00 2001 From: lierluis Date: Mon, 6 Jun 2016 01:31:39 -0700 Subject: [PATCH 3574/5486] Add line to story --- .../woman/hop-into-car/big-bump/strange-thing.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/talk_to_neighbour/woman/hop-into-car/big-bump/strange-thing.md b/english/talk_to_neighbour/woman/hop-into-car/big-bump/strange-thing.md index 7ae2a23630..7f4087b3aa 100644 --- a/english/talk_to_neighbour/woman/hop-into-car/big-bump/strange-thing.md +++ b/english/talk_to_neighbour/woman/hop-into-car/big-bump/strange-thing.md @@ -1 +1,3 @@ -In the rear-view mirrow you see an oddly shaped thing laying in the middel of the road... \ No newline at end of file +In the rear-view mirrow you see an oddly shaped thing laying in the middel of the road... + +Without paying attention to the road, you drive off of a cliff! \ No newline at end of file From dfc69826b706e34f013b7a82aec777b08e4451a4 Mon Sep 17 00:00:00 2001 From: ghub12v Date: Mon, 6 Jun 2016 18:56:39 +0300 Subject: [PATCH 3575/5486] Add option to sleep after meditation. --- english/meditation/meditation.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/meditation/meditation.md b/english/meditation/meditation.md index ea8fb118cc..3fb1d5609b 100644 --- a/english/meditation/meditation.md +++ b/english/meditation/meditation.md @@ -1,3 +1,5 @@ You should relax, you completed the git course, good job! +You feel relaxed and sleepy... Go to sleep? -Click [here](https://www.youtube.com/watch?v=2u86NS3NtMw)! \ No newline at end of file +Click [here](https://www.youtube.com/watch?v=2u86NS3NtMw)! +[Go to sleep](expired-milk/expired-milk.md)? From 3f212fb70448def506ebbad2f26f7214719adcca Mon Sep 17 00:00:00 2001 From: ghub12v Date: Mon, 6 Jun 2016 19:06:51 +0300 Subject: [PATCH 3576/5486] Update meditation.md --- english/meditation/meditation.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/meditation/meditation.md b/english/meditation/meditation.md index 3fb1d5609b..fb1f197c2d 100644 --- a/english/meditation/meditation.md +++ b/english/meditation/meditation.md @@ -2,4 +2,5 @@ You should relax, you completed the git course, good job! You feel relaxed and sleepy... Go to sleep? Click [here](https://www.youtube.com/watch?v=2u86NS3NtMw)! -[Go to sleep](expired-milk/expired-milk.md)? + +[Go to sleep](../sleep/more-sleep/expired-milk/expired-milk.md)? From 7799ee772f2a3da4ee1e5aaa46113597d5d0c0b7 Mon Sep 17 00:00:00 2001 From: Gustavo De Leon Date: Mon, 6 Jun 2016 13:35:59 -0700 Subject: [PATCH 3577/5486] Add maximum income article link --- english/stopbernie/stopbernie.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/stopbernie/stopbernie.md b/english/stopbernie/stopbernie.md index 4ae37e04ec..4e7aa291d8 100644 --- a/english/stopbernie/stopbernie.md +++ b/english/stopbernie/stopbernie.md @@ -1,5 +1,7 @@ Nothing is free. [Even the middle class will pay more under Bernie Sanders](http://goo.gl/uZIN0d) +Did you know Bernie Sanders has even flirted with a [maximum income](http://www.bloomberg.com/politics/articles/2015-11-18/bernie-sanders-flirted-with-100-percent-marginal-tax-on-the-rich-maximum-wage)? + Go [back to menu](../marshmallow.md) Instead of going back you wonder... Can the truth and validity about a tax plan @@ -14,4 +16,4 @@ And despite a few less dollars for the rich, we will all be better off. You chuckle to yourself reading the additions, and are suddenly reminded of wiki talk pages. -Hey, if the guy from the other party wins, you could always [move to Canada](../Canada/Canada.md). \ No newline at end of file +Hey, if the guy from the other party wins, you could always [move to Canada](../Canada/Canada.md). From d3e818d29367580e9774eedc1e80ea43ac6906b8 Mon Sep 17 00:00:00 2001 From: Gustavo De Leon Date: Mon, 6 Jun 2016 13:40:23 -0700 Subject: [PATCH 3578/5486] Switch full link for short version --- english/stopbernie/stopbernie.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/stopbernie/stopbernie.md b/english/stopbernie/stopbernie.md index 4e7aa291d8..dd29659603 100644 --- a/english/stopbernie/stopbernie.md +++ b/english/stopbernie/stopbernie.md @@ -1,6 +1,6 @@ Nothing is free. [Even the middle class will pay more under Bernie Sanders](http://goo.gl/uZIN0d) -Did you know Bernie Sanders has even flirted with a [maximum income](http://www.bloomberg.com/politics/articles/2015-11-18/bernie-sanders-flirted-with-100-percent-marginal-tax-on-the-rich-maximum-wage)? +Did you know Bernie Sanders has even flirted with a [maximum income](http://goo.gl/AvGGSv)? Go [back to menu](../marshmallow.md) From f03fb6b37700a4f996b129a3922bb190eef777bc Mon Sep 17 00:00:00 2001 From: Arsanios Mickael Date: Mon, 6 Jun 2016 23:16:00 +0200 Subject: [PATCH 3579/5486] add mystery drink --- english/drink/drink.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/drink/drink.md diff --git a/english/drink/drink.md b/english/drink/drink.md new file mode 100644 index 0000000000..5b21abf065 --- /dev/null +++ b/english/drink/drink.md @@ -0,0 +1 @@ +it's just water everybody , you are fine probably , or are you ?, no it is fine don't worry. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index a7d199991d..9a94493744 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -987,3 +987,5 @@ You decide you want to be a pirate and remember a show called [onepiece](onepiece/op.md) You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Taiwan.md)! + +you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) From e4d50bc5f23e9c80653f1e7986b6b345e5da7f77 Mon Sep 17 00:00:00 2001 From: dariox2 Date: Mon, 6 Jun 2016 18:56:14 -0300 Subject: [PATCH 3580/5486] =?UTF-8?q?Agrega=202=20l=C3=ADneas=20en=20miedo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/miedo/miedo.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/espanol/miedo/miedo.md b/espanol/miedo/miedo.md index 62483cda7b..4c0a251a50 100644 --- a/espanol/miedo/miedo.md +++ b/espanol/miedo/miedo.md @@ -1,2 +1,8 @@ Eres entonces una persona muy valiente y como tal deberas demostrarlo. + +Si fueses cobarde, pues entonces nada hara falta demostrar; y podras enfrentar +mltiples aventuras sin miedo de hacer un papeln. + +Pero dado que has nacido con la maldicin de la valenta, debes conjurar tu destino, +venciendo al miedo. From fddb30d7f3afad4c7db46722525da0f21c1d64fa Mon Sep 17 00:00:00 2001 From: Paul Crompton Date: Tue, 7 Jun 2016 10:08:10 -0400 Subject: [PATCH 3581/5486] Added WWIII option to Donald Trump --- english/vote-the-president/trump/trump.md | 4 +++- english/watch-star-wars/WWIII/WWIII.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/watch-star-wars/WWIII/WWIII.md diff --git a/english/vote-the-president/trump/trump.md b/english/vote-the-president/trump/trump.md index 8c206891b6..c233941d8e 100644 --- a/english/vote-the-president/trump/trump.md +++ b/english/vote-the-president/trump/trump.md @@ -1,3 +1,5 @@ You made America great again. Now its time to build a wall. Call 987654321 to contact Bob the builder. -It's gonna be huuuuge! \ No newline at end of file +It's gonna be huuuuge! + +Are you ready for [WWIII](WWIII/WWIII.md)? \ No newline at end of file diff --git a/english/watch-star-wars/WWIII/WWIII.md b/english/watch-star-wars/WWIII/WWIII.md new file mode 100644 index 0000000000..1dd1b6433e --- /dev/null +++ b/english/watch-star-wars/WWIII/WWIII.md @@ -0,0 +1 @@ +After the wall is completed, President Trump sends Mexico a bill for $8 billion to Mexico. Mexico doesn't like that, and declares war on the U.S. The rest is downhill from here... \ No newline at end of file From 76eedde43bff0c3b432cee7a196e2cb371c8e784 Mon Sep 17 00:00:00 2001 From: Paul Crompton Date: Tue, 7 Jun 2016 10:20:11 -0400 Subject: [PATCH 3582/5486] move WWIII dir to correct location --- .../{watch-star-wars => vote-the-president/trump}/WWIII/WWIII.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/{watch-star-wars => vote-the-president/trump}/WWIII/WWIII.md (100%) diff --git a/english/watch-star-wars/WWIII/WWIII.md b/english/vote-the-president/trump/WWIII/WWIII.md similarity index 100% rename from english/watch-star-wars/WWIII/WWIII.md rename to english/vote-the-president/trump/WWIII/WWIII.md From 9adcaac316e4627fba48f745bf93accd30af5b5c Mon Sep 17 00:00:00 2001 From: Paul Crompton Date: Tue, 7 Jun 2016 10:23:56 -0400 Subject: [PATCH 3583/5486] eliminate small redundancy in WWIII --- english/watch-star-wars/WWIII.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/watch-star-wars/WWIII.md diff --git a/english/watch-star-wars/WWIII.md b/english/watch-star-wars/WWIII.md new file mode 100644 index 0000000000..5ae5c3b9b5 --- /dev/null +++ b/english/watch-star-wars/WWIII.md @@ -0,0 +1 @@ +After the wall is completed, President Trump sends Mexico a bill for $8 billion. Mexico doesn't like that, and declares war on the U.S. The rest is downhill from here... \ No newline at end of file From 3ab7a1a6c19aac188c0cf2ba37984c90bf4dd8bb Mon Sep 17 00:00:00 2001 From: Paul Crompton Date: Tue, 7 Jun 2016 10:38:17 -0400 Subject: [PATCH 3584/5486] moved WWWIII dir again to the real correct place --- english/{vote-the-president/trump => }/WWIII/WWIII.md | 0 english/vote-the-president/trump/trump.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename english/{vote-the-president/trump => }/WWIII/WWIII.md (100%) diff --git a/english/vote-the-president/trump/WWIII/WWIII.md b/english/WWIII/WWIII.md similarity index 100% rename from english/vote-the-president/trump/WWIII/WWIII.md rename to english/WWIII/WWIII.md diff --git a/english/vote-the-president/trump/trump.md b/english/vote-the-president/trump/trump.md index c233941d8e..cf5653c032 100644 --- a/english/vote-the-president/trump/trump.md +++ b/english/vote-the-president/trump/trump.md @@ -2,4 +2,4 @@ You made America great again. Now its time to build a wall. Call 987654321 to co It's gonna be huuuuge! -Are you ready for [WWIII](WWIII/WWIII.md)? \ No newline at end of file +Are you ready for [WWIII](english/WWIII/WWIII.md)? \ No newline at end of file From b9749c7d978449e9a2138a1a33650655d2dd693e Mon Sep 17 00:00:00 2001 From: Paul Crompton Date: Tue, 7 Jun 2016 10:52:02 -0400 Subject: [PATCH 3585/5486] change file path in trump.md --- english/vote-the-president/trump/trump.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/vote-the-president/trump/trump.md b/english/vote-the-president/trump/trump.md index cf5653c032..4e97ca275a 100644 --- a/english/vote-the-president/trump/trump.md +++ b/english/vote-the-president/trump/trump.md @@ -2,4 +2,4 @@ You made America great again. Now its time to build a wall. Call 987654321 to co It's gonna be huuuuge! -Are you ready for [WWIII](english/WWIII/WWIII.md)? \ No newline at end of file +Are you ready for [WWIII](../../WWIII/WWIII.md)? \ No newline at end of file From 882d267f69271ff608af1d6d97eb629e7c7284a0 Mon Sep 17 00:00:00 2001 From: Ashraf Ali Date: Tue, 7 Jun 2016 22:49:12 +0700 Subject: [PATCH 3586/5486] Add line to die.md --- english/light-fire/fire/die/die.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/light-fire/fire/die/die.md b/english/light-fire/fire/die/die.md index 27acc27aa0..8678e788be 100644 --- a/english/light-fire/fire/die/die.md +++ b/english/light-fire/fire/die/die.md @@ -1 +1,2 @@ -Well, it's simple. You Die. Rest in Peace. \ No newline at end of file +You fail to extinguish the fire and.... +Well, it's simple. You Die. Rest in Peace. From 6a17fc0a4924b1b5bfcdf5dea7cb5a0d208321c2 Mon Sep 17 00:00:00 2001 From: Ashraf Ali Date: Tue, 7 Jun 2016 22:56:29 +0700 Subject: [PATCH 3587/5486] Fix to match note --- english/light-fire/fire/die/die.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/light-fire/fire/die/die.md b/english/light-fire/fire/die/die.md index 8678e788be..82545e14cf 100644 --- a/english/light-fire/fire/die/die.md +++ b/english/light-fire/fire/die/die.md @@ -1,2 +1,2 @@ -You fail to extinguish the fire and.... Well, it's simple. You Die. Rest in Peace. +Your body slowly degrades to ash as everyone forgets you ever existed. From db868247f5259a78068b655995d024fa8a8b5170 Mon Sep 17 00:00:00 2001 From: Polo Martin Date: Tue, 7 Jun 2016 12:37:50 -0400 Subject: [PATCH 3588/5486] Add experiment plotline --- english/ghostbusters/ghostbusters.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/ghostbusters/ghostbusters.md b/english/ghostbusters/ghostbusters.md index 8809bfc259..e3583882fe 100644 --- a/english/ghostbusters/ghostbusters.md +++ b/english/ghostbusters/ghostbusters.md @@ -48,10 +48,12 @@ WHERE AM I ??? a voice calls out from your right -You sense a cloaked figure with +You sense a cloaked figure with electric [blue eyes] (../goosebumps/goosebumps.md) approach. +"This time the experiment worked," the figure says before kneeling in front of you. + From cab950cc4aa197f92c8014906b6fc3f071422de3 Mon Sep 17 00:00:00 2001 From: Paul Crompton Date: Tue, 7 Jun 2016 12:42:01 -0400 Subject: [PATCH 3589/5486] move WWIII dir back into trump dir --- english/{ => vote-the-president/trump}/WWIII/WWIII.md | 0 english/vote-the-president/trump/trump.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename english/{ => vote-the-president/trump}/WWIII/WWIII.md (100%) diff --git a/english/WWIII/WWIII.md b/english/vote-the-president/trump/WWIII/WWIII.md similarity index 100% rename from english/WWIII/WWIII.md rename to english/vote-the-president/trump/WWIII/WWIII.md diff --git a/english/vote-the-president/trump/trump.md b/english/vote-the-president/trump/trump.md index 4e97ca275a..3e91b315e2 100644 --- a/english/vote-the-president/trump/trump.md +++ b/english/vote-the-president/trump/trump.md @@ -2,4 +2,4 @@ You made America great again. Now its time to build a wall. Call 987654321 to co It's gonna be huuuuge! -Are you ready for [WWIII](../../WWIII/WWIII.md)? \ No newline at end of file +Are you ready for [WWIII](./WWIII/WWIII.md)? \ No newline at end of file From a2e25c4654fb6e0eac862ef022eb823bb5ff1305 Mon Sep 17 00:00:00 2001 From: Paul Crompton Date: Tue, 7 Jun 2016 12:45:05 -0400 Subject: [PATCH 3590/5486] deleted WWIII dir from watch-star-wars dir --- english/watch-star-wars/WWIII.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/watch-star-wars/WWIII.md b/english/watch-star-wars/WWIII.md index 5ae5c3b9b5..4161247a0f 100644 --- a/english/watch-star-wars/WWIII.md +++ b/english/watch-star-wars/WWIII.md @@ -1 +1,3 @@ -After the wall is completed, President Trump sends Mexico a bill for $8 billion. Mexico doesn't like that, and declares war on the U.S. The rest is downhill from here... \ No newline at end of file +After the wall is completed, President Trump sends Mexico a bill for $8 billion. +Mexico doesn't like that, and declares war on the U.S. +The rest is downhill from here... \ No newline at end of file From fd5eca1673376caf12df45753c4d4b647f50db7c Mon Sep 17 00:00:00 2001 From: Tom VanDerPuy Date: Tue, 7 Jun 2016 11:48:42 -0500 Subject: [PATCH 3591/5486] Added watch-honey-badger option --- english/watch-honey-badger/watch-honey-badger.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/watch-honey-badger/watch-honey-badger.md diff --git a/english/watch-honey-badger/watch-honey-badger.md b/english/watch-honey-badger/watch-honey-badger.md new file mode 100644 index 0000000000..c4dcbfe0c6 --- /dev/null +++ b/english/watch-honey-badger/watch-honey-badger.md @@ -0,0 +1,3 @@ +You [watch](https://www.youtube.com/watch?v=4r7wHMg5Yjg) a video about a honey badger. + +You contemplate what life would be like without the honey badger. \ No newline at end of file From 22aa854eca7a207b817f425e37a007437c713344 Mon Sep 17 00:00:00 2001 From: Paul Crompton Date: Tue, 7 Jun 2016 12:49:07 -0400 Subject: [PATCH 3592/5486] delete WWIII.md from watch-star-wars dir --- english/watch-star-wars/WWIII.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 english/watch-star-wars/WWIII.md diff --git a/english/watch-star-wars/WWIII.md b/english/watch-star-wars/WWIII.md deleted file mode 100644 index 4161247a0f..0000000000 --- a/english/watch-star-wars/WWIII.md +++ /dev/null @@ -1,3 +0,0 @@ -After the wall is completed, President Trump sends Mexico a bill for $8 billion. -Mexico doesn't like that, and declares war on the U.S. -The rest is downhill from here... \ No newline at end of file From f6878fcbfe794b50f2b1398323f9c5b03131022e Mon Sep 17 00:00:00 2001 From: Paul Crompton Date: Tue, 7 Jun 2016 12:53:44 -0400 Subject: [PATCH 3593/5486] split up lines in WWIII.md --- english/vote-the-president/trump/WWIII/WWIII.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/vote-the-president/trump/WWIII/WWIII.md b/english/vote-the-president/trump/WWIII/WWIII.md index 1dd1b6433e..0fb921435c 100644 --- a/english/vote-the-president/trump/WWIII/WWIII.md +++ b/english/vote-the-president/trump/WWIII/WWIII.md @@ -1 +1,3 @@ -After the wall is completed, President Trump sends Mexico a bill for $8 billion to Mexico. Mexico doesn't like that, and declares war on the U.S. The rest is downhill from here... \ No newline at end of file +After the wall is completed, President Trump sends Mexico a bill for $8 billion to Mexico. +Mexico doesn't like that, and declares war on the U.S. +The rest is downhill from here... \ No newline at end of file From ff1beb3d08287cd087d459de8bffd7d38c19ac8d Mon Sep 17 00:00:00 2001 From: Tom VanDerPuy Date: Tue, 7 Jun 2016 11:56:15 -0500 Subject: [PATCH 3594/5486] Updated watch-honey-badger with link from watch-star-wars --- english/watch-star-wars/watch-star-wars.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/watch-star-wars/watch-star-wars.md b/english/watch-star-wars/watch-star-wars.md index 06a66c06c1..b8865d6110 100644 --- a/english/watch-star-wars/watch-star-wars.md +++ b/english/watch-star-wars/watch-star-wars.md @@ -1,3 +1,6 @@ You have December 18, 2015 etched in your mind. If you do not, Google "a long time ago in a galaxy far far away" right now. [Go back](../marshmallow.md) + +Would you like to know more? +[Watch Honey Badger](../watch-honey-badger/watch-honey-badger.md) From 38b726ad5dc7df41e5d503aefb146de0548ddf00 Mon Sep 17 00:00:00 2001 From: Polo Martin Date: Tue, 7 Jun 2016 13:15:54 -0400 Subject: [PATCH 3595/5486] Add new line --- english/ghostbusters/ghostbusters.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/ghostbusters/ghostbusters.md b/english/ghostbusters/ghostbusters.md index e3583882fe..f5c56913fc 100644 --- a/english/ghostbusters/ghostbusters.md +++ b/english/ghostbusters/ghostbusters.md @@ -54,6 +54,8 @@ electric [blue eyes] (../goosebumps/goosebumps.md) approach. "This time the experiment worked," the figure says before kneeling in front of you. +The numbness starts receding. + From c1d0da75aac7dae12b8f2a6cd365252cfdc26380 Mon Sep 17 00:00:00 2001 From: PriBala Date: Tue, 7 Jun 2016 14:34:48 -0400 Subject: [PATCH 3596/5486] Make hot chocolate with marshmallows --- english/hot-chocolate-time/makehotchocolate.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/hot-chocolate-time/makehotchocolate.md diff --git a/english/hot-chocolate-time/makehotchocolate.md b/english/hot-chocolate-time/makehotchocolate.md new file mode 100644 index 0000000000..9f042bda6f --- /dev/null +++ b/english/hot-chocolate-time/makehotchocolate.md @@ -0,0 +1 @@ +All that work has made me thirsty. Time for some hot chocolate with marshmallows... \ No newline at end of file From b05a8553a1a346daab6671fc4cab1487ee4325f2 Mon Sep 17 00:00:00 2001 From: PriBala Date: Tue, 7 Jun 2016 14:36:21 -0400 Subject: [PATCH 3597/5486] Add hot chocolate option after dancing --- english/dance/dance.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/dance/dance.md b/english/dance/dance.md index 9325e5de88..e92eb7ba92 100644 --- a/english/dance/dance.md +++ b/english/dance/dance.md @@ -36,6 +36,8 @@ it is a dancing cat [Want coffee?](../coffee/coffee.md) +[Make hot chocolate?](../hot-chocolate-time/makehotchocolate.md) + [Want to read a story](../myStory/mayank.md) [Dance like it's 1999](https://www.youtube.com/watch?v=xWiUvn2KBu4) From 893347a3c33696c7eafce7b196435f7af61f851c Mon Sep 17 00:00:00 2001 From: David Martinez Date: Tue, 7 Jun 2016 22:21:42 +0200 Subject: [PATCH 3598/5486] Add new storyline with Zipi & Zape --- espanol/canudos.md | 13 +++++++------ espanol/zipizape/zipizape.md | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 espanol/zipizape/zipizape.md diff --git a/espanol/canudos.md b/espanol/canudos.md index ae2b19b55e..96b6ec57f4 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -2,6 +2,8 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del i república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: +Hizo llamar a [Zipi y Zape](zipizape/zipizape.md) para recibir al ejército. + Hizo un gesto de [cansancio](cansancio/cansancio.md) [Hizo un gesto a Beatito](revolucion/revolucion.md) @@ -43,7 +45,7 @@ and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyA [Subió a la torre](torre/torre.md) -Se cansó de la guerra y decidió alienarse de todo lo material, +Se cansó de la guerra y decidió alienarse de todo lo material, accediendo a un [estado de meditación transcendente](transcender/transcender.md) [Ordenó buscar al Capitán Trueno](capitan/trueno.md) @@ -102,7 +104,7 @@ accediendo a un [estado de meditación transcendente](transcender/transcender.md Al ojearlo, una duda lo emabargó...[¿Qué hago?](duda/duda.md) -Al despertar y enfocar la vista vió lo que había sucedido tras la +Al despertar y enfocar la vista vió lo que había sucedido tras la explosión [que pasó?](explosion/explosion.md) Salió corriendo y no se lo vio nunca más en el reino @@ -115,7 +117,7 @@ A pero si no leiste el cuento del cuco, entonces significa que no tienes [miedo] [Puso su mano derecha en su frente y se teletransportó al centro del ejército enemigo](pelea_epica/pelea_epica.md) -Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. +Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. - [Dark_side](dark_side/dark_side.md) @@ -128,10 +130,10 @@ No tuvo más opción que buscar refuerzos, luchadores incanzables que tuvieran l Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, la guerra no había hecho más que [comenzar](guerra/duracion.md). -"El que tenga rabo de paja ni que lo fajen chiquito", +"El que tenga rabo de paja ni que lo fajen chiquito", dijo el [curandero](curandero/curandero.md)... -Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", +Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", se atrevio a lo que nadie se [imaginó:](Mutantes/Mutantes.md) [Hizo un breve movimiento para llamar a sus ayudantes y](ayudantes/ayudantes.md) @@ -149,4 +151,3 @@ solo [Escapó](escapo/escapo.md) Y llego [Daynerys Targaryen](thrones/daynerys.md) [Temeroso, ordenó que lo guiaran al pasadizo que le llevaría fuera de la ciudad](pasadizo/pasadizo.md) - diff --git a/espanol/zipizape/zipizape.md b/espanol/zipizape/zipizape.md new file mode 100644 index 0000000000..cac7aa0848 --- /dev/null +++ b/espanol/zipizape/zipizape.md @@ -0,0 +1,2 @@ +Lamentablemente, Zipi y Zape se habían ido de vacaciones con Carpanta, Espinete +y Don Pimpón. From d4b20854ad06fc3c6d209a77556284de728f4ae0 Mon Sep 17 00:00:00 2001 From: David Martinez Date: Tue, 7 Jun 2016 22:28:17 +0200 Subject: [PATCH 3599/5486] Add missing space --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 96b6ec57f4..fc6befbbaa 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -45,7 +45,7 @@ and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyA [Subió a la torre](torre/torre.md) -Se cansó de la guerra y decidió alienarse de todo lo material, +Se cansó de la guerra y decidió alienarse de todo lo material, accediendo a un [estado de meditación transcendente](transcender/transcender.md) [Ordenó buscar al Capitán Trueno](capitan/trueno.md) From 6113cb78932bfd1d50594a4992036d18e582bc40 Mon Sep 17 00:00:00 2001 From: Polo Martin Date: Tue, 7 Jun 2016 18:33:12 -0400 Subject: [PATCH 3600/5486] Fix whitespace --- english/ghostbusters/ghostbusters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/ghostbusters/ghostbusters.md b/english/ghostbusters/ghostbusters.md index f5c56913fc..82d23c3713 100644 --- a/english/ghostbusters/ghostbusters.md +++ b/english/ghostbusters/ghostbusters.md @@ -48,7 +48,7 @@ WHERE AM I ??? a voice calls out from your right -You sense a cloaked figure with +You sense a cloaked figure with electric [blue eyes] (../goosebumps/goosebumps.md) approach. From 25b8f79689f93af3ecbc31095b4de680b89cecf9 Mon Sep 17 00:00:00 2001 From: enderhsu <378803753@qq.com> Date: Wed, 8 Jun 2016 20:20:07 +0800 Subject: [PATCH 3601/5486] Write my story --- Chinese/Jay_Chou/Jay_Chou.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Chinese/Jay_Chou/Jay_Chou.md b/Chinese/Jay_Chou/Jay_Chou.md index e316bffc67..54ba284a58 100644 --- a/Chinese/Jay_Chou/Jay_Chou.md +++ b/Chinese/Jay_Chou/Jay_Chou.md @@ -1 +1,2 @@ 周杰伦自从参加了中国好声音之后，觉得比以前幽默多了，哎哟不错哦！哈哈！ +也许是生了女儿的原因，杰伦现在变得更有亲和力了 \ No newline at end of file From d81f2d64fb8b61aa763f5470d6f7e73310505817 Mon Sep 17 00:00:00 2001 From: David Martinez Date: Wed, 8 Jun 2016 17:59:36 +0200 Subject: [PATCH 3602/5486] add missing line --- espanol/canudos.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index fc6befbbaa..cef18bc540 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -45,7 +45,7 @@ and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyA [Subió a la torre](torre/torre.md) -Se cansó de la guerra y decidió alienarse de todo lo material, +Se cansó de la guerra y decidió alienarse de todo lo material, accediendo a un [estado de meditación transcendente](transcender/transcender.md) [Ordenó buscar al Capitán Trueno](capitan/trueno.md) @@ -151,3 +151,4 @@ solo [Escapó](escapo/escapo.md) Y llego [Daynerys Targaryen](thrones/daynerys.md) [Temeroso, ordenó que lo guiaran al pasadizo que le llevaría fuera de la ciudad](pasadizo/pasadizo.md) +- From db08ec2b4e8e4092cf722ee8d7001368338d773a Mon Sep 17 00:00:00 2001 From: David Martinez Date: Wed, 8 Jun 2016 18:06:21 +0200 Subject: [PATCH 3603/5486] add missing line --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index cef18bc540..0cee693e2b 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -151,4 +151,4 @@ solo [Escapó](escapo/escapo.md) Y llego [Daynerys Targaryen](thrones/daynerys.md) [Temeroso, ordenó que lo guiaran al pasadizo que le llevaría fuera de la ciudad](pasadizo/pasadizo.md) -- + From 93ee8f5664f1b68d1f158d6326c03e9426706f9f Mon Sep 17 00:00:00 2001 From: David Martinez Date: Wed, 8 Jun 2016 18:09:49 +0200 Subject: [PATCH 3604/5486] add missing spaces --- espanol/canudos.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 0cee693e2b..4253e9e75b 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -45,7 +45,7 @@ and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyA [Subió a la torre](torre/torre.md) -Se cansó de la guerra y decidió alienarse de todo lo material, +Se cansó de la guerra y decidió alienarse de todo lo material, accediendo a un [estado de meditación transcendente](transcender/transcender.md) [Ordenó buscar al Capitán Trueno](capitan/trueno.md) @@ -104,7 +104,7 @@ accediendo a un [estado de meditación transcendente](transcender/transcender.md Al ojearlo, una duda lo emabargó...[¿Qué hago?](duda/duda.md) -Al despertar y enfocar la vista vió lo que había sucedido tras la +Al despertar y enfocar la vista vió lo que había sucedido tras la explosión [que pasó?](explosion/explosion.md) Salió corriendo y no se lo vio nunca más en el reino @@ -117,7 +117,7 @@ A pero si no leiste el cuento del cuco, entonces significa que no tienes [miedo] [Puso su mano derecha en su frente y se teletransportó al centro del ejército enemigo](pelea_epica/pelea_epica.md) -Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. +Lo que nadie sabía, es que el consejero era un versado maestro instruído en las nobles artes Jedi. - [Dark_side](dark_side/dark_side.md) @@ -130,10 +130,10 @@ No tuvo más opción que buscar refuerzos, luchadores incanzables que tuvieran l Porque en el fondo él sabía que por mucho que hubiese ganado esta batalla, la guerra no había hecho más que [comenzar](guerra/duracion.md). -"El que tenga rabo de paja ni que lo fajen chiquito", +"El que tenga rabo de paja ni que lo fajen chiquito", dijo el [curandero](curandero/curandero.md)... -Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", +Nadie sabiendo el secreto mejor guardado este epico personaje, "El gran mutante", se atrevio a lo que nadie se [imaginó:](Mutantes/Mutantes.md) [Hizo un breve movimiento para llamar a sus ayudantes y](ayudantes/ayudantes.md) From a542bb9cd5bf3579fe4052dfc95b8fc70d822df2 Mon Sep 17 00:00:00 2001 From: Mukesh Date: Thu, 9 Jun 2016 00:49:07 +0530 Subject: [PATCH 3605/5486] Add IoT information and start story --- english/iot/intro.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/english/iot/intro.md b/english/iot/intro.md index dbc898ec96..932854ff0f 100644 --- a/english/iot/intro.md +++ b/english/iot/intro.md @@ -1 +1,22 @@ Internet of Things + +Internet of Things(IoT) is a network of synchronised physical 'things' - gadgets, +automobiles, buildings - embedded with sensors and powerful electronic circuits +powered by intelligent code that enable them to talk to each other without human +interference. + +The story begins here ... + +The Internet of Things(IoT) is a new digital world that has a varied population. +It habours a few billion species of gigantic vehicles, microscopic chips, robots, +a dozen of concrete jungles(buildings) and anything you name... + +One fine morning, 192.168.100.1, a drowsy young home assistance gadget wakes up +from a deep 'sleep' mode and preps himself up for the day - start network services, +initialise sensor inputs and load algorithms into memory. He makes a call to his +close friend 192.168.100.2, a gorgeous counterpart. + +DringDring Dring Kee Kee Kee Kee + +The lines are dead. He makes a dozen of vain attempts to a few other numbers. +Hours rolled by and the plight didn't seem to change. Terror soon took over him. From ef24566e1c134f98515804f7303ae04ce2bb1ff3 Mon Sep 17 00:00:00 2001 From: anand arunachalam Date: Wed, 8 Jun 2016 13:30:58 -0700 Subject: [PATCH 3606/5486] add to benefits of yoga --- english/yoga/benefits/yoga_benefits.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/yoga/benefits/yoga_benefits.md b/english/yoga/benefits/yoga_benefits.md index d204e3e5a6..cc222f79b0 100644 --- a/english/yoga/benefits/yoga_benefits.md +++ b/english/yoga/benefits/yoga_benefits.md @@ -20,7 +20,8 @@ Here we provide a list of benefits: 11. Increases focus. 12. Make you calm and manages anger. 13. Help you connect with your soul and inner god. +14. Take time off from from endless activity of mind and refocus and relax your mind It must be said though, that yoga is not a panacea. It won't cure a serious illness, and we must be aware -of this too. \ No newline at end of file +of this too. From b1c52c22f0e05f2b52574bcec51c64032a104422 Mon Sep 17 00:00:00 2001 From: Michael Anderson Date: Wed, 8 Jun 2016 16:31:19 -0400 Subject: [PATCH 3607/5486] Added a new story about Bernie Sanders --- english/vote-the-president/bernie/Bernie.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/vote-the-president/bernie/Bernie.md b/english/vote-the-president/bernie/Bernie.md index ecfc86b4f4..5b69804f09 100644 --- a/english/vote-the-president/bernie/Bernie.md +++ b/english/vote-the-president/bernie/Bernie.md @@ -1 +1,3 @@ Bernie wins, solving income-inequality and giving free hugs and college to all Americans! + +It's so sad Bernie lost the California Primary yesterday!! But I still believe in him! From 3a947ffcdeaabbfccbec0b1007b6cc6dc3042b05 Mon Sep 17 00:00:00 2001 From: Alex Sadliak Date: Thu, 9 Jun 2016 00:18:23 +0300 Subject: [PATCH 3608/5486] Continue the story about the bush (ukrainian) --- ukrainian/wait-more/out/try/index.md | 5 ++++- ukrainian/wait-more/out/try/parts/branch/branch.md | 3 +++ ukrainian/wait-more/out/try/parts/leaf/leaf.md | 2 ++ ukrainian/wait-more/out/try/parts/root/root.md | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 ukrainian/wait-more/out/try/parts/branch/branch.md create mode 100644 ukrainian/wait-more/out/try/parts/leaf/leaf.md create mode 100644 ukrainian/wait-more/out/try/parts/root/root.md diff --git a/ukrainian/wait-more/out/try/index.md b/ukrainian/wait-more/out/try/index.md index 6bfe0f8968..7b3641c5b9 100644 --- a/ukrainian/wait-more/out/try/index.md +++ b/ukrainian/wait-more/out/try/index.md @@ -1,2 +1,5 @@ Ви берете кілька листків с кущика, тягнете до рота та відчуваєте як ваше обличчя перекошує. -Яке ж воно кисле! Цікаво, воно все кисле, чи різні частини куща мають різні смаки.. Спробуємо? \ No newline at end of file +Яке ж воно кисле! Цікаво, воно все кисле, чи різні частини куща мають різні смаки.. Спробуємо? +[Спробувати ще один листочок](parts/leaf.md) +[Спробувати корінь](parts/root.md) +[Спробувати гілку](parts/branch.md) \ No newline at end of file diff --git a/ukrainian/wait-more/out/try/parts/branch/branch.md b/ukrainian/wait-more/out/try/parts/branch/branch.md new file mode 100644 index 0000000000..035de0095c --- /dev/null +++ b/ukrainian/wait-more/out/try/parts/branch/branch.md @@ -0,0 +1,3 @@ +Ви відриваєте достатньо великий шмат куща, який можна було б назвати гілкою +та куштуєте його. Ви не можете зупинитись та кусаєте раз за разом, здається, +гілки викликають звикання... \ No newline at end of file diff --git a/ukrainian/wait-more/out/try/parts/leaf/leaf.md b/ukrainian/wait-more/out/try/parts/leaf/leaf.md new file mode 100644 index 0000000000..21e00b25fe --- /dev/null +++ b/ukrainian/wait-more/out/try/parts/leaf/leaf.md @@ -0,0 +1,2 @@ +Цього разу листочок виявляється незвичайним, вам навіть подобається його смак. +Тільки-от якесь тривожне передчуття не дає вам спокою... \ No newline at end of file diff --git a/ukrainian/wait-more/out/try/parts/root/root.md b/ukrainian/wait-more/out/try/parts/root/root.md new file mode 100644 index 0000000000..722d9c32ca --- /dev/null +++ b/ukrainian/wait-more/out/try/parts/root/root.md @@ -0,0 +1,4 @@ +Ви відчуваєте дивний терпкий смак, після чого все йде обертом і ви +втрачаєте землю під ногами... +Через деякий час ви розплющуєте очі і розумієте, що якось опинились серед +химерних сплетінь живоплоту, вас потрохи охоплює паніка... \ No newline at end of file From 956fca85796dd595a0d40a0fae100fd3a83543b6 Mon Sep 17 00:00:00 2001 From: Alex Sadliak Date: Thu, 9 Jun 2016 00:24:14 +0300 Subject: [PATCH 3609/5486] fix: Fix the wrong paths to next stages --- ukrainian/wait-more/out/try/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ukrainian/wait-more/out/try/index.md b/ukrainian/wait-more/out/try/index.md index 7b3641c5b9..b8b4e263c0 100644 --- a/ukrainian/wait-more/out/try/index.md +++ b/ukrainian/wait-more/out/try/index.md @@ -1,5 +1,5 @@ Ви берете кілька листків с кущика, тягнете до рота та відчуваєте як ваше обличчя перекошує. Яке ж воно кисле! Цікаво, воно все кисле, чи різні частини куща мають різні смаки.. Спробуємо? -[Спробувати ще один листочок](parts/leaf.md) -[Спробувати корінь](parts/root.md) -[Спробувати гілку](parts/branch.md) \ No newline at end of file +[Спробувати ще один листочок](parts/leaf/leaf.md) +[Спробувати корінь](parts/root/root.md) +[Спробувати гілку](parts/branch/branch.md) \ No newline at end of file From e59e9011c30a1227256cd8dd7c97b71edb2051dc Mon Sep 17 00:00:00 2001 From: Alex Sadliak Date: Thu, 9 Jun 2016 00:31:41 +0300 Subject: [PATCH 3610/5486] fix: Added blank spaces between choices --- ukrainian/wait-more/out/try/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ukrainian/wait-more/out/try/index.md b/ukrainian/wait-more/out/try/index.md index b8b4e263c0..95d9d23b1f 100644 --- a/ukrainian/wait-more/out/try/index.md +++ b/ukrainian/wait-more/out/try/index.md @@ -1,5 +1,7 @@ Ви берете кілька листків с кущика, тягнете до рота та відчуваєте як ваше обличчя перекошує. Яке ж воно кисле! Цікаво, воно все кисле, чи різні частини куща мають різні смаки.. Спробуємо? [Спробувати ще один листочок](parts/leaf/leaf.md) + [Спробувати корінь](parts/root/root.md) + [Спробувати гілку](parts/branch/branch.md) \ No newline at end of file From 8061e9362876d712afe5714efdb79fd0c696f95e Mon Sep 17 00:00:00 2001 From: Justin Morgan Date: Wed, 8 Jun 2016 15:32:41 -0700 Subject: [PATCH 3611/5486] Create search.md --- english/Monty-Python/search.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/Monty-Python/search.md diff --git a/english/Monty-Python/search.md b/english/Monty-Python/search.md new file mode 100644 index 0000000000..cc37069416 --- /dev/null +++ b/english/Monty-Python/search.md @@ -0,0 +1,3 @@ +You set out on a search for the holy grail. + +Ride to the nearest castle. From bebc09e227eb7cd38d906a3752ce9d09dd713371 Mon Sep 17 00:00:00 2001 From: Justin Morgan Date: Wed, 8 Jun 2016 15:47:43 -0700 Subject: [PATCH 3612/5486] Update marshmallow.md --- english/marshmallow.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 9a94493744..bb62556945 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -20,6 +20,9 @@ January 2017 approaches. You have two presidential candidates to vote for. Keith the Unicorn approaches you. He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) +It is time to begin your adventure. +Your search for the grail begins [now](Monty-Python/search.md) + Down one path you see a person standing in the middle of the path. They look familiar somehow, but you just can't figure out who they are. They seem friendly so you decide to go [talk to them.](friendly-person/friendly-person.md) From 19f01318763463af35fd5a26635b72beb2e49a96 Mon Sep 17 00:00:00 2001 From: Brandon Tiqui Date: Wed, 8 Jun 2016 18:57:19 -0700 Subject: [PATCH 3613/5486] Add never stop learning --- english/love-udacity/love-udacity.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/love-udacity/love-udacity.md b/english/love-udacity/love-udacity.md index 6ebc24db86..595437fee7 100644 --- a/english/love-udacity/love-udacity.md +++ b/english/love-udacity/love-udacity.md @@ -7,3 +7,5 @@ She has been the difference and now I am confident I can be a developer. I am glad you also met [Udacity](http://www.udacity.com) The question is do you keep using the free courses or plump for the nano-degree? + +Never stop learning! \ No newline at end of file From ac01efdd8002e02210b6c6d60da78b8167da8344 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Thu, 9 Jun 2016 18:01:34 +0200 Subject: [PATCH 3614/5486] Dodaj opcje zapalek w Polish/przygoda/miesnie/miesnie.md --- Polish/przygoda/miesnie/miesnie.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Polish/przygoda/miesnie/miesnie.md b/Polish/przygoda/miesnie/miesnie.md index c47ae21f21..6d72855437 100644 --- a/Polish/przygoda/miesnie/miesnie.md +++ b/Polish/przygoda/miesnie/miesnie.md @@ -7,3 +7,5 @@ Co robisz? [Zaczynasz jeść ptasie mleczko](../jedzenie/jedzenie.md) [Kładziesz się na podłodze i zasypiasz](./spanie/spanie.md) + +[W rogu pudełka zauważasz leżące zapałki](./zapalki.md) From e9f9fd0417221f9e61f67ac29f1a4e284d16be0e Mon Sep 17 00:00:00 2001 From: Mateusz Date: Thu, 9 Jun 2016 18:04:26 +0200 Subject: [PATCH 3615/5486] Popraw opcje zapalki --- Polish/przygoda/miesnie/miesnie.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polish/przygoda/miesnie/miesnie.md b/Polish/przygoda/miesnie/miesnie.md index 6d72855437..cc6d1266c3 100644 --- a/Polish/przygoda/miesnie/miesnie.md +++ b/Polish/przygoda/miesnie/miesnie.md @@ -8,4 +8,4 @@ Co robisz? [Kładziesz się na podłodze i zasypiasz](./spanie/spanie.md) -[W rogu pudełka zauważasz leżące zapałki](./zapalki.md) +[W rogu pudełka zauważasz leżące zapałki](./zapalki/zapalki.md) From 515d0a6cc16b9f577f4f9a600c6add1cd2b49bf3 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Thu, 9 Jun 2016 18:07:13 +0200 Subject: [PATCH 3616/5486] Dodaj plik zapalki.md --- Polish/przygoda/miesnie/zapalki/zapalki.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Polish/przygoda/miesnie/zapalki/zapalki.md diff --git a/Polish/przygoda/miesnie/zapalki/zapalki.md b/Polish/przygoda/miesnie/zapalki/zapalki.md new file mode 100644 index 0000000000..4307dfe223 --- /dev/null +++ b/Polish/przygoda/miesnie/zapalki/zapalki.md @@ -0,0 +1,2 @@ +Podchodzisz bliżej i nie wierzysz własnym oczom. +Ktoś rzeczywiście zostawił tu zapałki! Co z nimi zrobisz? From 780df41d0e4a52e833d16a3d08ced90c15fe19ee Mon Sep 17 00:00:00 2001 From: Mateusz Date: Thu, 9 Jun 2016 18:25:21 +0200 Subject: [PATCH 3617/5486] Dodaj opcje do pliku zapalki.md --- Polish/przygoda/miesnie/zapalki/zapalki.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Polish/przygoda/miesnie/zapalki/zapalki.md b/Polish/przygoda/miesnie/zapalki/zapalki.md index 4307dfe223..80d669d316 100644 --- a/Polish/przygoda/miesnie/zapalki/zapalki.md +++ b/Polish/przygoda/miesnie/zapalki/zapalki.md @@ -1,2 +1,4 @@ Podchodzisz bliżej i nie wierzysz własnym oczom. Ktoś rzeczywiście zostawił tu zapałki! Co z nimi zrobisz? + +[W końcu ignorujesz je. Nie jesteś zbyt bystrą osobą.]("../../przygoda.md") From fc4dd83b4519c69434e6537df06baa47fa99471e Mon Sep 17 00:00:00 2001 From: Mateusz Date: Thu, 9 Jun 2016 18:27:29 +0200 Subject: [PATCH 3618/5486] Drobna poprawka w zapalki.md --- Polish/przygoda/miesnie/zapalki/zapalki.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polish/przygoda/miesnie/zapalki/zapalki.md b/Polish/przygoda/miesnie/zapalki/zapalki.md index 80d669d316..99d31593fd 100644 --- a/Polish/przygoda/miesnie/zapalki/zapalki.md +++ b/Polish/przygoda/miesnie/zapalki/zapalki.md @@ -1,4 +1,4 @@ Podchodzisz bliżej i nie wierzysz własnym oczom. Ktoś rzeczywiście zostawił tu zapałki! Co z nimi zrobisz? -[W końcu ignorujesz je. Nie jesteś zbyt bystrą osobą.]("../../przygoda.md") +[W końcu ignorujesz je. Nie jesteś zbyt bystrą osobą.](../../przygoda.md) From 6381b221b6e7ab6c51f787b69330ccca067b9a33 Mon Sep 17 00:00:00 2001 From: Stephen Chu Date: Thu, 9 Jun 2016 12:45:06 -0700 Subject: [PATCH 3619/5486] Added new choice to run out the door in marshmallow --- english/marshmallow.md | 2 ++ english/run_out_the_door/run_out_the_door.md | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 english/run_out_the_door/run_out_the_door.md diff --git a/english/marshmallow.md b/english/marshmallow.md index bb62556945..5ce3eb95dd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,6 +1,8 @@ Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. +You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! + Take some [time](meditation/meditation.md) off! Who is better? diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md new file mode 100644 index 0000000000..8c2871b939 --- /dev/null +++ b/english/run_out_the_door/run_out_the_door.md @@ -0,0 +1,7 @@ +You immediately jump up and run out the nearest exit! + +You burst out the door and the entire world is in front of you. + +You... + +[Go back inside](../marshmallow.md) and reclaim your rightful position in mediocrity. From 3616c8f31327febebe56e635cf98639805761b3a Mon Sep 17 00:00:00 2001 From: Iann Wu Date: Thu, 9 Jun 2016 22:44:50 -0700 Subject: [PATCH 3620/5486] Add war-start entry point(in marshmallow.md), folder, and story page --- english/marshmallow.md | 36 ++++++++++++++++++---------------- english/total-war/war-start.md | 5 +++++ 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 english/total-war/war-start.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 5ce3eb95dd..557a1ab20a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,5 +1,5 @@ -Your adventure begins. You realize there are hundreds of paths for you to choose from. -Which way should you go? Only you can decide. +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! @@ -42,9 +42,9 @@ DOING will definitely keep your sharpened with latest skills (which you can get [Know about the life of this world](00-Life-of-this-world/Life of this world.md) -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) Vist the master [liquid](liquid/liquid.md). @@ -780,14 +780,14 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now -Friday, December 4th. +Despite the little conundrum that you resolved, you realize that it's now +Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" With that new revelation in mind, you quickly make like David Hasselhoff and wiggle your wrist to show off a nice particular watch that even listens -to you when you speak to it. +to you when you speak to it. ["Ahem!"](my-adventure/my-adventure.md) @@ -802,9 +802,9 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines +When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. +there are two options you must choose from. You may either do [this](gtd/gtd.md), @@ -816,12 +816,12 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? @@ -835,7 +835,7 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive](divergence/divergence.md) or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) @@ -892,7 +892,7 @@ Do you want to build a [snowman?] (snowman/snowman.md) It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) -I think I'll try defying gravity. +I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) @@ -920,7 +920,7 @@ Explore the unknown. Most people die without ever visiting this [place.](underwa As you attempt this, a voice booms!! -The [boom](day-dream/day-dream.md) +The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) @@ -932,7 +932,7 @@ You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). -So what to do next? Three doors appear and all other ways out disappear. +So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. @@ -963,7 +963,7 @@ A light appears all around you and something comes into focus in the distance. [ Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) -If you have read this far, then you must be in pain. +If you have read this far, then you must be in pain. Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. @@ -981,7 +981,7 @@ You're reincarnated as a green starfish but wish you were [blue instead.](starfi [Motivate yourself](Motivate/Motivate.md) -You wake up as Harry Potter ... and are facing Voldemort in a duel? +You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... @@ -994,3 +994,5 @@ You decide you want to be a pirate and remember a show called You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Taiwan.md)! you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) + +Your friend told you that the new Total War - Warhammer has come out. [Let's check it out!](total-war/war-start.md) diff --git a/english/total-war/war-start.md b/english/total-war/war-start.md new file mode 100644 index 0000000000..7eb1a9e1c6 --- /dev/null +++ b/english/total-war/war-start.md @@ -0,0 +1,5 @@ +Total War - Warhammer is a turn-based strategy game with epic real-time tactical battles between armies. It is also the first in its franchise that introduces a fantasy setting as well as characters from the [Warhammer universe](https://en.wikipedia.org/wiki/Warhammer_Fantasy_(setting)). + +Here is a [trailer](https://youtu.be/qjzLuddjIUI) for the game. + +The game also support online multiplayer battles. [Here](https://youtu.be/JBVIRGrvUfk) is an example of a online 3v3 game play. \ No newline at end of file From fc51c08961c16cb47770c3df0af30ad6aa04e179 Mon Sep 17 00:00:00 2001 From: Stefan Moscarda Date: Fri, 10 Jun 2016 11:31:05 +0200 Subject: [PATCH 3621/5486] Add option to eat marshmallow upon eating sandwich. --- swedish/marshmallowen/marshmallowen.md | 2 ++ swedish/titta-ut/macka/macka.md | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/swedish/marshmallowen/marshmallowen.md b/swedish/marshmallowen/marshmallowen.md index 445cf82110..0a001a4bb5 100644 --- a/swedish/marshmallowen/marshmallowen.md +++ b/swedish/marshmallowen/marshmallowen.md @@ -6,4 +6,6 @@ Du märker att du har börjat tänker på engelska. Din svenska försvinner. Why is this happening to me ..... +[Du blundar och huvudet träffar kudden.](../../english/marshmallow.md) + [Du blunda och huvudet träffar kudden.](../../english/marshmallow.md) \ No newline at end of file diff --git a/swedish/titta-ut/macka/macka.md b/swedish/titta-ut/macka/macka.md index 67d391b58e..ae7063a3da 100644 --- a/swedish/titta-ut/macka/macka.md +++ b/swedish/titta-ut/macka/macka.md @@ -1,3 +1,8 @@ Du går till köket för att göra dig en macka. Väl där hittar du samtliga ingredienser som behövs och äter din nyligen förberedda -delikatess i lugn och ro. \ No newline at end of file +delikatess i lugn och ro. + +När mackan väl landat i magen känner du ett enormt sötsug. På bordet framför dig ligger en marshmallow. Vad gör du? + +[Äter en marshmallow.](marshmallowen/marshmallowen.md) +[Lägger dig för att sova igen.](../start.md) \ No newline at end of file From 0b3d554b4d6335ac9e968db0ea4ea91e4c2c8c99 Mon Sep 17 00:00:00 2001 From: Stefan Moscarda Date: Fri, 10 Jun 2016 11:34:37 +0200 Subject: [PATCH 3622/5486] no change --- swedish/marshmallowen/marshmallowen.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/swedish/marshmallowen/marshmallowen.md b/swedish/marshmallowen/marshmallowen.md index 0a001a4bb5..445cf82110 100644 --- a/swedish/marshmallowen/marshmallowen.md +++ b/swedish/marshmallowen/marshmallowen.md @@ -6,6 +6,4 @@ Du märker att du har börjat tänker på engelska. Din svenska försvinner. Why is this happening to me ..... -[Du blundar och huvudet träffar kudden.](../../english/marshmallow.md) - [Du blunda och huvudet träffar kudden.](../../english/marshmallow.md) \ No newline at end of file From d337037cccb94c116f988500deaf0519dca6b589 Mon Sep 17 00:00:00 2001 From: SMoscarda Date: Fri, 10 Jun 2016 11:36:46 +0200 Subject: [PATCH 3623/5486] Update macka.md --- swedish/titta-ut/macka/macka.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/swedish/titta-ut/macka/macka.md b/swedish/titta-ut/macka/macka.md index ae7063a3da..da476670da 100644 --- a/swedish/titta-ut/macka/macka.md +++ b/swedish/titta-ut/macka/macka.md @@ -5,4 +5,5 @@ delikatess i lugn och ro. När mackan väl landat i magen känner du ett enormt sötsug. På bordet framför dig ligger en marshmallow. Vad gör du? [Äter en marshmallow.](marshmallowen/marshmallowen.md) -[Lägger dig för att sova igen.](../start.md) \ No newline at end of file + +[Lägger dig för att sova igen.](../start.md) From bd447bfd0c73cc02e9a3b9a5e43b7e3169721464 Mon Sep 17 00:00:00 2001 From: Stefan Moscarda Date: Fri, 10 Jun 2016 11:44:58 +0200 Subject: [PATCH 3624/5486] Fix broken links --- swedish/titta-ut/macka/macka.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/swedish/titta-ut/macka/macka.md b/swedish/titta-ut/macka/macka.md index ae7063a3da..9ec3e01545 100644 --- a/swedish/titta-ut/macka/macka.md +++ b/swedish/titta-ut/macka/macka.md @@ -4,5 +4,5 @@ delikatess i lugn och ro. När mackan väl landat i magen känner du ett enormt sötsug. På bordet framför dig ligger en marshmallow. Vad gör du? -[Äter en marshmallow.](marshmallowen/marshmallowen.md) -[Lägger dig för att sova igen.](../start.md) \ No newline at end of file +[Äter en marshmallow.](../../marshmallowen/marshmallowen.md) +[Lägger dig för att sova igen.](../../start.md) \ No newline at end of file From 2f5b9f7e22369feec4560b15c3392afcbe1fb5fa Mon Sep 17 00:00:00 2001 From: Stefan Moscarda Date: Fri, 10 Jun 2016 11:52:54 +0200 Subject: [PATCH 3625/5486] Correct links. --- swedish/titta-ut/macka/macka.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/swedish/titta-ut/macka/macka.md b/swedish/titta-ut/macka/macka.md index d07ca8b89f..9bcbf0513b 100644 --- a/swedish/titta-ut/macka/macka.md +++ b/swedish/titta-ut/macka/macka.md @@ -4,6 +4,6 @@ delikatess i lugn och ro. När mackan väl landat i magen känner du ett enormt sötsug. På bordet framför dig ligger en marshmallow. Vad gör du? -[Äter en marshmallow.](marshmallowen/marshmallowen.md) +[Äter en marshmallow.](../../marshmallowen/marshmallowen.md) -[Lägger dig för att sova igen.](../start.md) \ No newline at end of file +[Lägger dig för att sova igen.](../../start.md) \ No newline at end of file From 6aa8b7858427d9bc808c4d1cee8ac44e0773d629 Mon Sep 17 00:00:00 2001 From: Antons Polskihs Date: Fri, 10 Jun 2016 16:38:14 +0300 Subject: [PATCH 3626/5486] Add the Slayer turning into Spice Girls during Vesti --- russian/vesti-nedeli/vesti.md | 1 + 1 file changed, 1 insertion(+) diff --git a/russian/vesti-nedeli/vesti.md b/russian/vesti-nedeli/vesti.md index 6525ad35dd..f6c972132b 100644 --- a/russian/vesti-nedeli/vesti.md +++ b/russian/vesti-nedeli/vesti.md @@ -5,6 +5,7 @@ водка вливает расслабляющую уверенность в каждую клеточку. Очертания Плана ярче не становятся. Грани вырастают до космических масштабов, разрывая границы понимания, уходя в мглу непознаваемого. +Грязная майка "Slayer" превратилась в кристально чистую майку "Spice Girls". Оркестр играл советскиЙ марш потом "Землю в иллюминаторе", гимн советской космонавтики незаметно влился в "Боже царя храни". Глаза закрылись. From a74d719e541bda0e9e0b3aa7978d18a1797216f4 Mon Sep 17 00:00:00 2001 From: Rafa Tromens Date: Fri, 10 Jun 2016 10:44:53 -0300 Subject: [PATCH 3627/5486] ptbr-futebol --- portugues/colaborando.md | 4 +++- portugues/futebol/futebol.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 portugues/futebol/futebol.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 54ea68b63c..934a167bb1 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -48,4 +48,6 @@ Um tijolo pesa 1 quilo mais meio tijolo. Quanto pesa 1 tijolo e meio? BR BR BR Hue hue hue!!!! -[Você foi assaltado](ladrao/assalto.md) \ No newline at end of file +[Você foi assaltado](ladrao/assalto.md) + +[Você vira um jogador...](futebol/futebol.md) \ No newline at end of file diff --git a/portugues/futebol/futebol.md b/portugues/futebol/futebol.md new file mode 100644 index 0000000000..419575137e --- /dev/null +++ b/portugues/futebol/futebol.md @@ -0,0 +1 @@ +Você joga futebol com a cabeça de seus amigos que não conseguem consertar o bug. \ No newline at end of file From 15570a2b40dab8b0f1426322192a7616a8304342 Mon Sep 17 00:00:00 2001 From: alexscottzs Date: Fri, 10 Jun 2016 22:20:47 +0800 Subject: [PATCH 3628/5486] =?UTF-8?q?add=20=E9=80=89=E6=8B=A9=20in=20?= =?UTF-8?q?=E5=BA=B7=E5=B8=88=E5=82=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...\201\253\346\230\237\346\203\205\346\212\245\345\261\200.md" | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 "Chinese/\347\201\253\346\230\237\346\203\205\346\212\245\345\261\200/\347\201\253\346\230\237\346\203\205\346\212\245\345\261\200.md" diff --git "a/Chinese/\347\201\253\346\230\237\346\203\205\346\212\245\345\261\200/\347\201\253\346\230\237\346\203\205\346\212\245\345\261\200.md" "b/Chinese/\347\201\253\346\230\237\346\203\205\346\212\245\345\261\200/\347\201\253\346\230\237\346\203\205\346\212\245\345\261\200.md" new file mode 100644 index 0000000000..2a5ecb1919 --- /dev/null +++ "b/Chinese/\347\201\253\346\230\237\346\203\205\346\212\245\345\261\200/\347\201\253\346\230\237\346\203\205\346\212\245\345\261\200.md" @@ -0,0 +1,2 @@ +火星情报局是由汪涵带领， +懵逼薛之谦打头的节目 From 50b16b2f84b6ec3ba69118cd215dd84aebbe8417 Mon Sep 17 00:00:00 2001 From: alexscottzs Date: Fri, 10 Jun 2016 22:21:49 +0800 Subject: [PATCH 3629/5486] =?UTF-8?q?update=20=E5=BA=B7=E5=B8=88=E5=82=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/Kong-Shi-foo/Kong-Shi-foo.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Chinese/Kong-Shi-foo/Kong-Shi-foo.md b/Chinese/Kong-Shi-foo/Kong-Shi-foo.md index 538af5bd0d..a8c3fe0e90 100644 --- a/Chinese/Kong-Shi-foo/Kong-Shi-foo.md +++ b/Chinese/Kong-Shi-foo/Kong-Shi-foo.md @@ -1,3 +1,7 @@ 孙悟空转世成了康师傅，于是开始做方便面，借此一统天下。 作者按：这都是什么乱七八糟的故事啊？怎么还扯到大话西游上来了？汗。咱弄一个冒险小说不行吗？ + +算了我们直接回[火星](../火星情报局/火星情报局.md)吧 + +啊，不，我要去当[斗战胜佛](../斗战胜佛/斗战胜佛.md) From dab4b789704ed466e7776af00902c85ab477d169 Mon Sep 17 00:00:00 2001 From: TS96 Date: Fri, 10 Jun 2016 18:40:29 -0400 Subject: [PATCH 3630/5486] new chapter --- english/quit/quit.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/quit/quit.md diff --git a/english/quit/quit.md b/english/quit/quit.md new file mode 100644 index 0000000000..33ec35bca4 --- /dev/null +++ b/english/quit/quit.md @@ -0,0 +1,6 @@ +You're trying really hard to understand this, +you're not sure if you're doing it right but +you haven't given up yet even though it's +really difficult. + +Are you going to [quit](http://i.imgur.com/Cw5wCpZ.gifv)? \ No newline at end of file From ca5238fd810ef3584fc93de73bcd955be2eb529a Mon Sep 17 00:00:00 2001 From: TS96 Date: Fri, 10 Jun 2016 18:40:29 -0400 Subject: [PATCH 3631/5486] add link to story --- english/love-udacity/love-udacity.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/love-udacity/love-udacity.md b/english/love-udacity/love-udacity.md index 595437fee7..8c1823f125 100644 --- a/english/love-udacity/love-udacity.md +++ b/english/love-udacity/love-udacity.md @@ -8,4 +8,6 @@ I am glad you also met [Udacity](http://www.udacity.com) The question is do you keep using the free courses or plump for the nano-degree? -Never stop learning! \ No newline at end of file +Never stop learning! + +But when things are getting really difficult, are you going to [quit](../quit/quit.md) \ No newline at end of file From 2e37e3d7a44d46a7ff05039368172c9fdbe2d9ab Mon Sep 17 00:00:00 2001 From: Denis Popov Date: Sat, 11 Jun 2016 22:23:16 +0300 Subject: [PATCH 3632/5486] Add a professor quest --- russian/invite-proffesor/invite-proffesor.md | 8 ++++++++ russian/zefir.md | 7 +++++++ 2 files changed, 15 insertions(+) create mode 100644 russian/invite-proffesor/invite-proffesor.md diff --git a/russian/invite-proffesor/invite-proffesor.md b/russian/invite-proffesor/invite-proffesor.md new file mode 100644 index 0000000000..aeb84f80c9 --- /dev/null +++ b/russian/invite-proffesor/invite-proffesor.md @@ -0,0 +1,8 @@ +Профессор Воробьев ответил на ваш звонок почти сразу. +К сожалению, он не успел закончить настройку телескопа после установки на него новой мощной линзы. +Поэтому оговоренный эксперимент придется отложить на следующий день. + +Тут ваш взгляд падает на полки, уставленные банками с медом и банками со сливками. +Нежные воздушные взбитые сливки... И тут вас осеняет! Вы включаете свой смартфон. Открываете "Контакты", группу "Длинные ножки". И приглашаете к себе трех подруг. +И вы уже точно знаете, что этот день завершится в приподнятом настроении. + diff --git a/russian/zefir.md b/russian/zefir.md index a2c810cdd6..f05fa311b5 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -14,8 +14,15 @@ Это была всего лишь банка с вишневым компотом. +И тут вы вспоминаете своего знакомого, с которым пресеклись две недели назад. Именно он порекомендовал вам компанию, которая может превратить вашу квартиру в шоколадный торт. +Толстый слой зефира на стенах. Слой шоколада на полу и заварного крема на потолке. Кровать из песочного теста. Подушки из свежего бисквита. Да, служащие компании постарались на славу! +Вчера вы хотели только прилечь на кровать, но накопившаяся усталость дала о себе знать и вы беспробудно проспали 9 часов. +Наступил день и теперь вы, полностью отдохнувший, готовы осуществить то, ради чего вы все это затеяли. + Ваши действия: +[Пригласить профессора Воробьева](invite-proffesor/invite-proffesor.md) + [Попросите девушку ущепнуть вас](girlfriend-pinch-you/girlfriend-pinch-you.md) [Пойти поплавать](go-to-swim/go-to-swim.md) From c5cda814168e97de80068076ab4b4e0b1340fb00 Mon Sep 17 00:00:00 2001 From: Denis Popov Date: Sat, 11 Jun 2016 22:39:37 +0300 Subject: [PATCH 3633/5486] Update story --- russian/invite-proffesor/invite-proffesor.md | 4 ++-- russian/zefir.md | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/russian/invite-proffesor/invite-proffesor.md b/russian/invite-proffesor/invite-proffesor.md index aeb84f80c9..3016683c80 100644 --- a/russian/invite-proffesor/invite-proffesor.md +++ b/russian/invite-proffesor/invite-proffesor.md @@ -3,6 +3,6 @@ Поэтому оговоренный эксперимент придется отложить на следующий день. Тут ваш взгляд падает на полки, уставленные банками с медом и банками со сливками. -Нежные воздушные взбитые сливки... И тут вас осеняет! Вы включаете свой смартфон. Открываете "Контакты", группу "Длинные ножки". И приглашаете к себе трех подруг. +Нежные воздушные взбитые сливки... И тут вас осеняет! Вы включаете свой смартфон. +Открываете "Контакты", группу "Длинные ножки". И приглашаете к себе трех подруг. И вы уже точно знаете, что этот день завершится в приподнятом настроении. - diff --git a/russian/zefir.md b/russian/zefir.md index f05fa311b5..4722305f64 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -14,9 +14,12 @@ Это была всего лишь банка с вишневым компотом. -И тут вы вспоминаете своего знакомого, с которым пресеклись две недели назад. Именно он порекомендовал вам компанию, которая может превратить вашу квартиру в шоколадный торт. -Толстый слой зефира на стенах. Слой шоколада на полу и заварного крема на потолке. Кровать из песочного теста. Подушки из свежего бисквита. Да, служащие компании постарались на славу! -Вчера вы хотели только прилечь на кровать, но накопившаяся усталость дала о себе знать и вы беспробудно проспали 9 часов. +И тут вы вспоминаете своего знакомого, с которым пресеклись две недели назад. Именно он порекомендовал вам компанию, +которая может превратить вашу квартиру в шоколадный торт. Толстый слой зефира на стенах. +Слой шоколада на полу и заварного крема на потолке. Кровать из песочного теста. Подушки из свежего бисквита. +Да, служащие компании постарались на славу! + +Вчера вы хотели только прилечь на кровать, но накопившаяся усталость дала о себе знать и вы проспали 9 часов. Наступил день и теперь вы, полностью отдохнувший, готовы осуществить то, ради чего вы все это затеяли. Ваши действия: From c3b7749467f17b9539a5f55ff158be916dfc4e23 Mon Sep 17 00:00:00 2001 From: Antony Kwok Date: Sun, 12 Jun 2016 17:02:16 +0100 Subject: [PATCH 3634/5486] Add an option to stop and meditate to the tunnel storyline --- english/tunnel/tunnel.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/tunnel/tunnel.md b/english/tunnel/tunnel.md index 9b0ac09db3..b9a2631cc8 100644 --- a/english/tunnel/tunnel.md +++ b/english/tunnel/tunnel.md @@ -5,3 +5,5 @@ hear your pursuer, only your breath echoing around you. [Look for a light.] (blind-search/blind-search.md) [Continue down the tunnel.] (continue/continue.md) + +[Stop and meditate on the situation](stop/stop.md) From 9a726687f2117846ec8dedae3666bc252b1ed9dc Mon Sep 17 00:00:00 2001 From: Antony Kwok Date: Sun, 12 Jun 2016 17:03:39 +0100 Subject: [PATCH 3635/5486] Add stop.md to tunnel storyline --- english/tunnel/stop/stop.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 english/tunnel/stop/stop.md diff --git a/english/tunnel/stop/stop.md b/english/tunnel/stop/stop.md new file mode 100644 index 0000000000..e69de29bb2 From 8af604e242c86b616c86f29385151bde49d45712 Mon Sep 17 00:00:00 2001 From: Antony Kwok Date: Sun, 12 Jun 2016 17:05:40 +0100 Subject: [PATCH 3636/5486] Add a line to stop.md --- english/tunnel/stop/stop.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/tunnel/stop/stop.md b/english/tunnel/stop/stop.md index e69de29bb2..a70163c42d 100644 --- a/english/tunnel/stop/stop.md +++ b/english/tunnel/stop/stop.md @@ -0,0 +1 @@ +You decide to stop and meditate on your current state. From dcad8f205fa7bf474198472bb779bdb4b08eb65e Mon Sep 17 00:00:00 2001 From: micmelesse Date: Sun, 12 Jun 2016 17:49:12 -0400 Subject: [PATCH 3637/5486] Update batman.md --- english/batman/batman.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index 9ad152e51c..cba800f1c5 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -32,4 +32,6 @@ The real hero is alfred the butler.. Who is really [Luke Skywalker's](http://fellowshipoftheminds.com/2015/11/23/star-wars-goes-to-illuminati-dark-side/) son! -He also gets really weird with his [neighbors](http://imgur.com/gallery/Gi9cwgR). \ No newline at end of file +He also gets really weird with his [neighbors](http://imgur.com/gallery/Gi9cwgR). + +I am batman's cousin. From 936de1e1ccab4fe3dd52acc4af777c0874bea05f Mon Sep 17 00:00:00 2001 From: Sergio Criales Date: Sun, 12 Jun 2016 22:55:36 -0400 Subject: [PATCH 3638/5486] Adionar mi historia triste a la aventura. --- espanol/noticias/noticias.md | 4 +++- espanol/noticias/orlando/orlando.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 espanol/noticias/orlando/orlando.md diff --git a/espanol/noticias/noticias.md b/espanol/noticias/noticias.md index 06b56c3b7e..9b27b30b34 100644 --- a/espanol/noticias/noticias.md +++ b/espanol/noticias/noticias.md @@ -8,4 +8,6 @@ Enseguida, Beatito: [Se burla del periodista](burla-periodista/burla-periodista.md) -[le comenta al periodista que necessita anteojos](anteojos/anteojos.md) \ No newline at end of file +[le comenta al periodista que necessita anteojos](anteojos/anteojos.md) + +[Noticia del tiroteo en Orlando](orlando/orlando.md) diff --git a/espanol/noticias/orlando/orlando.md b/espanol/noticias/orlando/orlando.md new file mode 100644 index 0000000000..da360d6cb4 --- /dev/null +++ b/espanol/noticias/orlando/orlando.md @@ -0,0 +1 @@ +Clic [aquí](http://edition.cnn.com/2016/06/12/us/orlando-nightclub-shooting/index.html) para ver la noticia. From 611bc03b708bbef6766a3afd5bef96a0804e9b6c Mon Sep 17 00:00:00 2001 From: Jacopo Prandelli Date: Mon, 13 Jun 2016 11:12:52 +0200 Subject: [PATCH 3639/5486] add option to repare bottle --- Italian/scappare/cercare-uscita.md | 4 +++- Italian/scappare/riparare/ripari.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Italian/scappare/riparare/ripari.md diff --git a/Italian/scappare/cercare-uscita.md b/Italian/scappare/cercare-uscita.md index f8aa237596..0f8182e7bf 100644 --- a/Italian/scappare/cercare-uscita.md +++ b/Italian/scappare/cercare-uscita.md @@ -9,4 +9,6 @@ Inciampi in una bottiglia rotta a metà, e ci sono vetri ovunque. [Approfitti del vetro più tagliente per farti la barba](barba/barba.md) -[Fra i vetri rotti scopri un oggetto](scopri-oggetto/scopri-oggetto.md) \ No newline at end of file +[Fra i vetri rotti scopri un oggetto](scopri-oggetto/scopri-oggetto.md) + +[Provi a ripararla] (riparare/ripari.md) \ No newline at end of file diff --git a/Italian/scappare/riparare/ripari.md b/Italian/scappare/riparare/ripari.md new file mode 100644 index 0000000000..edd568d6a9 --- /dev/null +++ b/Italian/scappare/riparare/ripari.md @@ -0,0 +1 @@ +La tua indole da Bob-Aggiustatutto ti porta a cercare di riparare la bottiglia. From 69678ca232cf5a93ecbf477c120071953312f481 Mon Sep 17 00:00:00 2001 From: Jacopo Prandelli Date: Mon, 13 Jun 2016 11:32:25 +0200 Subject: [PATCH 3640/5486] sleeping-pills breakfast --- Italian/colazione/colazione.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Italian/colazione/colazione.md b/Italian/colazione/colazione.md index ddb5f823d0..2ec119beb7 100644 --- a/Italian/colazione/colazione.md +++ b/Italian/colazione/colazione.md @@ -1,3 +1,5 @@ [Si mangia](https://www.youtube.com/watch?v=sN6opoE0iZk) -Si esce a prendere il tram \ No newline at end of file +Si esce a prendere il tram + +[prendi dei sonniferi] (dormire/sogno-strano.md) \ No newline at end of file From f3a6879e97e28708f66795585bfef10670137e40 Mon Sep 17 00:00:00 2001 From: Jacopo Prandelli Date: Mon, 13 Jun 2016 11:37:36 +0200 Subject: [PATCH 3641/5486] sleeping-pills breakfast --- Italian/colazione/colazione.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Italian/colazione/colazione.md b/Italian/colazione/colazione.md index 2ec119beb7..ce8a27fe41 100644 --- a/Italian/colazione/colazione.md +++ b/Italian/colazione/colazione.md @@ -2,4 +2,4 @@ Si esce a prendere il tram -[prendi dei sonniferi] (dormire/sogno-strano.md) \ No newline at end of file +[prendi dei sonniferi] (../dormire/sogno-strano.md) \ No newline at end of file From cf40e40538682ee2c7c013c2d399238299b65087 Mon Sep 17 00:00:00 2001 From: Jacopo Prandelli Date: Mon, 13 Jun 2016 11:41:07 +0200 Subject: [PATCH 3642/5486] sleeping-pills breakfast --- Italian/colazione/colazione.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Italian/colazione/colazione.md b/Italian/colazione/colazione.md index ce8a27fe41..8a4148f7a5 100644 --- a/Italian/colazione/colazione.md +++ b/Italian/colazione/colazione.md @@ -2,4 +2,4 @@ Si esce a prendere il tram -[prendi dei sonniferi] (../dormire/sogno-strano.md) \ No newline at end of file +[prendi dei sonniferi] (Italian/dormire/sogno-strano.md) \ No newline at end of file From 3675b465e3f7207e9afc25f995dd7ae5c6e458e9 Mon Sep 17 00:00:00 2001 From: Jacopo Prandelli Date: Mon, 13 Jun 2016 11:48:01 +0200 Subject: [PATCH 3643/5486] sleeping-pills --- Italian/colazione/colazione.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Italian/colazione/colazione.md b/Italian/colazione/colazione.md index 8a4148f7a5..ce8a27fe41 100644 --- a/Italian/colazione/colazione.md +++ b/Italian/colazione/colazione.md @@ -2,4 +2,4 @@ Si esce a prendere il tram -[prendi dei sonniferi] (Italian/dormire/sogno-strano.md) \ No newline at end of file +[prendi dei sonniferi] (../dormire/sogno-strano.md) \ No newline at end of file From 50033a9e1be06857137b4a1a3271f5b8525360fa Mon Sep 17 00:00:00 2001 From: Jacopo Prandelli Date: Mon, 13 Jun 2016 11:49:47 +0200 Subject: [PATCH 3644/5486] sleeping-pills --- Italian/colazione/colazione.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Italian/colazione/colazione.md b/Italian/colazione/colazione.md index ce8a27fe41..8f0238a3af 100644 --- a/Italian/colazione/colazione.md +++ b/Italian/colazione/colazione.md @@ -2,4 +2,4 @@ Si esce a prendere il tram -[prendi dei sonniferi] (../dormire/sogno-strano.md) \ No newline at end of file +[prendi dei sonniferi] (../domire/sogno-strano.md) \ No newline at end of file From c0df883edb0ed7d053f13b4f9eb2001cc4519b2e Mon Sep 17 00:00:00 2001 From: Kevin Watke Date: Mon, 13 Jun 2016 09:07:35 -0500 Subject: [PATCH 3645/5486] added a sentance to english/wake-up/wake-up.md "surrounded by dragons". --- english/wake-up/wake-up.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/wake-up/wake-up.md b/english/wake-up/wake-up.md index bc941766f8..585bdda2f8 100644 --- a/english/wake-up/wake-up.md +++ b/english/wake-up/wake-up.md @@ -8,6 +8,8 @@ by a camp fire (with the smell of burnt marshmallow in the air) on a deserted island +surrounded by dragons + Now you wonder how you got to this island. What were you doing before you were on the island and where did the marshmallows come From 724a4a390df2f91baba62659817d1922bff7ef3b Mon Sep 17 00:00:00 2001 From: Andrey Maleev Date: Tue, 14 Jun 2016 12:03:25 +0800 Subject: [PATCH 3646/5486] Add option "next room" at russian/programming/to-program.md --- russian/programming/to-program.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/programming/to-program.md b/russian/programming/to-program.md index 13d9a449ad..daab98504d 100644 --- a/russian/programming/to-program.md +++ b/russian/programming/to-program.md @@ -1 +1,3 @@ -Вы решаете, что в любой непонятной ситуации нужно писать код, и отправляетесь на поиски комьютера. \ No newline at end of file +Вы решаете, что в любой непонятной ситуации нужно писать код, и отправляетесь на поиски комьютера. + +[Искать в другой комнате](next_room/next_room.md) \ No newline at end of file From 06bc8735f167f0eb91c2f911c41b099cad1aeda8 Mon Sep 17 00:00:00 2001 From: Andrey Maleev Date: Tue, 14 Jun 2016 12:13:10 +0800 Subject: [PATCH 3647/5486] Correct link at russian/programming/to-program.md --- russian/programming/to-program.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/programming/to-program.md b/russian/programming/to-program.md index daab98504d..f34b7932cf 100644 --- a/russian/programming/to-program.md +++ b/russian/programming/to-program.md @@ -1,3 +1,3 @@ Вы решаете, что в любой непонятной ситуации нужно писать код, и отправляетесь на поиски комьютера. -[Искать в другой комнате](next_room/next_room.md) \ No newline at end of file +[Искать в другой комнате](../next_room/next_room.md) \ No newline at end of file From d88d08fe8fdf99cf7a738dee637046bf3e5b5bc7 Mon Sep 17 00:00:00 2001 From: Andrey Maleev Date: Tue, 14 Jun 2016 12:19:12 +0800 Subject: [PATCH 3648/5486] Add option "neighbor" at russian/programming/to-program.md --- russian/programming/to-program.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/programming/to-program.md b/russian/programming/to-program.md index f34b7932cf..f9e5b9c9f7 100644 --- a/russian/programming/to-program.md +++ b/russian/programming/to-program.md @@ -1,3 +1,5 @@ Вы решаете, что в любой непонятной ситуации нужно писать код, и отправляетесь на поиски комьютера. -[Искать в другой комнате](../next_room/next_room.md) \ No newline at end of file +[Искать в другой комнате](../next_room/next_room.md) + +[Поработать на компьютере соседей](../speak_to_neighbor/speak_to_neighbor.md) \ No newline at end of file From 62c1e915142ded471a3a3ace48a357d9cc4e5cb5 Mon Sep 17 00:00:00 2001 From: manutdkid77 Date: Tue, 14 Jun 2016 16:30:10 +0530 Subject: [PATCH 3649/5486] Add greeting --- portugues/amigo/tecnologia.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/amigo/tecnologia.md b/portugues/amigo/tecnologia.md index 9cfca263ad..3a6991f2f4 100644 --- a/portugues/amigo/tecnologia.md +++ b/portugues/amigo/tecnologia.md @@ -5,3 +5,5 @@ Você falou com seu amigo e... [Gostou muito da aplicação e decidiu lhe ensinar como colaborar com o desenvolvedor.](../colabora/colaborar.md) Percebeu que a tecnologia não é o seu ramo voltar a estudar [filosofia](filosofia/estudar.md) + +Muito bem! \ No newline at end of file From 72791ddbd98b11f45b52b589571c8508d4d05244 Mon Sep 17 00:00:00 2001 From: PiotrBerebecki Date: Tue, 14 Jun 2016 14:00:13 +0100 Subject: [PATCH 3650/5486] Add beer and sing option to life puzzle story --- english/LifePuzzle/LifePuzzle.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/english/LifePuzzle/LifePuzzle.md b/english/LifePuzzle/LifePuzzle.md index 7872dc2315..1d82ba7553 100644 --- a/english/LifePuzzle/LifePuzzle.md +++ b/english/LifePuzzle/LifePuzzle.md @@ -5,4 +5,11 @@ and your mass is proportionally reduced so as to maintain your original density. You are then thrown into an empty glass blender. The blades will start moving in 60 seconds. -What do you do? \ No newline at end of file +What do you do? + +Drink some [bear](bear/bear.md) + +or + +Begin to [sing](sing/sing.md) + From f5a9a8f2352750fafbf4e80ec1c482b8da2c778d Mon Sep 17 00:00:00 2001 From: PiotrBerebecki Date: Tue, 14 Jun 2016 14:40:10 +0100 Subject: [PATCH 3651/5486] Correct links to make them relative --- english/LifePuzzle/LifePuzzle.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/english/LifePuzzle/LifePuzzle.md b/english/LifePuzzle/LifePuzzle.md index 1d82ba7553..8918b38273 100644 --- a/english/LifePuzzle/LifePuzzle.md +++ b/english/LifePuzzle/LifePuzzle.md @@ -7,9 +7,8 @@ You are then thrown into an empty glass blender. The blades will start moving in 60 seconds. What do you do? -Drink some [bear](bear/bear.md) +[Ask a question on Quora?](../ask-on-quora/ask-on-quora.md) or -Begin to [sing](sing/sing.md) - +[Begin to sing](../sing/sing.md) \ No newline at end of file From 0f39dd811889e7940a528464a8a3d07e4db4c34c Mon Sep 17 00:00:00 2001 From: Obi-Bram Keno Beer Date: Tue, 14 Jun 2016 21:18:34 +0200 Subject: [PATCH 3652/5486] Add a few lines --- dutch/sms/sms.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dutch/sms/sms.md b/dutch/sms/sms.md index 7082aab813..c4125c5ded 100644 --- a/dutch/sms/sms.md +++ b/dutch/sms/sms.md @@ -1,2 +1,6 @@ ... het is een sms van een nummer dat je niet kent. +Een sms, wanneer krijg je nou nog een sms? +Het was niet van de overheid, niet van oma. +Toch maar klikken. +En toen kwam de schok... From 41e8799f65d717f8cdc3ee5fed55ec126bbd913b Mon Sep 17 00:00:00 2001 From: Iann Wu Date: Tue, 14 Jun 2016 13:20:42 -0700 Subject: [PATCH 3653/5486] Add Warhammer universe page. --- english/total-war/universe/universe.md | 1 + english/total-war/war-start.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 english/total-war/universe/universe.md diff --git a/english/total-war/universe/universe.md b/english/total-war/universe/universe.md new file mode 100644 index 0000000000..e8e756920d --- /dev/null +++ b/english/total-war/universe/universe.md @@ -0,0 +1 @@ +Warhammer Fantasy is a fantasy setting, created by Games Workshop, which is used by many games, including the table top wargame Warhammer Fantasy Battle, the Warhammer Fantasy Roleplay (WFRP) pen-and-paper role-playing game, and the MMORPG Warhammer Online: Age of Reckoning. More info [here](https://en.wikipedia.org/wiki/Warhammer_Fantasy_(setting)). \ No newline at end of file diff --git a/english/total-war/war-start.md b/english/total-war/war-start.md index 7eb1a9e1c6..c6fb562b44 100644 --- a/english/total-war/war-start.md +++ b/english/total-war/war-start.md @@ -1,4 +1,4 @@ -Total War - Warhammer is a turn-based strategy game with epic real-time tactical battles between armies. It is also the first in its franchise that introduces a fantasy setting as well as characters from the [Warhammer universe](https://en.wikipedia.org/wiki/Warhammer_Fantasy_(setting)). +Total War - Warhammer is a turn-based strategy game with epic real-time tactical battles between armies. It is also the first in its franchise that introduces a fantasy setting as well as characters from the [Warhammer universe](war-start/universe/universe.md). Here is a [trailer](https://youtu.be/qjzLuddjIUI) for the game. From 12822966fe6bf24050f029a6c4404e6afbbbe581 Mon Sep 17 00:00:00 2001 From: Iann Wu Date: Tue, 14 Jun 2016 14:32:41 -0700 Subject: [PATCH 3654/5486] Add Marshmallow entry point for Total War - Warhammer --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 557a1ab20a..19206cf9a8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -995,4 +995,4 @@ You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Tai you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) -Your friend told you that the new Total War - Warhammer has come out. [Let's check it out!](total-war/war-start.md) +Time to check out the latest [Total War - Warhammer](total-war/war-start.md)! From e60c47e4d66dd5e6687c519df3ae3929e4ff2dba Mon Sep 17 00:00:00 2001 From: Iann Wu Date: Tue, 14 Jun 2016 14:53:50 -0700 Subject: [PATCH 3655/5486] Break long lines into less than 120 characters --- english/total-war/war-start.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/total-war/war-start.md b/english/total-war/war-start.md index c6fb562b44..990d7ac445 100644 --- a/english/total-war/war-start.md +++ b/english/total-war/war-start.md @@ -1,4 +1,6 @@ -Total War - Warhammer is a turn-based strategy game with epic real-time tactical battles between armies. It is also the first in its franchise that introduces a fantasy setting as well as characters from the [Warhammer universe](war-start/universe/universe.md). +Total War - Warhammer is a turn-based strategy game with epic real-time tactical battles between armies. + +It is also the first in its franchise that introduces a fantasy setting as well as characters from the [Warhammer universe](war-start/universe/universe.md). Here is a [trailer](https://youtu.be/qjzLuddjIUI) for the game. From e8226535ff5f09ef3b79b4c4593a5122edea5023 Mon Sep 17 00:00:00 2001 From: Iann Wu Date: Tue, 14 Jun 2016 15:01:43 -0700 Subject: [PATCH 3656/5486] Add white spaces that were removed by auto trailing white space removal back --- english/marshmallow.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 19206cf9a8..1399262369 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,5 +1,5 @@ -Your adventure begins. You realize there are hundreds of paths for you to choose from. -Which way should you go? Only you can decide. +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! @@ -42,9 +42,9 @@ DOING will definitely keep your sharpened with latest skills (which you can get [Know about the life of this world](00-Life-of-this-world/Life of this world.md) -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) Vist the master [liquid](liquid/liquid.md). @@ -780,14 +780,14 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now -Friday, December 4th. +Despite the little conundrum that you resolved, you realize that it's now +Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" With that new revelation in mind, you quickly make like David Hasselhoff and wiggle your wrist to show off a nice particular watch that even listens -to you when you speak to it. +to you when you speak to it. ["Ahem!"](my-adventure/my-adventure.md) @@ -802,9 +802,9 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines +When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. +there are two options you must choose from. You may either do [this](gtd/gtd.md), @@ -816,12 +816,12 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? @@ -835,7 +835,7 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive](divergence/divergence.md) or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) @@ -892,7 +892,7 @@ Do you want to build a [snowman?] (snowman/snowman.md) It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) -I think I'll try defying gravity. +I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) @@ -920,7 +920,7 @@ Explore the unknown. Most people die without ever visiting this [place.](underwa As you attempt this, a voice booms!! -The [boom](day-dream/day-dream.md) +The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) @@ -932,7 +932,7 @@ You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). -So what to do next? Three doors appear and all other ways out disappear. +So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. @@ -963,7 +963,7 @@ A light appears all around you and something comes into focus in the distance. [ Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) -If you have read this far, then you must be in pain. +If you have read this far, then you must be in pain. Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. @@ -981,7 +981,7 @@ You're reincarnated as a green starfish but wish you were [blue instead.](starfi [Motivate yourself](Motivate/Motivate.md) -You wake up as Harry Potter ... and are facing Voldemort in a duel? +You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... From fa7cc6d34d1c41b603e068ef4b7ec8070a8a79f3 Mon Sep 17 00:00:00 2001 From: Iann Wu Date: Tue, 14 Jun 2016 15:08:19 -0700 Subject: [PATCH 3657/5486] Fix sentences and white spaces --- english/marshmallow.md | 2 +- english/total-war/universe/universe.md | 7 ++++++- english/total-war/war-start.md | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 1399262369..4f30b98589 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -781,7 +781,7 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) Despite the little conundrum that you resolved, you realize that it's now -Friday, December 4th. +Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" diff --git a/english/total-war/universe/universe.md b/english/total-war/universe/universe.md index e8e756920d..e83a8b2dd0 100644 --- a/english/total-war/universe/universe.md +++ b/english/total-war/universe/universe.md @@ -1 +1,6 @@ -Warhammer Fantasy is a fantasy setting, created by Games Workshop, which is used by many games, including the table top wargame Warhammer Fantasy Battle, the Warhammer Fantasy Roleplay (WFRP) pen-and-paper role-playing game, and the MMORPG Warhammer Online: Age of Reckoning. More info [here](https://en.wikipedia.org/wiki/Warhammer_Fantasy_(setting)). \ No newline at end of file +Warhammer Fantasy is a fantasy setting, created by Games Workshop, +which is used by many games, including the table top wargame Warhammer Fantasy Battle, +the Warhammer Fantasy Roleplay (WFRP) pen-and-paper role-playing game, +and the MMORPG Warhammer Online: Age of Reckoning. + +More info [here](https://en.wikipedia.org/wiki/Warhammer_Fantasy_(setting)). \ No newline at end of file diff --git a/english/total-war/war-start.md b/english/total-war/war-start.md index 990d7ac445..076f65f0a7 100644 --- a/english/total-war/war-start.md +++ b/english/total-war/war-start.md @@ -1,6 +1,6 @@ Total War - Warhammer is a turn-based strategy game with epic real-time tactical battles between armies. -It is also the first in its franchise that introduces a fantasy setting as well as characters from the [Warhammer universe](war-start/universe/universe.md). +It is also the first in its franchise that introduces a fantasy setting from the [Warhammer universe](war-start/universe/universe.md). Here is a [trailer](https://youtu.be/qjzLuddjIUI) for the game. From 015897d85fa6b2dec3fe5235669b85a11c4f901f Mon Sep 17 00:00:00 2001 From: Iann Wu Date: Tue, 14 Jun 2016 15:11:26 -0700 Subject: [PATCH 3658/5486] Fix sentences --- english/total-war/universe/universe.md | 4 ++-- english/total-war/war-start.md | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/english/total-war/universe/universe.md b/english/total-war/universe/universe.md index e83a8b2dd0..c0d5149f3f 100644 --- a/english/total-war/universe/universe.md +++ b/english/total-war/universe/universe.md @@ -1,5 +1,5 @@ -Warhammer Fantasy is a fantasy setting, created by Games Workshop, -which is used by many games, including the table top wargame Warhammer Fantasy Battle, +Warhammer Fantasy is a fantasy setting, created by Games Workshop, +which is used by many games, including the table top wargame Warhammer Fantasy Battle, the Warhammer Fantasy Roleplay (WFRP) pen-and-paper role-playing game, and the MMORPG Warhammer Online: Age of Reckoning. diff --git a/english/total-war/war-start.md b/english/total-war/war-start.md index 076f65f0a7..d20a767b57 100644 --- a/english/total-war/war-start.md +++ b/english/total-war/war-start.md @@ -1,7 +1,10 @@ -Total War - Warhammer is a turn-based strategy game with epic real-time tactical battles between armies. +Total War - Warhammer is a turn-based strategy game with +epic real-time tactical battles between armies. -It is also the first in its franchise that introduces a fantasy setting from the [Warhammer universe](war-start/universe/universe.md). +It is also the first in its franchise that introduces a +fantasy setting from the [Warhammer universe](total-war/universe/universe.md). Here is a [trailer](https://youtu.be/qjzLuddjIUI) for the game. -The game also support online multiplayer battles. [Here](https://youtu.be/JBVIRGrvUfk) is an example of a online 3v3 game play. \ No newline at end of file +The game also support online multiplayer battles. +[Here](https://youtu.be/JBVIRGrvUfk) is an example of a online 3v3 game play. \ No newline at end of file From 469e469c61cdb58196e146664d453dcf80dfea46 Mon Sep 17 00:00:00 2001 From: Iann Wu Date: Tue, 14 Jun 2016 15:29:08 -0700 Subject: [PATCH 3659/5486] Fix relative link --- english/total-war/war-start.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/total-war/war-start.md b/english/total-war/war-start.md index d20a767b57..74f6d5a69b 100644 --- a/english/total-war/war-start.md +++ b/english/total-war/war-start.md @@ -2,7 +2,7 @@ Total War - Warhammer is a turn-based strategy game with epic real-time tactical battles between armies. It is also the first in its franchise that introduces a -fantasy setting from the [Warhammer universe](total-war/universe/universe.md). +fantasy setting from the [Warhammer universe](universe/universe.md). Here is a [trailer](https://youtu.be/qjzLuddjIUI) for the game. From fb0f4080913641650f490be7c850491fc8ee2c48 Mon Sep 17 00:00:00 2001 From: PiotrBerebecki Date: Wed, 15 Jun 2016 11:58:49 +0100 Subject: [PATCH 3660/5486] Remove question mark from Quora option in LifePuzzle --- english/LifePuzzle/LifePuzzle.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/LifePuzzle/LifePuzzle.md b/english/LifePuzzle/LifePuzzle.md index 8918b38273..00b1b0737c 100644 --- a/english/LifePuzzle/LifePuzzle.md +++ b/english/LifePuzzle/LifePuzzle.md @@ -7,7 +7,7 @@ You are then thrown into an empty glass blender. The blades will start moving in 60 seconds. What do you do? -[Ask a question on Quora?](../ask-on-quora/ask-on-quora.md) +[Ask a question on Quora](../ask-on-quora/ask-on-quora.md) or From 733f5906ebef8c07917bd4d33ba10673de113f1f Mon Sep 17 00:00:00 2001 From: PiotrBerebecki Date: Wed, 15 Jun 2016 12:08:03 +0100 Subject: [PATCH 3661/5486] Add Saul Goodman option in LifePuzzle --- english/LifePuzzle/LifePuzzle.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/english/LifePuzzle/LifePuzzle.md b/english/LifePuzzle/LifePuzzle.md index 00b1b0737c..36eb33e3e2 100644 --- a/english/LifePuzzle/LifePuzzle.md +++ b/english/LifePuzzle/LifePuzzle.md @@ -7,8 +7,12 @@ You are then thrown into an empty glass blender. The blades will start moving in 60 seconds. What do you do? -[Ask a question on Quora](../ask-on-quora/ask-on-quora.md) +[Ask a question on Quora?](../ask-on-quora/ask-on-quora.md) or -[Begin to sing](../sing/sing.md) \ No newline at end of file +[Begin to sing](../sing/sing.md) + +or + +[Call Saul Goodman](../better-call-saul/saul.md) \ No newline at end of file From 738dc0a245d14c13288fb42a2f2347715bed8c5f Mon Sep 17 00:00:00 2001 From: liordino Date: Wed, 15 Jun 2016 17:58:49 -0300 Subject: [PATCH 3662/5486] =?UTF-8?q?Cria=20uma=20op=C3=A7=C3=A3o=20de=20l?= =?UTF-8?q?ivro=20para=20quem=20resolveu=20estudar=20filosofia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/amigo/filosofia/estudar.md | 2 ++ portugues/amigo/filosofia/etica/ler.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 portugues/amigo/filosofia/etica/ler.md diff --git a/portugues/amigo/filosofia/estudar.md b/portugues/amigo/filosofia/estudar.md index e09f6dcece..42398749c7 100644 --- a/portugues/amigo/filosofia/estudar.md +++ b/portugues/amigo/filosofia/estudar.md @@ -1,2 +1,4 @@ E comecei por ler este livro : +[Ética, de Baruch Espinoza](/etica/ler.md) + diff --git a/portugues/amigo/filosofia/etica/ler.md b/portugues/amigo/filosofia/etica/ler.md new file mode 100644 index 0000000000..5b295ee5a4 --- /dev/null +++ b/portugues/amigo/filosofia/etica/ler.md @@ -0,0 +1 @@ +Você começa a [ler](https://ebooks.adelaide.edu.au/s/spinoza/benedict/ethics/complete.html), e as dúvidas começam a surgir, e então busca meios de saná-las, começando por... \ No newline at end of file From d361da3f47bedbf2fb51ffbaca579465615eae41 Mon Sep 17 00:00:00 2001 From: Liordino Neto Date: Wed, 15 Jun 2016 20:29:48 -0300 Subject: [PATCH 3663/5486] =?UTF-8?q?Corrige=20o=20link=20para=20a=20p?= =?UTF-8?q?=C3=A1gina=20de=20quem=20resolveu=20ler=20o=20livro=20=C3=89tic?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/amigo/filosofia/estudar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/amigo/filosofia/estudar.md b/portugues/amigo/filosofia/estudar.md index 42398749c7..10573909cf 100644 --- a/portugues/amigo/filosofia/estudar.md +++ b/portugues/amigo/filosofia/estudar.md @@ -1,4 +1,4 @@ E comecei por ler este livro : -[Ética, de Baruch Espinoza](/etica/ler.md) +[Ética, de Baruch Espinoza](../etica/ler.md) From 1d94fb7703d0bacf48b70002ceb075b3bde170d5 Mon Sep 17 00:00:00 2001 From: Liordino Neto Date: Wed, 15 Jun 2016 20:30:54 -0300 Subject: [PATCH 3664/5486] =?UTF-8?q?Corrige=20novamente=20o=20link=20para?= =?UTF-8?q?=20a=20p=C3=A1gina=20de=20quem=20resolveu=20ler=20o=20livro=20?= =?UTF-8?q?=C3=89tica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/amigo/filosofia/estudar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/amigo/filosofia/estudar.md b/portugues/amigo/filosofia/estudar.md index 10573909cf..2636f30eec 100644 --- a/portugues/amigo/filosofia/estudar.md +++ b/portugues/amigo/filosofia/estudar.md @@ -1,4 +1,4 @@ E comecei por ler este livro : -[Ética, de Baruch Espinoza](../etica/ler.md) +[Ética, de Baruch Espinoza](etica/ler.md) From b1f20025a98fc84f8b4a1e9687b0870bc539b2d1 Mon Sep 17 00:00:00 2001 From: Liordino Neto Date: Wed, 15 Jun 2016 20:39:14 -0300 Subject: [PATCH 3665/5486] =?UTF-8?q?Separa=20o=20texto=20do=20arquivo=20e?= =?UTF-8?q?m=20linhas=20com=20n=C3=A3o=20mais=20do=20que=20120=20caractere?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/amigo/filosofia/etica/ler.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/portugues/amigo/filosofia/etica/ler.md b/portugues/amigo/filosofia/etica/ler.md index 5b295ee5a4..ae99453529 100644 --- a/portugues/amigo/filosofia/etica/ler.md +++ b/portugues/amigo/filosofia/etica/ler.md @@ -1 +1,2 @@ -Você começa a [ler](https://ebooks.adelaide.edu.au/s/spinoza/benedict/ethics/complete.html), e as dúvidas começam a surgir, e então busca meios de saná-las, começando por... \ No newline at end of file +Você começa a [ler](https://ebooks.adelaide.edu.au/s/spinoza/benedict/ethics/complete.html), e as dúvidas começam a +surgir. Então você busca meios de saná-las, começando por... From 0ea389f5ecbd255d9b60101fe45dac765349417b Mon Sep 17 00:00:00 2001 From: mantergo Date: Thu, 16 Jun 2016 03:46:44 +0300 Subject: [PATCH 3666/5486] Add tut.by story turn --- belarussian/tut-by/tut-by.md | 1 + belarussian/zefir.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 belarussian/tut-by/tut-by.md diff --git a/belarussian/tut-by/tut-by.md b/belarussian/tut-by/tut-by.md new file mode 100644 index 0000000000..33609c1881 --- /dev/null +++ b/belarussian/tut-by/tut-by.md @@ -0,0 +1 @@ +Ой, ужо напісалі, што грошай няма і ўсё блага. Няма чаго рабіць - пайду пасплю гадзінку. \ No newline at end of file diff --git a/belarussian/zefir.md b/belarussian/zefir.md index 1ee5b64971..eb1e518816 100644 --- a/belarussian/zefir.md +++ b/belarussian/zefir.md @@ -12,4 +12,6 @@ [Пабягу ў абменнiк купляць далляры](exchange-office/exchange-office.md) -[Пасплю яшчэ гадзінку](sleep-sweet/sleep-sweet.md) \ No newline at end of file +[Пасплю яшчэ гадзінку](sleep-sweet/sleep-sweet.md) + +[Пайду пакiну каментароу на tut.by](tut-by/tut-by.md) \ No newline at end of file From 60b13b0877306700f71e95d785f9090f2ef5b1f6 Mon Sep 17 00:00:00 2001 From: Amit Gandhi Date: Thu, 16 Jun 2016 15:43:15 +0530 Subject: [PATCH 3667/5486] Added a new episode for Star Wars ! --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 4f30b98589..1ac2ed2ef1 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -827,6 +827,8 @@ Yourself? Instead of reading this entire story, you decide to go see the new star wars! +As you're walking down the street you see [something](millenium-falcon/flyaway.md) + You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). [Do you have my stapler?](stapler/stapler.md) From 83de862c3a48b1b71242f6f819326b0e7b6fc912 Mon Sep 17 00:00:00 2001 From: Amit Gandhi Date: Thu, 16 Jun 2016 15:43:48 +0530 Subject: [PATCH 3668/5486] Added the story for flying away in a Millenium Falcon --- english/millenium-falcon/flyaway.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/millenium-falcon/flyaway.md diff --git a/english/millenium-falcon/flyaway.md b/english/millenium-falcon/flyaway.md new file mode 100644 index 0000000000..eb1d0eb841 --- /dev/null +++ b/english/millenium-falcon/flyaway.md @@ -0,0 +1 @@ +Suddenly you encounter a giant flying ship lying on the side, and you draw closer your heart starts beating fast. Wait, could it be? Could it really be the Millenium Falcon? As you pinch yourself and realize you're not dreaming, you now enter this giant ship and turn on the controls ! Fly way, you lucky brat, fly away ! From eba74fbf5d6b240fa65b8588c2e578c8836b6dc4 Mon Sep 17 00:00:00 2001 From: Allen Date: Thu, 16 Jun 2016 13:37:53 +0300 Subject: [PATCH 3669/5486] feat: Intra in scena CRBL cu Petre --- romanian/nalba.md | 2 ++ romanian/vrajeala/vrajeala.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 romanian/vrajeala/vrajeala.md diff --git a/romanian/nalba.md b/romanian/nalba.md index 05081dadc0..27823b846a 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -77,3 +77,5 @@ Parea ca devenise un [pitigoi lustragiu](pitigoi/pitigoi.md) pentru incisivii [crocobalaurului](padurea_violet/croco/croco.md). Si se simtea atat de [euforic] (euforie/euforie.md) incat nu-i mai pasa. + +Plin de vrajeala alicea [da un click aici](vrajeala/vrajeala.md) diff --git a/romanian/vrajeala/vrajeala.md b/romanian/vrajeala/vrajeala.md new file mode 100644 index 0000000000..0a0ddcf5da --- /dev/null +++ b/romanian/vrajeala/vrajeala.md @@ -0,0 +1 @@ +Ce-avem noi aicea? Petre stie ... bine ca si-a luat-o aicea. Vezi [aici](https://www.youtube.com/watch?v=MaStwY7CY-I) \ No newline at end of file From 8313336d26d8da6a9a27b27c0937483e48b12596 Mon Sep 17 00:00:00 2001 From: Amit Gandhi Date: Thu, 16 Jun 2016 16:19:20 +0530 Subject: [PATCH 3670/5486] Breaking one huge line to multiple lines for easier readability --- english/millenium-falcon/flyaway.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/millenium-falcon/flyaway.md b/english/millenium-falcon/flyaway.md index eb1d0eb841..a1b2ebeedf 100644 --- a/english/millenium-falcon/flyaway.md +++ b/english/millenium-falcon/flyaway.md @@ -1 +1,3 @@ -Suddenly you encounter a giant flying ship lying on the side, and you draw closer your heart starts beating fast. Wait, could it be? Could it really be the Millenium Falcon? As you pinch yourself and realize you're not dreaming, you now enter this giant ship and turn on the controls ! Fly way, you lucky brat, fly away ! +Suddenly you encounter a giant flying ship lying on the side, and you draw closer your heart starts beating fast. +Wait, could it be? Could it really be the Millenium Falcon? As you pinch yourself and realize you're not dreaming, you now enter this +giant ship and turn on the controls ! Fly way, you lucky brat, fly away ! From c29bf528e87a1342701361251f600a5abeb0c758 Mon Sep 17 00:00:00 2001 From: Amit Gandhi Date: Thu, 16 Jun 2016 16:24:26 +0530 Subject: [PATCH 3671/5486] Fixed split to multiple lines --- english/millenium-falcon/flyaway.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/millenium-falcon/flyaway.md b/english/millenium-falcon/flyaway.md index a1b2ebeedf..7279ab9bec 100644 --- a/english/millenium-falcon/flyaway.md +++ b/english/millenium-falcon/flyaway.md @@ -1,3 +1,3 @@ Suddenly you encounter a giant flying ship lying on the side, and you draw closer your heart starts beating fast. -Wait, could it be? Could it really be the Millenium Falcon? As you pinch yourself and realize you're not dreaming, you now enter this -giant ship and turn on the controls ! Fly way, you lucky brat, fly away ! +Wait, could it be? Could it really be the Millenium Falcon? As you pinch yourself and realize you're not dreaming, +you now enter this giant ship and turn on the controls ! Fly way, you lucky brat, fly away ! From 8146f1405d83b2be505810063ebed0f697f264be Mon Sep 17 00:00:00 2001 From: Gmv100 Date: Thu, 16 Jun 2016 14:33:51 +0200 Subject: [PATCH 3672/5486] Adding the option to dance bachata. --- english/run_out_the_door/run_out_the_door.md | 4 +++- english/start-dancing/startDancing.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/start-dancing/startDancing.md diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md index 8c2871b939..7a0817adca 100644 --- a/english/run_out_the_door/run_out_the_door.md +++ b/english/run_out_the_door/run_out_the_door.md @@ -1,7 +1,9 @@ You immediately jump up and run out the nearest exit! -You burst out the door and the entire world is in front of you. +You burst out the door and the entire world is in front of you while bachata music is being played. You... [Go back inside](../marshmallow.md) and reclaim your rightful position in mediocrity. + +Decide to [start dancing bachata](../start-dancing/startDancing.md) and everybody start to clap and cheer you up. diff --git a/english/start-dancing/startDancing.md b/english/start-dancing/startDancing.md new file mode 100644 index 0000000000..be95ab149a --- /dev/null +++ b/english/start-dancing/startDancing.md @@ -0,0 +1 @@ +When the song finishes, you think it is a great idea to start a party for all the people there. \ No newline at end of file From 2cd59a6d7e6f0c845e0fe6119f5f8d15c8252bbb Mon Sep 17 00:00:00 2001 From: taikonavt Date: Thu, 16 Jun 2016 16:58:48 +0300 Subject: [PATCH 3673/5486] add choice call_girlfriend --- russian/girlfriend-pinch-you/call_girlfriend/call.md | 1 + russian/girlfriend-pinch-you/girlfriend-pinch-you.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 russian/girlfriend-pinch-you/call_girlfriend/call.md diff --git a/russian/girlfriend-pinch-you/call_girlfriend/call.md b/russian/girlfriend-pinch-you/call_girlfriend/call.md new file mode 100644 index 0000000000..6357fea0a7 --- /dev/null +++ b/russian/girlfriend-pinch-you/call_girlfriend/call.md @@ -0,0 +1 @@ +Вы зовете вашу девушку, но никто не отвечает. Внезапно из сада раздается сдавленный крик ... diff --git a/russian/girlfriend-pinch-you/girlfriend-pinch-you.md b/russian/girlfriend-pinch-you/girlfriend-pinch-you.md index 3f17374954..9997230baa 100644 --- a/russian/girlfriend-pinch-you/girlfriend-pinch-you.md +++ b/russian/girlfriend-pinch-you/girlfriend-pinch-you.md @@ -1,3 +1,5 @@ От увиденного в комнате вам становится дурно. Стены из зефира, шолокоданая глазурь, звуки тромбона ... В голове лишь одна мысль: «Дорогая, ущепни меня, неужели я сплю?». -Вы привычно оборачиваетесь и вдруг осознаете что вы в комнате один! Где ваша девушка? \ No newline at end of file +Вы привычно оборачиваетесь и вдруг осознаете что вы в комнате один! Где ваша девушка? + +[Позвать девушку] (call_girlfriend/call.md) From f4279aa1479aecca80436dc414fb6a09f1ee0b8a Mon Sep 17 00:00:00 2001 From: Gmv100 Date: Thu, 16 Jun 2016 16:12:03 +0200 Subject: [PATCH 3674/5486] Updating mistake. It is forbidden to modify a line. --- english/run_out_the_door/run_out_the_door.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md index 7a0817adca..92722a42ba 100644 --- a/english/run_out_the_door/run_out_the_door.md +++ b/english/run_out_the_door/run_out_the_door.md @@ -1,6 +1,6 @@ You immediately jump up and run out the nearest exit! -You burst out the door and the entire world is in front of you while bachata music is being played. +You burst out the door and the entire world is in front of you. You... From 7e49728094d03fd57e5ca3744a45c7436e11cf65 Mon Sep 17 00:00:00 2001 From: PiotrBerebecki Date: Thu, 16 Jun 2016 23:35:50 +0100 Subject: [PATCH 3675/5486] Add Justice League option to LifePuzzle story --- english/LifePuzzle/LifePuzzle.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/LifePuzzle/LifePuzzle.md b/english/LifePuzzle/LifePuzzle.md index 36eb33e3e2..61dad3f95f 100644 --- a/english/LifePuzzle/LifePuzzle.md +++ b/english/LifePuzzle/LifePuzzle.md @@ -15,4 +15,8 @@ or or -[Call Saul Goodman](../better-call-saul/saul.md) \ No newline at end of file +[Call Saul Goodman](../better-call-saul/saul.md) + +or + +[Call the Justice League](../justice-league/justice-league.md) \ No newline at end of file From 9c7f68bd22afc6ffcbbe7499d3223591b960d432 Mon Sep 17 00:00:00 2001 From: PiotrBerebecki Date: Thu, 16 Jun 2016 23:56:32 +0100 Subject: [PATCH 3676/5486] Add story about computer looking out of the window --- english/computer-window/computer-window.md | 9 +++++++++ english/marshmallow.md | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 english/computer-window/computer-window.md diff --git a/english/computer-window/computer-window.md b/english/computer-window/computer-window.md new file mode 100644 index 0000000000..1cd9cb9293 --- /dev/null +++ b/english/computer-window/computer-window.md @@ -0,0 +1,9 @@ +You wake up in the morning and your computer is looking out of the window + +You asked her, + + - Are you OK? + + And she says, + + - Yes, thank you. I'm just thinking about our future... diff --git a/english/marshmallow.md b/english/marshmallow.md index 4f30b98589..bee1e45c01 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -996,3 +996,5 @@ You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Tai you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) Time to check out the latest [Total War - Warhammer](total-war/war-start.md)! + +You wake up in the morning and your [computer is looking out of the window](computer-windowd/computer-window.md) From c84538cee81365e4aecd53923b9a025b8c043b14 Mon Sep 17 00:00:00 2001 From: PiotrBerebecki Date: Fri, 17 Jun 2016 00:04:26 +0100 Subject: [PATCH 3677/5486] Correct broken link in computer window story --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index bee1e45c01..0e77afbbbe 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -997,4 +997,4 @@ you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) Time to check out the latest [Total War - Warhammer](total-war/war-start.md)! -You wake up in the morning and your [computer is looking out of the window](computer-windowd/computer-window.md) +You wake up in the morning and your [computer is looking out of the window](computer-window/computer-window.md) From d611df8129b3d78aab0b9f22903cdc0515034d64 Mon Sep 17 00:00:00 2001 From: Jaemoon Date: Thu, 16 Jun 2016 20:26:23 -0400 Subject: [PATCH 3678/5486] add vacuum adventure extension to call spirit file --- english/call-spirit/call-spirit.md | 4 +++- english/vacuum/vacuum.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/vacuum/vacuum.md diff --git a/english/call-spirit/call-spirit.md b/english/call-spirit/call-spirit.md index 4dfbff2591..d5ce39ea62 100644 --- a/english/call-spirit/call-spirit.md +++ b/english/call-spirit/call-spirit.md @@ -1 +1,3 @@ -The spirit says everything in your life is upside down! Are you even alive? Is everyone who they say the are? \ No newline at end of file +The spirit says everything in your life is upside down! Are you even alive? Is everyone who they say the are? It turns out this spirit is a troll! Luckily, you have your vaccuum on you. + +[Click here to use the vacuum!](../vacuum/vacuum.md) \ No newline at end of file diff --git a/english/vacuum/vacuum.md b/english/vacuum/vacuum.md new file mode 100644 index 0000000000..7b16306574 --- /dev/null +++ b/english/vacuum/vacuum.md @@ -0,0 +1 @@ +What should I do with this vacuum? \ No newline at end of file From 91b752556a6cdfd7872c874624a50fe2db1ad9da Mon Sep 17 00:00:00 2001 From: Jaemoon Date: Thu, 16 Jun 2016 20:28:24 -0400 Subject: [PATCH 3679/5486] Adjust second line to less than 120 characters --- english/call-spirit/call-spirit.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/call-spirit/call-spirit.md b/english/call-spirit/call-spirit.md index d5ce39ea62..9639a2b5c8 100644 --- a/english/call-spirit/call-spirit.md +++ b/english/call-spirit/call-spirit.md @@ -1,3 +1,4 @@ -The spirit says everything in your life is upside down! Are you even alive? Is everyone who they say the are? It turns out this spirit is a troll! Luckily, you have your vaccuum on you. +The spirit says everything in your life is upside down! Are you even alive? Is everyone who they say the are? +It turns out this spirit is a troll! Luckily, you have your vaccuum on you. [Click here to use the vacuum!](../vacuum/vacuum.md) \ No newline at end of file From 98860ea76628e28f735a706ef5d35641ee4ffe7f Mon Sep 17 00:00:00 2001 From: SRD Date: Thu, 16 Jun 2016 22:24:38 -0400 Subject: [PATCH 3680/5486] Add hot fruit option for the party --- english/start-dancing/startDancing.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/start-dancing/startDancing.md b/english/start-dancing/startDancing.md index be95ab149a..4ca60ac741 100644 --- a/english/start-dancing/startDancing.md +++ b/english/start-dancing/startDancing.md @@ -1 +1,5 @@ -When the song finishes, you think it is a great idea to start a party for all the people there. \ No newline at end of file +When the song finishes, you think it is a great idea to start a party for all the people there. + +What do you serve to your guests at this party to end all parties? + +[Hot fruit](../english/madness/cthulhu.md) (Hey, isn't the the bowl you mixed the glint in?) \ No newline at end of file From e54b92d515ddba26147b6fb4e9f544afabd18d1a Mon Sep 17 00:00:00 2001 From: SRD Date: Thu, 16 Jun 2016 22:29:10 -0400 Subject: [PATCH 3681/5486] Fixed link for hot fruit --- english/start-dancing/startDancing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/start-dancing/startDancing.md b/english/start-dancing/startDancing.md index 4ca60ac741..0b0d4fa5f3 100644 --- a/english/start-dancing/startDancing.md +++ b/english/start-dancing/startDancing.md @@ -2,4 +2,4 @@ When the song finishes, you think it is a great idea to start a party for all th What do you serve to your guests at this party to end all parties? -[Hot fruit](../english/madness/cthulhu.md) (Hey, isn't the the bowl you mixed the glint in?) \ No newline at end of file +[Hot fruit](../madness/cthulhu.md) (Hey, isn't the the bowl you mixed the glint in?) \ No newline at end of file From 8eb1f667b479e02e8c93a4e00b7c43df949d659c Mon Sep 17 00:00:00 2001 From: HmanA6399 Date: Fri, 17 Jun 2016 05:45:01 +0200 Subject: [PATCH 3682/5486] Add Khan Academy link to arabic learn.md --- arabic/learn/learn.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arabic/learn/learn.md b/arabic/learn/learn.md index 94bd28ceff..519b291dcf 100644 --- a/arabic/learn/learn.md +++ b/arabic/learn/learn.md @@ -8,6 +8,8 @@ -Udacity -coursera -Udemy +-Khan Academy +-thenewboston وفيه كتير بس انت عليك تدور @@ -27,6 +29,8 @@ freelancing اشهر مواقع العمل الحر - [الطهي](whattolearn/cooking/cooking.md) +- [الرياضيات](https://www.khanacademy.org) + - [أخرى](whattolearn/other/other.md) From 83f3091cccd287bad83b9d3fa166bfc530c93324 Mon Sep 17 00:00:00 2001 From: PiotrBerebecki Date: Fri, 17 Jun 2016 23:48:21 +0100 Subject: [PATCH 3683/5486] Add Tweeting functionality to the story --- english/LifePuzzle/LifePuzzle.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/LifePuzzle/LifePuzzle.md b/english/LifePuzzle/LifePuzzle.md index 61dad3f95f..de51d5213b 100644 --- a/english/LifePuzzle/LifePuzzle.md +++ b/english/LifePuzzle/LifePuzzle.md @@ -19,4 +19,8 @@ or or -[Call the Justice League](../justice-league/justice-league.md) \ No newline at end of file +[Call the Justice League](../justice-league/justice-league.md) + +or + +[Live Tweet the situation](../tweet-it/tweet-it.md) From b1aa83c4a1bfced76a11b4665813c223855980ea Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 18 Jun 2016 08:34:13 +0100 Subject: [PATCH 3684/5486] Add so many decisions - what will you do?? --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index c5b0f3486c..d9e195d582 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,6 +1,8 @@ Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. +Oh so many decisions - what will you do?? + You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! Take some [time](meditation/meditation.md) off! From 503f13bc84f992b2f8c2c3e8f7430c1510124018 Mon Sep 17 00:00:00 2001 From: Harsh Gupta Date: Sat, 18 Jun 2016 18:37:46 +0530 Subject: [PATCH 3685/5486] Link to a new-exit from run-out-the-door.md --- english/run_out_the_door/run_out_the_door.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md index 92722a42ba..eed233ba1e 100644 --- a/english/run_out_the_door/run_out_the_door.md +++ b/english/run_out_the_door/run_out_the_door.md @@ -1,4 +1,4 @@ -You immediately jump up and run out the nearest exit! +You immediately jump up and run out the nearest [exit](../new-exit/new-exit.md)! You burst out the door and the entire world is in front of you. From e2e5c587294032995cf4fe9011efd97e04131ff8 Mon Sep 17 00:00:00 2001 From: Harsh Gupta Date: Sat, 18 Jun 2016 18:41:09 +0530 Subject: [PATCH 3686/5486] Write new story in new-exit.md --- english/new-exit/new-exit.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/new-exit/new-exit.md diff --git a/english/new-exit/new-exit.md b/english/new-exit/new-exit.md new file mode 100644 index 0000000000..9aeb869fcb --- /dev/null +++ b/english/new-exit/new-exit.md @@ -0,0 +1,4 @@ +From this exit, you found an entire new world full of mysteries. + +All the exits from original world to this world are closed and there is only one way to open it. +Explore more to find a way to open it. \ No newline at end of file From cb1658b2040a91caa1b9190943dfc4f673b32720 Mon Sep 17 00:00:00 2001 From: Harsh Gupta Date: Sat, 18 Jun 2016 18:49:17 +0530 Subject: [PATCH 3687/5486] Change the deleted line in run_out_the_door.md back to normal with new insertion of line --- english/run_out_the_door/run_out_the_door.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md index eed233ba1e..7e8a5792da 100644 --- a/english/run_out_the_door/run_out_the_door.md +++ b/english/run_out_the_door/run_out_the_door.md @@ -1,3 +1,5 @@ +You immediately jump up and run out the nearest exit! + You immediately jump up and run out the nearest [exit](../new-exit/new-exit.md)! You burst out the door and the entire world is in front of you. From 1440235b56081aab1533b0b9e739b66859c1130c Mon Sep 17 00:00:00 2001 From: Robert Kraig Date: Sat, 18 Jun 2016 10:42:20 -0400 Subject: [PATCH 3688/5486] add MD file for "write-a-symphony" --- english/write-a-symphony/symphony.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 english/write-a-symphony/symphony.md diff --git a/english/write-a-symphony/symphony.md b/english/write-a-symphony/symphony.md new file mode 100644 index 0000000000..5cd9e56e03 --- /dev/null +++ b/english/write-a-symphony/symphony.md @@ -0,0 +1,9 @@ +# Beethoven + +You begin writing your masterpiece. But then you realize you're going deaf. + +Do you: + +[Call a doctor?](../call-a-doctor/doctor.md) + +[Lower your creative ambitions?](../write-a-hiku/hiku.md) \ No newline at end of file From 993b3c9de8011a6a31451ce04b833c7bd5585734 Mon Sep 17 00:00:00 2001 From: Robert Kraig Date: Sat, 18 Jun 2016 10:43:41 -0400 Subject: [PATCH 3689/5486] add symphony link to meditate.MD --- english/meditate/meditate.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/meditate/meditate.md b/english/meditate/meditate.md index a4cd6f02d6..eb171525f6 100644 --- a/english/meditate/meditate.md +++ b/english/meditate/meditate.md @@ -34,6 +34,8 @@ Afterwards, you decide to: [do Yoga for 30 min](../yoga/yoga.md) +[write a symphony](../write-a-symphony/symphony.md) + [go for a run](../run/run.md) [sleep a bit](../sleep/marshmallow.md) From 104d02ae55d3cb714d9eb7349038a156e031704d Mon Sep 17 00:00:00 2001 From: Robert Kraig Date: Sat, 18 Jun 2016 10:45:00 -0400 Subject: [PATCH 3690/5486] add symphony text to marshmallow.MD --- english/marshmallow.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index d9e195d582..cff9c5078e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -21,6 +21,9 @@ January 2017 approaches. You have two presidential candidates to vote for. [Click](vote-the-president/hillary/Hillary.md) here to vote for Hillary Clinton. +You don't like either of these candidates. +So instead, you decide to [write a symphony](write-a-symphony/symphony.md) + Keith the Unicorn approaches you. He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) From 1dd357d0a80b834641f4a124b036a4304fed5c95 Mon Sep 17 00:00:00 2001 From: Esposito Date: Sat, 18 Jun 2016 18:41:08 +0200 Subject: [PATCH 3691/5486] Aggiunta la storia Passeggiare in Italiano --- Italian/caramelle.md | 4 +++- Italian/passeggiare/passeggiare.md | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 Italian/passeggiare/passeggiare.md diff --git a/Italian/caramelle.md b/Italian/caramelle.md index e4e6a816e6..2fc343abe2 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -19,4 +19,6 @@ Che fai? [Alice non abita più qui] (alice/alice.md) -[Cerco un computer] (giocare/computer.md) \ No newline at end of file +[Cerco un computer] (giocare/computer.md) + +[Passeggiare] (passeggiare/passeggiare.md) \ No newline at end of file diff --git a/Italian/passeggiare/passeggiare.md b/Italian/passeggiare/passeggiare.md new file mode 100644 index 0000000000..0afacfaa3f --- /dev/null +++ b/Italian/passeggiare/passeggiare.md @@ -0,0 +1,5 @@ +Vado molto di fretta, +penso di prendere l'auto, +poi comincio a cammirare avvicinandomi al garage, +lo sorpasso, continuo a camminare, non mi fermo più. +Che bella passeggiata. From 14c48afe0fb67112ff6deb9c1bd9ade929b94ae2 Mon Sep 17 00:00:00 2001 From: Stony Brook Web Date: Sat, 18 Jun 2016 12:57:18 -0400 Subject: [PATCH 3692/5486] add Jazz to the story --- english/jazz-guitar/jazz.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/jazz-guitar/jazz.md diff --git a/english/jazz-guitar/jazz.md b/english/jazz-guitar/jazz.md new file mode 100644 index 0000000000..72bd7d0f89 --- /dev/null +++ b/english/jazz-guitar/jazz.md @@ -0,0 +1,5 @@ +The music is making you swing. You remember enjoying playing the guitar. + +[Do you pick up the guitar and join the band?](http://www.nec.edu) + +[Do you give up and go bake cookies?](../bake-cookies/cookies.md) \ No newline at end of file From f8f038599522922707a82ba370a3585a1e8bb263 Mon Sep 17 00:00:00 2001 From: Stony Brook Web Date: Sat, 18 Jun 2016 12:59:40 -0400 Subject: [PATCH 3693/5486] fix link to NEC Music --- english/jazz-guitar/jazz.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/jazz-guitar/jazz.md b/english/jazz-guitar/jazz.md index 72bd7d0f89..564befdc5a 100644 --- a/english/jazz-guitar/jazz.md +++ b/english/jazz-guitar/jazz.md @@ -1,5 +1,5 @@ The music is making you swing. You remember enjoying playing the guitar. -[Do you pick up the guitar and join the band?](http://www.nec.edu) +[Do you pick up the guitar and join the band?](http://necmusic.edu/ce/certificate/jazz) [Do you give up and go bake cookies?](../bake-cookies/cookies.md) \ No newline at end of file From bfcd9e9be723572e90660b9848f1de20a58c63f6 Mon Sep 17 00:00:00 2001 From: Stony Brook Web Date: Sat, 18 Jun 2016 13:06:19 -0400 Subject: [PATCH 3694/5486] add link from bored to jazz --- english/bored/bored.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/bored/bored.md b/english/bored/bored.md index 4e16bfa1cb..b3370b5299 100644 --- a/english/bored/bored.md +++ b/english/bored/bored.md @@ -9,3 +9,5 @@ "Or should I go on an [ADVENTURE!](../eat-rainbows/rainbows.md)?" "Or maybe [escape to the wilderness](../escape-to-the-wilderness/wilderness.md)?" + +("Maybe I should go to a jazz club?")[../jazz-guitar.jazz.md] From 8fffd8449f1a85dea46f4938b6ab7960edd93710 Mon Sep 17 00:00:00 2001 From: Stony Brook Web Date: Sat, 18 Jun 2016 13:09:08 -0400 Subject: [PATCH 3695/5486] fix link syntax --- english/bored/bored.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bored/bored.md b/english/bored/bored.md index b3370b5299..6c868b7e1a 100644 --- a/english/bored/bored.md +++ b/english/bored/bored.md @@ -10,4 +10,4 @@ "Or maybe [escape to the wilderness](../escape-to-the-wilderness/wilderness.md)?" -("Maybe I should go to a jazz club?")[../jazz-guitar.jazz.md] +["Maybe I should go to a jazz club?"](../jazz-guitar.jazz.md) From fc8a1045b36a319e04b79eb665939605358d76ff Mon Sep 17 00:00:00 2001 From: Stony Brook Web Date: Sat, 18 Jun 2016 13:10:19 -0400 Subject: [PATCH 3696/5486] fix link destination --- english/bored/bored.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bored/bored.md b/english/bored/bored.md index 6c868b7e1a..aa32b6e00d 100644 --- a/english/bored/bored.md +++ b/english/bored/bored.md @@ -10,4 +10,4 @@ "Or maybe [escape to the wilderness](../escape-to-the-wilderness/wilderness.md)?" -["Maybe I should go to a jazz club?"](../jazz-guitar.jazz.md) +["Maybe I should go to a jazz club?"](../jazz-guitar/jazz.md) From 20570a349249c91295bf5adca05741e9251da4c1 Mon Sep 17 00:00:00 2001 From: PiotrBerebecki Date: Sat, 18 Jun 2016 23:26:14 +0100 Subject: [PATCH 3697/5486] Add wikipedia option to the computer story --- english/computer-window/computer-window.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/computer-window/computer-window.md b/english/computer-window/computer-window.md index 1cd9cb9293..b55d3392f6 100644 --- a/english/computer-window/computer-window.md +++ b/english/computer-window/computer-window.md @@ -7,3 +7,7 @@ You asked her, And she says, - Yes, thank you. I'm just thinking about our future... + + What do you do? + + (Check out Wikipedia)[../wikipedia/wiki.md] From eb6d27e71578a33fb0f9496bfd66e83757aeadad Mon Sep 17 00:00:00 2001 From: PiotrBerebecki Date: Sat, 18 Jun 2016 23:30:38 +0100 Subject: [PATCH 3698/5486] Correct hyperlink path --- english/computer-window/computer-window.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/computer-window/computer-window.md b/english/computer-window/computer-window.md index b55d3392f6..eb04fb95d2 100644 --- a/english/computer-window/computer-window.md +++ b/english/computer-window/computer-window.md @@ -10,4 +10,4 @@ You asked her, What do you do? - (Check out Wikipedia)[../wikipedia/wiki.md] +[Check out Wikipedia](../wikipedia/wiki.md) From a69625f6c398c89514ccc6d1309eb8deb8442203 Mon Sep 17 00:00:00 2001 From: Sam Kaplan Date: Sat, 18 Jun 2016 20:01:54 -0700 Subject: [PATCH 3699/5486] Add version everything text --- english/meditation/meditation.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/meditation/meditation.md b/english/meditation/meditation.md index fb1f197c2d..e9bf30675f 100644 --- a/english/meditation/meditation.md +++ b/english/meditation/meditation.md @@ -1,6 +1,8 @@ You should relax, you completed the git course, good job! You feel relaxed and sleepy... Go to sleep? +Now that you have learned git and github, you can version everything! + Click [here](https://www.youtube.com/watch?v=2u86NS3NtMw)! [Go to sleep](../sleep/more-sleep/expired-milk/expired-milk.md)? From 6f7160178191ac095ddffe54f1ddc6a792a4ce1a Mon Sep 17 00:00:00 2001 From: Nick Short Date: Sun, 19 Jun 2016 10:50:09 +0100 Subject: [PATCH 3700/5486] Add to monty python tale --- english/Monty-Python/search.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/Monty-Python/search.md b/english/Monty-Python/search.md index cc37069416..247174afa2 100644 --- a/english/Monty-Python/search.md +++ b/english/Monty-Python/search.md @@ -1,3 +1,7 @@ You set out on a search for the holy grail. Ride to the nearest castle. + +Meet the black knight + +Chop off his limbs \ No newline at end of file From 7f19b74b556d92e6c96c0671b1c6d223a2101778 Mon Sep 17 00:00:00 2001 From: shamshuddeen Date: Sun, 19 Jun 2016 16:10:05 +0530 Subject: [PATCH 3701/5486] adding my blog link --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index cff9c5078e..9c0626b342 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,5 @@ +[Click here](http://www.dvloper.me) to visit my dvloper.me blog . + Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. From 83f5494bf3b6f3bc721789ba18ce20d133500e27 Mon Sep 17 00:00:00 2001 From: Gabriel Abdala Date: Sun, 19 Jun 2016 10:45:38 -0400 Subject: [PATCH 3702/5486] Gol da Alemanha --- portugues/futebol/futebol.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/futebol/futebol.md b/portugues/futebol/futebol.md index 419575137e..3aec88c52b 100644 --- a/portugues/futebol/futebol.md +++ b/portugues/futebol/futebol.md @@ -1 +1,3 @@ -Você joga futebol com a cabeça de seus amigos que não conseguem consertar o bug. \ No newline at end of file +Você joga futebol com a cabeça de seus amigos que não conseguem consertar o bug. + +Gol da Alemanha \ No newline at end of file From de9546c7aa19549d110bbf055adbdd0c3fc27d23 Mon Sep 17 00:00:00 2001 From: Yasmine Triola Date: Sun, 19 Jun 2016 14:27:26 -0400 Subject: [PATCH 3703/5486] Add three sentences to dig.md --- english/dig/dig.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/dig/dig.md b/english/dig/dig.md index fd2551612d..457850a2d5 100644 --- a/english/dig/dig.md +++ b/english/dig/dig.md @@ -2,12 +2,16 @@ You find that the walls are very thin, so you quickly break through. The effort has left you exhausted, but outside, you see a forest. +A lush green forest with an unsettling feeling about it. + A big, black bird approaches. It says "hello" "Hello, Mr Bird!", you say, and spot a collar with a tag on it. +The collar is worn dark brown leather, and the tag is faded silver. A very unusual looking bird indeed. + Upon inspecting the tag, you see it reads: "Nevermore". Turning over the tag, you see: "If found, please return to: Outis, 13 West Range, U. Virginia". @@ -35,4 +39,4 @@ Do you: [teach the bird how to worship lord](worship/worship.md) -[Rub the tag three times](../dragons/fire-everywhere.md) \ No newline at end of file +[Rub the tag three times](../dragons/fire-everywhere.md) From 7c2687ce19d3545fb55ec1ed4763c05687b752d7 Mon Sep 17 00:00:00 2001 From: "[Devin Cohen]" <[devin.cohen658@gmail.com]> Date: Sun, 19 Jun 2016 15:43:38 -0400 Subject: [PATCH 3704/5486] Add a working option to english story --- english/working/working.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/working/working.md diff --git a/english/working/working.md b/english/working/working.md new file mode 100644 index 0000000000..0aca86d95d --- /dev/null +++ b/english/working/working.md @@ -0,0 +1,5 @@ +You know you should be doing it. + +Stop wasting you'r time. + +[Get back to work](../take-nap/cucumber-induced-nap.md) \ No newline at end of file From 306463d5c3d94a775bf46c0fce3f3498c834e640 Mon Sep 17 00:00:00 2001 From: "rui.f.sampaio" Date: Mon, 20 Jun 2016 00:22:49 +0100 Subject: [PATCH 3705/5486] New beach Boracay. --- portugues_pt/praias/solemar.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/portugues_pt/praias/solemar.md b/portugues_pt/praias/solemar.md index b40e30c023..eb82eaa858 100644 --- a/portugues_pt/praias/solemar.md +++ b/portugues_pt/praias/solemar.md @@ -6,4 +6,5 @@ Gostave de conhecer Cabo Verde. Gostaria de passar um ano surfando Hawaii, Indonesia e Australia. -Gostaria de conhecer Turks and Caicos. \ No newline at end of file +Gostaria de conhecer Turks and Caicos. +Gostava de conhecer Boracay nas Filipinas. \ No newline at end of file From e29d8254a3d98a46b81355b1e1a89fd72056cc20 Mon Sep 17 00:00:00 2001 From: "kgerov@abv.bg" Date: Mon, 20 Jun 2016 14:24:28 +0300 Subject: [PATCH 3706/5486] Update bulgarian story: adrenaline shot part --- bulgarian/free_runner/tree/adrenaline/adrenaline.md | 1 + bulgarian/free_runner/tree/tree.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 bulgarian/free_runner/tree/adrenaline/adrenaline.md diff --git a/bulgarian/free_runner/tree/adrenaline/adrenaline.md b/bulgarian/free_runner/tree/adrenaline/adrenaline.md new file mode 100644 index 0000000000..15dc70f589 --- /dev/null +++ b/bulgarian/free_runner/tree/adrenaline/adrenaline.md @@ -0,0 +1 @@ +Имаш инжекция с адреналин. Биеш си я в сърцето. Силите ти се възвръщат, забравяш за болката и продължаваш да бягаш. Зад теб се появява кола. \ No newline at end of file diff --git a/bulgarian/free_runner/tree/tree.md b/bulgarian/free_runner/tree/tree.md index 1bd57784d4..48ba1c6fd0 100644 --- a/bulgarian/free_runner/tree/tree.md +++ b/bulgarian/free_runner/tree/tree.md @@ -1,3 +1,5 @@ Докато падаш към дървото, забелязваш че от прозореца на твоята стая се подава мъжка глава и те вижда. Успяваш да се хванеш за голям клон на дървото с помощта на веригата, но падането не минава без последствия. -Част от горната ти дреха се разкъсва и чак сега забелязваш, че целия ти торс е в синини. \ No newline at end of file +Част от горната ти дреха се разкъсва и чак сега забелязваш, че целия ти торс е в синини. + +1. [Биеш си инжекция с адреналин.](adrenaline/adrenaline.md) \ No newline at end of file From f1c94813327307fc30eba5f029535d131d8bae8e Mon Sep 17 00:00:00 2001 From: "kgerov@abv.bg" Date: Mon, 20 Jun 2016 14:29:38 +0300 Subject: [PATCH 3707/5486] Change line length --- bulgarian/free_runner/tree/adrenaline/adrenaline.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bulgarian/free_runner/tree/adrenaline/adrenaline.md b/bulgarian/free_runner/tree/adrenaline/adrenaline.md index 15dc70f589..992dbb8c80 100644 --- a/bulgarian/free_runner/tree/adrenaline/adrenaline.md +++ b/bulgarian/free_runner/tree/adrenaline/adrenaline.md @@ -1 +1,2 @@ -Имаш инжекция с адреналин. Биеш си я в сърцето. Силите ти се възвръщат, забравяш за болката и продължаваш да бягаш. Зад теб се появява кола. \ No newline at end of file +Имаш инжекция с адреналин. Биеш си я в сърцето. Силите ти се възвръщат, +забравяш за болката и продължаваш да бягаш. Зад теб се появява кола. \ No newline at end of file From 8fb995e17a58c519d6044b277634f782d71a8ffc Mon Sep 17 00:00:00 2001 From: "[Devin Cohen]" <[devin.cohen658@gmail.com]> Date: Mon, 20 Jun 2016 09:28:05 -0400 Subject: [PATCH 3708/5486] Add link to working.md inside fma.md --- english/Full Metal Alchemist/fma.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/Full Metal Alchemist/fma.md b/english/Full Metal Alchemist/fma.md index 3d871c7633..6bfb71d2ac 100644 --- a/english/Full Metal Alchemist/fma.md +++ b/english/Full Metal Alchemist/fma.md @@ -16,3 +16,5 @@ Set in a fictional universe in which alchemy mother back to life using alchemy. Click [here](../alchemy/alchemy.md) to learn more about alchemy. + +[Don't know what to do next?](../working/working.md) From 38636563cb3a4c9afed40cc8e2c5eb2ccc6edb11 Mon Sep 17 00:00:00 2001 From: Jan Date: Mon, 20 Jun 2016 19:09:16 +0200 Subject: [PATCH 3709/5486] Add one line --- german/Fragen/fragen.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/Fragen/fragen.md b/german/Fragen/fragen.md index be92948be5..3a1f38ce7f 100644 --- a/german/Fragen/fragen.md +++ b/german/Fragen/fragen.md @@ -1,2 +1,3 @@ Sie haben den Mut und naehern sich ihr an. Sie fragen sie: "Entschuldigung, wie spaet ist es". -Sie laechelt und beantwortet Ihre Frage: "Ich habe leider keine Armbanduhr..." \ No newline at end of file +Sie laechelt und beantwortet Ihre Frage: "Ich habe leider keine Armbanduhr..." +Jedoch holt sie sofort ihr Handy heraus, um weiter zu helfen. \ No newline at end of file From 798f6d199e6c9efc5a1e6cd30efc555ba16d003e Mon Sep 17 00:00:00 2001 From: Cheryl Spanos Date: Mon, 20 Jun 2016 14:04:51 -0700 Subject: [PATCH 3710/5486] Add smell the roses to explore outside --- english/explore-outside/explore-outside.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/explore-outside/explore-outside.md b/english/explore-outside/explore-outside.md index 47ea2a2d61..245fe6ef63 100644 --- a/english/explore-outside/explore-outside.md +++ b/english/explore-outside/explore-outside.md @@ -1,6 +1,7 @@ Walking out of a hole created from gobbling marshmallows, you step into a valley full of odd sights and sounds, each beckoning, suggesting mystery, but promising adventure. +You see rose garden full of beautiful red roses. You stop and smell the roses. You see a yellow lake surrounded by towering blue trees. In the lake, there is a small green child fishing in a marshmallow boat that's beginning to melt. But the child doesn't seem to mind. The boat is thick enough for now. You are about to call to the child. But... From 5ba508ef9c6022f5712014bec3342bcfdefc2df7 Mon Sep 17 00:00:00 2001 From: marisid Date: Tue, 21 Jun 2016 16:15:34 +0100 Subject: [PATCH 3711/5486] Update story (marshmallow.md) and add filling water tank option. --- greek/fill_water_tank/fill_water_tank.md | 5 +++++ greek/marshmallow.md | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 greek/fill_water_tank/fill_water_tank.md diff --git a/greek/fill_water_tank/fill_water_tank.md b/greek/fill_water_tank/fill_water_tank.md new file mode 100644 index 0000000000..fc8836e3da --- /dev/null +++ b/greek/fill_water_tank/fill_water_tank.md @@ -0,0 +1,5 @@ +Τα λαχταριστά ζαχαρωτά είναι φτιαγμένα από ... ζάχαρη! + +Γεμίζεις μια λεκάνη νερό κι αρχίζεις να τα ρίχνεις γρήγορα μέσα. + +Θα προλάβεις να τα ρίξεις όλα μέσα να λιώσουν χωρίς να σε φάνε; \ No newline at end of file diff --git a/greek/marshmallow.md b/greek/marshmallow.md index 25d10ae893..d8185e6376 100644 --- a/greek/marshmallow.md +++ b/greek/marshmallow.md @@ -29,3 +29,7 @@ Τελικά συνειδητοποιείς ότι ο Stay Puft Marshmallow Man από το Ghostbusters ήταν στη πραγματικότητα το ζαχαρωτό και σε πιάνει τρόμος ... μπου α χα χα... + +Όμως, μέσα στον πανικό σου, σου έρχεται στο μυαλό μια ιδέα. + +[Γεμίζεις μια λεκάνη με νερό](fill_water_tank/fill_water_tank.md) From db201072e6f406ae036183d7c321593171f53d6e Mon Sep 17 00:00:00 2001 From: Jason Malia Date: Tue, 21 Jun 2016 19:48:40 -0400 Subject: [PATCH 3712/5486] Add coding.imagination instagram --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 9c0626b342..fa67f4db6d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1007,3 +1007,5 @@ you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) Time to check out the latest [Total War - Warhammer](total-war/war-start.md)! You wake up in the morning and your [computer is looking out of the window](computer-window/computer-window.md) + +Instragram, a great place to spend time. [Visit my profile](www.instagram.com/coding-imagination) From a10bacaa6ba1fbbbeef7d4904166510dc1be2034 Mon Sep 17 00:00:00 2001 From: Jason Malia Date: Tue, 21 Jun 2016 19:55:37 -0400 Subject: [PATCH 3713/5486] Fix broken link to instagram profile --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index fa67f4db6d..ac9db9e5b9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1008,4 +1008,4 @@ Time to check out the latest [Total War - Warhammer](total-war/war-start.md)! You wake up in the morning and your [computer is looking out of the window](computer-window/computer-window.md) -Instragram, a great place to spend time. [Visit my profile](www.instagram.com/coding-imagination) +Instragram, a great place to spend time. [Visit my profile](https://www.instagram.com/coding.imagination/) From 145523112185a37a1f925a66f6e0076ac40adfb1 Mon Sep 17 00:00:00 2001 From: hendercine Date: Tue, 21 Jun 2016 18:09:08 -0700 Subject: [PATCH 3714/5486] Add new option and link to run_out_the_door --- english/run_out_the_door/run_out_the_door.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md index 7e8a5792da..b2f367a271 100644 --- a/english/run_out_the_door/run_out_the_door.md +++ b/english/run_out_the_door/run_out_the_door.md @@ -1,7 +1,7 @@ -You immediately jump up and run out the nearest exit! - You immediately jump up and run out the nearest [exit](../new-exit/new-exit.md)! +You find that a mysterious pool has formed right outside the door and with a splash you [fall in](../mysterious-pool/mysterious-pool.md)! + You burst out the door and the entire world is in front of you. You... From 0569eb477a82d64b6b6f2a07dce92119781f241d Mon Sep 17 00:00:00 2001 From: hendercine Date: Tue, 21 Jun 2016 18:12:53 -0700 Subject: [PATCH 3715/5486] Add mysterious-pool.md and directory --- english/run_out_the_door/mysterious-pool/mysterious-pool.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/run_out_the_door/mysterious-pool/mysterious-pool.md diff --git a/english/run_out_the_door/mysterious-pool/mysterious-pool.md b/english/run_out_the_door/mysterious-pool/mysterious-pool.md new file mode 100644 index 0000000000..1f9fb0e8e4 --- /dev/null +++ b/english/run_out_the_door/mysterious-pool/mysterious-pool.md @@ -0,0 +1 @@ +You sink to the bottom like a rock and your vision is obscured by millions of bubbles. When the bubbles finally clear, you see... \ No newline at end of file From 2df6ac1fbfe9a7956e90b321a5481de5adb8f6b8 Mon Sep 17 00:00:00 2001 From: hendercine Date: Tue, 21 Jun 2016 18:14:23 -0700 Subject: [PATCH 3716/5486] Change line length to 120 --- english/run_out_the_door/mysterious-pool/mysterious-pool.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/run_out_the_door/mysterious-pool/mysterious-pool.md b/english/run_out_the_door/mysterious-pool/mysterious-pool.md index 1f9fb0e8e4..9770cf5025 100644 --- a/english/run_out_the_door/mysterious-pool/mysterious-pool.md +++ b/english/run_out_the_door/mysterious-pool/mysterious-pool.md @@ -1 +1,2 @@ -You sink to the bottom like a rock and your vision is obscured by millions of bubbles. When the bubbles finally clear, you see... \ No newline at end of file +You sink to the bottom like a rock and your vision is obscured by millions of +bubbles. When the bubbles finally clear, you see... From 8b906cd5c3701af4bfe9ed0baae930c2160b95ae Mon Sep 17 00:00:00 2001 From: hendercine Date: Tue, 21 Jun 2016 18:19:02 -0700 Subject: [PATCH 3717/5486] Change line length to 120 and reset old typos --- english/run_out_the_door/run_out_the_door.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md index b2f367a271..da59e95611 100644 --- a/english/run_out_the_door/run_out_the_door.md +++ b/english/run_out_the_door/run_out_the_door.md @@ -1,6 +1,9 @@ +You immediately jump up and run out the nearest exit! + You immediately jump up and run out the nearest [exit](../new-exit/new-exit.md)! -You find that a mysterious pool has formed right outside the door and with a splash you [fall in](../mysterious-pool/mysterious-pool.md)! +You find that a mysterious pool has formed right outside the door and with a splash +you [fall in](../mysterious-pool/mysterious-pool.md)! You burst out the door and the entire world is in front of you. From dafdc4875af73252a9b323975f4ff02aca45e580 Mon Sep 17 00:00:00 2001 From: hendercine Date: Tue, 21 Jun 2016 18:48:42 -0700 Subject: [PATCH 3718/5486] Moved mysterious-pool directory to fix link --- english/{run_out_the_door => }/mysterious-pool/mysterious-pool.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/{run_out_the_door => }/mysterious-pool/mysterious-pool.md (100%) diff --git a/english/run_out_the_door/mysterious-pool/mysterious-pool.md b/english/mysterious-pool/mysterious-pool.md similarity index 100% rename from english/run_out_the_door/mysterious-pool/mysterious-pool.md rename to english/mysterious-pool/mysterious-pool.md From d15356d903d4e6a300963acc325471cc354f91d3 Mon Sep 17 00:00:00 2001 From: Manav Kothari Date: Tue, 21 Jun 2016 22:59:38 -0400 Subject: [PATCH 3719/5486] added URL for Sunny Deol as https://www.google.com --- hindi/Sunny_Deol/sunny.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hindi/Sunny_Deol/sunny.md b/hindi/Sunny_Deol/sunny.md index 28c8994504..ee38401ac2 100644 --- a/hindi/Sunny_Deol/sunny.md +++ b/hindi/Sunny_Deol/sunny.md @@ -1,4 +1,4 @@ -Sunny Deol is eldest son of [Dharmendra](https://en.wikipedia.org/wiki/Dharmendra). +Sunny Deol is eldest son of [Dharmendra](https://www.google.com). Known for his trade mark dialouge dilivery, there is hardly anybody else in the vollywood who match his acting skill. From cffc6efd3cb2b3ed597cdb9f91b27558ed83b521 Mon Sep 17 00:00:00 2001 From: Manav Kothari Date: Tue, 21 Jun 2016 23:09:16 -0400 Subject: [PATCH 3720/5486] Are they hot or what? --- hindi/Sunny_Deol/sunny.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hindi/Sunny_Deol/sunny.md b/hindi/Sunny_Deol/sunny.md index ee38401ac2..aba5d9a196 100644 --- a/hindi/Sunny_Deol/sunny.md +++ b/hindi/Sunny_Deol/sunny.md @@ -1,5 +1,8 @@ -Sunny Deol is eldest son of [Dharmendra](https://www.google.com). +Sunny Deol is eldest son of [Dharmendra](https://en.wikipedia.org/wiki/Dharmendra). Known for his trade mark dialouge dilivery, there is hardly anybody else in the vollywood who match his acting skill. -To know more about him [click here](https://en.wikipedia.org/wiki/Sunny_Deol) \ No newline at end of file +To know more about him [click here](https://en.wikipedia.org/wiki/Sunny_Deol) + + +Are they hot or what?(http://www.wonderslist.com/top-10-hottest-actresses-of-bollywood/) \ No newline at end of file From d7538d9bbf7fd282861173dcc8e34319bec0c16d Mon Sep 17 00:00:00 2001 From: Shan Date: Wed, 22 Jun 2016 17:43:08 +0530 Subject: [PATCH 3721/5486] Added another tip for developing yoga as a habit. --- english/yoga/habit/yoga-habit.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/yoga/habit/yoga-habit.md b/english/yoga/habit/yoga-habit.md index 0e375cc081..ca6c7250f2 100644 --- a/english/yoga/habit/yoga-habit.md +++ b/english/yoga/habit/yoga-habit.md @@ -3,3 +3,4 @@ to make it easier to get going: 1. Just do it! 2. Get a yoga partner +3. If lethargic, just start off with 1 minute of breathing. From aac693ab9e6f3892190d49157d7b8a62dbd41c5f Mon Sep 17 00:00:00 2001 From: Guerrino Leombruno Date: Thu, 23 Jun 2016 15:58:28 +0200 Subject: [PATCH 3722/5486] Add new adventure --- Italian/ascoltare/.DS_Store | Bin 0 -> 6148 bytes Italian/ascoltare/profumato.md | 3 +++ Italian/caramelle.md | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 Italian/ascoltare/.DS_Store create mode 100644 Italian/ascoltare/profumato.md diff --git a/Italian/ascoltare/.DS_Store b/Italian/ascoltare/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ab067662283001891e849c7c68d90421beeaf54c GIT binary patch literal 6148 zcmeHKJxc>o5S-N%0WDHmzS2tY9~>bOto;KTgH^(bnEon%SN>U?{XjTQ8^K0qVRzo! z+qri)#qBKsTOPKzzyiRW?uZW$Q}gTY6FaMn5$U|g0ed{*9X)O))!!$adx=-Pk@GU* z@3Fn#_0OAKzhR9(;2r&%Zl@EYObSQ=DIf);fE4(R0^WOR^NU19DIf);z?TC4eQ0#Y zu5d_oXq>w$yO7J z#p%qqD2H{4ic&xdj1@S~?ZW&2n*PK5KPG7>1*E{gQov@bht-m=RK0cba^7nj{gLi9 tN4gu=L1Bn?OpJESjkn{gD9XC#YhLdPhs2;WA9SLA23!}J6!>ceJ^@cr7;OLm literal 0 HcmV?d00001 diff --git a/Italian/ascoltare/profumato.md b/Italian/ascoltare/profumato.md new file mode 100644 index 0000000000..43c58cefba --- /dev/null +++ b/Italian/ascoltare/profumato.md @@ -0,0 +1,3 @@ +Parto e ascolto il programma più profumato d'Italia [Tutto Esaurito!] (http://www.105.net/sezioni/651/tutto-esaurito) + +A colaccccioneeee! \ No newline at end of file diff --git a/Italian/caramelle.md b/Italian/caramelle.md index 2fc343abe2..644700ec07 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -21,4 +21,6 @@ Che fai? [Cerco un computer] (giocare/computer.md) -[Passeggiare] (passeggiare/passeggiare.md) \ No newline at end of file +[Passeggiare] (passeggiare/passeggiare.md) + +[Salgo in macchina] (ascoltare/profumato.md) \ No newline at end of file From 2720f7c1d1fe25257703b5e4b94d4ec78fe7d4b2 Mon Sep 17 00:00:00 2001 From: pampuz Date: Thu, 23 Jun 2016 16:04:23 +0200 Subject: [PATCH 3723/5486] Delete .DS_Store --- Italian/ascoltare/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Italian/ascoltare/.DS_Store diff --git a/Italian/ascoltare/.DS_Store b/Italian/ascoltare/.DS_Store deleted file mode 100644 index ab067662283001891e849c7c68d90421beeaf54c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJxc>o5S-N%0WDHmzS2tY9~>bOto;KTgH^(bnEon%SN>U?{XjTQ8^K0qVRzo! z+qri)#qBKsTOPKzzyiRW?uZW$Q}gTY6FaMn5$U|g0ed{*9X)O))!!$adx=-Pk@GU* z@3Fn#_0OAKzhR9(;2r&%Zl@EYObSQ=DIf);fE4(R0^WOR^NU19DIf);z?TC4eQ0#Y zu5d_oXq>w$yO7J z#p%qqD2H{4ic&xdj1@S~?ZW&2n*PK5KPG7>1*E{gQov@bht-m=RK0cba^7nj{gLi9 tN4gu=L1Bn?OpJESjkn{gD9XC#YhLdPhs2;WA9SLA23!}J6!>ceJ^@cr7;OLm From 909cd48a731b67dfd4bf13fb170c661ff0392965 Mon Sep 17 00:00:00 2001 From: yagao0o Date: Thu, 23 Jun 2016 23:39:07 +0800 Subject: [PATCH 3724/5486] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=B0=8F?= =?UTF-8?q?=E5=B2=B3=E5=B2=B3=E5=92=8C=E4=BB=96=E5=B8=88=E5=82=85=E9=83=AD?= =?UTF-8?q?=E5=BE=B7=E7=BA=B2=20new=20file:=20=20=20guodegang.md=20modifie?= =?UTF-8?q?d:=20=20=20../xiaoyueyue/xiaoyueyue.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/guodegang/guodegang.md | 1 + Chinese/xiaoyueyue/xiaoyueyue.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Chinese/guodegang/guodegang.md diff --git a/Chinese/guodegang/guodegang.md b/Chinese/guodegang/guodegang.md new file mode 100644 index 0000000000..0fa6a3a85c --- /dev/null +++ b/Chinese/guodegang/guodegang.md @@ -0,0 +1 @@ +说到郭德纲，那就是响当当的德云社创始人！当年的德云一哥，为什么要加当年两个字呢？因为现在的德云一哥正是他的儿子郭麒麟！正所谓打虎亲兄弟，上阵父子兵。 diff --git a/Chinese/xiaoyueyue/xiaoyueyue.md b/Chinese/xiaoyueyue/xiaoyueyue.md index 04b2f8c2e8..d4a474f473 100644 --- a/Chinese/xiaoyueyue/xiaoyueyue.md +++ b/Chinese/xiaoyueyue/xiaoyueyue.md @@ -1 +1,3 @@ -孙悟空变成了小岳岳下井挖煤，结果被吓的哭鼻子了。变身的时候估计把自己的胆子给变没了。 \ No newline at end of file +孙悟空变成了小岳岳下井挖煤，结果被吓的哭鼻子了。变身的时候估计把自己的胆子给变没了。 +胆子没了就感觉不到害怕了，于是又变得没心没肺起来，后来就哭着喊着要给郭德纲当徒弟。 +[郭德纲](../guodegang/guodegang.md) From ee7c38c2ccad3a45f732294b6c1f04a3caeca061 Mon Sep 17 00:00:00 2001 From: Emmet Date: Thu, 23 Jun 2016 13:04:34 -0500 Subject: [PATCH 3725/5486] Add prison story --- english/marshmallow.md | 36 +++++++++++++++++++----------------- english/prison.md | 1 + 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 english/prison.md diff --git a/english/marshmallow.md b/english/marshmallow.md index ac9db9e5b9..d00f552e00 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,7 +1,7 @@ [Click here](http://www.dvloper.me) to visit my dvloper.me blog . -Your adventure begins. You realize there are hundreds of paths for you to choose from. -Which way should you go? Only you can decide. +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. Oh so many decisions - what will you do?? @@ -49,9 +49,9 @@ DOING will definitely keep your sharpened with latest skills (which you can get [Know about the life of this world](00-Life-of-this-world/Life of this world.md) -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) Vist the master [liquid](liquid/liquid.md). @@ -787,14 +787,14 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now -Friday, December 4th. +Despite the little conundrum that you resolved, you realize that it's now +Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" With that new revelation in mind, you quickly make like David Hasselhoff and wiggle your wrist to show off a nice particular watch that even listens -to you when you speak to it. +to you when you speak to it. ["Ahem!"](my-adventure/my-adventure.md) @@ -809,9 +809,9 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines +When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. +there are two options you must choose from. You may either do [this](gtd/gtd.md), @@ -823,12 +823,12 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? @@ -844,7 +844,7 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive](divergence/divergence.md) or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) @@ -901,7 +901,7 @@ Do you want to build a [snowman?] (snowman/snowman.md) It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) -I think I'll try defying gravity. +I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) @@ -929,7 +929,7 @@ Explore the unknown. Most people die without ever visiting this [place.](underwa As you attempt this, a voice booms!! -The [boom](day-dream/day-dream.md) +The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) @@ -941,7 +941,7 @@ You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). -So what to do next? Three doors appear and all other ways out disappear. +So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. @@ -972,7 +972,7 @@ A light appears all around you and something comes into focus in the distance. [ Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) -If you have read this far, then you must be in pain. +If you have read this far, then you must be in pain. Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. @@ -990,7 +990,7 @@ You're reincarnated as a green starfish but wish you were [blue instead.](starfi [Motivate yourself](Motivate/Motivate.md) -You wake up as Harry Potter ... and are facing Voldemort in a duel? +You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... @@ -1009,3 +1009,5 @@ Time to check out the latest [Total War - Warhammer](total-war/war-start.md)! You wake up in the morning and your [computer is looking out of the window](computer-window/computer-window.md) Instragram, a great place to spend time. [Visit my profile](https://www.instagram.com/coding.imagination/) + +You've been charged with treason against the King. You wake up in [prison](prison/prison.md). \ No newline at end of file diff --git a/english/prison.md b/english/prison.md new file mode 100644 index 0000000000..4f05f20946 --- /dev/null +++ b/english/prison.md @@ -0,0 +1 @@ +You wake in a damp, medieval prison cell. A guard stands outside your cell, facing away from you. \ No newline at end of file From 41770794c3c4e225226f5dc32ce35a3aa74fcaa6 Mon Sep 17 00:00:00 2001 From: Emmet Date: Thu, 23 Jun 2016 13:35:08 -0500 Subject: [PATCH 3726/5486] Add prison story --- english/prison.md | 1 - english/prison/prison.md | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 english/prison.md create mode 100644 english/prison/prison.md diff --git a/english/prison.md b/english/prison.md deleted file mode 100644 index 4f05f20946..0000000000 --- a/english/prison.md +++ /dev/null @@ -1 +0,0 @@ -You wake in a damp, medieval prison cell. A guard stands outside your cell, facing away from you. \ No newline at end of file diff --git a/english/prison/prison.md b/english/prison/prison.md new file mode 100644 index 0000000000..0e11cc72af --- /dev/null +++ b/english/prison/prison.md @@ -0,0 +1 @@ +You awake in a damp, medieval prison. A guard stands in front of your cell, facing away from you. \ No newline at end of file From 26ed40978441f679fbbf8e6c6b41e908ef80c011 Mon Sep 17 00:00:00 2001 From: Emmet Date: Thu, 23 Jun 2016 14:30:37 -0500 Subject: [PATCH 3727/5486] Fix trailing whitespace being removed --- english/marshmallow.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index d00f552e00..0b3bf7ecf6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,7 +1,7 @@ [Click here](http://www.dvloper.me) to visit my dvloper.me blog . -Your adventure begins. You realize there are hundreds of paths for you to choose from. -Which way should you go? Only you can decide. +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. Oh so many decisions - what will you do?? @@ -49,9 +49,9 @@ DOING will definitely keep your sharpened with latest skills (which you can get [Know about the life of this world](00-Life-of-this-world/Life of this world.md) -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) Vist the master [liquid](liquid/liquid.md). @@ -787,14 +787,14 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now -Friday, December 4th. +Despite the little conundrum that you resolved, you realize that it's now +Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" With that new revelation in mind, you quickly make like David Hasselhoff and wiggle your wrist to show off a nice particular watch that even listens -to you when you speak to it. +to you when you speak to it. ["Ahem!"](my-adventure/my-adventure.md) @@ -809,9 +809,9 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines +When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. +there are two options you must choose from. You may either do [this](gtd/gtd.md), @@ -823,12 +823,12 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? @@ -844,7 +844,7 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive](divergence/divergence.md) or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) @@ -901,7 +901,7 @@ Do you want to build a [snowman?] (snowman/snowman.md) It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) -I think I'll try defying gravity. +I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) @@ -929,7 +929,7 @@ Explore the unknown. Most people die without ever visiting this [place.](underwa As you attempt this, a voice booms!! -The [boom](day-dream/day-dream.md) +The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) @@ -941,7 +941,7 @@ You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). -So what to do next? Three doors appear and all other ways out disappear. +So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. @@ -972,7 +972,7 @@ A light appears all around you and something comes into focus in the distance. [ Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) -If you have read this far, then you must be in pain. +If you have read this far, then you must be in pain. Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. @@ -990,7 +990,7 @@ You're reincarnated as a green starfish but wish you were [blue instead.](starfi [Motivate yourself](Motivate/Motivate.md) -You wake up as Harry Potter ... and are facing Voldemort in a duel? +You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... From a3e5febc633ea72c63ebaefaeb86992e3e267020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20G=C3=B6tz?= Date: Fri, 24 Jun 2016 11:44:20 +0200 Subject: [PATCH 3728/5486] Add Haifisch and U-Boot story --- german/Leichen/Kleidung/Haifisch/Haifisch.md | 1 + german/Leichen/Kleidung/Kleidung.md | 7 +++++++ german/Leichen/Kleidung/UBoot/UBoot.md | 1 + 3 files changed, 9 insertions(+) create mode 100644 german/Leichen/Kleidung/Haifisch/Haifisch.md create mode 100644 german/Leichen/Kleidung/UBoot/UBoot.md diff --git a/german/Leichen/Kleidung/Haifisch/Haifisch.md b/german/Leichen/Kleidung/Haifisch/Haifisch.md new file mode 100644 index 0000000000..155397f4f6 --- /dev/null +++ b/german/Leichen/Kleidung/Haifisch/Haifisch.md @@ -0,0 +1 @@ +Du hast dich wohl getäuscht - es war kein Haifisch. Gehe einen Schritt zurück. \ No newline at end of file diff --git a/german/Leichen/Kleidung/Kleidung.md b/german/Leichen/Kleidung/Kleidung.md index c60bceeb59..a7505d586f 100644 --- a/german/Leichen/Kleidung/Kleidung.md +++ b/german/Leichen/Kleidung/Kleidung.md @@ -8,3 +8,10 @@ Jetzt, da ihr euch frei im Wasser bewegen k Ihr werdet immer kraftloser und es werden immer grere Wellen. Lange haltet ihr das nicht mehr durch. + +Pltzlich sprt Ihr wie etwas eure Beine streift. Was vermutet Ihr ist es: + +Ein [Haifisch] (Haifisch/Haifisch.md) + +Ein [U-Boot] (UBoot/UBoot.md) der UdSSR + diff --git a/german/Leichen/Kleidung/UBoot/UBoot.md b/german/Leichen/Kleidung/UBoot/UBoot.md new file mode 100644 index 0000000000..4923bbe611 --- /dev/null +++ b/german/Leichen/Kleidung/UBoot/UBoot.md @@ -0,0 +1 @@ +Oh mein Gott! Es ist tatsächlich ein U-Boot. Was machst du nun?? \ No newline at end of file From ffe5bbb4fba080ddea7e36c533bb1dceeb8d0ab2 Mon Sep 17 00:00:00 2001 From: Chin Hsu Date: Fri, 24 Jun 2016 20:32:03 -0400 Subject: [PATCH 3729/5486] add new adventure to schrodinger cat --- english/schrodinger-cat/dead-or-alive/dead-or-alive.md | 4 +++- english/schrodinger-cat/dead-or-alive/luck/what-is-luck.md | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/schrodinger-cat/dead-or-alive/luck/what-is-luck.md diff --git a/english/schrodinger-cat/dead-or-alive/dead-or-alive.md b/english/schrodinger-cat/dead-or-alive/dead-or-alive.md index 94e90da006..c35b0dd15d 100644 --- a/english/schrodinger-cat/dead-or-alive/dead-or-alive.md +++ b/english/schrodinger-cat/dead-or-alive/dead-or-alive.md @@ -2,4 +2,6 @@ You opened the box so you're alive. However the cat with you is dead. -He wasn't quite so lucky. \ No newline at end of file +He wasn't quite so lucky or maybe he's very lucky. + +[Click here] (luck/what-is-luck.md) to find out why. \ No newline at end of file diff --git a/english/schrodinger-cat/dead-or-alive/luck/what-is-luck.md b/english/schrodinger-cat/dead-or-alive/luck/what-is-luck.md new file mode 100644 index 0000000000..1613e7a0c9 --- /dev/null +++ b/english/schrodinger-cat/dead-or-alive/luck/what-is-luck.md @@ -0,0 +1,5 @@ +What if death is the gateway to new world? + +What if death is the path to wake up to our real selves? + +Was it still out of luck to be awake? \ No newline at end of file From 6e7834ac3a52602a6876b960e87207129aa09e26 Mon Sep 17 00:00:00 2001 From: Chin Hsu Date: Fri, 24 Jun 2016 20:40:55 -0400 Subject: [PATCH 3730/5486] avoid remove line. --- english/schrodinger-cat/dead-or-alive/dead-or-alive.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/schrodinger-cat/dead-or-alive/dead-or-alive.md b/english/schrodinger-cat/dead-or-alive/dead-or-alive.md index c35b0dd15d..7fd39c120e 100644 --- a/english/schrodinger-cat/dead-or-alive/dead-or-alive.md +++ b/english/schrodinger-cat/dead-or-alive/dead-or-alive.md @@ -2,6 +2,8 @@ You opened the box so you're alive. However the cat with you is dead. -He wasn't quite so lucky or maybe he's very lucky. +He wasn't quite so lucky. + +Or maybe he's very lucky? [Click here] (luck/what-is-luck.md) to find out why. \ No newline at end of file From 999cb4e292de1af5f1d2151b33cb3914bf0fb3d0 Mon Sep 17 00:00:00 2001 From: zakhttp Date: Sat, 25 Jun 2016 18:01:03 +0400 Subject: [PATCH 3731/5486] Add reflction to luck story --- english/schrodinger-cat/dead-or-alive/luck/what-is-luck.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/schrodinger-cat/dead-or-alive/luck/what-is-luck.md b/english/schrodinger-cat/dead-or-alive/luck/what-is-luck.md index 1613e7a0c9..21fa5f02c3 100644 --- a/english/schrodinger-cat/dead-or-alive/luck/what-is-luck.md +++ b/english/schrodinger-cat/dead-or-alive/luck/what-is-luck.md @@ -2,4 +2,6 @@ What if death is the gateway to new world? What if death is the path to wake up to our real selves? -Was it still out of luck to be awake? \ No newline at end of file +Was it still out of luck to be awake? + +What does luck means? From 7d509bc52e1220c1b35c0d5f9084b416605376c0 Mon Sep 17 00:00:00 2001 From: Artem Marochkanych Date: Sat, 25 Jun 2016 19:49:10 +0300 Subject: [PATCH 3732/5486] Add keep-going option --- ukrainian/wait-more/out/try/index.md | 6 ++++-- ukrainian/wait-more/out/try/parts/keep-going/keep-going.md | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 ukrainian/wait-more/out/try/parts/keep-going/keep-going.md diff --git a/ukrainian/wait-more/out/try/index.md b/ukrainian/wait-more/out/try/index.md index 95d9d23b1f..7d202d3bb2 100644 --- a/ukrainian/wait-more/out/try/index.md +++ b/ukrainian/wait-more/out/try/index.md @@ -1,7 +1,9 @@ -Ви берете кілька листків с кущика, тягнете до рота та відчуваєте як ваше обличчя перекошує. +Ви берете кілька листків с кущика, тягнете до рота та відчуваєте як ваше обличчя перекошує. Яке ж воно кисле! Цікаво, воно все кисле, чи різні частини куща мають різні смаки.. Спробуємо? [Спробувати ще один листочок](parts/leaf/leaf.md) [Спробувати корінь](parts/root/root.md) -[Спробувати гілку](parts/branch/branch.md) \ No newline at end of file +[Спробувати гілку](parts/branch/branch.md) + +[Лишаєте позаду кущ і прямуєте далі](parts/keep-going/keep-going.md) diff --git a/ukrainian/wait-more/out/try/parts/keep-going/keep-going.md b/ukrainian/wait-more/out/try/parts/keep-going/keep-going.md new file mode 100644 index 0000000000..f303b364f0 --- /dev/null +++ b/ukrainian/wait-more/out/try/parts/keep-going/keep-going.md @@ -0,0 +1 @@ +Ви прямуєте далі і бачите, що рівнинна місцевість поступово змінилась на гористу. Місцевіть дуже нагадує Прикарпаття. From 92e304c32e296916c421ac0dafdc31d0f6d48e00 Mon Sep 17 00:00:00 2001 From: Artem Marochkanych Date: Sat, 25 Jun 2016 19:52:46 +0300 Subject: [PATCH 3733/5486] Make line shorter --- ukrainian/wait-more/out/try/parts/keep-going/keep-going.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ukrainian/wait-more/out/try/parts/keep-going/keep-going.md b/ukrainian/wait-more/out/try/parts/keep-going/keep-going.md index f303b364f0..d7d0c8c325 100644 --- a/ukrainian/wait-more/out/try/parts/keep-going/keep-going.md +++ b/ukrainian/wait-more/out/try/parts/keep-going/keep-going.md @@ -1 +1,2 @@ -Ви прямуєте далі і бачите, що рівнинна місцевість поступово змінилась на гористу. Місцевіть дуже нагадує Прикарпаття. +Ви прямуєте далі і бачите, що рівнинна місцевість поступово +змінилась на гористу. Місцевіть дуже нагадує Прикарпаття. From 2d4ab44318b1c4750853cdcc48880b22ea20299f Mon Sep 17 00:00:00 2001 From: Artem Marochkanych Date: Sat, 25 Jun 2016 20:02:01 +0300 Subject: [PATCH 3734/5486] Make try/index.md the same --- ukrainian/wait-more/out/try/index.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ukrainian/wait-more/out/try/index.md b/ukrainian/wait-more/out/try/index.md index 7d202d3bb2..71c26ac8ac 100644 --- a/ukrainian/wait-more/out/try/index.md +++ b/ukrainian/wait-more/out/try/index.md @@ -1,9 +1,7 @@ -Ви берете кілька листків с кущика, тягнете до рота та відчуваєте як ваше обличчя перекошує. +Ви берете кілька листків с кущика, тягнете до рота та відчуваєте як ваше обличчя перекошує. Яке ж воно кисле! Цікаво, воно все кисле, чи різні частини куща мають різні смаки.. Спробуємо? [Спробувати ще один листочок](parts/leaf/leaf.md) [Спробувати корінь](parts/root/root.md) [Спробувати гілку](parts/branch/branch.md) - -[Лишаєте позаду кущ і прямуєте далі](parts/keep-going/keep-going.md) From 59030af4c57250bcf2de28a1c9bda5f49490e0ea Mon Sep 17 00:00:00 2001 From: Artem Marochkanych Date: Sat, 25 Jun 2016 20:05:48 +0300 Subject: [PATCH 3735/5486] Add a link that leads to this page Please review this, @casey-collab --- ukrainian/wait-more/out/try/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ukrainian/wait-more/out/try/index.md b/ukrainian/wait-more/out/try/index.md index 71c26ac8ac..50644fe833 100644 --- a/ukrainian/wait-more/out/try/index.md +++ b/ukrainian/wait-more/out/try/index.md @@ -5,3 +5,5 @@ [Спробувати корінь](parts/root/root.md) [Спробувати гілку](parts/branch/branch.md) + +[Лишаєте позаду кущ і прямуєте далі](parts/keep-going/keep-going.md) From 5e495e3e56bac2f23979e153352223f50b50ac46 Mon Sep 17 00:00:00 2001 From: pritamhinger Date: Sun, 26 Jun 2016 10:41:03 +0530 Subject: [PATCH 3736/5486] Add story of real indian hero - Bhagat Singh. --- hindi/Bhagat_Singh/bhagat_singn.md | 13 +++++++++++++ hindi/bollywood.md | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 hindi/Bhagat_Singh/bhagat_singn.md diff --git a/hindi/Bhagat_Singh/bhagat_singn.md b/hindi/Bhagat_Singh/bhagat_singn.md new file mode 100644 index 0000000000..e1c0c95853 --- /dev/null +++ b/hindi/Bhagat_Singh/bhagat_singn.md @@ -0,0 +1,13 @@ +Bhagat Singh aka Shaheed Bhagat Singh (28 September 1907 – 23 March 1931) was an [Indian](https://simple.wikipedia.org/wiki/India) socialist and a revolutionary. He is considered to be one of the most influential revolutionaries of the [Indian Independence Movement](https://simple.wikipedia.org/wiki/Indian_independence_movement). + +He was born in a [Sikh](https://simple.wikipedia.org/wiki/Sikh) family. His family had earlier been involved in revolutionary activities against the [British Raj](https://simple.wikipedia.org/wiki/Sikh). When Bhagat Singh was a teenager, he studied European revolutionary movements. He became attracted to [anarchist](https://simple.wikipedia.org/wiki/Anarchist) and [Marxist](https://simple.wikipedia.org/wiki/Marxist) ideologies. + +He became involved in numerous revolutionary activities. He quickly gained prominence in the [Hindustan Republican Association](https://simple.wikipedia.org/w/index.php?title=Hindustan_Republican_Association&action=edit&redlink=1) and became one of its chief leaders. Eventually, the name of the organization was changed to [Hindustan Socialist Republican Association] (https://simple.wikipedia.org/w/index.php?title=Hindustan_Socialist_Republican_Association&action=edit&redlink=1). This happened in the year 1928. + +[Lala Lajpat Rai](https://simple.wikipedia.org/w/index.php?title=Lala_Lajpat_Rai&action=edit&redlink=1) was killed at the hands of the police. Bhagat Singh wanted revenge for this incidence. He became involved in the murder of the British Police Officer [John Saunders](https://simple.wikipedia.org/w/index.php?title=John_Saunders&action=edit&redlink=1). The police tried to capture him. However, Bhagat Singh was successful in avoiding arrest. + +He made a plan to bomb the [Central Legislative Assembly](https://simple.wikipedia.org/w/index.php?title=Central_Legislative_Assembly&action=edit&redlink=1). He partnered with [Batukeshwar Dutt](https://simple.wikipedia.org/wiki/Batukeshwar_Dutt) for this task. He bombarded the assembly with two bombs. They were shouting slogans of [revolution](https://simple.wikipedia.org/wiki/Revolution) and threw [pamphlets](https://simple.wikipedia.org/wiki/Pamphlet). + +After the bombarding, they surrendered. He was held on this charge in prison. He underwent a 116 day fast in jail and so he did not have food for that long. He did this to demand equal political rights for both British and Indian political prisoners. In response to this determined protest, he gained nationwide support. + +His mentor as a young boy was Kartar Singh Sarabha, whose photo he always carried in his pocket. Singh is himself considered a martyr by Indians for acting to avenge the death of Lala Lajpat Rai. After studying the Russian Revolution, he wanted to die so that his death would inspire the youth of India which in turn will unite them to fight the British Empire. While in prison, Singh and two others had written a letter to Lord Irwin, wherein they asked to be treated as prisoners of war and consequently to be executed by firing squad and not by hanging. Prannath Mehta, Singh's friend, visited him in the jail on 20 March, four days before his execution, with a draft letter for clemency, but he declined to sign it \ No newline at end of file diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 8098185afd..072985b836 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -28,3 +28,5 @@ Art of Living [Know More](art-of-living/art-of-living.md) [चुटकुला पढो](joke/joke.md) और मुस्कुराते रहो Click [Here](king/king.md) to read the story of a great King. + +To know about real india hero click [Bhagat Singh](Bhagat_Singh/bhagat_singh.md) \ No newline at end of file From b27826dd00333da21049599277fca026090bdf05 Mon Sep 17 00:00:00 2001 From: pritamhinger Date: Sun, 26 Jun 2016 10:44:29 +0530 Subject: [PATCH 3737/5486] Rename file. --- hindi/Bhagat_Singh/{bhagat_singn.md => bhagat_singh.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hindi/Bhagat_Singh/{bhagat_singn.md => bhagat_singh.md} (100%) diff --git a/hindi/Bhagat_Singh/bhagat_singn.md b/hindi/Bhagat_Singh/bhagat_singh.md similarity index 100% rename from hindi/Bhagat_Singh/bhagat_singn.md rename to hindi/Bhagat_Singh/bhagat_singh.md From 1cf4f190d69366d3e02e48bc3d14ad70d7c200dd Mon Sep 17 00:00:00 2001 From: pritamhinger Date: Sun, 26 Jun 2016 10:54:49 +0530 Subject: [PATCH 3738/5486] Add line break to format properly. --- hindi/Bhagat_Singh/bhagat_singh.md | 45 +++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/hindi/Bhagat_Singh/bhagat_singh.md b/hindi/Bhagat_Singh/bhagat_singh.md index e1c0c95853..09f5419b1d 100644 --- a/hindi/Bhagat_Singh/bhagat_singh.md +++ b/hindi/Bhagat_Singh/bhagat_singh.md @@ -1,13 +1,44 @@ -Bhagat Singh aka Shaheed Bhagat Singh (28 September 1907 – 23 March 1931) was an [Indian](https://simple.wikipedia.org/wiki/India) socialist and a revolutionary. He is considered to be one of the most influential revolutionaries of the [Indian Independence Movement](https://simple.wikipedia.org/wiki/Indian_independence_movement). +Bhagat Singh aka Shaheed Bhagat Singh (28 September 1907 – 23 March 1931) was an +[Indian](https://simple.wikipedia.org/wiki/India) socialist and a revolutionary. +He is considered to be one of the most influential revolutionaries of the +[Indian Independence Movement](https://simple.wikipedia.org/wiki/Indian_independence_movement). -He was born in a [Sikh](https://simple.wikipedia.org/wiki/Sikh) family. His family had earlier been involved in revolutionary activities against the [British Raj](https://simple.wikipedia.org/wiki/Sikh). When Bhagat Singh was a teenager, he studied European revolutionary movements. He became attracted to [anarchist](https://simple.wikipedia.org/wiki/Anarchist) and [Marxist](https://simple.wikipedia.org/wiki/Marxist) ideologies. +He was born in a [Sikh](https://simple.wikipedia.org/wiki/Sikh) family. +His family had earlier been involved in revolutionary activities against the +[British Raj](https://simple.wikipedia.org/wiki/Sikh). +When Bhagat Singh was a teenager, he studied European revolutionary movements. +He became attracted to [anarchist](https://simple.wikipedia.org/wiki/Anarchist) and +[Marxist](https://simple.wikipedia.org/wiki/Marxist) ideologies. -He became involved in numerous revolutionary activities. He quickly gained prominence in the [Hindustan Republican Association](https://simple.wikipedia.org/w/index.php?title=Hindustan_Republican_Association&action=edit&redlink=1) and became one of its chief leaders. Eventually, the name of the organization was changed to [Hindustan Socialist Republican Association] (https://simple.wikipedia.org/w/index.php?title=Hindustan_Socialist_Republican_Association&action=edit&redlink=1). This happened in the year 1928. +He became involved in numerous revolutionary activities. He quickly gained prominence in the + and became one of its chief leaders. Eventually, the name of the organization was changed to + [Hindustan Socialist Republican Association] + (https://simple.wikipedia.org/w/index.php?title=Hindustan_Socialist_Republican_Association&action=edit&redlink=1). + This happened in the year 1928. -[Lala Lajpat Rai](https://simple.wikipedia.org/w/index.php?title=Lala_Lajpat_Rai&action=edit&redlink=1) was killed at the hands of the police. Bhagat Singh wanted revenge for this incidence. He became involved in the murder of the British Police Officer [John Saunders](https://simple.wikipedia.org/w/index.php?title=John_Saunders&action=edit&redlink=1). The police tried to capture him. However, Bhagat Singh was successful in avoiding arrest. +[Lala Lajpat Rai](https://simple.wikipedia.org/w/index.php?title=Lala_Lajpat_Rai&action=edit&redlink=1) +was killed at the hands of the police. +Bhagat Singh wanted revenge for this incidence. +He became involved in the murder of the British Police Officer +[John Saunders](https://simple.wikipedia.org/w/index.php?title=John_Saunders&action=edit&redlink=1). + The police tried to capture him. However, Bhagat Singh was successful in avoiding arrest. -He made a plan to bomb the [Central Legislative Assembly](https://simple.wikipedia.org/w/index.php?title=Central_Legislative_Assembly&action=edit&redlink=1). He partnered with [Batukeshwar Dutt](https://simple.wikipedia.org/wiki/Batukeshwar_Dutt) for this task. He bombarded the assembly with two bombs. They were shouting slogans of [revolution](https://simple.wikipedia.org/wiki/Revolution) and threw [pamphlets](https://simple.wikipedia.org/wiki/Pamphlet). +He made a plan to bomb the Central Legislative Assembly. +He partnered with [Batukeshwar Dutt](https://simple.wikipedia.org/wiki/Batukeshwar_Dutt) for this task. + He bombarded the assembly with two bombs. + They were shouting slogans of [revolution](https://simple.wikipedia.org/wiki/Revolution) + and threw [pamphlets](https://simple.wikipedia.org/wiki/Pamphlet). -After the bombarding, they surrendered. He was held on this charge in prison. He underwent a 116 day fast in jail and so he did not have food for that long. He did this to demand equal political rights for both British and Indian political prisoners. In response to this determined protest, he gained nationwide support. +After the bombarding, they surrendered. He was held on this charge in prison. +He underwent a 116 day fast in jail and so he did not have food for that long. +He did this to demand equal political rights for both British and Indian political prisoners. + In response to this determined protest, he gained nationwide support. -His mentor as a young boy was Kartar Singh Sarabha, whose photo he always carried in his pocket. Singh is himself considered a martyr by Indians for acting to avenge the death of Lala Lajpat Rai. After studying the Russian Revolution, he wanted to die so that his death would inspire the youth of India which in turn will unite them to fight the British Empire. While in prison, Singh and two others had written a letter to Lord Irwin, wherein they asked to be treated as prisoners of war and consequently to be executed by firing squad and not by hanging. Prannath Mehta, Singh's friend, visited him in the jail on 20 March, four days before his execution, with a draft letter for clemency, but he declined to sign it \ No newline at end of file +His mentor as a young boy was Kartar Singh Sarabha, whose photo he always carried in his pocket. +Singh is himself considered a martyr by Indians for acting to avenge the death of Lala Lajpat Rai. + After studying the Russian Revolution, he wanted to die so that his death would inspire the youth + of India which in turn will unite them to fight the British Empire. + While in prison, Singh and two others had written a letter to Lord Irwin, wherein they asked + to be treated as prisoners of war and consequently to be executed by firing squad and not by hanging. +Prannath Mehta, Singh's friend, visited him in the jail on 20 March, four days before his execution, +with a draft letter for clemency, but he declined to sign it \ No newline at end of file From 8e55b306c37c7e9f886513dc530e24fdab40a772 Mon Sep 17 00:00:00 2001 From: pritamhinger Date: Sun, 26 Jun 2016 10:58:53 +0530 Subject: [PATCH 3739/5486] Enter line breaks in lines with links. --- hindi/Bhagat_Singh/bhagat_singh.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hindi/Bhagat_Singh/bhagat_singh.md b/hindi/Bhagat_Singh/bhagat_singh.md index 09f5419b1d..6798e6bf41 100644 --- a/hindi/Bhagat_Singh/bhagat_singh.md +++ b/hindi/Bhagat_Singh/bhagat_singh.md @@ -8,6 +8,7 @@ His family had earlier been involved in revolutionary activities against the [British Raj](https://simple.wikipedia.org/wiki/Sikh). When Bhagat Singh was a teenager, he studied European revolutionary movements. He became attracted to [anarchist](https://simple.wikipedia.org/wiki/Anarchist) and + [Marxist](https://simple.wikipedia.org/wiki/Marxist) ideologies. He became involved in numerous revolutionary activities. He quickly gained prominence in the @@ -27,6 +28,7 @@ He made a plan to bomb the Central Legislative Assembly. He partnered with [Batukeshwar Dutt](https://simple.wikipedia.org/wiki/Batukeshwar_Dutt) for this task. He bombarded the assembly with two bombs. They were shouting slogans of [revolution](https://simple.wikipedia.org/wiki/Revolution) + and threw [pamphlets](https://simple.wikipedia.org/wiki/Pamphlet). After the bombarding, they surrendered. He was held on this charge in prison. From 9dbd9654fe2812ebed0be1726540a5a691635ef6 Mon Sep 17 00:00:00 2001 From: Eshan Date: Sun, 26 Jun 2016 19:50:23 +0530 Subject: [PATCH 3740/5486] 2 modified files --- english/cricket-rules/cricket-rule-book.md | 1 + english/cricket/cricket.md | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/english/cricket-rules/cricket-rule-book.md b/english/cricket-rules/cricket-rule-book.md index 48ae5dc237..d56044a501 100644 --- a/english/cricket-rules/cricket-rule-book.md +++ b/english/cricket-rules/cricket-rule-book.md @@ -6,3 +6,4 @@ attempting to restrict the scoring and dismiss the batsmen. The objective of the game is for a team to score more runs than its opponent. In some forms of cricket, it may also be necessary to dismiss the opposition in order to win the match, which would otherwise be drawn. + diff --git a/english/cricket/cricket.md b/english/cricket/cricket.md index f08b6d9143..0743ce1a4c 100644 --- a/english/cricket/cricket.md +++ b/english/cricket/cricket.md @@ -2,3 +2,7 @@ Click [here](http://www.espncricinfo.com) to catch up on cricket news and view l You look around and find the cricket bat-and-ball game equipment and rule book. Click [here](../cricket-rules/cricket-rule-book.md) to read the rules. + +you find cricket boring and instead want to learn about spirits +Click [here](../call-spirit/call-spirit.md) to learn.. + From 046edf9a0ab65b531b42ea4c9e57da2a373ff317 Mon Sep 17 00:00:00 2001 From: robOcity Date: Sun, 26 Jun 2016 14:28:18 -0600 Subject: [PATCH 3741/5486] bees chase you deeper into the woods --- english/forest/fire/woods/follow/follow.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/forest/fire/woods/follow/follow.md b/english/forest/fire/woods/follow/follow.md index c63f3b2ce2..b4e53ab52f 100644 --- a/english/forest/fire/woods/follow/follow.md +++ b/english/forest/fire/woods/follow/follow.md @@ -1,4 +1,8 @@ As you start to follow the shawman, you notice the bear behind you, drinking from the magical stream. The bear is now twice as big, and looks angry. You turn to ask for help from the shawman, but he's vanished. -You slowly turn to the bear, and feel a hot breath on the back of your neck. \ No newline at end of file +You slowly turn to the bear, and feel a hot breath on the back of your neck. + +Conjuring your new powers, you attempt to create a beehive full of honey to attract the bear. +Unfortunately you only manage to create the bees, now you can see them starting to swarm. A moment +later they are chasing you and the bear deeper in to the forest. From 6cd71078dc6df203536f4a260069b83a26d62050 Mon Sep 17 00:00:00 2001 From: eriz Date: Mon, 27 Jun 2016 11:28:44 +0800 Subject: [PATCH 3742/5486] add new choice to watch movie --- Philippines/salamat.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index 55f31464c4..0c7f4b7a86 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -7,3 +7,5 @@ Ipagpatuloy ang adventure [dito] (bago/bago.md). Un oh. Nakapag-tagalog din. [Pindot Kalikot] (bago/bago.md) Buksan ang [pinto] (bagong simula/bagong_simula.md). + +Pahinga muna sa pag-aaral. Manood ng movie [movie] (movie/movie.md) \ No newline at end of file From d545c1404e9b564dddb3ddd9bfac1b117781f64c Mon Sep 17 00:00:00 2001 From: eriz Date: Mon, 27 Jun 2016 11:34:37 +0800 Subject: [PATCH 3743/5486] add new file movie/movie.md --- Philippines/movie/movie.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Philippines/movie/movie.md diff --git a/Philippines/movie/movie.md b/Philippines/movie/movie.md new file mode 100644 index 0000000000..84252f09b0 --- /dev/null +++ b/Philippines/movie/movie.md @@ -0,0 +1,7 @@ +Mamili: + +Manood ng captain america. + +Manood ng avengers. + +Nagbago ng isip at bumalik sa [choices] (../). \ No newline at end of file From 7dc00e511f73a339eae74f0ab2be458346b56c46 Mon Sep 17 00:00:00 2001 From: eriz Date: Mon, 27 Jun 2016 11:37:30 +0800 Subject: [PATCH 3744/5486] remove redundant movie --- Philippines/salamat.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index 0c7f4b7a86..dd7d57a762 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -8,4 +8,4 @@ Un oh. Nakapag-tagalog din. [Pindot Kalikot] (bago/bago.md) Buksan ang [pinto] (bagong simula/bagong_simula.md). -Pahinga muna sa pag-aaral. Manood ng movie [movie] (movie/movie.md) \ No newline at end of file +Pahinga muna sa pag-aaral. Manood ng [movie] (movie/movie.md) \ No newline at end of file From 9fcb8c02dd6a7e45550b5d35fb01f4273a4fe01b Mon Sep 17 00:00:00 2001 From: eriz Date: Mon, 27 Jun 2016 11:38:30 +0800 Subject: [PATCH 3745/5486] fix link to choices --- Philippines/movie/movie.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Philippines/movie/movie.md b/Philippines/movie/movie.md index 84252f09b0..b75915a6ef 100644 --- a/Philippines/movie/movie.md +++ b/Philippines/movie/movie.md @@ -4,4 +4,4 @@ Manood ng captain america. Manood ng avengers. -Nagbago ng isip at bumalik sa [choices] (../). \ No newline at end of file +Nagbago ng isip at bumalik sa [choices] (../salamat.md). \ No newline at end of file From 48d9ff20280559a5a691ab1cab8a1fe68cc05312 Mon Sep 17 00:00:00 2001 From: Amber Date: Mon, 27 Jun 2016 16:47:40 +0200 Subject: [PATCH 3746/5486] Add midsommar story piece and adjust somna-om to include this option --- swedish/midsommar/midsommar.md | 3 +++ swedish/somna-om/somna-om.md | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 swedish/midsommar/midsommar.md diff --git a/swedish/midsommar/midsommar.md b/swedish/midsommar/midsommar.md new file mode 100644 index 0000000000..7571e98da5 --- /dev/null +++ b/swedish/midsommar/midsommar.md @@ -0,0 +1,3 @@ +Idag är midsommar! Du har inte köpt nån öl eller vin +eller SNAPS och Systemet är stängt. +Vad ska göra de små grodorna? diff --git a/swedish/somna-om/somna-om.md b/swedish/somna-om/somna-om.md index 3e6a01b4f4..1724bf2f17 100644 --- a/swedish/somna-om/somna-om.md +++ b/swedish/somna-om/somna-om.md @@ -1,4 +1,5 @@ Du väljer att dra täcket över huvudet och somnar om, men mardrömmen fortsätter och du drömmer nu om att... -[du äter en stor marshmallow...](../marshmallowen/marshmallowen.md) \ No newline at end of file +[du äter en stor marshmallow...](../marshmallowen/marshmallowen.md) +[det är midsommar](../midsommar/midsommar.md) From 8ab7ee89bcb735f786783750bc7190b75d43b1db Mon Sep 17 00:00:00 2001 From: Amber Date: Mon, 27 Jun 2016 16:50:26 +0200 Subject: [PATCH 3747/5486] Add line b/n links in somna-om --- swedish/somna-om/somna-om.md | 1 + 1 file changed, 1 insertion(+) diff --git a/swedish/somna-om/somna-om.md b/swedish/somna-om/somna-om.md index 1724bf2f17..215c6c67d9 100644 --- a/swedish/somna-om/somna-om.md +++ b/swedish/somna-om/somna-om.md @@ -2,4 +2,5 @@ Du väljer att dra täcket över huvudet och somnar om, men mardrömmen fortsätter och du drömmer nu om att... [du äter en stor marshmallow...](../marshmallowen/marshmallowen.md) + [det är midsommar](../midsommar/midsommar.md) From 4c7c49bfa9da2dc0734e99b6ac47ffa4a825efdd Mon Sep 17 00:00:00 2001 From: James Coughlin Date: Mon, 27 Jun 2016 08:37:09 -0700 Subject: [PATCH 3748/5486] Add option for three-dimensional-chess to english/coffee/chess/ --- english/coffee/chess/chess.md | 5 ++++- .../chess/three-dimensional-chess/three-dimensional-chess.md | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 english/coffee/chess/three-dimensional-chess/three-dimensional-chess.md diff --git a/english/coffee/chess/chess.md b/english/coffee/chess/chess.md index b72e15e0c0..d696047a81 100644 --- a/english/coffee/chess/chess.md +++ b/english/coffee/chess/chess.md @@ -1,3 +1,6 @@ Drinking coffee excites your brain. You feel like a mental challenge.... -and look for a challenging chess game. \ No newline at end of file +and look for a challenging chess game. + +[How about a nice game of three-dimensional chess?](three-dimensional-chess/three-dimensional-chess.md) + diff --git a/english/coffee/chess/three-dimensional-chess/three-dimensional-chess.md b/english/coffee/chess/three-dimensional-chess/three-dimensional-chess.md new file mode 100644 index 0000000000..1bf5d72e1f --- /dev/null +++ b/english/coffee/chess/three-dimensional-chess/three-dimensional-chess.md @@ -0,0 +1,3 @@ +You realize you don't have a three-dimensional chess set. +Maybe Amazon can deliver one today. + From dbb4443e444234beae92b59897d4c6fc982748fa Mon Sep 17 00:00:00 2001 From: "f.buschendorf" Date: Mon, 27 Jun 2016 21:51:09 +0200 Subject: [PATCH 3749/5486] Add trommeln story --- german/trommeln/trommeln.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 german/trommeln/trommeln.md diff --git a/german/trommeln/trommeln.md b/german/trommeln/trommeln.md new file mode 100644 index 0000000000..bd5331e41d --- /dev/null +++ b/german/trommeln/trommeln.md @@ -0,0 +1,3 @@ +Der rythmische Trommelklang hat die gestrandeten angelockt. Sie tapsen durch den Sand, schlagen sich durch die Büsche während die dumpfen Klänge lauter werden. Wilder Gesang einer fremden Sprache schallt ihnen entgegen. Als die letzten Steine vorsichtig erklommen sind, bietet sich ihnen ein unglaublicher Anblick! + +... doch die gehen wieder zurück zum [Strand](../schwimmen/schwimmen.md) von dem sie kamen From 50b3f40cfa0bb04e895e7825854c38dced3673e6 Mon Sep 17 00:00:00 2001 From: "f.buschendorf" Date: Mon, 27 Jun 2016 21:51:51 +0200 Subject: [PATCH 3750/5486] Modified schwimmen --- german/schwimmen/schwimmen.md | 2 ++ german/schwimmen/schwimmen.md~ | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 german/schwimmen/schwimmen.md~ diff --git a/german/schwimmen/schwimmen.md b/german/schwimmen/schwimmen.md index 7956be9d20..8fd017ff87 100644 --- a/german/schwimmen/schwimmen.md +++ b/german/schwimmen/schwimmen.md @@ -14,4 +14,6 @@ Man sollte ... ... sich erst einmal auf der Insel umschauen und dann entscheiden wie es weiter geht. [Insel](insel/insel.md) +... dem Klang des rythmischen Trommelschlages folgen.[Trommeln](trommeln/trommeln.md) + [Zurück](../ruderboot.md) diff --git a/german/schwimmen/schwimmen.md~ b/german/schwimmen/schwimmen.md~ new file mode 100644 index 0000000000..7956be9d20 --- /dev/null +++ b/german/schwimmen/schwimmen.md~ @@ -0,0 +1,17 @@ +Nachdem Sie zwei Stunden geschwommen sind, sehen Sie eine kleine Insel am Horizont. + +Sie erreichen Sie mit letzter Kraft und erholen sich erst einmal am Strand. Doch was nun? + +Man sollte ... + +... was zu Essen suchen, denn nach dem Schwimmen hat man immer Hunger +[Hunger](hunger/hunger.md) + +... ein sicheres Lager aufbauen, denn wer weiß schon welche Gefahren auf einer Insel lauern +[Gefahr](gefahr/gefahr.md) + + +... sich erst einmal auf der Insel umschauen und dann entscheiden wie es weiter geht. +[Insel](insel/insel.md) + +[Zurück](../ruderboot.md) From a9053ee972bcbb64027e348c0562074ec3c1f155 Mon Sep 17 00:00:00 2001 From: "f.buschendorf" Date: Mon, 27 Jun 2016 21:58:38 +0200 Subject: [PATCH 3751/5486] Deleted trommeln and moved files to schwimmen --- german/schwimmen/trommeln/trommeln.md | 3 +++ .../{trommeln/trommeln.md => schwimmen/trommeln/trommeln.md~} | 0 2 files changed, 3 insertions(+) create mode 100644 german/schwimmen/trommeln/trommeln.md rename german/{trommeln/trommeln.md => schwimmen/trommeln/trommeln.md~} (100%) diff --git a/german/schwimmen/trommeln/trommeln.md b/german/schwimmen/trommeln/trommeln.md new file mode 100644 index 0000000000..c1790efc29 --- /dev/null +++ b/german/schwimmen/trommeln/trommeln.md @@ -0,0 +1,3 @@ +Der rythmische Trommelklang hat die gestrandeten angelockt. Sie tapsen durch den Sand, schlagen sich durch die Büsche während die dumpfen Klänge lauter werden. Wilder Gesang einer fremden Sprache schallt ihnen entgegen. Als die letzten Steine vorsichtig erklommen sind, bietet sich ihnen ein unglaublicher Anblick! + +... doch die gehen wieder zurück zum [Strand](../schwimmen.md) von dem sie kamen diff --git a/german/trommeln/trommeln.md b/german/schwimmen/trommeln/trommeln.md~ similarity index 100% rename from german/trommeln/trommeln.md rename to german/schwimmen/trommeln/trommeln.md~ From 3f34575d0ad25759704ccbd5c5f13c7879efc01d Mon Sep 17 00:00:00 2001 From: "f.buschendorf" Date: Mon, 27 Jun 2016 22:00:09 +0200 Subject: [PATCH 3752/5486] Removed ~ files --- german/schwimmen/schwimmen.md~ | 17 ----------------- german/schwimmen/trommeln/trommeln.md~ | 3 --- 2 files changed, 20 deletions(-) delete mode 100644 german/schwimmen/schwimmen.md~ delete mode 100644 german/schwimmen/trommeln/trommeln.md~ diff --git a/german/schwimmen/schwimmen.md~ b/german/schwimmen/schwimmen.md~ deleted file mode 100644 index 7956be9d20..0000000000 --- a/german/schwimmen/schwimmen.md~ +++ /dev/null @@ -1,17 +0,0 @@ -Nachdem Sie zwei Stunden geschwommen sind, sehen Sie eine kleine Insel am Horizont. - -Sie erreichen Sie mit letzter Kraft und erholen sich erst einmal am Strand. Doch was nun? - -Man sollte ... - -... was zu Essen suchen, denn nach dem Schwimmen hat man immer Hunger -[Hunger](hunger/hunger.md) - -... ein sicheres Lager aufbauen, denn wer weiß schon welche Gefahren auf einer Insel lauern -[Gefahr](gefahr/gefahr.md) - - -... sich erst einmal auf der Insel umschauen und dann entscheiden wie es weiter geht. -[Insel](insel/insel.md) - -[Zurück](../ruderboot.md) diff --git a/german/schwimmen/trommeln/trommeln.md~ b/german/schwimmen/trommeln/trommeln.md~ deleted file mode 100644 index bd5331e41d..0000000000 --- a/german/schwimmen/trommeln/trommeln.md~ +++ /dev/null @@ -1,3 +0,0 @@ -Der rythmische Trommelklang hat die gestrandeten angelockt. Sie tapsen durch den Sand, schlagen sich durch die Büsche während die dumpfen Klänge lauter werden. Wilder Gesang einer fremden Sprache schallt ihnen entgegen. Als die letzten Steine vorsichtig erklommen sind, bietet sich ihnen ein unglaublicher Anblick! - -... doch die gehen wieder zurück zum [Strand](../schwimmen/schwimmen.md) von dem sie kamen From abe0131c55dbad3406e71b525f49754f511e87ea Mon Sep 17 00:00:00 2001 From: FabiolaBusch Date: Mon, 27 Jun 2016 22:01:12 +0200 Subject: [PATCH 3753/5486] Fixed typo in trommeln.md --- german/schwimmen/trommeln/trommeln.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/schwimmen/trommeln/trommeln.md b/german/schwimmen/trommeln/trommeln.md index c1790efc29..0c7f4b2a1b 100644 --- a/german/schwimmen/trommeln/trommeln.md +++ b/german/schwimmen/trommeln/trommeln.md @@ -1,3 +1,3 @@ -Der rythmische Trommelklang hat die gestrandeten angelockt. Sie tapsen durch den Sand, schlagen sich durch die Büsche während die dumpfen Klänge lauter werden. Wilder Gesang einer fremden Sprache schallt ihnen entgegen. Als die letzten Steine vorsichtig erklommen sind, bietet sich ihnen ein unglaublicher Anblick! +Der rythmische Trommelklang hat die gestrandeten angelockt. Sie tapsen durch den Sand, schlagen sich durch die Büsche während die dumpfen Klänge lauter werden. Wilder Gesang einer fremden Sprache schallt ihnen entgegen. Als sie die letzten Steine vorsichtig erklommen sind, bietet sich ihnen ein unglaublicher Anblick! ... doch die gehen wieder zurück zum [Strand](../schwimmen.md) von dem sie kamen From 2923bfc347c9c60069afdfeae4c868004f1d1fd4 Mon Sep 17 00:00:00 2001 From: FabiolaBusch Date: Mon, 27 Jun 2016 22:08:19 +0200 Subject: [PATCH 3754/5486] Added a line, more readable --- german/schwimmen/trommeln/trommeln.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/schwimmen/trommeln/trommeln.md b/german/schwimmen/trommeln/trommeln.md index 0c7f4b2a1b..fcfc2bd9e0 100644 --- a/german/schwimmen/trommeln/trommeln.md +++ b/german/schwimmen/trommeln/trommeln.md @@ -1,3 +1,5 @@ -Der rythmische Trommelklang hat die gestrandeten angelockt. Sie tapsen durch den Sand, schlagen sich durch die Büsche während die dumpfen Klänge lauter werden. Wilder Gesang einer fremden Sprache schallt ihnen entgegen. Als sie die letzten Steine vorsichtig erklommen sind, bietet sich ihnen ein unglaublicher Anblick! +Der rythmische Trommelklang hat die gestrandeten angelockt. Sie tapsen durch den Sand, schlagen sich durch die Büsche während die dumpfen Klänge lauter werden. Wilder Gesang einer fremden Sprache schallt ihnen entgegen. + +Als sie die letzten Steine vorsichtig erklommen sind, bietet sich ihnen ein unglaublicher Anblick! ... doch die gehen wieder zurück zum [Strand](../schwimmen.md) von dem sie kamen From 3e8d3482659faaf6b40407f914602207f30af405 Mon Sep 17 00:00:00 2001 From: "f.buschendorf" Date: Mon, 27 Jun 2016 22:10:24 +0200 Subject: [PATCH 3755/5486] added more lines --- german/schwimmen/trommeln/trommeln.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/schwimmen/trommeln/trommeln.md b/german/schwimmen/trommeln/trommeln.md index fcfc2bd9e0..00b055f614 100644 --- a/german/schwimmen/trommeln/trommeln.md +++ b/german/schwimmen/trommeln/trommeln.md @@ -1,4 +1,6 @@ -Der rythmische Trommelklang hat die gestrandeten angelockt. Sie tapsen durch den Sand, schlagen sich durch die Büsche während die dumpfen Klänge lauter werden. Wilder Gesang einer fremden Sprache schallt ihnen entgegen. +Der rythmische Trommelklang hat die gestrandeten angelockt. Sie tapsen durch den Sand, schlagen sich durch die Büsche während die dumpfen Klänge lauter werden. + +Wilder Gesang einer fremden Sprache schallt ihnen entgegen. Als sie die letzten Steine vorsichtig erklommen sind, bietet sich ihnen ein unglaublicher Anblick! From 0ca3b00a70233ff2dc05bd6259a9e12ff4d9513e Mon Sep 17 00:00:00 2001 From: FabiolaBusch Date: Mon, 27 Jun 2016 22:14:34 +0200 Subject: [PATCH 3756/5486] Added more lines --- german/schwimmen/trommeln/trommeln.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/schwimmen/trommeln/trommeln.md b/german/schwimmen/trommeln/trommeln.md index 00b055f614..6c0d89c8ed 100644 --- a/german/schwimmen/trommeln/trommeln.md +++ b/german/schwimmen/trommeln/trommeln.md @@ -1,4 +1,6 @@ -Der rythmische Trommelklang hat die gestrandeten angelockt. Sie tapsen durch den Sand, schlagen sich durch die Büsche während die dumpfen Klänge lauter werden. +Der rythmische Trommelklang hat die gestrandeten angelockt. + +Sie tapsen durch den Sand, schlagen sich durch die Büsche während die dumpfen Klänge lauter werden. Wilder Gesang einer fremden Sprache schallt ihnen entgegen. From f6263c62d3d14aedfe9e7e642d11af9d1f273728 Mon Sep 17 00:00:00 2001 From: Heather Nuffer Date: Mon, 27 Jun 2016 15:18:13 -0600 Subject: [PATCH 3757/5486] Add option to sing campfire song or to stop singing --- english/sing/continue/continue-to-sing.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/sing/continue/continue-to-sing.md b/english/sing/continue/continue-to-sing.md index 69757620be..50eda79849 100644 --- a/english/sing/continue/continue-to-sing.md +++ b/english/sing/continue/continue-to-sing.md @@ -9,3 +9,9 @@ You must really work out that larynx. Do they call you the Iron Lung? Because they should. You start to feel something in your throat. + +You start to think about marshmallows, and s'mores, +and that prompts you to sing [campfire songs](campfire_songs/rootbeer_song.md). + +Or, you worry about that funny feeling in your +throat and quickly stop singing instead. From 50327de194df357d4059f321646587afb550aa64 Mon Sep 17 00:00:00 2001 From: nigra Date: Mon, 27 Jun 2016 22:21:47 -0300 Subject: [PATCH 3758/5486] Added story! --- english/chillmusic/chillmusic.md | 5 +++++ english/chillmusic/chillmusic.md~ | 0 english/marshmallow.md | 2 ++ 3 files changed, 7 insertions(+) create mode 100644 english/chillmusic/chillmusic.md create mode 100644 english/chillmusic/chillmusic.md~ diff --git a/english/chillmusic/chillmusic.md b/english/chillmusic/chillmusic.md new file mode 100644 index 0000000000..ae42ecc1e4 --- /dev/null +++ b/english/chillmusic/chillmusic.md @@ -0,0 +1,5 @@ +Click here to listen to some relaxing [acoustic guitar](https://www.youtube.com/watch?v=bpKn3vx6LkI) + +Click here instead if you want to listen to some [relaxing rock](https://www.youtube.com/watch?v=JVJVAHLJleU) + +Click [here](..) to go back! diff --git a/english/chillmusic/chillmusic.md~ b/english/chillmusic/chillmusic.md~ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/english/marshmallow.md b/english/marshmallow.md index 9a94493744..ba53485717 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -28,6 +28,8 @@ Ask them to join you on a life changing [quest?](zuluquest/choosequest.md) Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) +How about some [chill music](chillmusic/chillmusic.md)? + [Want to see my Quora profile](ismail-quora-profile/quora-profile.md) You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. From c75cfcc7e61106e836bb9892601695752ffa8139 Mon Sep 17 00:00:00 2001 From: nigra Date: Mon, 27 Jun 2016 22:25:27 -0300 Subject: [PATCH 3759/5486] Fixed bad link. --- english/chillmusic/chillmusic.md | 2 +- english/chillmusic/chillmusic.md~ | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/english/chillmusic/chillmusic.md b/english/chillmusic/chillmusic.md index ae42ecc1e4..3cc86db95e 100644 --- a/english/chillmusic/chillmusic.md +++ b/english/chillmusic/chillmusic.md @@ -2,4 +2,4 @@ Click here to listen to some relaxing [acoustic guitar](https://www.youtube.com/ Click here instead if you want to listen to some [relaxing rock](https://www.youtube.com/watch?v=JVJVAHLJleU) -Click [here](..) to go back! +Click [here](../marshmallow.md) to go back! diff --git a/english/chillmusic/chillmusic.md~ b/english/chillmusic/chillmusic.md~ index e69de29bb2..ae42ecc1e4 100644 --- a/english/chillmusic/chillmusic.md~ +++ b/english/chillmusic/chillmusic.md~ @@ -0,0 +1,5 @@ +Click here to listen to some relaxing [acoustic guitar](https://www.youtube.com/watch?v=bpKn3vx6LkI) + +Click here instead if you want to listen to some [relaxing rock](https://www.youtube.com/watch?v=JVJVAHLJleU) + +Click [here](..) to go back! From 5f350e17934eb9dcb4fadc85666b4c6eec5ea511 Mon Sep 17 00:00:00 2001 From: nigra Date: Mon, 27 Jun 2016 22:37:44 -0300 Subject: [PATCH 3760/5486] Fixed a couple typos. --- english/chillmusic/chillmusic.md | 4 +- english/chillmusic/chillmusic.md~ | 6 +- english/marshmallow.md~ | 993 ++++++++++++++++++++++++++++++ 3 files changed, 998 insertions(+), 5 deletions(-) create mode 100644 english/marshmallow.md~ diff --git a/english/chillmusic/chillmusic.md b/english/chillmusic/chillmusic.md index 3cc86db95e..cd78dadd2e 100644 --- a/english/chillmusic/chillmusic.md +++ b/english/chillmusic/chillmusic.md @@ -1,5 +1,5 @@ -Click here to listen to some relaxing [acoustic guitar](https://www.youtube.com/watch?v=bpKn3vx6LkI) +Click here to listen to some relaxing [acoustic guitar](https://www.youtube.com/watch?v=bpKn3vx6LkI). -Click here instead if you want to listen to some [relaxing rock](https://www.youtube.com/watch?v=JVJVAHLJleU) +Click here instead if you want to listen to some [relaxing rock](https://www.youtube.com/watch?v=JVJVAHLJleU). Click [here](../marshmallow.md) to go back! diff --git a/english/chillmusic/chillmusic.md~ b/english/chillmusic/chillmusic.md~ index ae42ecc1e4..9adf3db860 100644 --- a/english/chillmusic/chillmusic.md~ +++ b/english/chillmusic/chillmusic.md~ @@ -1,5 +1,5 @@ -Click here to listen to some relaxing [acoustic guitar](https://www.youtube.com/watch?v=bpKn3vx6LkI) +Click here to listen to some relaxing [acoustic guitar](https://www.youtube.com/watch?v=bpKn3vx6LkI). -Click here instead if you want to listen to some [relaxing rock](https://www.youtube.com/watch?v=JVJVAHLJleU) +Click here instead if you want to listen to some [relaxing rock](https://www.youtube.com/watch?v=JVJVAHLJleU). -Click [here](..) to go back! +Click [here](english/marshmallow.md) to go back! diff --git a/english/marshmallow.md~ b/english/marshmallow.md~ new file mode 100644 index 0000000000..ba53485717 --- /dev/null +++ b/english/marshmallow.md~ @@ -0,0 +1,993 @@ +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. + +Take some [time](meditation/meditation.md) off! + +Who is better? + +[Click Here](captain/captain.md) to vote for Captain America + +[Click Here] (ironman/ironman.md) to vote for Iron Man + +[Click here] (00_8_Agent/The_name_is_Bond_Milton_Bond.md) to vote for a Special Agent + +January 2017 approaches. You have two presidential candidates to vote for. + +[Click](vote-the-president/trump/trump.md) here to vote for Donald Trump. + +[Click](vote-the-president/hillary/Hillary.md) here to vote for Hillary Clinton. + +Keith the Unicorn approaches you. +He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) + +Down one path you see a person standing in the middle of the path. +They look familiar somehow, but you just can't figure out who they are. +They seem friendly so you decide to go [talk to them.](friendly-person/friendly-person.md) + +Ask them to join you on a life changing [quest?](zuluquest/choosequest.md) + +Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) + +How about some [chill music](chillmusic/chillmusic.md)? + +[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) + +You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. + +I also agree only way to find way is to keep climbing or walking or studying or learning or all of this is DOING. +DOING will definitely keep your sharpened with latest skills (which you can get by the way from Udacity !!!) + +[Know about the life of this world](00-Life-of-this-world/Life of this world.md) + +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down + +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) + +Vist the master [liquid](liquid/liquid.md). + +Drink some [bear](bear/bear.md) + +[play](http://pcottle.github.io/learnGitBranching/) with the (git) branches + +and search for your [destiny](destiny/destiny.md). + +Before we begin, do you need a [warm-up?](warm-up/warm-up.md) + +or maybe [eat that delicious cucumber sandwich?](sandwich/sandwich.md) + +After warming up, take a minute and reflect on your [love for udacity](love-udacity/love-udacity.md) + +You are are man (or woman) for all seasons but need help in choosing +your travel destinations.. Of course we are happy to help you with these +[suggestions](travel-destinations/travel-destinations.md) + +Meet a [Schrodingers cat](schrodinger-cat/schrodinger-cat.md) + +Another visitor! [Stay a while...](impossible-adventure/start/start.md) + +[I am the one who knocks](say-my-name/say-my-name.md) + +[The Secret to Life...Seriously](https://www.youtube.com/watch?v=dQw4w9WgXcQ) + +[Some inspirational Lines](the-nights/the-nights.md) + +[Time for some teachings on life and success](swami-vivekananda/swami-vivekananda.md) + +One morning, you wake up in a strange room with marshmallows for walls. + +Marshmallows smell funny. What is a marshmallow anyway? + +Unexpectedly, the Chief Marshmallow demands to see your [references](references/references.md). + +Show him your [references](https://youtu.be/uZbjlsX0DNY?t=10s). + +The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtube.com/watch?v=s9Dp20ydm1E) + +*(Must be a Tuesday.)* + +Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. + +Or a [Wednesday](make_changes_GitHub/make_changes_GitHub.md)... + +[Thursday](doug-adams/arthur-dent/arthur-dent.md)... maybe even a Friday, but definetely not a Saturday. + +Ok, we have to consider Saturday too. + +[this crazy thought popped into your head](yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md) + +Alice doesn't live here anymore, [or does she?](scarab/goddess.md) + +But not Monday; you never go out on a Sunday evening......[or do you](./or-do-you/or-do-you.md)? + +Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. + +For a second, you decide whether or not to just [go back to sleep](go-back-to-sleep/go-back-to-sleep.md) + +Then, you consider playing a [chess puzzle](chess/chess.md) + +A sound from a Hitchcock movie fills the room, then quickly fades away. + +Was it the sound of a cry from the shower? + +Was it the sound of birds? + +It sounded like it could have been a [heffalump](heffalump/heffalump.md) + +No... perhaps not. + +Not at all. + +I think it was an [animal](animal/animal.md). + +Nope, it was [Tim Berners-Lee](https://en.wikipedia.org/wiki/Tim_Berners-Lee) sobbing in despair. + +Thinking back, there are no memories to suggest that this should have been +anything but an ordinary morning. You didn't go out last night, you don't +usually take intoxicants, what's happening...? + +Maybe this is a dream? + +Or a [memory](memories/memories.md)? + +Or is it just boring old [real-life](real-life/real-life.md)? + +Or [The Force](https://www.youtube.com/watch?v=cFn-NobVaoI&feature=youtu.be)! + +Or is this just [fantasy](https://www.youtube.com/watch?v=fJ9rUzIMcZQ)? + +Maybe it's a dream within a dream? Maybe dreaming and reality are one and the +same. Maybe reality is an oxymoron when considering multiple dimensions. + +But it's probably not worth dwelling on that right now, you could be in danger. + +Grave danger. Oh No! + +*(Is there another kind?)* + +I actually used to know a guy named Dave Granger. We sure had some good times! Anyway, the possibility of danger lurks. + +The type of extreme mortal danger that so often accompanies confectionary inspired interior design. +Quickly surveying your immediate surrounds, you notice a garishly dressed, +vacant-eyed young man lounging on a nearby sofa. + +[Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) + +You recall what a man said to you once: "Live as one of them, Kal-El, to discover +where your strength and your power are needed. Always hold in your heart the +pride of your special heritage. They can be a great people, Kal-El; they wish to +be. They only lack the light to show the way. For this reason above all, their +capacity for good, I have sent them you... my only son." + +[Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) + +Call in the [Justice League!](./justice-league/justice-league.md) + +[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) + +[That sure sounds familiar...](./sounds-familiar/sounds-familiar.md) + +These marshmallows are numerous and they look so delicious. +... despite the feeling they're somehow judging you for only wearing one sock. + +[Turn one of the marshmallows into gold.](./alchemy/alchemy.md) + +You reach out to grab a handful of the marshmallow wall, but you can't seem to take the handful away from the wall. + +You also seem to be wearing an uncomfortable and restrictive jacket made of leather... + +You don't own any uncomfortable and restrictive leather jackets... How did you end up sleeping in one? + +Suddenly, fuzzy memories of a tavern and an exotic woman... +a house made of candy... +closets full of umbrellas and leather. + +An umbrella (closed) automagically appears in your left hand. You tentatively + +[poke the wall](./poke-the-wall/poke-the-wall.md) with it. + +[You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) + +You are feeling very anxious at this point. + +Goosebumps appear. + +This is because you do not like leather for ethical reasons. + +Leather is all over [San Fransisco](sanfran/sanfran.md). + +[Ethical reason? Seriously?](./ethical-reason/ethical-reason.md) + +You begin to break out of the jacket and find a lighter, a fork, and rope. + +You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. + +But only find out that the chocolate has expired [132 days ago](./132-days-ago/132-days-ago.md). + +Do you want to [try to fill the remaining space in the sock with marshmallows](./fill-sock/fill-sock.md)? + +You are not sure who placed these objects near you or why. + +But you have a growing sense that these mundane objects are vital to your survival. + +You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. + +[You have the suspicion that you are being closely watched.](./watched/watched.md) + +[Of course, it's that man on the sofa; go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) + +[Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) + +You see a polar bear searching for food. + +[A Shotgun appears!](./shotgun/shotgun.md) + +[Whilst cycling backwards.](./cycling-backwards/cycling-backwards.md) + +"Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" + +You hear a small bird sound in the distance. + +But it sounds like it might be coming out of speakers. + +Something lightly brushes the back of your neck, sending a chill down your spine! + +Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. + +You hear a strange noise then turn and see a large, wooden door. + +You turn for a third time and see a small, metal door. + +You knock, hear nothing and decide to [enter](./strange-room/room.md). + +Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air +for alien life forms. + +When you look away, a marshmallow hand attempts to grab the lighter. + +But you are too quick for the marshmallow! + +The realization suddenly dawns upon you the marshmallow is self aware! + +You try to bury your contribution because you are slightly + +Embarrassed by the exercise. + +If you don't do something quickly, this marshmallow belly will digest you! + +Marshmallows are going to rule the world! + +Long live marshmallows! + +For a few moments you think to yourself, with all these marshmallows, you have some rice krispy squres. + +Hold the image of the marshmallow and... + +Sing softly the song of it's people as you... + +BUT!!!! wait a minute... Do you hear that?? + +A soft echo of a torrent is fading from far... + +I felt a sudden ease of mind. + +"Ok", I said to myself, "I need to get +[out of here](outta-here/outta-here.md)" + +"But first I must remember the magic spell needed to open the enchanted door!" +Where is Hermione Granger when you need her? Where I ask you? +Oh, I know. Click [here](hermione/hermioneHere.md) + +You pick up the fork and wrap it in rope to fashion a crappy wand. + +Pointing it at the door, eyes closed, "Alohomora..." + +Nothing seems to be happening. + +You pause for a second, awaiting a spectacular sight. + +Sheepishly you look down on the crappy wand in your hand. + +You must be doing something wrong. You drink a beer and think about it, then Ah-ha! + +so many [beer](drink-beer/drink-beer.md) options.. + +You notice your pants are now glowing, so you must have been holding the wand upside down. + +Suddenly, you become aware of the need to take a leak. +You can't hold it. You wonder, Are glowing pants waterproof? +You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) + + +Do you: + +[Listen to Tales of the Inexpressable (By Shpongle)](https://www.youtube.com/watch?v=6WTxC8wnXQo) + +[Watch the new Star Wars trailer](https://www.youtube.com/watch?v=sGbxmsDFVnE) + +[Watch the second new Star Wars trailer](https://www.youtube.com/watch?v=ngElkyQ6Rhs) + +[Live Tweet the situation](tweet-it/tweet-it.md) + +[Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) + +Take out your [knitting project](knit/knit.md) and finish your sock heel turn. + +Take out your [crochet project](crochet/crochet.md) instead and finish that teddy bear you've been working on. + +[Realize you are in the ...](in-matrix/matrix.md) + +[Realize you better call Saul](better-call-saul/saul.md) + +[Turn off all the lights](lightsoff/lightsoff.md) + +[Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) + +[Feel a sudden urge to dance](https://youtu.be/dQw4w9WgXcQ) + +[Make changes on GitHub to revise this crazy story](make_changes_GitHub/make_changes_GitHub.md) + +[Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) + +[Go eat some rainbows](eat-rainbows/rainbows.md) + +[Admire your glowing pants](glowing-pants/glowing-pants.md) + +[Grab some coffee?](coffee/coffee.md) + +[Grab some wine?](wine/wine.md) + +[Call the GhostBusters](ghostbusters/ghostbusters.md) + +[Talk to Bob Barker](bob-barker/barker.md) + +[Hop on a plane](forest/forest.md) + +[Spend so long trying to decide that you fall asleep](sleep-and-wake/sleep_and_wake.md) + +[Cry out for your Mommy](cry-out-for-mommy/oh_mommy.md) + +[Enter a Dim Reality](Enter-a-dim-reality/Dim_reality.md) + +[Watch the Warriors vs Cavaliers game 1 of the NBA Finals](warriors-game/watch-warriors.md) + +[Peek through the keyhole to reveal what is beyond](world-war-marshmallows/world-war-marshmallows.md) + +[Try the more effective "Apparation" spell to teleport elsewhere](movie-ripoffs/hogwarts/hogwarts.md) + +[Begin to feel suspicious](lucidream/luciddream.md) + +[Want to break free](yuha/yuha.md) + +[Open the door and run outside](open-door/open-door.md) + +[Give the marshmallow entity a turing test](turing-test/turing-test.md) + +[Step into an adjacent room to check your social media hubs](social-media/social-media.md) + +[Try and interact with the marshmallow hand](interact/interact.md) + +[Check your phone for date, time and location?](check-your-phone/check-your-phone.md) + +[Check mspaintadventures](mspa/mspa.md) + +[Lunge for the lighter](lunge-for-the-lighter/lunge-for-the-lighter.md) + +[Ask to Alice](ask-to-alice/ask-to-alice.md) + +[Close your eyes](experience/experience.md) + +[Grab the lighter first?](lighter/grab-lighter.md) + +[Make a swing with rope and jacket](enjoy-DreamRide/ride.md) + +[Start eating the walls?](eating-walls/eating-marshmallows.md) + +[Give the marshmallow to the polar bear?](polar-bear/polar-bear.md) + +[Realize you are in Minecraft](you-are-in-minecraft/minecraft.md) + +[Try to pull a MacGyver with the lighter, fork and rope?](macgyver/macgyver.md) + +[Quickly run outside and explore?](explore-outside/explore-outside.md) + +[Light a fire?](light-fire/fire.md) + +[Hungry Kya?](hungry/hungry.md) + +[Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) + +[Dig a hole with your bare hands?](hands/hands.md) + +[Go back to sleep?](sleep/marshmallow.md) + +[Stay puft?](staypuft/marshmallowman.md) + +[Dig at the walls with a fork](dig/dig.md) + +[Invite some friends over?](invite-friends/friends.md) + +[Look for a way out?](find-exit/leave.md) + +[Count the marshmallows?](count-the-marshmellows/count-the-marshmellows.md) + +[Begin to dance to pass the time?](dance/dance.md) + +[You pinch yourself to see whether you are dreaming?](pinch/pinch.md) + +[Promise to yourself this is the last time you take hallucinogenic mushrooms?](shrooms/never-again.md) + +[Think this is too surreal and decide to try the French version instead?](../french/feu-de-camp.md) + +[Think this is a dream, and jam the fork into your hand to wake up?](fork-jam/not_dreaming.md) + +[Go out and collect mushroom?](mushroom/collect_mushroom.md) + +[Try to walk around](virtualreality/oculus.md) + +[Make one of those weird marshmallow Jell-O salads?](marshmallow-jello-o-salad/the-kind-your-grandma-used-to-make.md) + +[Begin to sing out of fear?](sing/sing.md) + +[Go meditate and ponder about your next step?](meditate/meditate.md) + +[Scream out of fear?](scream/scream.md) + +[Get to work on the best batch of cookies ever made?](bake-cookies/cookies.md) + +[Start tying knots on the fork?](fork-knots/melt-with-fork.md) + +[Start pondering how you got yourself in a sticky situation?](ponder/ponder-about-life.md) + +[Create a new jacket out of marshmallows?](jacket/marshmallow-jacket.md) + +[Go straight to the solution!](http://youtu.be/dQw4w9WgXcQ) + +[Cook them marshmallows](http://youtu.be/dQw4w9WgXcQ) + +[Explore Wikipedia](wikipedia/wiki.md) + +[Whip out your spork, start a fire and make giant s'mores?](http://easybaked.files.wordpress.com/2011/10/smores4.jpg) + +[Ask yourself how you got yourself into this situation - AGAIN?](shrooms/never-again.md) + +[Challenge the Marshmallows to a Rock Off!](challenge-marshmellow-to-rock-off/tenacious-d.md) + +[Call a doctor](call-a-doctor/doctor.md) + +[Remember that pill you took](adipose/adipose.md) + +[Light up the wall](light-up/light-up.md) + +[Hide the lighter fork and rope in your pocket](hide/hide-chk.md) + +[Make a necklace out of the marshmallows](necklace/necklace.md) + +[Light up the wall 2](light-up2/light-up2.md) + +[Switch on your laptop and..](netflix/netflix.md) + +[Lion King ](no-worries/hakuna-matata.md) + +[Perform some magic](magic/magic.md) + +[Raise your self so high](khudi/buland_very_high.md) + +[Put yourself back in the straitjacket](backinstraitjacket/backinstraitjacket.md) + +[Find the bird](find-bird/bird.md) + +[Attempt to befriend the marshmellow man](make-friends/make-friends.md) + +[Try to use one of your pokemon?](pokemon/pikachu_wins.md) + +[Throw a rock at it and see if it moves](moving/moving.md) + +[Start tickling the marshmallow](tickle/tickle.md) + +[Enter the time tunnel](timeTunnel/timeTunnel.md) + +[Tie the marshmallow's hands and legs](tying/tying.md) + +[Use the fork, Luke!](use-the-fork-luke/use-the-fork.md) + +[B b b bird bird bird, bird is the word](birdistheword/birdistheword.md) + +[Quote of the day](quote-of-the-day/quote.md) + +[Escape and find a phone to call...](call-these-guys/calltheseguys.md) + +[Play some cricket](play-some-cricket/playsomecricket.md) + +[Run back and forth quickly slamming into the walls](indigestion/indigestion.md) + +[In their tongue he is Dovhakiin, DragonBorn, FUS ROH DAH](fus-roh-dah/fus-roh-dah.md) + +[The walls start closing in](malaria/malaria.md) + +[Come to Nepal](nepal/nepal.md) + +[Order Pizza](order-pizza/order-pizza.md) + +[Summon your robot army](robot-army/robots-everywhere.md) + +[Oh dear! You ended up in Candyland!](candyland/diabetes.md) + +[Give 'em the Leslie Howard!](slap-it-hard/teach-it-a-lesson.md) + +[You punch the first person you see!](punch/punch.md) + +[Hulk smash?](hulk/smash.md) + +[Marsh Attack!!!](marshmallow-attack/marsh-attack.md) + +[Got Lost](getsLost/getsLost.md) + +[Try to make smores](smores/smores.md) + +[Summon your humble servant](humbleservant/humbleservant.md) + +[Summon the magical snuffbox](snuffbox/snuffbox.md) + +[Become the One?](matrix/matrix.md) + +[Melt all the marshmallows to make s'mores?](meltmarshmallows/meltmarshmallows.md) + +[Want to cook boneless pork shoulder roast?](pork/roast.md) + +[Take a selfie?](selfie/selfie.md) + +[Say something](blah-balh/blah-blah.md) + +[Try the Marshmallow Test on it?](https://youtu.be/QX_oy9614HQ) + +[Become an Octodog](be-octodog/octodog.md) + +[Make a Marshmallow cake](https://www.youtube.com/watch?v=3l1SY3QREv4) + +[I'm Batman](I'm-batman/batman.md) + +[You realize you are in NeverLand and you are + never going come... so you sing the Tinker Bell song](https://youtu.be/Sopngy6uucw) + +[You decide to become a marshmallow yourself.](becomemarshmallow/becomemarshmallow.md) + +[Explain Fizzbin to the marshmallow hand?](fizzbin/explain-fizzbin.md) + +[Drool on the Marshmallow to show demonstrate your digestive superiority](drool/droolstrategem.md) + +[Eat the Marshmallow](eatmarshmallow/eatmarshmallow.md) + +[Escape into Willy Wonka Lego-World](lego-world/lego-world.md) + +[Eat breakfast](../english/breakfast/breakfast.md) + +[After breakfast you lookup triathlon](triathlon/triathlon.md) + +[The inception protocol](dream_in_dream/inception.md) + +[Choose the blue pill or the red pill?](choose-pill/choose-pill.md) + +[Pull out your proton pack!](ghost-buster/ghost-busted.md) + +[You take the red pill](red-pill/red-pill.md) + +[Twas the Night Before Christmas](night-night/tale.md) + +[Check Reddit for any useful information.](reddit/ask-reddit.md) + +[Watch Up](watch-movie/Up.md) + +[Give up and search for oil fields](oil-field/oil-field.md) + +[Appear on Falkor’s Back](appear-on-falkors-back/falkor.md) + +[Sit and ponder how you got into this situation](thesituation/situation.md) + +[Smart Ape roasting a marshmellow](https://www.youtube.com/watch?v=_ZEBrHe4hVs) + +[Bruce Wayne is BATS !!](batman/batman.md) + +[Use your chance, master self-control](self-control/self-control.md) + +[Have a Pip-Boy](pipboy/pipboy.md) + +[Call upon one of your past lives as avatar](avatar/air.md) + +[Play some GTA5](play-gta5/play-gta5.md) + +[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) + +[Search for gluten](search-for-gluten/search-for-gluten.md) + +[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) + +[Go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) + +[Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) + +[Commit suicide](commit-suicide/suicide.md) + +[Make an appointment with the dentist](dentist/ouch.md) + +[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) + +[You Google what to do](https://www.google.co.in/) + +[Abdul kalam quotes on overcoming fear](apj/apj.md) + +[If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) + +[There's no such thing as a free lunch.](free-lunch/free-lunch.md) + +[Follow the dog...](play-with-dog/dog.md) + +[What is LOVE ?](love/love.md) + +[Got to Singapore](singapore/singapore.md) + +[Talk to Finn](talk-to-finn/finn.md) + +[Play Guitar](guitar/guitar.md) + +[Contemplate the meaning of life](meaning/meaning.md) + +[Rinse the marshmallow under the tap then eat it](dysentry/dysentry.md) + +[Wake up!](wake-up/wake-up.md) + +[Thank Mr. Skeltal](2spooky/2spooky.md) + +[Utilize your wand once again...](utilize-wand/fork-rope-wand.md) + +[Draw a trapezoid](trapezoid/trapezoid.md) + +[Stop, hammertime!](hammertime/hammertime.md) + +[Analyze the composition of the marshmallow](analyze/analysis.md) + +[Watch Barcelona game](watch-barca/watch-barca.md) + +[Oops! this story ain't ending..](unending-story/unending-story.md) + +[Code](code/code.md) + +[Screaming goat is screaming](https://youtu.be/kh6c0SOfkH4) + +[Play on miniclip!] (papa-louie/papa-louie.md) + +[Visit Sturgis 2015!](sturgis2015/sturgis.md) + +[Attack marshmallow pikachu!](pikachu/pokeball.md) + +"I have problems with my sleep," you realise. "I'm going to [move to New York](new-york/new-york.md)." + +[Summon Dragons of the Khaleesi](dragons/fire-everywhere.md) + +[Bounce](bounce/bounce.md) + +[Play some DotA 2](play-dota2/play-dota2.md) + +[Play Starcraft 2](starcraft2/starcraft2.md) + +[Play some Geometry Dash](play-geometrydash/play-geometrydash.md) + +[See if there is a Udacity course on the subject](udacity/udacity.md) + +Click [here](young/young.md) to listen to music. + +[Consult Flann O'Brien](flann-o-brien/truth-is-odd.md) + +[Attack it with a lightsaber](lightsaber/lightsaber.md) + +[Decide to browse Reddit instead](https://www.reddit.com/) + +[It's time to take a vacation] (licked-cat/vacation.md) + +And then you realize that Burning Man is over, so no real vacations :( + +[present-tense](present-tense/present-tense.md) + +[Think about happy thoughts while spinning around in circles](my-story/my-story.md) + +[Story of DKER](DKER/DKER.md) + +[Get your prostate checked](prostate/prostate.md) + +If you eat a lot, you should also [exercise](exercise/exercise.md) + +A quick brown fox jumps over the lazy dog! + +[Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) + +[Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) + +[Watch a recording of an awesome jazz concert](https://www.youtube.com/watch?v=VMb3PX9gq78) + +whilst wandering through the vastness of this universe. + +[But what universe is this?](universe-test/blaze_verse.md) + +Either way we are cool, right? + +This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. + +You decide that you do not want to visit the miracle man. [You check your +phone to find something else to do](check-phone/check-phone.md). + +And you plug-in to [play some music](play-music/playmusic.md). + +The next thing you know, you're up all night in Croatia mixing a new playlist + +You remember the story of a [robot](happy-robot/happy-robot.md). + +Wondering how you got here, you feel a strange tingling in your hands, almost as if +they are responding to your new surroundings. You feel an urge to gesture forward, +and as you do a large pink marshmallow shoots out of your hand into the wall before you. +[Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) + +[The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) + +All in a hard days work, do you play some [music](play-music/playmusic.md). + +As you hold your pot of precious hunny, you begin to [hear an ominous voice...](ominous-voice/ominous-voice.md) + +Honesty in a hard way [Watch it](few-good-men/fgm.md) + +Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube.com/watch?v=lAF8D0ugyVk) + +But the call of of nature wasn't going away so you push open the toilet door and go in.. + +Just then you recall the news story of what is causing the +[strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. + +...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) + +You escape into a [recording studio](more_cowbell/more_cowbell.md) + +Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) + +And then you stumble upon something [completely different](http://www.atlasobscura.com/) + +After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) + + +[What about skydiving](skydiving/skydiving.md) + +*Story intensifies!* + +You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie... + +Instead of going to the movies, you decide to [solve the gase crisis](plow/plow.md) instead. + +You made it through the day and are starting to get sleepy... [Time to fall asleep](marshmallow.md) + +You wake up in front of a computer screen. You begin reading +the text of a markdown file called marshmallow.md. As you read +you realize that the story is about you! +[remember this story!](this-story-is-about-you/this-story-is-about-you.md) + +This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) + +[Call a random number](call-a-random-number/answer.md) + + +You must be lonely. [Want a friend?](robofriend/AIRobot.md) + +When I code over my weekend, I feel that this becomes my [whole life](code-my-life/code-my-life.md). + +Suddenly you feel a strong craving for [something.](craving/craving.md) + +Despite the little conundrum that you resolved, you realize that it's now +Friday, December 4th. + +"Wait a minute", you gasped, "The English Premier League is on tomorrow!!" + +With that new revelation in mind, you quickly make like David Hasselhoff +and wiggle your wrist to show off a nice particular watch that even listens +to you when you speak to it. + +["Ahem!"](my-adventure/my-adventure.md) + +So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... +>>>>>>> deb66146d3bd0481a4c19d27b8ef289b939d4156 + +["Train Ride!"] (train-ride/train-ride.md) + +I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/star-wars.md) + +"What's a Heffelump?" asked Sheffield inquisitively. + +"I dont't know! Why should I care?" replied Donald Trump. + +When faced with a lot of work and impending deadlines +in the (not so near) future, +there are two options you must choose from. + +You may either do [this](gtd/gtd.md), + + or [that](procrastinate/procrastinate.md). + + This is one weird story. Did anybody read the whole page? + + I sure did not. This is as weird as it gets. + +[Get Crazy!](crazy/crazy.md) + +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +[move to Boston](boston/boston.md)." + +Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! + +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" + +Yourself? + +Instead of reading this entire story, you decide to go see the new star wars! + +You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). + +[Do you have my stapler?](stapler/stapler.md) + +[Build a car](build-a-car/build-a-car.md) + +What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? + +The divergence is coming, [survive](divergence/divergence.md) or perish? + +[Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) + +You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) + +You start off strong... + +But there are [too many hurdles in your way](hurdles/hurdles.md). + +"What a joke?", he said, after looking at the [news](joke/joke.md) + +Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... + +It says you should [brew some beer](beer-brewer/beer-brewer.md). + +The [news](joke/joke.md) says it all my people! + +Bible says... As you sow, so shall you [reap](think/growrich.md) + +So shall you reap, and the [steelers](steelers/steelers.md) know that all too well! + +Until you realize that even marshmallows need [LOVE](https://www.youtube.com/watch?v=i5fZ__mnHbU). + +Marcel needs a new pair of shoes, will you buy shoes for [Marcel](https://www.youtube.com/watch?v=VF9-sEbqDvU)? + +You look up and out to the ocean. In the distance you see a [mermaid](mermaid/mermaid.md) + +The mermaid above died, but [don't worry...](mermaid2/mermaid.md) + +A fairy tale about [a shoemaker and elves](elves-and-shoemaker/elves-and-shoemaker.md) + +The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) + +The understanding of git [go here](Booyah/booyah.md) + +[Link to Git Official Website] (git/git.md) + +[link to google website] (kumar/kumar.md) + +Hi i got this one for udacity team. + +As the sand encompassed her toes and +the ocean-spray breezed through her nose + +she froze... + +But the cold never bothered me anyway. + +Let it go, let it gooo... + +CANT HOLD IT BACK ANY MORE + +Do you want to build a [snowman?] (snowman/snowman.md) + +It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) + +I think I'll try defying gravity. + +Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) + +[Paint It Black](paint-it-black/PaintItBlack.md) + +[Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) + +[To Infinity and Beyond](math/math.md) + +[I hope you aren't using a poorly built crawler on this](./marshmallow.md) + +[Read my story](magic2/magic2.md) + +[..and recall that Carl Johnson might be alive](Carl/carl-johnson.md) + +[Or, forget it all, and jump off the cliff](cliff/cliff.md) + +[Make a pie chart](http://i.imgur.com/uaFES1b.jpg) + +[Read a story of a crouch dragon](crouch-dragon/crouch-dragon.md) + +[Write a hiku](write-a-hiku/hiku.md) + +Explore the unknown. Most people die without ever visiting this [place.](underwater/scuba-diving.md) + +As you attempt this, a voice booms!! + +The [boom](day-dream/day-dream.md) + +Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) + +You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) + +For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) + +You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). + +You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). + +So what to do next? Three doors appear and all other ways out disappear. +So you pick the [right door](mysterydoor/mysterydoor.md) + +You put your [cowboy hat](cowboy/cowboy.md) back on your head. + +Or... or... or... Oh, I forgot! +You foget something, but you decide to [move on](move-on/move-on.md). + +You follow the panda up the nearest tree, chewing bamboo shoots as you go [bamboo-shoots](bamboo/bamboo-shoots.md) + +And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) + +[Do nothing.](nothing/do-nothing.md) + +[Rent a hydroplaning dog sled to get you to the other side of the world] (dog-sled/dogsled.md) + +Toasted [marshmallow](toasted/smores_pie.md) + +While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. +[The new record is!](new_warriors_record/new_warriors_record.md) + +Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). + +Life is full of [puzzles](LifePuzzle/LifePuzzle.md). + +You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". + +A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) + +Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) + +If you have read this far, then you must be in pain. +Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. + +As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. + +Health and Life Lovely [Quotes](./health/health.md) + +The lannisters always pays thier debts, says tyrion lannister. Interesting [character](./gameofthrones/tyrion.md) he is. + +Time to [move to Canada](Canada/Canada.md), eh? + + +The crushing weight of all these options causes you to [end your life.](end/end.md) + +You're reincarnated as a green starfish but wish you were [blue instead.](starfish/starfish.md) + +[Motivate yourself](Motivate/Motivate.md) + +You wake up as Harry Potter ... and are facing Voldemort in a duel? +What should you [do](magicaladventure/decision_time/decision_time.md) + +My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... + +[Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. + +You decide you want to be a pirate and remember a show called +[onepiece](onepiece/op.md) + +You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Taiwan.md)! + +you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) From bc61d2bbb01fc5d7bdab2e94ae206987841a06dc Mon Sep 17 00:00:00 2001 From: NOVAinc Date: Mon, 27 Jun 2016 22:44:10 -0300 Subject: [PATCH 3761/5486] Delete marshmallow.md~ --- english/marshmallow.md~ | 993 ---------------------------------------- 1 file changed, 993 deletions(-) delete mode 100644 english/marshmallow.md~ diff --git a/english/marshmallow.md~ b/english/marshmallow.md~ deleted file mode 100644 index ba53485717..0000000000 --- a/english/marshmallow.md~ +++ /dev/null @@ -1,993 +0,0 @@ -Your adventure begins. You realize there are hundreds of paths for you to choose from. -Which way should you go? Only you can decide. - -Take some [time](meditation/meditation.md) off! - -Who is better? - -[Click Here](captain/captain.md) to vote for Captain America - -[Click Here] (ironman/ironman.md) to vote for Iron Man - -[Click here] (00_8_Agent/The_name_is_Bond_Milton_Bond.md) to vote for a Special Agent - -January 2017 approaches. You have two presidential candidates to vote for. - -[Click](vote-the-president/trump/trump.md) here to vote for Donald Trump. - -[Click](vote-the-president/hillary/Hillary.md) here to vote for Hillary Clinton. - -Keith the Unicorn approaches you. -He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) - -Down one path you see a person standing in the middle of the path. -They look familiar somehow, but you just can't figure out who they are. -They seem friendly so you decide to go [talk to them.](friendly-person/friendly-person.md) - -Ask them to join you on a life changing [quest?](zuluquest/choosequest.md) - -Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) - -How about some [chill music](chillmusic/chillmusic.md)? - -[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) - -You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. - -I also agree only way to find way is to keep climbing or walking or studying or learning or all of this is DOING. -DOING will definitely keep your sharpened with latest skills (which you can get by the way from Udacity !!!) - -[Know about the life of this world](00-Life-of-this-world/Life of this world.md) - -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down - -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) - -Vist the master [liquid](liquid/liquid.md). - -Drink some [bear](bear/bear.md) - -[play](http://pcottle.github.io/learnGitBranching/) with the (git) branches - -and search for your [destiny](destiny/destiny.md). - -Before we begin, do you need a [warm-up?](warm-up/warm-up.md) - -or maybe [eat that delicious cucumber sandwich?](sandwich/sandwich.md) - -After warming up, take a minute and reflect on your [love for udacity](love-udacity/love-udacity.md) - -You are are man (or woman) for all seasons but need help in choosing -your travel destinations.. Of course we are happy to help you with these -[suggestions](travel-destinations/travel-destinations.md) - -Meet a [Schrodingers cat](schrodinger-cat/schrodinger-cat.md) - -Another visitor! [Stay a while...](impossible-adventure/start/start.md) - -[I am the one who knocks](say-my-name/say-my-name.md) - -[The Secret to Life...Seriously](https://www.youtube.com/watch?v=dQw4w9WgXcQ) - -[Some inspirational Lines](the-nights/the-nights.md) - -[Time for some teachings on life and success](swami-vivekananda/swami-vivekananda.md) - -One morning, you wake up in a strange room with marshmallows for walls. - -Marshmallows smell funny. What is a marshmallow anyway? - -Unexpectedly, the Chief Marshmallow demands to see your [references](references/references.md). - -Show him your [references](https://youtu.be/uZbjlsX0DNY?t=10s). - -The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtube.com/watch?v=s9Dp20ydm1E) - -*(Must be a Tuesday.)* - -Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. - -Or a [Wednesday](make_changes_GitHub/make_changes_GitHub.md)... - -[Thursday](doug-adams/arthur-dent/arthur-dent.md)... maybe even a Friday, but definetely not a Saturday. - -Ok, we have to consider Saturday too. - -[this crazy thought popped into your head](yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md) - -Alice doesn't live here anymore, [or does she?](scarab/goddess.md) - -But not Monday; you never go out on a Sunday evening......[or do you](./or-do-you/or-do-you.md)? - -Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. - -For a second, you decide whether or not to just [go back to sleep](go-back-to-sleep/go-back-to-sleep.md) - -Then, you consider playing a [chess puzzle](chess/chess.md) - -A sound from a Hitchcock movie fills the room, then quickly fades away. - -Was it the sound of a cry from the shower? - -Was it the sound of birds? - -It sounded like it could have been a [heffalump](heffalump/heffalump.md) - -No... perhaps not. - -Not at all. - -I think it was an [animal](animal/animal.md). - -Nope, it was [Tim Berners-Lee](https://en.wikipedia.org/wiki/Tim_Berners-Lee) sobbing in despair. - -Thinking back, there are no memories to suggest that this should have been -anything but an ordinary morning. You didn't go out last night, you don't -usually take intoxicants, what's happening...? - -Maybe this is a dream? - -Or a [memory](memories/memories.md)? - -Or is it just boring old [real-life](real-life/real-life.md)? - -Or [The Force](https://www.youtube.com/watch?v=cFn-NobVaoI&feature=youtu.be)! - -Or is this just [fantasy](https://www.youtube.com/watch?v=fJ9rUzIMcZQ)? - -Maybe it's a dream within a dream? Maybe dreaming and reality are one and the -same. Maybe reality is an oxymoron when considering multiple dimensions. - -But it's probably not worth dwelling on that right now, you could be in danger. - -Grave danger. Oh No! - -*(Is there another kind?)* - -I actually used to know a guy named Dave Granger. We sure had some good times! Anyway, the possibility of danger lurks. - -The type of extreme mortal danger that so often accompanies confectionary inspired interior design. -Quickly surveying your immediate surrounds, you notice a garishly dressed, -vacant-eyed young man lounging on a nearby sofa. - -[Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) - -You recall what a man said to you once: "Live as one of them, Kal-El, to discover -where your strength and your power are needed. Always hold in your heart the -pride of your special heritage. They can be a great people, Kal-El; they wish to -be. They only lack the light to show the way. For this reason above all, their -capacity for good, I have sent them you... my only son." - -[Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) - -Call in the [Justice League!](./justice-league/justice-league.md) - -[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) - -[That sure sounds familiar...](./sounds-familiar/sounds-familiar.md) - -These marshmallows are numerous and they look so delicious. -... despite the feeling they're somehow judging you for only wearing one sock. - -[Turn one of the marshmallows into gold.](./alchemy/alchemy.md) - -You reach out to grab a handful of the marshmallow wall, but you can't seem to take the handful away from the wall. - -You also seem to be wearing an uncomfortable and restrictive jacket made of leather... - -You don't own any uncomfortable and restrictive leather jackets... How did you end up sleeping in one? - -Suddenly, fuzzy memories of a tavern and an exotic woman... -a house made of candy... -closets full of umbrellas and leather. - -An umbrella (closed) automagically appears in your left hand. You tentatively - -[poke the wall](./poke-the-wall/poke-the-wall.md) with it. - -[You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) - -You are feeling very anxious at this point. - -Goosebumps appear. - -This is because you do not like leather for ethical reasons. - -Leather is all over [San Fransisco](sanfran/sanfran.md). - -[Ethical reason? Seriously?](./ethical-reason/ethical-reason.md) - -You begin to break out of the jacket and find a lighter, a fork, and rope. - -You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. - -But only find out that the chocolate has expired [132 days ago](./132-days-ago/132-days-ago.md). - -Do you want to [try to fill the remaining space in the sock with marshmallows](./fill-sock/fill-sock.md)? - -You are not sure who placed these objects near you or why. - -But you have a growing sense that these mundane objects are vital to your survival. - -You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. - -[You have the suspicion that you are being closely watched.](./watched/watched.md) - -[Of course, it's that man on the sofa; go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) - -[Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) - -You see a polar bear searching for food. - -[A Shotgun appears!](./shotgun/shotgun.md) - -[Whilst cycling backwards.](./cycling-backwards/cycling-backwards.md) - -"Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" - -You hear a small bird sound in the distance. - -But it sounds like it might be coming out of speakers. - -Something lightly brushes the back of your neck, sending a chill down your spine! - -Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. - -You hear a strange noise then turn and see a large, wooden door. - -You turn for a third time and see a small, metal door. - -You knock, hear nothing and decide to [enter](./strange-room/room.md). - -Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air -for alien life forms. - -When you look away, a marshmallow hand attempts to grab the lighter. - -But you are too quick for the marshmallow! - -The realization suddenly dawns upon you the marshmallow is self aware! - -You try to bury your contribution because you are slightly - -Embarrassed by the exercise. - -If you don't do something quickly, this marshmallow belly will digest you! - -Marshmallows are going to rule the world! - -Long live marshmallows! - -For a few moments you think to yourself, with all these marshmallows, you have some rice krispy squres. - -Hold the image of the marshmallow and... - -Sing softly the song of it's people as you... - -BUT!!!! wait a minute... Do you hear that?? - -A soft echo of a torrent is fading from far... - -I felt a sudden ease of mind. - -"Ok", I said to myself, "I need to get -[out of here](outta-here/outta-here.md)" - -"But first I must remember the magic spell needed to open the enchanted door!" -Where is Hermione Granger when you need her? Where I ask you? -Oh, I know. Click [here](hermione/hermioneHere.md) - -You pick up the fork and wrap it in rope to fashion a crappy wand. - -Pointing it at the door, eyes closed, "Alohomora..." - -Nothing seems to be happening. - -You pause for a second, awaiting a spectacular sight. - -Sheepishly you look down on the crappy wand in your hand. - -You must be doing something wrong. You drink a beer and think about it, then Ah-ha! - -so many [beer](drink-beer/drink-beer.md) options.. - -You notice your pants are now glowing, so you must have been holding the wand upside down. - -Suddenly, you become aware of the need to take a leak. -You can't hold it. You wonder, Are glowing pants waterproof? -You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) - - -Do you: - -[Listen to Tales of the Inexpressable (By Shpongle)](https://www.youtube.com/watch?v=6WTxC8wnXQo) - -[Watch the new Star Wars trailer](https://www.youtube.com/watch?v=sGbxmsDFVnE) - -[Watch the second new Star Wars trailer](https://www.youtube.com/watch?v=ngElkyQ6Rhs) - -[Live Tweet the situation](tweet-it/tweet-it.md) - -[Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) - -Take out your [knitting project](knit/knit.md) and finish your sock heel turn. - -Take out your [crochet project](crochet/crochet.md) instead and finish that teddy bear you've been working on. - -[Realize you are in the ...](in-matrix/matrix.md) - -[Realize you better call Saul](better-call-saul/saul.md) - -[Turn off all the lights](lightsoff/lightsoff.md) - -[Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) - -[Feel a sudden urge to dance](https://youtu.be/dQw4w9WgXcQ) - -[Make changes on GitHub to revise this crazy story](make_changes_GitHub/make_changes_GitHub.md) - -[Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) - -[Go eat some rainbows](eat-rainbows/rainbows.md) - -[Admire your glowing pants](glowing-pants/glowing-pants.md) - -[Grab some coffee?](coffee/coffee.md) - -[Grab some wine?](wine/wine.md) - -[Call the GhostBusters](ghostbusters/ghostbusters.md) - -[Talk to Bob Barker](bob-barker/barker.md) - -[Hop on a plane](forest/forest.md) - -[Spend so long trying to decide that you fall asleep](sleep-and-wake/sleep_and_wake.md) - -[Cry out for your Mommy](cry-out-for-mommy/oh_mommy.md) - -[Enter a Dim Reality](Enter-a-dim-reality/Dim_reality.md) - -[Watch the Warriors vs Cavaliers game 1 of the NBA Finals](warriors-game/watch-warriors.md) - -[Peek through the keyhole to reveal what is beyond](world-war-marshmallows/world-war-marshmallows.md) - -[Try the more effective "Apparation" spell to teleport elsewhere](movie-ripoffs/hogwarts/hogwarts.md) - -[Begin to feel suspicious](lucidream/luciddream.md) - -[Want to break free](yuha/yuha.md) - -[Open the door and run outside](open-door/open-door.md) - -[Give the marshmallow entity a turing test](turing-test/turing-test.md) - -[Step into an adjacent room to check your social media hubs](social-media/social-media.md) - -[Try and interact with the marshmallow hand](interact/interact.md) - -[Check your phone for date, time and location?](check-your-phone/check-your-phone.md) - -[Check mspaintadventures](mspa/mspa.md) - -[Lunge for the lighter](lunge-for-the-lighter/lunge-for-the-lighter.md) - -[Ask to Alice](ask-to-alice/ask-to-alice.md) - -[Close your eyes](experience/experience.md) - -[Grab the lighter first?](lighter/grab-lighter.md) - -[Make a swing with rope and jacket](enjoy-DreamRide/ride.md) - -[Start eating the walls?](eating-walls/eating-marshmallows.md) - -[Give the marshmallow to the polar bear?](polar-bear/polar-bear.md) - -[Realize you are in Minecraft](you-are-in-minecraft/minecraft.md) - -[Try to pull a MacGyver with the lighter, fork and rope?](macgyver/macgyver.md) - -[Quickly run outside and explore?](explore-outside/explore-outside.md) - -[Light a fire?](light-fire/fire.md) - -[Hungry Kya?](hungry/hungry.md) - -[Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) - -[Dig a hole with your bare hands?](hands/hands.md) - -[Go back to sleep?](sleep/marshmallow.md) - -[Stay puft?](staypuft/marshmallowman.md) - -[Dig at the walls with a fork](dig/dig.md) - -[Invite some friends over?](invite-friends/friends.md) - -[Look for a way out?](find-exit/leave.md) - -[Count the marshmallows?](count-the-marshmellows/count-the-marshmellows.md) - -[Begin to dance to pass the time?](dance/dance.md) - -[You pinch yourself to see whether you are dreaming?](pinch/pinch.md) - -[Promise to yourself this is the last time you take hallucinogenic mushrooms?](shrooms/never-again.md) - -[Think this is too surreal and decide to try the French version instead?](../french/feu-de-camp.md) - -[Think this is a dream, and jam the fork into your hand to wake up?](fork-jam/not_dreaming.md) - -[Go out and collect mushroom?](mushroom/collect_mushroom.md) - -[Try to walk around](virtualreality/oculus.md) - -[Make one of those weird marshmallow Jell-O salads?](marshmallow-jello-o-salad/the-kind-your-grandma-used-to-make.md) - -[Begin to sing out of fear?](sing/sing.md) - -[Go meditate and ponder about your next step?](meditate/meditate.md) - -[Scream out of fear?](scream/scream.md) - -[Get to work on the best batch of cookies ever made?](bake-cookies/cookies.md) - -[Start tying knots on the fork?](fork-knots/melt-with-fork.md) - -[Start pondering how you got yourself in a sticky situation?](ponder/ponder-about-life.md) - -[Create a new jacket out of marshmallows?](jacket/marshmallow-jacket.md) - -[Go straight to the solution!](http://youtu.be/dQw4w9WgXcQ) - -[Cook them marshmallows](http://youtu.be/dQw4w9WgXcQ) - -[Explore Wikipedia](wikipedia/wiki.md) - -[Whip out your spork, start a fire and make giant s'mores?](http://easybaked.files.wordpress.com/2011/10/smores4.jpg) - -[Ask yourself how you got yourself into this situation - AGAIN?](shrooms/never-again.md) - -[Challenge the Marshmallows to a Rock Off!](challenge-marshmellow-to-rock-off/tenacious-d.md) - -[Call a doctor](call-a-doctor/doctor.md) - -[Remember that pill you took](adipose/adipose.md) - -[Light up the wall](light-up/light-up.md) - -[Hide the lighter fork and rope in your pocket](hide/hide-chk.md) - -[Make a necklace out of the marshmallows](necklace/necklace.md) - -[Light up the wall 2](light-up2/light-up2.md) - -[Switch on your laptop and..](netflix/netflix.md) - -[Lion King ](no-worries/hakuna-matata.md) - -[Perform some magic](magic/magic.md) - -[Raise your self so high](khudi/buland_very_high.md) - -[Put yourself back in the straitjacket](backinstraitjacket/backinstraitjacket.md) - -[Find the bird](find-bird/bird.md) - -[Attempt to befriend the marshmellow man](make-friends/make-friends.md) - -[Try to use one of your pokemon?](pokemon/pikachu_wins.md) - -[Throw a rock at it and see if it moves](moving/moving.md) - -[Start tickling the marshmallow](tickle/tickle.md) - -[Enter the time tunnel](timeTunnel/timeTunnel.md) - -[Tie the marshmallow's hands and legs](tying/tying.md) - -[Use the fork, Luke!](use-the-fork-luke/use-the-fork.md) - -[B b b bird bird bird, bird is the word](birdistheword/birdistheword.md) - -[Quote of the day](quote-of-the-day/quote.md) - -[Escape and find a phone to call...](call-these-guys/calltheseguys.md) - -[Play some cricket](play-some-cricket/playsomecricket.md) - -[Run back and forth quickly slamming into the walls](indigestion/indigestion.md) - -[In their tongue he is Dovhakiin, DragonBorn, FUS ROH DAH](fus-roh-dah/fus-roh-dah.md) - -[The walls start closing in](malaria/malaria.md) - -[Come to Nepal](nepal/nepal.md) - -[Order Pizza](order-pizza/order-pizza.md) - -[Summon your robot army](robot-army/robots-everywhere.md) - -[Oh dear! You ended up in Candyland!](candyland/diabetes.md) - -[Give 'em the Leslie Howard!](slap-it-hard/teach-it-a-lesson.md) - -[You punch the first person you see!](punch/punch.md) - -[Hulk smash?](hulk/smash.md) - -[Marsh Attack!!!](marshmallow-attack/marsh-attack.md) - -[Got Lost](getsLost/getsLost.md) - -[Try to make smores](smores/smores.md) - -[Summon your humble servant](humbleservant/humbleservant.md) - -[Summon the magical snuffbox](snuffbox/snuffbox.md) - -[Become the One?](matrix/matrix.md) - -[Melt all the marshmallows to make s'mores?](meltmarshmallows/meltmarshmallows.md) - -[Want to cook boneless pork shoulder roast?](pork/roast.md) - -[Take a selfie?](selfie/selfie.md) - -[Say something](blah-balh/blah-blah.md) - -[Try the Marshmallow Test on it?](https://youtu.be/QX_oy9614HQ) - -[Become an Octodog](be-octodog/octodog.md) - -[Make a Marshmallow cake](https://www.youtube.com/watch?v=3l1SY3QREv4) - -[I'm Batman](I'm-batman/batman.md) - -[You realize you are in NeverLand and you are - never going come... so you sing the Tinker Bell song](https://youtu.be/Sopngy6uucw) - -[You decide to become a marshmallow yourself.](becomemarshmallow/becomemarshmallow.md) - -[Explain Fizzbin to the marshmallow hand?](fizzbin/explain-fizzbin.md) - -[Drool on the Marshmallow to show demonstrate your digestive superiority](drool/droolstrategem.md) - -[Eat the Marshmallow](eatmarshmallow/eatmarshmallow.md) - -[Escape into Willy Wonka Lego-World](lego-world/lego-world.md) - -[Eat breakfast](../english/breakfast/breakfast.md) - -[After breakfast you lookup triathlon](triathlon/triathlon.md) - -[The inception protocol](dream_in_dream/inception.md) - -[Choose the blue pill or the red pill?](choose-pill/choose-pill.md) - -[Pull out your proton pack!](ghost-buster/ghost-busted.md) - -[You take the red pill](red-pill/red-pill.md) - -[Twas the Night Before Christmas](night-night/tale.md) - -[Check Reddit for any useful information.](reddit/ask-reddit.md) - -[Watch Up](watch-movie/Up.md) - -[Give up and search for oil fields](oil-field/oil-field.md) - -[Appear on Falkor’s Back](appear-on-falkors-back/falkor.md) - -[Sit and ponder how you got into this situation](thesituation/situation.md) - -[Smart Ape roasting a marshmellow](https://www.youtube.com/watch?v=_ZEBrHe4hVs) - -[Bruce Wayne is BATS !!](batman/batman.md) - -[Use your chance, master self-control](self-control/self-control.md) - -[Have a Pip-Boy](pipboy/pipboy.md) - -[Call upon one of your past lives as avatar](avatar/air.md) - -[Play some GTA5](play-gta5/play-gta5.md) - -[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) - -[Search for gluten](search-for-gluten/search-for-gluten.md) - -[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) - -[Go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) - -[Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) - -[Commit suicide](commit-suicide/suicide.md) - -[Make an appointment with the dentist](dentist/ouch.md) - -[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) - -[You Google what to do](https://www.google.co.in/) - -[Abdul kalam quotes on overcoming fear](apj/apj.md) - -[If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) - -[There's no such thing as a free lunch.](free-lunch/free-lunch.md) - -[Follow the dog...](play-with-dog/dog.md) - -[What is LOVE ?](love/love.md) - -[Got to Singapore](singapore/singapore.md) - -[Talk to Finn](talk-to-finn/finn.md) - -[Play Guitar](guitar/guitar.md) - -[Contemplate the meaning of life](meaning/meaning.md) - -[Rinse the marshmallow under the tap then eat it](dysentry/dysentry.md) - -[Wake up!](wake-up/wake-up.md) - -[Thank Mr. Skeltal](2spooky/2spooky.md) - -[Utilize your wand once again...](utilize-wand/fork-rope-wand.md) - -[Draw a trapezoid](trapezoid/trapezoid.md) - -[Stop, hammertime!](hammertime/hammertime.md) - -[Analyze the composition of the marshmallow](analyze/analysis.md) - -[Watch Barcelona game](watch-barca/watch-barca.md) - -[Oops! this story ain't ending..](unending-story/unending-story.md) - -[Code](code/code.md) - -[Screaming goat is screaming](https://youtu.be/kh6c0SOfkH4) - -[Play on miniclip!] (papa-louie/papa-louie.md) - -[Visit Sturgis 2015!](sturgis2015/sturgis.md) - -[Attack marshmallow pikachu!](pikachu/pokeball.md) - -"I have problems with my sleep," you realise. "I'm going to [move to New York](new-york/new-york.md)." - -[Summon Dragons of the Khaleesi](dragons/fire-everywhere.md) - -[Bounce](bounce/bounce.md) - -[Play some DotA 2](play-dota2/play-dota2.md) - -[Play Starcraft 2](starcraft2/starcraft2.md) - -[Play some Geometry Dash](play-geometrydash/play-geometrydash.md) - -[See if there is a Udacity course on the subject](udacity/udacity.md) - -Click [here](young/young.md) to listen to music. - -[Consult Flann O'Brien](flann-o-brien/truth-is-odd.md) - -[Attack it with a lightsaber](lightsaber/lightsaber.md) - -[Decide to browse Reddit instead](https://www.reddit.com/) - -[It's time to take a vacation] (licked-cat/vacation.md) - -And then you realize that Burning Man is over, so no real vacations :( - -[present-tense](present-tense/present-tense.md) - -[Think about happy thoughts while spinning around in circles](my-story/my-story.md) - -[Story of DKER](DKER/DKER.md) - -[Get your prostate checked](prostate/prostate.md) - -If you eat a lot, you should also [exercise](exercise/exercise.md) - -A quick brown fox jumps over the lazy dog! - -[Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) - -[Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) - -[Watch a recording of an awesome jazz concert](https://www.youtube.com/watch?v=VMb3PX9gq78) - -whilst wandering through the vastness of this universe. - -[But what universe is this?](universe-test/blaze_verse.md) - -Either way we are cool, right? - -This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. - -You decide that you do not want to visit the miracle man. [You check your -phone to find something else to do](check-phone/check-phone.md). - -And you plug-in to [play some music](play-music/playmusic.md). - -The next thing you know, you're up all night in Croatia mixing a new playlist - -You remember the story of a [robot](happy-robot/happy-robot.md). - -Wondering how you got here, you feel a strange tingling in your hands, almost as if -they are responding to your new surroundings. You feel an urge to gesture forward, -and as you do a large pink marshmallow shoots out of your hand into the wall before you. -[Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) - -[The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) - -All in a hard days work, do you play some [music](play-music/playmusic.md). - -As you hold your pot of precious hunny, you begin to [hear an ominous voice...](ominous-voice/ominous-voice.md) - -Honesty in a hard way [Watch it](few-good-men/fgm.md) - -Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube.com/watch?v=lAF8D0ugyVk) - -But the call of of nature wasn't going away so you push open the toilet door and go in.. - -Just then you recall the news story of what is causing the -[strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. - -...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) - -You escape into a [recording studio](more_cowbell/more_cowbell.md) - -Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) - -And then you stumble upon something [completely different](http://www.atlasobscura.com/) - -After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) - - -[What about skydiving](skydiving/skydiving.md) - -*Story intensifies!* - -You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie... - -Instead of going to the movies, you decide to [solve the gase crisis](plow/plow.md) instead. - -You made it through the day and are starting to get sleepy... [Time to fall asleep](marshmallow.md) - -You wake up in front of a computer screen. You begin reading -the text of a markdown file called marshmallow.md. As you read -you realize that the story is about you! -[remember this story!](this-story-is-about-you/this-story-is-about-you.md) - -This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) - -[Call a random number](call-a-random-number/answer.md) - - -You must be lonely. [Want a friend?](robofriend/AIRobot.md) - -When I code over my weekend, I feel that this becomes my [whole life](code-my-life/code-my-life.md). - -Suddenly you feel a strong craving for [something.](craving/craving.md) - -Despite the little conundrum that you resolved, you realize that it's now -Friday, December 4th. - -"Wait a minute", you gasped, "The English Premier League is on tomorrow!!" - -With that new revelation in mind, you quickly make like David Hasselhoff -and wiggle your wrist to show off a nice particular watch that even listens -to you when you speak to it. - -["Ahem!"](my-adventure/my-adventure.md) - -So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... ->>>>>>> deb66146d3bd0481a4c19d27b8ef289b939d4156 - -["Train Ride!"] (train-ride/train-ride.md) - -I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/star-wars.md) - -"What's a Heffelump?" asked Sheffield inquisitively. - -"I dont't know! Why should I care?" replied Donald Trump. - -When faced with a lot of work and impending deadlines -in the (not so near) future, -there are two options you must choose from. - -You may either do [this](gtd/gtd.md), - - or [that](procrastinate/procrastinate.md). - - This is one weird story. Did anybody read the whole page? - - I sure did not. This is as weird as it gets. - -[Get Crazy!](crazy/crazy.md) - -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim -[move to Boston](boston/boston.md)." - -Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! - -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" - -Yourself? - -Instead of reading this entire story, you decide to go see the new star wars! - -You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). - -[Do you have my stapler?](stapler/stapler.md) - -[Build a car](build-a-car/build-a-car.md) - -What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? - -The divergence is coming, [survive](divergence/divergence.md) or perish? - -[Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) - -You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) - -You start off strong... - -But there are [too many hurdles in your way](hurdles/hurdles.md). - -"What a joke?", he said, after looking at the [news](joke/joke.md) - -Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... - -It says you should [brew some beer](beer-brewer/beer-brewer.md). - -The [news](joke/joke.md) says it all my people! - -Bible says... As you sow, so shall you [reap](think/growrich.md) - -So shall you reap, and the [steelers](steelers/steelers.md) know that all too well! - -Until you realize that even marshmallows need [LOVE](https://www.youtube.com/watch?v=i5fZ__mnHbU). - -Marcel needs a new pair of shoes, will you buy shoes for [Marcel](https://www.youtube.com/watch?v=VF9-sEbqDvU)? - -You look up and out to the ocean. In the distance you see a [mermaid](mermaid/mermaid.md) - -The mermaid above died, but [don't worry...](mermaid2/mermaid.md) - -A fairy tale about [a shoemaker and elves](elves-and-shoemaker/elves-and-shoemaker.md) - -The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) - -The understanding of git [go here](Booyah/booyah.md) - -[Link to Git Official Website] (git/git.md) - -[link to google website] (kumar/kumar.md) - -Hi i got this one for udacity team. - -As the sand encompassed her toes and -the ocean-spray breezed through her nose - -she froze... - -But the cold never bothered me anyway. - -Let it go, let it gooo... - -CANT HOLD IT BACK ANY MORE - -Do you want to build a [snowman?] (snowman/snowman.md) - -It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) - -I think I'll try defying gravity. - -Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) - -[Paint It Black](paint-it-black/PaintItBlack.md) - -[Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) - -[To Infinity and Beyond](math/math.md) - -[I hope you aren't using a poorly built crawler on this](./marshmallow.md) - -[Read my story](magic2/magic2.md) - -[..and recall that Carl Johnson might be alive](Carl/carl-johnson.md) - -[Or, forget it all, and jump off the cliff](cliff/cliff.md) - -[Make a pie chart](http://i.imgur.com/uaFES1b.jpg) - -[Read a story of a crouch dragon](crouch-dragon/crouch-dragon.md) - -[Write a hiku](write-a-hiku/hiku.md) - -Explore the unknown. Most people die without ever visiting this [place.](underwater/scuba-diving.md) - -As you attempt this, a voice booms!! - -The [boom](day-dream/day-dream.md) - -Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) - -You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) - -For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) - -You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). - -You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). - -So what to do next? Three doors appear and all other ways out disappear. -So you pick the [right door](mysterydoor/mysterydoor.md) - -You put your [cowboy hat](cowboy/cowboy.md) back on your head. - -Or... or... or... Oh, I forgot! -You foget something, but you decide to [move on](move-on/move-on.md). - -You follow the panda up the nearest tree, chewing bamboo shoots as you go [bamboo-shoots](bamboo/bamboo-shoots.md) - -And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) - -[Do nothing.](nothing/do-nothing.md) - -[Rent a hydroplaning dog sled to get you to the other side of the world] (dog-sled/dogsled.md) - -Toasted [marshmallow](toasted/smores_pie.md) - -While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. -[The new record is!](new_warriors_record/new_warriors_record.md) - -Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). - -Life is full of [puzzles](LifePuzzle/LifePuzzle.md). - -You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". - -A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) - -Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) - -If you have read this far, then you must be in pain. -Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. - -As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. - -Health and Life Lovely [Quotes](./health/health.md) - -The lannisters always pays thier debts, says tyrion lannister. Interesting [character](./gameofthrones/tyrion.md) he is. - -Time to [move to Canada](Canada/Canada.md), eh? - - -The crushing weight of all these options causes you to [end your life.](end/end.md) - -You're reincarnated as a green starfish but wish you were [blue instead.](starfish/starfish.md) - -[Motivate yourself](Motivate/Motivate.md) - -You wake up as Harry Potter ... and are facing Voldemort in a duel? -What should you [do](magicaladventure/decision_time/decision_time.md) - -My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... - -[Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. - -You decide you want to be a pirate and remember a show called -[onepiece](onepiece/op.md) - -You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Taiwan.md)! - -you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) From 94d0dd9faca87e448ee066205bfb1d3399406cd6 Mon Sep 17 00:00:00 2001 From: NOVAinc Date: Mon, 27 Jun 2016 22:48:33 -0300 Subject: [PATCH 3762/5486] Update chillmusic.md --- english/chillmusic/chillmusic.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/chillmusic/chillmusic.md b/english/chillmusic/chillmusic.md index cd78dadd2e..4543cbd22f 100644 --- a/english/chillmusic/chillmusic.md +++ b/english/chillmusic/chillmusic.md @@ -1,5 +1,3 @@ Click here to listen to some relaxing [acoustic guitar](https://www.youtube.com/watch?v=bpKn3vx6LkI). Click here instead if you want to listen to some [relaxing rock](https://www.youtube.com/watch?v=JVJVAHLJleU). - -Click [here](../marshmallow.md) to go back! From a83ed147e7b47bc2b0b28107f0f5b0d44d85b2bf Mon Sep 17 00:00:00 2001 From: NOVAinc Date: Mon, 27 Jun 2016 22:48:45 -0300 Subject: [PATCH 3763/5486] Delete chillmusic.md~ --- english/chillmusic/chillmusic.md~ | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 english/chillmusic/chillmusic.md~ diff --git a/english/chillmusic/chillmusic.md~ b/english/chillmusic/chillmusic.md~ deleted file mode 100644 index 9adf3db860..0000000000 --- a/english/chillmusic/chillmusic.md~ +++ /dev/null @@ -1,5 +0,0 @@ -Click here to listen to some relaxing [acoustic guitar](https://www.youtube.com/watch?v=bpKn3vx6LkI). - -Click here instead if you want to listen to some [relaxing rock](https://www.youtube.com/watch?v=JVJVAHLJleU). - -Click [here](english/marshmallow.md) to go back! From de9eaee2dc7b07d8a2bca21250808984cf9dfaf7 Mon Sep 17 00:00:00 2001 From: Heather Nuffer Date: Mon, 27 Jun 2016 20:37:41 -0600 Subject: [PATCH 3764/5486] Add file with rootbeer campfire song --- english/sing/campfire_songs/rootbeer_song.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 english/sing/campfire_songs/rootbeer_song.md diff --git a/english/sing/campfire_songs/rootbeer_song.md b/english/sing/campfire_songs/rootbeer_song.md new file mode 100644 index 0000000000..1eacbec137 --- /dev/null +++ b/english/sing/campfire_songs/rootbeer_song.md @@ -0,0 +1,13 @@ +You sing: + +(Dough) – I use to buy my root beer, +Re (Ray) – The guy who pours my root beer, +Mi (Me) – The guy who drinks my root beer, +Fa – A long way to the bathroom, +So – Let’s have another root beer, +(La) Lots and lots of lovely root beer, +Ti (Tea) – No thanks, I’m having root beer, +And that’s why I have no + dough, dough, dough, dough. + +Everyone laughs, and the tension is diffused. From b399d7020b59b3219c73edeefc5b054c5bc20ae8 Mon Sep 17 00:00:00 2001 From: Heather Nuffer Date: Mon, 27 Jun 2016 21:00:51 -0600 Subject: [PATCH 3765/5486] Fix my link to the rootbeer song --- english/sing/continue/continue-to-sing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sing/continue/continue-to-sing.md b/english/sing/continue/continue-to-sing.md index 50eda79849..73ddcaf68a 100644 --- a/english/sing/continue/continue-to-sing.md +++ b/english/sing/continue/continue-to-sing.md @@ -11,7 +11,7 @@ Do they call you the Iron Lung? Because they should. You start to feel something in your throat. You start to think about marshmallows, and s'mores, -and that prompts you to sing [campfire songs](campfire_songs/rootbeer_song.md). +and that prompts you to sing [campfire songs](../campfire_songs/rootbeer_song.md). Or, you worry about that funny feeling in your throat and quickly stop singing instead. From 44585ae9a3dafe91da25079fbaa79000f5f27c38 Mon Sep 17 00:00:00 2001 From: brigitte Date: Tue, 28 Jun 2016 14:46:17 +1000 Subject: [PATCH 3766/5486] Add beginning of great Tasmanian adventure --- english/great-tasmanian-adventure/great-tasmanian-adventure.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/great-tasmanian-adventure/great-tasmanian-adventure.md diff --git a/english/great-tasmanian-adventure/great-tasmanian-adventure.md b/english/great-tasmanian-adventure/great-tasmanian-adventure.md new file mode 100644 index 0000000000..a920c3f0af --- /dev/null +++ b/english/great-tasmanian-adventure/great-tasmanian-adventure.md @@ -0,0 +1 @@ +You try to undo the Brexit result using CTRL-Z but it doesn't work. You realise the only way you can undo the referendum is to climb to the top of Federation Peak in Tasmania. \ No newline at end of file From 7e34037b23142cf30b0c3e07da850644671348af Mon Sep 17 00:00:00 2001 From: brigitte Date: Tue, 28 Jun 2016 14:47:06 +1000 Subject: [PATCH 3767/5486] Add line break to end of file --- english/great-tasmanian-adventure/great-tasmanian-adventure.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/great-tasmanian-adventure/great-tasmanian-adventure.md b/english/great-tasmanian-adventure/great-tasmanian-adventure.md index a920c3f0af..cc23714e34 100644 --- a/english/great-tasmanian-adventure/great-tasmanian-adventure.md +++ b/english/great-tasmanian-adventure/great-tasmanian-adventure.md @@ -1 +1,2 @@ -You try to undo the Brexit result using CTRL-Z but it doesn't work. You realise the only way you can undo the referendum is to climb to the top of Federation Peak in Tasmania. \ No newline at end of file +You try to undo the Brexit result using CTRL-Z but it doesn't work. You realise the only way you can undo the referendum is to climb to the top of Federation Peak in Tasmania. + From 91e68047fdbf2b42bd407c6d5de2156461ff641b Mon Sep 17 00:00:00 2001 From: brigitte Date: Tue, 28 Jun 2016 14:47:32 +1000 Subject: [PATCH 3768/5486] Add link to great Tasmanian adventure --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0b3bf7ecf6..09510c9ba0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -983,6 +983,7 @@ The lannisters always pays thier debts, says tyrion lannister. Interesting [char Time to [move to Canada](Canada/Canada.md), eh? +You struggle to find a line break to add your own adventure. You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) The crushing weight of all these options causes you to [end your life.](end/end.md) From 1a60e3c640e80a4ed56fafea4feccce4c751cbb4 Mon Sep 17 00:00:00 2001 From: brigitte Date: Tue, 28 Jun 2016 14:57:00 +1000 Subject: [PATCH 3769/5486] Add line break to great Tasmanian adventure line to reduce character count --- english/marshmallow.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 09510c9ba0..2c37f332b8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -983,7 +983,10 @@ The lannisters always pays thier debts, says tyrion lannister. Interesting [char Time to [move to Canada](Canada/Canada.md), eh? -You struggle to find a line break to add your own adventure. You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) +You struggle to find a line break to add your own adventure. +You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) + + The crushing weight of all these options causes you to [end your life.](end/end.md) From d6c70fff9089e8c2fa4ad092ea3ab45f3f61de34 Mon Sep 17 00:00:00 2001 From: brigitte Date: Tue, 28 Jun 2016 14:57:56 +1000 Subject: [PATCH 3770/5486] Add line breaks to reduce character count per line. --- english/great-tasmanian-adventure/great-tasmanian-adventure.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/great-tasmanian-adventure/great-tasmanian-adventure.md b/english/great-tasmanian-adventure/great-tasmanian-adventure.md index cc23714e34..d7943b5c1f 100644 --- a/english/great-tasmanian-adventure/great-tasmanian-adventure.md +++ b/english/great-tasmanian-adventure/great-tasmanian-adventure.md @@ -1,2 +1,3 @@ -You try to undo the Brexit result using CTRL-Z but it doesn't work. You realise the only way you can undo the referendum is to climb to the top of Federation Peak in Tasmania. +You try to undo the Brexit result using CTRL-Z but it doesn't work. +You realise the only way you can undo the referendum is to climb to the top of Federation Peak in Tasmania. From 85b8217d778611ca62d6ec4f9ed46b3646a8cdaa Mon Sep 17 00:00:00 2001 From: "Eddy(ADT)" Date: Tue, 28 Jun 2016 19:48:51 +1000 Subject: [PATCH 3771/5486] Dream of hiking in Thailand --- Thai/Activities/Hiking.md | 1 + Thai/travel.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Thai/Activities/Hiking.md diff --git a/Thai/Activities/Hiking.md b/Thai/Activities/Hiking.md new file mode 100644 index 0000000000..67a55cfabd --- /dev/null +++ b/Thai/Activities/Hiking.md @@ -0,0 +1 @@ +Hiking is a very good exercise. ได้ออกกำลังกายด้วย ได้ชมวิวด้วย \ No newline at end of file diff --git a/Thai/travel.md b/Thai/travel.md index 8c316ec579..ff05245919 100644 --- a/Thai/travel.md +++ b/Thai/travel.md @@ -6,4 +6,6 @@ What do you want to do? [Just have a chocolate while stroll on the beach](../english/chocolateOrSleep/chocolateOrSleep.md) - [Have Tom Yum Kung. The food is as spicy as the weather.](Cuisine/TomYumKung.md) \ No newline at end of file + [Have Tom Yum Kung. The food is as spicy as the weather.](Cuisine/TomYumKung.md) + + I want to sleep on a beach and dream of [hiking](Activities/Hiking.md) a mountain in the Northern of Thailand. \ No newline at end of file From 48f4a8115c2ef6e86361e2191155167f6cc271f8 Mon Sep 17 00:00:00 2001 From: LuisAlbertoPerezDeLaCruz Date: Tue, 28 Jun 2016 10:00:20 -0400 Subject: [PATCH 3772/5486] ADD Trump-Floyd-The-Wall --- .../trump/trump-floyd-the-wall/thewall.md | 1 + english/vote-the-president/trump/trump.md | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 english/vote-the-president/trump/trump-floyd-the-wall/thewall.md diff --git a/english/vote-the-president/trump/trump-floyd-the-wall/thewall.md b/english/vote-the-president/trump/trump-floyd-the-wall/thewall.md new file mode 100644 index 0000000000..6ec18aaacb --- /dev/null +++ b/english/vote-the-president/trump/trump-floyd-the-wall/thewall.md @@ -0,0 +1 @@ +and then he built a giant wall, which destroyed the habit of eating delicious spicy nachos during the superbowl. So sad! \ No newline at end of file diff --git a/english/vote-the-president/trump/trump.md b/english/vote-the-president/trump/trump.md index 3e91b315e2..f4e019ac82 100644 --- a/english/vote-the-president/trump/trump.md +++ b/english/vote-the-president/trump/trump.md @@ -2,4 +2,11 @@ You made America great again. Now its time to build a wall. Call 987654321 to co It's gonna be huuuuge! -Are you ready for [WWIII](./WWIII/WWIII.md)? \ No newline at end of file +Are you ready for [WWIII](./WWIII/WWIII.md)? + +Know about [Latest hit from Trump Floyd "The Wall"](./trump-floyd-the-wall/thewall.md) ! + + + + + From 4cff18b922d00ee66c9afb186bb090056985fd38 Mon Sep 17 00:00:00 2001 From: David Smith Date: Tue, 28 Jun 2016 15:17:39 -0400 Subject: [PATCH 3773/5486] Add #NeverTrump message for Hillary Clinton --- english/vote-the-president/hillary/Hillary.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/vote-the-president/hillary/Hillary.md b/english/vote-the-president/hillary/Hillary.md index 3931d5968b..a7f4996349 100644 --- a/english/vote-the-president/hillary/Hillary.md +++ b/english/vote-the-president/hillary/Hillary.md @@ -1 +1,3 @@ -Congratulations. You made another Clinton president again. 99% of Hillary voters are actually Trump haters. \ No newline at end of file +Congratulations. You made another Clinton president again. 99% of Hillary voters are actually Trump haters. + +You have done God's work. [#NeverTrump](https://twitter.com/hashtag/NeverTrump?src=hash) \ No newline at end of file From 97d893b73bbaa465a3c8532549e9b6d802fda3d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=B5=E1=86=B7=E1=84=80=E1=85=A7=E1=86=BC?= =?UTF-8?q?=E1=84=86=E1=85=B5=E1=86=AB?= Date: Wed, 29 Jun 2016 12:39:11 +0900 Subject: [PATCH 3774/5486] add study option --- korean/marshmallow.md | 4 +++- korean/study/study.md | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 korean/study/study.md diff --git a/korean/marshmallow.md b/korean/marshmallow.md index 1c1f8892c2..a82488c9a1 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -42,4 +42,6 @@ [방을 둘러본다](look-around/look-around.md) -[카페 성수에 간다](cafe-sungsu/cafe-sungsu.md) \ No newline at end of file +[카페 성수에 간다](cafe-sungsu/cafe-sungsu.md) + +[공부를 한다](study/study.md) \ No newline at end of file diff --git a/korean/study/study.md b/korean/study/study.md new file mode 100644 index 0000000000..f0a89582fe --- /dev/null +++ b/korean/study/study.md @@ -0,0 +1,9 @@ +머리 속에 있는 천자문을 천천히 외워보았어요. 얼마 지나지 않아 졸음이 오네요. + +어떻게 할까요? + +[밖에 나가본다](../explore-outside/explore-outside.md)? + +[마시멜로를 먹는다](../eating-walls/eating-marshmallows.md) + +[노래를 부른다](../sing-a-song/song.md) From 3bf70f029674d6e3bedc69585095d9619a80719c Mon Sep 17 00:00:00 2001 From: SazerLite Date: Wed, 29 Jun 2016 02:49:39 -0500 Subject: [PATCH 3775/5486] Add piano transcription of Blue Danube --- english/chillmusic/chillmusic.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/chillmusic/chillmusic.md b/english/chillmusic/chillmusic.md index 4543cbd22f..6aebc287f8 100644 --- a/english/chillmusic/chillmusic.md +++ b/english/chillmusic/chillmusic.md @@ -1,3 +1,5 @@ Click here to listen to some relaxing [acoustic guitar](https://www.youtube.com/watch?v=bpKn3vx6LkI). Click here instead if you want to listen to some [relaxing rock](https://www.youtube.com/watch?v=JVJVAHLJleU). + +Click [here](https://www.youtube.com/watch?v=c3lid40q2ew) to hear a lovely piano piece. \ No newline at end of file From 8f4011a058ae5c2999547b636d70061844ae66a0 Mon Sep 17 00:00:00 2001 From: SazerLite Date: Wed, 29 Jun 2016 03:35:32 -0500 Subject: [PATCH 3776/5486] Add giant bubble and glowing eyes to the mysterious pool directory --- english/mysterious-pool/giant-bubble/giant-bubble.md | 2 ++ english/mysterious-pool/glowing-eyes/glowing-eyes.md | 2 ++ english/mysterious-pool/mysterious-pool.md | 4 ++++ 3 files changed, 8 insertions(+) create mode 100644 english/mysterious-pool/giant-bubble/giant-bubble.md create mode 100644 english/mysterious-pool/glowing-eyes/glowing-eyes.md diff --git a/english/mysterious-pool/giant-bubble/giant-bubble.md b/english/mysterious-pool/giant-bubble/giant-bubble.md new file mode 100644 index 0000000000..56ebb9cfa1 --- /dev/null +++ b/english/mysterious-pool/giant-bubble/giant-bubble.md @@ -0,0 +1,2 @@ +The big luminescent bubble was surrounded with a lovely blue aura. You could go to it for air, +or it could be toxic. You choose to... \ No newline at end of file diff --git a/english/mysterious-pool/glowing-eyes/glowing-eyes.md b/english/mysterious-pool/glowing-eyes/glowing-eyes.md new file mode 100644 index 0000000000..8940bacdc2 --- /dev/null +++ b/english/mysterious-pool/glowing-eyes/glowing-eyes.md @@ -0,0 +1,2 @@ +The giant, glowing yellow eyes slowly move towards you! Could it be a friend or foe? +Running low on air, you decide to... \ No newline at end of file diff --git a/english/mysterious-pool/mysterious-pool.md b/english/mysterious-pool/mysterious-pool.md index 9770cf5025..802e290272 100644 --- a/english/mysterious-pool/mysterious-pool.md +++ b/english/mysterious-pool/mysterious-pool.md @@ -1,2 +1,6 @@ You sink to the bottom like a rock and your vision is obscured by millions of bubbles. When the bubbles finally clear, you see... + +A pair of [glowing eyes](glowing-eyes/glowing-eyes.md). + +A giant blue [bubble](giant-bubble/giant-bubble.md). \ No newline at end of file From c16cf61b1dff6b0462a7afcd940fead599567187 Mon Sep 17 00:00:00 2001 From: Vincent Bonnot Date: Wed, 29 Jun 2016 22:21:41 +0200 Subject: [PATCH 3777/5486] add option 'fermez les yeux' to ecouter.md --- french/manger/trou/reveille/voix-humaines/ecouter/ecouter.md | 2 ++ .../voix-humaines/ecouter/fermer-les-yeux/fermer-les-yeux.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 french/manger/trou/reveille/voix-humaines/ecouter/fermer-les-yeux/fermer-les-yeux.md diff --git a/french/manger/trou/reveille/voix-humaines/ecouter/ecouter.md b/french/manger/trou/reveille/voix-humaines/ecouter/ecouter.md index 5c35b402b2..bafb6d0116 100644 --- a/french/manger/trou/reveille/voix-humaines/ecouter/ecouter.md +++ b/french/manger/trou/reveille/voix-humaines/ecouter/ecouter.md @@ -1,2 +1,4 @@ Vous entendez une conversation animée entre trois personnes, mais vous ne reconnaissez pas la langue. Il y a aussi le bruit d'un bébé qui pleure. + +[Vous fermez les yeux un instant pour vous concentrer](fermer-les-yeux/fermer-les-yeux.md) diff --git a/french/manger/trou/reveille/voix-humaines/ecouter/fermer-les-yeux/fermer-les-yeux.md b/french/manger/trou/reveille/voix-humaines/ecouter/fermer-les-yeux/fermer-les-yeux.md new file mode 100644 index 0000000000..89ad6dc368 --- /dev/null +++ b/french/manger/trou/reveille/voix-humaines/ecouter/fermer-les-yeux/fermer-les-yeux.md @@ -0,0 +1 @@ +Soudain, une image se forme dans votre esprit, une image familière... vous connaissez ces voix. From 28604df25de6d33e0588b05cbcffb048ac973e9b Mon Sep 17 00:00:00 2001 From: Nkurunziza van Hoof Date: Wed, 29 Jun 2016 22:54:37 +0200 Subject: [PATCH 3778/5486] Modify geld-verdienen.md --- dutch/bos/ontvoering/meehelpen/klus/geld-verdienen.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dutch/bos/ontvoering/meehelpen/klus/geld-verdienen.md b/dutch/bos/ontvoering/meehelpen/klus/geld-verdienen.md index 622493e043..bb7e6c75f5 100644 --- a/dutch/bos/ontvoering/meehelpen/klus/geld-verdienen.md +++ b/dutch/bos/ontvoering/meehelpen/klus/geld-verdienen.md @@ -2,4 +2,8 @@ In eerste instantie geloven de mannen je niet maar als ze je Rolex om je arm zien zijn ze snel geïnteresseerd. Wie is deze man? De mannen kijken elkaar aan en na een korte blik vraagt de langste man: -Voor wie werk jij dan eigenlijk en heb je nog meer klussen? \ No newline at end of file +Voor wie werk jij dan eigenlijk en heb je nog meer klussen? + +- Ik ben Lucien de zoon van Carmen van Walraven en ik kom [wraak nemen!](wraak/wraak.md) + +- k ben Ruben leider van de grootste mensensmokkerlaarsbende van Nederland en ik heb nog [een mooie klus voor één van jullie.](mensensmokkel/mensensmokkel.md) \ No newline at end of file From 88e368ea466f086846929fdc8c1c2e8992929f4b Mon Sep 17 00:00:00 2001 From: Nkurunziza van Hoof Date: Wed, 29 Jun 2016 22:58:46 +0200 Subject: [PATCH 3779/5486] Add mensensmokkel --- .../bos/ontvoering/meehelpen/klus/mensensmokkel/mensensmokkel.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 dutch/bos/ontvoering/meehelpen/klus/mensensmokkel/mensensmokkel.md diff --git a/dutch/bos/ontvoering/meehelpen/klus/mensensmokkel/mensensmokkel.md b/dutch/bos/ontvoering/meehelpen/klus/mensensmokkel/mensensmokkel.md new file mode 100644 index 0000000000..8081ba0cb6 --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/klus/mensensmokkel/mensensmokkel.md @@ -0,0 +1 @@ +Maar ik denk niet dat ik nu een keuze kan maken, maar ik weet wel dat de sterkste van jullie twee de grootste kans maakt om met mij samen te werken. Ik ben namelijk benieuwd wie van jullie.... \ No newline at end of file From 09d98da7a9bf4bb0874dc76b2b766303b05c60f5 Mon Sep 17 00:00:00 2001 From: Nkurunziza van Hoof Date: Wed, 29 Jun 2016 22:59:55 +0200 Subject: [PATCH 3780/5486] Add wraak nemen --- dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md diff --git a/dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md b/dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md new file mode 100644 index 0000000000..7191341cd6 --- /dev/null +++ b/dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md @@ -0,0 +1,3 @@ +Beide mannen slaan stijf achterover van verbazing, hoe is het mogelijk! "Lucien was toch vergiftigd door Mark, de nieuwste leerling van onze baas?" zegt de dikste man. "Dan is die verdomde Mark toch de mol!" zegt de langste man kokend van woede en wetende dat zijn laatste minuten zijn geteld. + +Hij is nog niet uitgepraat of razendsnel pak ik met beide handen van onder mijn trui twee vlijmscherpe werpmessen en met een soepele werpbeweging gooi ik ze richting de hoofden van de verschikte mannen... \ No newline at end of file From 2dc2f85100ed545fd0d3d8064b1b0ad4c9713a96 Mon Sep 17 00:00:00 2001 From: Nkurunziza van Hoof Date: Wed, 29 Jun 2016 23:25:26 +0200 Subject: [PATCH 3781/5486] Break up lines too long --- .../meehelpen/klus/mensensmokkel/mensensmokkel.md | 5 ++++- dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dutch/bos/ontvoering/meehelpen/klus/mensensmokkel/mensensmokkel.md b/dutch/bos/ontvoering/meehelpen/klus/mensensmokkel/mensensmokkel.md index 8081ba0cb6..46cd028332 100644 --- a/dutch/bos/ontvoering/meehelpen/klus/mensensmokkel/mensensmokkel.md +++ b/dutch/bos/ontvoering/meehelpen/klus/mensensmokkel/mensensmokkel.md @@ -1 +1,4 @@ -Maar ik denk niet dat ik nu een keuze kan maken, maar ik weet wel dat de sterkste van jullie twee de grootste kans maakt om met mij samen te werken. Ik ben namelijk benieuwd wie van jullie.... \ No newline at end of file +Ik denk niet dat ik nu een keuze kan maken, wie het wordt. +Maar ik weet wel dat de sterkste van jullie twee de grootste kans maakt om met mij samen te werken. + +Ik ben namelijk benieuwd wie van jullie.... \ No newline at end of file diff --git a/dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md b/dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md index 7191341cd6..b017bacca0 100644 --- a/dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md +++ b/dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md @@ -1,3 +1,6 @@ -Beide mannen slaan stijf achterover van verbazing, hoe is het mogelijk! "Lucien was toch vergiftigd door Mark, de nieuwste leerling van onze baas?" zegt de dikste man. "Dan is die verdomde Mark toch de mol!" zegt de langste man kokend van woede en wetende dat zijn laatste minuten zijn geteld. +Beide mannen slaan stijf achterover van verbazing, hoe is het mogelijk! +"Lucien was toch vergiftigd door Mark, de nieuwste leerling van onze baas?" zegt de dikste man. +"Dan is die verdomde Mark toch de mol!" zegt de langste man kokend van woede, wetende dat zijn laatste minuten zijn geteld. -Hij is nog niet uitgepraat of razendsnel pak ik met beide handen van onder mijn trui twee vlijmscherpe werpmessen en met een soepele werpbeweging gooi ik ze richting de hoofden van de verschikte mannen... \ No newline at end of file +Hij is nog niet uitgepraat of razendsnel pak ik met beide handen van onder mijn trui twee vlijmscherpe werpmessen. +Met een soepele werpbeweging gooi ik ze richting de hoofden van de verschikte mannen... \ No newline at end of file From 1cba35ad15d0765d626abcf7b4c07887684afead Mon Sep 17 00:00:00 2001 From: Nkurunziza van Hoof Date: Wed, 29 Jun 2016 23:40:10 +0200 Subject: [PATCH 3782/5486] Again break up lines too long --- .../ontvoering/meehelpen/klus/geld-verdienen.md | 4 +++- dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md | 14 ++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dutch/bos/ontvoering/meehelpen/klus/geld-verdienen.md b/dutch/bos/ontvoering/meehelpen/klus/geld-verdienen.md index bb7e6c75f5..d1cea0c1b9 100644 --- a/dutch/bos/ontvoering/meehelpen/klus/geld-verdienen.md +++ b/dutch/bos/ontvoering/meehelpen/klus/geld-verdienen.md @@ -6,4 +6,6 @@ Voor wie werk jij dan eigenlijk en heb je nog meer klussen? - Ik ben Lucien de zoon van Carmen van Walraven en ik kom [wraak nemen!](wraak/wraak.md) -- k ben Ruben leider van de grootste mensensmokkerlaarsbende van Nederland en ik heb nog [een mooie klus voor één van jullie.](mensensmokkel/mensensmokkel.md) \ No newline at end of file +- Ik ben Ruben de Roker... +leider van de grootste mensensmokkerlaarsbende van Nederland +en ik heb nog [een mooie klus voor één van jullie.](mensensmokkel/mensensmokkel.md) \ No newline at end of file diff --git a/dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md b/dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md index b017bacca0..346753a32f 100644 --- a/dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md +++ b/dutch/bos/ontvoering/meehelpen/klus/wraak/wraak.md @@ -1,6 +1,12 @@ Beide mannen slaan stijf achterover van verbazing, hoe is het mogelijk! -"Lucien was toch vergiftigd door Mark, de nieuwste leerling van onze baas?" zegt de dikste man. -"Dan is die verdomde Mark toch de mol!" zegt de langste man kokend van woede, wetende dat zijn laatste minuten zijn geteld. -Hij is nog niet uitgepraat of razendsnel pak ik met beide handen van onder mijn trui twee vlijmscherpe werpmessen. -Met een soepele werpbeweging gooi ik ze richting de hoofden van de verschikte mannen... \ No newline at end of file +"Lucien was toch vergiftigd door Mafkees Mark.... +de nieuwste leerling van onze baas?" vraagt de dikste man. + +"Dan is die verdomde Mark toch de mol!" schreeuwt de langste man +kokend van woede, wetende dat zijn laatste minuten zijn geteld. + +Hij is nog niet uitgepraat... +of razendsnel pak ik met beide handen van onder mijn trui twee vlijmscherpe werpmessen. + +En met een soepele werpbeweging gooi ik ze richting de hoofden van de verschikte mannen... \ No newline at end of file From c0f330e7012708739ef2521a9cb60569c236909d Mon Sep 17 00:00:00 2001 From: Bogdan Camalessa Date: Thu, 30 Jun 2016 09:30:24 +0300 Subject: [PATCH 3783/5486] Add a new option Add a new option to an existing choice point, and link that option to padurea_violet page --- romanian/somn/somn.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/romanian/somn/somn.md b/romanian/somn/somn.md index 584f46c045..7216f67913 100644 --- a/romanian/somn/somn.md +++ b/romanian/somn/somn.md @@ -1 +1,2 @@ -Si in timp ce dormi visezi tot felul de lucruri; se facea ca te afli in: \ No newline at end of file +Si in timp ce dormi visezi tot felul de lucruri; se facea ca te afli in: +[padurea violet](padurea_violet/padurea_violet.md) From c14a41899293092cc16fb7605e5e1ea4c8b3eb7e Mon Sep 17 00:00:00 2001 From: Bogdan Camalessa Date: Thu, 30 Jun 2016 09:35:24 +0300 Subject: [PATCH 3784/5486] Insert blank line --- romanian/somn/somn.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/romanian/somn/somn.md b/romanian/somn/somn.md index 7216f67913..366c0400d8 100644 --- a/romanian/somn/somn.md +++ b/romanian/somn/somn.md @@ -1,2 +1,3 @@ Si in timp ce dormi visezi tot felul de lucruri; se facea ca te afli in: -[padurea violet](padurea_violet/padurea_violet.md) + +[padurea violet](padurea_violet/padurea_violet.md) From d0e417a10627712757af0ad6f7a8575aa39f401e Mon Sep 17 00:00:00 2001 From: Bogdan Camalessa Date: Thu, 30 Jun 2016 09:39:56 +0300 Subject: [PATCH 3785/5486] Fix broken link --- romanian/somn/somn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/romanian/somn/somn.md b/romanian/somn/somn.md index 366c0400d8..7027e1ee02 100644 --- a/romanian/somn/somn.md +++ b/romanian/somn/somn.md @@ -1,3 +1,3 @@ Si in timp ce dormi visezi tot felul de lucruri; se facea ca te afli in: -[padurea violet](padurea_violet/padurea_violet.md) +[padurea violet](../padurea_violet/padurea_violet.md) From f0d4b7d8147e0f9aa0b63031af40a5306148f980 Mon Sep 17 00:00:00 2001 From: Chuong Pham Date: Thu, 30 Jun 2016 15:46:09 +0700 Subject: [PATCH 3786/5486] Add Storyline to Saigon --- vietnamese/SaiGon/SaiGon.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vietnamese/SaiGon/SaiGon.md b/vietnamese/SaiGon/SaiGon.md index fd6cfbeaa5..0101783065 100644 --- a/vietnamese/SaiGon/SaiGon.md +++ b/vietnamese/SaiGon/SaiGon.md @@ -1,3 +1,5 @@ Sài Gòn là 1 trong 2 thành phố nổi tiếng nhất ở Việt Nam ngoài Hà Nội. Sài Gòn thành phố rất nhộn nhịp và phát triển. -Sai Gon duoc vi nhu thanh pho Toronto o Canada \ No newline at end of file +Sai Gon duoc vi nhu thanh pho Toronto o Canada + +Sài Gòn trước 75 là hòn ngọc viễn đông \ No newline at end of file From 48dbd07fb804b1cf14a009bfc1dd924d1f54c1fe Mon Sep 17 00:00:00 2001 From: Nesters Kovalkovs Date: Thu, 30 Jun 2016 16:41:15 +0300 Subject: [PATCH 3787/5486] Google question --- latvian/grab-lighter/grab-lighter.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/latvian/grab-lighter/grab-lighter.md b/latvian/grab-lighter/grab-lighter.md index 1b627b7d5e..70c61c1577 100644 --- a/latvian/grab-lighter/grab-lighter.md +++ b/latvian/grab-lighter/grab-lighter.md @@ -1,3 +1,5 @@ Tu ar trīcošām rokām paķer šķiltavas no zemes. Tu drudžaini tās mēģini noslēpt savā bikšū kabatā. + +Tu izvelc telefonu no otras kabatas un Googlei jautā: ko tagad darīt? \ No newline at end of file From 0c727eb954b3099e061389d79d64056b56752d0a Mon Sep 17 00:00:00 2001 From: vedderjam Date: Fri, 1 Jul 2016 20:29:25 +0200 Subject: [PATCH 3788/5486] =?UTF-8?q?A=C3=B1adir=20sorpresa=20inesperada?= =?UTF-8?q?=20para=20Beatito?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/rezando/plaza/casamiento/casamiento.md | 2 ++ espanol/rezando/plaza/casamiento/inesperado/inesperado.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 espanol/rezando/plaza/casamiento/inesperado/inesperado.md diff --git a/espanol/rezando/plaza/casamiento/casamiento.md b/espanol/rezando/plaza/casamiento/casamiento.md index 7e45183885..912fca9aac 100644 --- a/espanol/rezando/plaza/casamiento/casamiento.md +++ b/espanol/rezando/plaza/casamiento/casamiento.md @@ -1 +1,3 @@ "Bueno Beatito, yo también tengo algo que confesarte", dijo Juarema. Luego ella... + +añadió: ["No vas a poder desposarme porque..."](inesperado/inesperado.md) diff --git a/espanol/rezando/plaza/casamiento/inesperado/inesperado.md b/espanol/rezando/plaza/casamiento/inesperado/inesperado.md new file mode 100644 index 0000000000..32d3dc500f --- /dev/null +++ b/espanol/rezando/plaza/casamiento/inesperado/inesperado.md @@ -0,0 +1,3 @@ +- Tengo que confesarte que no puedes desposarme. ¿Recuerdas el enano que me +acompañaba en mi regreso? Quizás debas hablar con él. Yo no tengo fuerzas para +contarlo... From fcf96c4d63bfd986bdf1e14fef9d90a548549d40 Mon Sep 17 00:00:00 2001 From: Ravish Khatri Date: Sun, 3 Jul 2016 04:31:45 +0530 Subject: [PATCH 3789/5486] Just want to get over with this --- english/132-days-ago/132-days-ago.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/132-days-ago/132-days-ago.md b/english/132-days-ago/132-days-ago.md index 1d96237964..e6e260657b 100644 --- a/english/132-days-ago/132-days-ago.md +++ b/english/132-days-ago/132-days-ago.md @@ -6,4 +6,6 @@ You decide to [eat the chocolate anyway.](../youre-fine/youre-fine.md) Or, you could [eat a juicy steak](../rib-eye/rib-eye.md) -Maybe even a [fart] (../eat-farts/eat-farts.md)or two? \ No newline at end of file +Maybe even a [fart] (../eat-farts/eat-farts.md)or two? + +sick of it \ No newline at end of file From f6a67cbc091b7a8fc334b5d00740e322d29dbec2 Mon Sep 17 00:00:00 2001 From: oldwalkman Date: Sun, 3 Jul 2016 16:46:45 +0800 Subject: [PATCH 3790/5486] add beauty --- Chinese/beauty/beauty.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Chinese/beauty/beauty.md diff --git a/Chinese/beauty/beauty.md b/Chinese/beauty/beauty.md new file mode 100644 index 0000000000..814a99bc8a --- /dev/null +++ b/Chinese/beauty/beauty.md @@ -0,0 +1 @@ +木心老爷子说过，[美貌](https://www.douban.com/group/topic/12641976/)是一种表情。 \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 51927ee7ee..2b7fd55476 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -2,6 +2,8 @@ 前端攻城狮一枚。这枚攻城狮做出了很多网页，比如： +[美貌是一种表情](beauty/beauty.md) + [葫芦娃](oner0128/story.md) [PanicStation](PanicStation/panic.md) From 1dae39e25dc478a487ff60b27ae65d43187e8b3c Mon Sep 17 00:00:00 2001 From: oldwalkman Date: Sun, 3 Jul 2016 17:21:59 +0800 Subject: [PATCH 3791/5486] add beauty --- Chinese/beauty/beauty.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Chinese/beauty/beauty.md diff --git a/Chinese/beauty/beauty.md b/Chinese/beauty/beauty.md new file mode 100644 index 0000000000..814a99bc8a --- /dev/null +++ b/Chinese/beauty/beauty.md @@ -0,0 +1 @@ +木心老爷子说过，[美貌](https://www.douban.com/group/topic/12641976/)是一种表情。 \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 51927ee7ee..2b7fd55476 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -2,6 +2,8 @@ 前端攻城狮一枚。这枚攻城狮做出了很多网页，比如： +[美貌是一种表情](beauty/beauty.md) + [葫芦娃](oner0128/story.md) [PanicStation](PanicStation/panic.md) From 66b477bf1e57628f2ed138159122e7aaa3dd0cdf Mon Sep 17 00:00:00 2001 From: oldwalkman Date: Sun, 3 Jul 2016 18:04:21 +0800 Subject: [PATCH 3792/5486] add emotion --- Chinese/beauty/beauty.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/beauty/beauty.md b/Chinese/beauty/beauty.md index 814a99bc8a..1e280d64f6 100644 --- a/Chinese/beauty/beauty.md +++ b/Chinese/beauty/beauty.md @@ -1 +1 @@ -木心老爷子说过，[美貌](https://www.douban.com/group/topic/12641976/)是一种表情。 \ No newline at end of file +木心老爷子说过，[美貌](https://www.douban.com/group/topic/12641976/)是一种表情。^_^ \ No newline at end of file From 046435bfe76528f4414de7c7e5979e4742262133 Mon Sep 17 00:00:00 2001 From: Omar Ali Date: Sun, 3 Jul 2016 13:23:08 -0500 Subject: [PATCH 3793/5486] Add youtube link to Saul Goodman's best line from Breaking Bad --- english/say-my-name/say-my-name.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/say-my-name/say-my-name.md b/english/say-my-name/say-my-name.md index 1659b541d3..5a103337df 100644 --- a/english/say-my-name/say-my-name.md +++ b/english/say-my-name/say-my-name.md @@ -9,3 +9,5 @@ NOW... SAY MY NAME [Some dancing](https://www.youtube.com/watch?v=zBvPEmEkpkg) [Pinkman](https://www.youtube.com/watch?v=RLe6qQ5MK20) + +[Right Amount of Dirty](https://www.youtube.com/watch?v=qdhTL5G32Gw) From af885fef80387c1ec59df74e52d961497181f1de Mon Sep 17 00:00:00 2001 From: Matthew Vega Date: Sun, 3 Jul 2016 22:21:36 -0700 Subject: [PATCH 3794/5486] Explain why a happy robot is happy --- english/happy-robot/happy-robot.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/happy-robot/happy-robot.md b/english/happy-robot/happy-robot.md index c4f6ef70e4..98f9c28f98 100644 --- a/english/happy-robot/happy-robot.md +++ b/english/happy-robot/happy-robot.md @@ -1,4 +1,4 @@ -A happy robot helps people. +A happy robot helps people. A happy robot is happy because he helps people. It was a dark and stormy night. A scream is heard. A happy robot, let's name him "George," wakes up to the sound. "Someone needs my help!" @@ -6,4 +6,4 @@ It was a dark and stormy night. A scream is heard. A happy robot, let's name h He jumps up, but before he rushes out the door he... a) Grabs a [weapon](./robot-help/robot-weapon.md), or -b) Enjoys some [refreshments](./robot-refresh/refreshments.md). \ No newline at end of file +b) Enjoys some [refreshments](./robot-refresh/refreshments.md). From bc4ae8a53e32a55dd7f31244bfd50c1e71f40a1d Mon Sep 17 00:00:00 2001 From: Matthew Vega Date: Sun, 3 Jul 2016 22:26:16 -0700 Subject: [PATCH 3795/5486] Move added content to its own line --- english/happy-robot/happy-robot.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/happy-robot/happy-robot.md b/english/happy-robot/happy-robot.md index 98f9c28f98..fcb01d8ce9 100644 --- a/english/happy-robot/happy-robot.md +++ b/english/happy-robot/happy-robot.md @@ -1,4 +1,6 @@ -A happy robot helps people. A happy robot is happy because he helps people. +A happy robot helps people. + +A happy robot is happy because he helps people. It was a dark and stormy night. A scream is heard. A happy robot, let's name him "George," wakes up to the sound. "Someone needs my help!" From 1f52ca0cfb83d2e6750df915f47914a2af4c5279 Mon Sep 17 00:00:00 2001 From: Matthew Vega Date: Sun, 3 Jul 2016 22:30:50 -0700 Subject: [PATCH 3796/5486] Remove unintended newline addition From c6e8f1c30bcdfa1efcee2af16072b194c914ef39 Mon Sep 17 00:00:00 2001 From: delia Date: Mon, 4 Jul 2016 13:34:38 +0200 Subject: [PATCH 3797/5486] Add changes to angeles link. --- espanol/angeles/angeles.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/angeles/angeles.md b/espanol/angeles/angeles.md index e3ba694b79..82ffbb69ad 100644 --- a/espanol/angeles/angeles.md +++ b/espanol/angeles/angeles.md @@ -6,4 +6,6 @@ han brindado. Betito se llenó de fuerzas también y animó a todos los guerrero La voz de un ángel te llama, pero estas distraído con la tecnología! +La tecnología es un mal de la sociedad si se emplea mal. + El progreso no mide tiempo. From 4ae9603b6b22b2e61af05d1f66ea4864af8492a6 Mon Sep 17 00:00:00 2001 From: 123gaurav Date: Mon, 4 Jul 2016 14:12:24 -0400 Subject: [PATCH 3798/5486] Happiness in Life --- english/Happy/happie.md | 2 ++ english/marshmallow.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/Happy/happie.md diff --git a/english/Happy/happie.md b/english/Happy/happie.md new file mode 100644 index 0000000000..747322053c --- /dev/null +++ b/english/Happy/happie.md @@ -0,0 +1,2 @@ +In the Pursuit of Happines +Let's try to stay happy like them. [here](https://www.youtube.com/watch?v=8mP5xOg7ijs) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 7d179a979b..6f4ffe8201 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -9,6 +9,8 @@ You decide to drop everything you're doing and [run out the door](run_out_the_do Take some [time](meditation/meditation.md) off! +Life is full of twists and turns like but try to cheer yourself and people around you. [Click Here](Happy/happie.md) + Who is better? [Click Here](captain/captain.md) to vote for Captain America From 327ca6906c8ce574a2d7e99caf15b904c89072bc Mon Sep 17 00:00:00 2001 From: jmrunkle Date: Mon, 4 Jul 2016 11:38:17 -0700 Subject: [PATCH 3799/5486] Add warning for batmetal --- english/batmetal/batmetal.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batmetal/batmetal.md b/english/batmetal/batmetal.md index 3562247c8c..00f16046fd 100644 --- a/english/batmetal/batmetal.md +++ b/english/batmetal/batmetal.md @@ -1 +1,3 @@ +WARNING: Entering heavy metal zone! + [I AM BE DANGEROUS NOW](https://www.youtube.com/watch?v=qatmJtIJAPw). From ea003c9deddc654a56840320ef60f17259cbdb9b Mon Sep 17 00:00:00 2001 From: Corey Murphy Date: Mon, 4 Jul 2016 18:47:40 -0700 Subject: [PATCH 3800/5486] Added links in english/sleep/crackers/crackers.md Added english/sleep/crackers/cracker-soldiers-fight.md Added english/sleep/crackers/cracker-soldiers-flee.md --- .../cracker-soldiers-fight/cracker-soldiers-fight.md | 12 ++++++++++++ .../cracker-soldiers-flee/cracker-soldiers-flee.md | 5 +++++ english/sleep/crackers/crackers.md | 10 +++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 english/sleep/crackers/cracker-soldiers-fight/cracker-soldiers-fight.md create mode 100644 english/sleep/crackers/cracker-soldiers-flee/cracker-soldiers-flee.md diff --git a/english/sleep/crackers/cracker-soldiers-fight/cracker-soldiers-fight.md b/english/sleep/crackers/cracker-soldiers-fight/cracker-soldiers-fight.md new file mode 100644 index 0000000000..be6662ae99 --- /dev/null +++ b/english/sleep/crackers/cracker-soldiers-fight/cracker-soldiers-fight.md @@ -0,0 +1,12 @@ +You think to yourself, "What's the worst that can happen?" + +You eye the biggest, baddest soldier in the room, a gorilla looming over you. + +You tear the spear from a nearby soldier's hands and hurl it directly at the massive gorilla. + +He easily catches the spear with his shield, but in doing so, creates a gap in the shield. + +Do you... + + + diff --git a/english/sleep/crackers/cracker-soldiers-flee/cracker-soldiers-flee.md b/english/sleep/crackers/cracker-soldiers-flee/cracker-soldiers-flee.md new file mode 100644 index 0000000000..d553edb8e8 --- /dev/null +++ b/english/sleep/crackers/cracker-soldiers-flee/cracker-soldiers-flee.md @@ -0,0 +1,5 @@ +You think to yourself, "Self, this isn't going well." + +You eye the biggest, baddest soldier in the room, a gorilla looming over you, and bravely turn tail and flee. + +As you push past a rather unintimidating Platypus, something grabs your arm firmly and pulls you back into the circle... diff --git a/english/sleep/crackers/crackers.md b/english/sleep/crackers/crackers.md index cb31908681..fd53671117 100644 --- a/english/sleep/crackers/crackers.md +++ b/english/sleep/crackers/crackers.md @@ -4,4 +4,12 @@ As you begin to utter the words, the walls of the marshmallow room rip open as g They part, and you realize they are graham cracker shields held by animal cracker soldiers carrying chocolate spears. -It's becoming increasingly dangerous by the second. \ No newline at end of file +It's becoming increasingly dangerous by the second. + +Do you... + + +[Fight?](cracker-soldiers-fight/cracker-soldiers-fight.md) + + +[Flee?](cracker-soldiers-flee/cracker-soldiers-flee.md) \ No newline at end of file From fd0dcc561c7a400cbffa8275ab8e6fcde2002bbe Mon Sep 17 00:00:00 2001 From: Corey Murphy Date: Mon, 4 Jul 2016 19:04:07 -0700 Subject: [PATCH 3801/5486] Ensured all lines were less than 120 characters. --- .../cracker-soldiers-fight/cracker-soldiers-fight.md | 9 ++++++--- .../cracker-soldiers-flee/cracker-soldiers-flee.md | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/english/sleep/crackers/cracker-soldiers-fight/cracker-soldiers-fight.md b/english/sleep/crackers/cracker-soldiers-fight/cracker-soldiers-fight.md index be6662ae99..2023e001bb 100644 --- a/english/sleep/crackers/cracker-soldiers-fight/cracker-soldiers-fight.md +++ b/english/sleep/crackers/cracker-soldiers-fight/cracker-soldiers-fight.md @@ -1,10 +1,13 @@ You think to yourself, "What's the worst that can happen?" -You eye the biggest, baddest soldier in the room, a gorilla looming over you. +You eye the biggest, baddest soldier in the room, +a gorilla looming over you. -You tear the spear from a nearby soldier's hands and hurl it directly at the massive gorilla. +You tear the spear from a nearby soldier's hands +and hurl it directly at the massive gorilla. -He easily catches the spear with his shield, but in doing so, creates a gap in the shield. +He easily catches the spear with his shield, +but in doing so, creates a gap in the shield. Do you... diff --git a/english/sleep/crackers/cracker-soldiers-flee/cracker-soldiers-flee.md b/english/sleep/crackers/cracker-soldiers-flee/cracker-soldiers-flee.md index d553edb8e8..e35b8c97ed 100644 --- a/english/sleep/crackers/cracker-soldiers-flee/cracker-soldiers-flee.md +++ b/english/sleep/crackers/cracker-soldiers-flee/cracker-soldiers-flee.md @@ -1,5 +1,7 @@ You think to yourself, "Self, this isn't going well." -You eye the biggest, baddest soldier in the room, a gorilla looming over you, and bravely turn tail and flee. +You eye the biggest, baddest soldier in the room, +a gorilla looming over you, and bravely turn tail and flee. -As you push past a rather unintimidating Platypus, something grabs your arm firmly and pulls you back into the circle... +As you push past a rather unintimidating Platypus, +something grabs your arm firmly and pulls you back into the circle... From edd4dece621085e6f7f3f9d60615c6c1ac3b4bce Mon Sep 17 00:00:00 2001 From: AntonTce Date: Mon, 4 Jul 2016 21:51:49 -0500 Subject: [PATCH 3802/5486] Add go to travel --- russian/travelling/desert/desert.md | 1 + russian/travelling/go-to-travel.md | 9 +++++++++ russian/travelling/jungle/jungle.md | 1 + russian/travelling/mountain/mountain.md | 1 + russian/zefir.md | 4 +++- 5 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 russian/travelling/desert/desert.md create mode 100644 russian/travelling/go-to-travel.md create mode 100644 russian/travelling/jungle/jungle.md create mode 100644 russian/travelling/mountain/mountain.md diff --git a/russian/travelling/desert/desert.md b/russian/travelling/desert/desert.md new file mode 100644 index 0000000000..ee28c66eec --- /dev/null +++ b/russian/travelling/desert/desert.md @@ -0,0 +1 @@ +Вы отправились в знойную пустыню на поиски легендарного оазиса. \ No newline at end of file diff --git a/russian/travelling/go-to-travel.md b/russian/travelling/go-to-travel.md new file mode 100644 index 0000000000..986fb0fc36 --- /dev/null +++ b/russian/travelling/go-to-travel.md @@ -0,0 +1,9 @@ +Вы решаетесь отправиться в увлекательное путешествие! + +Ваши действия: + +[Отправиться в пустыню](desert/desert.md) + +[Пройти через джунгли](jungle/jungle.md) + +[Покорить гору](mountain/mountain.md) \ No newline at end of file diff --git a/russian/travelling/jungle/jungle.md b/russian/travelling/jungle/jungle.md new file mode 100644 index 0000000000..1cf768e8f7 --- /dev/null +++ b/russian/travelling/jungle/jungle.md @@ -0,0 +1 @@ +Вас забросили в непроходимые джунгли, чтобы вы прошли их. \ No newline at end of file diff --git a/russian/travelling/mountain/mountain.md b/russian/travelling/mountain/mountain.md new file mode 100644 index 0000000000..c28c53bd7c --- /dev/null +++ b/russian/travelling/mountain/mountain.md @@ -0,0 +1 @@ +Вы решаетесь взойти на вершину Канченджанги по северной стене. \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index 4722305f64..b1bfb5ff2c 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -104,4 +104,6 @@ [Начнёте медитировать](meditate/meditate.md) -[Решите программировать] (programming/to-program.md) \ No newline at end of file +[Решите программировать] (programming/to-program.md) + +[Отправитесь путешествовать](travelling/go-to-travel.md) \ No newline at end of file From 7ebc911b816ae1c4791a9f1916074a6b7370fbdd Mon Sep 17 00:00:00 2001 From: jakkritpromma Date: Tue, 5 Jul 2016 17:38:21 +0700 Subject: [PATCH 3803/5486] Modify ironman.md and create jarvis.md --- english/ironman/ironman.md | 4 +++- english/ironman/jarvis/jarvis.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/ironman/jarvis/jarvis.md diff --git a/english/ironman/ironman.md b/english/ironman/ironman.md index 72d42f0dca..0fbb027290 100644 --- a/english/ironman/ironman.md +++ b/english/ironman/ironman.md @@ -1,4 +1,6 @@ Wrong Choice. A man of honour beats a genius billionaire playboy philanthropist. -Let's watch the trailer of him fighting captain america [here](https://youtu.be/uVdV-lxRPFo). \ No newline at end of file +Let's watch the trailer of him fighting captain america [here](https://youtu.be/uVdV-lxRPFo). + +However, [J.A.R.V.I.S.](jarvis/jarvis.md) is developing a secret plan. \ No newline at end of file diff --git a/english/ironman/jarvis/jarvis.md b/english/ironman/jarvis/jarvis.md new file mode 100644 index 0000000000..4a39dbdb85 --- /dev/null +++ b/english/ironman/jarvis/jarvis.md @@ -0,0 +1 @@ +Just A Rather Very Intelligent System, or J.A.R.V.I.S. is Tony Stark's artificially intelligent computer. It is programmed to speak with a male voice in a British accent. J.A.R.V.I.S. is now merged with Vision [Source](http://marvel-movies.wikia.com/wiki/J.A.R.V.I.S.). \ No newline at end of file From 9268dd6547a005af61ec19abc03a5b16cfbf21df Mon Sep 17 00:00:00 2001 From: Praveen Jugraj Date: Tue, 5 Jul 2016 23:32:17 +1000 Subject: [PATCH 3804/5486] feat: PJ adding to story --- english/mad/mad.md | 1 + english/marshmallow.md | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 english/mad/mad.md diff --git a/english/mad/mad.md b/english/mad/mad.md new file mode 100644 index 0000000000..e2d85820c6 --- /dev/null +++ b/english/mad/mad.md @@ -0,0 +1 @@ +come along, I will introduce you the [Forest](forest/forest.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 7d179a979b..5093326a0e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,7 @@ +Once upon a time many authors collaborated to make meaningless linked story. + +[start](mad/mad.md) your journey into world of mad or spend your time [wisely](http://www.pythonchallenge.com/) + [Click here](http://www.dvloper.me) to visit my dvloper.me blog . Your adventure begins. You realize there are hundreds of paths for you to choose from. From 951e7b85759705e0e431198c00b98cb89293c263 Mon Sep 17 00:00:00 2001 From: Praveen Jugraj Date: Tue, 5 Jul 2016 23:39:19 +1000 Subject: [PATCH 3805/5486] fix forest.md link --- english/mad/mad.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/mad/mad.md b/english/mad/mad.md index e2d85820c6..e59c4ec80b 100644 --- a/english/mad/mad.md +++ b/english/mad/mad.md @@ -1 +1 @@ -come along, I will introduce you the [Forest](forest/forest.md) \ No newline at end of file +come along, I will introduce you the [Forest](../forest/forest.md) \ No newline at end of file From 3cc516e29b014d409bcada53114bb572c47c6302 Mon Sep 17 00:00:00 2001 From: Praveen Jugraj Date: Tue, 5 Jul 2016 23:54:34 +1000 Subject: [PATCH 3806/5486] format to put links in separate lines --- english/marshmallow.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5093326a0e..27f1f43b31 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,6 +1,10 @@ Once upon a time many authors collaborated to make meaningless linked story. -[start](mad/mad.md) your journey into world of mad or spend your time [wisely](http://www.pythonchallenge.com/) +[start](mad/mad.md) your journey into world of mad + +or + +spend your time [wisely](http://www.pythonchallenge.com/) [Click here](http://www.dvloper.me) to visit my dvloper.me blog . From 51b4d033a77d35a45384a8c89bff508f056b6c6f Mon Sep 17 00:00:00 2001 From: Priscilla Beaudet Date: Tue, 5 Jul 2016 12:08:14 -0400 Subject: [PATCH 3807/5486] Create barata --- portugues/barata | 1 + 1 file changed, 1 insertion(+) create mode 100644 portugues/barata diff --git a/portugues/barata b/portugues/barata new file mode 100644 index 0000000000..ad4501eef3 --- /dev/null +++ b/portugues/barata @@ -0,0 +1 @@ +Eu vou comprar um chicote pra me defender desse bug! From b979e4cc1f3c5ec5f421e12c57b5fb5567ac6144 Mon Sep 17 00:00:00 2001 From: Priscilla Beaudet Date: Tue, 5 Jul 2016 12:10:21 -0400 Subject: [PATCH 3808/5486] Delete barata --- portugues/barata | 1 - 1 file changed, 1 deletion(-) delete mode 100644 portugues/barata diff --git a/portugues/barata b/portugues/barata deleted file mode 100644 index ad4501eef3..0000000000 --- a/portugues/barata +++ /dev/null @@ -1 +0,0 @@ -Eu vou comprar um chicote pra me defender desse bug! From 0d42150503c3f88a0b110f8c525ef87d88e1a9a9 Mon Sep 17 00:00:00 2001 From: jens Date: Tue, 5 Jul 2016 22:27:46 +0200 Subject: [PATCH 3809/5486] Story in der Hoehle fortgefuehrt, ich hoffe jmd. fuehrt sie weiter ;-) --- .../Person/GespraechMitHoehlenmann/Gespraech.md | 2 ++ german/Korallen/Hoehle/Unterwasserstation/Person/Person.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 german/Korallen/Hoehle/Unterwasserstation/Person/GespraechMitHoehlenmann/Gespraech.md diff --git a/german/Korallen/Hoehle/Unterwasserstation/Person/GespraechMitHoehlenmann/Gespraech.md b/german/Korallen/Hoehle/Unterwasserstation/Person/GespraechMitHoehlenmann/Gespraech.md new file mode 100644 index 0000000000..c358001f3f --- /dev/null +++ b/german/Korallen/Hoehle/Unterwasserstation/Person/GespraechMitHoehlenmann/Gespraech.md @@ -0,0 +1,2 @@ +Der Mann jault laut auf und geht auf sie los, in letzter Sekunde entsinnen Sie sich Ihrer fast vergessenen Judokenntnisse und legen ihn mit einem gekonnten Wurf aufs Kreuz. +Im Wrgegriff verrt Ihnen der Mann laut nach Luft japsend dass sich in dem Stein ein Hohlraum mit geheimen Dokumente befindet. \ No newline at end of file diff --git a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md index 8ff4121901..ddc782e280 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md +++ b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md @@ -1,3 +1,7 @@ Sie reicht Ihnen die Hand um Ihnen aus dem Wasser zu helfen. Erst jetzt gelingt es Ihnen einen Blick auf den Fremden zu werfen. Er guckt Sie mit einer gewissen Skepsis aber nicht unfreundlich an. Er drückt Ihnen einen Stein in die Hand und sagt "Hier mein Junge, bring das in Sicherheit". + +[Sie werfen ihm den Stein auf den Fuß und fragen ihn was zum Teufel er hier sucht](GespraechMitHoehlenmann/gespraech.md) + +[Ihnen ist das alles nicht mehr Geheuer in dieser Hoehler, mit dem Stein in der Hand springen Sie wieder ins Wasser und schwimmen aus der Höhle](../../Korallen.md) From 7d731bb3000cac3c99ee3286cddbd4500503c0e3 Mon Sep 17 00:00:00 2001 From: jens Date: Tue, 5 Jul 2016 22:32:20 +0200 Subject: [PATCH 3810/5486] fixed type --- german/Korallen/Hoehle/Unterwasserstation/Person/Person.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md index ddc782e280..ecb46012da 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md +++ b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md @@ -2,6 +2,6 @@ Sie reicht Ihnen die Hand um Ihnen aus dem Wasser zu helfen. Erst jetzt gelingt werfen. Er guckt Sie mit einer gewissen Skepsis aber nicht unfreundlich an. Er drückt Ihnen einen Stein in die Hand und sagt "Hier mein Junge, bring das in Sicherheit". -[Sie werfen ihm den Stein auf den Fuß und fragen ihn was zum Teufel er hier sucht](GespraechMitHoehlenmann/gespraech.md) +[Sie werfen ihm den Stein auf den Fuß und fragen ihn was zum Teufel er hier sucht](GespraechMitHoehlenmann/Gespraech.md) -[Ihnen ist das alles nicht mehr Geheuer in dieser Hoehler, mit dem Stein in der Hand springen Sie wieder ins Wasser und schwimmen aus der Höhle](../../Korallen.md) +[Ihnen ist das alles nicht mehr Geheuer in dieser Hoehle, mit dem Stein in der Hand springen Sie wieder ins Wasser und schwimmen aus der Höhle](../../Korallen.md) From aa65c70767da5ad0e2448bf46086e072f9f00376 Mon Sep 17 00:00:00 2001 From: jens Date: Tue, 5 Jul 2016 22:44:25 +0200 Subject: [PATCH 3811/5486] fixed typo --- .../Person/GespraechMitHoehlenmann/Gespraech.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/Korallen/Hoehle/Unterwasserstation/Person/GespraechMitHoehlenmann/Gespraech.md b/german/Korallen/Hoehle/Unterwasserstation/Person/GespraechMitHoehlenmann/Gespraech.md index c358001f3f..1ca5d6bd3e 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/Person/GespraechMitHoehlenmann/Gespraech.md +++ b/german/Korallen/Hoehle/Unterwasserstation/Person/GespraechMitHoehlenmann/Gespraech.md @@ -1,2 +1,2 @@ Der Mann jault laut auf und geht auf sie los, in letzter Sekunde entsinnen Sie sich Ihrer fast vergessenen Judokenntnisse und legen ihn mit einem gekonnten Wurf aufs Kreuz. -Im Wrgegriff verrt Ihnen der Mann laut nach Luft japsend dass sich in dem Stein ein Hohlraum mit geheimen Dokumente befindet. \ No newline at end of file +Im Wrgegriff verrt Ihnen der Mann laut nach Luft japsend dass sich in dem Stein ein Hohlraum mit geheimen Dokumenten befindet. \ No newline at end of file From 5c694423d6fd01b4a9c41b313f596da6e6e57029 Mon Sep 17 00:00:00 2001 From: Priscilla Beaudet Date: Tue, 5 Jul 2016 16:44:33 -0400 Subject: [PATCH 3812/5486] Add adventure of the cockroach --- portugues/colaborando.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 934a167bb1..a03440c019 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -27,6 +27,8 @@ Você: [Vai ao banheiro e pega sua toalha](toalha/nave.md) +[Pergunta pro Luis Fernando](barata/chicotada.md) + Na verdade, isto tudo é a sua imaginação. Você vive em 1991 e usa MS-DOS 5.0 e um modem de 9600 baud. A sua linha telefônica está uma droga hoje e você tem que baixar a ultima versão do XTree para enciumar os seus amigos. @@ -50,4 +52,6 @@ BR BR BR Hue hue hue!!!! [Você foi assaltado](ladrao/assalto.md) -[Você vira um jogador...](futebol/futebol.md) \ No newline at end of file +[Você vira um jogador...](futebol/futebol.md) + +[Eu vou comprar um chicote pra me defender]() \ No newline at end of file From b8d9808f5cfab7f25d49af65108e575528a0b130 Mon Sep 17 00:00:00 2001 From: Priscilla Beaudet Date: Tue, 5 Jul 2016 16:45:52 -0400 Subject: [PATCH 3813/5486] Add cockroach path --- portugues/barata/Alexandre/alexandre.md | 6 ++++++ portugues/barata/Fernando/fernando.md | 6 ++++++ portugues/barata/LuisFernando/luisFernando.md | 6 ++++++ portugues/barata/Luizinho/luizinho.md | 6 ++++++ portugues/barata/Rogerio/rogerio.md | 6 ++++++ portugues/barata/Serginho/serginho.md | 6 ++++++ portugues/barata/baratadavizinha.md | 18 ++++++++++++++++++ 7 files changed, 54 insertions(+) create mode 100644 portugues/barata/Alexandre/alexandre.md create mode 100644 portugues/barata/Fernando/fernando.md create mode 100644 portugues/barata/LuisFernando/luisFernando.md create mode 100644 portugues/barata/Luizinho/luizinho.md create mode 100644 portugues/barata/Rogerio/rogerio.md create mode 100644 portugues/barata/Serginho/serginho.md create mode 100644 portugues/barata/baratadavizinha.md diff --git a/portugues/barata/Alexandre/alexandre.md b/portugues/barata/Alexandre/alexandre.md new file mode 100644 index 0000000000..f5957e3d1f --- /dev/null +++ b/portugues/barata/Alexandre/alexandre.md @@ -0,0 +1,6 @@ +Diz aí Alexandre o que "cê" vai fazer. +Eu vou comprar uma bombinha pra me defender. +Diz aí Alexandre o que "cê" vai fazer. +Eu vou comprar uma bombinha pra me defender. + +Ele vai dar .. \ No newline at end of file diff --git a/portugues/barata/Fernando/fernando.md b/portugues/barata/Fernando/fernando.md new file mode 100644 index 0000000000..65a890936e --- /dev/null +++ b/portugues/barata/Fernando/fernando.md @@ -0,0 +1,6 @@ +Diz aí Fernando o que "cê" vai fazer. +Eu vou comprar uma espora pra me defender. +Diz aí Fernando o que "cê" vai fazer. +Eu vou comprar uma espora pra me defender. + +Ele vai dar uma esporada na barata dela ( x4 ) \ No newline at end of file diff --git a/portugues/barata/LuisFernando/luisFernando.md b/portugues/barata/LuisFernando/luisFernando.md new file mode 100644 index 0000000000..b96bacb943 --- /dev/null +++ b/portugues/barata/LuisFernando/luisFernando.md @@ -0,0 +1,6 @@ +Diz aí Luis Fernando o que "cê" vai fazer. +Eu vou comprar um chicote pra me defender. +Diz aí Luis Fernando o que "cê" vai fazer. +Eu vou comprar um chicote pra me defender. + +Ele vai dar uma chicotada na barata dela. ( x4 ) \ No newline at end of file diff --git a/portugues/barata/Luizinho/luizinho.md b/portugues/barata/Luizinho/luizinho.md new file mode 100644 index 0000000000..5f6c5a5ddd --- /dev/null +++ b/portugues/barata/Luizinho/luizinho.md @@ -0,0 +1,6 @@ +Diz aí Luizinho o que "cê" vai fazer. +Eu vou comprar um inseticida pra me defender. +Diz aí Luizinho o que "cê" vai fazer. +Eu vou comprar um inseticida pra me defender. + +Ele vai dar uma tonteada na barata dela ( x4 ) diff --git a/portugues/barata/Rogerio/rogerio.md b/portugues/barata/Rogerio/rogerio.md new file mode 100644 index 0000000000..ceac903903 --- /dev/null +++ b/portugues/barata/Rogerio/rogerio.md @@ -0,0 +1,6 @@ +Diz aí Rogério o que "cê" vai fazer. +Eu vou comprar um pau pra me defender. +Diz aí Rogério o que "cê" vai fazer. +Eu vou comprar um pau pra me defender. + +Ele vai dar uma paulada na barata dela ( x4 ) \ No newline at end of file diff --git a/portugues/barata/Serginho/serginho.md b/portugues/barata/Serginho/serginho.md new file mode 100644 index 0000000000..b75bb15d81 --- /dev/null +++ b/portugues/barata/Serginho/serginho.md @@ -0,0 +1,6 @@ +Diz aí Serginho o que "cê" vai fazer. +Eu vou comprar uma furadeira pra me defender. +Diz aí Serginho o que "cê" vai fazer. +Eu vou comprar uma furadeira pra me defender. + +Ele vai dar uma furada na barata dela ( x4 ) \ No newline at end of file diff --git a/portugues/barata/baratadavizinha.md b/portugues/barata/baratadavizinha.md new file mode 100644 index 0000000000..bbc7ab1978 --- /dev/null +++ b/portugues/barata/baratadavizinha.md @@ -0,0 +1,18 @@ +Toda vez que eu chego em casa, +a barata da vizinha está na minha cama. +Toda vez que eu chego em casa, +a barata da vizinha está na minha cama. + +[Diz aí Luis Fernando o que "cê" vai fazer:](LuisFernando/luisFernando.md) + +[Diz aí Rogério o que "cê" vai fazer:](Rogerio/rogerio.md) + +[Diz aí Fernando o que "cê" vai fazer:](Fernando/fernando.md) + +[Diz aí Luizinho o que "cê" vai fazer:](Luizinho/luizinho.md) + +[Diz aí Serginho o que "cê" vai fazer:](Serginho/serginho.md) + +[Diz aí Alexandre o que "cê" vai fazer:](Alexandre/alexandre.md) + +E vc? O que "cê" vai fazer? \ No newline at end of file From b2c06937042ba4ea5457318c2bd928d17d131586 Mon Sep 17 00:00:00 2001 From: jens Date: Tue, 5 Jul 2016 22:49:39 +0200 Subject: [PATCH 3814/5486] fixed link --- german/Korallen/Hoehle/Unterwasserstation/Person/Person.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md index ecb46012da..c4c5b8a957 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md +++ b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md @@ -4,4 +4,4 @@ Er drückt Ihnen einen Stein in die Hand und sagt "Hier mein Junge, bring das in [Sie werfen ihm den Stein auf den Fuß und fragen ihn was zum Teufel er hier sucht](GespraechMitHoehlenmann/Gespraech.md) -[Ihnen ist das alles nicht mehr Geheuer in dieser Hoehle, mit dem Stein in der Hand springen Sie wieder ins Wasser und schwimmen aus der Höhle](../../Korallen.md) +[Ihnen ist das alles nicht mehr Geheuer in dieser Hoehle, mit dem Stein in der Hand springen Sie wieder ins Wasser und schwimmen aus der Höhle](../../../Korallen.md) From fec1d4dc9d7399d29d0be05f336d461fa3edd74c Mon Sep 17 00:00:00 2001 From: Priscilla Beaudet Date: Tue, 5 Jul 2016 16:53:16 -0400 Subject: [PATCH 3815/5486] Fix initial path --- portugues/colaborando.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index a03440c019..2a9de9cb1e 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -27,7 +27,7 @@ Você: [Vai ao banheiro e pega sua toalha](toalha/nave.md) -[Pergunta pro Luis Fernando](barata/chicotada.md) +[Toda vez que eu chego em casa...](barata/baratadavizinha.md) Na verdade, isto tudo é a sua imaginação. Você vive em 1991 e usa MS-DOS 5.0 e um modem de 9600 baud. @@ -54,4 +54,3 @@ BR BR BR Hue hue hue!!!! [Você vira um jogador...](futebol/futebol.md) -[Eu vou comprar um chicote pra me defender]() \ No newline at end of file From 57d7a8505ac2ca9edb7ebba2e45bcb742afbc0e9 Mon Sep 17 00:00:00 2001 From: jens Date: Tue, 5 Jul 2016 22:59:23 +0200 Subject: [PATCH 3816/5486] line breaks --- .../Person/GespraechMitHoehlenmann/Gespraech.md | 7 +++++-- german/Korallen/Hoehle/Unterwasserstation/Person/Person.md | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/german/Korallen/Hoehle/Unterwasserstation/Person/GespraechMitHoehlenmann/Gespraech.md b/german/Korallen/Hoehle/Unterwasserstation/Person/GespraechMitHoehlenmann/Gespraech.md index 1ca5d6bd3e..41e8ff1a44 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/Person/GespraechMitHoehlenmann/Gespraech.md +++ b/german/Korallen/Hoehle/Unterwasserstation/Person/GespraechMitHoehlenmann/Gespraech.md @@ -1,2 +1,5 @@ -Der Mann jault laut auf und geht auf sie los, in letzter Sekunde entsinnen Sie sich Ihrer fast vergessenen Judokenntnisse und legen ihn mit einem gekonnten Wurf aufs Kreuz. -Im Wrgegriff verrt Ihnen der Mann laut nach Luft japsend dass sich in dem Stein ein Hohlraum mit geheimen Dokumenten befindet. \ No newline at end of file +Der Mann jault laut auf und geht auf sie los, +in letzter Sekunde entsinnen Sie sich Ihrer fast vergessenen Judokenntnisse +und legen ihn mit einem gekonnten Wurf aufs Kreuz. +Im Wrgegriff verrt Ihnen der Mann laut nach Luft japsend dass sich in dem Stein + ein Hohlraum mit geheimen Dokumenten befindet. \ No newline at end of file diff --git a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md index c4c5b8a957..fab9901bef 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md +++ b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md @@ -4,4 +4,5 @@ Er drückt Ihnen einen Stein in die Hand und sagt "Hier mein Junge, bring das in [Sie werfen ihm den Stein auf den Fuß und fragen ihn was zum Teufel er hier sucht](GespraechMitHoehlenmann/Gespraech.md) -[Ihnen ist das alles nicht mehr Geheuer in dieser Hoehle, mit dem Stein in der Hand springen Sie wieder ins Wasser und schwimmen aus der Höhle](../../../Korallen.md) +[Ihnen ist das alles nicht mehr Geheuer in dieser Hoehle, mit dem Stein in der Hand springen Sie wieder ins Wasser + und schwimmen aus der Höhle](../../../Korallen.md) From abce5c9c6f330623c265b577ba3a7a72567086ba Mon Sep 17 00:00:00 2001 From: jakkritpromma Date: Wed, 6 Jul 2016 09:43:06 +0700 Subject: [PATCH 3817/5486] Modify the lines of jarvis.md --- english/ironman/jarvis/jarvis.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/ironman/jarvis/jarvis.md b/english/ironman/jarvis/jarvis.md index 4a39dbdb85..b54d942843 100644 --- a/english/ironman/jarvis/jarvis.md +++ b/english/ironman/jarvis/jarvis.md @@ -1 +1,4 @@ -Just A Rather Very Intelligent System, or J.A.R.V.I.S. is Tony Stark's artificially intelligent computer. It is programmed to speak with a male voice in a British accent. J.A.R.V.I.S. is now merged with Vision [Source](http://marvel-movies.wikia.com/wiki/J.A.R.V.I.S.). \ No newline at end of file +Just A Rather Very Intelligent System, or J.A.R.V.I.S. +It is Tony Stark's artificially intelligent computer. +It is programmed to speak with a male voice in a British accent. +J.A.R.V.I.S. is now merged with Vision [Source](http://marvel-movies.wikia.com/wiki/J.A.R.V.I.S.). \ No newline at end of file From 7aaf621a23abe400166271c7bfaa58ba66d4cead Mon Sep 17 00:00:00 2001 From: "John Q. Doe" Date: Tue, 5 Jul 2016 22:14:14 -0500 Subject: [PATCH 3818/5486] Fixed it to meet bot's requirements for pull --- japanese/mattake/mattake.md | 5 ++++- japanese/pengin/pengin.md | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 japanese/pengin/pengin.md diff --git a/japanese/mattake/mattake.md b/japanese/mattake/mattake.md index b1f5d61485..17f66a2f5a 100644 --- a/japanese/mattake/mattake.md +++ b/japanese/mattake/mattake.md @@ -1,8 +1,11 @@ 松茸は思っているより小さかった。 +と思った途端に、めっちゃでか〜いペンギンが +森の中から出てきた。急に、ペンギンは「喧嘩するほど、テッ、安藤さんがテッ！」 +と言い出した。 あなたは: [松茸カツ丼](../katsudon/katsudon.md)を注文しにおもむろにiPhoneを取り出し、ボブ他５０名を予約できる店を検索した。 - +[「本当は、人間なんだろう」とペンギンに言う](../pengin/pengin.md) \ No newline at end of file diff --git a/japanese/pengin/pengin.md b/japanese/pengin/pengin.md new file mode 100644 index 0000000000..701dd50f0f --- /dev/null +++ b/japanese/pengin/pengin.md @@ -0,0 +1,11 @@ +「本当は、人間なんだろう」とペンギンに言ったら、 +「俺？俺？俺ペンギンだよ、ペンギン。人間なわけないじゃん」 +と人間みたいなペンギンが説明した。緊張に笑いながら、 +ペンギンが森に逃げ込んだ。 + +あなたはやっぱり: + + +[松茸カツ丼](../katsudon/katsudon.md)を注文しにおもむろにiPhoneを取り出し、ボブ他５０名を予約できる店を検索した。 + + From 422ca030802a20e25b699f18f0de032144e9f0cf Mon Sep 17 00:00:00 2001 From: "John Q. Doe" Date: Tue, 5 Jul 2016 22:18:12 -0500 Subject: [PATCH 3819/5486] Fixed accidental deletions --- japanese/mattake/mattake.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/japanese/mattake/mattake.md b/japanese/mattake/mattake.md index 17f66a2f5a..1b91e46dc0 100644 --- a/japanese/mattake/mattake.md +++ b/japanese/mattake/mattake.md @@ -8,4 +8,5 @@ [松茸カツ丼](../katsudon/katsudon.md)を注文しにおもむろにiPhoneを取り出し、ボブ他５０名を予約できる店を検索した。 -[「本当は、人間なんだろう」とペンギンに言う](../pengin/pengin.md) \ No newline at end of file + +[「本当は、人間なんだろう」とペンギンに言う](../pengin/pengin.md) From c6f1c6397a0e0421108bfab209cd3ef7c69ab836 Mon Sep 17 00:00:00 2001 From: kartik Date: Wed, 6 Jul 2016 12:32:40 +0530 Subject: [PATCH 3820/5486] Extend story - english/magic/magic.md --- english/magic/magic.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/magic/magic.md b/english/magic/magic.md index 8436288c5e..ca0931d7f3 100644 --- a/english/magic/magic.md +++ b/english/magic/magic.md @@ -13,3 +13,6 @@ With my green light saber, I'll deal with this sithlord madness! Continue on to the port and get on the big ship. +Valar morghulis +Valar dohaeris + From 01a85cd0fb152e363d001527408f4d38b6937d0d Mon Sep 17 00:00:00 2001 From: Jimmy Q Date: Wed, 6 Jul 2016 20:06:01 +0800 Subject: [PATCH 3821/5486] add one line to Chinese/beauty/beauty.md --- Chinese/beauty/beauty.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Chinese/beauty/beauty.md b/Chinese/beauty/beauty.md index d90da6aaad..a065ec0ae9 100644 --- a/Chinese/beauty/beauty.md +++ b/Chinese/beauty/beauty.md @@ -1 +1,3 @@ 木心老爷子说过，[美貌](https://www.douban.com/group/topic/12641976/)是一种表情。^_^ + +性感是一种邀请。 \ No newline at end of file From 4f2e1c7d6f91fcdbf12b4865bed29d2ca7f33a5a Mon Sep 17 00:00:00 2001 From: David Granqvist Date: Wed, 6 Jul 2016 23:26:05 +0200 Subject: [PATCH 3822/5486] added midsommar-link --- swedish/midsommar/midsommar.md | 1 + swedish/start.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/swedish/midsommar/midsommar.md b/swedish/midsommar/midsommar.md index 7571e98da5..4d7faea3fc 100644 --- a/swedish/midsommar/midsommar.md +++ b/swedish/midsommar/midsommar.md @@ -1,3 +1,4 @@ Idag är midsommar! Du har inte köpt nån öl eller vin eller SNAPS och Systemet är stängt. + Vad ska göra de små grodorna? diff --git a/swedish/start.md b/swedish/start.md index f49ebaacd2..c2acd43374 100644 --- a/swedish/start.md +++ b/swedish/start.md @@ -13,4 +13,6 @@ Vad nu, då? [Äter marshmallowen.](marshmallowen/marshmallowen.md) -[Somna om](somna-om/somna-om.md) \ No newline at end of file +[Somna om](somna-om/somna-om.md) + +[midsommar] (midsommar/midsommar.md) \ No newline at end of file From 69673fceb1652c595e3ca2f040151fed48d08ec3 Mon Sep 17 00:00:00 2001 From: Marat Maksumov Date: Thu, 7 Jul 2016 01:57:53 +0300 Subject: [PATCH 3823/5486] Making story vodka2 --- russian/gusli/vodka/vodka.md | 4 +++- russian/gusli/vodka/vodka2/vodka2.md | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 russian/gusli/vodka/vodka2/vodka2.md diff --git a/russian/gusli/vodka/vodka.md b/russian/gusli/vodka/vodka.md index 7b7f6683fa..29b9bda913 100644 --- a/russian/gusli/vodka/vodka.md +++ b/russian/gusli/vodka/vodka.md @@ -5,4 +5,6 @@ После успешного превращения зефира в шпротину вас уже не остановить. Вскоре на столе появляется остальная банка шпрот, банка кильки в томатном соусе, соленые огурчики, маринованый хрен, краюха черного хлеба и тд и тп. -Вдоволь поев и выпив остатки самогона, вы решаете пойти за второй... \ No newline at end of file +Вдоволь поев и выпив остатки самогона, вы решаете пойти за второй... + +[Пойти за второй](vodka2/vodka2.md) \ No newline at end of file diff --git a/russian/gusli/vodka/vodka2/vodka2.md b/russian/gusli/vodka/vodka2/vodka2.md new file mode 100644 index 0000000000..b38a9df462 --- /dev/null +++ b/russian/gusli/vodka/vodka2/vodka2.md @@ -0,0 +1,2 @@ +А собственно, зачем идти за второй? Отработанными движениями отрываем от стены очередной кусок зефира и придаем +ему форму Белуги. Новый опыт не пропьешь - напиток получился мирового класса... \ No newline at end of file From 2c64cb43f9c3b9944cde358a16e254818050ee23 Mon Sep 17 00:00:00 2001 From: SANDY Date: Wed, 6 Jul 2016 22:14:23 -0400 Subject: [PATCH 3824/5486] Add items related to developing a yoga habit. --- english/yoga/habit/yoga-habit.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/yoga/habit/yoga-habit.md b/english/yoga/habit/yoga-habit.md index ca6c7250f2..c8b2254751 100644 --- a/english/yoga/habit/yoga-habit.md +++ b/english/yoga/habit/yoga-habit.md @@ -4,3 +4,5 @@ to make it easier to get going: 1. Just do it! 2. Get a yoga partner 3. If lethargic, just start off with 1 minute of breathing. +4. Commit to only 10-15 minutes of yoga a day- this is doable for most people! +5. Use YouTube yoga videos if you can't get out of the house for a class. From 6ac94560d1e6434753524524bae29cf8b0eaf1d7 Mon Sep 17 00:00:00 2001 From: Cosmic Funky Pollo Date: Thu, 7 Jul 2016 11:27:25 +0200 Subject: [PATCH 3825/5486] Added a new option to bear and added the vomit story --- english/bear/bear.md | 6 +++++- english/vomit/vomit.md | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/vomit/vomit.md diff --git a/english/bear/bear.md b/english/bear/bear.md index 2dab08de8d..c318cbb3ac 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -2,4 +2,8 @@ Stella atroir. Taiwan bear. Ice cold. If warm, the results could be unbearable. Bear in mind, the grizzly taste. -You are now drunk. You stumble over to the nearest cutie and ask, "Hey baby, what's ursine?" \ No newline at end of file +You are now drunk. You stumble over to the nearest cutie and ask, "Hey baby, what's ursine?" + +When she slaps you in the face... + +[You vomit on top of her](english/vomit/vomit.md) \ No newline at end of file diff --git a/english/vomit/vomit.md b/english/vomit/vomit.md new file mode 100644 index 0000000000..4b79b90602 --- /dev/null +++ b/english/vomit/vomit.md @@ -0,0 +1 @@ +Your dreams of vomiting on top of someone have been finally accomplished. Let's get cray! \ No newline at end of file From 3f11440faf90fd6a33162df1d9b3cc31163aafa3 Mon Sep 17 00:00:00 2001 From: Cosmic Funky Pollo Date: Thu, 7 Jul 2016 11:35:50 +0200 Subject: [PATCH 3826/5486] Fix link in english/bear/bear.md --- english/bear/bear.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bear/bear.md b/english/bear/bear.md index c318cbb3ac..55aafa8e15 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -6,4 +6,4 @@ You are now drunk. You stumble over to the nearest cutie and ask, "Hey baby, wha When she slaps you in the face... -[You vomit on top of her](english/vomit/vomit.md) \ No newline at end of file +[You vomit on top of her](../vomit/vomit.md) \ No newline at end of file From f0eab7b197355b41218b35e72f01a93ede6b2424 Mon Sep 17 00:00:00 2001 From: Pritam Date: Thu, 7 Jul 2016 22:54:24 +0530 Subject: [PATCH 3827/5486] Add Google url to bangla --- bangla/bangla-portals.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bangla/bangla-portals.md b/bangla/bangla-portals.md index 508761d060..c89dde0267 100644 --- a/bangla/bangla-portals.md +++ b/bangla/bangla-portals.md @@ -3,3 +3,5 @@ http://www.pipilika.com/ http://www.somewhereinblog.net/ http://www.priyo.com/ + +http://www.google.co.in/ \ No newline at end of file From fc107c61ba9650cfc636e0a19a1480bfe9ca62f3 Mon Sep 17 00:00:00 2001 From: Hai Brenner Date: Thu, 7 Jul 2016 20:26:57 +0300 Subject: [PATCH 3828/5486] Add continuation to the adventure once we spot the glowing eyes underneath the water --- english/mysterious-pool/glowing-eyes/caught_up/plants.md | 3 +++ english/mysterious-pool/glowing-eyes/cave/blind.md | 4 ++++ english/mysterious-pool/glowing-eyes/glowing-eyes.md | 9 ++++++++- english/mysterious-pool/glowing-eyes/tuna/tuna.md | 3 +++ 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 english/mysterious-pool/glowing-eyes/caught_up/plants.md create mode 100644 english/mysterious-pool/glowing-eyes/cave/blind.md create mode 100644 english/mysterious-pool/glowing-eyes/tuna/tuna.md diff --git a/english/mysterious-pool/glowing-eyes/caught_up/plants.md b/english/mysterious-pool/glowing-eyes/caught_up/plants.md new file mode 100644 index 0000000000..6b4c0ed276 --- /dev/null +++ b/english/mysterious-pool/glowing-eyes/caught_up/plants.md @@ -0,0 +1,3 @@ +You try to swim back up to regain breath, +but then you notice that your leg is caught up by some water plants pulling you back in! Oh no.... + diff --git a/english/mysterious-pool/glowing-eyes/cave/blind.md b/english/mysterious-pool/glowing-eyes/cave/blind.md new file mode 100644 index 0000000000..4b9e7ff6a4 --- /dev/null +++ b/english/mysterious-pool/glowing-eyes/cave/blind.md @@ -0,0 +1,4 @@ +You swim into the cave. +A frightened squid pops up from one of the rocks of the cave and shoots ink to your eyes! +You are now short of breath AND cannot see a thing... + diff --git a/english/mysterious-pool/glowing-eyes/glowing-eyes.md b/english/mysterious-pool/glowing-eyes/glowing-eyes.md index 8940bacdc2..705ee4ba35 100644 --- a/english/mysterious-pool/glowing-eyes/glowing-eyes.md +++ b/english/mysterious-pool/glowing-eyes/glowing-eyes.md @@ -1,2 +1,9 @@ The giant, glowing yellow eyes slowly move towards you! Could it be a friend or foe? -Running low on air, you decide to... \ No newline at end of file +Running low on air, you decide to... + +[swim towards the eyes](tuna/tuna.md) + +[swim back up for air](caught_up/plants.md) + +[swim to hide in a nearby cave](cave/blind.md) + diff --git a/english/mysterious-pool/glowing-eyes/tuna/tuna.md b/english/mysterious-pool/glowing-eyes/tuna/tuna.md new file mode 100644 index 0000000000..1156505203 --- /dev/null +++ b/english/mysterious-pool/glowing-eyes/tuna/tuna.md @@ -0,0 +1,3 @@ +The eyes approach you and you are amazed to discover that they belong to a +miraculous giant blue tuna with sharp teeth! + From 7bb4b3a9b1549c8a2faae70e61a2033d374d7d73 Mon Sep 17 00:00:00 2001 From: Amir Eskandari Date: Thu, 7 Jul 2016 10:48:13 -0700 Subject: [PATCH 3829/5486] Trump story enhancement --- english/vote-the-president/trump/trump.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/vote-the-president/trump/trump.md b/english/vote-the-president/trump/trump.md index f4e019ac82..b6e2cec4af 100644 --- a/english/vote-the-president/trump/trump.md +++ b/english/vote-the-president/trump/trump.md @@ -6,6 +6,8 @@ Are you ready for [WWIII](./WWIII/WWIII.md)? Know about [Latest hit from Trump Floyd "The Wall"](./trump-floyd-the-wall/thewall.md) ! +You must have a tiny.. pair of [hands](https://www.reddit.com/r/gifs/comments/48xv6z/tiny_hands_trump_oc/). + From b207f175536051fe9f9ee2044ca63fe0fe0344b7 Mon Sep 17 00:00:00 2001 From: Amir Eskandari Date: Thu, 7 Jul 2016 10:59:08 -0700 Subject: [PATCH 3830/5486] Remove link. --- english/vote-the-president/trump/trump.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/vote-the-president/trump/trump.md b/english/vote-the-president/trump/trump.md index b6e2cec4af..ae985aaeb0 100644 --- a/english/vote-the-president/trump/trump.md +++ b/english/vote-the-president/trump/trump.md @@ -6,7 +6,7 @@ Are you ready for [WWIII](./WWIII/WWIII.md)? Know about [Latest hit from Trump Floyd "The Wall"](./trump-floyd-the-wall/thewall.md) ! -You must have a tiny.. pair of [hands](https://www.reddit.com/r/gifs/comments/48xv6z/tiny_hands_trump_oc/). +You must have a tiny.. pair of hands. From 34a7463e622dccab4ae2ce2a94cd2d09414908a8 Mon Sep 17 00:00:00 2001 From: Mfgray Date: Thu, 7 Jul 2016 12:37:10 -0700 Subject: [PATCH 3831/5486] Add choices to pockets and context for them --- english/forest/pockets/pockets.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/english/forest/pockets/pockets.md b/english/forest/pockets/pockets.md index ff366cf51b..285ab2531d 100644 --- a/english/forest/pockets/pockets.md +++ b/english/forest/pockets/pockets.md @@ -19,3 +19,13 @@ towards the helicopter, and see stewardesses approach you with champagne and refreshments, you think to yourself: "Phew. That could have gone very differently!" + +The first stewardess hands you a familiar looking iphone 5se as she says it's for your. The phone is ringing, but it's not someone calling, the alarm clock is going off. But how did she have your own phone, the one you were missing from your back pocket. And why won't the alarm turn off. You keep pushing snooze and snooze but it keeps ringing. And your leg starts hurting. + +You wake up sprawled out in the leaves and dirt. Ugghhh the helicopter rescue was too good to be true. The dire situation you are in comes back to you, but seems even more hopeless after the dreamed rescue. Your realize the stabbing pain in your leg had made you pass out, but it's only a dull ache now. + +You hear your iphone alarm going off in the direction of those trees over there. You didn't dream that part, but it looks dark over there. + +[You drag yourself towards the sound of your phone](../drag/drag.md) + +[You check your pockets](pocketsagain/pocketsagain.md) like you meant to before passing out From de6c3493517a8944006bd040d9577b93d9b8683e Mon Sep 17 00:00:00 2001 From: Mfgray Date: Thu, 7 Jul 2016 12:38:27 -0700 Subject: [PATCH 3832/5486] Add new file with story for check pocketsagain --- english/forest/pockets/pocketsagain/pocketsagain.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/forest/pockets/pocketsagain/pocketsagain.md diff --git a/english/forest/pockets/pocketsagain/pocketsagain.md b/english/forest/pockets/pocketsagain/pocketsagain.md new file mode 100644 index 0000000000..c4f94e2d02 --- /dev/null +++ b/english/forest/pockets/pocketsagain/pocketsagain.md @@ -0,0 +1,3 @@ +You ignore the ringing phone and empty out all the pockets of your cargo pants into a pile. Your wallet is gone, having fallen in the woods like your phone. Your pile of possessions includes some food, duct tape, a pocket knife, and a small box wrapped up like a present. It is the present your best friend handed you at the airport as they dropped you off because tomorrow is your birthday. + +There's a deep growling sound coming from the woods in the direction of your phone. Is that a bear growl? Wow, good thing you didn't go search for it. From ca5aebfc60d1b8dc198e8d216ad8090d9cbb01b3 Mon Sep 17 00:00:00 2001 From: Mfgray Date: Thu, 7 Jul 2016 12:45:09 -0700 Subject: [PATCH 3833/5486] Fixed typo --- english/forest/pockets/pockets.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/forest/pockets/pockets.md b/english/forest/pockets/pockets.md index 285ab2531d..522d1d1469 100644 --- a/english/forest/pockets/pockets.md +++ b/english/forest/pockets/pockets.md @@ -20,7 +20,7 @@ refreshments, you think to yourself: "Phew. That could have gone very differently!" -The first stewardess hands you a familiar looking iphone 5se as she says it's for your. The phone is ringing, but it's not someone calling, the alarm clock is going off. But how did she have your own phone, the one you were missing from your back pocket. And why won't the alarm turn off. You keep pushing snooze and snooze but it keeps ringing. And your leg starts hurting. +The first stewardess hands you a familiar looking iphone 5se as she says it's for you. The phone is ringing, but it's not someone calling, the alarm clock is going off. But how did she have your own phone, the one you were missing from your back pocket. And why won't the alarm turn off. You keep pushing snooze and snooze but it keeps ringing. And your leg starts hurting. You wake up sprawled out in the leaves and dirt. Ugghhh the helicopter rescue was too good to be true. The dire situation you are in comes back to you, but seems even more hopeless after the dreamed rescue. Your realize the stabbing pain in your leg had made you pass out, but it's only a dull ache now. @@ -28,4 +28,4 @@ You hear your iphone alarm going off in the direction of those trees over there. [You drag yourself towards the sound of your phone](../drag/drag.md) -[You check your pockets](pocketsagain/pocketsagain.md) like you meant to before passing out +[You check your pockets like you meant to before passing out](pocketsagain/pocketsagain.md) From ea1682e43bdd0bfaf5b41a10214267aae91bb610 Mon Sep 17 00:00:00 2001 From: Mfgray Date: Thu, 7 Jul 2016 13:04:41 -0700 Subject: [PATCH 3834/5486] fix line length: shorten --- english/forest/pockets/pocketsagain/pocketsagain.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/forest/pockets/pocketsagain/pocketsagain.md b/english/forest/pockets/pocketsagain/pocketsagain.md index c4f94e2d02..e2d7f6b819 100644 --- a/english/forest/pockets/pocketsagain/pocketsagain.md +++ b/english/forest/pockets/pocketsagain/pocketsagain.md @@ -1,3 +1,5 @@ -You ignore the ringing phone and empty out all the pockets of your cargo pants into a pile. Your wallet is gone, having fallen in the woods like your phone. Your pile of possessions includes some food, duct tape, a pocket knife, and a small box wrapped up like a present. It is the present your best friend handed you at the airport as they dropped you off because tomorrow is your birthday. +You ignore the ringing phone and empty out all the pockets of your cargo pants into a pile. Your wallet is gone, having fallen in the woods like your phone. + + Your pile of possessions includes some food, duct tape, a pocket knife, and a small box wrapped up like a present. It is the present your best friend handed you at the airport as they dropped you off because tomorrow is your birthday. There's a deep growling sound coming from the woods in the direction of your phone. Is that a bear growl? Wow, good thing you didn't go search for it. From 95668f26d3d5fb2ad9c6fd183aecd193d1d1b1dc Mon Sep 17 00:00:00 2001 From: Mfgray Date: Thu, 7 Jul 2016 13:07:45 -0700 Subject: [PATCH 3835/5486] fix line length --- english/forest/pockets/pockets.md | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/english/forest/pockets/pockets.md b/english/forest/pockets/pockets.md index 522d1d1469..45669da431 100644 --- a/english/forest/pockets/pockets.md +++ b/english/forest/pockets/pockets.md @@ -20,11 +20,19 @@ refreshments, you think to yourself: "Phew. That could have gone very differently!" -The first stewardess hands you a familiar looking iphone 5se as she says it's for you. The phone is ringing, but it's not someone calling, the alarm clock is going off. But how did she have your own phone, the one you were missing from your back pocket. And why won't the alarm turn off. You keep pushing snooze and snooze but it keeps ringing. And your leg starts hurting. - -You wake up sprawled out in the leaves and dirt. Ugghhh the helicopter rescue was too good to be true. The dire situation you are in comes back to you, but seems even more hopeless after the dreamed rescue. Your realize the stabbing pain in your leg had made you pass out, but it's only a dull ache now. - -You hear your iphone alarm going off in the direction of those trees over there. You didn't dream that part, but it looks dark over there. +The first stewardess hands you a familiar looking iphone 5se as she says it's +for you. The phone is ringing, but it's not someone calling, the alarm clock is +going off. But how did she have your own phone, the one you were missing from +your back pocket. And why won't the alarm turn off. You keep pushing snooze and +snooze but it keeps ringing. And your leg starts hurting. + +You wake up sprawled out in the leaves and dirt. Ugghhh the helicopter rescue +was too good to be true. The dire situation you are in comes back to you, but +seems even more hopeless after the dreamed rescue. Your realize the stabbing +pain in your leg had made you pass out, but it's only a dull ache now. + +You hear your iphone alarm going off in the direction of those trees over +there. You didn't dream that part, but it looks dark over there. [You drag yourself towards the sound of your phone](../drag/drag.md) From 62608f8a0168aaf31d1bdd1a8e01d0aefabf83cf Mon Sep 17 00:00:00 2001 From: Mfgray Date: Thu, 7 Jul 2016 13:08:25 -0700 Subject: [PATCH 3836/5486] fix line length for real --- english/forest/pockets/pocketsagain/pocketsagain.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/english/forest/pockets/pocketsagain/pocketsagain.md b/english/forest/pockets/pocketsagain/pocketsagain.md index e2d7f6b819..a33da68253 100644 --- a/english/forest/pockets/pocketsagain/pocketsagain.md +++ b/english/forest/pockets/pocketsagain/pocketsagain.md @@ -1,5 +1,9 @@ -You ignore the ringing phone and empty out all the pockets of your cargo pants into a pile. Your wallet is gone, having fallen in the woods like your phone. +You ignore the ringing phone and empty out all the pockets of your cargo pants +into a pile. Your wallet is gone, having fallen in the woods like your phone. - Your pile of possessions includes some food, duct tape, a pocket knife, and a small box wrapped up like a present. It is the present your best friend handed you at the airport as they dropped you off because tomorrow is your birthday. + Your pile of possessions includes some food, duct tape, a pocket knife, and a + small box wrapped up like a present. It is the present your best friend handed + you at the airport as they dropped you off because tomorrow is your birthday. -There's a deep growling sound coming from the woods in the direction of your phone. Is that a bear growl? Wow, good thing you didn't go search for it. +There's a deep growling sound coming from the woods in the direction of your +phone. Is that a bear growl? Wow, good thing you didn't go search for it. From 0be79873348e8a00079b36d75315304eae3827a4 Mon Sep 17 00:00:00 2001 From: Miguel Salas Date: Thu, 7 Jul 2016 23:11:59 -0400 Subject: [PATCH 3837/5486] rogando: oyo una voz --- .../oyo_una_voz/con_el_mazo_dando/con_el_mazo_dando.md | 1 + espanol/rogando/oyo_una_voz/oyo_una_voz.md | 1 + espanol/rogando/rogando.md | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 espanol/rogando/oyo_una_voz/con_el_mazo_dando/con_el_mazo_dando.md create mode 100644 espanol/rogando/oyo_una_voz/oyo_una_voz.md diff --git a/espanol/rogando/oyo_una_voz/con_el_mazo_dando/con_el_mazo_dando.md b/espanol/rogando/oyo_una_voz/con_el_mazo_dando/con_el_mazo_dando.md new file mode 100644 index 0000000000..ec0f1b867a --- /dev/null +++ b/espanol/rogando/oyo_una_voz/con_el_mazo_dando/con_el_mazo_dando.md @@ -0,0 +1 @@ +Y alzo su cara para ver quien había dicho eso, y entonces vio que... diff --git a/espanol/rogando/oyo_una_voz/oyo_una_voz.md b/espanol/rogando/oyo_una_voz/oyo_una_voz.md new file mode 100644 index 0000000000..afa1d82e56 --- /dev/null +++ b/espanol/rogando/oyo_una_voz/oyo_una_voz.md @@ -0,0 +1 @@ +['A dios rogando y con el mazo dando'](con_el_mazo_dando/con_el_mazo_dando) diff --git a/espanol/rogando/rogando.md b/espanol/rogando/rogando.md index 9a869a6b22..c35e4d191d 100644 --- a/espanol/rogando/rogando.md +++ b/espanol/rogando/rogando.md @@ -1 +1,3 @@ -Dej caer su cayado en el suelo, se arrodill junto a Betito y or al cielo para que Dios mande un ejrcito de ngeles. \ No newline at end of file +Dej� caer su cayado en el suelo, se arrodill� junto a Betito y or� al cielo para que Dios mande un ej�rcito de �ngeles. + +[Oyó entonces una voz que dijo:](oyo-una-voz/oyo_una_voz) From e7650d09980f4244d2f6ba52437412ef8201b79a Mon Sep 17 00:00:00 2001 From: Miguel Salas Date: Thu, 7 Jul 2016 23:19:34 -0400 Subject: [PATCH 3838/5486] =?UTF-8?q?=20rogando:=20oyo=20una=20voz-correcc?= =?UTF-8?q?i=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/rogando/oyo_una_voz/oyo_una_voz.md | 2 +- espanol/rogando/rogando.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/espanol/rogando/oyo_una_voz/oyo_una_voz.md b/espanol/rogando/oyo_una_voz/oyo_una_voz.md index afa1d82e56..22ca681623 100644 --- a/espanol/rogando/oyo_una_voz/oyo_una_voz.md +++ b/espanol/rogando/oyo_una_voz/oyo_una_voz.md @@ -1 +1 @@ -['A dios rogando y con el mazo dando'](con_el_mazo_dando/con_el_mazo_dando) +['A dios rogando y con el mazo dando'](con_el_mazo_dando/con_el_mazo_dando.md) diff --git a/espanol/rogando/rogando.md b/espanol/rogando/rogando.md index c35e4d191d..ff99266aae 100644 --- a/espanol/rogando/rogando.md +++ b/espanol/rogando/rogando.md @@ -1,3 +1,3 @@ Dej� caer su cayado en el suelo, se arrodill� junto a Betito y or� al cielo para que Dios mande un ej�rcito de �ngeles. -[Oyó entonces una voz que dijo:](oyo-una-voz/oyo_una_voz) +[Oyó entonces una voz que dijo:](oyo-una-voz/oyo_una_voz.md) From 4b0f7fd1eab7d27d0db6955b679020197fdeee69 Mon Sep 17 00:00:00 2001 From: Miguel Salas Date: Thu, 7 Jul 2016 23:31:53 -0400 Subject: [PATCH 3839/5486] =?UTF-8?q?=20rogando:=20oyo=20una=20voz-correcc?= =?UTF-8?q?i=C3=B3n2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/rogando/rogando.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/rogando/rogando.md b/espanol/rogando/rogando.md index ff99266aae..87bcf7500b 100644 --- a/espanol/rogando/rogando.md +++ b/espanol/rogando/rogando.md @@ -1,3 +1,3 @@ Dej� caer su cayado en el suelo, se arrodill� junto a Betito y or� al cielo para que Dios mande un ej�rcito de �ngeles. -[Oyó entonces una voz que dijo:](oyo-una-voz/oyo_una_voz.md) +[Oyó entonces una voz que dijo:](oyo_una_voz/oyo_una_voz.md) From 49768bfd3168749ce818048e9d4c146424e21824 Mon Sep 17 00:00:00 2001 From: MiguelSalas1987 Date: Thu, 7 Jul 2016 23:34:47 -0400 Subject: [PATCH 3840/5486] =?UTF-8?q?error=20de=20ortograf=C3=ADa=20correg?= =?UTF-8?q?ido?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rogando/oyo_una_voz/con_el_mazo_dando/con_el_mazo_dando.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/rogando/oyo_una_voz/con_el_mazo_dando/con_el_mazo_dando.md b/espanol/rogando/oyo_una_voz/con_el_mazo_dando/con_el_mazo_dando.md index ec0f1b867a..e947d26925 100644 --- a/espanol/rogando/oyo_una_voz/con_el_mazo_dando/con_el_mazo_dando.md +++ b/espanol/rogando/oyo_una_voz/con_el_mazo_dando/con_el_mazo_dando.md @@ -1 +1 @@ -Y alzo su cara para ver quien había dicho eso, y entonces vio que... +Y alzo su cara para ver quién había dicho eso, y entonces vió que... From 1089796a925734c461e46d38f9f4f078889e9dde Mon Sep 17 00:00:00 2001 From: suhas subramanyam Date: Fri, 8 Jul 2016 10:26:46 +0530 Subject: [PATCH 3841/5486] Add zoo story --- english/marshmallow.md | 4 +++- english/zoo/zoo.md | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 english/zoo/zoo.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 27f1f43b31..eaacdb4f66 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1024,4 +1024,6 @@ You wake up in the morning and your [computer is looking out of the window](comp Instragram, a great place to spend time. [Visit my profile](https://www.instagram.com/coding.imagination/) -You've been charged with treason against the King. You wake up in [prison](prison/prison.md). \ No newline at end of file +You've been charged with treason against the King. You wake up in [prison](prison/prison.md). + +My visit to the [zoo](zoo/zoo.md). diff --git a/english/zoo/zoo.md b/english/zoo/zoo.md new file mode 100644 index 0000000000..64e3150713 --- /dev/null +++ b/english/zoo/zoo.md @@ -0,0 +1,2 @@ +Recently I visited a zoo in my hometown. It was an awesome experience to be part of the +nature. I saw a lot of tigers, elephants, deer and a whole lot of other [animals](animal/animal.md) From c6eff3aa126e1b4d4e7220f9705786f8ec2ce2a7 Mon Sep 17 00:00:00 2001 From: suhas subramanyam Date: Fri, 8 Jul 2016 10:33:42 +0530 Subject: [PATCH 3842/5486] Fix issue with relative link for animal --- english/zoo/zoo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/zoo/zoo.md b/english/zoo/zoo.md index 64e3150713..73354a9f5d 100644 --- a/english/zoo/zoo.md +++ b/english/zoo/zoo.md @@ -1,2 +1,2 @@ Recently I visited a zoo in my hometown. It was an awesome experience to be part of the -nature. I saw a lot of tigers, elephants, deer and a whole lot of other [animals](animal/animal.md) +nature. I saw a lot of tigers, elephants, deer and a whole lot of other [animals](../animal/animal.md) From 400f32b2a067bc8f640ddbc92b0213862808fd50 Mon Sep 17 00:00:00 2001 From: Kristin Mihara Date: Thu, 7 Jul 2016 22:15:58 -0700 Subject: [PATCH 3843/5486] Add line about Ice Cream Sea --- english/candyland/rainbow/rainbow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/candyland/rainbow/rainbow.md b/english/candyland/rainbow/rainbow.md index e42f9bc2f7..a9394109da 100644 --- a/english/candyland/rainbow/rainbow.md +++ b/english/candyland/rainbow/rainbow.md @@ -17,4 +17,6 @@ You remember your past and feel ashamed you know what those taste like. You begin to cry uncontrollably. +But then you pick yourself up, and realize that in the distance is Ice Cream Sea! + From e9e7b9865e6771585837b934dcda586aea9c599b Mon Sep 17 00:00:00 2001 From: Samrudh Shetty Date: Fri, 8 Jul 2016 11:12:34 +0530 Subject: [PATCH 3844/5486] Added time travel thingy? --- english/marshmallow.md | 2 ++ english/time-travel/time-travel.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/time-travel/time-travel.md diff --git a/english/marshmallow.md b/english/marshmallow.md index eaacdb4f66..fc968ef13c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1027,3 +1027,5 @@ Instragram, a great place to spend time. [Visit my profile](https://www.instagr You've been charged with treason against the King. You wake up in [prison](prison/prison.md). My visit to the [zoo](zoo/zoo.md). + +You wake up confused, you faint you go back in [time](time-travel/time-travel.md) \ No newline at end of file diff --git a/english/time-travel/time-travel.md b/english/time-travel/time-travel.md new file mode 100644 index 0000000000..97fd8b8bf6 --- /dev/null +++ b/english/time-travel/time-travel.md @@ -0,0 +1 @@ +You are really confused, you faint again, wake up and get a migraine. From a287b929a2f477b4896b8ea2ae3b54f3202bbde0 Mon Sep 17 00:00:00 2001 From: twdickey43 Date: Fri, 8 Jul 2016 07:23:52 -0400 Subject: [PATCH 3845/5486] Add one line --- english/love/love.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/love/love.md b/english/love/love.md index 28a82d0c70..c90d1c8b62 100644 --- a/english/love/love.md +++ b/english/love/love.md @@ -45,3 +45,5 @@ With you for all eternity. Our hearts, always as one. - Anthony Kolos - + +God is love. From 80be5e88dcccdac47481236ce1efc9fcafed8a08 Mon Sep 17 00:00:00 2001 From: Gearoid Date: Fri, 8 Jul 2016 12:53:32 +0100 Subject: [PATCH 3846/5486] Add scan network option to iot story --- english/iot/intro.md | 4 ++++ english/iot/scan-network/scan-network.md | 7 +++++++ 2 files changed, 11 insertions(+) create mode 100644 english/iot/scan-network/scan-network.md diff --git a/english/iot/intro.md b/english/iot/intro.md index 932854ff0f..9f5ce2557e 100644 --- a/english/iot/intro.md +++ b/english/iot/intro.md @@ -20,3 +20,7 @@ DringDring Dring Kee Kee Kee Kee The lines are dead. He makes a dozen of vain attempts to a few other numbers. Hours rolled by and the plight didn't seem to change. Terror soon took over him. + +What will he do? + +[Will he scan the network for other devices?](../iot/scan-network/scan-network.md) diff --git a/english/iot/scan-network/scan-network.md b/english/iot/scan-network/scan-network.md new file mode 100644 index 0000000000..f420d3ccfe --- /dev/null +++ b/english/iot/scan-network/scan-network.md @@ -0,0 +1,7 @@ +He begins scanning the network. But he can't find anyone! +His core temp starts to rise as his panic and extra clock cycles start to take effect. + +*ping* Suddenly he finds someone! Its 192.168.100.-1! +How is this possible! +His clock cycles max out tyring to comprehend the situation. +"Whats happened to the network!? Who is -1?" From 056f69b10e6d3fce99a3320ac0adfda6f4532cd0 Mon Sep 17 00:00:00 2001 From: savio jose Date: Fri, 8 Jul 2016 23:19:44 +0530 Subject: [PATCH 3847/5486] Update Batman legacy --- english/batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index cba800f1c5..a7bf01af81 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -35,3 +35,5 @@ Who is really He also gets really weird with his [neighbors](http://imgur.com/gallery/Gi9cwgR). I am batman's cousin. + +Now that Bruce Wayne is grown old, he has proclaimed that I should take over his legacy! From c3d21b053b3746bc21ccce0536da06e8e405d0d8 Mon Sep 17 00:00:00 2001 From: Bharat Dave Date: Fri, 8 Jul 2016 18:17:19 -0400 Subject: [PATCH 3848/5486] Line 8 and 10 are added for the chase --- english/bamboo/bamboo-shoots.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/english/bamboo/bamboo-shoots.md b/english/bamboo/bamboo-shoots.md index f79a0e501c..a25506af32 100644 --- a/english/bamboo/bamboo-shoots.md +++ b/english/bamboo/bamboo-shoots.md @@ -4,3 +4,8 @@ you start to realize these pandas may not be as friendly as you thought. You turn around and the pandas all have evil grins. They climb down from the bamboo and walk towards you. + +You don't know what to do.The pandas continue to walk towards you. + +You begin retreating slowly.Suddenly,one of the pandas speed up. + From 2303d4c1afc16a646cc13657809e45e933a4c79d Mon Sep 17 00:00:00 2001 From: TylerHuynh100 Date: Fri, 8 Jul 2016 19:39:09 -0700 Subject: [PATCH 3849/5486] Add my story to the directory --- vietnamese/TansStory/mystory.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 vietnamese/TansStory/mystory.md diff --git a/vietnamese/TansStory/mystory.md b/vietnamese/TansStory/mystory.md new file mode 100644 index 0000000000..d1e8f84bec --- /dev/null +++ b/vietnamese/TansStory/mystory.md @@ -0,0 +1,2 @@ +Minh di dinh cu o My cung duoc 10 nam roi. Minh moi hoc ra truong. +Minh dang kiem viec lam ma van khong co. Nhung minh se khong nan ma bo cuoc. Minh se co gang nhieu hon nua. \ No newline at end of file From 9928cfe525e938d0a216db01e476978aa119ff05 Mon Sep 17 00:00:00 2001 From: TylerHuynh100 Date: Fri, 8 Jul 2016 19:50:54 -0700 Subject: [PATCH 3850/5486] Add a link to the story --- vietnamese/TansStory/mystory.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vietnamese/TansStory/mystory.md b/vietnamese/TansStory/mystory.md index d1e8f84bec..f151a65364 100644 --- a/vietnamese/TansStory/mystory.md +++ b/vietnamese/TansStory/mystory.md @@ -1,2 +1,2 @@ Minh di dinh cu o My cung duoc 10 nam roi. Minh moi hoc ra truong. -Minh dang kiem viec lam ma van khong co. Nhung minh se khong nan ma bo cuoc. Minh se co gang nhieu hon nua. \ No newline at end of file +Minh dang kiem [viec lam](https://github.com/thuynh8/create-your-own-adventure/blob/master/vietnamese/TansStory/mystory.md) ma van khong co. Nhung minh se khong nan ma bo cuoc. Minh se co gang nhieu hon nua. \ No newline at end of file From 51ade1faabd489f3fa31e486ba3b279113a55fbd Mon Sep 17 00:00:00 2001 From: TylerHuynh100 Date: Fri, 8 Jul 2016 20:03:17 -0700 Subject: [PATCH 3851/5486] Add relative link to my story --- vietnamese/TansStory/mystory.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vietnamese/TansStory/mystory.md b/vietnamese/TansStory/mystory.md index f151a65364..549843082f 100644 --- a/vietnamese/TansStory/mystory.md +++ b/vietnamese/TansStory/mystory.md @@ -1,2 +1,2 @@ Minh di dinh cu o My cung duoc 10 nam roi. Minh moi hoc ra truong. -Minh dang kiem [viec lam](https://github.com/thuynh8/create-your-own-adventure/blob/master/vietnamese/TansStory/mystory.md) ma van khong co. Nhung minh se khong nan ma bo cuoc. Minh se co gang nhieu hon nua. \ No newline at end of file +Minh dang kiem [viec lam](Tanstory/mystory.md)ma van khong co. Nhung minh se khong nan ma bo cuoc. Minh se co gang nhieu hon nua. \ No newline at end of file From 7cad9e3f407bc3aa920a9f3ef998c1742ab204ad Mon Sep 17 00:00:00 2001 From: TylerHuynh100 Date: Fri, 8 Jul 2016 20:08:46 -0700 Subject: [PATCH 3852/5486] Modify mystory.md --- vietnamese/TansStory/mystory.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vietnamese/TansStory/mystory.md b/vietnamese/TansStory/mystory.md index 549843082f..2d1329fdb5 100644 --- a/vietnamese/TansStory/mystory.md +++ b/vietnamese/TansStory/mystory.md @@ -1,2 +1,3 @@ Minh di dinh cu o My cung duoc 10 nam roi. Minh moi hoc ra truong. -Minh dang kiem [viec lam](Tanstory/mystory.md)ma van khong co. Nhung minh se khong nan ma bo cuoc. Minh se co gang nhieu hon nua. \ No newline at end of file +Minh dang kiem [viec lam](https://raw.githubusercontent.com/thuynh8/create-your-own-adventure/master/vietnamese/TansStory/mystory.md) ma van khong co. +Nhung minh se khong nan ma bo cuoc. Minh se co gang nhieu hon nua. \ No newline at end of file From be92c3fdae84a51310b61c8f1377b792106d7abc Mon Sep 17 00:00:00 2001 From: TylerHuynh100 Date: Fri, 8 Jul 2016 20:12:21 -0700 Subject: [PATCH 3853/5486] Make line shorter --- vietnamese/TansStory/mystory.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vietnamese/TansStory/mystory.md b/vietnamese/TansStory/mystory.md index 2d1329fdb5..63b5152e7b 100644 --- a/vietnamese/TansStory/mystory.md +++ b/vietnamese/TansStory/mystory.md @@ -1,3 +1,2 @@ Minh di dinh cu o My cung duoc 10 nam roi. Minh moi hoc ra truong. -Minh dang kiem [viec lam](https://raw.githubusercontent.com/thuynh8/create-your-own-adventure/master/vietnamese/TansStory/mystory.md) ma van khong co. -Nhung minh se khong nan ma bo cuoc. Minh se co gang nhieu hon nua. \ No newline at end of file +Minh dang kiem [viec lam](https://raw.githubusercontent.com/thuynh8/create-your-own-adventure/master/vietnamese/TansStory/mystory.md) \ No newline at end of file From 7816d140075be58948091b46379c92664eaa02ec Mon Sep 17 00:00:00 2001 From: TylerHuynh100 Date: Fri, 8 Jul 2016 20:16:02 -0700 Subject: [PATCH 3854/5486] Modify mystory.md again --- vietnamese/TansStory/mystory.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vietnamese/TansStory/mystory.md b/vietnamese/TansStory/mystory.md index 63b5152e7b..d40ce7e1cd 100644 --- a/vietnamese/TansStory/mystory.md +++ b/vietnamese/TansStory/mystory.md @@ -1,2 +1,3 @@ Minh di dinh cu o My cung duoc 10 nam roi. Minh moi hoc ra truong. -Minh dang kiem [viec lam](https://raw.githubusercontent.com/thuynh8/create-your-own-adventure/master/vietnamese/TansStory/mystory.md) \ No newline at end of file + +Minh dang kiem [viec lam](http://www.google.com) nhung van khong co. From 42d268b8353593abc985eb400ba164957b075d5e Mon Sep 17 00:00:00 2001 From: TylerHuynh100 Date: Fri, 8 Jul 2016 20:21:41 -0700 Subject: [PATCH 3855/5486] Fix the content of mystory.md --- vietnamese/TansStory/mystory.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vietnamese/TansStory/mystory.md b/vietnamese/TansStory/mystory.md index d40ce7e1cd..9fd8d7aa18 100644 --- a/vietnamese/TansStory/mystory.md +++ b/vietnamese/TansStory/mystory.md @@ -1,3 +1,3 @@ Minh di dinh cu o My cung duoc 10 nam roi. Minh moi hoc ra truong. -Minh dang kiem [viec lam](http://www.google.com) nhung van khong co. +Minh dang kiem viec lam nhung van khong co. From a80daea7c61c9dae06ecfcb4bb7ae3b865e68bf9 Mon Sep 17 00:00:00 2001 From: TylerHuynh100 Date: Fri, 8 Jul 2016 20:26:04 -0700 Subject: [PATCH 3856/5486] Add my story --- vietnamese/kechuyen.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index ec8c662cb3..e29beb00b1 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -1,4 +1,6 @@ -Bạn thích nghe [truyện ma](https://www.youtube.com/watch?v=0dfWjEKXpZk)? +Chuyen [kiem viec](TansStory/mystory.md) cua toi + +Bạn thích nghe [truyện ma](https://www.youtube.com/watch?v=0dfWjEKXpZk)? Thế còn [truyện cười](https://www.youtube.com/watch?v=3r_-ZLZCxQs)? From 7ea54d30a2f5292d78386c728cfad1efa6e076c9 Mon Sep 17 00:00:00 2001 From: TylerHuynh100 Date: Fri, 8 Jul 2016 20:29:15 -0700 Subject: [PATCH 3857/5486] Modify kechuyen.md --- vietnamese/kechuyen.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vietnamese/kechuyen.md b/vietnamese/kechuyen.md index e29beb00b1..f4f25b2f1c 100644 --- a/vietnamese/kechuyen.md +++ b/vietnamese/kechuyen.md @@ -1,6 +1,4 @@ -Chuyen [kiem viec](TansStory/mystory.md) cua toi - -Bạn thích nghe [truyện ma](https://www.youtube.com/watch?v=0dfWjEKXpZk)? +Bạn thích nghe [truyện ma](https://www.youtube.com/watch?v=0dfWjEKXpZk)? Thế còn [truyện cười](https://www.youtube.com/watch?v=3r_-ZLZCxQs)? @@ -21,3 +19,5 @@ Nhắc tới Sài Gòn, không thể không nhắc tới [Cà phê bệt](https: Tôi thì chưa từng đến Sài Gòn, tôi là người [Hà Nội gốc](Ha-Noi/toi_la_nguoi_ha_loi_goc.md). Nhưng tôi là rể [Hải Phòng](Hai-Phong/Hai_Phong_thanh_pho_cang.md) + +Chuyen [kiem viec](TansStory/mystory.md) cua toi \ No newline at end of file From 67d594c21ab8cbc5ee0f9eee5a5357a85ec33fb0 Mon Sep 17 00:00:00 2001 From: Cj Catalan Date: Sat, 9 Jul 2016 13:09:30 +0800 Subject: [PATCH 3858/5486] Add hungry_prince story --- english/hungry_prince/hungry_prince.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 english/hungry_prince/hungry_prince.md diff --git a/english/hungry_prince/hungry_prince.md b/english/hungry_prince/hungry_prince.md new file mode 100644 index 0000000000..b9c5bd3c1d --- /dev/null +++ b/english/hungry_prince/hungry_prince.md @@ -0,0 +1,11 @@ +There once was a prince who was hungry. + +It was lunch time and he had a lot of work to do. But his grumbling stomach was too powerful to handle. + +He decided to eat the biggest burger in the kingdom. + +It was this [burger](http://www.supersizedmeals.com/food/images/articles/20090615-Big_League_Burger_2.jpg). + +Satisfied with the burger, He asked for the chef to come in his palace to thank him. + +Little did he know, that burger will change everything he knows.... \ No newline at end of file From 25c9b3fac857cd480864c9f68ee41b2714e96885 Mon Sep 17 00:00:00 2001 From: CjCatalan07 Date: Sat, 9 Jul 2016 13:41:50 +0800 Subject: [PATCH 3859/5486] Add The Hungry Prince Link --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 257e5fbd3b..a698acc46b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1030,4 +1030,6 @@ You've been charged with treason against the King. You wake up in [prison](priso My visit to the [zoo](zoo/zoo.md). -You wake up confused, you faint you go back in [time](time-travel/time-travel.md) \ No newline at end of file +You wake up confused, you faint you go back in [time](time-travel/time-travel.md) + +[The Hungry Prince](hungry_prince/hungry_prince.md) From 084d3079a81b6116d925401c4794f124b102275c Mon Sep 17 00:00:00 2001 From: Rikke Barsten Date: Sat, 9 Jul 2016 22:18:07 +0200 Subject: [PATCH 3860/5486] Add garden option --- danish/have/have.md | 2 ++ danish/velkommen.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 danish/have/have.md diff --git a/danish/have/have.md b/danish/have/have.md new file mode 100644 index 0000000000..f68b9cde1a --- /dev/null +++ b/danish/have/have.md @@ -0,0 +1,2 @@ +Du opdager, at dine gulerødder spirer. Du bliver så glad, at du bryder ud i +[sang] (danish/synging/synging.md) diff --git a/danish/velkommen.md b/danish/velkommen.md index c4fb1db1ac..945fd021d9 100644 --- a/danish/velkommen.md +++ b/danish/velkommen.md @@ -13,3 +13,5 @@ Vælger du at: [Prøver at lette stemningen](synging/synging.md) [Tage kapsækken på ryggen og vandre sydpå, "Come so med jer! What are you venting for?"](haervejen/haervejen.md) + +[Gå en tur i din have] (have/have.md) From dbd8526a297dfd75610d5f159f5d05186c4f31ac Mon Sep 17 00:00:00 2001 From: Hassan Date: Sat, 9 Jul 2016 23:24:23 +0100 Subject: [PATCH 3861/5486] Added to Schrodinger-cat --- english/schrodinger-cat/schrodinger-cat.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/schrodinger-cat/schrodinger-cat.md b/english/schrodinger-cat/schrodinger-cat.md index 0854302afe..2c0e2a8231 100644 --- a/english/schrodinger-cat/schrodinger-cat.md +++ b/english/schrodinger-cat/schrodinger-cat.md @@ -6,6 +6,8 @@ Also known as Quantum Superposition It is only when you open the box that you become either dead or alive. +To be alive or not or both is your choice. + So [open the box](dead-or-alive/dead-or-alive.md). Or, [weld the box shut](undead/undead.md) and become an immortal undead. From a6c39f74fdba3df664837f434b42c15b2e1417c6 Mon Sep 17 00:00:00 2001 From: Yuandi Jin Date: Sat, 9 Jul 2016 17:26:19 -0700 Subject: [PATCH 3862/5486] Add pokemon story (Chinese) --- Chinese/pokemon-go/pikachu.md | 2 ++ "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 Chinese/pokemon-go/pikachu.md diff --git a/Chinese/pokemon-go/pikachu.md b/Chinese/pokemon-go/pikachu.md new file mode 100644 index 0000000000..f5035202c0 --- /dev/null +++ b/Chinese/pokemon-go/pikachu.md @@ -0,0 +1,2 @@ +有一天早晨，你像往常一样醒来，准备拿出手机抓几只口袋妖怪，却发现自己变成了一只皮！卡！丘！ +一群壮汉正拿着精灵球向你扑来，你会？ \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 2b7fd55476..a6a2303083 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -124,4 +124,6 @@ [测试](test/test.md) +[Pokemon](pokemon-go/pikachu.md) + 后端程序元辛苦的工作虽然很少得到人重视，却是必不可少的一部分. From c00f1765db609dbc7aa06425a050b959fb4ac6b2 Mon Sep 17 00:00:00 2001 From: Max Engel Date: Sat, 9 Jul 2016 22:06:02 -0500 Subject: [PATCH 3863/5486] Add to zoo story and new file in drink folder --- english/drink/lemonade.md | 0 english/zoo/zoo.md | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 english/drink/lemonade.md diff --git a/english/drink/lemonade.md b/english/drink/lemonade.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/english/zoo/zoo.md b/english/zoo/zoo.md index 73354a9f5d..9cab756649 100644 --- a/english/zoo/zoo.md +++ b/english/zoo/zoo.md @@ -1,2 +1,4 @@ Recently I visited a zoo in my hometown. It was an awesome experience to be part of the nature. I saw a lot of tigers, elephants, deer and a whole lot of other [animals](../animal/animal.md) + +I was pretty thirsty. There is a lemonade stand over there. I head over and buy some [lemonade](english/drinks/lemonade.md) \ No newline at end of file From 6696df34abd0590241258b4a5b3854c0d06d4f1e Mon Sep 17 00:00:00 2001 From: Max Engel Date: Sat, 9 Jul 2016 22:15:23 -0500 Subject: [PATCH 3864/5486] Second attempt at adding my part to the story --- english/drink/lemonade.md | 1 + english/zoo/zoo.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/english/drink/lemonade.md b/english/drink/lemonade.md index e69de29bb2..7d30ed5464 100644 --- a/english/drink/lemonade.md +++ b/english/drink/lemonade.md @@ -0,0 +1 @@ +The lemonade is incredibly refreshing. I am now ready explore on this hot, summer day. \ No newline at end of file diff --git a/english/zoo/zoo.md b/english/zoo/zoo.md index 9cab756649..62e387d7bc 100644 --- a/english/zoo/zoo.md +++ b/english/zoo/zoo.md @@ -1,4 +1,5 @@ Recently I visited a zoo in my hometown. It was an awesome experience to be part of the nature. I saw a lot of tigers, elephants, deer and a whole lot of other [animals](../animal/animal.md) -I was pretty thirsty. There is a lemonade stand over there. I head over and buy some [lemonade](english/drinks/lemonade.md) \ No newline at end of file +I was pretty thirsty. There is a lemonade stand over there. +I head over and buy some [lemonade](../drinks/lemonade.md) \ No newline at end of file From ec3e83b463b6b805defd133228483b540f763463 Mon Sep 17 00:00:00 2001 From: Max Engel Date: Sat, 9 Jul 2016 22:30:34 -0500 Subject: [PATCH 3865/5486] Fix link to other file --- english/zoo/zoo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/zoo/zoo.md b/english/zoo/zoo.md index 62e387d7bc..6d0d9d0fb7 100644 --- a/english/zoo/zoo.md +++ b/english/zoo/zoo.md @@ -2,4 +2,4 @@ Recently I visited a zoo in my hometown. It was an awesome experience to be part nature. I saw a lot of tigers, elephants, deer and a whole lot of other [animals](../animal/animal.md) I was pretty thirsty. There is a lemonade stand over there. -I head over and buy some [lemonade](../drinks/lemonade.md) \ No newline at end of file +I head over and buy some [lemonade](../drink/lemonade.md) \ No newline at end of file From 907c1fe6071b4c18f23a4fa7fd0054632d551829 Mon Sep 17 00:00:00 2001 From: Max Engel Date: Sat, 9 Jul 2016 22:38:08 -0500 Subject: [PATCH 3866/5486] Add new folder called lemonade --- english/drink/{ => lemonade}/lemonade.md | 0 english/zoo/zoo.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename english/drink/{ => lemonade}/lemonade.md (100%) diff --git a/english/drink/lemonade.md b/english/drink/lemonade/lemonade.md similarity index 100% rename from english/drink/lemonade.md rename to english/drink/lemonade/lemonade.md diff --git a/english/zoo/zoo.md b/english/zoo/zoo.md index 6d0d9d0fb7..51909649cc 100644 --- a/english/zoo/zoo.md +++ b/english/zoo/zoo.md @@ -2,4 +2,4 @@ Recently I visited a zoo in my hometown. It was an awesome experience to be part nature. I saw a lot of tigers, elephants, deer and a whole lot of other [animals](../animal/animal.md) I was pretty thirsty. There is a lemonade stand over there. -I head over and buy some [lemonade](../drink/lemonade.md) \ No newline at end of file +I head over and buy some [lemonade](../drink/lemonade/lemonade.md) \ No newline at end of file From 2286433beef7f6093d5a6e2e21cb3fa775e6eac9 Mon Sep 17 00:00:00 2001 From: wanqingqing Date: Sun, 10 Jul 2016 16:36:46 +0800 Subject: [PATCH 3867/5486] Change pipachu.md and add some stuff --- Chinese/pokemon-go/pikachu.md | 7 ++++++- Chinese/pokemon-go/stuff/dream.md | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Chinese/pokemon-go/stuff/dream.md diff --git a/Chinese/pokemon-go/pikachu.md b/Chinese/pokemon-go/pikachu.md index f5035202c0..d203b2dbcb 100644 --- a/Chinese/pokemon-go/pikachu.md +++ b/Chinese/pokemon-go/pikachu.md @@ -1,2 +1,7 @@ 有一天早晨，你像往常一样醒来，准备拿出手机抓几只口袋妖怪，却发现自己变成了一只皮！卡！丘！ -一群壮汉正拿着精灵球向你扑来，你会？ \ No newline at end of file +一群壮汉正拿着精灵球向你扑来，你会？ + +百万伏特！！！ +然后。。。开启逃跑模式 + +[变身皮卡丘的梦想](Chinese/pokemon-go/stuff/dream.md) diff --git a/Chinese/pokemon-go/stuff/dream.md b/Chinese/pokemon-go/stuff/dream.md new file mode 100644 index 0000000000..4cb2519e32 --- /dev/null +++ b/Chinese/pokemon-go/stuff/dream.md @@ -0,0 +1 @@ +要当全世界小精灵的老大 From 4d8b1215cbbe02b328aa4608ed024a55252fa85b Mon Sep 17 00:00:00 2001 From: wanqingqing Date: Sun, 10 Jul 2016 16:42:22 +0800 Subject: [PATCH 3868/5486] fix error link --- Chinese/pokemon-go/pikachu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/pokemon-go/pikachu.md b/Chinese/pokemon-go/pikachu.md index d203b2dbcb..27df55bfb7 100644 --- a/Chinese/pokemon-go/pikachu.md +++ b/Chinese/pokemon-go/pikachu.md @@ -4,4 +4,4 @@ 百万伏特！！！ 然后。。。开启逃跑模式 -[变身皮卡丘的梦想](Chinese/pokemon-go/stuff/dream.md) +[变身皮卡丘的梦想](stuff/dream.md) From 7df820fbfa0eb042d7b1793d0bd6824372061284 Mon Sep 17 00:00:00 2001 From: Ben C Date: Sun, 10 Jul 2016 21:47:32 +0100 Subject: [PATCH 3869/5486] Add story about man on flying carpet --- english/appear-on-falkors-back/falkor.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/appear-on-falkors-back/falkor.md b/english/appear-on-falkors-back/falkor.md index e5f7027d27..edc783f4af 100644 --- a/english/appear-on-falkors-back/falkor.md +++ b/english/appear-on-falkors-back/falkor.md @@ -1,6 +1,8 @@ You appear on Falkor's back, flying through marshmallow clouds and dodging fire-breathing dragons as they char the clouds. +You pass by a man on a magic carpet who is funnily enough asleep! + Pick one of the choices below: Just click on the link. From ccc2adbadfc98cd2d246c87446aeee4c03508814 Mon Sep 17 00:00:00 2001 From: csfrank271 Date: Mon, 11 Jul 2016 12:54:12 +1000 Subject: [PATCH 3870/5486] Update hungry_prince.md --- english/hungry_prince/hungry_prince.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/hungry_prince/hungry_prince.md b/english/hungry_prince/hungry_prince.md index b9c5bd3c1d..8102b85f8d 100644 --- a/english/hungry_prince/hungry_prince.md +++ b/english/hungry_prince/hungry_prince.md @@ -8,4 +8,6 @@ It was this [burger](http://www.supersizedmeals.com/food/images/articles/2009061 Satisfied with the burger, He asked for the chef to come in his palace to thank him. -Little did he know, that burger will change everything he knows.... \ No newline at end of file +Little did he know, that burger will change everything he knows.... + +But more on that later. For now, the prince must tend to his royal duties. From ca48ecf466fcec11a128f45c6ff235fd72ea056f Mon Sep 17 00:00:00 2001 From: KSouthwood Date: Mon, 11 Jul 2016 11:29:31 -0400 Subject: [PATCH 3871/5486] Add continuation to giant bubble branch --- english/mysterious-pool/giant-bubble/giant-bubble.md | 8 +++++++- .../giant-bubble/into-the-bubble/breathe-again.md | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md diff --git a/english/mysterious-pool/giant-bubble/giant-bubble.md b/english/mysterious-pool/giant-bubble/giant-bubble.md index 56ebb9cfa1..a3e7953b6e 100644 --- a/english/mysterious-pool/giant-bubble/giant-bubble.md +++ b/english/mysterious-pool/giant-bubble/giant-bubble.md @@ -1,2 +1,8 @@ The big luminescent bubble was surrounded with a lovely blue aura. You could go to it for air, -or it could be toxic. You choose to... \ No newline at end of file +or it could be toxic. You choose to... + +[Swim into the bubble](into-the-bubble/breathe-again.md) + +[Head back to the glowing eyes](../glowing-eyes/glowing-eyes.md) + +[Try to swim for the surface](../glowing-eyes/caught-up/plants.md) diff --git a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md new file mode 100644 index 0000000000..0c16a53099 --- /dev/null +++ b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md @@ -0,0 +1,3 @@ +You swim into the bubble, and gasping, you take a big breath in. You look +around in wonderment at the soothing blue aura of the bubble. Just as you +start to relax, thinking you may be alright after all, you realize... \ No newline at end of file From d4ce4a8bbb978ab5d482b78e9cf82c82cf13163b Mon Sep 17 00:00:00 2001 From: KSouthwood Date: Mon, 11 Jul 2016 11:34:43 -0400 Subject: [PATCH 3872/5486] Fix typo in directory path --- english/mysterious-pool/giant-bubble/giant-bubble.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/mysterious-pool/giant-bubble/giant-bubble.md b/english/mysterious-pool/giant-bubble/giant-bubble.md index a3e7953b6e..adb6062f62 100644 --- a/english/mysterious-pool/giant-bubble/giant-bubble.md +++ b/english/mysterious-pool/giant-bubble/giant-bubble.md @@ -5,4 +5,4 @@ or it could be toxic. You choose to... [Head back to the glowing eyes](../glowing-eyes/glowing-eyes.md) -[Try to swim for the surface](../glowing-eyes/caught-up/plants.md) +[Try to swim for the surface](../glowing-eyes/caught_up/plants.md) From bb5e9dd072d54e92ca7678eaa6d2f1f2f644d811 Mon Sep 17 00:00:00 2001 From: Mateo Buitrago Date: Mon, 11 Jul 2016 18:42:11 -0500 Subject: [PATCH 3873/5486] =?UTF-8?q?Poner=20al=20drag=C3=B3n=20en=20adopc?= =?UTF-8?q?i=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/dragon/adopcion/adopcion.md | 2 ++ espanol/dragon/dragon.md | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 espanol/dragon/adopcion/adopcion.md diff --git a/espanol/dragon/adopcion/adopcion.md b/espanol/dragon/adopcion/adopcion.md new file mode 100644 index 0000000000..9f699800d6 --- /dev/null +++ b/espanol/dragon/adopcion/adopcion.md @@ -0,0 +1,2 @@ +El dragón fue dado en adopción y pronto lo adoptó +una linda pareja de suecos los cuales no podian tener hijos. \ No newline at end of file diff --git a/espanol/dragon/dragon.md b/espanol/dragon/dragon.md index 79fe033c93..b05f49cf4a 100644 --- a/espanol/dragon/dragon.md +++ b/espanol/dragon/dragon.md @@ -27,4 +27,6 @@ Pero no sabía controlar al dragón, así que decidió: [darle de comer](festin/festin.md) -[Devolverlo](devolverlo/devolverlo.md) \ No newline at end of file +[Devolverlo](devolverlo/devolverlo.md) + +[Darlo en adopción](adopcion/adopcion.md) \ No newline at end of file From 07cd7d91bdde2f9942174959604dfd56c83eaede Mon Sep 17 00:00:00 2001 From: Mateo Buitrago Date: Mon, 11 Jul 2016 19:00:42 -0500 Subject: [PATCH 3874/5486] =?UTF-8?q?El=20dragon=20creci=C3=B3=20en=20su?= =?UTF-8?q?=20familia=20adoptiva?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/dragon/adopcion/adopcion.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/espanol/dragon/adopcion/adopcion.md b/espanol/dragon/adopcion/adopcion.md index 9f699800d6..66c0bee5c0 100644 --- a/espanol/dragon/adopcion/adopcion.md +++ b/espanol/dragon/adopcion/adopcion.md @@ -1,2 +1,11 @@ El dragón fue dado en adopción y pronto lo adoptó -una linda pareja de suecos los cuales no podian tener hijos. \ No newline at end of file +una linda pareja de suecos los cuales no podian tener hijos. + +Ellos vivieron una vida perfecta, llevando a su hijo dragón +a la escuela y a clases de fútbol. Todo era hermoso. + +Pronto el joven dragón empezó a sufrir de acné, a tener +cambios en la voz y a tener cambios de humor. El dragón +se dió cuenta que no se parecía a sus padres adoptivos +por lo cual decidio: + From 1ae58790604cd74bd0fb5edaa435e960b60f8b81 Mon Sep 17 00:00:00 2001 From: Benjamin Reynolds Date: Tue, 12 Jul 2016 09:33:24 -0400 Subject: [PATCH 3875/5486] Add back to sleep option --- english/boston/boston.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/boston/boston.md b/english/boston/boston.md index 52bcb3c93d..34817e9598 100644 --- a/english/boston/boston.md +++ b/english/boston/boston.md @@ -6,4 +6,6 @@ [Go on vacation](../licked-cat/vacation.md) -[Get to work](../gtd/gtd.md) \ No newline at end of file +[Get to work](../gtd/gtd.md) + +[Go back to sleep](../go-back-to-sleep/go-back-to-sleep.md) \ No newline at end of file From 17b2d692d5cd09e36a3b65e412d36aaac7c666b0 Mon Sep 17 00:00:00 2001 From: James Carty Date: Tue, 12 Jul 2016 14:56:43 +0100 Subject: [PATCH 3876/5486] Add Pokemon lego and fix a typo --- english/lego/lego.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/lego/lego.md b/english/lego/lego.md index fd2b80d247..37fd52842e 100644 --- a/english/lego/lego.md +++ b/english/lego/lego.md @@ -2,7 +2,7 @@ The mallow man seems nice so you chat to him after walking up to him. He decides he likes you too, so he gets out his Lego's. -He's got Star Wars, Lego Movie, space, technics, oh so much lego and you play with it all! +He's got Star Wars, Lego Movie, Pokemon, space, technics, oh so much lego and you play with it all! After a while he starts to get a bit too much, he doesn't get out much, you're bored. @@ -36,6 +36,6 @@ or You see, there are two types of legos in this world. -We all know and love them lego brand legos, any other brand belongs in the trash heap. IMPOSTERS +We all know and love them lego brand legos, any other brand belongs in the trash heap. IMPOSTERS From 437ff0fb7a26de31dea5c22253eecc1d8e9da4f2 Mon Sep 17 00:00:00 2001 From: James Carty Date: Tue, 12 Jul 2016 15:03:33 +0100 Subject: [PATCH 3877/5486] Add Pokemon line to lego --- english/lego/lego.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/english/lego/lego.md b/english/lego/lego.md index 37fd52842e..8dd7aad0f4 100644 --- a/english/lego/lego.md +++ b/english/lego/lego.md @@ -2,7 +2,9 @@ The mallow man seems nice so you chat to him after walking up to him. He decides he likes you too, so he gets out his Lego's. -He's got Star Wars, Lego Movie, Pokemon, space, technics, oh so much lego and you play with it all! +He's got Star Wars, Lego Movie, space, technics, oh so much lego and you play with it all! + +I wish they had Pokemon lego too. After a while he starts to get a bit too much, he doesn't get out much, you're bored. @@ -36,6 +38,6 @@ or You see, there are two types of legos in this world. -We all know and love them lego brand legos, any other brand belongs in the trash heap. IMPOSTERS +We all know and love them lego brand legos, any other brand belongs in the trash heap. IMPOSTERS From 3accb99ec02679a43edf23d44094aa5aaacc28f3 Mon Sep 17 00:00:00 2001 From: jdhj Date: Tue, 12 Jul 2016 22:21:32 +0100 Subject: [PATCH 3878/5486] Add a twisty little maze, with passages all different --- english/plugh/maze1/maze1.md | 14 ++++++++++++++ english/plugh/maze2/maze2.md | 14 ++++++++++++++ english/plugh/maze3/maze3.md | 14 ++++++++++++++ english/plugh/maze4/maze4.md | 14 ++++++++++++++ english/plugh/maze5/maze5.md | 10 ++++++++++ english/plugh/plugh.md | 6 +++++- 6 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 english/plugh/maze1/maze1.md create mode 100644 english/plugh/maze2/maze2.md create mode 100644 english/plugh/maze3/maze3.md create mode 100644 english/plugh/maze4/maze4.md create mode 100644 english/plugh/maze5/maze5.md diff --git a/english/plugh/maze1/maze1.md b/english/plugh/maze1/maze1.md new file mode 100644 index 0000000000..1b00b0485f --- /dev/null +++ b/english/plugh/maze1/maze1.md @@ -0,0 +1,14 @@ +You are in a maze of twisty little passages, all different. + +Which way should we go? + +[north](maze1.md) +[south](maze1.md) +[west](maze1.md) +[east](maze1.md) +[northwest](../maze2/maze2.md) +[northeast](maze1.md) +[southwest](maze1.md) +[southeast](maze1.md) +[up](maze1.md) +[down](maze1.md) diff --git a/english/plugh/maze2/maze2.md b/english/plugh/maze2/maze2.md new file mode 100644 index 0000000000..92d3987481 --- /dev/null +++ b/english/plugh/maze2/maze2.md @@ -0,0 +1,14 @@ +You are in a maze of twisting little passages, all different. + +Which way should we go? + +[north](../maze1/maze1.md) +[south](../maze1/maze1.md) +[west](../maze1/maze1.md) +[east](../maze1/maze1.md) +[northwest](../maze1/maze1.md) +[northeast](../maze1/maze1.md) +[southwest](../maze1/maze1.md) +[southeast](../maze3/maze3.md) +[up](../maze1/maze1.md) +[down](../maze1/maze1.md) diff --git a/english/plugh/maze3/maze3.md b/english/plugh/maze3/maze3.md new file mode 100644 index 0000000000..82ce15d0ee --- /dev/null +++ b/english/plugh/maze3/maze3.md @@ -0,0 +1,14 @@ +You are in a maze of little twisty passages, all different. + +Which way should we go? + +[north](../maze1/maze1.md) +[south](../maze1/maze1.md) +[west](../maze1/maze1.md) +[east](../maze1/maze1.md) +[northwest](../maze1/maze1.md) +[northeast](../maze1/maze1.md) +[southwest](../maze1/maze1.md) +[southeast](../maze1/maze1.md) +[up](../maze1/maze1.md) +[down](../maze4/maze4.md) diff --git a/english/plugh/maze4/maze4.md b/english/plugh/maze4/maze4.md new file mode 100644 index 0000000000..7fbc44112b --- /dev/null +++ b/english/plugh/maze4/maze4.md @@ -0,0 +1,14 @@ +You are in a maze of little twisting passages, all different. + +Which way should we go? + +[north](../maze1/maze1.md) +[south](../maze1/maze1.md) +[west](../maze5/maze5.md) +[east](../maze1/maze1.md) +[northwest](../maze1/maze1.md) +[northeast](../maze1/maze1.md) +[southwest](../maze1/maze1.md) +[southeast](../maze1/maze1.md) +[up](../maze1/maze1.md) +[down](../maze1/maze1.md) diff --git a/english/plugh/maze5/maze5.md b/english/plugh/maze5/maze5.md new file mode 100644 index 0000000000..92e9342d7d --- /dev/null +++ b/english/plugh/maze5/maze5.md @@ -0,0 +1,10 @@ +*** CONGRATULATIONS *** + +You solved the puzzle and made it through the maze. +You find a delicate and precious ming vase. +It looks very fragile, good thing you can't drop it eh? + +[A door opens up leading back to the marshmallow room](../../marshmallow.md) + +Thank you for trying my little part of the game. + diff --git a/english/plugh/plugh.md b/english/plugh/plugh.md index 4dc98baf68..265cb967e3 100644 --- a/english/plugh/plugh.md +++ b/english/plugh/plugh.md @@ -1 +1,5 @@ -Suddenly, you find yourself on a hill looking at a small building. What a relief! \ No newline at end of file +Suddenly, you find yourself on a hill looking at a small building. What a relief! + +But the only way back is through the maze, are you up to the challenge? +[Enter the maze](maze1/maze1.md) + From 0344e8457986ba2d7cc16d4730b1e9e1a2e74859 Mon Sep 17 00:00:00 2001 From: jdhj Date: Tue, 12 Jul 2016 23:05:36 +0100 Subject: [PATCH 3879/5486] Fix line spacing between links --- english/plugh/maze1/maze1.md | 9 +++++++++ english/plugh/maze2/maze2.md | 9 +++++++++ english/plugh/maze3/maze3.md | 9 +++++++++ english/plugh/maze4/maze4.md | 9 +++++++++ 4 files changed, 36 insertions(+) diff --git a/english/plugh/maze1/maze1.md b/english/plugh/maze1/maze1.md index 1b00b0485f..f57731baad 100644 --- a/english/plugh/maze1/maze1.md +++ b/english/plugh/maze1/maze1.md @@ -3,12 +3,21 @@ You are in a maze of twisty little passages, all different. Which way should we go? [north](maze1.md) + [south](maze1.md) + [west](maze1.md) + [east](maze1.md) + [northwest](../maze2/maze2.md) + [northeast](maze1.md) + [southwest](maze1.md) + [southeast](maze1.md) + [up](maze1.md) + [down](maze1.md) diff --git a/english/plugh/maze2/maze2.md b/english/plugh/maze2/maze2.md index 92d3987481..3817fd375f 100644 --- a/english/plugh/maze2/maze2.md +++ b/english/plugh/maze2/maze2.md @@ -3,12 +3,21 @@ You are in a maze of twisting little passages, all different. Which way should we go? [north](../maze1/maze1.md) + [south](../maze1/maze1.md) + [west](../maze1/maze1.md) + [east](../maze1/maze1.md) + [northwest](../maze1/maze1.md) + [northeast](../maze1/maze1.md) + [southwest](../maze1/maze1.md) + [southeast](../maze3/maze3.md) + [up](../maze1/maze1.md) + [down](../maze1/maze1.md) diff --git a/english/plugh/maze3/maze3.md b/english/plugh/maze3/maze3.md index 82ce15d0ee..e7007afe3c 100644 --- a/english/plugh/maze3/maze3.md +++ b/english/plugh/maze3/maze3.md @@ -3,12 +3,21 @@ You are in a maze of little twisty passages, all different. Which way should we go? [north](../maze1/maze1.md) + [south](../maze1/maze1.md) + [west](../maze1/maze1.md) + [east](../maze1/maze1.md) + [northwest](../maze1/maze1.md) + [northeast](../maze1/maze1.md) + [southwest](../maze1/maze1.md) + [southeast](../maze1/maze1.md) + [up](../maze1/maze1.md) + [down](../maze4/maze4.md) diff --git a/english/plugh/maze4/maze4.md b/english/plugh/maze4/maze4.md index 7fbc44112b..07af5b1862 100644 --- a/english/plugh/maze4/maze4.md +++ b/english/plugh/maze4/maze4.md @@ -3,12 +3,21 @@ You are in a maze of little twisting passages, all different. Which way should we go? [north](../maze1/maze1.md) + [south](../maze1/maze1.md) + [west](../maze5/maze5.md) + [east](../maze1/maze1.md) + [northwest](../maze1/maze1.md) + [northeast](../maze1/maze1.md) + [southwest](../maze1/maze1.md) + [southeast](../maze1/maze1.md) + [up](../maze1/maze1.md) + [down](../maze1/maze1.md) From 9dde46930c8614b3e38e1f5d6cb30fa044178893 Mon Sep 17 00:00:00 2001 From: jdhj Date: Tue, 12 Jul 2016 23:21:16 +0100 Subject: [PATCH 3880/5486] Removed some content to fit into 100 line limit --- english/plugh/maze1/maze1.md | 2 -- english/plugh/maze2/maze2.md | 2 -- english/plugh/maze3/maze3.md | 2 -- english/plugh/maze4/maze4.md | 2 -- 4 files changed, 8 deletions(-) diff --git a/english/plugh/maze1/maze1.md b/english/plugh/maze1/maze1.md index f57731baad..9c8af3ffb9 100644 --- a/english/plugh/maze1/maze1.md +++ b/english/plugh/maze1/maze1.md @@ -18,6 +18,4 @@ Which way should we go? [southeast](maze1.md) -[up](maze1.md) - [down](maze1.md) diff --git a/english/plugh/maze2/maze2.md b/english/plugh/maze2/maze2.md index 3817fd375f..a7851f25d1 100644 --- a/english/plugh/maze2/maze2.md +++ b/english/plugh/maze2/maze2.md @@ -18,6 +18,4 @@ Which way should we go? [southeast](../maze3/maze3.md) -[up](../maze1/maze1.md) - [down](../maze1/maze1.md) diff --git a/english/plugh/maze3/maze3.md b/english/plugh/maze3/maze3.md index e7007afe3c..1a8d68c056 100644 --- a/english/plugh/maze3/maze3.md +++ b/english/plugh/maze3/maze3.md @@ -18,6 +18,4 @@ Which way should we go? [southeast](../maze1/maze1.md) -[up](../maze1/maze1.md) - [down](../maze4/maze4.md) diff --git a/english/plugh/maze4/maze4.md b/english/plugh/maze4/maze4.md index 07af5b1862..50c93083bc 100644 --- a/english/plugh/maze4/maze4.md +++ b/english/plugh/maze4/maze4.md @@ -18,6 +18,4 @@ Which way should we go? [southeast](../maze1/maze1.md) -[up](../maze1/maze1.md) - [down](../maze1/maze1.md) From 24d350c84f5e02caaee30a01676a518fd4720ddc Mon Sep 17 00:00:00 2001 From: Henrique Faria Date: Tue, 12 Jul 2016 22:29:13 -0300 Subject: [PATCH 3881/5486] Add cool ending story --- portugues/colaborando.md | 2 ++ portugues/historia/fim.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 portugues/historia/fim.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 2a9de9cb1e..1b9d17ed0f 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -54,3 +54,5 @@ BR BR BR Hue hue hue!!!! [Você vira um jogador...](futebol/futebol.md) +[História com um fim muito legal] (historia/fim.md) + diff --git a/portugues/historia/fim.md b/portugues/historia/fim.md new file mode 100644 index 0000000000..62df7c1784 --- /dev/null +++ b/portugues/historia/fim.md @@ -0,0 +1 @@ +Fim muito legal :) \ No newline at end of file From 5095fec796f46161169a7c70b293873655f1778d Mon Sep 17 00:00:00 2001 From: Burcu Noyan Date: Tue, 12 Jul 2016 21:39:09 -0400 Subject: [PATCH 3882/5486] Add option to take a plane to Vegas --- .../go-with-scully/hanging-with-scully/hanging-with-scully.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/talk_to_neighbour/woman/go-with-scully/hanging-with-scully/hanging-with-scully.md b/english/talk_to_neighbour/woman/go-with-scully/hanging-with-scully/hanging-with-scully.md index 4b169eab69..5718bb7944 100644 --- a/english/talk_to_neighbour/woman/go-with-scully/hanging-with-scully/hanging-with-scully.md +++ b/english/talk_to_neighbour/woman/go-with-scully/hanging-with-scully/hanging-with-scully.md @@ -1 +1,3 @@ -There's a scientist of sorts that can help us understand the situation. But he lives in Las Vegas. \ No newline at end of file +There's a scientist of sorts that can help us understand the situation. But he lives in Las Vegas. + +[Get on a plane to Vegas] (../../../../forest/forest.md) \ No newline at end of file From 8b21088c7901188b760a877a316950db56738bca Mon Sep 17 00:00:00 2001 From: mclee3360 Date: Wed, 13 Jul 2016 14:03:25 +0900 Subject: [PATCH 3883/5486] Add new page about Love Live --- english/LoveLive/lovelive.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 english/LoveLive/lovelive.md diff --git a/english/LoveLive/lovelive.md b/english/LoveLive/lovelive.md new file mode 100644 index 0000000000..4ca4f56c93 --- /dev/null +++ b/english/LoveLive/lovelive.md @@ -0,0 +1,30 @@ +Love Live! School Idol Project (ラブライブ! School idol project) is a Japanese multimedia project + co-developed by ASCII Media Works' Dengeki G's Magazine, music label Lantis, and animation studio + Sunrise. The project revolves around a group of fictional school girls who become idols in order + to save their school from shutting down. It launched in the August 2010 issue of Dengeki G's Magazine, + and went on to produce music CDs, anime music videos, two manga adaptations, and video games. + +A 13-episode anime television series produced by Sunrise and directed by Takahiko Kyōgoku aired + in Japan between January and March 2013, with a second season airing between April and June 2014. + An animated film titled Love Live! The School Idol Movie was distributed by Shochiku and released + in June 2015. Both anime series and the film are licensed in North America, the United Kingdom, + Australia and New Zealand by NIS America, MVM Entertainment and Madman Entertainment, respectively. + A separate project titled Love Live! Sunshine!! focuses on a new group of school idols, and an anime + television series based on the project premiered in July 2016. + +[Source: [Wikipedia](https://en.wikipedia.org/wiki/Love_Live!)] + +Now that you've gone full weeaboo, you've prepared yourself for the 700+ episodes + (as of July 2016) of the hit anime series [One Piece](../onepiece/op.md). + +[Link](http://myanimelist.net/anime/15051/Love_Live_School_Idol_Project) to info + about the first season. + +[Link](http://myanimelist.net/anime/19111/Love_Live_School_Idol_Project_2nd_Season) to info + about the second season. + +[Link](http://myanimelist.net/anime/24997/Love_Live_The_School_Idol_Movie) to info + about the movie. + +[Link](http://myanimelist.net/anime/32526/Love_Live_Sunshine) to info + about Sunshine anime series. From eec751e02df2edc390d351e5882450e4727f01e2 Mon Sep 17 00:00:00 2001 From: mclee3360 Date: Wed, 13 Jul 2016 14:04:42 +0900 Subject: [PATCH 3884/5486] Add link to another anime Connected to Love Live! School Idol Project. --- english/Full Metal Alchemist/fma.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/Full Metal Alchemist/fma.md b/english/Full Metal Alchemist/fma.md index 6bfb71d2ac..1b16d32442 100644 --- a/english/Full Metal Alchemist/fma.md +++ b/english/Full Metal Alchemist/fma.md @@ -18,3 +18,6 @@ mother back to life using alchemy. Click [here](../alchemy/alchemy.md) to learn more about alchemy. [Don't know what to do next?](../working/working.md) + +But this is just the beginning. To become full weeaboo trash, you must fall down +into the depths of [idol hell](../LoveLive/lovelive.md)... \ No newline at end of file From 74a3d1bcd09d5c74d345a5cf5afdaf4ca8233005 Mon Sep 17 00:00:00 2001 From: Ma Daj Date: Wed, 13 Jul 2016 22:00:11 +1000 Subject: [PATCH 3885/5486] Create response to slap in bear/bear.md - slap-response/slap-response.md --- english/bear/bear.md | 4 +++- english/slap-response/slap-response.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/slap-response/slap-response.md diff --git a/english/bear/bear.md b/english/bear/bear.md index 55aafa8e15..b9e81fc9cc 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -6,4 +6,6 @@ You are now drunk. You stumble over to the nearest cutie and ask, "Hey baby, wha When she slaps you in the face... -[You vomit on top of her](../vomit/vomit.md) \ No newline at end of file +[You vomit on top of her](../vomit/vomit.md) + +..., holding your hand to your red cheek (you say) [..slap-response/slap-response.md] \ No newline at end of file diff --git a/english/slap-response/slap-response.md b/english/slap-response/slap-response.md new file mode 100644 index 0000000000..f65f45ba60 --- /dev/null +++ b/english/slap-response/slap-response.md @@ -0,0 +1 @@ +"urasinner!"; smile and add "aren't we all", turning your other cheek. \ No newline at end of file From 1eedc2b3194a3186a31bf39023bba515802818d7 Mon Sep 17 00:00:00 2001 From: Vladimir-Markovic Date: Wed, 13 Jul 2016 22:19:41 +1000 Subject: [PATCH 3886/5486] Add slash after dot dot in a link to md file. --- english/bear/bear.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bear/bear.md b/english/bear/bear.md index b9e81fc9cc..f6968f5f83 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -8,4 +8,4 @@ When she slaps you in the face... [You vomit on top of her](../vomit/vomit.md) -..., holding your hand to your red cheek (you say) [..slap-response/slap-response.md] \ No newline at end of file +..., holding your hand to your red cheek (you say) [../slap-response/slap-response.md] From 49ca3fbfa1afaff84aa41c44a23473f910fb2872 Mon Sep 17 00:00:00 2001 From: Vladimir-Markovic Date: Wed, 13 Jul 2016 22:23:50 +1000 Subject: [PATCH 3887/5486] Swapped brackets in a link. --- english/bear/bear.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/bear/bear.md b/english/bear/bear.md index f6968f5f83..25506be5ee 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -8,4 +8,4 @@ When she slaps you in the face... [You vomit on top of her](../vomit/vomit.md) -..., holding your hand to your red cheek (you say) [../slap-response/slap-response.md] +..., holding your hand to your red cheek [you say] (../slap-response/slap-response.md) From e5d61bb7669dab4a236ac777c397694e01429a09 Mon Sep 17 00:00:00 2001 From: Tom Collins Date: Wed, 13 Jul 2016 13:08:51 -0400 Subject: [PATCH 3888/5486] add catwoman to batman adventure --- english/I'm-batman/batman.md | 2 ++ english/I'm-batman/catwoman/catwoman.md | 3 +++ english/I'm-batman/catwoman/pursue/pursue.md | 1 + english/I'm-batman/catwoman/vacation/vacation.md | 1 + 4 files changed, 7 insertions(+) create mode 100644 english/I'm-batman/catwoman/catwoman.md create mode 100644 english/I'm-batman/catwoman/pursue/pursue.md create mode 100644 english/I'm-batman/catwoman/vacation/vacation.md diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index 5ac0201bc7..d4b001ebcf 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -8,3 +8,5 @@ Alfred Pennyworth: Why do we fall sir? So we might learn to pick ourselves up. Bruce Wayne: You still haven't given up on [me](https://www.youtube.com/watch?v=u843KNE-exo)? Batman: [It's time...](../batmetal/batmetal.md) + +The batphone is ringing, [answer](../catwoman/catwoman.md)? \ No newline at end of file diff --git a/english/I'm-batman/catwoman/catwoman.md b/english/I'm-batman/catwoman/catwoman.md new file mode 100644 index 0000000000..b552a67e2d --- /dev/null +++ b/english/I'm-batman/catwoman/catwoman.md @@ -0,0 +1,3 @@ +The batphone rings. Its commissioner Gordon telling you Catwoman just robbed Gotham National Bank! + +Do you pursue Catwoman? [Yes](../pursue/pursue.md) or [No](../vacation/vacation.md) \ No newline at end of file diff --git a/english/I'm-batman/catwoman/pursue/pursue.md b/english/I'm-batman/catwoman/pursue/pursue.md new file mode 100644 index 0000000000..1db0977255 --- /dev/null +++ b/english/I'm-batman/catwoman/pursue/pursue.md @@ -0,0 +1 @@ +Your in hot pursuit Batman! \ No newline at end of file diff --git a/english/I'm-batman/catwoman/vacation/vacation.md b/english/I'm-batman/catwoman/vacation/vacation.md new file mode 100644 index 0000000000..d8c8fe306b --- /dev/null +++ b/english/I'm-batman/catwoman/vacation/vacation.md @@ -0,0 +1 @@ +You decide you need a vacation from crime fighting... \ No newline at end of file From 4fdb23792859b23eb00ec6a6810754eafcb02da4 Mon Sep 17 00:00:00 2001 From: Tom Collins Date: Wed, 13 Jul 2016 13:18:29 -0400 Subject: [PATCH 3889/5486] fixed link bugs --- english/I'm-batman/batman.md | 2 +- english/I'm-batman/catwoman/catwoman.md | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index d4b001ebcf..71c53c0bc6 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -9,4 +9,4 @@ Bruce Wayne: You still haven't given up on [me](https://www.youtube.com/watch?v= Batman: [It's time...](../batmetal/batmetal.md) -The batphone is ringing, [answer](../catwoman/catwoman.md)? \ No newline at end of file +The batphone is ringing, [answer](/catwoman/catwoman.md)? \ No newline at end of file diff --git a/english/I'm-batman/catwoman/catwoman.md b/english/I'm-batman/catwoman/catwoman.md index b552a67e2d..32d83f8ac5 100644 --- a/english/I'm-batman/catwoman/catwoman.md +++ b/english/I'm-batman/catwoman/catwoman.md @@ -1,3 +1,9 @@ The batphone rings. Its commissioner Gordon telling you Catwoman just robbed Gotham National Bank! -Do you pursue Catwoman? [Yes](../pursue/pursue.md) or [No](../vacation/vacation.md) \ No newline at end of file +Do you pursue Catwoman? + +[Yes](../pursue/pursue.md) + +or + +[No](/vacation/vacation.md) \ No newline at end of file From eb1bf9f8b10a99d0830206981b3fd2e602c1ef91 Mon Sep 17 00:00:00 2001 From: Tom Collins Date: Wed, 13 Jul 2016 13:32:17 -0400 Subject: [PATCH 3890/5486] fix link again --- english/I'm-batman/batman.md | 2 +- english/I'm-batman/catwoman/catwoman.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/english/I'm-batman/batman.md b/english/I'm-batman/batman.md index 71c53c0bc6..94a7e61552 100644 --- a/english/I'm-batman/batman.md +++ b/english/I'm-batman/batman.md @@ -9,4 +9,4 @@ Bruce Wayne: You still haven't given up on [me](https://www.youtube.com/watch?v= Batman: [It's time...](../batmetal/batmetal.md) -The batphone is ringing, [answer](/catwoman/catwoman.md)? \ No newline at end of file +The batphone is ringing, [answer](catwoman/catwoman.md)? \ No newline at end of file diff --git a/english/I'm-batman/catwoman/catwoman.md b/english/I'm-batman/catwoman/catwoman.md index 32d83f8ac5..d46ab29d72 100644 --- a/english/I'm-batman/catwoman/catwoman.md +++ b/english/I'm-batman/catwoman/catwoman.md @@ -2,8 +2,8 @@ The batphone rings. Its commissioner Gordon telling you Catwoman just robbed Got Do you pursue Catwoman? -[Yes](../pursue/pursue.md) +[Yes](pursue/pursue.md) or -[No](/vacation/vacation.md) \ No newline at end of file +[No](vacation/vacation.md) \ No newline at end of file From 3126b18783dfe9270037ee781de731e11ebad526 Mon Sep 17 00:00:00 2001 From: EKT1 Date: Wed, 13 Jul 2016 21:37:31 +0300 Subject: [PATCH 3891/5486] Add description of enjoying beer outside of sauna. --- finnish/sauna.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/finnish/sauna.md b/finnish/sauna.md index bed29fa29e..1b5ecd7c4b 100644 --- a/finnish/sauna.md +++ b/finnish/sauna.md @@ -1,7 +1,7 @@ -Istut saunan terassilla. +Istut saunan terassilla. Nautit jääkylmää olutta tölkistä, ja se poreilee suussasi ihanasti. Katsellessasi tyyntä järveä kuulet kuikan huudot hämärtyvässä elokuun alun illassa. Mene uimaan painamalla [tästä](järvi/järvi.md) -Palaa [löylyyn](loyly/loyly.md) \ No newline at end of file +Palaa [löylyyn](loyly/loyly.md) From ec104c0b44ae8e3a29e0615428f976b52e6fe267 Mon Sep 17 00:00:00 2001 From: EKT1 Date: Wed, 13 Jul 2016 21:49:07 +0300 Subject: [PATCH 3892/5486] Add enjoying ice-cold beverage outside of sauna. --- finnish/sauna.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/finnish/sauna.md b/finnish/sauna.md index 1b5ecd7c4b..90786e6964 100644 --- a/finnish/sauna.md +++ b/finnish/sauna.md @@ -1,4 +1,6 @@ -Istut saunan terassilla. Nautit jääkylmää olutta tölkistä, ja se poreilee suussasi ihanasti. +Istut saunan terassilla. + +Nautit jääkylmää olutta tölkistä, ja se poreilee suussasi ihanasti. Katsellessasi tyyntä järveä kuulet kuikan huudot hämärtyvässä elokuun alun illassa. From 7cf6e10d7163d19e9a4dbc4b69d6b1de4d96d64c Mon Sep 17 00:00:00 2001 From: Miles Eastwood Date: Wed, 13 Jul 2016 19:57:46 -0400 Subject: [PATCH 3893/5486] Add work-out option --- english/marshmallow.md | 2 ++ english/work-out/run/run.md | 4 ++++ english/work-out/weights/weights.md | 6 ++++++ english/work-out/work-out.md | 8 ++++++++ 4 files changed, 20 insertions(+) create mode 100644 english/work-out/run/run.md create mode 100644 english/work-out/weights/weights.md create mode 100644 english/work-out/work-out.md diff --git a/english/marshmallow.md b/english/marshmallow.md index a698acc46b..1dfdb46c31 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -75,6 +75,8 @@ and search for your [destiny](destiny/destiny.md). Before we begin, do you need a [warm-up?](warm-up/warm-up.md) +Once you're warmed up, why not try a [work out?](work-out/work-out.md) + or maybe [eat that delicious cucumber sandwich?](sandwich/sandwich.md) After warming up, take a minute and reflect on your [love for udacity](love-udacity/love-udacity.md) diff --git a/english/work-out/run/run.md b/english/work-out/run/run.md new file mode 100644 index 0000000000..11ab67ae54 --- /dev/null +++ b/english/work-out/run/run.md @@ -0,0 +1,4 @@ +You lace up your 10 year old tennis shoes and hit the road running. + +Unfortunatly you're not quite as fit as you were in highschool, and +turn around after half a kilometer. Better than nothing! \ No newline at end of file diff --git a/english/work-out/weights/weights.md b/english/work-out/weights/weights.md new file mode 100644 index 0000000000..a73039d5f0 --- /dev/null +++ b/english/work-out/weights/weights.md @@ -0,0 +1,6 @@ +You head to the garage and dust off the old bench press. You load up 135 pounds, +thinking "I remember how easy this was in high-school...". + +After getting under the bar, you quickly realize you are no longer as strong as +you were in highschool. Struggling to press the bar back up, you concede to gravity +and sheepishly roll the bar down off yourself. \ No newline at end of file diff --git a/english/work-out/work-out.md b/english/work-out/work-out.md new file mode 100644 index 0000000000..88f230e700 --- /dev/null +++ b/english/work-out/work-out.md @@ -0,0 +1,8 @@ +Now that you've made a good life desicion and decided to work out, you now must +choose your method. Do you: + +Work that cardiovascular system by going for a [run](/run/run.md)? + +Or... + +Attempt to get super swole by lifting some [weights](/weights/weights.md)? \ No newline at end of file From 756fa11f65f222baf1991dfd7ee1f5744f7ba03d Mon Sep 17 00:00:00 2001 From: Miles Eastwood Date: Wed, 13 Jul 2016 20:12:05 -0400 Subject: [PATCH 3894/5486] Fix links in work-out.md --- english/work-out/work-out.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/work-out/work-out.md b/english/work-out/work-out.md index 88f230e700..129e3e0c31 100644 --- a/english/work-out/work-out.md +++ b/english/work-out/work-out.md @@ -1,8 +1,8 @@ Now that you've made a good life desicion and decided to work out, you now must choose your method. Do you: -Work that cardiovascular system by going for a [run](/run/run.md)? +Work that cardiovascular system by going for a [run](run/run.md)? Or... -Attempt to get super swole by lifting some [weights](/weights/weights.md)? \ No newline at end of file +Attempt to get super swole by lifting some [weights](weights/weights.md)? \ No newline at end of file From 6a0c9208bab8358bf847e11abd065da47e649364 Mon Sep 17 00:00:00 2001 From: lo16 Date: Thu, 14 Jul 2016 14:34:01 +0800 Subject: [PATCH 3895/5486] potato --- english/wikipedia/wiki.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/wikipedia/wiki.md b/english/wikipedia/wiki.md index 58a4c78b91..3e9fef5531 100644 --- a/english/wikipedia/wiki.md +++ b/english/wikipedia/wiki.md @@ -6,6 +6,8 @@ It is best of the internet. It is free. +Potato + It is mesmerizing. It is transcendental. From 138fc28be15e805c8684f802806bb46370256f00 Mon Sep 17 00:00:00 2001 From: barrykeegan Date: Thu, 14 Jul 2016 16:06:06 +0100 Subject: [PATCH 3896/5486] Add Millenium Falcon addition --- english/millenium-falcon/flyaway.md | 4 ++++ english/millenium-falcon/hansolo/hansolo.md | 7 +++++++ 2 files changed, 11 insertions(+) create mode 100644 english/millenium-falcon/hansolo/hansolo.md diff --git a/english/millenium-falcon/flyaway.md b/english/millenium-falcon/flyaway.md index 7279ab9bec..72489dbb15 100644 --- a/english/millenium-falcon/flyaway.md +++ b/english/millenium-falcon/flyaway.md @@ -1,3 +1,7 @@ Suddenly you encounter a giant flying ship lying on the side, and you draw closer your heart starts beating fast. Wait, could it be? Could it really be the Millenium Falcon? As you pinch yourself and realize you're not dreaming, you now enter this giant ship and turn on the controls ! Fly way, you lucky brat, fly away ! + +"Hey Chewy, who's flying this infernal machine?" You suddenly hear being asked from one of the dark corridors off the cockpit. You're not alone! + +You hear footsteps coming your way, you must decide to [hide inside the doorway](hansolo/hansolo.md) and evade detection or [shoot first](https://en.wikipedia.org/wiki/Han_shot_first) \ No newline at end of file diff --git a/english/millenium-falcon/hansolo/hansolo.md b/english/millenium-falcon/hansolo/hansolo.md new file mode 100644 index 0000000000..96e5f8e443 --- /dev/null +++ b/english/millenium-falcon/hansolo/hansolo.md @@ -0,0 +1,7 @@ +A man walks through the door a second after you get into your hiding spot, you get ready to strike him on the head and when you pounce from your position a big furry hand grabs you from behind. + +"Eject him out the airlock, Chewy" the man says. + +"Eeeeggghhhhaaaaaeeeeeaaaggh" replies the furry handed creature. + +You're brought to the closest airlock, tossed inside and as the inner door closes you regret not checking the ship before flying away on it. \ No newline at end of file From cc83b818f4c39567527613293e1cb23b3cf55194 Mon Sep 17 00:00:00 2001 From: Youssef Ghrib Date: Thu, 14 Jul 2016 18:12:50 +0100 Subject: [PATCH 3897/5486] Add angry prince story --- english/angry_prince/angry_prince.md | 13 +++++++++++++ english/marshmallow.md | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 english/angry_prince/angry_prince.md diff --git a/english/angry_prince/angry_prince.md b/english/angry_prince/angry_prince.md new file mode 100644 index 0000000000..f0ae39ea84 --- /dev/null +++ b/english/angry_prince/angry_prince.md @@ -0,0 +1,13 @@ +There once was a prince who was angry. + +It was peace time and he had a lot of duties to do. But his rumbling rage was too powerful to handle. + +He decided to take the biggest sword in the kingdom. + +It was this [sword](https://i.ytimg.com/vi/ICatpGotaNs/maxresdefault.jpg). + +Satisfied with the sword, He asked for the craftsman to come in his palace to thank him. + +Little did he know, that sword will change everything he knows.... + +But more on that later. For now, the prince must tend to his royal duties. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 1dfdb46c31..c345b42e64 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1035,3 +1035,5 @@ My visit to the [zoo](zoo/zoo.md). You wake up confused, you faint you go back in [time](time-travel/time-travel.md) [The Hungry Prince](hungry_prince/hungry_prince.md) + +[The Angry Prince](angry_prince/angry_prince.md) From ef4ad275fa6dd30748b5030b976b269c327d5a14 Mon Sep 17 00:00:00 2001 From: jdhj Date: Thu, 14 Jul 2016 18:48:33 +0100 Subject: [PATCH 3898/5486] another secret door added to the maze in the hope of getting a conflict to deal with --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index a698acc46b..7332fc014d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1033,3 +1033,5 @@ My visit to the [zoo](zoo/zoo.md). You wake up confused, you faint you go back in [time](time-travel/time-travel.md) [The Hungry Prince](hungry_prince/hungry_prince.md) + +The password is [xyzzy](plugh/plugh.md) From 305b2a74dee520d52fab63ecb131915a75afbc74 Mon Sep 17 00:00:00 2001 From: barrykeegan Date: Thu, 14 Jul 2016 18:55:50 +0100 Subject: [PATCH 3899/5486] Fix line lengths and multiple links --- english/millenium-falcon/flyaway.md | 5 ++++- english/millenium-falcon/hansolo/hansolo.md | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/english/millenium-falcon/flyaway.md b/english/millenium-falcon/flyaway.md index 72489dbb15..bdb8a21048 100644 --- a/english/millenium-falcon/flyaway.md +++ b/english/millenium-falcon/flyaway.md @@ -4,4 +4,7 @@ you now enter this giant ship and turn on the controls ! Fly way, you lucky brat "Hey Chewy, who's flying this infernal machine?" You suddenly hear being asked from one of the dark corridors off the cockpit. You're not alone! -You hear footsteps coming your way, you must decide to [hide inside the doorway](hansolo/hansolo.md) and evade detection or [shoot first](https://en.wikipedia.org/wiki/Han_shot_first) \ No newline at end of file +You hear footsteps coming your way, you must decide to +[hide inside the doorway](hansolo/hansolo.md) and evade detection... + +...or maybe you should [shoot first!](https://en.wikipedia.org/wiki/Han_shot_first) \ No newline at end of file diff --git a/english/millenium-falcon/hansolo/hansolo.md b/english/millenium-falcon/hansolo/hansolo.md index 96e5f8e443..d0f62f67e0 100644 --- a/english/millenium-falcon/hansolo/hansolo.md +++ b/english/millenium-falcon/hansolo/hansolo.md @@ -1,7 +1,12 @@ -A man walks through the door a second after you get into your hiding spot, you get ready to strike him on the head and when you pounce from your position a big furry hand grabs you from behind. +A man walks through the door a second after you get into +your hiding spot, you get ready to strike him on the head +and when you pounce from your position a big furry hand +grabs you from behind. "Eject him out the airlock, Chewy" the man says. "Eeeeggghhhhaaaaaeeeeeaaaggh" replies the furry handed creature. -You're brought to the closest airlock, tossed inside and as the inner door closes you regret not checking the ship before flying away on it. \ No newline at end of file +You're brought to the closest airlock, tossed inside and as +the inner door closes you regret not checking the ship +before flying away on it. \ No newline at end of file From 07884fa5dccd9ca703cf863f28fee64cf8c09710 Mon Sep 17 00:00:00 2001 From: barrykeegan Date: Thu, 14 Jul 2016 18:59:09 +0100 Subject: [PATCH 3900/5486] Fix line lengths --- english/millenium-falcon/flyaway.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/millenium-falcon/flyaway.md b/english/millenium-falcon/flyaway.md index bdb8a21048..bc033fde14 100644 --- a/english/millenium-falcon/flyaway.md +++ b/english/millenium-falcon/flyaway.md @@ -2,7 +2,9 @@ Suddenly you encounter a giant flying ship lying on the side, and you draw close Wait, could it be? Could it really be the Millenium Falcon? As you pinch yourself and realize you're not dreaming, you now enter this giant ship and turn on the controls ! Fly way, you lucky brat, fly away ! -"Hey Chewy, who's flying this infernal machine?" You suddenly hear being asked from one of the dark corridors off the cockpit. You're not alone! +"Hey Chewy, who's flying this infernal machine?" You +suddenly hear being asked from one of the dark corridors +off the cockpit. You're not alone! You hear footsteps coming your way, you must decide to [hide inside the doorway](hansolo/hansolo.md) and evade detection... From aebcfc81769db21499ba7cd91c9b357cf5477d16 Mon Sep 17 00:00:00 2001 From: Uli21 Date: Thu, 14 Jul 2016 23:26:15 -0500 Subject: [PATCH 3901/5486] =?UTF-8?q?Agregar=20opci=C3=B3n=20de=20desmayo?= =?UTF-8?q?=20a=20historia=20principal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/canudos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index 4253e9e75b..12151d5a8c 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -152,3 +152,5 @@ Y llego [Daynerys Targaryen](thrones/daynerys.md) [Temeroso, ordenó que lo guiaran al pasadizo que le llevaría fuera de la ciudad](pasadizo/pasadizo.md) +Recordó algunos crímenes que pesaban sobre él y de la nada perdió el conocimiento(desmayo/desmayo.md) + From 72d6ba930f444a976453db5fdecbaaf2534b1364 Mon Sep 17 00:00:00 2001 From: Ben Read Date: Fri, 15 Jul 2016 10:07:19 +0100 Subject: [PATCH 3902/5486] Added link to superpowers from swim --- english/swim/swim.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/swim/swim.md b/english/swim/swim.md index da597870a9..5a8c22cb68 100644 --- a/english/swim/swim.md +++ b/english/swim/swim.md @@ -1,3 +1,7 @@ -Swim while sleeping is really cool but dangerous. You swam for 10 min and decided to give it up. +Swim while sleeping is really cool but dangerous. You swam for 10 min and decided to give it up. But then you decided to try again, and jumped into the water whilst sleeping. + +As you swim more, you rise to the surface and find yourself flying out of the water. +But you are not asleep anymore, and you now have super powers! Do you choose to +[save the world](../super-powers/practice-flying.md) or just fly around forever? From 455ccba132bda922e78446f0988a8a842e527d82 Mon Sep 17 00:00:00 2001 From: Ben Read Date: Fri, 15 Jul 2016 10:24:54 +0100 Subject: [PATCH 3903/5486] Readded the deleted space --- english/swim/swim.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/swim/swim.md b/english/swim/swim.md index 5a8c22cb68..688ed744af 100644 --- a/english/swim/swim.md +++ b/english/swim/swim.md @@ -1,4 +1,4 @@ -Swim while sleeping is really cool but dangerous. You swam for 10 min and decided to give it up. +Swim while sleeping is really cool but dangerous. You swam for 10 min and decided to give it up. But then you decided to try again, and jumped into the water whilst sleeping. From d7fcad622c44606b707d1bfd8232a071c8876765 Mon Sep 17 00:00:00 2001 From: ab697 Date: Fri, 15 Jul 2016 16:34:18 +0100 Subject: [PATCH 3904/5486] pratesk istorija garsiau/ --- lithuanian/rekti/garsiau/atsibusti/atsibusti.md | 1 + lithuanian/rekti/garsiau/begti/begti.md | 1 + lithuanian/rekti/garsiau/garsiau.md | 10 +++++++++- lithuanian/rekti/garsiau/ginklas/ginklas.md | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 lithuanian/rekti/garsiau/atsibusti/atsibusti.md create mode 100644 lithuanian/rekti/garsiau/begti/begti.md create mode 100644 lithuanian/rekti/garsiau/ginklas/ginklas.md diff --git a/lithuanian/rekti/garsiau/atsibusti/atsibusti.md b/lithuanian/rekti/garsiau/atsibusti/atsibusti.md new file mode 100644 index 0000000000..69a680789f --- /dev/null +++ b/lithuanian/rekti/garsiau/atsibusti/atsibusti.md @@ -0,0 +1 @@ +Atsibusdo visiškoje tamsoje, o vilkai - dingę. \ No newline at end of file diff --git a/lithuanian/rekti/garsiau/begti/begti.md b/lithuanian/rekti/garsiau/begti/begti.md new file mode 100644 index 0000000000..b7dee976ac --- /dev/null +++ b/lithuanian/rekti/garsiau/begti/begti.md @@ -0,0 +1 @@ +Jis bėgo kaip niekada gyvenime nebuvo bėgęs... \ No newline at end of file diff --git a/lithuanian/rekti/garsiau/garsiau.md b/lithuanian/rekti/garsiau/garsiau.md index dbf5e1af91..a2150f44a2 100644 --- a/lithuanian/rekti/garsiau/garsiau.md +++ b/lithuanian/rekti/garsiau/garsiau.md @@ -1 +1,9 @@ -Netrukus atbėgo trys vilkai +Netrukus atbėgo trys vilkai. + +Ir jis... + +[Pradėjo bėgti](begti/begti.md) + +[Atsibudo](atsibusti/atsibudo.md) + +[Ieškojo ginklo](ginklas/ginklas.md) diff --git a/lithuanian/rekti/garsiau/ginklas/ginklas.md b/lithuanian/rekti/garsiau/ginklas/ginklas.md new file mode 100644 index 0000000000..08b52f2575 --- /dev/null +++ b/lithuanian/rekti/garsiau/ginklas/ginklas.md @@ -0,0 +1 @@ +Bet tamsoje nieko nerado... \ No newline at end of file From a81e11e1c67c88f2037d6456bc563dbff65f9af1 Mon Sep 17 00:00:00 2001 From: ab697 Date: Fri, 15 Jul 2016 16:38:57 +0100 Subject: [PATCH 3905/5486] fix: pataisyk atsibusti/atsibudo.md -> atsibusti/atsibusti.md --- lithuanian/rekti/garsiau/garsiau.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lithuanian/rekti/garsiau/garsiau.md b/lithuanian/rekti/garsiau/garsiau.md index a2150f44a2..4eae4dce36 100644 --- a/lithuanian/rekti/garsiau/garsiau.md +++ b/lithuanian/rekti/garsiau/garsiau.md @@ -4,6 +4,6 @@ Ir jis... [Pradėjo bėgti](begti/begti.md) -[Atsibudo](atsibusti/atsibudo.md) +[Atsibudo](atsibusti/atsibusti.md) [Ieškojo ginklo](ginklas/ginklas.md) From 6bda6dcb74aff26cbfb0821f0803e00da786e610 Mon Sep 17 00:00:00 2001 From: ab697 Date: Fri, 15 Jul 2016 16:44:48 +0100 Subject: [PATCH 3906/5486] fix: remove unintentional modification in garsiau.md Line 1. --- lithuanian/rekti/garsiau/garsiau.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lithuanian/rekti/garsiau/garsiau.md b/lithuanian/rekti/garsiau/garsiau.md index 4eae4dce36..a605c3793a 100644 --- a/lithuanian/rekti/garsiau/garsiau.md +++ b/lithuanian/rekti/garsiau/garsiau.md @@ -1,6 +1,6 @@ -Netrukus atbėgo trys vilkai. +Netrukus atbėgo trys vilkai -Ir jis... +...ir jis... [Pradėjo bėgti](begti/begti.md) From 8fd1475615a1be61487e02ca075fa660fee7119d Mon Sep 17 00:00:00 2001 From: ab697 Date: Fri, 15 Jul 2016 16:48:41 +0100 Subject: [PATCH 3907/5486] fix: removed space char at end of garsiau.md line 1 --- lithuanian/rekti/garsiau/garsiau.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lithuanian/rekti/garsiau/garsiau.md b/lithuanian/rekti/garsiau/garsiau.md index a605c3793a..f72fb1a1cf 100644 --- a/lithuanian/rekti/garsiau/garsiau.md +++ b/lithuanian/rekti/garsiau/garsiau.md @@ -1,4 +1,4 @@ -Netrukus atbėgo trys vilkai +Netrukus atbėgo trys vilkai ...ir jis... From d91e3df793242f43040a9a1c3105fa6116e29ca8 Mon Sep 17 00:00:00 2001 From: jcpleite Date: Fri, 15 Jul 2016 19:56:13 -0300 Subject: [PATCH 3908/5486] Add my own JC history --- portugues/colaborando.md | 3 +-- portugues/jc/jc.md | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 portugues/jc/jc.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 1b9d17ed0f..24ede293e5 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -37,8 +37,6 @@ A sua linha telefônica está uma droga hoje e você tem que baixar a ultima ver O Git te parece ser util, mas como você ainda não vive no século XXI, você está mais preocupado com esse tal de Windows. - - Mas te bateu uma fome danada e você não tem nada na geladeira e nenhum tostão. Vende seu PC? @@ -56,3 +54,4 @@ BR BR BR Hue hue hue!!!! [História com um fim muito legal] (historia/fim.md) +[Corrigiria o bug fazendo o seguinte] (jc/jc.md) diff --git a/portugues/jc/jc.md b/portugues/jc/jc.md new file mode 100644 index 0000000000..a0d61f5f25 --- /dev/null +++ b/portugues/jc/jc.md @@ -0,0 +1,5 @@ +Eu primeiro faço o fork da branch. +Depois faço o pull da branch para meu notebook. +Crio uma branch para fazer o change e commit da correç]ao desse bug. +Depois faço o push dessa branch. +Ai no GitHub faço o Pull Request. \ No newline at end of file From 0d4a4d5eba00ffb81bf2e15caf0a7282db32cf17 Mon Sep 17 00:00:00 2001 From: jcpleite Date: Fri, 15 Jul 2016 20:44:03 -0300 Subject: [PATCH 3909/5486] Delete lines for 120 caracteres --- portugues/jc/jc.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/portugues/jc/jc.md b/portugues/jc/jc.md index a0d61f5f25..59bcfd90db 100644 --- a/portugues/jc/jc.md +++ b/portugues/jc/jc.md @@ -1,5 +1 @@ -Eu primeiro faço o fork da branch. -Depois faço o pull da branch para meu notebook. -Crio uma branch para fazer o change e commit da correç]ao desse bug. -Depois faço o push dessa branch. -Ai no GitHub faço o Pull Request. \ No newline at end of file +Eu primeiro faço o fork da branch. \ No newline at end of file From 17ace0cb03d4af538033e29dba062541ee8d3174 Mon Sep 17 00:00:00 2001 From: jcpleite Date: Fri, 15 Jul 2016 20:50:39 -0300 Subject: [PATCH 3910/5486] Add lines removed --- portugues/colaborando.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 24ede293e5..b0c96f421d 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -37,6 +37,8 @@ A sua linha telefônica está uma droga hoje e você tem que baixar a ultima ver O Git te parece ser util, mas como você ainda não vive no século XXI, você está mais preocupado com esse tal de Windows. + + Mas te bateu uma fome danada e você não tem nada na geladeira e nenhum tostão. Vende seu PC? From 71c87078c103dbcead6b34d2e22b098e11650ab6 Mon Sep 17 00:00:00 2001 From: jcpleite Date: Fri, 15 Jul 2016 21:16:09 -0300 Subject: [PATCH 3911/5486] Delete 2 lines --- portugues/colaborando.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index b0c96f421d..24ede293e5 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -37,8 +37,6 @@ A sua linha telefônica está uma droga hoje e você tem que baixar a ultima ver O Git te parece ser util, mas como você ainda não vive no século XXI, você está mais preocupado com esse tal de Windows. - - Mas te bateu uma fome danada e você não tem nada na geladeira e nenhum tostão. Vende seu PC? From 0d426cc864e30f3785f96e744065cf2ad975c12c Mon Sep 17 00:00:00 2001 From: jcpleite Date: Fri, 15 Jul 2016 21:25:47 -0300 Subject: [PATCH 3912/5486] Add 2 lines again --- portugues/colaborando.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 24ede293e5..b0c96f421d 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -37,6 +37,8 @@ A sua linha telefônica está uma droga hoje e você tem que baixar a ultima ver O Git te parece ser util, mas como você ainda não vive no século XXI, você está mais preocupado com esse tal de Windows. + + Mas te bateu uma fome danada e você não tem nada na geladeira e nenhum tostão. Vende seu PC? From 1565488752e722ddd3135fb2710da337fa15b5ee Mon Sep 17 00:00:00 2001 From: artiom Date: Sat, 16 Jul 2016 17:44:18 +0200 Subject: [PATCH 3913/5486] Wallpaper --- russian/wallpaper/glue.md | 6 ++++++ russian/zefir.md | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 russian/wallpaper/glue.md diff --git a/russian/wallpaper/glue.md b/russian/wallpaper/glue.md new file mode 100644 index 0000000000..09711572e2 --- /dev/null +++ b/russian/wallpaper/glue.md @@ -0,0 +1,6 @@ +Да здесь всё так липко, и мне не соствит труда это сделать. +С чего начать? Ах да, мне же понадобятся некоторые инструменты да и обои. +Да уж ни того ни другого у мнея сечас нет. +Ну и как их выравнивать на слишком липучей поверхности. + +Вообщем сделаю чтонибуть [другое] (../zefir.md) \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index b1bfb5ff2c..979554a3c0 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -106,4 +106,6 @@ [Решите программировать] (programming/to-program.md) -[Отправитесь путешествовать](travelling/go-to-travel.md) \ No newline at end of file +[Отправитесь путешествовать](travelling/go-to-travel.md) + +[Начну клеить обои](wallpaper/glue.md) \ No newline at end of file From f7f12db0c742c0a57ef59b8c1204aa30ef44ad04 Mon Sep 17 00:00:00 2001 From: tobleis Date: Sat, 16 Jul 2016 19:44:57 +0200 Subject: [PATCH 3914/5486] added Bierkeller to the right path --- german/schwimmen/hunger/bierkeller/bierkeller.md | 1 + german/schwimmen/hunger/hunger.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 german/schwimmen/hunger/bierkeller/bierkeller.md diff --git a/german/schwimmen/hunger/bierkeller/bierkeller.md b/german/schwimmen/hunger/bierkeller/bierkeller.md new file mode 100644 index 0000000000..3884e206d6 --- /dev/null +++ b/german/schwimmen/hunger/bierkeller/bierkeller.md @@ -0,0 +1 @@ +Sie schwimmen zum schoenen fraenkischen Bierkeller am Rande des Ufers. Dort bestellen Sie sich erstmal "a Seidla" und "a Kellerbladdn". Gestaerkt ueberlegen Sie sich was als naechstes zu tun ist. diff --git a/german/schwimmen/hunger/hunger.md b/german/schwimmen/hunger/hunger.md index d9b6703625..6e8e1866aa 100644 --- a/german/schwimmen/hunger/hunger.md +++ b/german/schwimmen/hunger/hunger.md @@ -5,3 +5,5 @@ Also hin dort! [Moment mal - Kiosk?](momentmal/momentmal.md) [Renn so schnell wie möglich, damit du der erste bist.](rennen/rennen.md) + +[Wieso Kiosk? Ich nehme lieber den Bierkeller.] (bierkeller/bierkeller.md) From 8fac860b3fa569380419645e4c8952fd42e1a1f2 Mon Sep 17 00:00:00 2001 From: tobleis Date: Sat, 16 Jul 2016 19:48:39 +0200 Subject: [PATCH 3915/5486] fixed too long line --- german/schwimmen/hunger/bierkeller/bierkeller.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/schwimmen/hunger/bierkeller/bierkeller.md b/german/schwimmen/hunger/bierkeller/bierkeller.md index 3884e206d6..240c1ca57b 100644 --- a/german/schwimmen/hunger/bierkeller/bierkeller.md +++ b/german/schwimmen/hunger/bierkeller/bierkeller.md @@ -1 +1,2 @@ -Sie schwimmen zum schoenen fraenkischen Bierkeller am Rande des Ufers. Dort bestellen Sie sich erstmal "a Seidla" und "a Kellerbladdn". Gestaerkt ueberlegen Sie sich was als naechstes zu tun ist. +Sie schwimmen zum schoenen fraenkischen Bierkeller am Rande des Ufers. Dort bestellen Sie sich erstmal +"a Seidla" und "a Kellerbladdn". Gestaerkt ueberlegen Sie sich was als naechstes zu tun ist. From 41de6d1f33c788eeabe8217f5e99fb74f797a851 Mon Sep 17 00:00:00 2001 From: mormool Date: Sat, 16 Jul 2016 22:52:43 +0200 Subject: [PATCH 3916/5486] Add a few lines to Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md --- .../zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md | 6 ++++++ .../gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md index 0bcd36db5f..5501ba76db 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md @@ -1 +1,7 @@ Cała tablica pokryta jest Twoimi bazgrołami i szczerze mowiąc, nie przyniosło to żadnego efektu. Co dalej? + +[Narysuj spodnie](../spodnie/spodnie.md) + +[Narysuj zamek od kurtki](../zamek/zamek.md) + +[Znowu nabazgraj byle co](../bazgroly/bazgroly.md) \ No newline at end of file diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md index e6e0565d33..e10236ddaf 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md @@ -1,4 +1,4 @@ -Marker wydaje się chętni do wykorzystania jak twoja ręka zbliża się do tablicy. +Marker wydaje się chętny do wykorzystania jak twoja ręka zbliża się do tablicy. [Narysuj spodnie](spodnie/spodnie.md) From 66151fcf2619b20e7aa8f044577de1d85f10dc6d Mon Sep 17 00:00:00 2001 From: mormool Date: Sat, 16 Jul 2016 22:58:00 +0200 Subject: [PATCH 3917/5486] Add a few lines to Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md --- .../gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md index e10236ddaf..e6e0565d33 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zmarkerem.md @@ -1,4 +1,4 @@ -Marker wydaje się chętny do wykorzystania jak twoja ręka zbliża się do tablicy. +Marker wydaje się chętni do wykorzystania jak twoja ręka zbliża się do tablicy. [Narysuj spodnie](spodnie/spodnie.md) From 4ded832bac0d446abd9c1797f216484e4ff24b2a Mon Sep 17 00:00:00 2001 From: semitch Date: Sat, 16 Jul 2016 22:10:31 -0400 Subject: [PATCH 3918/5486] Add "What will you do next?" to wave.md --- english/friendly-person/wave/wave.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/friendly-person/wave/wave.md b/english/friendly-person/wave/wave.md index 9c9d98a05c..ca17503c23 100644 --- a/english/friendly-person/wave/wave.md +++ b/english/friendly-person/wave/wave.md @@ -1,5 +1,7 @@ You do wave, but... OMG! They don't seem to be seeing you at all! +What will you do next? + [Throw a rock](throw-rock/throw-rock.md) to get their attention? [Pinch](pinch/pinch.md) them to get their attention? \ No newline at end of file From 2eb4a36f5067a3e14f065991d139a4211e43702e Mon Sep 17 00:00:00 2001 From: artiom Date: Sun, 17 Jul 2016 11:45:24 +0200 Subject: [PATCH 3919/5486] added Glue story --- russian/glue/index.md | 4 ++++ russian/glue/wallpapers.md | 9 +++++++++ russian/wallpaper/glue.md | 6 ------ russian/zefir.md | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 russian/glue/index.md create mode 100644 russian/glue/wallpapers.md delete mode 100644 russian/wallpaper/glue.md diff --git a/russian/glue/index.md b/russian/glue/index.md new file mode 100644 index 0000000000..b81950f1dc --- /dev/null +++ b/russian/glue/index.md @@ -0,0 +1,4 @@ + . + ? + +[ ] (wallpapers.md) \ No newline at end of file diff --git a/russian/glue/wallpapers.md b/russian/glue/wallpapers.md new file mode 100644 index 0000000000..622781e79d --- /dev/null +++ b/russian/glue/wallpapers.md @@ -0,0 +1,9 @@ +Да здесь всё так липко, и мне не соствит труда этого сделать. +С чего начать? Ах да, мне же понадобятся некоторые инструменты да и обои. +Какие бы мне выбрать? +[эти](https://www.google.be/search?q=windows&tbm=isch) или может вот [эти](https://www.google.be/search?q=linux&tbm=isch) +Надо бы обдумать все за и против. + +А пока... + +Сделаю чтонибуть [другое] (../zefir.md) \ No newline at end of file diff --git a/russian/wallpaper/glue.md b/russian/wallpaper/glue.md deleted file mode 100644 index 09711572e2..0000000000 --- a/russian/wallpaper/glue.md +++ /dev/null @@ -1,6 +0,0 @@ -Да здесь всё так липко, и мне не соствит труда это сделать. -С чего начать? Ах да, мне же понадобятся некоторые инструменты да и обои. -Да уж ни того ни другого у мнея сечас нет. -Ну и как их выравнивать на слишком липучей поверхности. - -Вообщем сделаю чтонибуть [другое] (../zefir.md) \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index 979554a3c0..0c268e445a 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -108,4 +108,4 @@ [Отправитесь путешествовать](travelling/go-to-travel.md) -[Начну клеить обои](wallpaper/glue.md) \ No newline at end of file +[Буду клеить](glue/index.md) \ No newline at end of file From 1d0b19caf11d6a528a610333874244daaafa7398 Mon Sep 17 00:00:00 2001 From: pasikiskis Date: Sun, 17 Jul 2016 13:08:27 +0300 Subject: [PATCH 3920/5486] Update apsiciupineti.md --- lithuanian/apsiciupineti/apsiciupineti.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lithuanian/apsiciupineti/apsiciupineti.md b/lithuanian/apsiciupineti/apsiciupineti.md index b102fe3bed..a1af0952f1 100644 --- a/lithuanian/apsiciupineti/apsiciupineti.md +++ b/lithuanian/apsiciupineti/apsiciupineti.md @@ -1,3 +1,5 @@ Apsičiupinėjęs randa kažką kišenėje -Ištraukęs pamato, jog tai žibintuvėlis \ No newline at end of file +Ištraukęs pamato, jog tai žibintuvėlis + +kurį kadaise buvo gavęs iš [raganos](./ragana) From 96abbb4a690495ac9444e0e6bb1b0d4115bb1d5b Mon Sep 17 00:00:00 2001 From: artiom Date: Sun, 17 Jul 2016 12:09:08 +0200 Subject: [PATCH 3921/5486] fixed text length was to long, more 120 characters --- russian/glue/wallpapers.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/russian/glue/wallpapers.md b/russian/glue/wallpapers.md index 622781e79d..02fa19e233 100644 --- a/russian/glue/wallpapers.md +++ b/russian/glue/wallpapers.md @@ -1,7 +1,14 @@ Да здесь всё так липко, и мне не соствит труда этого сделать. С чего начать? Ах да, мне же понадобятся некоторые инструменты да и обои. + Какие бы мне выбрать? -[эти](https://www.google.be/search?q=windows&tbm=isch) или может вот [эти](https://www.google.be/search?q=linux&tbm=isch) + +[эти](https://www.google.be/search?q=windows&tbm=isch) + +или может вот + +[эти](https://www.google.be/search?q=linux&tbm=isch) + Надо бы обдумать все за и против. А пока... From c9fd082d44b5b4a4f2253a6b786b56d69a186cac Mon Sep 17 00:00:00 2001 From: artiom Date: Sun, 17 Jul 2016 12:11:34 +0200 Subject: [PATCH 3922/5486] fix typo --- russian/glue/wallpapers.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/glue/wallpapers.md b/russian/glue/wallpapers.md index 02fa19e233..8d85c0347c 100644 --- a/russian/glue/wallpapers.md +++ b/russian/glue/wallpapers.md @@ -1,5 +1,6 @@ Да здесь всё так липко, и мне не соствит труда этого сделать. -С чего начать? Ах да, мне же понадобятся некоторые инструменты да и обои. + +A с чего начать? Ах да, мне же понадобятся некоторые инструменты да и обои. Какие бы мне выбрать? From 98da604b653815d9c7aa6bb6bec81b33e1aee1c8 Mon Sep 17 00:00:00 2001 From: pasikiskis Date: Sun, 17 Jul 2016 13:12:27 +0300 Subject: [PATCH 3923/5486] Create ragana --- lithuanian/apsiciupineti/ragana | 1 + 1 file changed, 1 insertion(+) create mode 100644 lithuanian/apsiciupineti/ragana diff --git a/lithuanian/apsiciupineti/ragana b/lithuanian/apsiciupineti/ragana new file mode 100644 index 0000000000..4ee3897466 --- /dev/null +++ b/lithuanian/apsiciupineti/ragana @@ -0,0 +1 @@ +Kuri žibintuvėlį buvo užkerėjusi stebuklingais stebuklažodžiais From 9a33212d310055dae5df3d80a10dbd47be672bd7 Mon Sep 17 00:00:00 2001 From: pasikiskis Date: Sun, 17 Jul 2016 13:15:53 +0300 Subject: [PATCH 3924/5486] Delete ragana --- lithuanian/apsiciupineti/ragana | 1 - 1 file changed, 1 deletion(-) delete mode 100644 lithuanian/apsiciupineti/ragana diff --git a/lithuanian/apsiciupineti/ragana b/lithuanian/apsiciupineti/ragana deleted file mode 100644 index 4ee3897466..0000000000 --- a/lithuanian/apsiciupineti/ragana +++ /dev/null @@ -1 +0,0 @@ -Kuri žibintuvėlį buvo užkerėjusi stebuklingais stebuklažodžiais From 979705416fe57fa040dd27abe6c01038eb4400f9 Mon Sep 17 00:00:00 2001 From: pasikiskis Date: Sun, 17 Jul 2016 13:16:25 +0300 Subject: [PATCH 3925/5486] Create ragana --- lithuanian/apsiciupineti/ragana/ragana | 1 + 1 file changed, 1 insertion(+) create mode 100644 lithuanian/apsiciupineti/ragana/ragana diff --git a/lithuanian/apsiciupineti/ragana/ragana b/lithuanian/apsiciupineti/ragana/ragana new file mode 100644 index 0000000000..4ee3897466 --- /dev/null +++ b/lithuanian/apsiciupineti/ragana/ragana @@ -0,0 +1 @@ +Kuri žibintuvėlį buvo užkerėjusi stebuklingais stebuklažodžiais From 2c01948436e7e89366c5cafad88d5dae7b626bc6 Mon Sep 17 00:00:00 2001 From: pasikiskis Date: Sun, 17 Jul 2016 13:17:08 +0300 Subject: [PATCH 3926/5486] Rename ragana to ragana.md --- lithuanian/apsiciupineti/ragana/{ragana => ragana.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lithuanian/apsiciupineti/ragana/{ragana => ragana.md} (100%) diff --git a/lithuanian/apsiciupineti/ragana/ragana b/lithuanian/apsiciupineti/ragana/ragana.md similarity index 100% rename from lithuanian/apsiciupineti/ragana/ragana rename to lithuanian/apsiciupineti/ragana/ragana.md From 05572b789d1c1bc9a5420042f9565d92f46b4869 Mon Sep 17 00:00:00 2001 From: pasikiskis Date: Sun, 17 Jul 2016 13:17:46 +0300 Subject: [PATCH 3927/5486] Update apsiciupineti.md --- lithuanian/apsiciupineti/apsiciupineti.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lithuanian/apsiciupineti/apsiciupineti.md b/lithuanian/apsiciupineti/apsiciupineti.md index a1af0952f1..b1bc7010ab 100644 --- a/lithuanian/apsiciupineti/apsiciupineti.md +++ b/lithuanian/apsiciupineti/apsiciupineti.md @@ -2,4 +2,4 @@ Apsičiupinėjęs randa kažką kišenėje Ištraukęs pamato, jog tai žibintuvėlis -kurį kadaise buvo gavęs iš [raganos](./ragana) +kurį kadaise buvo gavęs iš [raganos](./ragana/ragana.md) From 3e2f78ee1bda079ca463d11c674e3d63c7c58bdb Mon Sep 17 00:00:00 2001 From: artiom Date: Sun, 17 Jul 2016 12:21:00 +0200 Subject: [PATCH 3928/5486] realized that one page per derictory --- russian/glue/{ => glue-wallpapers}/wallpapers.md | 2 +- russian/glue/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename russian/glue/{ => glue-wallpapers}/wallpapers.md (88%) diff --git a/russian/glue/wallpapers.md b/russian/glue/glue-wallpapers/wallpapers.md similarity index 88% rename from russian/glue/wallpapers.md rename to russian/glue/glue-wallpapers/wallpapers.md index 8d85c0347c..a50b25a56a 100644 --- a/russian/glue/wallpapers.md +++ b/russian/glue/glue-wallpapers/wallpapers.md @@ -14,4 +14,4 @@ A с чего начать? Ах да, мне же понадобятся нек А пока... -Сделаю чтонибуть [другое] (../zefir.md) \ No newline at end of file +Сделаю чтонибуть [другое] (../../zefir.md) \ No newline at end of file diff --git a/russian/glue/index.md b/russian/glue/index.md index b81950f1dc..776db09bc4 100644 --- a/russian/glue/index.md +++ b/russian/glue/index.md @@ -1,4 +1,4 @@ . ? -[ ] (wallpapers.md) \ No newline at end of file +[ ] (glue-wallpapers/wallpapers.md) \ No newline at end of file From fca95b5a978e04175af1f8c929534601634baf3b Mon Sep 17 00:00:00 2001 From: Ed Nakata Date: Sun, 17 Jul 2016 09:18:35 -0700 Subject: [PATCH 3929/5486] docs: "Death of a Marshmallow" --- english/the-slayer/freddie/freddie.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/english/the-slayer/freddie/freddie.md b/english/the-slayer/freddie/freddie.md index edf4ebd270..5773fbfec0 100644 --- a/english/the-slayer/freddie/freddie.md +++ b/english/the-slayer/freddie/freddie.md @@ -1,2 +1,13 @@ Freddie saved the little marshmallows stabing the terrible marshmallow with -his chocolate stick. \ No newline at end of file +his chocolate stick. + +As the terrible marshmallow lay heaped on the floor, he wheezed a final threat at Freddie, +"You think you've won. You think you've defeated me. But there s'more." +With that the terrible marshmallow began to convulse in a mix of evil laughing and gasps for air. + +Freddie stood over the terrible marshmallow, trying to think of a witty retort. +Nothing was coming to his head. There was only one thing left to do. + +[Practice yoga.](/english/yoga/breathe/breathe.md) + +[Take a nap.](/english/take-a-nap/take-a-nap.md) \ No newline at end of file From 1a98069f080e75c300c469ee3654379ad97353f0 Mon Sep 17 00:00:00 2001 From: ednakata Date: Sun, 17 Jul 2016 09:34:23 -0700 Subject: [PATCH 3930/5486] Update freddie.md --- english/the-slayer/freddie/freddie.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/the-slayer/freddie/freddie.md b/english/the-slayer/freddie/freddie.md index 5773fbfec0..84cf04f9c1 100644 --- a/english/the-slayer/freddie/freddie.md +++ b/english/the-slayer/freddie/freddie.md @@ -8,6 +8,6 @@ With that the terrible marshmallow began to convulse in a mix of evil laughing a Freddie stood over the terrible marshmallow, trying to think of a witty retort. Nothing was coming to his head. There was only one thing left to do. -[Practice yoga.](/english/yoga/breathe/breathe.md) +[Practice yoga.](../../yoga/breathe/breathe.md) -[Take a nap.](/english/take-a-nap/take-a-nap.md) \ No newline at end of file +[Take a nap.](../../take-a-nap/take-a-nap.md) From 8661ba8454e3b8047373dd5d600213ff57675cf7 Mon Sep 17 00:00:00 2001 From: Jasdeep Toor Date: Sun, 17 Jul 2016 17:24:28 -0600 Subject: [PATCH 3931/5486] Add to create your own adventure story --- english/go-back-to-sleep/go-back-to-sleep.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/go-back-to-sleep/go-back-to-sleep.md b/english/go-back-to-sleep/go-back-to-sleep.md index 319ba85da0..0bf9937e2f 100644 --- a/english/go-back-to-sleep/go-back-to-sleep.md +++ b/english/go-back-to-sleep/go-back-to-sleep.md @@ -3,6 +3,10 @@ The marshmallow floor is soft, and thankfully not very sticky. It's super weird that there is a marshmallow floor whether you're awake or you're dreaming. Maybe you're always dreaming? +Before getting into the bed you decide to reach down and grab a piece of marshmallow floor. +It tastes really good, but you can't help but being disgusted by the thought of all the +feet that have been on the floor. + You roll over, let your eyes close shut, and drift off into [dreamland](../dream/dream.md) You wonder, idly, what happens if you start dreaming from within a dream.. From 70c343fa6e3758094c10fec12e620945f04e78b1 Mon Sep 17 00:00:00 2001 From: pasikiskis Date: Mon, 18 Jul 2016 08:59:21 +0300 Subject: [PATCH 3932/5486] Update vejas.md --- lithuanian/uzsimerkti/vejas.md | 1 + 1 file changed, 1 insertion(+) diff --git a/lithuanian/uzsimerkti/vejas.md b/lithuanian/uzsimerkti/vejas.md index 7116d9ce09..731c419b23 100644 --- a/lithuanian/uzsimerkti/vejas.md +++ b/lithuanian/uzsimerkti/vejas.md @@ -1 +1,2 @@ Po akimirkos jis pajuto švelnų vėją +ir jo nosį užgniaužė sodruus [žemuogių](./zemuoges/zemuoges.md) kvapas From d058f3e22cad99facf3dbd0da03a048f43de759c Mon Sep 17 00:00:00 2001 From: pasikiskis Date: Mon, 18 Jul 2016 09:01:55 +0300 Subject: [PATCH 3933/5486] Create zemuoges.md --- lithuanian/uzsimerkti/zemuoges.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 lithuanian/uzsimerkti/zemuoges.md diff --git a/lithuanian/uzsimerkti/zemuoges.md b/lithuanian/uzsimerkti/zemuoges.md new file mode 100644 index 0000000000..7b86f51f0e --- /dev/null +++ b/lithuanian/uzsimerkti/zemuoges.md @@ -0,0 +1 @@ +ir jis labai įsinorėjo From f528e4bca111ec89d3f9ad9a8235c657758ec7f9 Mon Sep 17 00:00:00 2001 From: pasikiskis Date: Mon, 18 Jul 2016 09:02:15 +0300 Subject: [PATCH 3934/5486] Delete zemuoges.md --- lithuanian/uzsimerkti/zemuoges.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 lithuanian/uzsimerkti/zemuoges.md diff --git a/lithuanian/uzsimerkti/zemuoges.md b/lithuanian/uzsimerkti/zemuoges.md deleted file mode 100644 index 7b86f51f0e..0000000000 --- a/lithuanian/uzsimerkti/zemuoges.md +++ /dev/null @@ -1 +0,0 @@ -ir jis labai įsinorėjo From 6f66c78f30fa0776ac9b9cf7f61a89515d7569ff Mon Sep 17 00:00:00 2001 From: pasikiskis Date: Mon, 18 Jul 2016 09:03:57 +0300 Subject: [PATCH 3935/5486] Create zemuoges.md --- lithuanian/uzsimerkti/zemuoges/zemuoges.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 lithuanian/uzsimerkti/zemuoges/zemuoges.md diff --git a/lithuanian/uzsimerkti/zemuoges/zemuoges.md b/lithuanian/uzsimerkti/zemuoges/zemuoges.md new file mode 100644 index 0000000000..1602822b43 --- /dev/null +++ b/lithuanian/uzsimerkti/zemuoges/zemuoges.md @@ -0,0 +1 @@ +ir jis įsinorėjo From 6af3a47826889930b4dcfc83417915955e1c093e Mon Sep 17 00:00:00 2001 From: pasikiskis Date: Mon, 18 Jul 2016 09:35:44 +0300 Subject: [PATCH 3936/5486] Update miegas.md --- lithuanian/miegoti/miegas.md | 1 + 1 file changed, 1 insertion(+) diff --git a/lithuanian/miegoti/miegas.md b/lithuanian/miegoti/miegas.md index 31e6dec10a..6d9bacdff0 100644 --- a/lithuanian/miegoti/miegas.md +++ b/lithuanian/miegoti/miegas.md @@ -1 +1,2 @@ Ir jis skaniai užmiega +. Užmigęs sapnuoja kad vaikšto po mėnulį ir pasydęs [atsibudo](../rekti/garsiau/atsibusti/atsibusti.md) From eeacd626b77ad06acb8baea18a2fff6781e919e8 Mon Sep 17 00:00:00 2001 From: AlissonPoli Date: Mon, 18 Jul 2016 12:30:04 -0300 Subject: [PATCH 3937/5486] Add arte na praia --- portugues/titanic/pular/boiar/voce/voce.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/portugues/titanic/pular/boiar/voce/voce.md b/portugues/titanic/pular/boiar/voce/voce.md index cf0e056461..e014999c78 100644 --- a/portugues/titanic/pular/boiar/voce/voce.md +++ b/portugues/titanic/pular/boiar/voce/voce.md @@ -13,3 +13,9 @@ Vendo mais de perto, é mesmo o seu portátil. Você leva até casa, como é um Thinkpad você consegue recuperar [seus dados](https://www.youtube.com/watch?v=3KXx-Kys-Fk) Você toma uma decisão. + +Você decide levar seu Thinkpad para uma assistencia. +No caminho encontra uma moça de humanas. +Ela te chama para voltar pra praia e vender sua arte. + +Você volta ou recupera os dados? From 366beee0f7c220e632842824f04510c566156a68 Mon Sep 17 00:00:00 2001 From: Emerik BEDOUIN Date: Mon, 18 Jul 2016 21:44:15 +0200 Subject: [PATCH 3938/5486] Change continue.md to add possibility to throw up --- french/manger/continue/continue.md | 4 +++- french/manger/continue/vomis/vomis.md | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 french/manger/continue/vomis/vomis.md diff --git a/french/manger/continue/continue.md b/french/manger/continue/continue.md index 2eabe6cb34..86fbb7d932 100644 --- a/french/manger/continue/continue.md +++ b/french/manger/continue/continue.md @@ -1,4 +1,4 @@ -Vous continuez de manger. +Vous continuez de manger. Sans vous arrêter, frénétiquement vous engloutissez le mur entier. @@ -18,3 +18,5 @@ mur qui vous protegeait du vent glaciale n'est plus. Que faites vous ? [Je me rendors](../../dormir/reve-etrange.md) [J'appel au secours](../../appel-au-secours/appeler-au-secours.md) + +[Je vomis](vomis/vomis.md) diff --git a/french/manger/continue/vomis/vomis.md b/french/manger/continue/vomis/vomis.md new file mode 100644 index 0000000000..2e924ec19f --- /dev/null +++ b/french/manger/continue/vomis/vomis.md @@ -0,0 +1,13 @@ +Vous vomissez. + +Deux fois. + +Vous vous sentez mieux mais vous avez à nouveau faim. + +Vous mangez un petit bout de pain d'épice, mais vous avez toujours froid. + +Que faites vous ? + +[J'appel à l'aide](../../../appel-au-secours/appeler-au-secours.md) + +[Je mange encore](../continue.md) From 8b58dc5f3eaf74bdbc3629e525e8e6db3cc2da9a Mon Sep 17 00:00:00 2001 From: Emerik Date: Mon, 18 Jul 2016 21:55:19 +0200 Subject: [PATCH 3939/5486] Update continue.md --- french/manger/continue/continue.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/french/manger/continue/continue.md b/french/manger/continue/continue.md index 86fbb7d932..597be25c5a 100644 --- a/french/manger/continue/continue.md +++ b/french/manger/continue/continue.md @@ -1,4 +1,4 @@ -Vous continuez de manger. +Vous continuez de manger. Sans vous arrêter, frénétiquement vous engloutissez le mur entier. From b6ea65619a72aeb632acf372cfa836526b71d939 Mon Sep 17 00:00:00 2001 From: WaQ Date: Tue, 19 Jul 2016 00:12:27 +0300 Subject: [PATCH 3940/5486] Add two lines to urdu/urdu-news.md --- urdu/urdu-news.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urdu/urdu-news.md b/urdu/urdu-news.md index ba1173cc7c..42f079f702 100644 --- a/urdu/urdu-news.md +++ b/urdu/urdu-news.md @@ -4,4 +4,7 @@ if you like to see urdu news [click here](http://www.bbc.com/urdu/) خوشی کا عالم تھا کہ اچانک پلک جھپکتے ہی، نہ جانے کیوں، سب لوگوں کو سانپ سونگھ گیا- -[سنسنی خبریں صرف اور صرف جیو نیوز پر ](http://www.geo.tv/urdu/) \ No newline at end of file +[سنسنی خبریں صرف اور صرف جیو نیوز پر ](http://www.geo.tv/urdu/) + +اردو میں کہانیاں بےشمار ہیں۔ ہم آپ کو آج ایک انوکھی کہانی سناتے ہیں۔ یہ کہانی پیاسے کوے کا جدید دور ہے۔ جب کوے کع بحوک +لگی تو اڑھتے اڑھتے اس کی نظر مینیرل واٹر کی چھوٹی بوتل پر پڑی۔ آگے کیا ہوا؟ From 21f3ea8f6dc56ed904bd69c6ba4cc7eef4ee9703 Mon Sep 17 00:00:00 2001 From: Allen Jones Date: Mon, 18 Jul 2016 21:33:43 -0400 Subject: [PATCH 3941/5486] Add bee chase and honey gathering to bear fight --- english/forest/fire/fight/fight.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/forest/fire/fight/fight.md b/english/forest/fire/fight/fight.md index b0f3b2f65c..60865744e8 100644 --- a/english/forest/fire/fight/fight.md +++ b/english/forest/fire/fight/fight.md @@ -5,4 +5,10 @@ you sink the sharp end into his back and the bear cries out in pain. Victory achieved, you march triumphntly back to your camp. +But not so fast! The bees are fast approaching. Rather than get stung you jump +into a nearby lake until they fly away. +You climb out of the water dripping wet. The bees have gone. The sweet honey +beckons to you. You saunter forward, remembering your first sip of mead. You +quickly scoop a jar of honey from the thrashed beehive, stash it in your +waterskin, and scamper back to camp unscathed. \ No newline at end of file From 5057d3062b285f8b5cf8cd631e6c098db5763ba2 Mon Sep 17 00:00:00 2001 From: ViciousVisions Date: Mon, 18 Jul 2016 23:29:57 -0400 Subject: [PATCH 3942/5486] Add a choice point to blackout --- english/blackout/blackout.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/blackout/blackout.md b/english/blackout/blackout.md index d155a1631d..0af15d785a 100644 --- a/english/blackout/blackout.md +++ b/english/blackout/blackout.md @@ -1 +1,2 @@ -You walk down the tunnel and feel faint. You blackout and right before you hit the floor someone catches you. \ No newline at end of file +You walk down the tunnel and feel faint. You blackout and right before you hit the floor someone catches you. +While you were blacked out you recall something you were [hypnotized to forget.](hypnotized-to-forget\hypnotized.md) From e3d1eae73d151760aad85c7940e75d174cd641a6 Mon Sep 17 00:00:00 2001 From: ViciousVisions Date: Mon, 18 Jul 2016 23:37:02 -0400 Subject: [PATCH 3943/5486] Add the first line to hynotized page --- english/hypnotized-to-forget/hypnotized.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/hypnotized-to-forget/hypnotized.md diff --git a/english/hypnotized-to-forget/hypnotized.md b/english/hypnotized-to-forget/hypnotized.md new file mode 100644 index 0000000000..89906a02a1 --- /dev/null +++ b/english/hypnotized-to-forget/hypnotized.md @@ -0,0 +1 @@ +You recall that the person holding you is the person that hypnotized you. From 15bd7728d422f7d87e7334dda86e65f544ff2970 Mon Sep 17 00:00:00 2001 From: ViciousVisions Date: Mon, 18 Jul 2016 23:56:56 -0400 Subject: [PATCH 3944/5486] Fix broken link in blackout --- english/blackout/blackout.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/blackout/blackout.md b/english/blackout/blackout.md index 0af15d785a..565e5da200 100644 --- a/english/blackout/blackout.md +++ b/english/blackout/blackout.md @@ -1,2 +1,2 @@ You walk down the tunnel and feel faint. You blackout and right before you hit the floor someone catches you. -While you were blacked out you recall something you were [hypnotized to forget.](hypnotized-to-forget\hypnotized.md) +While you were blacked out you recall something you were [hypnotized to forget.](../hypnotized-to-forget/hypnotized.md) From 3bdec194f356660871b9ec5b89f5bac217f6b87f Mon Sep 17 00:00:00 2001 From: Rafay Khan Date: Tue, 19 Jul 2016 11:22:57 +0500 Subject: [PATCH 3945/5486] Add new storie line "Devastated" --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 816aba072c..d30a213fdf 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1040,3 +1040,4 @@ You wake up confused, you faint you go back in [time](time-travel/time-travel.md The password is [xyzzy](plugh/plugh.md) +Perishing in an avalanche of words, in a mundane collection of sentences called "stories". Devastated? From 896a67c9ad235ec1386915a4b8cd68954de40e88 Mon Sep 17 00:00:00 2001 From: Rafay Khan Date: Tue, 19 Jul 2016 11:44:39 +0500 Subject: [PATCH 3946/5486] Add directory and storie for devastated_greatness --- english/devastated_greatness/devastated_greatness.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 english/devastated_greatness/devastated_greatness.md diff --git a/english/devastated_greatness/devastated_greatness.md b/english/devastated_greatness/devastated_greatness.md new file mode 100644 index 0000000000..8cc9afc5a9 --- /dev/null +++ b/english/devastated_greatness/devastated_greatness.md @@ -0,0 +1,8 @@ +Staring at the ceiling I thought we'd never make + +But all that it took was patience + +Now we're on our way to greatness + +-[Devastated](http://genius.com/Joey-bada-devastated-lyrics) + From b15925ab2789fa630623257d41b88cb8ac083376 Mon Sep 17 00:00:00 2001 From: Rafay Khan Date: Tue, 19 Jul 2016 11:47:53 +0500 Subject: [PATCH 3947/5486] Add link for devastated_greatness storie --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index d30a213fdf..74ca7d1c3f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1040,4 +1040,4 @@ You wake up confused, you faint you go back in [time](time-travel/time-travel.md The password is [xyzzy](plugh/plugh.md) -Perishing in an avalanche of words, in a mundane collection of sentences called "stories". Devastated? +Perishing in an avalanche of words, in a mundane collection of sentences called "stories". [Devastated?](devastated_greatness/devastated_greatness.md) From a884696c67b00e4fa3b56cc20da88901b4da6314 Mon Sep 17 00:00:00 2001 From: Rafay Khan Date: Tue, 19 Jul 2016 11:50:14 +0500 Subject: [PATCH 3948/5486] Fix a line in storie devastated_greatness --- english/devastated_greatness/devastated_greatness.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/devastated_greatness/devastated_greatness.md b/english/devastated_greatness/devastated_greatness.md index 8cc9afc5a9..f075fc60d5 100644 --- a/english/devastated_greatness/devastated_greatness.md +++ b/english/devastated_greatness/devastated_greatness.md @@ -1,4 +1,4 @@ -Staring at the ceiling I thought we'd never make +Staring at the ceiling I thought we'd never make it But all that it took was patience From 11cdb278a871d5f17e54ad8cf3554ef24a5273c0 Mon Sep 17 00:00:00 2001 From: Rafay Khan Date: Tue, 19 Jul 2016 11:57:42 +0500 Subject: [PATCH 3949/5486] Add line break to Devastated --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 74ca7d1c3f..a67a32745a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1040,4 +1040,5 @@ You wake up confused, you faint you go back in [time](time-travel/time-travel.md The password is [xyzzy](plugh/plugh.md) -Perishing in an avalanche of words, in a mundane collection of sentences called "stories". [Devastated?](devastated_greatness/devastated_greatness.md) +Perishing in an avalanche of words, in a mundane collection of sentences called "stories". +[Devastated?](devastated_greatness/devastated_greatness.md) From 90c3ab3a7c53b7c681cdaf81ecf6454d22ebd181 Mon Sep 17 00:00:00 2001 From: Gabriel Urban Date: Tue, 19 Jul 2016 14:30:03 +0200 Subject: [PATCH 3950/5486] Zachran seba, zachranis svet --- slovak/marsmelaci.md | 2 ++ slovak/zachrana/zachrana-seba.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 slovak/zachrana/zachrana-seba.md diff --git a/slovak/marsmelaci.md b/slovak/marsmelaci.md index 976a4eec7c..0d689231cc 100644 --- a/slovak/marsmelaci.md +++ b/slovak/marsmelaci.md @@ -6,4 +6,6 @@ Jedno nevšedné ráno sa zobudíš v divnej miestnosti, ktorá má steny z mars [Pokúsiš sa zachrániť rybku](zachrana/zachrana-rybky.md) +[Pokúsiš sa zachrániť seba](zachrana/zachrana-seba.md) + [Siahneš opäť po fľaši](flasa/nikdy-viac.md) diff --git a/slovak/zachrana/zachrana-seba.md b/slovak/zachrana/zachrana-seba.md new file mode 100644 index 0000000000..70db7c360c --- /dev/null +++ b/slovak/zachrana/zachrana-seba.md @@ -0,0 +1,4 @@ +Rybku rýchlo vytiahneš z nosa. +Zisťuješ že je mŕtva už asi pol roka. +Najvyšší čas prestať piť, len to ťa zachráni. +Amen. From 8e39cf5958e010c0a19799c4ff950285c7b75be9 Mon Sep 17 00:00:00 2001 From: Gabriel Urban Date: Tue, 19 Jul 2016 14:35:07 +0200 Subject: [PATCH 3951/5486] Move to separate dir --- slovak/{zachrana => nepi}/zachrana-seba.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename slovak/{zachrana => nepi}/zachrana-seba.md (100%) diff --git a/slovak/zachrana/zachrana-seba.md b/slovak/nepi/zachrana-seba.md similarity index 100% rename from slovak/zachrana/zachrana-seba.md rename to slovak/nepi/zachrana-seba.md From d77e625723bb65b6625c8d85643ffb0af135f8a3 Mon Sep 17 00:00:00 2001 From: Gabriel Urban Date: Tue, 19 Jul 2016 14:41:01 +0200 Subject: [PATCH 3952/5486] Rewrite link --- slovak/marsmelaci.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slovak/marsmelaci.md b/slovak/marsmelaci.md index 0d689231cc..560463d723 100644 --- a/slovak/marsmelaci.md +++ b/slovak/marsmelaci.md @@ -6,6 +6,6 @@ Jedno nevšedné ráno sa zobudíš v divnej miestnosti, ktorá má steny z mars [Pokúsiš sa zachrániť rybku](zachrana/zachrana-rybky.md) -[Pokúsiš sa zachrániť seba](zachrana/zachrana-seba.md) +[Pokúsiš sa zachrániť seba](nepi/zachrana-seba.md) [Siahneš opäť po fľaši](flasa/nikdy-viac.md) From 8f6ea6efb6b57285a84cd6d45deef12b9815187b Mon Sep 17 00:00:00 2001 From: training Date: Tue, 19 Jul 2016 09:35:08 -0400 Subject: [PATCH 3953/5486] Add Guangwu option and files --- english/Guangwu/Guangwu.md | 1 + english/eating-walls/eating-marshmallows.md | 2 +- english/marshmallow.md | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 english/Guangwu/Guangwu.md diff --git a/english/Guangwu/Guangwu.md b/english/Guangwu/Guangwu.md new file mode 100644 index 0000000000..3b4680d8f9 --- /dev/null +++ b/english/Guangwu/Guangwu.md @@ -0,0 +1 @@ +Hi,I am Guangwu,Nice to meet you ! diff --git a/english/eating-walls/eating-marshmallows.md b/english/eating-walls/eating-marshmallows.md index 47aad5072b..2035c34581 100644 --- a/english/eating-walls/eating-marshmallows.md +++ b/english/eating-walls/eating-marshmallows.md @@ -52,4 +52,4 @@ Do you: [raidersfile] (../Raiders/LetsgoRaiders.md) Raiders. -[Stop and listen to the sound of birds that came out of nowhere] (sound-of-birds/sound-of-birds.md). \ No newline at end of file +[Stop and listen to the sound of birds that came out of nowhere] (sound-of-birds/sound-of-birds.md). diff --git a/english/marshmallow.md b/english/marshmallow.md index 816aba072c..2e7dff8fcb 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1040,3 +1040,4 @@ You wake up confused, you faint you go back in [time](time-travel/time-travel.md The password is [xyzzy](plugh/plugh.md) +[Guangwu](Guangwu/Guangwu.md) From 558c18bbb3cd0eb758017695bee24ce1decc31fb Mon Sep 17 00:00:00 2001 From: training Date: Tue, 19 Jul 2016 09:41:24 -0400 Subject: [PATCH 3954/5486] Modify the link name to "Say Hi to Guangwu" --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 2e7dff8fcb..c94b36a7e8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1040,4 +1040,6 @@ You wake up confused, you faint you go back in [time](time-travel/time-travel.md The password is [xyzzy](plugh/plugh.md) -[Guangwu](Guangwu/Guangwu.md) +[Say "Hi" to Guangwu](Guangwu/Guangwu.md) + + From 5877fbcb467a0a922eec24a771f70868b51fe024 Mon Sep 17 00:00:00 2001 From: training Date: Tue, 19 Jul 2016 09:49:57 -0400 Subject: [PATCH 3955/5486] Restore the master branch! --- english/marshmallow.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 2e7dff8fcb..03df39e9aa 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1039,5 +1039,3 @@ You wake up confused, you faint you go back in [time](time-travel/time-travel.md [The Angry Prince](angry_prince/angry_prince.md) The password is [xyzzy](plugh/plugh.md) - -[Guangwu](Guangwu/Guangwu.md) From 2fbd29ebac5e5766caf010a579f7cf59eeb659c0 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Tue, 19 Jul 2016 16:03:46 -0400 Subject: [PATCH 3956/5486] Add some info --- english/captain/captain.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/captain/captain.md b/english/captain/captain.md index cf1b489d3b..8c41dd8ede 100644 --- a/english/captain/captain.md +++ b/english/captain/captain.md @@ -1,4 +1,5 @@ Good Choice. A man of honour beats a genius billionaire playboy philanthropist. +(But can he do it again, later?) Let's watch the trailer of him fighting iron man [here](https://youtu.be/uVdV-lxRPFo). \ No newline at end of file From 113f98480f2c41ab8dd977de3b9387d31bd03a02 Mon Sep 17 00:00:00 2001 From: xacasi Date: Wed, 20 Jul 2016 22:03:15 +0800 Subject: [PATCH 3957/5486] *nang + linya tungkol sa pagbabago --- Philippines/bago/hakbang/hakbang.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Philippines/bago/hakbang/hakbang.md b/Philippines/bago/hakbang/hakbang.md index 06f71998d0..628ae93cdc 100644 --- a/Philippines/bago/hakbang/hakbang.md +++ b/Philippines/bago/hakbang/hakbang.md @@ -2,4 +2,8 @@ Ito ang una mong hakbang tungo sa pagbabago. Sa Mayo, bumoto. Bumoto ng wais. +*nang + +Kahit anong gawin mo, magbabago ka. + Kung ayaw mo, bumalik sa Udacity para mag-aral o kaya bumalik sa [umpisa] (../../salamat.md) From 2e10f2b0951f7df3ec8e447352bcebe8407f0b43 Mon Sep 17 00:00:00 2001 From: Rikke Barsten Date: Wed, 20 Jul 2016 17:25:42 +0200 Subject: [PATCH 3958/5486] Add recipe for carrot cake --- danish/have/have.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/danish/have/have.md b/danish/have/have.md index f68b9cde1a..a183173414 100644 --- a/danish/have/have.md +++ b/danish/have/have.md @@ -1,2 +1,3 @@ -Du opdager, at dine gulerødder spirer. Du bliver så glad, at du bryder ud i -[sang] (danish/synging/synging.md) +Du opdager, at dine gulerødder er klare til at blive høstet. Du bliver høster +gulerødderne og bager en +[gulerodskage] (http://www.arla.dk/opskrifter/gulerodskage/). From bedb1b77f9118dd2998aab6bcd3156c05b40a7e4 Mon Sep 17 00:00:00 2001 From: emi Date: Wed, 20 Jul 2016 23:02:30 -0300 Subject: [PATCH 3959/5486] Add Doug Adams story --- english/doug-adams/doug-adams.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 english/doug-adams/doug-adams.md diff --git a/english/doug-adams/doug-adams.md b/english/doug-adams/doug-adams.md new file mode 100644 index 0000000000..6fdd2b0e64 --- /dev/null +++ b/english/doug-adams/doug-adams.md @@ -0,0 +1,8 @@ +Where did all the dolphins go? + +Dolphins are smart creatures, that much we know. However, it had never dawned upon us just how smart they actually were. The farewell message that they had sent prior to their departure was both enigmatic and ridiculous at the same time. _So long and thanks for all the fish_? Who would have thought... Who would have known? + +There are two people left in this stupendous galaxy who might know... + +[Arthur Dent](arthur-dent/arthur-dent.md) +[Ford Prefect](ford-prefect/ford-prefect.md) \ No newline at end of file From 5b0fa2868083f98f883ac2ec2aa710d1c009689e Mon Sep 17 00:00:00 2001 From: emi Date: Wed, 20 Jul 2016 23:09:16 -0300 Subject: [PATCH 3960/5486] Make changes to file format and add link on main page --- english/doug-adams/doug-adams.md | 9 ++++++++- english/marshmallow.md | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/english/doug-adams/doug-adams.md b/english/doug-adams/doug-adams.md index 6fdd2b0e64..fc44ae4ce6 100644 --- a/english/doug-adams/doug-adams.md +++ b/english/doug-adams/doug-adams.md @@ -1,8 +1,15 @@ Where did all the dolphins go? -Dolphins are smart creatures, that much we know. However, it had never dawned upon us just how smart they actually were. The farewell message that they had sent prior to their departure was both enigmatic and ridiculous at the same time. _So long and thanks for all the fish_? Who would have thought... Who would have known? +Dolphins are smart creatures, that much we know. However, it had never dawned upon us just how smart they actually were. + +The farewell message that they had sent prior to their departure was both enigmatic and ridiculous at the same time. + +So long and thanks for all the fish? + +Who would have thought... Who would have known? There are two people left in this stupendous galaxy who might know... [Arthur Dent](arthur-dent/arthur-dent.md) + [Ford Prefect](ford-prefect/ford-prefect.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index f5fc6a117c..e247445433 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1044,3 +1044,5 @@ The password is [xyzzy](plugh/plugh.md) Perishing in an avalanche of words, in a mundane collection of sentences called "stories". [Devastated?](devastated_greatness/devastated_greatness.md) + +Ever the fan of [Doug Adams](doug-adams/doug-adams.md). From 822a98cc0151056bdced9ecf92c470f1de087ada Mon Sep 17 00:00:00 2001 From: emi Date: Wed, 20 Jul 2016 23:12:01 -0300 Subject: [PATCH 3961/5486] Insert line breaks --- english/doug-adams/doug-adams.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/english/doug-adams/doug-adams.md b/english/doug-adams/doug-adams.md index fc44ae4ce6..ee369e10fe 100644 --- a/english/doug-adams/doug-adams.md +++ b/english/doug-adams/doug-adams.md @@ -1,14 +1,19 @@ Where did all the dolphins go? -Dolphins are smart creatures, that much we know. However, it had never dawned upon us just how smart they actually were. +Dolphins are smart creatures, that much we know. +However, it had never dawned upon us just +how smart they actually were. -The farewell message that they had sent prior to their departure was both enigmatic and ridiculous at the same time. +The farewell message that they had sent +prior to their departure was both enigmatic +and ridiculous at the same time. So long and thanks for all the fish? Who would have thought... Who would have known? -There are two people left in this stupendous galaxy who might know... +There are two people left in this stupendous +galaxy who might know... [Arthur Dent](arthur-dent/arthur-dent.md) From 52a256aef9540f6e5dc7fe6fba27c040bf1bcc67 Mon Sep 17 00:00:00 2001 From: Neuberger Date: Thu, 21 Jul 2016 08:05:51 +0300 Subject: [PATCH 3962/5486] added showerthoughts entry --- english/marshmallow.md | 2 ++ english/showerthoughts/showerthoughts.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/showerthoughts/showerthoughts.md diff --git a/english/marshmallow.md b/english/marshmallow.md index f5fc6a117c..59cd1e0b77 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1044,3 +1044,5 @@ The password is [xyzzy](plugh/plugh.md) Perishing in an avalanche of words, in a mundane collection of sentences called "stories". [Devastated?](devastated_greatness/devastated_greatness.md) + +Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit diff --git a/english/showerthoughts/showerthoughts.md b/english/showerthoughts/showerthoughts.md new file mode 100644 index 0000000000..aefc50770f --- /dev/null +++ b/english/showerthoughts/showerthoughts.md @@ -0,0 +1 @@ +[showerthoughts](https://www.reddit.com/r/Showerthoughts/) \ No newline at end of file From 49c036f6ee98c38bf991a88c24af64857e2c9a9a Mon Sep 17 00:00:00 2001 From: Neuberger Date: Thu, 21 Jul 2016 16:11:10 +0300 Subject: [PATCH 3963/5486] link is problematic for github, removeing it --- english/showerthoughts/showerthoughts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/showerthoughts/showerthoughts.md b/english/showerthoughts/showerthoughts.md index aefc50770f..4f59813d42 100644 --- a/english/showerthoughts/showerthoughts.md +++ b/english/showerthoughts/showerthoughts.md @@ -1 +1 @@ -[showerthoughts](https://www.reddit.com/r/Showerthoughts/) \ No newline at end of file +in reddit, check out /r/showerthoughts \ No newline at end of file From ad153d05804521eeb5941f8d2948488c68df629b Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Thu, 21 Jul 2016 10:15:50 -0400 Subject: [PATCH 3964/5486] Add contiuation to breathe again with two options. --- .../giant-bubble/into-the-bubble/breathe-again.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md index 0c16a53099..4832d6b990 100644 --- a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md +++ b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md @@ -1,3 +1,4 @@ You swim into the bubble, and gasping, you take a big breath in. You look around in wonderment at the soothing blue aura of the bubble. Just as you -start to relax, thinking you may be alright after all, you realize... \ No newline at end of file +start to relax, thinking you may be alright after all, you realize... two things are possible. +1: its all just a [dream](.../.../.../fly/fly.md) or its really [happening](.../.../travel-destinations/travel-destinations.md) \ No newline at end of file From 99167615f27457c2a4eab01105acf292e2e63415 Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Thu, 21 Jul 2016 11:18:37 -0400 Subject: [PATCH 3965/5486] Fix broken links in breathe again --- .../giant-bubble/into-the-bubble/breathe-again.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md index 4832d6b990..e55336ae45 100644 --- a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md +++ b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md @@ -1,4 +1,8 @@ You swim into the bubble, and gasping, you take a big breath in. You look around in wonderment at the soothing blue aura of the bubble. Just as you start to relax, thinking you may be alright after all, you realize... two things are possible. -1: its all just a [dream](.../.../.../fly/fly.md) or its really [happening](.../.../travel-destinations/travel-destinations.md) \ No newline at end of file +1: its all just a [dream](create-your-own-adventure/english/dream/fly/fly.md) + +or + +2: its really [happening](create-your-own-adventure/english/travel-destinations/travel-destinations.md) \ No newline at end of file From ab9d0d3490d7bf16ea8f1f0c9ee3164d29a2494f Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Thu, 21 Jul 2016 11:33:21 -0400 Subject: [PATCH 3966/5486] Fix broken link to other options --- .../giant-bubble/into-the-bubble/breathe-again.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md index e55336ae45..5c103c819e 100644 --- a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md +++ b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md @@ -1,8 +1,8 @@ You swim into the bubble, and gasping, you take a big breath in. You look around in wonderment at the soothing blue aura of the bubble. Just as you start to relax, thinking you may be alright after all, you realize... two things are possible. -1: its all just a [dream](create-your-own-adventure/english/dream/fly/fly.md) +1: its all just a [dream](../dream/fly/fly.md) or -2: its really [happening](create-your-own-adventure/english/travel-destinations/travel-destinations.md) \ No newline at end of file +2: its really [happening](../travel-destinations/travel-destinations.md) \ No newline at end of file From b3a9556cc971d342c8c9fe96e5ebcc2c83bbd238 Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Thu, 21 Jul 2016 11:36:33 -0400 Subject: [PATCH 3967/5486] 3rd attempt to fix borken link --- .../giant-bubble/into-the-bubble/breathe-again.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md index 5c103c819e..47b69ec31d 100644 --- a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md +++ b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md @@ -1,8 +1,8 @@ You swim into the bubble, and gasping, you take a big breath in. You look around in wonderment at the soothing blue aura of the bubble. Just as you start to relax, thinking you may be alright after all, you realize... two things are possible. -1: its all just a [dream](../dream/fly/fly.md) +1: its all just a [dream](../../../dream/fly/fly.md) or -2: its really [happening](../travel-destinations/travel-destinations.md) \ No newline at end of file +2: its really [happening](../../../travel-destinations/travel-destinations.md) \ No newline at end of file From e9f6240c22f79254880d42e4e8ac53f7d56e1ef2 Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Thu, 21 Jul 2016 11:59:11 -0400 Subject: [PATCH 3968/5486] Update breathe-again.md --- .../giant-bubble/into-the-bubble/breathe-again.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md index 47b69ec31d..7b6c1fcd6a 100644 --- a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md +++ b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md @@ -1,8 +1,10 @@ You swim into the bubble, and gasping, you take a big breath in. You look around in wonderment at the soothing blue aura of the bubble. Just as you -start to relax, thinking you may be alright after all, you realize... two things are possible. +start to relax, thinking you may be alright after all, you realize... +two things are possible. + 1: its all just a [dream](../../../dream/fly/fly.md) or -2: its really [happening](../../../travel-destinations/travel-destinations.md) \ No newline at end of file +2: its really [happening](../../../travel-destinations/travel-destinations.md) From 62a96fce0b97a82bab0f044235299cd5741987d0 Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Thu, 21 Jul 2016 12:18:43 -0400 Subject: [PATCH 3969/5486] Add mariachi section to story --- espanol/musica/mariachi/grupo_mariachi.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/musica/mariachi/grupo_mariachi.md diff --git a/espanol/musica/mariachi/grupo_mariachi.md b/espanol/musica/mariachi/grupo_mariachi.md new file mode 100644 index 0000000000..f92303db9d --- /dev/null +++ b/espanol/musica/mariachi/grupo_mariachi.md @@ -0,0 +1 @@ +Y fue entonces cuando apareció un grupo de Mariachi, listo para sorprender a la familia con un poco de música. \ No newline at end of file From bcd672fc647963f0cde5ac0521e313fa8a20a69e Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Thu, 21 Jul 2016 12:57:38 -0400 Subject: [PATCH 3970/5486] change directory of file --- espanol/musica/grupo_mariachi.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/musica/grupo_mariachi.md diff --git a/espanol/musica/grupo_mariachi.md b/espanol/musica/grupo_mariachi.md new file mode 100644 index 0000000000..f92303db9d --- /dev/null +++ b/espanol/musica/grupo_mariachi.md @@ -0,0 +1 @@ +Y fue entonces cuando apareció un grupo de Mariachi, listo para sorprender a la familia con un poco de música. \ No newline at end of file From 586e7584b25fccc8609a2495cc4f640935cbfef2 Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Thu, 21 Jul 2016 12:59:36 -0400 Subject: [PATCH 3971/5486] Delete duplicate mariachi file --- espanol/musica/grupo_mariachi.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 espanol/musica/grupo_mariachi.md diff --git a/espanol/musica/grupo_mariachi.md b/espanol/musica/grupo_mariachi.md deleted file mode 100644 index f92303db9d..0000000000 --- a/espanol/musica/grupo_mariachi.md +++ /dev/null @@ -1 +0,0 @@ -Y fue entonces cuando apareció un grupo de Mariachi, listo para sorprender a la familia con un poco de música. \ No newline at end of file From d34f4c9e82b6c18e4dde3a616a3ef344cffc12af Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Thu, 21 Jul 2016 13:03:33 -0400 Subject: [PATCH 3972/5486] Add mariachi section file --- espanol/musica/grupo_mariachi.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/musica/grupo_mariachi.md diff --git a/espanol/musica/grupo_mariachi.md b/espanol/musica/grupo_mariachi.md new file mode 100644 index 0000000000..f92303db9d --- /dev/null +++ b/espanol/musica/grupo_mariachi.md @@ -0,0 +1 @@ +Y fue entonces cuando apareció un grupo de Mariachi, listo para sorprender a la familia con un poco de música. \ No newline at end of file From 964bfc77c9ec7ac71a2a1a304f8adfd300006da7 Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Thu, 21 Jul 2016 13:11:02 -0400 Subject: [PATCH 3973/5486] Agrega musica estilo mariachi --- espanol/musica/grupo_mariachi.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/musica/grupo_mariachi.md diff --git a/espanol/musica/grupo_mariachi.md b/espanol/musica/grupo_mariachi.md new file mode 100644 index 0000000000..f92303db9d --- /dev/null +++ b/espanol/musica/grupo_mariachi.md @@ -0,0 +1 @@ +Y fue entonces cuando apareció un grupo de Mariachi, listo para sorprender a la familia con un poco de música. \ No newline at end of file From 1fd0edb1124c2356161d6277880501afac9aaab9 Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Thu, 21 Jul 2016 13:21:45 -0400 Subject: [PATCH 3974/5486] Addicion a la historia del rey --- espanol/torre/rey/rey.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index 0f37a9f156..13c44a960a 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -1,3 +1,5 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. [Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) + +Pero en ese instante llego el anunciador con una [sorpresa](../../rey/rey.md) \ No newline at end of file From 52faa3374ffb3047dbf9ff53f3bb278432c91250 Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Thu, 21 Jul 2016 13:28:21 -0400 Subject: [PATCH 3975/5486] resolver problema con el link --- espanol/torre/rey/rey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index 13c44a960a..7f32dc3463 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -2,4 +2,4 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. [Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) -Pero en ese instante llego el anunciador con una [sorpresa](../../rey/rey.md) \ No newline at end of file +Pero en ese instante llego el anunciador con una [sorpresa](../../../rey/rey.md) \ No newline at end of file From 1402e4d97ca65996173316252b30e7b4dae82df3 Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Thu, 21 Jul 2016 13:32:20 -0400 Subject: [PATCH 3976/5486] Resolver problema con el link --- espanol/torre/rey/rey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index 7f32dc3463..dc9457d36d 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -2,4 +2,4 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. [Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) -Pero en ese instante llego el anunciador con una [sorpresa](../../../rey/rey.md) \ No newline at end of file +Pero en ese instante llego el anunciador con una [sorpresa](../../../musica/grupo_mariachi.md) \ No newline at end of file From 96d3c22fd5d1b6f883e106da67d23853ce5a4e04 Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Thu, 21 Jul 2016 13:35:38 -0400 Subject: [PATCH 3977/5486] Segundo intento a resolver el link --- espanol/torre/rey/rey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index dc9457d36d..f99fcbdf63 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -2,4 +2,4 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. [Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) -Pero en ese instante llego el anunciador con una [sorpresa](../../../musica/grupo_mariachi.md) \ No newline at end of file +Pero en ese instante llego el anunciador con una [sorpresa](/../../musica/grupo_mariachi.md) From 947a959bc5367abdff43048737632bf159d364ae Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Thu, 21 Jul 2016 13:37:00 -0400 Subject: [PATCH 3978/5486] tercer intento a resolver link --- espanol/torre/rey/rey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index f99fcbdf63..6e1f7e0b2a 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -2,4 +2,4 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. [Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) -Pero en ese instante llego el anunciador con una [sorpresa](/../../musica/grupo_mariachi.md) +Pero en ese instante llego el anunciador con una [sorpresa](/../../../../musica/grupo_mariachi.md) From d58a4f6b8f342c7ed7848a77e82f59e3ec7d950e Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Thu, 21 Jul 2016 13:37:39 -0400 Subject: [PATCH 3979/5486] cuarto intento a resolver link --- espanol/torre/rey/rey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index 6e1f7e0b2a..6431863227 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -2,4 +2,4 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. [Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) -Pero en ese instante llego el anunciador con una [sorpresa](/../../../../musica/grupo_mariachi.md) +Pero en ese instante llego el anunciador con una [sorpresa](/..//musica/grupo_mariachi.md) From fe1f094076be20ead4db349dd879b682c063132c Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Thu, 21 Jul 2016 13:38:05 -0400 Subject: [PATCH 3980/5486] quinto intento --- espanol/torre/rey/rey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index 6431863227..c44f11f6e6 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -2,4 +2,4 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. [Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) -Pero en ese instante llego el anunciador con una [sorpresa](/..//musica/grupo_mariachi.md) +Pero en ese instante llego el anunciador con una [sorpresa](/../espanol/musica/grupo_mariachi.md) From 7b256a8e34f9ed2c7eba0776dfe34fad4ddb7f5b Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Thu, 21 Jul 2016 13:39:10 -0400 Subject: [PATCH 3981/5486] 6th intento --- espanol/torre/rey/rey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index c44f11f6e6..c67667dca1 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -2,4 +2,4 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. [Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) -Pero en ese instante llego el anunciador con una [sorpresa](/../espanol/musica/grupo_mariachi.md) +Pero en ese instante llego el anunciador con una [sorpresa](../espanol/musica/grupo_mariachi.md) From ba814f8a8165c0a9d6c44ee4e2b98350bba00a21 Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Thu, 21 Jul 2016 13:41:31 -0400 Subject: [PATCH 3982/5486] 7th --- espanol/torre/rey/rey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index c67667dca1..f441e142ab 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -2,4 +2,4 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. [Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) -Pero en ese instante llego el anunciador con una [sorpresa](../espanol/musica/grupo_mariachi.md) +Pero en ese instante llego el anunciador con una [sorpresa](musica/espanol/musica/grupo_mariachi.md) From ced48e722ed099dcc0b1ee3e07e28b9e1963f4f8 Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Thu, 21 Jul 2016 13:44:29 -0400 Subject: [PATCH 3983/5486] arreglar link quebrado --- espanol/torre/rey/rey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index f441e142ab..48a6050ec4 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -2,4 +2,4 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. [Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) -Pero en ese instante llego el anunciador con una [sorpresa](musica/espanol/musica/grupo_mariachi.md) +Pero en ese instante llego el anunciador con una [sorpresa](create-your-own-adventure/espanol/musica/grupo_mariachi.md) From a99062933a6ccdf7f45267b2e13ba0e972b39edf Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Thu, 21 Jul 2016 13:45:27 -0400 Subject: [PATCH 3984/5486] Segundo intento a resolver el link --- espanol/torre/rey/rey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index 48a6050ec4..13b4a3aa7c 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -2,4 +2,4 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. [Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) -Pero en ese instante llego el anunciador con una [sorpresa](create-your-own-adventure/espanol/musica/grupo_mariachi.md) +Pero en ese instante llego el anunciador con una [sorpresa](../../espanol/musica/grupo_mariachi.md) From b2b113d054e6635ec2529b6582ceae865dcebfa6 Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Thu, 21 Jul 2016 13:47:19 -0400 Subject: [PATCH 3985/5486] Fix broken link --- espanol/torre/rey/rey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/torre/rey/rey.md b/espanol/torre/rey/rey.md index 13b4a3aa7c..eaede1a023 100644 --- a/espanol/torre/rey/rey.md +++ b/espanol/torre/rey/rey.md @@ -2,4 +2,4 @@ El rey, al saber que el imperio acechaba decidió convocar a su ejército. [Pero el ejército estaba profundamente dormido](dormidos/dormidos.md) -Pero en ese instante llego el anunciador con una [sorpresa](../../espanol/musica/grupo_mariachi.md) +Pero en ese instante llego el anunciador con una [sorpresa](../../musica/grupo_mariachi.md) From 05d9da15242894edadefce9de565230e69da0c88 Mon Sep 17 00:00:00 2001 From: Akgul Date: Thu, 21 Jul 2016 15:42:57 -0400 Subject: [PATCH 3986/5486] Add recursion to turkish story --- turkce/catalla-kaz/metali-cek/metali-cek.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/turkce/catalla-kaz/metali-cek/metali-cek.md b/turkce/catalla-kaz/metali-cek/metali-cek.md index 1ae46263a4..1a943d3b66 100644 --- a/turkce/catalla-kaz/metali-cek/metali-cek.md +++ b/turkce/catalla-kaz/metali-cek/metali-cek.md @@ -16,3 +16,5 @@ Ne yapacaksın? [İple in](iple-in/iple-in.md) [Çakmakla İlerle](cakmakla-ilerle/cakmakla-ilerle.md) + +[Uykuya dal](../../hatmisekeri.md) \ No newline at end of file From 9ed5b9c6fa9cd100589810598d1be48928485a56 Mon Sep 17 00:00:00 2001 From: Dario Date: Thu, 21 Jul 2016 22:30:42 +0200 Subject: [PATCH 3987/5486] Add my story link --- german/ruderboot.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/german/ruderboot.md b/german/ruderboot.md index 04defbd28a..4a793392d7 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -1,6 +1,6 @@ -Sie wachen von der Sonne geblendet auf und stellen ziemlich benommen fest, dass Sie +Sie wachen von der Sonne geblendet auf und stellen ziemlich benommen fest, dass Sie -in einem Ruderboot auf einem grossen See treiben. Ihre Hose ist vollkommen durchnsst, und +in einem Ruderboot auf einem grossen See treiben. Ihre Hose ist vollkommen durchn�sst, und Sie bemerken, dass durch ein Loch in der Bootswand Wasser ins Boot dringt. @@ -8,7 +8,7 @@ Werden Sie: [Festellen, dass Sie doch kein Deutsch sprechen](../language.md) -[Zunchst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) +[Zun�chst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) [Laut um Hilfe schreien?](Hilfeschrei/Hilfeschrei.md) @@ -24,12 +24,14 @@ Werden Sie: [Versuchen, mit Ihrer Kleidung das Loch zu stopfen](Stopfen/stopfen.md) -[Durchlcherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) +[Durchl�cherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) [Handeln ist anstrengend. Warum nicht einfach abwarten was passiert?](abwarten/abwarten.md) -[Sie spren einen hllischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) +[Sie sp�ren einen h�llischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) -[Kopfber ins Wasser springen](Kopfsprung/Kopfsprung.md) +[Kopf�ber ins Wasser springen](Kopfsprung/Kopfsprung.md) -[Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) \ No newline at end of file +[Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) + +[Nase zuhalten und ins Wurstwasser springen](Wurstwasser/wurstwasser.md) From 422951dcf44da4aad4456ea9eea10c56c0ea7ccb Mon Sep 17 00:00:00 2001 From: Dario Date: Thu, 21 Jul 2016 22:37:05 +0200 Subject: [PATCH 3988/5486] Add first sentence in the new story line --- german/Wurstwasser/wurstwasser.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 german/Wurstwasser/wurstwasser.md diff --git a/german/Wurstwasser/wurstwasser.md b/german/Wurstwasser/wurstwasser.md new file mode 100644 index 0000000000..2051d99fa2 --- /dev/null +++ b/german/Wurstwasser/wurstwasser.md @@ -0,0 +1 @@ +Das salzige Wurstwasser bahnt seinen Weg hinauf in Ihre Nasennebenhöhlen. From 724417c002c4494f08608a29bc3013aa5e022e78 Mon Sep 17 00:00:00 2001 From: Jacob Cousineau Date: Thu, 21 Jul 2016 15:41:23 -0500 Subject: [PATCH 3989/5486] Add discover-new-genres directory and markdown file within. --- english/discover-new-genres/discover-new-genres.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/discover-new-genres/discover-new-genres.md diff --git a/english/discover-new-genres/discover-new-genres.md b/english/discover-new-genres/discover-new-genres.md new file mode 100644 index 0000000000..df92a17a26 --- /dev/null +++ b/english/discover-new-genres/discover-new-genres.md @@ -0,0 +1,4 @@ +You have decided to explore a new genre of music! There are so many options, but +after giving it some thought you decide to explore... + +================================================================================ From f8f66f2de64266b2d6d054536d8113405ddf3bde Mon Sep 17 00:00:00 2001 From: Jacob Cousineau Date: Thu, 21 Jul 2016 15:48:35 -0500 Subject: [PATCH 3990/5486] Add path to discover-new-genres.md in marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index c0e607b422..90a03927c6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1048,3 +1048,5 @@ Perishing in an avalanche of words, in a mundane collection of sentences called Ever the fan of [Doug Adams](doug-adams/doug-adams.md). Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit + +[Discover](../discover-new-genres/discover-new-genres.md) a new genre of music! From 689232479e6af61e4cca053a1aff8d8b6dec2f65 Mon Sep 17 00:00:00 2001 From: Dario Date: Thu, 21 Jul 2016 22:48:45 +0200 Subject: [PATCH 3991/5486] Fix german phonetic vowels --- german/ruderboot.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/german/ruderboot.md b/german/ruderboot.md index 4a793392d7..7565b3a751 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -8,7 +8,7 @@ Werden Sie: [Festellen, dass Sie doch kein Deutsch sprechen](../language.md) -[Zun�chst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) +[Zunächst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) [Laut um Hilfe schreien?](Hilfeschrei/Hilfeschrei.md) @@ -24,13 +24,13 @@ Werden Sie: [Versuchen, mit Ihrer Kleidung das Loch zu stopfen](Stopfen/stopfen.md) -[Durchl�cherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) +[Durchlöcherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) [Handeln ist anstrengend. Warum nicht einfach abwarten was passiert?](abwarten/abwarten.md) -[Sie sp�ren einen h�llischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) +[Sie spüren einen höllischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) -[Kopf�ber ins Wasser springen](Kopfsprung/Kopfsprung.md) +[Kopfüber ins Wasser springen](Kopfsprung/Kopfsprung.md) [Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) From 8cec736ff4d7ea5ee397dff58b85851c5f505d41 Mon Sep 17 00:00:00 2001 From: Jacob Cousineau Date: Thu, 21 Jul 2016 15:50:55 -0500 Subject: [PATCH 3992/5486] Fix typo in file path. --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 90a03927c6..a516195269 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1049,4 +1049,4 @@ Ever the fan of [Doug Adams](doug-adams/doug-adams.md). Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit -[Discover](../discover-new-genres/discover-new-genres.md) a new genre of music! +[Discover](discover-new-genres/discover-new-genres.md) a new genre of music! From cc7d736827f10c9d2adf97274efe3ac90c324770 Mon Sep 17 00:00:00 2001 From: Dario Date: Thu, 21 Jul 2016 22:52:23 +0200 Subject: [PATCH 3993/5486] Fix intro --- german/ruderboot.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/ruderboot.md b/german/ruderboot.md index 7565b3a751..5e2aad1fbe 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -1,6 +1,6 @@ Sie wachen von der Sonne geblendet auf und stellen ziemlich benommen fest, dass Sie -in einem Ruderboot auf einem grossen See treiben. Ihre Hose ist vollkommen durchn�sst, und +in einem Ruderboot auf einem grossen See treiben. Ihre Hose ist vollkommen durchnässt, und Sie bemerken, dass durch ein Loch in der Bootswand Wasser ins Boot dringt. From 57ab874d2a0cdce122c5311a10fc78325eeb2276 Mon Sep 17 00:00:00 2001 From: Dario Date: Thu, 21 Jul 2016 23:01:48 +0200 Subject: [PATCH 3994/5486] Return to old version of ruderboot.md --- german/ruderboot.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/german/ruderboot.md b/german/ruderboot.md index 5e2aad1fbe..04defbd28a 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -1,6 +1,6 @@ -Sie wachen von der Sonne geblendet auf und stellen ziemlich benommen fest, dass Sie +Sie wachen von der Sonne geblendet auf und stellen ziemlich benommen fest, dass Sie -in einem Ruderboot auf einem grossen See treiben. Ihre Hose ist vollkommen durchnässt, und +in einem Ruderboot auf einem grossen See treiben. Ihre Hose ist vollkommen durchnsst, und Sie bemerken, dass durch ein Loch in der Bootswand Wasser ins Boot dringt. @@ -8,7 +8,7 @@ Werden Sie: [Festellen, dass Sie doch kein Deutsch sprechen](../language.md) -[Zunächst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) +[Zunchst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) [Laut um Hilfe schreien?](Hilfeschrei/Hilfeschrei.md) @@ -24,14 +24,12 @@ Werden Sie: [Versuchen, mit Ihrer Kleidung das Loch zu stopfen](Stopfen/stopfen.md) -[Durchlöcherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) +[Durchlcherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) [Handeln ist anstrengend. Warum nicht einfach abwarten was passiert?](abwarten/abwarten.md) -[Sie spüren einen höllischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) +[Sie spren einen hllischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) -[Kopfüber ins Wasser springen](Kopfsprung/Kopfsprung.md) +[Kopfber ins Wasser springen](Kopfsprung/Kopfsprung.md) -[Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) - -[Nase zuhalten und ins Wurstwasser springen](Wurstwasser/wurstwasser.md) +[Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) \ No newline at end of file From c0e09d54c0df716aa0986f51be146f9b695d3a3f Mon Sep 17 00:00:00 2001 From: Dario Date: Thu, 21 Jul 2016 23:05:11 +0200 Subject: [PATCH 3995/5486] Add link again --- german/ruderboot.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/ruderboot.md b/german/ruderboot.md index 04defbd28a..bd79671d4b 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -32,4 +32,6 @@ Werden Sie: [Kopfber ins Wasser springen](Kopfsprung/Kopfsprung.md) -[Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) \ No newline at end of file +[Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) + +[Nase zuhalten und ins Wurstwasser springen](Wurstwasser/wurstwasser.md) \ No newline at end of file From d0e3cb4e1dc49d1a780f0477886b8df58462f8a4 Mon Sep 17 00:00:00 2001 From: Jacob Cousineau Date: Thu, 21 Jul 2016 18:23:06 -0500 Subject: [PATCH 3996/5486] Create grime.md and add brief description of grime music --- english/discover-new-genres/grime/grime.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 english/discover-new-genres/grime/grime.md diff --git a/english/discover-new-genres/grime/grime.md b/english/discover-new-genres/grime/grime.md new file mode 100644 index 0000000000..b0130337be --- /dev/null +++ b/english/discover-new-genres/grime/grime.md @@ -0,0 +1,10 @@ +You have decided to learn about grime! Grime is a genre originating from the +United Kingdom that mainly grew out of similar, older genres of electronic music +in the UK - primarily UK garage and jungle. Grime music is normally set at a +tempo of 140 beats per minute and feature dark basslines, futuristic electronic +noises, and an abundance of square waves. Grime is listened to both as stand- +alone instrumentals and with an MC, whose role in the genre has morphed from +something similar to the literal definition of "mic controller" to something +very similar to a modern hip-hop rapper. Grime is known for being fast, +agressive, and hard hitting and although many MCs have moved closer and closer +to a hip-hop sound, grime still maintains a distinct, underground sound. \ No newline at end of file From f3119638d2527572a6df0af709385f5bbcc53df6 Mon Sep 17 00:00:00 2001 From: Jacob Cousineau Date: Thu, 21 Jul 2016 18:29:39 -0500 Subject: [PATCH 3997/5486] Add link to grime.md in discover-new-genres.md --- english/discover-new-genres/discover-new-genres.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/discover-new-genres/discover-new-genres.md b/english/discover-new-genres/discover-new-genres.md index df92a17a26..b52e9b2378 100644 --- a/english/discover-new-genres/discover-new-genres.md +++ b/english/discover-new-genres/discover-new-genres.md @@ -2,3 +2,5 @@ You have decided to explore a new genre of music! There are so many options, but after giving it some thought you decide to explore... ================================================================================ +1) [Grime](grime/grime.md) +================================================================================ From c9ac9fdbe1878468ee60a54b74fb7db230c997a9 Mon Sep 17 00:00:00 2001 From: Jacob Cousineau Date: Thu, 21 Jul 2016 18:41:04 -0500 Subject: [PATCH 3998/5486] Encourage adding other genres to list --- english/discover-new-genres/discover-new-genres.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/discover-new-genres/discover-new-genres.md b/english/discover-new-genres/discover-new-genres.md index b52e9b2378..5addcf0c19 100644 --- a/english/discover-new-genres/discover-new-genres.md +++ b/english/discover-new-genres/discover-new-genres.md @@ -4,3 +4,5 @@ after giving it some thought you decide to explore... ================================================================================ 1) [Grime](grime/grime.md) ================================================================================ + +Add your favorite genre/s down here. Let's make a genre list! \ No newline at end of file From bc73ab92f29188d0282807094c3f0f7985025270 Mon Sep 17 00:00:00 2001 From: Jacob Cousineau Date: Thu, 21 Jul 2016 19:19:13 -0500 Subject: [PATCH 3999/5486] Add basic links to grime.md --- english/discover-new-genres/grime/grime.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/english/discover-new-genres/grime/grime.md b/english/discover-new-genres/grime/grime.md index b0130337be..b640c975fb 100644 --- a/english/discover-new-genres/grime/grime.md +++ b/english/discover-new-genres/grime/grime.md @@ -7,4 +7,9 @@ alone instrumentals and with an MC, whose role in the genre has morphed from something similar to the literal definition of "mic controller" to something very similar to a modern hip-hop rapper. Grime is known for being fast, agressive, and hard hitting and although many MCs have moved closer and closer -to a hip-hop sound, grime still maintains a distinct, underground sound. \ No newline at end of file +to a hip-hop sound, grime still maintains a distinct, underground sound. + +Links: +[Wikipedia article](https://en.wikipedia.org/wiki/Grime_music) +[Short documentary on grime history](http://www.factmag.com/2014/11/06/watch-a-full-length-documentary-on-the-history-of-grime-featuring-dizzee-rascal-slimzee-kano-and-more/) +[Grime Subreddit](https://www.reddit.com/r/grime) From 88bc209c6b0116986535d300578fb22f21340ccb Mon Sep 17 00:00:00 2001 From: Jacob Cousineau Date: Thu, 21 Jul 2016 19:42:07 -0500 Subject: [PATCH 4000/5486] Add examples section with links --- english/discover-new-genres/grime/grime.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/english/discover-new-genres/grime/grime.md b/english/discover-new-genres/grime/grime.md index b640c975fb..062364c15e 100644 --- a/english/discover-new-genres/grime/grime.md +++ b/english/discover-new-genres/grime/grime.md @@ -9,7 +9,17 @@ very similar to a modern hip-hop rapper. Grime is known for being fast, agressive, and hard hitting and although many MCs have moved closer and closer to a hip-hop sound, grime still maintains a distinct, underground sound. +Examples: +[Skepta-That's Not Me](https://www.youtube.com/watch?v=dyONbqggasY) +[Wiley-Outchea](https://soundcloud.com/richard-kylea-cowie/wiley-outchea) +[Spooky-Top 10 Dubplate Mix](https://soundcloud.com/factmag/dj-spooky-top-10-dubplate-mix) +[Dark0-Black Rose](https://www.youtube.com/watch?v=-irjIr2jBlM) +[DJ Slimzee, Wiley and Dizzee Rascal-Sidewinder 2003 Set](https://www.youtube.com/watch?v=2IzqD-z8trY) +[Dizzee Rascal-I Luv U](https://www.youtube.com/watch?v=YH0KWX2a8zY) +[Jammz-The World](https://soundcloud.com/iamgrime/jammz-iag001-b1-the-world) +[Danny Weed-Salt Beef](https://www.youtube.com/watch?v=LvBIazVjdn8) + Links: [Wikipedia article](https://en.wikipedia.org/wiki/Grime_music) [Short documentary on grime history](http://www.factmag.com/2014/11/06/watch-a-full-length-documentary-on-the-history-of-grime-featuring-dizzee-rascal-slimzee-kano-and-more/) -[Grime Subreddit](https://www.reddit.com/r/grime) +[Grime Subreddit](https://www.reddit.com/r/grime) \ No newline at end of file From 46d467648c5fc0bdc062e57443f34415fb0559ac Mon Sep 17 00:00:00 2001 From: Jacob Cousineau Date: Thu, 21 Jul 2016 19:52:38 -0500 Subject: [PATCH 4001/5486] Fixed spacing errors with links --- english/discover-new-genres/grime/grime.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/english/discover-new-genres/grime/grime.md b/english/discover-new-genres/grime/grime.md index 062364c15e..03d5b0a8ff 100644 --- a/english/discover-new-genres/grime/grime.md +++ b/english/discover-new-genres/grime/grime.md @@ -11,15 +11,25 @@ to a hip-hop sound, grime still maintains a distinct, underground sound. Examples: [Skepta-That's Not Me](https://www.youtube.com/watch?v=dyONbqggasY) + [Wiley-Outchea](https://soundcloud.com/richard-kylea-cowie/wiley-outchea) + [Spooky-Top 10 Dubplate Mix](https://soundcloud.com/factmag/dj-spooky-top-10-dubplate-mix) + [Dark0-Black Rose](https://www.youtube.com/watch?v=-irjIr2jBlM) + [DJ Slimzee, Wiley and Dizzee Rascal-Sidewinder 2003 Set](https://www.youtube.com/watch?v=2IzqD-z8trY) + [Dizzee Rascal-I Luv U](https://www.youtube.com/watch?v=YH0KWX2a8zY) + [Jammz-The World](https://soundcloud.com/iamgrime/jammz-iag001-b1-the-world) + [Danny Weed-Salt Beef](https://www.youtube.com/watch?v=LvBIazVjdn8) + Links: [Wikipedia article](https://en.wikipedia.org/wiki/Grime_music) + [Short documentary on grime history](http://www.factmag.com/2014/11/06/watch-a-full-length-documentary-on-the-history-of-grime-featuring-dizzee-rascal-slimzee-kano-and-more/) -[Grime Subreddit](https://www.reddit.com/r/grime) \ No newline at end of file + +[Grime Subreddit](https://www.reddit.com/r/grime) From c7456055c6cc13b2d4d218f92e9612cf6a7bc18c Mon Sep 17 00:00:00 2001 From: Jacob Cousineau Date: Thu, 21 Jul 2016 20:00:01 -0500 Subject: [PATCH 4002/5486] Fix more spacing issues with titles --- english/discover-new-genres/grime/grime.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/discover-new-genres/grime/grime.md b/english/discover-new-genres/grime/grime.md index 03d5b0a8ff..12cad56f07 100644 --- a/english/discover-new-genres/grime/grime.md +++ b/english/discover-new-genres/grime/grime.md @@ -10,6 +10,7 @@ agressive, and hard hitting and although many MCs have moved closer and closer to a hip-hop sound, grime still maintains a distinct, underground sound. Examples: + [Skepta-That's Not Me](https://www.youtube.com/watch?v=dyONbqggasY) [Wiley-Outchea](https://soundcloud.com/richard-kylea-cowie/wiley-outchea) @@ -28,6 +29,7 @@ Examples: Links: + [Wikipedia article](https://en.wikipedia.org/wiki/Grime_music) [Short documentary on grime history](http://www.factmag.com/2014/11/06/watch-a-full-length-documentary-on-the-history-of-grime-featuring-dizzee-rascal-slimzee-kano-and-more/) From a982ac0523c99bb958496a216c3f61ce57f7c8bd Mon Sep 17 00:00:00 2001 From: Jacob Cousineau Date: Thu, 21 Jul 2016 21:26:49 -0500 Subject: [PATCH 4003/5486] Shorten link to meet <120 chars limit --- english/discover-new-genres/grime/grime.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/discover-new-genres/grime/grime.md b/english/discover-new-genres/grime/grime.md index 12cad56f07..b38df282fe 100644 --- a/english/discover-new-genres/grime/grime.md +++ b/english/discover-new-genres/grime/grime.md @@ -32,6 +32,6 @@ Links: [Wikipedia article](https://en.wikipedia.org/wiki/Grime_music) -[Short documentary on grime history](http://www.factmag.com/2014/11/06/watch-a-full-length-documentary-on-the-history-of-grime-featuring-dizzee-rascal-slimzee-kano-and-more/) +[Short documentary on grime history](http://bit.ly/1ulCD4c) [Grime Subreddit](https://www.reddit.com/r/grime) From c57972b63d8fd56083685a68efd01054d67abd30 Mon Sep 17 00:00:00 2001 From: Jacob Cousineau Date: Thu, 21 Jul 2016 21:32:25 -0500 Subject: [PATCH 4004/5486] Added periods to end of each example/link --- english/discover-new-genres/grime/grime.md | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/english/discover-new-genres/grime/grime.md b/english/discover-new-genres/grime/grime.md index b38df282fe..86bc80a284 100644 --- a/english/discover-new-genres/grime/grime.md +++ b/english/discover-new-genres/grime/grime.md @@ -11,27 +11,26 @@ to a hip-hop sound, grime still maintains a distinct, underground sound. Examples: -[Skepta-That's Not Me](https://www.youtube.com/watch?v=dyONbqggasY) +[Skepta-That's Not Me](https://www.youtube.com/watch?v=dyONbqggasY). -[Wiley-Outchea](https://soundcloud.com/richard-kylea-cowie/wiley-outchea) +[Wiley-Outchea](https://soundcloud.com/richard-kylea-cowie/wiley-outchea). -[Spooky-Top 10 Dubplate Mix](https://soundcloud.com/factmag/dj-spooky-top-10-dubplate-mix) +[Spooky-Top 10 Dubplate Mix](https://soundcloud.com/factmag/dj-spooky-top-10-dubplate-mix). -[Dark0-Black Rose](https://www.youtube.com/watch?v=-irjIr2jBlM) +[Dark0-Black Rose](https://www.youtube.com/watch?v=-irjIr2jBlM). -[DJ Slimzee, Wiley and Dizzee Rascal-Sidewinder 2003 Set](https://www.youtube.com/watch?v=2IzqD-z8trY) +[DJ Slimzee, Wiley and Dizzee Rascal-Sidewinder 2003 Set](https://www.youtube.com/watch?v=2IzqD-z8trY). -[Dizzee Rascal-I Luv U](https://www.youtube.com/watch?v=YH0KWX2a8zY) +[Dizzee Rascal-I Luv U](https://www.youtube.com/watch?v=YH0KWX2a8zY). -[Jammz-The World](https://soundcloud.com/iamgrime/jammz-iag001-b1-the-world) - -[Danny Weed-Salt Beef](https://www.youtube.com/watch?v=LvBIazVjdn8) +[Jammz-The World](https://soundcloud.com/iamgrime/jammz-iag001-b1-the-world). +[Danny Weed-Salt Beef](https://www.youtube.com/watch?v=LvBIazVjdn8). Links: -[Wikipedia article](https://en.wikipedia.org/wiki/Grime_music) +[Wikipedia article](https://en.wikipedia.org/wiki/Grime_music). -[Short documentary on grime history](http://bit.ly/1ulCD4c) +[Short documentary on grime history](http://bit.ly/1ulCD4c). -[Grime Subreddit](https://www.reddit.com/r/grime) +[Grime Subreddit](https://www.reddit.com/r/grime). From bf42dcc2ab6763eb141ca41ed41bed0a9b7fd465 Mon Sep 17 00:00:00 2001 From: alexfung888 <1.alexfung@gmail.com> Date: Fri, 22 Jul 2016 14:52:57 +0800 Subject: [PATCH 4005/5486] forking on Special Agent --- english/00_8_Agent/The_name_is_Bond_Milton_Bond.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md index ce38cf1eec..92eac4b32a 100644 --- a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md +++ b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md @@ -1,3 +1,6 @@ +You have entered into the world of a secret agent. +If you used to be a Drill Master, you should aspire to become a [White Tiger](https://play.google.com/store/apps/details?id=com.linecorp.LGRGS) instead. + You have entered into the world of one of Her Majesty's secret agent. Codename Agent 008; his name is Bond, Milton Bond. He's the pencil pushing assistant of his more well-known cousin, [James](http://www.007.com/characters/the-bonds/). From 71b7b7aafa271062b58a560060b1cd8e0f56be58 Mon Sep 17 00:00:00 2001 From: alexfung888 <1.alexfung@gmail.com> Date: Fri, 22 Jul 2016 15:16:27 +0800 Subject: [PATCH 4006/5486] splitting a long line into two. --- english/00_8_Agent/The_name_is_Bond_Milton_Bond.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md index 92eac4b32a..fea768fd0c 100644 --- a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md +++ b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md @@ -1,5 +1,6 @@ You have entered into the world of a secret agent. -If you used to be a Drill Master, you should aspire to become a [White Tiger](https://play.google.com/store/apps/details?id=com.linecorp.LGRGS) instead. +If you used to be a Drill Master, you should aspire to become +a [White Tiger](https://play.google.com/store/apps/details?id=com.linecorp.LGRGS) instead. You have entered into the world of one of Her Majesty's secret agent. Codename Agent 008; his name is Bond, Milton Bond. From 73a4a302445508f752ecd4c9d0cdfe4028bde3c1 Mon Sep 17 00:00:00 2001 From: Bruce Baisch Jr Date: Fri, 22 Jul 2016 19:38:15 -0400 Subject: [PATCH 4007/5486] Give choice to listen to Too Many Puppies --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index a516195269..cc897c04a2 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1050,3 +1050,5 @@ Ever the fan of [Doug Adams](doug-adams/doug-adams.md). Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit [Discover](discover-new-genres/discover-new-genres.md) a new genre of music! + +[Watch](https://www.youtube.com/watch?v=-XJN7qqFqPE) Too Many Puppies! From e6e83902c85a8e5b38ce9713916036db564c8162 Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Fri, 22 Jul 2016 19:47:26 -0400 Subject: [PATCH 4008/5486] feat: Agregrar une option de caramel --- french/dessine/caramel/mangez-caramel.md | 1 + french/dessine/porte.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 french/dessine/caramel/mangez-caramel.md diff --git a/french/dessine/caramel/mangez-caramel.md b/french/dessine/caramel/mangez-caramel.md new file mode 100644 index 0000000000..121d79461d --- /dev/null +++ b/french/dessine/caramel/mangez-caramel.md @@ -0,0 +1 @@ +Vous mangez la porte de caramel avec du pain. Après quelques mintues, vous voyez la lumière. Vous voyez aussi... un lapin? \ No newline at end of file diff --git a/french/dessine/porte.md b/french/dessine/porte.md index 9985873031..1feca30183 100644 --- a/french/dessine/porte.md +++ b/french/dessine/porte.md @@ -7,3 +7,4 @@ Donc je decide de [Essayer d'ouvrir la porte faite de chocolat](chocolat/essayer-ouvrir-chocolat.md) +[Essayer mange la porte faite de caramel](caramel/mangez-caramel.md) \ No newline at end of file From 03dc88a56ffca9365dcae4d6f05e1375d6da96aa Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Fri, 22 Jul 2016 19:53:25 -0400 Subject: [PATCH 4009/5486] style: fit 120 characters or less per line --- french/dessine/caramel/mangez-caramel.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/french/dessine/caramel/mangez-caramel.md b/french/dessine/caramel/mangez-caramel.md index 121d79461d..89f3cc33ad 100644 --- a/french/dessine/caramel/mangez-caramel.md +++ b/french/dessine/caramel/mangez-caramel.md @@ -1 +1,2 @@ -Vous mangez la porte de caramel avec du pain. Après quelques mintues, vous voyez la lumière. Vous voyez aussi... un lapin? \ No newline at end of file +Vous mangez la porte de caramel avec du pain. Après quelques mintues, +vous voyez la lumière. Vous voyez aussi... un lapin? From 22c86adad4f23fffa60dfb4c8565e4008bdddad8 Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Fri, 22 Jul 2016 19:59:53 -0400 Subject: [PATCH 4010/5486] style: fix change of other's line --- .../giant-bubble/into-the-bubble/breathe-again.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md index 7b6c1fcd6a..812e55edf7 100644 --- a/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md +++ b/english/mysterious-pool/giant-bubble/into-the-bubble/breathe-again.md @@ -1,6 +1,7 @@ You swim into the bubble, and gasping, you take a big breath in. You look around in wonderment at the soothing blue aura of the bubble. Just as you -start to relax, thinking you may be alright after all, you realize... +start to relax, thinking you may be alright after all, you realize... + two things are possible. 1: its all just a [dream](../../../dream/fly/fly.md) From 0868d07d8edf64fc0e1016c440c39ade190a5557 Mon Sep 17 00:00:00 2001 From: Karla Aguilar Date: Fri, 22 Jul 2016 20:08:50 -0400 Subject: [PATCH 4011/5486] bug: remove musica and its files --- espanol/musica/grupo_mariachi.md | 1 - espanol/musica/mariachi/grupo_mariachi.md | 1 - "finnish/ja\314\210rvi/ja\314\210rvi.md" | 3 +++ .../svetlo-vijolic\314\214na.md" | 1 + "slovenian/zac\314\214etek.md" | 9 +++++++++ 5 files changed, 13 insertions(+), 2 deletions(-) delete mode 100644 espanol/musica/grupo_mariachi.md delete mode 100644 espanol/musica/mariachi/grupo_mariachi.md create mode 100644 "finnish/ja\314\210rvi/ja\314\210rvi.md" create mode 100644 "slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" create mode 100644 "slovenian/zac\314\214etek.md" diff --git a/espanol/musica/grupo_mariachi.md b/espanol/musica/grupo_mariachi.md deleted file mode 100644 index f92303db9d..0000000000 --- a/espanol/musica/grupo_mariachi.md +++ /dev/null @@ -1 +0,0 @@ -Y fue entonces cuando apareció un grupo de Mariachi, listo para sorprender a la familia con un poco de música. \ No newline at end of file diff --git a/espanol/musica/mariachi/grupo_mariachi.md b/espanol/musica/mariachi/grupo_mariachi.md deleted file mode 100644 index f92303db9d..0000000000 --- a/espanol/musica/mariachi/grupo_mariachi.md +++ /dev/null @@ -1 +0,0 @@ -Y fue entonces cuando apareció un grupo de Mariachi, listo para sorprender a la familia con un poco de música. \ No newline at end of file diff --git "a/finnish/ja\314\210rvi/ja\314\210rvi.md" "b/finnish/ja\314\210rvi/ja\314\210rvi.md" new file mode 100644 index 0000000000..da8b73f978 --- /dev/null +++ "b/finnish/ja\314\210rvi/ja\314\210rvi.md" @@ -0,0 +1,3 @@ +Pulahdat järveen laiturin nokasta. + +Vesi tuntuu ihanan viileältä ja tunnet olosi rauhalliseksi. \ No newline at end of file diff --git "a/slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" "b/slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" new file mode 100644 index 0000000000..4a14b970ab --- /dev/null +++ "b/slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" @@ -0,0 +1 @@ +Znašel si se v sobi svetlo vijolične barve. diff --git "a/slovenian/zac\314\214etek.md" "b/slovenian/zac\314\214etek.md" new file mode 100644 index 0000000000..91db1fd9c8 --- /dev/null +++ "b/slovenian/zac\314\214etek.md" @@ -0,0 +1,9 @@ +Včeraj si zaspal v svoji sobi, zdaj pa si se zbudil v beli sobi z dvemi vrati. Ena na levi, druga na desni. + +Leva vrata so rumene barve, desna pa svetlo vijolične barve. + +Skozi katera vrata vstopiš? + +[Odpreš vrata rumene barve](rumena/rumena.md) + +[Odpreš vrata svetlo vijolične barve](svetlo-vijolična/svetlo-vijolična.md) From 528652d2e4b75e151239ef0db88ca29fcc54d56d Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Fri, 22 Jul 2016 20:15:41 -0400 Subject: [PATCH 4012/5486] =?UTF-8?q?Delete=20ja=CC=88rvi.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "finnish/ja\314\210rvi/ja\314\210rvi.md" | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 "finnish/ja\314\210rvi/ja\314\210rvi.md" diff --git "a/finnish/ja\314\210rvi/ja\314\210rvi.md" "b/finnish/ja\314\210rvi/ja\314\210rvi.md" deleted file mode 100644 index da8b73f978..0000000000 --- "a/finnish/ja\314\210rvi/ja\314\210rvi.md" +++ /dev/null @@ -1,3 +0,0 @@ -Pulahdat järveen laiturin nokasta. - -Vesi tuntuu ihanan viileältä ja tunnet olosi rauhalliseksi. \ No newline at end of file From 77ee5607962b9766ceb3387518b16ab55b746785 Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Fri, 22 Jul 2016 20:16:11 -0400 Subject: [PATCH 4013/5486] =?UTF-8?q?Delete=20svetlo-vijolic=CC=8Cna.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" | 1 - 1 file changed, 1 deletion(-) delete mode 100644 "slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" diff --git "a/slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" "b/slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" deleted file mode 100644 index 4a14b970ab..0000000000 --- "a/slovenian/svetlo-vijolic\314\214na/svetlo-vijolic\314\214na.md" +++ /dev/null @@ -1 +0,0 @@ -Znašel si se v sobi svetlo vijolične barve. From 62574ea9982c556ddb2d09c8ffafbd55d56f9b4b Mon Sep 17 00:00:00 2001 From: Karla N Aguilar Date: Fri, 22 Jul 2016 20:16:29 -0400 Subject: [PATCH 4014/5486] =?UTF-8?q?Delete=20zac=CC=8Cetek.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "slovenian/zac\314\214etek.md" | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 "slovenian/zac\314\214etek.md" diff --git "a/slovenian/zac\314\214etek.md" "b/slovenian/zac\314\214etek.md" deleted file mode 100644 index 91db1fd9c8..0000000000 --- "a/slovenian/zac\314\214etek.md" +++ /dev/null @@ -1,9 +0,0 @@ -Včeraj si zaspal v svoji sobi, zdaj pa si se zbudil v beli sobi z dvemi vrati. Ena na levi, druga na desni. - -Leva vrata so rumene barve, desna pa svetlo vijolične barve. - -Skozi katera vrata vstopiš? - -[Odpreš vrata rumene barve](rumena/rumena.md) - -[Odpreš vrata svetlo vijolične barve](svetlo-vijolična/svetlo-vijolična.md) From a1f6588414ed9a2a451f55f59ed7aee891c81860 Mon Sep 17 00:00:00 2001 From: CelestialTechnology Date: Fri, 22 Jul 2016 22:01:43 -0500 Subject: [PATCH 4015/5486] Add Green Arrow for Epic DC; Add relative link --- english/DC-Comics/Arrow/arrow.md | 7 +++++++ english/DC-Comics/epic_DC_Character.md | 1 + 2 files changed, 8 insertions(+) create mode 100644 english/DC-Comics/Arrow/arrow.md diff --git a/english/DC-Comics/Arrow/arrow.md b/english/DC-Comics/Arrow/arrow.md new file mode 100644 index 0000000000..96b30e092a --- /dev/null +++ b/english/DC-Comics/Arrow/arrow.md @@ -0,0 +1,7 @@ +My name is Oliver Queen, formerly known as the hood, now known as the arrow. No one knows my identity due to my superior +disguise... + +"Yeah, dude, how can nobody NOT see your face? I mean, it's just a hood. Your voice morpher doesn't help much either. +SOOOOOO obvious." + +The Arrow twitches. He draws an arrow and nocks it to his bow, his anger rising. \ No newline at end of file diff --git a/english/DC-Comics/epic_DC_Character.md b/english/DC-Comics/epic_DC_Character.md index a4a8b7c82b..5b5639ffdc 100644 --- a/english/DC-Comics/epic_DC_Character.md +++ b/english/DC-Comics/epic_DC_Character.md @@ -6,3 +6,4 @@ Give it a deep thouht and figure it out. Hint: A useless character :) +[Green Arrow](Arrow/arrow.md) \ No newline at end of file From 72c7a6deb713e2c897bf42dd87bf42707de0e9fc Mon Sep 17 00:00:00 2001 From: Marcos Morgan Date: Sat, 23 Jul 2016 14:34:01 +0100 Subject: [PATCH 4016/5486] Buscar a Hernandez --- espanol/muralla/abrir/abrirsoldados/abrirsoldados.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/muralla/abrir/abrirsoldados/abrirsoldados.md b/espanol/muralla/abrir/abrirsoldados/abrirsoldados.md index 724792a75c..e69c3f982c 100644 --- a/espanol/muralla/abrir/abrirsoldados/abrirsoldados.md +++ b/espanol/muralla/abrir/abrirsoldados/abrirsoldados.md @@ -9,3 +9,5 @@ sobre la ciudad. Sin perder tiempo, Beatito exclamó: [¡Cerrad el portón!](cerrad/cerrad.md) + +[Hay que encontrar al capitan Hernandez!](../../../) From 7de94a3f37bd26989b56bf9258f14ff6dd26e6f6 Mon Sep 17 00:00:00 2001 From: Marcos Morgan Date: Sat, 23 Jul 2016 14:37:05 +0100 Subject: [PATCH 4017/5486] Add link to el capitan --- espanol/muralla/abrir/abrirsoldados/abrirsoldados.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/muralla/abrir/abrirsoldados/abrirsoldados.md b/espanol/muralla/abrir/abrirsoldados/abrirsoldados.md index e69c3f982c..5f772683cd 100644 --- a/espanol/muralla/abrir/abrirsoldados/abrirsoldados.md +++ b/espanol/muralla/abrir/abrirsoldados/abrirsoldados.md @@ -10,4 +10,4 @@ Sin perder tiempo, Beatito exclamó: [¡Cerrad el portón!](cerrad/cerrad.md) -[Hay que encontrar al capitan Hernandez!](../../../) +[¡Hay que encontrar al capitan Hernandez!](../../../barracas/capitan.md) From e74bf6c89281647289afce56b5614e309fec5723 Mon Sep 17 00:00:00 2001 From: colt Date: Sat, 23 Jul 2016 15:39:51 +0200 Subject: [PATCH 4018/5486] Burek s's krem --- serbian/burekKrem/krem.md | 3 +++ serbian/start.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 serbian/burekKrem/krem.md diff --git a/serbian/burekKrem/krem.md b/serbian/burekKrem/krem.md new file mode 100644 index 0000000000..188c60301c --- /dev/null +++ b/serbian/burekKrem/krem.md @@ -0,0 +1,3 @@ +Pojeo je dve osmine slatkog bureka, umazao se ko svinjče, +i psovao u sebi ceo Niš zato što ti nikad ne daju jednu četvrtinu, +no uvek dve osmine. Sto mu gromova... \ No newline at end of file diff --git a/serbian/start.md b/serbian/start.md index d8684e4a79..efdc16369f 100644 --- a/serbian/start.md +++ b/serbian/start.md @@ -12,3 +12,5 @@ Mlada radnica ga je ljubazno gledala. Rekla je: "Ili mozda tri?"[klikni ovde](noveIdeje/noveIdeje.md) "Da li ste mozda zainteresovani za neki dezert?" [klikni ovde](dezert/dezert.md) + +"Možda bi Vam prijao niški burek sa eurokremom?" [klikni ovde](burekKrem/krem.md) \ No newline at end of file From cab873f6bf11c43f353f5d50db657e5f287fba9d Mon Sep 17 00:00:00 2001 From: Jas K Date: Sat, 23 Jul 2016 18:51:15 +0100 Subject: [PATCH 4019/5486] Add rickson by armbar --- english/marshmallow.md | 2 ++ english/rickson-armbar/ricksonbyarmbar | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/rickson-armbar/ricksonbyarmbar diff --git a/english/marshmallow.md b/english/marshmallow.md index cc897c04a2..260dd72729 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1052,3 +1052,5 @@ Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit [Discover](discover-new-genres/discover-new-genres.md) a new genre of music! [Watch](https://www.youtube.com/watch?v=-XJN7qqFqPE) Too Many Puppies! + +You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar)... \ No newline at end of file diff --git a/english/rickson-armbar/ricksonbyarmbar b/english/rickson-armbar/ricksonbyarmbar new file mode 100644 index 0000000000..c4af2088ec --- /dev/null +++ b/english/rickson-armbar/ricksonbyarmbar @@ -0,0 +1,3 @@ +You just got armbarred. + +Oh well, it's just a joint dislocation. You will survive. \ No newline at end of file From 8c8be50871a7e042b03072e86b8923b8f661bb0b Mon Sep 17 00:00:00 2001 From: Jas K Date: Sat, 23 Jul 2016 18:59:04 +0100 Subject: [PATCH 4020/5486] Add .md to end of filename --- english/rickson-armbar/{ricksonbyarmbar => ricksonbyarmbar.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/rickson-armbar/{ricksonbyarmbar => ricksonbyarmbar.md} (100%) diff --git a/english/rickson-armbar/ricksonbyarmbar b/english/rickson-armbar/ricksonbyarmbar.md similarity index 100% rename from english/rickson-armbar/ricksonbyarmbar rename to english/rickson-armbar/ricksonbyarmbar.md From ea79b88d088862205b39c2a1e93220997630cebb Mon Sep 17 00:00:00 2001 From: Jas K Date: Sat, 23 Jul 2016 19:14:08 +0100 Subject: [PATCH 4021/5486] Add correct file link to marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 260dd72729..4df2be066c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1053,4 +1053,4 @@ Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit [Watch](https://www.youtube.com/watch?v=-XJN7qqFqPE) Too Many Puppies! -You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar)... \ No newline at end of file +You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... \ No newline at end of file From 70b3ef493483c164abdc7db846860a3f69419f6b Mon Sep 17 00:00:00 2001 From: matthewmcdermott Date: Sat, 23 Jul 2016 17:11:23 -0400 Subject: [PATCH 4022/5486] Create pizza.md file and link from is-this-a-dream --- english/is-this-a-dream/is-this-a-dream.md | 4 +++- english/pizza/pizza.md | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/pizza/pizza.md diff --git a/english/is-this-a-dream/is-this-a-dream.md b/english/is-this-a-dream/is-this-a-dream.md index 1023a9c660..7b1007f3b2 100644 --- a/english/is-this-a-dream/is-this-a-dream.md +++ b/english/is-this-a-dream/is-this-a-dream.md @@ -7,6 +7,8 @@ No more eating at that strange ass pizzaria you promise your self... But then again .. none of this fabulous shit would have been yours had you not be a frequent visitor at Joe's hallucination pizza bar. You know you want it cause life is short and there is yet much to lord over - .. so you pick up the phone and dial. "Hi I'd like to order a pizza ..." + + + .. so you pick up the phone and dial. "Hi I'd like to order a [pizza](../pizza/pizza.md) ..." Nah. I'm not hungry. Let's get [back to the story.](../marshmallow.md) diff --git a/english/pizza/pizza.md b/english/pizza/pizza.md new file mode 100644 index 0000000000..d8e503195e --- /dev/null +++ b/english/pizza/pizza.md @@ -0,0 +1,5 @@ +... reaching over to put the phone down you catch a whiff of your own B.O. and realize you need to become clean. First, you reach over and slap the ass next to you attempting to wake the owner. No reaction, so you get up and go into the shower. + +Getting out of the shower with a towel wrapped around your waste, you hear a loud knock out in the apartment. Holding the towel in place you remember there is a pizza delivery on its way, so you bolt out of the bathroom to the front door. After paying the pizza man, you turn around to see the owner of the ass looking at you with a smile on her face. + +After having some pizza together you both go into a hallucinogenic [slumber](../marshmallow.md)... From 8e8eb0c67591908c1b0e4d32b333404c0e29aac6 Mon Sep 17 00:00:00 2001 From: matthewmcdermott Date: Sat, 23 Jul 2016 17:19:11 -0400 Subject: [PATCH 4023/5486] Make pizza.md lines less than 120 --- english/is-this-a-dream/is-this-a-dream.md | 4 ++-- english/pizza/pizza.md | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/english/is-this-a-dream/is-this-a-dream.md b/english/is-this-a-dream/is-this-a-dream.md index 7b1007f3b2..d0fa81f963 100644 --- a/english/is-this-a-dream/is-this-a-dream.md +++ b/english/is-this-a-dream/is-this-a-dream.md @@ -7,8 +7,8 @@ No more eating at that strange ass pizzaria you promise your self... But then again .. none of this fabulous shit would have been yours had you not be a frequent visitor at Joe's hallucination pizza bar. You know you want it cause life is short and there is yet much to lord over + .. so you pick up the phone and dial. "Hi I'd like to order a pizza ..." - - .. so you pick up the phone and dial. "Hi I'd like to order a [pizza](../pizza/pizza.md) ..." +Order the [pizza](../pizza/pizza.md). Nah. I'm not hungry. Let's get [back to the story.](../marshmallow.md) diff --git a/english/pizza/pizza.md b/english/pizza/pizza.md index d8e503195e..e7dde74c13 100644 --- a/english/pizza/pizza.md +++ b/english/pizza/pizza.md @@ -1,5 +1,10 @@ -... reaching over to put the phone down you catch a whiff of your own B.O. and realize you need to become clean. First, you reach over and slap the ass next to you attempting to wake the owner. No reaction, so you get up and go into the shower. +... reaching over to put the phone down you catch a whiff of your own B.O. and realize +you need to become clean. First, you reach over and slap the ass next to you attempting +to wake the owner. No reaction, so you get up and go into the shower. -Getting out of the shower with a towel wrapped around your waste, you hear a loud knock out in the apartment. Holding the towel in place you remember there is a pizza delivery on its way, so you bolt out of the bathroom to the front door. After paying the pizza man, you turn around to see the owner of the ass looking at you with a smile on her face. +Getting out of the shower with a towel wrapped around your waste, you hear a loud knock +out in the apartment. Holding the towel in place you remember there is a pizza delivery +on its way, so you bolt out of the bathroom to the front door. After paying the pizza +man, you turn around to see the owner of the ass looking at you with a smile on her face. After having some pizza together you both go into a hallucinogenic [slumber](../marshmallow.md)... From 4ad7596c9b45fa5f4a40c3cc4f59db165ba72c01 Mon Sep 17 00:00:00 2001 From: John Napoletano Date: Sun, 24 Jul 2016 14:19:52 +0700 Subject: [PATCH 4024/5486] Add go back link to marshmallow.md from mad.md --- english/mad/mad.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/mad/mad.md b/english/mad/mad.md index e59c4ec80b..f6e6ff0b28 100644 --- a/english/mad/mad.md +++ b/english/mad/mad.md @@ -1 +1,3 @@ -come along, I will introduce you the [Forest](../forest/forest.md) \ No newline at end of file +come along, I will introduce you the [Forest](../forest/forest.md) + +On second though, maybe I should [go back](../marshmallow.md). \ No newline at end of file From 9fefda00fe4ccae70dbdeda1933838d927619da3 Mon Sep 17 00:00:00 2001 From: Ben Hadley Date: Sun, 24 Jul 2016 12:46:06 -0700 Subject: [PATCH 4025/5486] Add new option to plugh maze adventure --- english/lovecraftian/shoggoth.md | 1 + english/plugh/maze1/maze1.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/lovecraftian/shoggoth.md diff --git a/english/lovecraftian/shoggoth.md b/english/lovecraftian/shoggoth.md new file mode 100644 index 0000000000..19b9c31a53 --- /dev/null +++ b/english/lovecraftian/shoggoth.md @@ -0,0 +1 @@ +You are eaten by a horrible, eldritch Shoggoth. diff --git a/english/plugh/maze1/maze1.md b/english/plugh/maze1/maze1.md index 9c8af3ffb9..155df52449 100644 --- a/english/plugh/maze1/maze1.md +++ b/english/plugh/maze1/maze1.md @@ -19,3 +19,5 @@ Which way should we go? [southeast](maze1.md) [down](maze1.md) + +Or [enter](../../lovecraftian/shoggoth.md) a mysterious teleporter room. From 973efaa17298a4208d8de289947bd5b9cf910fe0 Mon Sep 17 00:00:00 2001 From: dmartin Date: Sun, 24 Jul 2016 15:48:49 -0500 Subject: [PATCH 4026/5486] Add link to troll from panic page --- catala/panic/panic.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/catala/panic/panic.md b/catala/panic/panic.md index 895b2d7da0..7b69ae71e0 100644 --- a/catala/panic/panic.md +++ b/catala/panic/panic.md @@ -1,8 +1,8 @@ De sobte no pots respirar, els pulmons se't fan petits i no t'entra l'aire. -Notes com tot el cos se't paralitza de por. +Notes com tot el cos se't paralitza de por. -Però com redimonis has arribat allà? +Però com redimonis has arribat allà? L'últim que recordes és que estaves a casa, tumbat al teu llit, llegint abans d'anar a dormir. @@ -10,7 +10,11 @@ abans d'anar a dormir. I pensant en llegit... on està el llibre? Però redimoniiiiis!!! A qui li importa on està el llibre en aquest moment? -Això no és important en aquest moment, t'has de centrar i pensar en on estàs, +Això no és important en aquest moment, t'has de centrar i pensar en on estàs, com hi has arribat i com redimooooooniiiiis sortiràs d'allà. Però... i el llibre? + +Si em surto d'aquesta, prometo no tornar a llegir Kafka abans de dormir. + +Al sortir a corre cuita de l'habitació, em trobo de sobte al [damunt d'una roca al mig d'un bosc ben fosc.](../troll/troll.md) From 81b9913b644c0f77ae55058d99629c5c91fe0292 Mon Sep 17 00:00:00 2001 From: dmartin Date: Sun, 24 Jul 2016 18:07:40 -0500 Subject: [PATCH 4027/5486] plit a line --- catala/panic/panic.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catala/panic/panic.md b/catala/panic/panic.md index 7b69ae71e0..d56218c17d 100644 --- a/catala/panic/panic.md +++ b/catala/panic/panic.md @@ -17,4 +17,5 @@ Però... i el llibre? Si em surto d'aquesta, prometo no tornar a llegir Kafka abans de dormir. -Al sortir a corre cuita de l'habitació, em trobo de sobte al [damunt d'una roca al mig d'un bosc ben fosc.](../troll/troll.md) +Al sortir a corre cuita de l'habitació, em trobo de sobte +[al damunt d'una roca al mig d'un bosc ben fosc.](../troll/troll.md) From 29baa7348475f4df6227a8cded212d60ad829cab Mon Sep 17 00:00:00 2001 From: Marios Hadjiantonis Date: Sun, 24 Jul 2016 20:10:02 -0400 Subject: [PATCH 4028/5486] Add option to paint a picture. --- english/marshmallow.md | 1 + english/paint-a-picture/paint-a-picture.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 english/paint-a-picture/paint-a-picture.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 4df2be066c..8622997924 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -35,6 +35,7 @@ January 2017 approaches. You have two presidential candidates to vote for. You don't like either of these candidates. So instead, you decide to [write a symphony](write-a-symphony/symphony.md) +or [paint a picture](paint-a-picture.md). Keith the Unicorn approaches you. He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) diff --git a/english/paint-a-picture/paint-a-picture.md b/english/paint-a-picture/paint-a-picture.md new file mode 100644 index 0000000000..919f70f9b8 --- /dev/null +++ b/english/paint-a-picture/paint-a-picture.md @@ -0,0 +1 @@ +With your eyes closed, you paint a perfect replica of Da Vinci's Mona Liza. From fb63b2e9058df9c57b27916a3b299588d11f9d63 Mon Sep 17 00:00:00 2001 From: Marios Hadjiantonis Date: Sun, 24 Jul 2016 20:16:25 -0400 Subject: [PATCH 4029/5486] Fix broken link. --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 8622997924..6b5ac6711c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -35,7 +35,7 @@ January 2017 approaches. You have two presidential candidates to vote for. You don't like either of these candidates. So instead, you decide to [write a symphony](write-a-symphony/symphony.md) -or [paint a picture](paint-a-picture.md). +or [paint a picture](paint-a-picture/paint-a-picture.md). Keith the Unicorn approaches you. He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) From 4a103c9bea2c07b467cabd888f9c0485c322a82c Mon Sep 17 00:00:00 2001 From: Marios Hadjiantonis Date: Sun, 24 Jul 2016 20:19:56 -0400 Subject: [PATCH 4030/5486] Separate the two links. --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6b5ac6711c..0b484c0c6f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -35,7 +35,8 @@ January 2017 approaches. You have two presidential candidates to vote for. You don't like either of these candidates. So instead, you decide to [write a symphony](write-a-symphony/symphony.md) -or [paint a picture](paint-a-picture/paint-a-picture.md). +or +[paint a picture](paint-a-picture/paint-a-picture.md). Keith the Unicorn approaches you. He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) From e9ab629db41d4725e94217e7f8e19e2c8cc09cd2 Mon Sep 17 00:00:00 2001 From: Ashan Date: Mon, 25 Jul 2016 16:48:45 +0700 Subject: [PATCH 4031/5486] Add line to batman.md --- english/batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index a7bf01af81..6daeb10b20 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -37,3 +37,5 @@ He also gets really weird with his [neighbors](http://imgur.com/gallery/Gi9cwgR) I am batman's cousin. Now that Bruce Wayne is grown old, he has proclaimed that I should take over his legacy! + +Over my dead body!! Says Robin. \ No newline at end of file From f1931ae7d1a4c44cd862a0ac9acbe3c276c21301 Mon Sep 17 00:00:00 2001 From: xinyuehtx Date: Mon, 25 Jul 2016 18:03:37 +0800 Subject: [PATCH 4032/5486] =?UTF-8?q?Create=20=E9=BB=84=E8=85=BE=E9=9C=84.?= =?UTF-8?q?md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/A_htx/\351\273\204\350\205\276\351\234\204.md" | 1 + 1 file changed, 1 insertion(+) create mode 100644 "Chinese/A_htx/\351\273\204\350\205\276\351\234\204.md" diff --git "a/Chinese/A_htx/\351\273\204\350\205\276\351\234\204.md" "b/Chinese/A_htx/\351\273\204\350\205\276\351\234\204.md" new file mode 100644 index 0000000000..14be3ed993 --- /dev/null +++ "b/Chinese/A_htx/\351\273\204\350\205\276\351\234\204.md" @@ -0,0 +1 @@ +[我](http://www.baidu.com) From e1ace374f371c8f96267f4152a124c284e3ca727 Mon Sep 17 00:00:00 2001 From: xinyuehtx Date: Mon, 25 Jul 2016 18:05:09 +0800 Subject: [PATCH 4033/5486] =?UTF-8?q?Update=20=E5=A4=A7=E8=AF=9D=E8=A5=BF?= =?UTF-8?q?=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index a6a2303083..cbc35d9cb6 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -127,3 +127,5 @@ [Pokemon](pokemon-go/pikachu.md) 后端程序元辛苦的工作虽然很少得到人重视，却是必不可少的一部分. + +[黄腾霄](A_htx/黄腾霄.md) From dccb23f5bf4729c34384194bbbcb326288fcc79d Mon Sep 17 00:00:00 2001 From: dmartin Date: Mon, 25 Jul 2016 12:17:43 -0500 Subject: [PATCH 4034/5486] Add link to troll --- catala/panic/panic.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catala/panic/panic.md b/catala/panic/panic.md index d56218c17d..a46da51ac3 100644 --- a/catala/panic/panic.md +++ b/catala/panic/panic.md @@ -1,8 +1,8 @@ De sobte no pots respirar, els pulmons se't fan petits i no t'entra l'aire. -Notes com tot el cos se't paralitza de por. +Notes com tot el cos se't paralitza de por. -Però com redimonis has arribat allà? +Però com redimonis has arribat allà? L'últim que recordes és que estaves a casa, tumbat al teu llit, llegint abans d'anar a dormir. @@ -10,7 +10,7 @@ abans d'anar a dormir. I pensant en llegit... on està el llibre? Però redimoniiiiis!!! A qui li importa on està el llibre en aquest moment? -Això no és important en aquest moment, t'has de centrar i pensar en on estàs, +Això no és important en aquest moment, t'has de centrar i pensar en on estàs, com hi has arribat i com redimooooooniiiiis sortiràs d'allà. Però... i el llibre? From 7f11c2edfcec4a4bad553c2c3bb5467c3b06e779 Mon Sep 17 00:00:00 2001 From: Asmita Date: Mon, 25 Jul 2016 10:48:46 -0700 Subject: [PATCH 4035/5486] added more to the story. --- Marathi/marathi.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Marathi/marathi.md b/Marathi/marathi.md index 7b2314eda0..644ce4ac60 100644 --- a/Marathi/marathi.md +++ b/Marathi/marathi.md @@ -8,4 +8,6 @@ mazi story [ethe](mi_marathi/mi_marathi.md)ahe. Want to meet Maharashtrians in Seattle? Go [here](seattle/seattle.md) -पुण्यामध्ये [गणेशोत्सव](ganesh/ganeshotsav.md) खूप उत्साहात साजरा झाला ! सगळ्यांचे आभार ! \ No newline at end of file +पुण्यामध्ये [गणेशोत्सव](ganesh/ganeshotsav.md) खूप उत्साहात साजरा झाला ! सगळ्यांचे आभार ! + +डरसली ने पुण्याच्या सगळ्या हॉस्पिटल ना मोदक बनवून पाठवण्याचा दर वर्षीचा कार्यक्रम चालू केला. पाच किलो तांदळाची पिठी, १० नारळ, २ गुळाच्या ढेपा, एक किलो वेलची. \ No newline at end of file From 50dd041188982ecf815382a3f040c1be30fa3ee7 Mon Sep 17 00:00:00 2001 From: Asmita Date: Mon, 25 Jul 2016 11:15:56 -0700 Subject: [PATCH 4036/5486] Add newline to break long line. --- Marathi/marathi.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marathi/marathi.md b/Marathi/marathi.md index 644ce4ac60..170084598a 100644 --- a/Marathi/marathi.md +++ b/Marathi/marathi.md @@ -10,4 +10,5 @@ Want to meet Maharashtrians in Seattle? Go [here](seattle/seattle.md) पुण्यामध्ये [गणेशोत्सव](ganesh/ganeshotsav.md) खूप उत्साहात साजरा झाला ! सगळ्यांचे आभार ! -डरसली ने पुण्याच्या सगळ्या हॉस्पिटल ना मोदक बनवून पाठवण्याचा दर वर्षीचा कार्यक्रम चालू केला. पाच किलो तांदळाची पिठी, १० नारळ, २ गुळाच्या ढेपा, एक किलो वेलची. \ No newline at end of file +डरसली ने पुण्याच्या सगळ्या हॉस्पिटल ना मोदक बनवून पाठवण्याचा दर वर्षीचा कार्यक्रम चालू केला. +पाच किलो तांदळाची पिठी, १० नारळ, २ गुळाच्या ढेपा, एक किलो वेलची. From 08a53398e30b85d83eef5810f11c06f10d178188 Mon Sep 17 00:00:00 2001 From: donald <825870831@qq.com> Date: Tue, 26 Jul 2016 15:48:21 +0800 Subject: [PATCH 4037/5486] =?UTF-8?q?Add=20a=20line=20in=20=E4=B8=9C?= =?UTF-8?q?=E5=93=A5=E5=98=BF=E5=98=BF=E5=98=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/Donggewudi/Donggeheiheihei.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/Donggewudi/Donggeheiheihei.md b/Chinese/Donggewudi/Donggeheiheihei.md index f459c513f6..70af190b4a 100644 --- a/Chinese/Donggewudi/Donggeheiheihei.md +++ b/Chinese/Donggewudi/Donggeheiheihei.md @@ -4,4 +4,6 @@ [你可知月光宝盒？](../Xinyang/MyLoveStory.md) -由此嘿嘿嘿 \ No newline at end of file +由此嘿嘿嘿 + +东哥也很喜欢操[大白](../Baymax/Baymax.md) From b536b67a6de0a3fae57bf47e2c8b2f3870e5a389 Mon Sep 17 00:00:00 2001 From: Itasari Date: Tue, 26 Jul 2016 11:20:46 -0700 Subject: [PATCH 4038/5486] Add a sentence on creating your channel on YouTube --- english/wikipedia/wiki.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/wikipedia/wiki.md b/english/wikipedia/wiki.md index 3e9fef5531..7d59c96a46 100644 --- a/english/wikipedia/wiki.md +++ b/english/wikipedia/wiki.md @@ -31,10 +31,14 @@ but seemingly everyone makes use of Wikipedia! Until you get bored and go explore [here](https://www.urbandictionary.com) instead. -Then after you explore the website, you learn a few neat tricks. +Then after you explore the website, you learn a few neat tricks. + +Then you want to show the world your new tricks by creating your own channel on [YouTube](https://www.youtube.com/). [Play minecraft](../you-are-in-minecraft/minecraft.md) [Play Skyrim](../fus-roh-dah/fus-roh-dah.md) [Learn Calculus](https://en.wikipedia.org/wiki/Calculus) + + From b32cf022e6131396e71b57c1ba131a57f089e411 Mon Sep 17 00:00:00 2001 From: Itasari Date: Tue, 26 Jul 2016 11:40:12 -0700 Subject: [PATCH 4039/5486] Incorporate casey-collab comment re: changing original lines --- english/wikipedia/wiki.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/wikipedia/wiki.md b/english/wikipedia/wiki.md index 7d59c96a46..be54c9ffc9 100644 --- a/english/wikipedia/wiki.md +++ b/english/wikipedia/wiki.md @@ -31,7 +31,7 @@ but seemingly everyone makes use of Wikipedia! Until you get bored and go explore [here](https://www.urbandictionary.com) instead. -Then after you explore the website, you learn a few neat tricks. +Then after you explore the website, you learn a few neat tricks. Then you want to show the world your new tricks by creating your own channel on [YouTube](https://www.youtube.com/). @@ -40,5 +40,3 @@ Then you want to show the world your new tricks by creating your own channel on [Play Skyrim](../fus-roh-dah/fus-roh-dah.md) [Learn Calculus](https://en.wikipedia.org/wiki/Calculus) - - From de118e038a7862c186697943f3e14db8554ea7af Mon Sep 17 00:00:00 2001 From: Allek Mott Date: Tue, 26 Jul 2016 17:16:03 -0700 Subject: [PATCH 4040/5486] Add amnesia --- english/forest/forest.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/forest/forest.md b/english/forest/forest.md index 6ff52620b3..847d14ecbe 100644 --- a/english/forest/forest.md +++ b/english/forest/forest.md @@ -31,4 +31,6 @@ Google can't help you right now. You are on your own. [Make a shelter from the parachute](shelter/shelter.md) -[Eat all of your rations in a panic](eat/eat.md) \ No newline at end of file +[Eat all of your rations in a panic](eat/eat.md) + +[Succumb to amnesia](./forest) From 5d890d2feb54251dc5798e9bff8eaf7fa9807c50 Mon Sep 17 00:00:00 2001 From: Allek Mott Date: Tue, 26 Jul 2016 17:17:43 -0700 Subject: [PATCH 4041/5486] Fix hyperlink (forgot file extension) --- english/forest/forest.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/forest/forest.md b/english/forest/forest.md index 847d14ecbe..4f3803cecb 100644 --- a/english/forest/forest.md +++ b/english/forest/forest.md @@ -33,4 +33,4 @@ Google can't help you right now. You are on your own. [Eat all of your rations in a panic](eat/eat.md) -[Succumb to amnesia](./forest) +[Succumb to amnesia](./forest.md) From 7597a780955265b832c932348353fa31856ced6c Mon Sep 17 00:00:00 2001 From: Liu Reid Date: Wed, 27 Jul 2016 12:07:36 +0800 Subject: [PATCH 4042/5486] add a new story Person of Interest --- .../\347\226\221\347\212\257\350\277\275\350\270\252.md" | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 "Chinese/Person_of_Interest/\347\226\221\347\212\257\350\277\275\350\270\252.md" diff --git "a/Chinese/Person_of_Interest/\347\226\221\347\212\257\350\277\275\350\270\252.md" "b/Chinese/Person_of_Interest/\347\226\221\347\212\257\350\277\275\350\270\252.md" new file mode 100644 index 0000000000..019551b679 --- /dev/null +++ "b/Chinese/Person_of_Interest/\347\226\221\347\212\257\350\277\275\350\270\252.md" @@ -0,0 +1 @@ +在一个没有秘密的世界... \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index cbc35d9cb6..78796eb21c 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -129,3 +129,5 @@ 后端程序元辛苦的工作虽然很少得到人重视，却是必不可少的一部分. [黄腾霄](A_htx/黄腾霄.md) + +[疑犯追踪](Person_of_Interest/疑犯追踪.md) \ No newline at end of file From d14db50b94def41371d3abac15944b520e7f5168 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 27 Jul 2016 00:12:30 -0500 Subject: [PATCH 4043/5486] Added new page with 2 different possibilities --- espanol/canudos.md | 3 +++ espanol/time/time.md | 2 ++ espanol/time/time1.md | 1 + 3 files changed, 6 insertions(+) create mode 100644 espanol/time/time.md create mode 100644 espanol/time/time1.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 12151d5a8c..3a197b6824 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -154,3 +154,6 @@ Y llego [Daynerys Targaryen](thrones/daynerys.md) Recordó algunos crímenes que pesaban sobre él y de la nada perdió el conocimiento(desmayo/desmayo.md) +Revelo que venia del futuro y que le daba dos opciones: +- [Morir luchando como sabia que pasaria en el futuro](time/time.md) +- [Seguir sus instrucciones y ganar](time/time1.md) \ No newline at end of file diff --git a/espanol/time/time.md b/espanol/time/time.md new file mode 100644 index 0000000000..ef5c22170c --- /dev/null +++ b/espanol/time/time.md @@ -0,0 +1,2 @@ +Asi el consejero oprimio un boton de una extrana maquina que saco de su gaban y desaparecio mientras Beatito +se preguntaba sobre las afirmacion que acababa de escuchar. \ No newline at end of file diff --git a/espanol/time/time1.md b/espanol/time/time1.md new file mode 100644 index 0000000000..58604788e7 --- /dev/null +++ b/espanol/time/time1.md @@ -0,0 +1 @@ +El consejero apunto a un monte a lo lejos y dijo "lleva a tu ejercito a ese punto"... \ No newline at end of file From 2dd2e0d594bdebdd919916bb2d457773ba5c8846 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 27 Jul 2016 00:23:16 -0500 Subject: [PATCH 4044/5486] Fixed error for auto merge for time --- espanol/canudos.md | 3 ++- espanol/{time => time1}/time1.md | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename espanol/{time => time1}/time1.md (100%) diff --git a/espanol/canudos.md b/espanol/canudos.md index 3a197b6824..6ed4cfc09a 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -156,4 +156,5 @@ Recordó algunos crímenes que pesaban sobre él y de la nada perdió el conocim Revelo que venia del futuro y que le daba dos opciones: - [Morir luchando como sabia que pasaria en el futuro](time/time.md) -- [Seguir sus instrucciones y ganar](time/time1.md) \ No newline at end of file + +- [Seguir sus instrucciones y ganar](time1/time1.md) \ No newline at end of file diff --git a/espanol/time/time1.md b/espanol/time1/time1.md similarity index 100% rename from espanol/time/time1.md rename to espanol/time1/time1.md From 7b73382616b23572e6a6441bb90b0422ab6dc1cb Mon Sep 17 00:00:00 2001 From: Rupesh12 Date: Wed, 27 Jul 2016 01:55:34 -0400 Subject: [PATCH 4045/5486] Add the Great Bhagat Singh --- hindi/Bhagat_Singh/bhagat_singh.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hindi/Bhagat_Singh/bhagat_singh.md b/hindi/Bhagat_Singh/bhagat_singh.md index 6798e6bf41..659b853bee 100644 --- a/hindi/Bhagat_Singh/bhagat_singh.md +++ b/hindi/Bhagat_Singh/bhagat_singh.md @@ -1,3 +1,6 @@ +Bhagat Singh the Great One. +[Bhagat Singh The Great](http://freeindia.org/biographies/freedomfighters/bhagathsingh/index.htm). + Bhagat Singh aka Shaheed Bhagat Singh (28 September 1907 – 23 March 1931) was an [Indian](https://simple.wikipedia.org/wiki/India) socialist and a revolutionary. He is considered to be one of the most influential revolutionaries of the From cb4a99ac7ab5759ff21dd2a4162ef1a1e087094f Mon Sep 17 00:00:00 2001 From: Di Wu Date: Wed, 27 Jul 2016 16:50:04 +0800 Subject: [PATCH 4046/5486] Adding the language of love, oh.... --- language.md | 2 ++ love/love.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 love/love.md diff --git a/language.md b/language.md index 25252ec217..dc2f49861b 100644 --- a/language.md +++ b/language.md @@ -18,6 +18,8 @@ If you speak Punjabi, [go here](punjabi/punjabi.md). यिद तपाई नेपाली बोलनुहुनछ भने, [यहाँ िथचनुहोस ।](nepali/about_nepal.md) +If you speak the language of love, [kiss here](love/love.md) + 如果你说中文，[点击这里](Chinese/大话西游.md). 如果你说中文而且想要了解一个新的世界，[请点击这里](Chinese/DesertHell/NewWorld.md). diff --git a/love/love.md b/love/love.md new file mode 100644 index 0000000000..372e9966e9 --- /dev/null +++ b/love/love.md @@ -0,0 +1,3 @@ +Love is universal, some say, [French] (../french/feu-de-camp.md) is the language of love. + +Do I agree? \ No newline at end of file From 6d75214bb33fd9671c4be13e7223e660112d5b92 Mon Sep 17 00:00:00 2001 From: mbowen13 Date: Wed, 27 Jul 2016 13:32:06 -0400 Subject: [PATCH 4047/5486] Add line to story --- english/weed/weed.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/weed/weed.md b/english/weed/weed.md index 0a9ecd8f19..ebefb168b0 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -11,6 +11,8 @@ Then you wonder why you're taking advice from a Love Pink Unicorn (after all, th the most untrustworthy breed of unicorn, far worse, even, than the Grim Charcoal Unicorns of Strawgoh). However, the Love Pink Unicorn brings happiness to everyone by handing out those yummy pot cookies. +You realize the unicorn is really your inner self. + You decide to take a new path. Do you: Take a vow of [sobriety]?(../shrooms/never-again.md) From 2b4ed9f844a6f880f0a8ac059fdbefb5d8d96009 Mon Sep 17 00:00:00 2001 From: Chad Renner Date: Wed, 27 Jul 2016 14:33:24 -0400 Subject: [PATCH 4048/5486] Modify Gibbersh Story to create awesomesomeness! --- Gibberish/Gibberish.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Gibberish/Gibberish.md b/Gibberish/Gibberish.md index e5804c1925..4d5124fb2b 100644 --- a/Gibberish/Gibberish.md +++ b/Gibberish/Gibberish.md @@ -12,3 +12,4 @@ alksdjfö jibber jobber joober, gibberish is for goobers. kdnavna knakdn knakdn ind faondf alkd fadk +blkajd asdglkjdsFH A SGLKAHSJD S sdflhjgaj dat goober. From cc8d5455e3cea1dc33f0d0ece82bb9b255b8e856 Mon Sep 17 00:00:00 2001 From: Lenovo Date: Thu, 28 Jul 2016 15:37:30 +0600 Subject: [PATCH 4049/5486] Added music in Russian Zefir.md --- russian/music/turn_music.md | 1 + russian/zefir.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 russian/music/turn_music.md diff --git a/russian/music/turn_music.md b/russian/music/turn_music.md new file mode 100644 index 0000000000..88e8a2e43a --- /dev/null +++ b/russian/music/turn_music.md @@ -0,0 +1 @@ + Joy c Valerie. \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index 0c268e445a..4e40bf56b8 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -108,4 +108,6 @@ [Отправитесь путешествовать](travelling/go-to-travel.md) -[Буду клеить](glue/index.md) \ No newline at end of file +[Буду клеить](glue/index.md) + +[Включите музыку](music/turn_music.md) \ No newline at end of file From 6e62f5d4fcc9b23dc5e9ce287f7d1f7285c37876 Mon Sep 17 00:00:00 2001 From: gcmsrc Date: Thu, 28 Jul 2016 21:39:02 +0100 Subject: [PATCH 4050/5486] Add antonio_conte folder and antonio_conte.md files --- Italian/antonio_conte/antonio.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Italian/antonio_conte/antonio.md diff --git a/Italian/antonio_conte/antonio.md b/Italian/antonio_conte/antonio.md new file mode 100644 index 0000000000..e69de29bb2 From 43ea39ed55d43a9f46e11d55de52e26e8307b8c7 Mon Sep 17 00:00:00 2001 From: gcmsrc Date: Thu, 28 Jul 2016 21:44:57 +0100 Subject: [PATCH 4051/5486] Modify antonio.md text with main story --- Italian/antonio_conte/antonio.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Italian/antonio_conte/antonio.md b/Italian/antonio_conte/antonio.md index e69de29bb2..ec2a771a44 100644 --- a/Italian/antonio_conte/antonio.md +++ b/Italian/antonio_conte/antonio.md @@ -0,0 +1,9 @@ +TELEFONATA AD ANTONIO CONTE (A.C.) + +Io: We, Mister! Come andiamo? Mi sono svegliato in una [stanza molto strana](http://giphy.com/gifs/uy4zM12rn3oaY). Che cosa devo fare? + +A.C.: Esci, esci - meglio cosi! [immagine di supporto](http://giphy.com/gifs/sporzaredactie-euro2016-italia-sporza-26BoCA9sGwKqelZra) + +Io: Ma mister, sembra ci siano [belle ragazze](http://giphy.com/gifs/dancing-dance-SioZIrQsuN36E)... + +A.C.: ... [clicca qui va'...](http://giphy.com/gifs/sporzaredactie-euro2016-italia-sporza-l41YiaHYCcSwrZGBq) \ No newline at end of file From a78a8f1625e4f3df1687ba67373fe802d78a4273 Mon Sep 17 00:00:00 2001 From: gcmsrc Date: Thu, 28 Jul 2016 21:48:25 +0100 Subject: [PATCH 4052/5486] Reduce line lenght --- Italian/antonio_conte/antonio.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Italian/antonio_conte/antonio.md b/Italian/antonio_conte/antonio.md index ec2a771a44..fb93f7d087 100644 --- a/Italian/antonio_conte/antonio.md +++ b/Italian/antonio_conte/antonio.md @@ -1,9 +1,13 @@ TELEFONATA AD ANTONIO CONTE (A.C.) -Io: We, Mister! Come andiamo? Mi sono svegliato in una [stanza molto strana](http://giphy.com/gifs/uy4zM12rn3oaY). Che cosa devo fare? +Io: We, Mister! Come andiamo? Mi sono svegliato in una +[stanza molto strana](http://giphy.com/gifs/uy4zM12rn3oaY). +Che cosa devo fare? -A.C.: Esci, esci - meglio cosi! [immagine di supporto](http://giphy.com/gifs/sporzaredactie-euro2016-italia-sporza-26BoCA9sGwKqelZra) +A.C.: Esci, esci - meglio cosi! +[immagine di supporto](http://giphy.com/gifs/sporzaredactie-euro2016-italia-sporza-26BoCA9sGwKqelZra) -Io: Ma mister, sembra ci siano [belle ragazze](http://giphy.com/gifs/dancing-dance-SioZIrQsuN36E)... +Io: Ma mister, sembra ci siano +[belle ragazze](http://giphy.com/gifs/dancing-dance-SioZIrQsuN36E)... A.C.: ... [clicca qui va'...](http://giphy.com/gifs/sporzaredactie-euro2016-italia-sporza-l41YiaHYCcSwrZGBq) \ No newline at end of file From d85b68b0d381a82ad35ac20a91c795a0324ec101 Mon Sep 17 00:00:00 2001 From: gcmsrc Date: Thu, 28 Jul 2016 21:49:34 +0100 Subject: [PATCH 4053/5486] Modify caramelle.md file --- Italian/caramelle.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Italian/caramelle.md b/Italian/caramelle.md index 644700ec07..c40d30fac4 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -23,4 +23,6 @@ Che fai? [Passeggiare] (passeggiare/passeggiare.md) -[Salgo in macchina] (ascoltare/profumato.md) \ No newline at end of file +[Salgo in macchina] (ascoltare/profumato.md) + +[Telefono ad Antonio Conte](antonio_conte/antonio.md) \ No newline at end of file From 39aafe304cc2bd58bdec935ea4e3df6c39654e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Vali=C3=B1o?= Date: Thu, 28 Jul 2016 22:52:29 +0200 Subject: [PATCH 4054/5486] Simple test changes to make a pull request --- english/udacity/udacity.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/udacity/udacity.md b/english/udacity/udacity.md index d6b2248fdb..aed586568e 100644 --- a/english/udacity/udacity.md +++ b/english/udacity/udacity.md @@ -1,3 +1,5 @@ Alas, there is not, you're stuck. Get Caroline on it! -Click [here](https://github.com/cbuckey-uda) to visit Caroline's github page! \ No newline at end of file +Click [here](https://github.com/cbuckey-uda) to visit Caroline's github page! + +Please be *_Nice_*! \ No newline at end of file From 8b92d8514244f2155d79de421b269b3a3236914b Mon Sep 17 00:00:00 2001 From: autumnly Date: Fri, 29 Jul 2016 16:44:20 +0900 Subject: [PATCH 4055/5486] Add new file : getting-closer.md Modify approached-green-people.md --- .../approach-green-people/approached-green-people.md | 4 +++- .../approach-green-people/getting-closer.md | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 korean/explore-outside/investigate-marshmallow-structure/approach-green-people/getting-closer.md diff --git a/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md index 0f1b035f28..5bbf030c0e 100644 --- a/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md +++ b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md @@ -1,4 +1,6 @@ 초록 인간들에게 다가가자 그들이 고개를 돌려 당신이 있는쪽을 바라보고 있어요. 당신은 어떻게 할까요? -[마시멜로 방 밖으로 되돌아간다] (../../explore-outside.md) \ No newline at end of file +[마시멜로 방 밖으로 되돌아간다] (../../explore-outside.md) + +[초록 인간들에게 더 가까이 가본다] (getting-closer.md) \ No newline at end of file diff --git a/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/getting-closer.md b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/getting-closer.md new file mode 100644 index 0000000000..47e0e24da4 --- /dev/null +++ b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/getting-closer.md @@ -0,0 +1,8 @@ + +초록인간들을 자세히 들여다 봤어요. +그런데...! + +그들은 인간이 아니라 +뭉쳐있는 초록색 m&m 초콜렛들이였어요. + +아마도 이 곳은 커다란 초콜렛 공장인가봐요. \ No newline at end of file From 915cbc79fb88a794f1be7c8afa5e14aa5d3f62d6 Mon Sep 17 00:00:00 2001 From: autumnly Date: Fri, 29 Jul 2016 16:55:13 +0900 Subject: [PATCH 4056/5486] Redirect file getting-closer.md --- .../approach-green-people/approached-green-people.md | 2 +- .../{ => getting-closer}/getting-closer.md | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename korean/explore-outside/investigate-marshmallow-structure/approach-green-people/{ => getting-closer}/getting-closer.md (100%) diff --git a/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md index 5bbf030c0e..155e62df39 100644 --- a/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md +++ b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md @@ -3,4 +3,4 @@ [마시멜로 방 밖으로 되돌아간다] (../../explore-outside.md) -[초록 인간들에게 더 가까이 가본다] (getting-closer.md) \ No newline at end of file +[초록 인간들에게 더 가까이 가본다] (./getting-closer.md) \ No newline at end of file diff --git a/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/getting-closer.md b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/getting-closer/getting-closer.md similarity index 100% rename from korean/explore-outside/investigate-marshmallow-structure/approach-green-people/getting-closer.md rename to korean/explore-outside/investigate-marshmallow-structure/approach-green-people/getting-closer/getting-closer.md From ba4ce40c1efacc166c7beff578b1ca36a4e224a8 Mon Sep 17 00:00:00 2001 From: autumnly Date: Fri, 29 Jul 2016 17:00:53 +0900 Subject: [PATCH 4057/5486] Modified a link --- .../approach-green-people/approached-green-people.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md index 155e62df39..a8f44443c4 100644 --- a/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md +++ b/korean/explore-outside/investigate-marshmallow-structure/approach-green-people/approached-green-people.md @@ -3,4 +3,4 @@ [마시멜로 방 밖으로 되돌아간다] (../../explore-outside.md) -[초록 인간들에게 더 가까이 가본다] (./getting-closer.md) \ No newline at end of file +[초록 인간들에게 더 가까이 가본다] (getting-closer/getting-closer.md) \ No newline at end of file From 139419aea4827ec406b3413171e96639efeb6c6b Mon Sep 17 00:00:00 2001 From: matthiashofmann Date: Fri, 29 Jul 2016 17:51:28 +0900 Subject: [PATCH 4058/5486] add german drinking line in service.md --- german/schwimmen/insel/fs_innen/service/service.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/german/schwimmen/insel/fs_innen/service/service.md b/german/schwimmen/insel/fs_innen/service/service.md index 7bca456fcb..e549f3efbc 100644 --- a/german/schwimmen/insel/fs_innen/service/service.md +++ b/german/schwimmen/insel/fs_innen/service/service.md @@ -5,3 +5,5 @@ Dann antwortest du: "Ich hätte eigentlich ganz gern ein kühles Altbier!". Im nächsten Moment öffnet sich mit einem leisen, metallischen Knackgeräusch eine kleine Luke in der rückseitigen Fahrstuhlwand. Diese war dir noch gar nicht aufgefallen. Hinter der Luke befindet sich eine kleine Aussparung, und dort steht auf einem Tablett tatsächlich ein schönes, offensichtlich gekühltes Bier. + +Du greifst das Bier und während des Trinkens verlierst du dich in dem erfrischenden Geschmack. \ No newline at end of file From a2bb67a6eb239c3f79d9638ef3ff57f62f7b7f3c Mon Sep 17 00:00:00 2001 From: Andi Date: Fri, 29 Jul 2016 12:05:44 +0200 Subject: [PATCH 4059/5486] =?UTF-8?q?Alternative=20"=C3=9Cberlegen"=20nach?= =?UTF-8?q?=20Stopfen=20des=20Lochs=20im=20Boot=20hinzuf=C3=BCgen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Stopfen/stopfen.md | 2 ++ german/Stopfen/ueberlegen/ueberlegen.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 german/Stopfen/ueberlegen/ueberlegen.md diff --git a/german/Stopfen/stopfen.md b/german/Stopfen/stopfen.md index 4437764646..079a261b3d 100644 --- a/german/Stopfen/stopfen.md +++ b/german/Stopfen/stopfen.md @@ -14,3 +14,5 @@ Was machen Sie nun? [Aus dem Traum aufwachen und Oktoberfest besuchen](../Oktoberfest/oktoberfest.md) [Die Stille geniessen und nachdenken](entspannen/entspannen.md) + +[Ruhig durchatmen und überlegen] (ueberlegen/ueberlegen.md) diff --git a/german/Stopfen/ueberlegen/ueberlegen.md b/german/Stopfen/ueberlegen/ueberlegen.md new file mode 100644 index 0000000000..41ba769f61 --- /dev/null +++ b/german/Stopfen/ueberlegen/ueberlegen.md @@ -0,0 +1,3 @@ +Sie entschlieen sich, dem Anflug von Panik entgegenzutreten und erst einmal durchzuatmen. Dann schauen Sie sich im Boot genau um. Hier befinden sich keine Ruder oder sonstige Gegenstnde. + +Sie schauen ber den See. Das nchstliegende Ufer ist weit entfernt. Sie knnen keine Menschen am Ufer erkennen. Sie sehen auch keine anderen Boote auf dem See. Ans Ufer zu schwimmen scheint aussichtslos und zudem gefhrlich aufgrund mglicher Strudel. Also mssen Sie eine andere Mglichkeit finden, ans Ufer zu kommen. From adfad63b6168358aab21a095acdfadac1d2ffafc Mon Sep 17 00:00:00 2001 From: Andi Date: Fri, 29 Jul 2016 12:28:22 +0200 Subject: [PATCH 4060/5486] =?UTF-8?q?=C3=9Cberfl=C3=BCssiges=20Leerzeichen?= =?UTF-8?q?=20entfernt=20in=20"stopfen.md"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Stopfen/stopfen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/Stopfen/stopfen.md b/german/Stopfen/stopfen.md index 079a261b3d..8601f2d760 100644 --- a/german/Stopfen/stopfen.md +++ b/german/Stopfen/stopfen.md @@ -15,4 +15,4 @@ Was machen Sie nun? [Die Stille geniessen und nachdenken](entspannen/entspannen.md) -[Ruhig durchatmen und überlegen] (ueberlegen/ueberlegen.md) +[Ruhig durchatmen und überlegen](ueberlegen/ueberlegen.md) From 11cf3526091c0fc09497e29eed72d4472b4f8c62 Mon Sep 17 00:00:00 2001 From: Andi Date: Fri, 29 Jul 2016 12:33:07 +0200 Subject: [PATCH 4061/5486] =?UTF-8?q?Zeilenumbr=C3=BCche=20eingef=C3=BCgt?= =?UTF-8?q?=20in=20"ueberlegen.md"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Stopfen/ueberlegen/ueberlegen.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/german/Stopfen/ueberlegen/ueberlegen.md b/german/Stopfen/ueberlegen/ueberlegen.md index 41ba769f61..69cf913e92 100644 --- a/german/Stopfen/ueberlegen/ueberlegen.md +++ b/german/Stopfen/ueberlegen/ueberlegen.md @@ -1,3 +1,6 @@ -Sie entschlieen sich, dem Anflug von Panik entgegenzutreten und erst einmal durchzuatmen. Dann schauen Sie sich im Boot genau um. Hier befinden sich keine Ruder oder sonstige Gegenstnde. +Sie entschlieen sich, dem Anflug von Panik entgegenzutreten und erst einmal durchzuatmen. Dann schauen Sie sich +im Boot genau um. Hier befinden sich keine Ruder oder sonstige Gegenstnde. -Sie schauen ber den See. Das nchstliegende Ufer ist weit entfernt. Sie knnen keine Menschen am Ufer erkennen. Sie sehen auch keine anderen Boote auf dem See. Ans Ufer zu schwimmen scheint aussichtslos und zudem gefhrlich aufgrund mglicher Strudel. Also mssen Sie eine andere Mglichkeit finden, ans Ufer zu kommen. +Sie schauen ber den See. Das nchstliegende Ufer ist weit entfernt. Sie knnen keine Menschen am Ufer erkennen. +Sie sehen auch keine anderen Boote auf dem See. Ans Ufer zu schwimmen scheint aussichtslos und zudem gefhrlich +aufgrund mglicher Strudel. Also mssen Sie eine andere Mglichkeit finden, ans Ufer zu kommen. From dbd07001bf23fbb2028d208cf29383c491de994d Mon Sep 17 00:00:00 2001 From: RyanxWolton Date: Fri, 29 Jul 2016 16:49:56 +0100 Subject: [PATCH 4062/5486] Add Pokemon Go story --- english/Pokemon_Go/Pokemon-Go.md | 6 +++++ english/marshmallow.md | 38 +++++++++++++++++--------------- 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 english/Pokemon_Go/Pokemon-Go.md diff --git a/english/Pokemon_Go/Pokemon-Go.md b/english/Pokemon_Go/Pokemon-Go.md new file mode 100644 index 0000000000..6f20935f62 --- /dev/null +++ b/english/Pokemon_Go/Pokemon-Go.md @@ -0,0 +1,6 @@ +Pokemon Go has seemingly taken over the world. You want to be the very best, so +you quit your job to become a full time Pokemon Go player. You strive to travel +the world in search of Pokemon! + +One night, after quitting your job, you are dreaming of +[Marshmallows](../pikachu/Pokeball.md) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0b484c0c6f..3bcfa7c083 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,6 +1,6 @@ Once upon a time many authors collaborated to make meaningless linked story. -[start](mad/mad.md) your journey into world of mad +[start](mad/mad.md) your journey into world of mad or @@ -8,8 +8,8 @@ spend your time [wisely](http://www.pythonchallenge.com/) [Click here](http://www.dvloper.me) to visit my dvloper.me blog . -Your adventure begins. You realize there are hundreds of paths for you to choose from. -Which way should you go? Only you can decide. +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. Oh so many decisions - what will you do?? @@ -63,9 +63,9 @@ DOING will definitely keep your sharpened with latest skills (which you can get [Know about the life of this world](00-Life-of-this-world/Life of this world.md) -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) Vist the master [liquid](liquid/liquid.md). @@ -803,7 +803,7 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now +Despite the little conundrum that you resolved, you realize that it's now Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" @@ -825,9 +825,9 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines +When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. +there are two options you must choose from. You may either do [this](gtd/gtd.md), @@ -839,12 +839,12 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? @@ -860,7 +860,7 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive](divergence/divergence.md) or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) @@ -917,7 +917,7 @@ Do you want to build a [snowman?] (snowman/snowman.md) It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) -I think I'll try defying gravity. +I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) @@ -945,7 +945,7 @@ Explore the unknown. Most people die without ever visiting this [place.](underwa As you attempt this, a voice booms!! -The [boom](day-dream/day-dream.md) +The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) @@ -957,7 +957,7 @@ You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). -So what to do next? Three doors appear and all other ways out disappear. +So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. @@ -999,7 +999,7 @@ The lannisters always pays thier debts, says tyrion lannister. Interesting [char Time to [move to Canada](Canada/Canada.md), eh? -You struggle to find a line break to add your own adventure. +You struggle to find a line break to add your own adventure. You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) @@ -1010,7 +1010,7 @@ You're reincarnated as a green starfish but wish you were [blue instead.](starfi [Motivate yourself](Motivate/Motivate.md) -You wake up as Harry Potter ... and are facing Voldemort in a duel? +You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... @@ -1044,7 +1044,7 @@ The password is [xyzzy](plugh/plugh.md) [Say "Hi" to Guangwu](Guangwu/Guangwu.md) -Perishing in an avalanche of words, in a mundane collection of sentences called "stories". +Perishing in an avalanche of words, in a mundane collection of sentences called "stories". [Devastated?](devastated_greatness/devastated_greatness.md) Ever the fan of [Doug Adams](doug-adams/doug-adams.md). @@ -1055,4 +1055,6 @@ Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit [Watch](https://www.youtube.com/watch?v=-XJN7qqFqPE) Too Many Puppies! -You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... \ No newline at end of file +You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... + +You decide to quit your job to play [Pokemon Go](Pokemon-Go/Pokemon-Go.md) full time. From f8313493c07538fe343055387a47315e0cd47e88 Mon Sep 17 00:00:00 2001 From: verobero Date: Fri, 29 Jul 2016 23:20:28 +0700 Subject: [PATCH 4063/5486] Add Marshmallow Land route --- english/call-a-doctor/doctor.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/call-a-doctor/doctor.md b/english/call-a-doctor/doctor.md index dc08c90928..3c6c2eafad 100644 --- a/english/call-a-doctor/doctor.md +++ b/english/call-a-doctor/doctor.md @@ -19,3 +19,5 @@ color, not like the institutionalized white you remember from movies. ["I speak Vietnamese"](VN/vn.md) +["Marshmallow Land"](../eatmarshmallow/marshmallowland.md) + From dd463ec8838ca0e9eae971d4eab1212baa50e2ba Mon Sep 17 00:00:00 2001 From: verobero Date: Fri, 29 Jul 2016 23:22:33 +0700 Subject: [PATCH 4064/5486] Add marshmallowland.md --- english/eatmarshmallow/marshmallowland.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/eatmarshmallow/marshmallowland.md diff --git a/english/eatmarshmallow/marshmallowland.md b/english/eatmarshmallow/marshmallowland.md new file mode 100644 index 0000000000..eed05e22a3 --- /dev/null +++ b/english/eatmarshmallow/marshmallowland.md @@ -0,0 +1,5 @@ +The sight of white, pink, and a stain of burnt-ish brown confuses you. + +No doctors in sight. Only marshmallows. + +You have never had a sweet tooth, so the sight of marshmallows makes you nauseous. From 533f90446a7cccf3f36390d8a714e02beb9029cb Mon Sep 17 00:00:00 2001 From: RyanxWolton Date: Fri, 29 Jul 2016 17:24:32 +0100 Subject: [PATCH 4065/5486] Fix typo in pathname for Pokemon Go storyline --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 3bcfa7c083..fa520ddb8c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1057,4 +1057,4 @@ Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... -You decide to quit your job to play [Pokemon Go](Pokemon-Go/Pokemon-Go.md) full time. +You decide to quit your job to play [Pokemon Go](Pokemon_Go/Pokemon-Go.md) full time. From 2dc701cbdb0527f59196229c62f8b6910f22d81d Mon Sep 17 00:00:00 2001 From: RyanxWolton Date: Fri, 29 Jul 2016 17:29:10 +0100 Subject: [PATCH 4066/5486] Fix link to pikachu story --- english/Pokemon_Go/Pokemon-Go.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/Pokemon_Go/Pokemon-Go.md b/english/Pokemon_Go/Pokemon-Go.md index 6f20935f62..683d221b33 100644 --- a/english/Pokemon_Go/Pokemon-Go.md +++ b/english/Pokemon_Go/Pokemon-Go.md @@ -3,4 +3,4 @@ you quit your job to become a full time Pokemon Go player. You strive to travel the world in search of Pokemon! One night, after quitting your job, you are dreaming of -[Marshmallows](../pikachu/Pokeball.md) +[Marshmallows](../pikachu/pokeball.md) From be310dfa3c370d9ab5e884ae97e9cb30c776a748 Mon Sep 17 00:00:00 2001 From: verobero Date: Fri, 29 Jul 2016 23:32:08 +0700 Subject: [PATCH 4067/5486] Move marshmallowland.md to new directory --- english/eatmarshmallow/{ => marshmallowland}/marshmallowland.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/eatmarshmallow/{ => marshmallowland}/marshmallowland.md (100%) diff --git a/english/eatmarshmallow/marshmallowland.md b/english/eatmarshmallow/marshmallowland/marshmallowland.md similarity index 100% rename from english/eatmarshmallow/marshmallowland.md rename to english/eatmarshmallow/marshmallowland/marshmallowland.md From 0959a078d9f60f82a983ace8f0335cbe073beeb3 Mon Sep 17 00:00:00 2001 From: verobero Date: Fri, 29 Jul 2016 23:33:54 +0700 Subject: [PATCH 4068/5486] Update Marshmallow Land directory --- english/call-a-doctor/doctor.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/call-a-doctor/doctor.md b/english/call-a-doctor/doctor.md index 3c6c2eafad..0d92cd717e 100644 --- a/english/call-a-doctor/doctor.md +++ b/english/call-a-doctor/doctor.md @@ -19,5 +19,5 @@ color, not like the institutionalized white you remember from movies. ["I speak Vietnamese"](VN/vn.md) -["Marshmallow Land"](../eatmarshmallow/marshmallowland.md) +["Marshmallow Land"](../eatmarshmallow/marshmallowland/marshmallowland.md) From e1d1638ee738bdbe85208b92b28806dca11f9dcc Mon Sep 17 00:00:00 2001 From: RyanxWolton Date: Fri, 29 Jul 2016 17:40:12 +0100 Subject: [PATCH 4069/5486] Update marshmallow.md --- english/marshmallow.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index fa520ddb8c..b7610005c3 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -839,12 +839,12 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? @@ -860,7 +860,7 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive](divergence/divergence.md) or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) @@ -917,7 +917,7 @@ Do you want to build a [snowman?] (snowman/snowman.md) It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) -I think I'll try defying gravity. +I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) @@ -945,7 +945,7 @@ Explore the unknown. Most people die without ever visiting this [place.](underwa As you attempt this, a voice booms!! -The [boom](day-dream/day-dream.md) +The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) @@ -957,7 +957,7 @@ You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). -So what to do next? Three doors appear and all other ways out disappear. +So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. @@ -999,7 +999,7 @@ The lannisters always pays thier debts, says tyrion lannister. Interesting [char Time to [move to Canada](Canada/Canada.md), eh? -You struggle to find a line break to add your own adventure. +You struggle to find a line break to add your own adventure. You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) @@ -1010,7 +1010,7 @@ You're reincarnated as a green starfish but wish you were [blue instead.](starfi [Motivate yourself](Motivate/Motivate.md) -You wake up as Harry Potter ... and are facing Voldemort in a duel? +You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... @@ -1044,7 +1044,7 @@ The password is [xyzzy](plugh/plugh.md) [Say "Hi" to Guangwu](Guangwu/Guangwu.md) -Perishing in an avalanche of words, in a mundane collection of sentences called "stories". +Perishing in an avalanche of words, in a mundane collection of sentences called "stories". [Devastated?](devastated_greatness/devastated_greatness.md) Ever the fan of [Doug Adams](doug-adams/doug-adams.md). From 87b4aa9ae12c3a49604db387a384fb032a5d6aa2 Mon Sep 17 00:00:00 2001 From: CBofill Date: Fri, 29 Jul 2016 13:14:06 -0700 Subject: [PATCH 4070/5486] Add options to help-me --- english/find-exit/kiss-the-sky/help-me.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/english/find-exit/kiss-the-sky/help-me.md b/english/find-exit/kiss-the-sky/help-me.md index 03ce53e2c4..e572fd29c3 100644 --- a/english/find-exit/kiss-the-sky/help-me.md +++ b/english/find-exit/kiss-the-sky/help-me.md @@ -3,3 +3,13 @@ Help me! Help me! Oh, no, no.... + +The purple haze from the burning tower is blowing towards you. There must be some kind of +way [outta here](../../outta-here/outta-here.md), you think to yourself. In the distance +a train whistle sounds. + +[Sit down and play guitar](../../guitar/guitar.md) + +[Catch your guitar on fire](../../light-fire/fire.md) + +[Investigate the train you hear a comin'](../../train-ride/train-ride.md) \ No newline at end of file From 9f465f1145036ae25353645b88a6bfd4a3151f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Vali=C3=B1o?= Date: Sat, 30 Jul 2016 17:38:17 +0200 Subject: [PATCH 4071/5486] =?UTF-8?q?Se=20puede=20deshacer=20un=20commit?= =?UTF-8?q?=20en=20git=20=C2=BF=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- english/crazy/crazy.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/crazy/crazy.md b/english/crazy/crazy.md index b953552b1b..220c27e7e0 100644 --- a/english/crazy/crazy.md +++ b/english/crazy/crazy.md @@ -17,3 +17,6 @@ Eat some [ice cream?](../ice-cream/ice-cream.md) ummm crazy should be spelled krazy with a k something is seriously wrong with us + +No the others are the insane + From d494a213d68636fe368b37e4e7c022faf90f5709 Mon Sep 17 00:00:00 2001 From: madralino Date: Sat, 30 Jul 2016 18:09:23 +0200 Subject: [PATCH 4072/5486] Remove markdown sintax in my previous commit --- english/udacity/udacity.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/udacity/udacity.md b/english/udacity/udacity.md index aed586568e..e85be20655 100644 --- a/english/udacity/udacity.md +++ b/english/udacity/udacity.md @@ -2,4 +2,4 @@ Alas, there is not, you're stuck. Get Caroline on it! Click [here](https://github.com/cbuckey-uda) to visit Caroline's github page! -Please be *_Nice_*! \ No newline at end of file +Please be Nice! From 6bdb793ab3059a58cafb84677a72610ee382fd40 Mon Sep 17 00:00:00 2001 From: ierosvin Date: Sat, 30 Jul 2016 20:20:40 +0400 Subject: [PATCH 4073/5486] add story to Philippines --- Philippines/duterte/duterte.md | 5 +++++ Philippines/salamat.md | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 Philippines/duterte/duterte.md diff --git a/Philippines/duterte/duterte.md b/Philippines/duterte/duterte.md new file mode 100644 index 0000000000..f552170beb --- /dev/null +++ b/Philippines/duterte/duterte.md @@ -0,0 +1,5 @@ +Tumatak sa kasaysayan ng Pilipinas ang pagkapanalo ni Duterte bilang Pangulo +sa kadahilanang sya ang kauna unahang pangulo na galing Mindanao. Siya ay +nailuklok sa pwesto noong June 30, 2016. + +Ayaw ko nang sundan ang kwento ni Duterte. [Lumabas] (../salamat.md) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index dd7d57a762..379709965b 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -8,4 +8,8 @@ Un oh. Nakapag-tagalog din. [Pindot Kalikot] (bago/bago.md) Buksan ang [pinto] (bagong simula/bagong_simula.md). -Pahinga muna sa pag-aaral. Manood ng [movie] (movie/movie.md) \ No newline at end of file +Pahinga muna sa pag-aaral. Manood ng [movie] (movie/movie.md) + +Nakapag pahinga na. Salamat sa mga [pelikula] (movie/movie.md). +Ngayon ay ating sundan ang mga kaganapan sa Pilipinas. +Kamakailan ay nanalong Presidente si [Duterte] (duterte/duterte.md). From b64156dba3da9a44cf418369c39790cc7dfed2e7 Mon Sep 17 00:00:00 2001 From: Anurad80 Date: Sat, 30 Jul 2016 19:17:07 -0400 Subject: [PATCH 4074/5486] add ponmozhigal --- Tamil/Vivekanandha/ponmozhigal.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tamil/Vivekanandha/ponmozhigal.md b/Tamil/Vivekanandha/ponmozhigal.md index c75f068de2..67ecfb0e68 100644 --- a/Tamil/Vivekanandha/ponmozhigal.md +++ b/Tamil/Vivekanandha/ponmozhigal.md @@ -5,4 +5,7 @@ "???? ??????? ??????? ???????" ????? ????. ?? ?????????? ????????? ???????? ???????? ??????????? ?????????." -"???? ??????; ??????? ?????!" \ No newline at end of file +"???? ??????; ??????? ?????!" + +அன்பாயிரு! +எல்லோரிடமும் அன்பாயிரு, துன்பப்படுபவர்களிடம் பரிவுகொள். எல்லா உயிர்களையும் நேசி. யார்மீதும் பொறாமைப் படாதே. பிறரது குற்றங்களைக் காணாதே. -சுவாமி விவேகானந்தர் \ No newline at end of file From e70b852474ae76a1dd535261ec81e652f23a091c Mon Sep 17 00:00:00 2001 From: KeK Date: Sat, 30 Jul 2016 16:17:27 -0700 Subject: [PATCH 4075/5486] add fingerPointer sentences --- english/run_out_the_door/run_out_the_door.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md index da59e95611..f9b864ef70 100644 --- a/english/run_out_the_door/run_out_the_door.md +++ b/english/run_out_the_door/run_out_the_door.md @@ -7,6 +7,10 @@ you [fall in](../mysterious-pool/mysterious-pool.md)! You burst out the door and the entire world is in front of you. +Everyone turns to stare at you! + +People begin to point fingers and laugh. + You... [Go back inside](../marshmallow.md) and reclaim your rightful position in mediocrity. From 69d32e8f17cc509dcee0d5c5e841373d0f9344d7 Mon Sep 17 00:00:00 2001 From: Anuradha Ohm Date: Sat, 30 Jul 2016 19:21:00 -0400 Subject: [PATCH 4076/5486] Update ponmozhigal.md --- Tamil/Vivekanandha/ponmozhigal.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tamil/Vivekanandha/ponmozhigal.md b/Tamil/Vivekanandha/ponmozhigal.md index 67ecfb0e68..64c0f35b50 100644 --- a/Tamil/Vivekanandha/ponmozhigal.md +++ b/Tamil/Vivekanandha/ponmozhigal.md @@ -8,4 +8,5 @@ "???? ??????; ??????? ?????!" அன்பாயிரு! -எல்லோரிடமும் அன்பாயிரு, துன்பப்படுபவர்களிடம் பரிவுகொள். எல்லா உயிர்களையும் நேசி. யார்மீதும் பொறாமைப் படாதே. பிறரது குற்றங்களைக் காணாதே. -சுவாமி விவேகானந்தர் \ No newline at end of file +எல்லோரிடமும் அன்பாயிரு, துன்பப்படுபவர்களிடம் பரிவுகொள். எல்லா உயிர்களையும் நேசி +. யார்மீதும் பொறாமைப் படாதே. பிறரது குற்றங்களைக் காணாதே. -சுவாமி விவேகானந்தர் From 8d244fa42756d1621e85f5487c534d49f34ee454 Mon Sep 17 00:00:00 2001 From: Dillon Foley Date: Sun, 31 Jul 2016 10:42:53 -0400 Subject: [PATCH 4077/5486] Add "check it out" option to sandwich.md --- english/sandwich/sandwich.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/sandwich/sandwich.md b/english/sandwich/sandwich.md index 646f33f4c5..9a426e09d7 100644 --- a/english/sandwich/sandwich.md +++ b/english/sandwich/sandwich.md @@ -10,4 +10,6 @@ You strengthen your resolve and eat it anyway. You may need the energy later. Bolstered by the invigourating feeling of the sandwich in your belly, your senses tingle in anticipation of [continuing your adventure](../marshmallow.md). -Or perhaps you decide to take a little [nap](../take-nap/cucumber-induced-nap.md) \ No newline at end of file +Or perhaps you decide to take a little [nap](../take-nap/cucumber-induced-nap.md) + +Also, what's that sounds coming from over the hill? Maybe you should [check it out?](../cave.md) \ No newline at end of file From 511d1fd295aeacf1b7c83a47fcdcf9cb6d8728fd Mon Sep 17 00:00:00 2001 From: Dillon Foley Date: Sun, 31 Jul 2016 10:48:58 -0400 Subject: [PATCH 4078/5486] Add cave.md file for cave ending (from sandwich.md path) --- english/cave/cave.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 english/cave/cave.md diff --git a/english/cave/cave.md b/english/cave/cave.md new file mode 100644 index 0000000000..b77a0365b9 --- /dev/null +++ b/english/cave/cave.md @@ -0,0 +1,8 @@ +You follow the strange noise over the hill and come upon a dark cave. +Nervously, you approach the entrance and the sound gets louder, a +crinkly, somehow wet shuffling noise. You come to the side of the entrance +and poke your head in, when a voice speaks: + +"COME JOIN US" + +and it pulls you into the darkness. \ No newline at end of file From 81e0e47f865b4391011897735979597eb2e87929 Mon Sep 17 00:00:00 2001 From: Luca Ricci Date: Sun, 31 Jul 2016 16:53:02 +0200 Subject: [PATCH 4079/5486] Add an option to raccogli.md file --- Italian/scappare/raccogli/raccogli.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Italian/scappare/raccogli/raccogli.md b/Italian/scappare/raccogli/raccogli.md index 7fce4b099a..5a91aac00e 100644 --- a/Italian/scappare/raccogli/raccogli.md +++ b/Italian/scappare/raccogli/raccogli.md @@ -5,3 +5,5 @@ Raccogli i pezzi di vetro, ma ti ferisci una mano. [Stringi i denti e resisti al dolore] (resisti/resisti.md) [Ti butti sul pavimento piangendo dal dolore] (piangi/piangi.md) + +[Torni a dormire](../../caramelle.md) \ No newline at end of file From d945f48e3b468a6a3d78e22280f58cc5ea7ee486 Mon Sep 17 00:00:00 2001 From: Dillon Foley Date: Sun, 31 Jul 2016 10:53:15 -0400 Subject: [PATCH 4080/5486] Fix link to cave.md file in sandwich.md --- english/sandwich/sandwich.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sandwich/sandwich.md b/english/sandwich/sandwich.md index 9a426e09d7..6702131e9f 100644 --- a/english/sandwich/sandwich.md +++ b/english/sandwich/sandwich.md @@ -12,4 +12,4 @@ your senses tingle in anticipation of [continuing your adventure](../marshmallow Or perhaps you decide to take a little [nap](../take-nap/cucumber-induced-nap.md) -Also, what's that sounds coming from over the hill? Maybe you should [check it out?](../cave.md) \ No newline at end of file +Also, what's that sounds coming from over the hill? Maybe you should [check it out?](../cave/cave.md) \ No newline at end of file From f63af43edbcd49f0d3f5201a93f1a6ea2059c041 Mon Sep 17 00:00:00 2001 From: Laura Harmon Date: Sun, 31 Jul 2016 16:13:23 -0600 Subject: [PATCH 4081/5486] Added thoughts on Life, the Universe and Everything --- english/doug-adams/deep-thought/deep-thought.md | 1 + english/marshmallow.md | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 english/doug-adams/deep-thought/deep-thought.md diff --git a/english/doug-adams/deep-thought/deep-thought.md b/english/doug-adams/deep-thought/deep-thought.md new file mode 100644 index 0000000000..d81cc0710e --- /dev/null +++ b/english/doug-adams/deep-thought/deep-thought.md @@ -0,0 +1 @@ +42 diff --git a/english/marshmallow.md b/english/marshmallow.md index 0b484c0c6f..68061f61b0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1049,6 +1049,10 @@ Perishing in an avalanche of words, in a mundane collection of sentences called Ever the fan of [Doug Adams](doug-adams/doug-adams.md). +If you really want to know the answer to the question.... +"What is the answer to Life, the Universe and Everything?" then you +need some [Deep Thought](doug-adams/deep-thought/deep-thought.md) + Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit [Discover](discover-new-genres/discover-new-genres.md) a new genre of music! From 1fe0f8ba60232c8a79b0ca6f3d5925e332627124 Mon Sep 17 00:00:00 2001 From: Matheus Henrique Ferri Date: Sun, 31 Jul 2016 22:03:42 -0300 Subject: [PATCH 4082/5486] modificar historia --- portugues/colaborando.md | 2 ++ portugues/fada/dinheiro/dinheiro.md | 3 +++ portugues/fada/fada.md | 5 +++++ portugues/fada/solucao/solucao.md | 4 ++++ 4 files changed, 14 insertions(+) create mode 100644 portugues/fada/dinheiro/dinheiro.md create mode 100644 portugues/fada/fada.md create mode 100644 portugues/fada/solucao/solucao.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index b0c96f421d..6bf15a51cb 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -3,6 +3,8 @@ aplicativo, você detecta um bug. Você: +[Chora descontroladamente até que sua fada madrinha aparece e te dá 1 desejo](fada/fada.md) + [Caguei, vou ver um video no xvideos](xvideos/xvideos.md) [Procura o repositório do aplicativo?](colabora/colaborar.md) diff --git a/portugues/fada/dinheiro/dinheiro.md b/portugues/fada/dinheiro/dinheiro.md new file mode 100644 index 0000000000..5798c6fc50 --- /dev/null +++ b/portugues/fada/dinheiro/dinheiro.md @@ -0,0 +1,3 @@ +Parabéns, + +você ficou milionário muito mais rapidamente do que se fodendo pra entender essas paradas loucas de tecnologia, vá pra praia e descanse! \ No newline at end of file diff --git a/portugues/fada/fada.md b/portugues/fada/fada.md new file mode 100644 index 0000000000..d2c0b5cb61 --- /dev/null +++ b/portugues/fada/fada.md @@ -0,0 +1,5 @@ +Senta e chora até que sua fada madrinha apareça. Ela simpatiza com você e te dá direito a 1 desejo, o que você deseja? + +[Você deseja que ela solucione o bug para você](solucao/solucao.md) + +[Você pede 1 milhão de reais e nunca mais se preocupa com Git e Github na vida](dinheiro/dinheiro.md) \ No newline at end of file diff --git a/portugues/fada/solucao/solucao.md b/portugues/fada/solucao/solucao.md new file mode 100644 index 0000000000..70fde939c8 --- /dev/null +++ b/portugues/fada/solucao/solucao.md @@ -0,0 +1,4 @@ +Que pena, + +A fada resolveu seu problema agora mas logo surgiu outro bug que você nao sabia resolver e agora você perdeu seu emprego +e virou mendigo, porque não pediu dinheiro enquanto podia????? \ No newline at end of file From ac32853e2709ada8ae15a4d0bbd923881f0758eb Mon Sep 17 00:00:00 2001 From: Matheus Henrique Ferri Date: Sun, 31 Jul 2016 22:09:38 -0300 Subject: [PATCH 4083/5486] =?UTF-8?q?corre=C3=A7=C3=A3o=20de=20altera?= =?UTF-8?q?=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/fada/dinheiro/dinheiro.md | 4 +++- portugues/fada/solucao/solucao.md | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/portugues/fada/dinheiro/dinheiro.md b/portugues/fada/dinheiro/dinheiro.md index 5798c6fc50..93aba00337 100644 --- a/portugues/fada/dinheiro/dinheiro.md +++ b/portugues/fada/dinheiro/dinheiro.md @@ -1,3 +1,5 @@ Parabéns, -você ficou milionário muito mais rapidamente do que se fodendo pra entender essas paradas loucas de tecnologia, vá pra praia e descanse! \ No newline at end of file +você ficou milionário muito mais rapidamente do que se +fodendo pra entender essas paradas loucas de tecnologia, +vá pra praia e descanse! \ No newline at end of file diff --git a/portugues/fada/solucao/solucao.md b/portugues/fada/solucao/solucao.md index 70fde939c8..b75de9f7c5 100644 --- a/portugues/fada/solucao/solucao.md +++ b/portugues/fada/solucao/solucao.md @@ -1,4 +1,6 @@ Que pena, -A fada resolveu seu problema agora mas logo surgiu outro bug que você nao sabia resolver e agora você perdeu seu emprego -e virou mendigo, porque não pediu dinheiro enquanto podia????? \ No newline at end of file +A fada resolveu seu problema agora mas logo surgiu +outro bug que você nao sabia resolver e agora você +perdeu seu emprego e virou mendigo, porque não +pediu dinheiro enquanto podia????? \ No newline at end of file From 8a80546ae3427f99a08a51943f71632bd1f16c97 Mon Sep 17 00:00:00 2001 From: etsikt Date: Mon, 1 Aug 2016 11:20:29 +0200 Subject: [PATCH 4084/5486] Add new line to story. --- norwegian/faller/faller.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/norwegian/faller/faller.md b/norwegian/faller/faller.md index d8f7a5e01f..055f5aff93 100644 --- a/norwegian/faller/faller.md +++ b/norwegian/faller/faller.md @@ -1,3 +1,3 @@ Når jeg går tilbake til stranda sklir jeg på en stein og detter i vannet. -... +Samtidig benytter måken sjansen til å angripe meg. From 27b5c922d0497e40f3d427461b5f0f94c35e67ac Mon Sep 17 00:00:00 2001 From: etsikt Date: Mon, 1 Aug 2016 12:42:13 +0200 Subject: [PATCH 4085/5486] Add line to story. --- norwegian/faller/faller.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/norwegian/faller/faller.md b/norwegian/faller/faller.md index d8f7a5e01f..82239187ad 100644 --- a/norwegian/faller/faller.md +++ b/norwegian/faller/faller.md @@ -1,3 +1,5 @@ Når jeg går tilbake til stranda sklir jeg på en stein og detter i vannet. +Samtidig benytter måken sjansen til å gå til angrep! + ... From 29208d38103041145655fd8a4b58343a5c4852eb Mon Sep 17 00:00:00 2001 From: AndrewPetrosky Date: Mon, 1 Aug 2016 09:55:55 -0400 Subject: [PATCH 4086/5486] Add an adventure in which you can learn about something random --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 68061f61b0..384abbe64c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1059,4 +1059,6 @@ Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit [Watch](https://www.youtube.com/watch?v=-XJN7qqFqPE) Too Many Puppies! -You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... \ No newline at end of file +You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... + +Learn about something random [here](https://en.wikipedia.org/wiki/Special:Random)! \ No newline at end of file From b0d31669707e54f714e5b9d6885af220e4e863ce Mon Sep 17 00:00:00 2001 From: rameshkp Date: Mon, 1 Aug 2016 18:44:15 +0100 Subject: [PATCH 4087/5486] Adding new page for Thevaram in Tamil --- Tamil/Thevaram/thevarm.md | 14 ++++++++++++++ language.md | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 Tamil/Thevaram/thevarm.md diff --git a/Tamil/Thevaram/thevarm.md b/Tamil/Thevaram/thevarm.md new file mode 100644 index 0000000000..fa0770aff4 --- /dev/null +++ b/Tamil/Thevaram/thevarm.md @@ -0,0 +1,14 @@ +தமிழ் : +மாசில் வீணையும் மாலை மதியமும் +வீசு தென்றலும் வீங்கிள வெய்னிலும் +மூசு வண்டறைல் பொய்கயும் போன்றதே +ஈசன் எந்தை இணையடி நீழலே + +English: +Maasil Veenaiyum Maalai Madhiyamum +Veesu thendralum veengila veynilum +Moosu vandarai poygayum ponradhee +Eesan endhai inayadi neezhalee. + +Meaning: +The shelter under the parallel feet of the God, my boss, is like the nice melody of Veena (Musical Instrument), the early evening moon, pleasant breeze, the Spring, a pond where bees are in making sound. diff --git a/language.md b/language.md index dc2f49861b..15b1aff7f3 100644 --- a/language.md +++ b/language.md @@ -14,6 +14,8 @@ If you understand Tamil, தமிழ் வணக்கம் [இங்கே தமிழ் வணக்கம்!To view ponmozhigal [Click Here](Tamil/Vivekanandha/ponmozhigal.md) +If you understand Tamil, திருநாவுக்கரசர் அருளிய தேவாரம் [இங்கே அழுத்தவும்](Tamil/Thevaram/thevarm.md) + If you speak Punjabi, [go here](punjabi/punjabi.md). यिद तपाई नेपाली बोलनुहुनछ भने, [यहाँ िथचनुहोस ।](nepali/about_nepal.md) @@ -116,7 +118,7 @@ click vaj tlhIngan Hol Dajatlh'a' [naDev click](klingon/start.md) Po flisni shqip, [shkoni ketu](albanian/hyrje.md) -നിങ്ങളുടെ ഭാഷ മലയാളം ആണെങ്കിൽ, +നിങ്ങളുടെ ഭാഷ മലയാളം ആണെങ്കിൽ, [ഇവിടെ ക്ലിക്ക് ചെയ്യുക](Malayalam/malayalam.md) [ئەگەر کوردی ئەزانیت کلیک بکە](kurdish/kurdi.md) @@ -150,4 +152,4 @@ If GibberisHkjsbckjsjcn,[hereeekdcskj](Gibberish/Gibberish.md) તમે ગુજરાતી છો તો [અહી](Gujarati/અમે ગુજરાતી લોકો છીએ/અમે ગુજરાતી લોકો છીએ.md) જાઓ -To explore the বাংলা (bangla/bengali) search engine, news portals, and blogs [click here](bangla/bangla-portals.md). \ No newline at end of file +To explore the বাংলা (bangla/bengali) search engine, news portals, and blogs [click here](bangla/bangla-portals.md). From a7e8cb0c96c2a3eb42f0dfc8cf70f29bc575d21c Mon Sep 17 00:00:00 2001 From: rameshkp Date: Mon, 1 Aug 2016 19:03:15 +0100 Subject: [PATCH 4088/5486] Fix: Modified file character length --- Tamil/Thevaram/thevarm.md | 4 +++- language.md | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Tamil/Thevaram/thevarm.md b/Tamil/Thevaram/thevarm.md index fa0770aff4..7560f4d3b4 100644 --- a/Tamil/Thevaram/thevarm.md +++ b/Tamil/Thevaram/thevarm.md @@ -11,4 +11,6 @@ Moosu vandarai poygayum ponradhee Eesan endhai inayadi neezhalee. Meaning: -The shelter under the parallel feet of the God, my boss, is like the nice melody of Veena (Musical Instrument), the early evening moon, pleasant breeze, the Spring, a pond where bees are in making sound. +The shelter under the parallel feet of the God, my boss, +is like the nice melody of Veena (Musical Instrument), the early evening moon, +pleasant breeze, the Spring, a pond where bees are in making sound. diff --git a/language.md b/language.md index 15b1aff7f3..4a52953928 100644 --- a/language.md +++ b/language.md @@ -14,8 +14,6 @@ If you understand Tamil, தமிழ் வணக்கம் [இங்கே தமிழ் வணக்கம்!To view ponmozhigal [Click Here](Tamil/Vivekanandha/ponmozhigal.md) -If you understand Tamil, திருநாவுக்கரசர் அருளிய தேவாரம் [இங்கே அழுத்தவும்](Tamil/Thevaram/thevarm.md) - If you speak Punjabi, [go here](punjabi/punjabi.md). यिद तपाई नेपाली बोलनुहुनछ भने, [यहाँ िथचनुहोस ।](nepali/about_nepal.md) @@ -153,3 +151,5 @@ If GibberisHkjsbckjsjcn,[hereeekdcskj](Gibberish/Gibberish.md) તમે ગુજરાતી છો તો [અહી](Gujarati/અમે ગુજરાતી લોકો છીએ/અમે ગુજરાતી લોકો છીએ.md) જાઓ To explore the বাংলা (bangla/bengali) search engine, news portals, and blogs [click here](bangla/bangla-portals.md). + +If you understand Tamil, திருநாவுக்கரசர் அருளிய தேவாரம் [இங்கே அழுத்தவும்](Tamil/Thevaram/thevarm.md) From 173e58b5f191e07858dc59b46177ceae245770bb Mon Sep 17 00:00:00 2001 From: rameshkp Date: Mon, 1 Aug 2016 19:14:00 +0100 Subject: [PATCH 4089/5486] fix 3 --- language.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/language.md b/language.md index 4a52953928..8f76e49066 100644 --- a/language.md +++ b/language.md @@ -116,7 +116,7 @@ click vaj tlhIngan Hol Dajatlh'a' [naDev click](klingon/start.md) Po flisni shqip, [shkoni ketu](albanian/hyrje.md) -നിങ്ങളുടെ ഭാഷ മലയാളം ആണെങ്കിൽ, +നിങ്ങളുടെ ഭാഷ മലയാളം ആണെങ്കിൽ, [ഇവിടെ ക്ലിക്ക് ചെയ്യുക](Malayalam/malayalam.md) [ئەگەر کوردی ئەزانیت کلیک بکە](kurdish/kurdi.md) @@ -150,6 +150,6 @@ If GibberisHkjsbckjsjcn,[hereeekdcskj](Gibberish/Gibberish.md) તમે ગુજરાતી છો તો [અહી](Gujarati/અમે ગુજરાતી લોકો છીએ/અમે ગુજરાતી લોકો છીએ.md) જાઓ -To explore the বাংলা (bangla/bengali) search engine, news portals, and blogs [click here](bangla/bangla-portals.md). - -If you understand Tamil, திருநாவுக்கரசர் அருளிய தேவாரம் [இங்கே அழுத்தவும்](Tamil/Thevaram/thevarm.md) +To explore the বাংলা (bangla/bengali) search engine, news portals, and blogs [click here](bangla/bangla-portals.md). + +If you understand Tamil, திருநாவுக்கரசர் அருளிய தேவாரம் [இங்கே அழுத்தவும்](Tamil/Thevaram/thevarm.md) From d225d2fcd698b700bb94a3ca9373fc61cc129284 Mon Sep 17 00:00:00 2001 From: jonathanmundy Date: Mon, 1 Aug 2016 20:51:57 +0100 Subject: [PATCH 4090/5486] docs: Add sentence relating to molluscs --- english/run_out_the_door/run_out_the_door.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md index f9b864ef70..5fa456515d 100644 --- a/english/run_out_the_door/run_out_the_door.md +++ b/english/run_out_the_door/run_out_the_door.md @@ -7,6 +7,8 @@ you [fall in](../mysterious-pool/mysterious-pool.md)! You burst out the door and the entire world is in front of you. +It dawns on you the world is your mollusc of choosing. And you don't like shellfish. + Everyone turns to stare at you! People begin to point fingers and laugh. From 18ab4d2fea0b91ba17692fb0815ed01e2a8a1ccb Mon Sep 17 00:00:00 2001 From: madralino Date: Mon, 1 Aug 2016 22:18:08 +0200 Subject: [PATCH 4091/5486] Test to pull --- english/udacity/udacity.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/udacity/udacity.md b/english/udacity/udacity.md index e85be20655..a48796c4f9 100644 --- a/english/udacity/udacity.md +++ b/english/udacity/udacity.md @@ -2,4 +2,5 @@ Alas, there is not, you're stuck. Get Caroline on it! Click [here](https://github.com/cbuckey-uda) to visit Caroline's github page! + Please be Nice! From 491af9a7a73d66e002ce25fe275615e6ac4824ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Vali=C3=B1o?= Date: Mon, 1 Aug 2016 22:26:40 +0200 Subject: [PATCH 4092/5486] =?UTF-8?q?correccion=20salto=20de=20l=C3=ADnea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- english/udacity/udacity.md | 1 - 1 file changed, 1 deletion(-) diff --git a/english/udacity/udacity.md b/english/udacity/udacity.md index a48796c4f9..e85be20655 100644 --- a/english/udacity/udacity.md +++ b/english/udacity/udacity.md @@ -2,5 +2,4 @@ Alas, there is not, you're stuck. Get Caroline on it! Click [here](https://github.com/cbuckey-uda) to visit Caroline's github page! - Please be Nice! From 1b5be18997644463ff7384d5928531c2152a8ab1 Mon Sep 17 00:00:00 2001 From: madralino Date: Mon, 1 Aug 2016 22:31:22 +0200 Subject: [PATCH 4093/5486] www --- english/udacity/udacity.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/udacity/udacity.md b/english/udacity/udacity.md index e85be20655..9abc9ed193 100644 --- a/english/udacity/udacity.md +++ b/english/udacity/udacity.md @@ -1,5 +1,5 @@ Alas, there is not, you're stuck. Get Caroline on it! -Click [here](https://github.com/cbuckey-uda) to visit Caroline's github page! +Click [here](https://www.github.com/cbuckey-uda) to visit Caroline's github page! Please be Nice! From 849a5abccd149d4ed824e744014843f4abd11e26 Mon Sep 17 00:00:00 2001 From: madralino Date: Mon, 1 Aug 2016 22:35:02 +0200 Subject: [PATCH 4094/5486] git io shortener --- english/udacity/udacity.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/udacity/udacity.md b/english/udacity/udacity.md index 9abc9ed193..91f1382590 100644 --- a/english/udacity/udacity.md +++ b/english/udacity/udacity.md @@ -1,5 +1,5 @@ Alas, there is not, you're stuck. Get Caroline on it! -Click [here](https://www.github.com/cbuckey-uda) to visit Caroline's github page! +Click [here](https://git.io/v6fpG) to visit Caroline's github page! Please be Nice! From 9ec654229e36db5531a3ab193319dde121f6d1af Mon Sep 17 00:00:00 2001 From: madralino Date: Mon, 1 Aug 2016 22:39:36 +0200 Subject: [PATCH 4095/5486] Test to pull --- english/udacity/udacity.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/udacity/udacity.md b/english/udacity/udacity.md index 91f1382590..e85be20655 100644 --- a/english/udacity/udacity.md +++ b/english/udacity/udacity.md @@ -1,5 +1,5 @@ Alas, there is not, you're stuck. Get Caroline on it! -Click [here](https://git.io/v6fpG) to visit Caroline's github page! +Click [here](https://github.com/cbuckey-uda) to visit Caroline's github page! Please be Nice! From fac52b902cbb33bed9085016f0c2d9d7a7df1963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Vali=C3=B1o?= Date: Mon, 1 Aug 2016 22:54:11 +0200 Subject: [PATCH 4096/5486] cambio --- english/udacity/udacity.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/udacity/udacity.md b/english/udacity/udacity.md index e85be20655..d6b2248fdb 100644 --- a/english/udacity/udacity.md +++ b/english/udacity/udacity.md @@ -1,5 +1,3 @@ Alas, there is not, you're stuck. Get Caroline on it! -Click [here](https://github.com/cbuckey-uda) to visit Caroline's github page! - -Please be Nice! +Click [here](https://github.com/cbuckey-uda) to visit Caroline's github page! \ No newline at end of file From d4a0466f7e6edc02556006760ed25f034b27a6e9 Mon Sep 17 00:00:00 2001 From: Wonderbird Date: Mon, 1 Aug 2016 17:47:48 -0400 Subject: [PATCH 4097/5486] Add one more option to ukrainian story --- ukrainian/marshmallow.md | 2 ++ ukrainian/tv-show/tv-show.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 ukrainian/tv-show/tv-show.md diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 3b1a72f954..0746cdd59b 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -36,4 +36,6 @@ [Зав'яжу на кінці мотузки здоровенний вузел і кину в стіну](lace/lace.md) +[Візьму мобілочку і почну переглядати серіали](tv-show/tv-show.md) + [Викличу потусторонні сили](daemon/daemon.md) \ No newline at end of file diff --git a/ukrainian/tv-show/tv-show.md b/ukrainian/tv-show/tv-show.md new file mode 100644 index 0000000000..8211944345 --- /dev/null +++ b/ukrainian/tv-show/tv-show.md @@ -0,0 +1,3 @@ +Ви переглядали серіли аж допоки в мобілочці не розрядився акумулятор. + +[Треба подумати що ж робити далі...](../marshmallow.md) \ No newline at end of file From 498097c806ffbb9d58a1506ba7ed64f71543b641 Mon Sep 17 00:00:00 2001 From: Sebastian Hewelt Date: Tue, 2 Aug 2016 03:01:11 +0200 Subject: [PATCH 4098/5486] Modify wola.md, add new option to wola: eliksir, create eliksir dir and eliksir.md --- Polish/przygoda/wola/eliksir/eliksir.md | 3 +++ Polish/przygoda/wola/wola.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 Polish/przygoda/wola/eliksir/eliksir.md diff --git a/Polish/przygoda/wola/eliksir/eliksir.md b/Polish/przygoda/wola/eliksir/eliksir.md new file mode 100644 index 0000000000..3967822226 --- /dev/null +++ b/Polish/przygoda/wola/eliksir/eliksir.md @@ -0,0 +1,3 @@ +Wypiłeś tyle eliksiru woli, że spojrzeniem zmiotłeś czasoprzestrzeń. Wśród kompletnej pustki dostrzegasz tunel, który przenosi cię w czasie. Jesteś w przyszłości w której ludzie zapomnieli o Johnie Travolcie w "Gorączce Sobotniej Nocy". + +Tak ci go żal, że umierasz. \ No newline at end of file diff --git a/Polish/przygoda/wola/wola.md b/Polish/przygoda/wola/wola.md index a4b7cbb9b2..91a592532e 100644 --- a/Polish/przygoda/wola/wola.md +++ b/Polish/przygoda/wola/wola.md @@ -5,3 +5,5 @@ Co robisz? [Rozbijasz ściany siłą mięśni](../miesnie/miesnie.md) [Zaczynasz jeść ptasie mleczko](../jedzenie/jedzenie.md) + +[Wypijasz eliksir woli i próbujesz ponownie](eliksir/eliksir.md) From 0fdbf6893afea74f407ac66196d5a256b07fd4a2 Mon Sep 17 00:00:00 2001 From: Sebastian Hewelt Date: Tue, 2 Aug 2016 03:09:26 +0200 Subject: [PATCH 4099/5486] add new lines --- Polish/przygoda/wola/eliksir/eliksir.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Polish/przygoda/wola/eliksir/eliksir.md b/Polish/przygoda/wola/eliksir/eliksir.md index 3967822226..a0d455c280 100644 --- a/Polish/przygoda/wola/eliksir/eliksir.md +++ b/Polish/przygoda/wola/eliksir/eliksir.md @@ -1,3 +1,5 @@ -Wypiłeś tyle eliksiru woli, że spojrzeniem zmiotłeś czasoprzestrzeń. Wśród kompletnej pustki dostrzegasz tunel, który przenosi cię w czasie. Jesteś w przyszłości w której ludzie zapomnieli o Johnie Travolcie w "Gorączce Sobotniej Nocy". +Wypiłeś tyle eliksiru woli, że spojrzeniem zmiotłeś czasoprzestrzeń. +Wśród kompletnej pustki dostrzegasz tunel, który przenosi cię w czasie. +Jesteś w przyszłości w której ludzie zapomnieli o Johnie Travolcie w "Gorączce Sobotniej Nocy". Tak ci go żal, że umierasz. \ No newline at end of file From 9cd733b00233a7e2780be60c8e136261a91cb159 Mon Sep 17 00:00:00 2001 From: Azeezah Date: Tue, 2 Aug 2016 07:37:56 -0400 Subject: [PATCH 4100/5486] Link to make a shelter from the parachute The page /master/english/forest/shelter/shelter.md was linked previously in /master/english/forest/forest.md --- english/forest/pockets/pocketsagain/pocketsagain.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/forest/pockets/pocketsagain/pocketsagain.md b/english/forest/pockets/pocketsagain/pocketsagain.md index a33da68253..e95dd9c2e3 100644 --- a/english/forest/pockets/pocketsagain/pocketsagain.md +++ b/english/forest/pockets/pocketsagain/pocketsagain.md @@ -7,3 +7,9 @@ into a pile. Your wallet is gone, having fallen in the woods like your phone. There's a deep growling sound coming from the woods in the direction of your phone. Is that a bear growl? Wow, good thing you didn't go search for it. + +You still need a shelter though. The ground is muddy and full of vermin. + +[You decide to make a shelter out of your parachute.](../../shelter/shelter.md) + + From 4f93b72d4ac91da3fc6c6314c187e23c61577d2e Mon Sep 17 00:00:00 2001 From: ankeshkhemani Date: Tue, 2 Aug 2016 19:49:15 +0530 Subject: [PATCH 4101/5486] Add Ankesh's story --- english/gameofthrones/characters/ankesh.md | 1 + english/marshmallow.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/gameofthrones/characters/ankesh.md diff --git a/english/gameofthrones/characters/ankesh.md b/english/gameofthrones/characters/ankesh.md new file mode 100644 index 0000000000..9c43158e4f --- /dev/null +++ b/english/gameofthrones/characters/ankesh.md @@ -0,0 +1 @@ +Ankesh is the one true king of westeros diff --git a/english/marshmallow.md b/english/marshmallow.md index 384abbe64c..e3b0cdef3e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1061,4 +1061,6 @@ Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... -Learn about something random [here](https://en.wikipedia.org/wiki/Special:Random)! \ No newline at end of file +Learn about something random [here](https://en.wikipedia.org/wiki/Special:Random)! + +Learn about Ankesh [here](gameofthrones/characters/ankesh.md) From 4e9e6d363f1015722550dc021994e4791ac5af61 Mon Sep 17 00:00:00 2001 From: ankeshkhemani Date: Tue, 2 Aug 2016 19:56:09 +0530 Subject: [PATCH 4102/5486] Ankesh included his story, this time seperate page --- english/{gameofthrones => }/characters/ankesh.md | 0 english/marshmallow.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename english/{gameofthrones => }/characters/ankesh.md (100%) diff --git a/english/gameofthrones/characters/ankesh.md b/english/characters/ankesh.md similarity index 100% rename from english/gameofthrones/characters/ankesh.md rename to english/characters/ankesh.md diff --git a/english/marshmallow.md b/english/marshmallow.md index e3b0cdef3e..dec75d908b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1063,4 +1063,4 @@ You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... Learn about something random [here](https://en.wikipedia.org/wiki/Special:Random)! -Learn about Ankesh [here](gameofthrones/characters/ankesh.md) +Learn about Ankesh [here](characters/ankesh.md) From de4f215e78f8183bfadd0c3ffd64ff3916b49137 Mon Sep 17 00:00:00 2001 From: Amshar Basheer Date: Wed, 3 Aug 2016 10:30:24 -0400 Subject: [PATCH 4103/5486] Add some lines to extend star craft 2 story --- english/starcraft2/starcraft2.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/starcraft2/starcraft2.md b/english/starcraft2/starcraft2.md index 0c2334078c..e68f09635a 100644 --- a/english/starcraft2/starcraft2.md +++ b/english/starcraft2/starcraft2.md @@ -4,4 +4,10 @@ an old game that you play some years ago, suddenly you read starcraft 2 a new version with beter graphics and you give it a chance again -visiting [Starcraft 2](http://www.starcraft2.com) \ No newline at end of file +visiting [Starcraft 2](http://www.starcraft2.com) + +After downloading Star Craft 2, you start playing the campaign and + +you find it to be the best RTS campaign you've ever played. You had + +so much fun playing it that you play through it twice more. \ No newline at end of file From 67ca14fbf20bfc379c90062b355c243b7b7243f4 Mon Sep 17 00:00:00 2001 From: Thiago Vilela Date: Wed, 3 Aug 2016 11:52:49 -0300 Subject: [PATCH 4104/5486] Nova historia Alterado colaborando.md Adicionado /youtube/minecraft.md --- portugues/colaborando.md | 2 ++ portugues/youtube/minecraft.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 portugues/youtube/minecraft.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 6bf15a51cb..8519acdd7d 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -3,6 +3,8 @@ aplicativo, você detecta um bug. Você: +[Faz um canal no youtube para falar de Minecraft](youtube/minecraft.md) + [Chora descontroladamente até que sua fada madrinha aparece e te dá 1 desejo](fada/fada.md) [Caguei, vou ver um video no xvideos](xvideos/xvideos.md) diff --git a/portugues/youtube/minecraft.md b/portugues/youtube/minecraft.md new file mode 100644 index 0000000000..116b9575c2 --- /dev/null +++ b/portugues/youtube/minecraft.md @@ -0,0 +1 @@ +Canal [TazerCraft](https://www.youtube.com/user/TazerCraft) From 0fa1a16ee72bbf7b745f733bc989ccf341c449dc Mon Sep 17 00:00:00 2001 From: tugaenko Date: Thu, 4 Aug 2016 14:09:48 +0300 Subject: [PATCH 4105/5486] Add "Minesweeper" case to /Programming/ --- russian/minesweeper/minesweeper.md | 1 + russian/programming/to-program.md | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 russian/minesweeper/minesweeper.md diff --git a/russian/minesweeper/minesweeper.md b/russian/minesweeper/minesweeper.md new file mode 100644 index 0000000000..42f0489cf4 --- /dev/null +++ b/russian/minesweeper/minesweeper.md @@ -0,0 +1 @@ +Первое, что вам пришло в голову - это написать зефирного сапера в зефирном браузере. Вы сели и написали его за восемь с половиной часов. \ No newline at end of file diff --git a/russian/programming/to-program.md b/russian/programming/to-program.md index f9e5b9c9f7..3d4abc8a5f 100644 --- a/russian/programming/to-program.md +++ b/russian/programming/to-program.md @@ -1,5 +1,9 @@ + Вы решаете, что в любой непонятной ситуации нужно писать код, и отправляетесь на поиски комьютера. [Искать в другой комнате](../next_room/next_room.md) -[Поработать на компьютере соседей](../speak_to_neighbor/speak_to_neighbor.md) \ No newline at end of file +[Поработать на компьютере соседей](../speak_to_neighbor/speak_to_neighbor.md) + +[Открыть свой зефирный макбук и сразу начать](../minesweeper/minesweeper.md) + From 3edd7d1dfcb3e8c2605e57e3ddc35a069686c1c2 Mon Sep 17 00:00:00 2001 From: tugaenko Date: Thu, 4 Aug 2016 14:21:03 +0300 Subject: [PATCH 4106/5486] Update minesweeper.md --- russian/minesweeper/minesweeper.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/minesweeper/minesweeper.md b/russian/minesweeper/minesweeper.md index 42f0489cf4..fd486daf84 100644 --- a/russian/minesweeper/minesweeper.md +++ b/russian/minesweeper/minesweeper.md @@ -1 +1,2 @@ -Первое, что вам пришло в голову - это написать зефирного сапера в зефирном браузере. Вы сели и написали его за восемь с половиной часов. \ No newline at end of file +Первое, что вам пришло в голову - это написать зефирного сапера в зефирном браузере. +Вы сели и написали его за восемь с половиной часов. From 1ca5fc2e17849238636bd9b6ad0cacd810a9bdf0 Mon Sep 17 00:00:00 2001 From: tugaenko Date: Thu, 4 Aug 2016 14:21:32 +0300 Subject: [PATCH 4107/5486] Update to-program.md --- russian/programming/to-program.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/programming/to-program.md b/russian/programming/to-program.md index 3d4abc8a5f..40a8cc2917 100644 --- a/russian/programming/to-program.md +++ b/russian/programming/to-program.md @@ -3,7 +3,7 @@ [Искать в другой комнате](../next_room/next_room.md) -[Поработать на компьютере соседей](../speak_to_neighbor/speak_to_neighbor.md) +[Поработать на компьютере соседей](../speak_to_neighbor/speak_to_neighbor.md) [Открыть свой зефирный макбук и сразу начать](../minesweeper/minesweeper.md) From 767a2809b16feff7537a6aeb6dff7d1eca849f14 Mon Sep 17 00:00:00 2001 From: tugaenko Date: Thu, 4 Aug 2016 14:28:15 +0300 Subject: [PATCH 4108/5486] Update to-program.md --- russian/programming/to-program.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/russian/programming/to-program.md b/russian/programming/to-program.md index 40a8cc2917..b1e7c4d93a 100644 --- a/russian/programming/to-program.md +++ b/russian/programming/to-program.md @@ -1,9 +1,8 @@ - Вы решаете, что в любой непонятной ситуации нужно писать код, и отправляетесь на поиски комьютера. [Искать в другой комнате](../next_room/next_room.md) -[Поработать на компьютере соседей](../speak_to_neighbor/speak_to_neighbor.md) +[Поработать на компьютере соседей](../speak_to_neighbor/speak_to_neighbor.md) [Открыть свой зефирный макбук и сразу начать](../minesweeper/minesweeper.md) From 2fa214826ead7fd58f37fbb7d1409d75609292f9 Mon Sep 17 00:00:00 2001 From: tugaenko Date: Thu, 4 Aug 2016 14:30:54 +0300 Subject: [PATCH 4109/5486] Update to-program.md --- russian/programming/to-program.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/russian/programming/to-program.md b/russian/programming/to-program.md index b1e7c4d93a..ad57cfdf86 100644 --- a/russian/programming/to-program.md +++ b/russian/programming/to-program.md @@ -1,8 +1,8 @@ Вы решаете, что в любой непонятной ситуации нужно писать код, и отправляетесь на поиски комьютера. +[Открыть свой зефирный макбук и сразу начать](../minesweeper/minesweeper.md) + [Искать в другой комнате](../next_room/next_room.md) [Поработать на компьютере соседей](../speak_to_neighbor/speak_to_neighbor.md) -[Открыть свой зефирный макбук и сразу начать](../minesweeper/minesweeper.md) - From d35300605e0f06615946290831678901049942ef Mon Sep 17 00:00:00 2001 From: tugaenko Date: Thu, 4 Aug 2016 14:31:37 +0300 Subject: [PATCH 4110/5486] Update to-program.md --- russian/programming/to-program.md | 1 - 1 file changed, 1 deletion(-) diff --git a/russian/programming/to-program.md b/russian/programming/to-program.md index ad57cfdf86..3686c836e3 100644 --- a/russian/programming/to-program.md +++ b/russian/programming/to-program.md @@ -5,4 +5,3 @@ [Искать в другой комнате](../next_room/next_room.md) [Поработать на компьютере соседей](../speak_to_neighbor/speak_to_neighbor.md) - From e939ecaedade53451df21ef357553981c98d964e Mon Sep 17 00:00:00 2001 From: tugaenko Date: Thu, 4 Aug 2016 14:32:26 +0300 Subject: [PATCH 4111/5486] Update to-program.md From e5908bc8d7e1a6125ef2c090a716f00ea72aa8b0 Mon Sep 17 00:00:00 2001 From: tugaenko Date: Thu, 4 Aug 2016 14:33:28 +0300 Subject: [PATCH 4112/5486] Update to-program.md From 2868783d571c8c7e9490953404d3211e746a303b Mon Sep 17 00:00:00 2001 From: tugaenko Date: Thu, 4 Aug 2016 14:37:37 +0300 Subject: [PATCH 4113/5486] Update to-program.md From c3a8607f6c646bd14eb57b911f6886a0988b90e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20A=2E=20Sch=C3=A4fer?= Date: Thu, 4 Aug 2016 22:43:44 +0200 Subject: [PATCH 4114/5486] Add german Schwimmen nach Entsorgung der Leichen --- german/Leichen/Simulation/Simulation.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Leichen/Simulation/Simulation.md b/german/Leichen/Simulation/Simulation.md index 1c43cb4b08..545608d15e 100644 --- a/german/Leichen/Simulation/Simulation.md +++ b/german/Leichen/Simulation/Simulation.md @@ -8,4 +8,6 @@ Nachdem ich vergeblich auf k angebrachten Gegenstnden - wie einer VR-Brille oder verkabelten Handschuhen - gewartet habe, muss ich mich nach anderen Hinweisen umschauen. -Deshalb erwge ich folgende Optionen: +Deshalb erwge ich folgende Optionen + +... um zu sehen ob das Wasser real ist, entscheide ich mich erstmal ein bisschen zu [schwimmen](../../schwimmen/schwimmen.md). \ No newline at end of file From 7f3fd2df1a2040863e4802bee262b4f461580aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20A=2E=20Sch=C3=A4fer?= Date: Thu, 4 Aug 2016 22:49:04 +0200 Subject: [PATCH 4115/5486] Break up in multiple lines --- german/Leichen/Simulation/Simulation.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/Leichen/Simulation/Simulation.md b/german/Leichen/Simulation/Simulation.md index 545608d15e..e13dd77cf2 100644 --- a/german/Leichen/Simulation/Simulation.md +++ b/german/Leichen/Simulation/Simulation.md @@ -10,4 +10,5 @@ muss ich mich nach anderen Hinweisen umschauen. Deshalb erwge ich folgende Optionen -... um zu sehen ob das Wasser real ist, entscheide ich mich erstmal ein bisschen zu [schwimmen](../../schwimmen/schwimmen.md). \ No newline at end of file +... um zu sehen ob das Wasser real ist, entscheide ich mich erstmal ein bisschen +zu [schwimmen](../../schwimmen/schwimmen.md). \ No newline at end of file From af499a43d7c29a3ee5d29fb5e2c4f92a9ce61a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20A=2E=20Sch=C3=A4fer?= Date: Thu, 4 Aug 2016 22:53:18 +0200 Subject: [PATCH 4116/5486] Undo line modification --- german/Leichen/Simulation/Simulation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/Leichen/Simulation/Simulation.md b/german/Leichen/Simulation/Simulation.md index e13dd77cf2..af0cfc4480 100644 --- a/german/Leichen/Simulation/Simulation.md +++ b/german/Leichen/Simulation/Simulation.md @@ -8,7 +8,7 @@ Nachdem ich vergeblich auf k angebrachten Gegenstnden - wie einer VR-Brille oder verkabelten Handschuhen - gewartet habe, muss ich mich nach anderen Hinweisen umschauen. -Deshalb erwge ich folgende Optionen +Deshalb erwge ich folgende Optionen: ... um zu sehen ob das Wasser real ist, entscheide ich mich erstmal ein bisschen zu [schwimmen](../../schwimmen/schwimmen.md). \ No newline at end of file From 0581bf855cf633e3430a38ff95e3b2dea4d0a1bd Mon Sep 17 00:00:00 2001 From: Jeff Roszkowski Date: Thu, 4 Aug 2016 17:25:37 -0400 Subject: [PATCH 4117/5486] But words! --- english/2spooky/2spooky.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index e988c65940..4ca6dbaf8f 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -12,6 +12,8 @@ hahahaha no your face! +but words! + [Go back to sleep.](../sleep/marshmallow.md) [Check DC Comics.](../DC-Comics/epic_DC_Character.md) From 2ec5597e8dda5a5515e2bd0c28973fe63a81c1ea Mon Sep 17 00:00:00 2001 From: Ray Meibaum Date: Thu, 4 Aug 2016 21:56:34 -0400 Subject: [PATCH 4118/5486] Add self-loathing to the story --- english/vomit/self-loathing/self-loathing.md | 1 + english/vomit/vomit.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/vomit/self-loathing/self-loathing.md diff --git a/english/vomit/self-loathing/self-loathing.md b/english/vomit/self-loathing/self-loathing.md new file mode 100644 index 0000000000..39cde76011 --- /dev/null +++ b/english/vomit/self-loathing/self-loathing.md @@ -0,0 +1 @@ +You couldn't possibly hate yourself anymore right now. diff --git a/english/vomit/vomit.md b/english/vomit/vomit.md index 4b79b90602..1ac8b7a979 100644 --- a/english/vomit/vomit.md +++ b/english/vomit/vomit.md @@ -1 +1,3 @@ -Your dreams of vomiting on top of someone have been finally accomplished. Let's get cray! \ No newline at end of file +Your dreams of vomiting on top of someone have been finally accomplished. Let's get cray! + +Your excitement quickly turns to disgust and [self-loathing](./self-loathing/self-loathing.md). From 68a98142570b6ab58cc9edeeeccf565576578a41 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 5 Aug 2016 15:37:03 +0100 Subject: [PATCH 4119/5486] Add options to english/33hours/explore-room/under-carpet/under-carpet.md --- english/33hours/explore-room/under-carpet/under-carpet.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/33hours/explore-room/under-carpet/under-carpet.md b/english/33hours/explore-room/under-carpet/under-carpet.md index 4819b2abf5..d56ccdf7cf 100644 --- a/english/33hours/explore-room/under-carpet/under-carpet.md +++ b/english/33hours/explore-room/under-carpet/under-carpet.md @@ -1 +1,5 @@ Under the carpet there are only floorboards. It looks like one of them might be loose. + +[Remove floorboard](remove-floorboard/remove-floorboard.md) + +[Replace carpet](../room.md) \ No newline at end of file From 1347d1da8ac8188e4d5fbbed65ebaf49023ab63a Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 5 Aug 2016 15:38:16 +0100 Subject: [PATCH 4120/5486] Add english/33hours/explore-room/under-carpet/remove-floorboard/remove-floorboard.md --- .../under-carpet/remove-floorboard/remove-floorboard.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/33hours/explore-room/under-carpet/remove-floorboard/remove-floorboard.md diff --git a/english/33hours/explore-room/under-carpet/remove-floorboard/remove-floorboard.md b/english/33hours/explore-room/under-carpet/remove-floorboard/remove-floorboard.md new file mode 100644 index 0000000000..9e608d0e02 --- /dev/null +++ b/english/33hours/explore-room/under-carpet/remove-floorboard/remove-floorboard.md @@ -0,0 +1,7 @@ +You pry at the loose floorboard and manage to get a grip on it. + +You pull the floorboard out and see an old cigar box hidden below it. + +[Open cigar box] + +[Put floorboard and carpet back](../../room.md) \ No newline at end of file From 95eccd9cf97332341766289f1463598971e4fadc Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 5 Aug 2016 15:42:15 +0100 Subject: [PATCH 4121/5486] Remove dead link to open cigar box in english/33hours/explore-room/under-carpet/remove-floorboard/remove-floorboard.md --- .../under-carpet/remove-floorboard/remove-floorboard.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/33hours/explore-room/under-carpet/remove-floorboard/remove-floorboard.md b/english/33hours/explore-room/under-carpet/remove-floorboard/remove-floorboard.md index 9e608d0e02..f9666be6e1 100644 --- a/english/33hours/explore-room/under-carpet/remove-floorboard/remove-floorboard.md +++ b/english/33hours/explore-room/under-carpet/remove-floorboard/remove-floorboard.md @@ -2,6 +2,4 @@ You pry at the loose floorboard and manage to get a grip on it. You pull the floorboard out and see an old cigar box hidden below it. -[Open cigar box] - [Put floorboard and carpet back](../../room.md) \ No newline at end of file From 05ef3322e7e0920ecb41c075a6c5ee5aa8b8ef93 Mon Sep 17 00:00:00 2001 From: RyanxWolton Date: Fri, 5 Aug 2016 22:04:40 +0100 Subject: [PATCH 4122/5486] Changed folders and file names to be all lower case --- english/marshmallow.md | 2 +- english/{Pokemon_Go/Pokemon-Go.md => pokemon-go/pokemon-go.md} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename english/{Pokemon_Go/Pokemon-Go.md => pokemon-go/pokemon-go.md} (100%) diff --git a/english/marshmallow.md b/english/marshmallow.md index fa520ddb8c..469e1942d4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1057,4 +1057,4 @@ Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... -You decide to quit your job to play [Pokemon Go](Pokemon_Go/Pokemon-Go.md) full time. +You decide to quit your job to play [Pokemon Go](pokemon-go/pokemon-go.md) full time. diff --git a/english/Pokemon_Go/Pokemon-Go.md b/english/pokemon-go/pokemon-go.md similarity index 100% rename from english/Pokemon_Go/Pokemon-Go.md rename to english/pokemon-go/pokemon-go.md From 3010607c0785b6daaef0b71e72d98ca068bbd252 Mon Sep 17 00:00:00 2001 From: RyanxWolton Date: Fri, 5 Aug 2016 22:16:51 +0100 Subject: [PATCH 4123/5486] Update marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 3408a198f5..38f421245f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,6 +1,6 @@ Once upon a time many authors collaborated to make meaningless linked story. -[start](mad/mad.md) your journey into world of mad +-[start](mad/mad.md) your journey into world of mad or From f7ffeb48698dca00dd35915bd00383060e4263b7 Mon Sep 17 00:00:00 2001 From: RyanxWolton Date: Fri, 5 Aug 2016 22:17:31 +0100 Subject: [PATCH 4124/5486] Update marshmallow.md --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 38f421245f..3408a198f5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,6 +1,6 @@ Once upon a time many authors collaborated to make meaningless linked story. --[start](mad/mad.md) your journey into world of mad +[start](mad/mad.md) your journey into world of mad or From d2972f64abf50860d94d135d303141b28e344b05 Mon Sep 17 00:00:00 2001 From: james-norcross Date: Sat, 6 Aug 2016 10:59:10 -0500 Subject: [PATCH 4125/5486] Add trip to the supermarket --- english/breakfast/breakfast.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/breakfast/breakfast.md b/english/breakfast/breakfast.md index 8cb1b1fbfc..4b5882cd5b 100644 --- a/english/breakfast/breakfast.md +++ b/english/breakfast/breakfast.md @@ -8,3 +8,6 @@ Thereafter, you remembered the hole you made in the wall and started thinking of You realize that the only way to fix the whole in the wall is to buy additional marshmellows. In order to do this you have to go to the supermarket. That same supermarket that you vowed you would never return to. + +But, the wall has to be fixed. So you gather your courage and go to the dreaded supermarket and make your way to the +aisle with the marshmallows. Turning into the aisle you see a terrible sight. From 31a7bcedc12ba71e141564916a05cd364b01d3f2 Mon Sep 17 00:00:00 2001 From: Brian Cleary Date: Sat, 6 Aug 2016 14:26:49 -0600 Subject: [PATCH 4126/5486] Add Tiger/Bear option --- english/00_8_Agent/The_name_is_Bond_Milton_Bond.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md index fea768fd0c..bfcba05c8f 100644 --- a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md +++ b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md @@ -1,6 +1,7 @@ You have entered into the world of a secret agent. If you used to be a Drill Master, you should aspire to become -a [White Tiger](https://play.google.com/store/apps/details?id=com.linecorp.LGRGS) instead. +a [White Tiger](https://play.google.com/store/apps/details?id=com.linecorp.LGRGS) instead. If White Tiger +is too dull, you may choose a [Tiger Bear](http://i0.wp.com/listverse.com/wp-content/uploads/2011/05/liger.jpg?resize=548%2C426) You have entered into the world of one of Her Majesty's secret agent. Codename Agent 008; his name is Bond, Milton Bond. From 5590052708b54fce314aa035b1c273c3acda39d1 Mon Sep 17 00:00:00 2001 From: Ram Shah Date: Sat, 6 Aug 2016 13:29:23 -0700 Subject: [PATCH 4127/5486] Add Alia Bhatt to Bollywood --- hindi/bollywood.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 072985b836..ecae0b0850 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -29,4 +29,6 @@ Art of Living [Know More](art-of-living/art-of-living.md) Click [Here](king/king.md) to read the story of a great King. -To know about real india hero click [Bhagat Singh](Bhagat_Singh/bhagat_singh.md) \ No newline at end of file +To know about real india hero click [Bhagat Singh](Bhagat_Singh/bhagat_singh.md) + +Check out [Alia Bhatt](https://www.instagram.com/aliaabhatt/?hl=en) \ No newline at end of file From 02ab5d33305a77bf68928f81e7d5376b4922c528 Mon Sep 17 00:00:00 2001 From: Brian Cleary Date: Sat, 6 Aug 2016 14:31:08 -0600 Subject: [PATCH 4128/5486] Add Tiger Bear 2 --- english/00_8_Agent/The_name_is_Bond_Milton_Bond.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md index bfcba05c8f..b78da20398 100644 --- a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md +++ b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md @@ -1,7 +1,8 @@ You have entered into the world of a secret agent. If you used to be a Drill Master, you should aspire to become -a [White Tiger](https://play.google.com/store/apps/details?id=com.linecorp.LGRGS) instead. If White Tiger -is too dull, you may choose a [Tiger Bear](http://i0.wp.com/listverse.com/wp-content/uploads/2011/05/liger.jpg?resize=548%2C426) +a [White Tiger](https://play.google.com/store/apps/details?id=com.linecorp.LGRGS) instead. +If White Tiger is too dull, you may choose a +[Tiger Bear](http://i0.wp.com/listverse.com/wp-content/uploads/2011/05/liger.jpg?resize=548%2C426) You have entered into the world of one of Her Majesty's secret agent. Codename Agent 008; his name is Bond, Milton Bond. From 2969c4f35412918b01290b77f389505e829483a9 Mon Sep 17 00:00:00 2001 From: Brian Cleary Date: Sat, 6 Aug 2016 14:35:07 -0600 Subject: [PATCH 4129/5486] Commit 3 Tiger Bear --- english/00_8_Agent/The_name_is_Bond_Milton_Bond.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md index b78da20398..23912bb7ab 100644 --- a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md +++ b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md @@ -1,6 +1,7 @@ You have entered into the world of a secret agent. If you used to be a Drill Master, you should aspire to become -a [White Tiger](https://play.google.com/store/apps/details?id=com.linecorp.LGRGS) instead. +a [White Tiger](https://play.google.com/store/apps/details?id=com.linecorp.LGRGS) instead. + If White Tiger is too dull, you may choose a [Tiger Bear](http://i0.wp.com/listverse.com/wp-content/uploads/2011/05/liger.jpg?resize=548%2C426) From ac3bbf5f6038c0b4125e5f38628e21db8acbaa84 Mon Sep 17 00:00:00 2001 From: KitKat7 Date: Sun, 7 Aug 2016 18:44:16 +0800 Subject: [PATCH 4130/5486] Update the story of snow_white --- Chinese/snow_white/story.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Chinese/snow_white/story.md b/Chinese/snow_white/story.md index 5e5484043a..3c91695799 100644 --- a/Chinese/snow_white/story.md +++ b/Chinese/snow_white/story.md @@ -1,3 +1,5 @@ 从此白雪公主 和 七个小矮人 过上了 幸福的生活 [为什么](continue/continue.md) + +又听说 七个小矮人 是 [葫芦娃](../oner0128/story.md) 长大后的样子 From 9dbc840db778f3ad3f7d36c734e7b4f4e21cf009 Mon Sep 17 00:00:00 2001 From: Jefferson Martins de Andrade Date: Sun, 7 Aug 2016 14:55:54 -0300 Subject: [PATCH 4131/5486] =?UTF-8?q?adicionado=20cafeina=20na=20hist?= =?UTF-8?q?=C3=B3ria?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fork/semdiferencas/pentefino/sono/cafeina/cafe.md | 3 +++ .../colabora/fork/semdiferencas/pentefino/sono/sono.md | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 portugues/colabora/fork/semdiferencas/pentefino/sono/cafeina/cafe.md diff --git a/portugues/colabora/fork/semdiferencas/pentefino/sono/cafeina/cafe.md b/portugues/colabora/fork/semdiferencas/pentefino/sono/cafeina/cafe.md new file mode 100644 index 0000000000..614c387677 --- /dev/null +++ b/portugues/colabora/fork/semdiferencas/pentefino/sono/cafeina/cafe.md @@ -0,0 +1,3 @@ +No caminho para a cozinha você revisa mentalmente tudo o que já conseguiu de informação sobre o bug até o momento. + +Quando você chega próximo a cafeteira você percebe que... [continuem...] \ No newline at end of file diff --git a/portugues/colabora/fork/semdiferencas/pentefino/sono/sono.md b/portugues/colabora/fork/semdiferencas/pentefino/sono/sono.md index acfa553cbb..465b8d38c7 100644 --- a/portugues/colabora/fork/semdiferencas/pentefino/sono/sono.md +++ b/portugues/colabora/fork/semdiferencas/pentefino/sono/sono.md @@ -1,7 +1,13 @@ -Então você resolve descansar um pouco, e no outro dia você +Então você resolve descansar um pouco, e... + +No outro dia você: [Chama um amigo para ajudar](./ajuda/ajuda.md) [Se cansa de tentar encontrar o problema](./cansado/cansado.md) [Faz uma pergunta no Stackoverflow esperando alguma dica](./stackoverflow/stackoverflow.md) + +Muda de idéia e não vai descansar, você não pode deixar se vencer pelo cansaço: + +[Vai até a cozinha buscar uma xícara de café](./cafeina/cafe.md) \ No newline at end of file From 2c95e74a6e7785321ee5630e6c627dbad2cbaff9 Mon Sep 17 00:00:00 2001 From: Jefferson Martins de Andrade Date: Sun, 7 Aug 2016 15:11:06 -0300 Subject: [PATCH 4132/5486] =?UTF-8?q?ajustando=20a=20linha=20deletada=20pa?= =?UTF-8?q?ra=20se=20adequar=20a=20regra=20de=20commit=20do=20exerc=C3=ADc?= =?UTF-8?q?io?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/colabora/fork/semdiferencas/pentefino/sono/sono.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/portugues/colabora/fork/semdiferencas/pentefino/sono/sono.md b/portugues/colabora/fork/semdiferencas/pentefino/sono/sono.md index 465b8d38c7..edae43658c 100644 --- a/portugues/colabora/fork/semdiferencas/pentefino/sono/sono.md +++ b/portugues/colabora/fork/semdiferencas/pentefino/sono/sono.md @@ -1,6 +1,4 @@ -Então você resolve descansar um pouco, e... - -No outro dia você: +Então você resolve descansar um pouco, e no outro dia você [Chama um amigo para ajudar](./ajuda/ajuda.md) From 75de965cc2f9049b52bf06ea9be54c39c4ea2a1b Mon Sep 17 00:00:00 2001 From: AghaAsad Date: Sun, 7 Aug 2016 13:47:09 -0500 Subject: [PATCH 4133/5486] add my story in code.md --- english/code/code.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/code/code.md b/english/code/code.md index 7809f3ef6f..57c2106de6 100644 --- a/english/code/code.md +++ b/english/code/code.md @@ -18,4 +18,6 @@ You then decide to change the transparency program to slowly alternate between 1 Some time passes and an opportunity arises to [follow your destiny.](../destiny/destiny.md) -This is always easier whenever you drink [coffee!](../coffee/coffee.md) \ No newline at end of file +This is always easier whenever you drink [coffee!](../coffee/coffee.md) + +Sometime I code and for fun I play or watch soccer. \ No newline at end of file From b95623e5a0d74510837fb60200c846d2ae81caf0 Mon Sep 17 00:00:00 2001 From: Rossiny Date: Sun, 7 Aug 2016 17:43:49 -0300 Subject: [PATCH 4134/5486] Add hold the door --- english/hold_the_door/hodor.md | 8 ++++++++ english/marshmallow.md | 2 ++ 2 files changed, 10 insertions(+) create mode 100644 english/hold_the_door/hodor.md diff --git a/english/hold_the_door/hodor.md b/english/hold_the_door/hodor.md new file mode 100644 index 0000000000..8cb43785b0 --- /dev/null +++ b/english/hold_the_door/hodor.md @@ -0,0 +1,8 @@ +Hold the door! +Hold the door! +Hold th door! +Hold door! +Hol door! +Holdoor! +Holdor! +Hodor! \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index dec75d908b..6e12ca3d67 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1064,3 +1064,5 @@ You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... Learn about something random [here](https://en.wikipedia.org/wiki/Special:Random)! Learn about Ankesh [here](characters/ankesh.md) + +[Hold the door!](hold_the_door/hodor.md) [Spoiller GOT] \ No newline at end of file From 7ff0bbaaf2bd0ba7821da6a2c02cbe3a5adf8463 Mon Sep 17 00:00:00 2001 From: Tony Lee Date: Mon, 8 Aug 2016 22:07:00 +0800 Subject: [PATCH 4135/5486] =?UTF-8?q?add=20=E6=8E=A8=E8=8D=90=E7=BE=8E?= =?UTF-8?q?=E5=89=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- .../stranger.things.md" | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 "Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/stranger.things.md" diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 78796eb21c..61aa52b86e 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -130,4 +130,6 @@ [黄腾霄](A_htx/黄腾霄.md) -[疑犯追踪](Person_of_Interest/疑犯追踪.md) \ No newline at end of file +[疑犯追踪](Person_of_Interest/疑犯追踪.md) + +推荐大家看看[the stranger things](推荐美剧/stranger.things.md) diff --git "a/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/stranger.things.md" "b/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/stranger.things.md" new file mode 100644 index 0000000000..eb00271914 --- /dev/null +++ "b/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/stranger.things.md" @@ -0,0 +1,3 @@ +In a small town where everyone knows everyone| a peculiar incident starts a chain of events that leads to the disappearance of a child - which begins to tear at the +fabric of an otherwise peaceful community. Dark government agencies and seemingly malevolent supernatural forces converge on the town| while a few locals begin to +understand that there's more going on than meets the eye. From aa91ce2858f47055f09f698f5574f0f9cbf67389 Mon Sep 17 00:00:00 2001 From: Arki Valencia II Date: Mon, 8 Aug 2016 23:25:58 +0800 Subject: [PATCH 4136/5486] Renamed Philippines to Filipino to reflect language --- {Philippines => Filipino}/bago/bago.md | 0 {Philippines => Filipino}/bago/hakbang/hakbang.md | 0 {Philippines => Filipino}/bagong simula/bagong_simula.md | 0 {Philippines => Filipino}/bagong simula/ipis/ipis.md | 0 {Philippines => Filipino}/duterte/duterte.md | 0 {Philippines => Filipino}/movie/movie.md | 0 {Philippines => Filipino}/salamat.md | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename {Philippines => Filipino}/bago/bago.md (100%) rename {Philippines => Filipino}/bago/hakbang/hakbang.md (100%) rename {Philippines => Filipino}/bagong simula/bagong_simula.md (100%) rename {Philippines => Filipino}/bagong simula/ipis/ipis.md (100%) rename {Philippines => Filipino}/duterte/duterte.md (100%) rename {Philippines => Filipino}/movie/movie.md (100%) rename {Philippines => Filipino}/salamat.md (100%) diff --git a/Philippines/bago/bago.md b/Filipino/bago/bago.md similarity index 100% rename from Philippines/bago/bago.md rename to Filipino/bago/bago.md diff --git a/Philippines/bago/hakbang/hakbang.md b/Filipino/bago/hakbang/hakbang.md similarity index 100% rename from Philippines/bago/hakbang/hakbang.md rename to Filipino/bago/hakbang/hakbang.md diff --git a/Philippines/bagong simula/bagong_simula.md b/Filipino/bagong simula/bagong_simula.md similarity index 100% rename from Philippines/bagong simula/bagong_simula.md rename to Filipino/bagong simula/bagong_simula.md diff --git a/Philippines/bagong simula/ipis/ipis.md b/Filipino/bagong simula/ipis/ipis.md similarity index 100% rename from Philippines/bagong simula/ipis/ipis.md rename to Filipino/bagong simula/ipis/ipis.md diff --git a/Philippines/duterte/duterte.md b/Filipino/duterte/duterte.md similarity index 100% rename from Philippines/duterte/duterte.md rename to Filipino/duterte/duterte.md diff --git a/Philippines/movie/movie.md b/Filipino/movie/movie.md similarity index 100% rename from Philippines/movie/movie.md rename to Filipino/movie/movie.md diff --git a/Philippines/salamat.md b/Filipino/salamat.md similarity index 100% rename from Philippines/salamat.md rename to Filipino/salamat.md From 88bb688c732dba806fbc007d20b1565727550390 Mon Sep 17 00:00:00 2001 From: Arki Valencia II Date: Mon, 8 Aug 2016 23:28:30 +0800 Subject: [PATCH 4137/5486] Reverted back to Philippines from Filipino --- {Filipino => Philippines}/bago/bago.md | 0 {Filipino => Philippines}/bago/hakbang/hakbang.md | 0 {Filipino => Philippines}/bagong simula/bagong_simula.md | 0 {Filipino => Philippines}/bagong simula/ipis/ipis.md | 0 {Filipino => Philippines}/duterte/duterte.md | 0 {Filipino => Philippines}/movie/movie.md | 0 {Filipino => Philippines}/salamat.md | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename {Filipino => Philippines}/bago/bago.md (100%) rename {Filipino => Philippines}/bago/hakbang/hakbang.md (100%) rename {Filipino => Philippines}/bagong simula/bagong_simula.md (100%) rename {Filipino => Philippines}/bagong simula/ipis/ipis.md (100%) rename {Filipino => Philippines}/duterte/duterte.md (100%) rename {Filipino => Philippines}/movie/movie.md (100%) rename {Filipino => Philippines}/salamat.md (100%) diff --git a/Filipino/bago/bago.md b/Philippines/bago/bago.md similarity index 100% rename from Filipino/bago/bago.md rename to Philippines/bago/bago.md diff --git a/Filipino/bago/hakbang/hakbang.md b/Philippines/bago/hakbang/hakbang.md similarity index 100% rename from Filipino/bago/hakbang/hakbang.md rename to Philippines/bago/hakbang/hakbang.md diff --git a/Filipino/bagong simula/bagong_simula.md b/Philippines/bagong simula/bagong_simula.md similarity index 100% rename from Filipino/bagong simula/bagong_simula.md rename to Philippines/bagong simula/bagong_simula.md diff --git a/Filipino/bagong simula/ipis/ipis.md b/Philippines/bagong simula/ipis/ipis.md similarity index 100% rename from Filipino/bagong simula/ipis/ipis.md rename to Philippines/bagong simula/ipis/ipis.md diff --git a/Filipino/duterte/duterte.md b/Philippines/duterte/duterte.md similarity index 100% rename from Filipino/duterte/duterte.md rename to Philippines/duterte/duterte.md diff --git a/Filipino/movie/movie.md b/Philippines/movie/movie.md similarity index 100% rename from Filipino/movie/movie.md rename to Philippines/movie/movie.md diff --git a/Filipino/salamat.md b/Philippines/salamat.md similarity index 100% rename from Filipino/salamat.md rename to Philippines/salamat.md From 5aaf204f3626b9f058664a485e26d658826f89f2 Mon Sep 17 00:00:00 2001 From: Arki Valencia II Date: Mon, 8 Aug 2016 23:31:00 +0800 Subject: [PATCH 4138/5486] Added new story path --- Philippines/bagong simula/ipis/ipis.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Philippines/bagong simula/ipis/ipis.md b/Philippines/bagong simula/ipis/ipis.md index 72239f36f2..67ba26070a 100644 --- a/Philippines/bagong simula/ipis/ipis.md +++ b/Philippines/bagong simula/ipis/ipis.md @@ -6,4 +6,6 @@ Sa puntong iyon, nalaman mo na hindi lang ikaw na nasa loob ng kwarto. Subukang [durugin ang ipis](http://www.publicdomainpictures.net/pictures/60000/velka/cockroach.jpg). +[Tapakan ang ipis habang nag iisip](durog/durog.md) + Tigtigin ang kamay para maalis ang ipis at [kumaripas pabalas ng kwarto] (../../salamat.md). \ No newline at end of file From 1282d9533f57e30f76a00fb1fc4195a884f28afd Mon Sep 17 00:00:00 2001 From: Arki Valencia II Date: Mon, 8 Aug 2016 23:31:48 +0800 Subject: [PATCH 4139/5486] Added story for the new story path --- Philippines/bagong simula/ipis/durog/durog.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Philippines/bagong simula/ipis/durog/durog.md diff --git a/Philippines/bagong simula/ipis/durog/durog.md b/Philippines/bagong simula/ipis/durog/durog.md new file mode 100644 index 0000000000..8b9f71c3fe --- /dev/null +++ b/Philippines/bagong simula/ipis/durog/durog.md @@ -0,0 +1,7 @@ +Napagdesisyunan mong durugin ang ipis ngunit habang papalapit ang iyong paa sa ipis +ay bumubuka naman ang likod nito, tila papalabas ang pakpak. Pumasok agad sayong isip na +lilipad ito at mag ttransform bilang si Ipis Man. + +[Bilisan ang pag durog sa ipis](http://www.publicdomainpictures.net/pictures/60000/velka/cockroach.jpg). + +[kumaripas palabas ng kwarto] (../../../salamat.md). \ No newline at end of file From 81f69f17778f69ac5cc2f3b36d822cf9895d1006 Mon Sep 17 00:00:00 2001 From: Alejandro Poggi Date: Mon, 8 Aug 2016 14:22:17 -0400 Subject: [PATCH 4140/5486] Edited batman --- english/batman/batman.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index 6daeb10b20..0ba357a521 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -38,4 +38,6 @@ I am batman's cousin. Now that Bruce Wayne is grown old, he has proclaimed that I should take over his legacy! -Over my dead body!! Says Robin. \ No newline at end of file +Over my dead body!! Says Robin. + +John Cena comes busting through the wall and screams: \ No newline at end of file From b995516ef873fabbe7aecc7ae50d09e2ed974034 Mon Sep 17 00:00:00 2001 From: Christopher Shobar Date: Mon, 8 Aug 2016 13:57:48 -0700 Subject: [PATCH 4141/5486] Add retrun from forest --- english/forest/forest.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/forest/forest.md b/english/forest/forest.md index 4f3803cecb..c72a9cf942 100644 --- a/english/forest/forest.md +++ b/english/forest/forest.md @@ -34,3 +34,5 @@ Google can't help you right now. You are on your own. [Eat all of your rations in a panic](eat/eat.md) [Succumb to amnesia](./forest.md) + +[Go back whence you came](../marhallow.md) From c8a5d62bf65a39cdbe627537288f995f38b97431 Mon Sep 17 00:00:00 2001 From: Christopher Shobar Date: Mon, 8 Aug 2016 14:01:14 -0700 Subject: [PATCH 4142/5486] trying to get link correct --- english/forest/forest.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/forest/forest.md b/english/forest/forest.md index c72a9cf942..e00c3402ba 100644 --- a/english/forest/forest.md +++ b/english/forest/forest.md @@ -35,4 +35,4 @@ Google can't help you right now. You are on your own. [Succumb to amnesia](./forest.md) -[Go back whence you came](../marhallow.md) +[Go back whence you came](marhallow.md) From 9eee2d12dd7338e9dea75057f5ae82689b0cfdcf Mon Sep 17 00:00:00 2001 From: Christopher Shobar Date: Mon, 8 Aug 2016 14:02:46 -0700 Subject: [PATCH 4143/5486] Fix link --- english/forest/forest.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/forest/forest.md b/english/forest/forest.md index e00c3402ba..f4b64a98bc 100644 --- a/english/forest/forest.md +++ b/english/forest/forest.md @@ -35,4 +35,4 @@ Google can't help you right now. You are on your own. [Succumb to amnesia](./forest.md) -[Go back whence you came](marhallow.md) +[Go back whence you came](../marshmallow.md) From 0b52d84f2da2bb22bdb37ded36f7c1dcae8a9bb8 Mon Sep 17 00:00:00 2001 From: JaneEvans Date: Mon, 8 Aug 2016 14:37:27 -0700 Subject: [PATCH 4144/5486] Add a new story path about Data Scientist --- ...47\221\345\255\246\345\256\266\346\230\257\345\225\245.md" | 2 ++ "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 "Chinese/DataScientist/\346\225\260\346\215\256\347\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" diff --git "a/Chinese/DataScientist/\346\225\260\346\215\256\347\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" "b/Chinese/DataScientist/\346\225\260\346\215\256\347\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" new file mode 100644 index 0000000000..8326852ab7 --- /dev/null +++ "b/Chinese/DataScientist/\346\225\260\346\215\256\347\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" @@ -0,0 +1,2 @@ +孙悟空想，我本是花果山大王，如今却为了生计成了做了搞数据的程序员。 +要是早500年，我可是那逍遥自在的[美猴王](大话西游.md) \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 78796eb21c..dbb80e5de3 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -130,4 +130,6 @@ [黄腾霄](A_htx/黄腾霄.md) -[疑犯追踪](Person_of_Interest/疑犯追踪.md) \ No newline at end of file +[疑犯追踪](Person_of_Interest/疑犯追踪.md) + +[数据数学家](DataScientist/数据科学家是啥.md) \ No newline at end of file From 49271301cef7712161b9f922e7ab0d52a73064f2 Mon Sep 17 00:00:00 2001 From: JaneEvans Date: Mon, 8 Aug 2016 14:40:52 -0700 Subject: [PATCH 4145/5486] fix a typo --- ...47\221\345\255\246\345\256\266\346\230\257\345\225\245.md" | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git "a/Chinese/DataScientist/\346\225\260\346\215\256\347\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" "b/Chinese/DataScientist/\346\225\260\346\215\256\347\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" index 8326852ab7..e38744a933 100644 --- "a/Chinese/DataScientist/\346\225\260\346\215\256\347\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" +++ "b/Chinese/DataScientist/\346\225\260\346\215\256\347\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" @@ -1,2 +1,2 @@ -孙悟空想，我本是花果山大王，如今却为了生计成了做了搞数据的程序员。 -要是早500年，我可是那逍遥自在的[美猴王](大话西游.md) \ No newline at end of file +孙悟空想，我本是花果山大王，如今却为了生计做了搞数据的程序员。 +要是早500年，我可是那逍遥自在的[美猴王](大话西游.md) From 2d839b81d316b8013f0a09e72fee5e2314054200 Mon Sep 17 00:00:00 2001 From: JaneEvans Date: Mon, 8 Aug 2016 14:41:30 -0700 Subject: [PATCH 4146/5486] =?UTF-8?q?fix=20the=20link=20to=20"=E7=BE=8E?= =?UTF-8?q?=E7=8C=B4=E7=8E=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Chinese/DataScientist/\346\225\260\346\215\256\347\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" "b/Chinese/DataScientist/\346\225\260\346\215\256\347\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" index e38744a933..56bdc07c57 100644 --- "a/Chinese/DataScientist/\346\225\260\346\215\256\347\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" +++ "b/Chinese/DataScientist/\346\225\260\346\215\256\347\247\221\345\255\246\345\256\266\346\230\257\345\225\245.md" @@ -1,2 +1,2 @@ 孙悟空想，我本是花果山大王，如今却为了生计做了搞数据的程序员。 -要是早500年，我可是那逍遥自在的[美猴王](大话西游.md) +要是早500年，我可是那逍遥自在的[美猴王](../大话西游.md) From 5b27115b4012d58694a9d013aee609e6ff8070b7 Mon Sep 17 00:00:00 2001 From: Tony Lee Date: Tue, 9 Aug 2016 08:22:28 +0800 Subject: [PATCH 4147/5486] break lines --- .../stranger.things.md" | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git "a/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/stranger.things.md" "b/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/stranger.things.md" index eb00271914..c26e7d4587 100644 --- "a/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/stranger.things.md" +++ "b/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/stranger.things.md" @@ -1,3 +1,7 @@ -In a small town where everyone knows everyone| a peculiar incident starts a chain of events that leads to the disappearance of a child - which begins to tear at the -fabric of an otherwise peaceful community. Dark government agencies and seemingly malevolent supernatural forces converge on the town| while a few locals begin to -understand that there's more going on than meets the eye. +In a small town where everyone knows everyone, +a peculiar incident starts a chain of events, +that leads to the disappearance of a child, +which begins to tear at thefabric of an otherwise peaceful community. +Dark government agencies and seemingly malevolent supernatural forces converge on the town, +while a few locals begin to understand that, +there's more going on than meets the eye. From 8f3f9ca11e8d3c668af3fd3fe30789d6de2c3db9 Mon Sep 17 00:00:00 2001 From: Tony Lee Date: Tue, 9 Aug 2016 08:39:38 +0800 Subject: [PATCH 4148/5486] fixed typo --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index f838709773..0b5dd23af7 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -133,7 +133,7 @@ [疑犯追踪](Person_of_Interest/疑犯追踪.md) -[数据数学家](DataScientist/数据科学家是啥.mdi) +[数据数学家](DataScientist/数据科学家是啥.md) [推荐美剧：Stranger Things](推荐美剧/stranger.things.md) From fea75acee4b1173cfd4f12c4da6356256135a2ee Mon Sep 17 00:00:00 2001 From: Tony Lee Date: Tue, 9 Aug 2016 08:51:48 +0800 Subject: [PATCH 4149/5486] re-format --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 -- 1 file changed, 2 deletions(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 0b5dd23af7..35b6ede257 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -132,8 +132,6 @@ [疑犯追踪](Person_of_Interest/疑犯追踪.md) - [数据数学家](DataScientist/数据科学家是啥.md) - [推荐美剧：Stranger Things](推荐美剧/stranger.things.md) From a5ff6456221bb6faade8eabd70f991b8591b1034 Mon Sep 17 00:00:00 2001 From: Enrique Date: Mon, 8 Aug 2016 20:14:12 -0700 Subject: [PATCH 4150/5486] Add link to bob-barker --- english/breakfast/breakfast.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/breakfast/breakfast.md b/english/breakfast/breakfast.md index 4b5882cd5b..b06c7c689d 100644 --- a/english/breakfast/breakfast.md +++ b/english/breakfast/breakfast.md @@ -11,3 +11,5 @@ have to go to the supermarket. That same supermarket that you vowed you would ne But, the wall has to be fixed. So you gather your courage and go to the dreaded supermarket and make your way to the aisle with the marshmallows. Turning into the aisle you see a terrible sight. + +[Who is this man?](english/bob-barker/barker.md) \ No newline at end of file From b8bd738a0d4f926bfc57fc0bf4294c8789d832eb Mon Sep 17 00:00:00 2001 From: esjr81 Date: Mon, 8 Aug 2016 20:23:16 -0700 Subject: [PATCH 4151/5486] Update breakfast.md --- english/breakfast/breakfast.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/breakfast/breakfast.md b/english/breakfast/breakfast.md index b06c7c689d..c70e87a0e3 100644 --- a/english/breakfast/breakfast.md +++ b/english/breakfast/breakfast.md @@ -12,4 +12,4 @@ have to go to the supermarket. That same supermarket that you vowed you would ne But, the wall has to be fixed. So you gather your courage and go to the dreaded supermarket and make your way to the aisle with the marshmallows. Turning into the aisle you see a terrible sight. -[Who is this man?](english/bob-barker/barker.md) \ No newline at end of file +[Who is this man?](bob-barker/barker.md) From 835f57f5d983282640dc5885dc09035df86374b8 Mon Sep 17 00:00:00 2001 From: esjr81 Date: Mon, 8 Aug 2016 20:25:17 -0700 Subject: [PATCH 4152/5486] Update breakfast.md --- english/breakfast/breakfast.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/breakfast/breakfast.md b/english/breakfast/breakfast.md index c70e87a0e3..0fe1be7956 100644 --- a/english/breakfast/breakfast.md +++ b/english/breakfast/breakfast.md @@ -12,4 +12,4 @@ have to go to the supermarket. That same supermarket that you vowed you would ne But, the wall has to be fixed. So you gather your courage and go to the dreaded supermarket and make your way to the aisle with the marshmallows. Turning into the aisle you see a terrible sight. -[Who is this man?](bob-barker/barker.md) +[Who is this man?](../bob-barker/barker.md) From 7a12996f25233d949763e6ea6d09bb4eeea3046e Mon Sep 17 00:00:00 2001 From: Jayant Tripathi Date: Tue, 9 Aug 2016 18:56:43 +0530 Subject: [PATCH 4153/5486] Update follow.md file and jump.md file --- english/forest/fire/woods/follow/follow.md | 5 +++++ english/forest/fire/woods/follow/jumpInWaterFall/jump.md | 6 ++++++ english/forest/fire/woods/follow/jumpInWaterFall/notJump.md | 1 + 3 files changed, 12 insertions(+) create mode 100644 english/forest/fire/woods/follow/jumpInWaterFall/jump.md create mode 100644 english/forest/fire/woods/follow/jumpInWaterFall/notJump.md diff --git a/english/forest/fire/woods/follow/follow.md b/english/forest/fire/woods/follow/follow.md index b4e53ab52f..39fd0b6866 100644 --- a/english/forest/fire/woods/follow/follow.md +++ b/english/forest/fire/woods/follow/follow.md @@ -6,3 +6,8 @@ You slowly turn to the bear, and feel a hot breath on the back of your neck. Conjuring your new powers, you attempt to create a beehive full of honey to attract the bear. Unfortunately you only manage to create the bees, now you can see them starting to swarm. A moment later they are chasing you and the bear deeper in to the forest. + +You keep running in the general direction in which you think the shaman went. In the end you reach +waterfall. +[Jump into the waterfall](./jump) +[Don't Jump](./notJump.md) diff --git a/english/forest/fire/woods/follow/jumpInWaterFall/jump.md b/english/forest/fire/woods/follow/jumpInWaterFall/jump.md new file mode 100644 index 0000000000..6e7b60998b --- /dev/null +++ b/english/forest/fire/woods/follow/jumpInWaterFall/jump.md @@ -0,0 +1,6 @@ +You fall and keep falling until you hit the water hard. You feel pain as you have never experienced before. +You struggle for breath but are still underwater. You struggle to reach break the surface and when you +finally do your lungs burn with air, yet it feels so good. +You feel pain and burn and stigs of bees yet you feel ecstatic for being alive. +You are alive and nothing else matters for now, except for reaching the shore and celebrating your life +little longer. diff --git a/english/forest/fire/woods/follow/jumpInWaterFall/notJump.md b/english/forest/fire/woods/follow/jumpInWaterFall/notJump.md new file mode 100644 index 0000000000..b53b5f60a8 --- /dev/null +++ b/english/forest/fire/woods/follow/jumpInWaterFall/notJump.md @@ -0,0 +1 @@ +Your are killed by bear while stung by bees. From 3b49c1bd6dfe09abe7cb53b788e583979b7755ba Mon Sep 17 00:00:00 2001 From: Jayant Tripathi Date: Tue, 9 Aug 2016 19:00:38 +0530 Subject: [PATCH 4154/5486] correct link in follow. --- english/forest/fire/woods/follow/follow.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/english/forest/fire/woods/follow/follow.md b/english/forest/fire/woods/follow/follow.md index 39fd0b6866..dfbfdbaed9 100644 --- a/english/forest/fire/woods/follow/follow.md +++ b/english/forest/fire/woods/follow/follow.md @@ -9,5 +9,7 @@ later they are chasing you and the bear deeper in to the forest. You keep running in the general direction in which you think the shaman went. In the end you reach waterfall. -[Jump into the waterfall](./jump) -[Don't Jump](./notJump.md) + +[Jump into the waterfall](jumpInWaterFall/jump) + +[Don't Jump](jumpInWaterFall/notJump.md) From b1f80a41d10e4469d6d93ff8017543c8bfc821ce Mon Sep 17 00:00:00 2001 From: Jayant Tripathi Date: Tue, 9 Aug 2016 19:02:34 +0530 Subject: [PATCH 4155/5486] fix jump links. --- english/forest/fire/woods/follow/follow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/forest/fire/woods/follow/follow.md b/english/forest/fire/woods/follow/follow.md index dfbfdbaed9..f8080d19ae 100644 --- a/english/forest/fire/woods/follow/follow.md +++ b/english/forest/fire/woods/follow/follow.md @@ -10,6 +10,6 @@ later they are chasing you and the bear deeper in to the forest. You keep running in the general direction in which you think the shaman went. In the end you reach waterfall. -[Jump into the waterfall](jumpInWaterFall/jump) +[Jump into the waterfall](./jumpInWaterFall/jump) -[Don't Jump](jumpInWaterFall/notJump.md) +[Don't Jump](./jumpInWaterFall/notJump.md) From 32a09f3663b4e8b6a522b5489f27e18e86949427 Mon Sep 17 00:00:00 2001 From: Jayant Tripathi Date: Tue, 9 Aug 2016 19:04:20 +0530 Subject: [PATCH 4156/5486] fix jump link. --- english/forest/fire/woods/follow/follow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/forest/fire/woods/follow/follow.md b/english/forest/fire/woods/follow/follow.md index f8080d19ae..66b4f76156 100644 --- a/english/forest/fire/woods/follow/follow.md +++ b/english/forest/fire/woods/follow/follow.md @@ -10,6 +10,8 @@ later they are chasing you and the bear deeper in to the forest. You keep running in the general direction in which you think the shaman went. In the end you reach waterfall. -[Jump into the waterfall](./jumpInWaterFall/jump) +[Jump into the waterfall](./jumpInWaterFall/jump.md) [Don't Jump](./jumpInWaterFall/notJump.md) + + From 7f9b6bc33f44bccd84cacf72b7f159f974f741fd Mon Sep 17 00:00:00 2001 From: Jayant Tripathi Date: Tue, 9 Aug 2016 19:15:36 +0530 Subject: [PATCH 4157/5486] follow casey-collab suggestion. --- english/forest/fire/woods/follow/follow.md | 13 +++++++------ .../fire/woods/follow/jumpInWaterFall/jump.md | 6 ------ .../fire/woods/follow/jumpInWaterFall/notJump.md | 1 - 3 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 english/forest/fire/woods/follow/jumpInWaterFall/jump.md delete mode 100644 english/forest/fire/woods/follow/jumpInWaterFall/notJump.md diff --git a/english/forest/fire/woods/follow/follow.md b/english/forest/fire/woods/follow/follow.md index 66b4f76156..73194b8b59 100644 --- a/english/forest/fire/woods/follow/follow.md +++ b/english/forest/fire/woods/follow/follow.md @@ -8,10 +8,11 @@ Unfortunately you only manage to create the bees, now you can see them starting later they are chasing you and the bear deeper in to the forest. You keep running in the general direction in which you think the shaman went. In the end you reach -waterfall. - -[Jump into the waterfall](./jumpInWaterFall/jump.md) - -[Don't Jump](./jumpInWaterFall/notJump.md) - +waterfall and you jump. +You fall and keep falling until you hit the water hard. You feel pain as you have never experienced before. +You struggle for breath but are still underwater. You struggle to reach break the surface and when you +finally do your lungs burn with air, yet it feels so good. +You feel pain and burn and stigs of bees yet you feel ecstatic for being alive. +You are alive and nothing else matters for now, except for reaching the shore and celebrating your life +little longer. diff --git a/english/forest/fire/woods/follow/jumpInWaterFall/jump.md b/english/forest/fire/woods/follow/jumpInWaterFall/jump.md deleted file mode 100644 index 6e7b60998b..0000000000 --- a/english/forest/fire/woods/follow/jumpInWaterFall/jump.md +++ /dev/null @@ -1,6 +0,0 @@ -You fall and keep falling until you hit the water hard. You feel pain as you have never experienced before. -You struggle for breath but are still underwater. You struggle to reach break the surface and when you -finally do your lungs burn with air, yet it feels so good. -You feel pain and burn and stigs of bees yet you feel ecstatic for being alive. -You are alive and nothing else matters for now, except for reaching the shore and celebrating your life -little longer. diff --git a/english/forest/fire/woods/follow/jumpInWaterFall/notJump.md b/english/forest/fire/woods/follow/jumpInWaterFall/notJump.md deleted file mode 100644 index b53b5f60a8..0000000000 --- a/english/forest/fire/woods/follow/jumpInWaterFall/notJump.md +++ /dev/null @@ -1 +0,0 @@ -Your are killed by bear while stung by bees. From 97786eab3966cdd0eb5b233e10d63ad47bdb176a Mon Sep 17 00:00:00 2001 From: Melbourne Baldove Date: Tue, 9 Aug 2016 22:06:00 +0800 Subject: [PATCH 4158/5486] Added new link to blank story to Philippines --- Philippines/salamat.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index 379709965b..d540f154ee 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -13,3 +13,5 @@ Pahinga muna sa pag-aaral. Manood ng [movie] (movie/movie.md) Nakapag pahinga na. Salamat sa mga [pelikula] (movie/movie.md). Ngayon ay ating sundan ang mga kaganapan sa Pilipinas. Kamakailan ay nanalong Presidente si [Duterte] (duterte/duterte.md). + +O kung gusto mo namang kumain, tara [kain] (kain/kain.md) tayo ! From 569213a66fd17f544fa997033886ff2be6160456 Mon Sep 17 00:00:00 2001 From: Melbourne Baldove Date: Tue, 9 Aug 2016 22:39:44 +0800 Subject: [PATCH 4159/5486] Added new kain story --- Philippines/kain/kain.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Philippines/kain/kain.md diff --git a/Philippines/kain/kain.md b/Philippines/kain/kain.md new file mode 100644 index 0000000000..76fa01cd05 --- /dev/null +++ b/Philippines/kain/kain.md @@ -0,0 +1,2 @@ +Tara kain tayo ng pizza at fries, masarap ito eh ! +Inom din tayo ng beer ! \ No newline at end of file From f260e70240176ae8e123cc1660355f49b3989341 Mon Sep 17 00:00:00 2001 From: RyanxWolton Date: Tue, 9 Aug 2016 16:40:59 +0100 Subject: [PATCH 4160/5486] Update marshmallow.md Add white space where it had been deleted --- english/marshmallow.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 3408a198f5..8941603d64 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,6 +1,6 @@ Once upon a time many authors collaborated to make meaningless linked story. -[start](mad/mad.md) your journey into world of mad +[start](mad/mad.md) your journey into world of mad or @@ -8,8 +8,8 @@ spend your time [wisely](http://www.pythonchallenge.com/) [Click here](http://www.dvloper.me) to visit my dvloper.me blog . -Your adventure begins. You realize there are hundreds of paths for you to choose from. -Which way should you go? Only you can decide. +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. Oh so many decisions - what will you do?? @@ -63,9 +63,9 @@ DOING will definitely keep your sharpened with latest skills (which you can get [Know about the life of this world](00-Life-of-this-world/Life of this world.md) -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) Vist the master [liquid](liquid/liquid.md). @@ -803,7 +803,7 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now +Despite the little conundrum that you resolved, you realize that it's now Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" @@ -825,9 +825,9 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines +When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. +there are two options you must choose from. You may either do [this](gtd/gtd.md), From ec45135b869d14643c8559d2c7020a09ea958f2b Mon Sep 17 00:00:00 2001 From: RyanxWolton Date: Tue, 9 Aug 2016 17:02:04 +0100 Subject: [PATCH 4161/5486] Update marshmallow.md --- english/marshmallow.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0bd514aea0..9f00d01676 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -839,12 +839,12 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? @@ -860,7 +860,7 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive](divergence/divergence.md) or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) @@ -917,7 +917,7 @@ Do you want to build a [snowman?] (snowman/snowman.md) It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) -I think I'll try defying gravity. +I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) @@ -945,7 +945,7 @@ Explore the unknown. Most people die without ever visiting this [place.](underwa As you attempt this, a voice booms!! -The [boom](day-dream/day-dream.md) +The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) @@ -957,7 +957,7 @@ You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). -So what to do next? Three doors appear and all other ways out disappear. +So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. @@ -999,7 +999,7 @@ The lannisters always pays thier debts, says tyrion lannister. Interesting [char Time to [move to Canada](Canada/Canada.md), eh? -You struggle to find a line break to add your own adventure. +You struggle to find a line break to add your own adventure. You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) @@ -1010,7 +1010,7 @@ You're reincarnated as a green starfish but wish you were [blue instead.](starfi [Motivate yourself](Motivate/Motivate.md) -You wake up as Harry Potter ... and are facing Voldemort in a duel? +You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... @@ -1044,7 +1044,7 @@ The password is [xyzzy](plugh/plugh.md) [Say "Hi" to Guangwu](Guangwu/Guangwu.md) -Perishing in an avalanche of words, in a mundane collection of sentences called "stories". +Perishing in an avalanche of words, in a mundane collection of sentences called "stories". [Devastated?](devastated_greatness/devastated_greatness.md) Ever the fan of [Doug Adams](doug-adams/doug-adams.md). From 804422e9ec3818f09c3c89df5fbc6b80d0dc1d88 Mon Sep 17 00:00:00 2001 From: Guilherme Aramizo Ribeiro Date: Tue, 9 Aug 2016 19:40:19 -0300 Subject: [PATCH 4162/5486] garamizo further story to Canada --- english/watched/watched.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/watched/watched.md b/english/watched/watched.md index afd8852d6d..b9328264c5 100644 --- a/english/watched/watched.md +++ b/english/watched/watched.md @@ -5,3 +5,4 @@ Does the abyss know that you're late with your tax return? Perhaps you'd like to lighten up and [bake some cookies.](../bake-cookies/cookies.md) +Or evade the tax collection and [settle in Canada].(../../Canada/Canada.md) From fd56dda5c7f0e364a2aeba2a43f59a3a807bbe46 Mon Sep 17 00:00:00 2001 From: Guilherme Aramizo Ribeiro Date: Tue, 9 Aug 2016 19:43:15 -0300 Subject: [PATCH 4163/5486] Fix markdown typo --- english/watched/watched.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/watched/watched.md b/english/watched/watched.md index b9328264c5..6914c225ce 100644 --- a/english/watched/watched.md +++ b/english/watched/watched.md @@ -5,4 +5,4 @@ Does the abyss know that you're late with your tax return? Perhaps you'd like to lighten up and [bake some cookies.](../bake-cookies/cookies.md) -Or evade the tax collection and [settle in Canada].(../../Canada/Canada.md) +Or evade the tax collection and [settle in Canada](../../Canada/Canada.md). From 8340835647a0df574c067fc91549b9012e65ee3b Mon Sep 17 00:00:00 2001 From: Guilherme Aramizo Ribeiro Date: Tue, 9 Aug 2016 19:48:14 -0300 Subject: [PATCH 4164/5486] Fix broken link --- english/watched/watched.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/watched/watched.md b/english/watched/watched.md index 6914c225ce..71e533b33b 100644 --- a/english/watched/watched.md +++ b/english/watched/watched.md @@ -5,4 +5,4 @@ Does the abyss know that you're late with your tax return? Perhaps you'd like to lighten up and [bake some cookies.](../bake-cookies/cookies.md) -Or evade the tax collection and [settle in Canada](../../Canada/Canada.md). +Or evade the tax collection and [settle in Canada](../Canada/Canada.md). From 955701331cc21c3dbb432cfe5b55811d4d353f0f Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 9 Aug 2016 17:17:07 -0600 Subject: [PATCH 4165/5486] Modify fire.md; add ally-squirrels folder and .md --- english/forest/fire/ally-squirrels/ally-squirrels.md | 2 ++ english/forest/fire/fire.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/forest/fire/ally-squirrels/ally-squirrels.md diff --git a/english/forest/fire/ally-squirrels/ally-squirrels.md b/english/forest/fire/ally-squirrels/ally-squirrels.md new file mode 100644 index 0000000000..aa472ff66b --- /dev/null +++ b/english/forest/fire/ally-squirrels/ally-squirrels.md @@ -0,0 +1,2 @@ +You ally yourself with the squirrels +They show you the ways of nut-storage and skin-winged flight \ No newline at end of file diff --git a/english/forest/fire/fire.md b/english/forest/fire/fire.md index cb76756e3c..51196d3be7 100644 --- a/english/forest/fire/fire.md +++ b/english/forest/fire/fire.md @@ -33,3 +33,4 @@ part of the woods. What should you do? [Fight the bear](fight/fight.md) +[Ally yourself with the squirrels] (ally-squirrels/ally-squirrels.md) From 3794878f0db9a8d21f401f1a8d304a5aa8153b26 Mon Sep 17 00:00:00 2001 From: Peanut303 Date: Tue, 9 Aug 2016 19:12:18 -0600 Subject: [PATCH 4166/5486] Add shoreline and edit follow.md --- english/forest/fire/woods/follow/follow.md | 2 ++ english/forest/fire/woods/follow/shoreline/shoreline.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/forest/fire/woods/follow/shoreline/shoreline.md diff --git a/english/forest/fire/woods/follow/follow.md b/english/forest/fire/woods/follow/follow.md index 73194b8b59..79c5e203a8 100644 --- a/english/forest/fire/woods/follow/follow.md +++ b/english/forest/fire/woods/follow/follow.md @@ -16,3 +16,5 @@ finally do your lungs burn with air, yet it feels so good. You feel pain and burn and stigs of bees yet you feel ecstatic for being alive. You are alive and nothing else matters for now, except for reaching the shore and celebrating your life little longer. + +[Scramble onto the rocky shoreline] (shoreline/shoreline.md) diff --git a/english/forest/fire/woods/follow/shoreline/shoreline.md b/english/forest/fire/woods/follow/shoreline/shoreline.md new file mode 100644 index 0000000000..25b8d112c9 --- /dev/null +++ b/english/forest/fire/woods/follow/shoreline/shoreline.md @@ -0,0 +1,3 @@ +A sense of relief passes through you as you scramble onto the rocky shoreline of the river.That moment is short lived. + +Deep within the dense forest comes an ominous growl. Something far larger,more dangerous than a bear.You freeze in fear \ No newline at end of file From 7136eaebf3ccd148eea1185ce73f46e833bd58a7 Mon Sep 17 00:00:00 2001 From: Beth Palmer Date: Wed, 10 Aug 2016 21:03:20 +0100 Subject: [PATCH 4167/5486] Add new part to story --- english/marshmallow.md | 2 ++ english/philosophy/questions.md | 0 2 files changed, 2 insertions(+) create mode 100644 english/philosophy/questions.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 9f00d01676..0412106e41 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1069,3 +1069,5 @@ Learn about Ankesh [here](characters/ankesh.md) [Hold the door!](hold_the_door/hodor.md) [Spoiller GOT] >>>>>>> b6c70ae2fc2160a4b1b9c8639b4567de6b5a4a93 + +You realise that the philosphy of life in general boils down to that one central question... will you? or will you not? [So Will you?](philosophy/questions.md) diff --git a/english/philosophy/questions.md b/english/philosophy/questions.md new file mode 100644 index 0000000000..e69de29bb2 From 8392e5d7d06884eb51323f38ea2043f9d0b33b8e Mon Sep 17 00:00:00 2001 From: Beth Palmer Date: Wed, 10 Aug 2016 21:08:29 +0100 Subject: [PATCH 4168/5486] Updated content --- english/marshmallow.md | 4 +++- english/philosophy/questions.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0412106e41..464ae3f0db 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1070,4 +1070,6 @@ Learn about Ankesh [here](characters/ankesh.md) [Hold the door!](hold_the_door/hodor.md) [Spoiller GOT] >>>>>>> b6c70ae2fc2160a4b1b9c8639b4567de6b5a4a93 -You realise that the philosphy of life in general boils down to that one central question... will you? or will you not? [So Will you?](philosophy/questions.md) +You realise that the philosphy of life in general boils down to +that one central question... will you? or will you not? +[So Will you?](philosophy/questions.md) diff --git a/english/philosophy/questions.md b/english/philosophy/questions.md index e69de29bb2..5f2789e393 100644 --- a/english/philosophy/questions.md +++ b/english/philosophy/questions.md @@ -0,0 +1 @@ +We have the questions. Now we need to find the answers. Look to the universe. \ No newline at end of file From e98c3a95d00f781f596f4e0e995bf0a7d1602bc8 Mon Sep 17 00:00:00 2001 From: Gundawindy Ricketts Date: Thu, 11 Aug 2016 06:26:13 +0800 Subject: [PATCH 4169/5486] Add a line to the story. --- english/eatmarshmallow/marshmallowland/marshmallowland.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/eatmarshmallow/marshmallowland/marshmallowland.md b/english/eatmarshmallow/marshmallowland/marshmallowland.md index eed05e22a3..d6c284312c 100644 --- a/english/eatmarshmallow/marshmallowland/marshmallowland.md +++ b/english/eatmarshmallow/marshmallowland/marshmallowland.md @@ -3,3 +3,5 @@ The sight of white, pink, and a stain of burnt-ish brown confuses you. No doctors in sight. Only marshmallows. You have never had a sweet tooth, so the sight of marshmallows makes you nauseous. + +So you throw up on the floor. From af861c3b02d31e4c586efb8f427614308ba05f69 Mon Sep 17 00:00:00 2001 From: xTheMesSx Date: Wed, 10 Aug 2016 22:15:57 -0400 Subject: [PATCH 4170/5486] Add cats. Everyone luvs cats. --- english/mad/mad.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/mad/mad.md b/english/mad/mad.md index f6e6ff0b28..c6f0ea932f 100644 --- a/english/mad/mad.md +++ b/english/mad/mad.md @@ -1,3 +1,5 @@ come along, I will introduce you the [Forest](../forest/forest.md) -On second though, maybe I should [go back](../marshmallow.md). \ No newline at end of file +On second though, maybe I should [go back](../marshmallow.md). + +An army of cats appears! You stop to [Aaawww](https://www.reddit.com/r/cats/) \ No newline at end of file From c7785a55d3d08c7a1c8afffb40e0796aa338bbdd Mon Sep 17 00:00:00 2001 From: Spencer Date: Wed, 10 Aug 2016 23:27:29 -0700 Subject: [PATCH 4171/5486] Add ghost-like quality to handless thing --- .../eating-walls/find-a-toilet/door/shake-hands/shake-hands.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/eating-walls/find-a-toilet/door/shake-hands/shake-hands.md b/english/eating-walls/find-a-toilet/door/shake-hands/shake-hands.md index 7e488ccd3b..399bb7c3a7 100644 --- a/english/eating-walls/find-a-toilet/door/shake-hands/shake-hands.md +++ b/english/eating-walls/find-a-toilet/door/shake-hands/shake-hands.md @@ -1,4 +1,7 @@ You reach out to shake the things hand in an attempt to be cordial, but you realize the thing has no hands. +Your hands went straight through the dark figure! Is it a ghost? +You and then the thing scream again in renewed fright! + You beging to feel light-headed and pass-out. \ No newline at end of file From ab621b319d1a78d2205f7751ef8d99ba90d6c3c9 Mon Sep 17 00:00:00 2001 From: MA Hye Date: Thu, 11 Aug 2016 16:55:35 +0100 Subject: [PATCH 4172/5486] Add story path about the nature of identity --- english/marshmallow.md | 2 ++ english/nature-of-identity/nature-of-identity.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 english/nature-of-identity/nature-of-identity.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 464ae3f0db..3e8d30ea31 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1073,3 +1073,5 @@ Learn about Ankesh [here](characters/ankesh.md) You realise that the philosphy of life in general boils down to that one central question... will you? or will you not? [So Will you?](philosophy/questions.md) + +You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). \ No newline at end of file diff --git a/english/nature-of-identity/nature-of-identity.md b/english/nature-of-identity/nature-of-identity.md new file mode 100644 index 0000000000..0a77e84fd7 --- /dev/null +++ b/english/nature-of-identity/nature-of-identity.md @@ -0,0 +1,5 @@ +You stumble upon an ancient [realisation](https://youtu.be/kVAHXiKjgRo). + +If your physical form, the atoms that constitute your body, your thoughts and feelings, +and even your memories and DNA are ceaselessly changing, what is the constant property +that makes you... you? \ No newline at end of file From e8dc169473002d7fccee2db2680ca77c7e978ec4 Mon Sep 17 00:00:00 2001 From: Marc Anthony Rosa Date: Thu, 11 Aug 2016 15:30:33 -0500 Subject: [PATCH 4173/5486] Add new entry with parachute option --- english/forest/scream/run/run.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/english/forest/scream/run/run.md b/english/forest/scream/run/run.md index 5524dfe638..e7d687584b 100644 --- a/english/forest/scream/run/run.md +++ b/english/forest/scream/run/run.md @@ -1,4 +1,12 @@ -Since you know you cannot outrun a tiger. You decide to run toward it +Since you know you cannot outrun a tiger. You decide to run toward it making as much noise as possible in a way to scare it off!! The tiger tilts its head slightly to the left and watches you with that -curious expression so typical of three year olds. When you reach the tiger it lifts an expectant paw, and.... \ No newline at end of file +curious expression so typical of three year olds. When you reach the tiger it lifts an expectant paw, and.... + +You're now flying backwards in the air! You forgot that you were still attached to the parachute, which sling-shotted you backwards, just as you reached the end of the tether. + +After getting slingshot backwards about 10 feed back, you land on your back with a huge thud. You look up and see that the parachute falls to your feet, now untangled from the trees. + +You reach over and pick up the parachute. The tiger, having watched all of this in surprise, is now staring at you with a hungry look. + +You, armed with a parachute, have to make a choice. Should you... From 226ee918fd796d288fc8500e6dbb6b553c76fc94 Mon Sep 17 00:00:00 2001 From: Marc Anthony Rosa Date: Thu, 11 Aug 2016 15:38:50 -0500 Subject: [PATCH 4174/5486] Reduce line length, made slight edits --- english/forest/scream/run/run.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/english/forest/scream/run/run.md b/english/forest/scream/run/run.md index e7d687584b..df4bd0d312 100644 --- a/english/forest/scream/run/run.md +++ b/english/forest/scream/run/run.md @@ -3,10 +3,14 @@ making as much noise as possible in a way to scare it off!! The tiger tilts its head slightly to the left and watches you with that curious expression so typical of three year olds. When you reach the tiger it lifts an expectant paw, and.... -You're now flying backwards in the air! You forgot that you were still attached to the parachute, which sling-shotted you backwards, just as you reached the end of the tether. +You're now flying backwards! -After getting slingshot backwards about 10 feed back, you land on your back with a huge thud. You look up and see that the parachute falls to your feet, now untangled from the trees. +You forgot that you were still attached to the parachute, which sling-shotted you backwards, just as you reached the end of the tether. -You reach over and pick up the parachute. The tiger, having watched all of this in surprise, is now staring at you with a hungry look. +After flying backwards 10 feed back, you land on your back. THUD! + +You look up and see that the parachute falling to your feet, untangled from the trees. + +You reach over and pick up the parachute. The tiger, having watched all of this, is staring at you with a hungry look. You, armed with a parachute, have to make a choice. Should you... From 70920be306fe4010b7bbc5793c84c9cbf8c94f70 Mon Sep 17 00:00:00 2001 From: Marc Anthony Rosa Date: Thu, 11 Aug 2016 15:58:18 -0500 Subject: [PATCH 4175/5486] Update characters per line --- english/forest/scream/run/run.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/english/forest/scream/run/run.md b/english/forest/scream/run/run.md index df4bd0d312..122aa25511 100644 --- a/english/forest/scream/run/run.md +++ b/english/forest/scream/run/run.md @@ -5,12 +5,16 @@ curious expression so typical of three year olds. When you reach the tiger it li You're now flying backwards! -You forgot that you were still attached to the parachute, which sling-shotted you backwards, just as you reached the end of the tether. +You forgot that you were still attached to the parachute, +which sling-shotted you backwards, just as you reached the end of the tether. After flying backwards 10 feed back, you land on your back. THUD! -You look up and see that the parachute falling to your feet, untangled from the trees. +You look up and see that the parachute falling to your feet, +untangled from the trees. -You reach over and pick up the parachute. The tiger, having watched all of this, is staring at you with a hungry look. +You reach over and pick up the parachute. +The tiger, having watched all of this, is staring at you +with a hungry look. You, armed with a parachute, have to make a choice. Should you... From c6b38a99add5cce48a9fa70a1b0b632352e28074 Mon Sep 17 00:00:00 2001 From: Marc Anthony Rosa Date: Thu, 11 Aug 2016 16:01:27 -0500 Subject: [PATCH 4176/5486] Add space on line 1 --- english/forest/scream/run/run.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/forest/scream/run/run.md b/english/forest/scream/run/run.md index 122aa25511..93cfd2f78f 100644 --- a/english/forest/scream/run/run.md +++ b/english/forest/scream/run/run.md @@ -1,4 +1,4 @@ -Since you know you cannot outrun a tiger. You decide to run toward it +Since you know you cannot outrun a tiger. You decide to run toward it making as much noise as possible in a way to scare it off!! The tiger tilts its head slightly to the left and watches you with that curious expression so typical of three year olds. When you reach the tiger it lifts an expectant paw, and.... From af7eaf1a9fdd35ee317b45173e2980a98079cece Mon Sep 17 00:00:00 2001 From: Doug Peterson Date: Thu, 11 Aug 2016 17:35:11 -0600 Subject: [PATCH 4177/5486] Add start over link --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 3e8d30ea31..89ad219594 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -326,6 +326,8 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: +Give up and [start over](language.md) + [Listen to Tales of the Inexpressable (By Shpongle)](https://www.youtube.com/watch?v=6WTxC8wnXQo) [Watch the new Star Wars trailer](https://www.youtube.com/watch?v=sGbxmsDFVnE) @@ -1074,4 +1076,4 @@ You realise that the philosphy of life in general boils down to that one central question... will you? or will you not? [So Will you?](philosophy/questions.md) -You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). \ No newline at end of file +You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). From 7e39912e9acc1d3b49cde7530fa7d397efe246e5 Mon Sep 17 00:00:00 2001 From: Doug Peterson Date: Thu, 11 Aug 2016 17:40:21 -0600 Subject: [PATCH 4178/5486] Fix start over link --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 89ad219594..88677ffb91 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -326,7 +326,7 @@ You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) Do you: -Give up and [start over](language.md) +Give up and [start over](marshmallow.md). [Listen to Tales of the Inexpressable (By Shpongle)](https://www.youtube.com/watch?v=6WTxC8wnXQo) From 076b62afedbd87e8d39a56b1b1ba98efc84f40f6 Mon Sep 17 00:00:00 2001 From: Jason Marvin Date: Fri, 12 Aug 2016 14:37:34 -0600 Subject: [PATCH 4179/5486] Add 'light' and 'stay' links --- english/forest/drag/drag.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/forest/drag/drag.md b/english/forest/drag/drag.md index ce063cb714..9fe17aa050 100644 --- a/english/forest/drag/drag.md +++ b/english/forest/drag/drag.md @@ -1,3 +1,7 @@ You drag yourself further into the woods. Along the way, you disturb a nest of rattle snakes. Before you can get away, they lunge at you and inject you with their venom. You die in even more pain than you were before. + +[Move toward the light](light/light.md) + +[Stay, don't move](stay/stay.md) From d29854e044f2113c3e4e9479b227d68aafc88985 Mon Sep 17 00:00:00 2001 From: Jason Marvin Date: Fri, 12 Aug 2016 14:45:20 -0600 Subject: [PATCH 4180/5486] Add 'light' story doc --- english/forest/drag/light/light.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/forest/drag/light/light.md diff --git a/english/forest/drag/light/light.md b/english/forest/drag/light/light.md new file mode 100644 index 0000000000..c3796fdd4b --- /dev/null +++ b/english/forest/drag/light/light.md @@ -0,0 +1,3 @@ +You walk toward the light that gets more blinding and comforting +the closer you get. Suddenly, you realize your spirit has been +lifted into the stars to eternally look down upon the universe. \ No newline at end of file From 8be3ed8200f791862395622a3617ef2f67468ce5 Mon Sep 17 00:00:00 2001 From: Jason Marvin Date: Fri, 12 Aug 2016 14:49:23 -0600 Subject: [PATCH 4181/5486] Add 'stay' story doc --- english/forest/drag/stay/stay.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/forest/drag/stay/stay.md diff --git a/english/forest/drag/stay/stay.md b/english/forest/drag/stay/stay.md new file mode 100644 index 0000000000..e2e07ae609 --- /dev/null +++ b/english/forest/drag/stay/stay.md @@ -0,0 +1,3 @@ +The light slowly starts to dim until it disappears entirely. +You realize you are standing next to your corpse. You are set +to roam the earth as a spirit for eternity. \ No newline at end of file From deb2f241291e5f83caef952208b7e6c7362a29a3 Mon Sep 17 00:00:00 2001 From: nauke Date: Sat, 13 Aug 2016 15:10:45 +0200 Subject: [PATCH 4182/5486] Add open a pill option --- english/choose-pill/choose-pill.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/choose-pill/choose-pill.md b/english/choose-pill/choose-pill.md index 8628e7388d..2b21b65ac9 100644 --- a/english/choose-pill/choose-pill.md +++ b/english/choose-pill/choose-pill.md @@ -8,4 +8,6 @@ This is your last chance. After this, there is no turning back. You take the blue pill—the story ends, you wake up in your bed and believe whatever you want to believe. You take the red pill—you stay in Wonderland, and I show you how deep the rabbit hole goes. -One last option is you take both pills and whichever is more potent wins. (not recommended) \ No newline at end of file +One last option is you take both pills and whichever is more potent wins. (not recommended) + +The last last option is to bite off half of the pill and see what is inside. \ No newline at end of file From 378fae85ae254dbfc274630b2d902d5d4571e290 Mon Sep 17 00:00:00 2001 From: sj Date: Sun, 14 Aug 2016 02:55:47 +0530 Subject: [PATCH 4183/5486] NGE commited --- english/NGE/NGE.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/NGE/NGE.md diff --git a/english/NGE/NGE.md b/english/NGE/NGE.md new file mode 100644 index 0000000000..e0581988f3 --- /dev/null +++ b/english/NGE/NGE.md @@ -0,0 +1 @@ +dont do [this] (https://www.udacity.com/course/how-to-use-git-and-github--ud775) \ No newline at end of file From 517f0f68eea7a581d77c56a70f6560157e27daf9 Mon Sep 17 00:00:00 2001 From: sj Date: Sun, 14 Aug 2016 02:58:08 +0530 Subject: [PATCH 4184/5486] MArshmallow commited --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 88677ffb91..6b9c1cae38 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,5 +1,7 @@ Once upon a time many authors collaborated to make meaningless linked story. +NGE is [here] (NGE/NGE.md) + [start](mad/mad.md) your journey into world of mad or From 0aafe24c5f365c5aa46db9f3329aa61daf104f55 Mon Sep 17 00:00:00 2001 From: Marek Rabenda Date: Sun, 14 Aug 2016 11:39:26 +0200 Subject: [PATCH 4185/5486] Add kadarka story --- Polish/kadarka/kadarka.md | 18 ++++++++++++++++++ Polish/kadarka/laka/laka.md | 5 +++++ Polish/ptasieMleczko.md | 4 ++++ Polish/spanie/spaniee.md | 2 +- 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 Polish/kadarka/kadarka.md create mode 100644 Polish/kadarka/laka/laka.md diff --git a/Polish/kadarka/kadarka.md b/Polish/kadarka/kadarka.md new file mode 100644 index 0000000000..5a469a27d3 --- /dev/null +++ b/Polish/kadarka/kadarka.md @@ -0,0 +1,18 @@ +To dobra decyzja, bo pragnienie coraz bardziej si wzmaga. Co z tego, e nie masz na sobie +spodni? Kogo to obchodzi, skoro jak widzisz, w tej krainie wszyscy chodz bez majtek. +W Biedronce litr dobrej psodkiej Kadarki kosztuje 10 z. To niewiele, za tak +dobre wino i przy okazji jest jego tyle, e moesz podzieli si z nim z wszystkimi krasnoludkami, +skrzatami i dobrymi duszkami, ktre zamieszkuj poblisk k, tam gdzie jest ujcie wody miejskiej. +W pobliskiej Biedronce kupujesz Kadark. + +Moe masz ochot przej si na poblisk k? + +Co robisz? + + +[Wracasz na pocztek](../ptasieMleczko.md) + +[Jeszcze raz chcesz to sobie przemyle](./kadarka.md) + +[Idziesz na k](laka/laka.md) + diff --git a/Polish/kadarka/laka/laka.md b/Polish/kadarka/laka/laka.md new file mode 100644 index 0000000000..dd0f1e09fa --- /dev/null +++ b/Polish/kadarka/laka/laka.md @@ -0,0 +1,5 @@ +Dotare wanie na k. Pijesz Kadark i jest ci dobrze. Rozgldasz si dookoa +i zauwaasz, e nikogo nie ma, ani ywej duszy, adnych skrzatw, duszkw, czy +czegokolwiek innego. Wpadasz na pomys, pustka towarzyska na ce obok stacji +uzdatniania wody zainspirowaa ci do spenienia twojego najskrytszego marzenia. +Szybko podejmujesz decyzj i cigasz majtki (moe bdzie tam Dong?). diff --git a/Polish/ptasieMleczko.md b/Polish/ptasieMleczko.md index 46627e6dd1..a60a526298 100644 --- a/Polish/ptasieMleczko.md +++ b/Polish/ptasieMleczko.md @@ -2,6 +2,8 @@ Pewnego ranka obudziłeś się w dziwnym pokoju ze ścianami z ptaskiego mleczka Okazało się również, że masz na sobie niewygodną kurtkę i nie masz na sobie spodni... +Czujesz, e wzmaga si w tobie pragnienie, czy to nie jest dobry pomys, eby napi si Kadarki? + Co robisz? [Idziesz spac?](spanie/spaniee.md) @@ -10,3 +12,5 @@ Co robisz? [Chcesz się przebrać](ubranie/ubranie.md) +[Idziesz kupi Kadark](kadarka/kadarka.md) +i diff --git a/Polish/spanie/spaniee.md b/Polish/spanie/spaniee.md index 33024a8b81..8289775367 100644 --- a/Polish/spanie/spaniee.md +++ b/Polish/spanie/spaniee.md @@ -4,4 +4,4 @@ Co robisz? [Start](../ptasieMleczko.md) -[Idziesz dalej spać](./spaniee.md) \ No newline at end of file +[Idziesz dalej spać](./spaniee.md) From 72bffa15b6256609ffa81e86c0bba6f93e3131ee Mon Sep 17 00:00:00 2001 From: Reem Date: Sun, 14 Aug 2016 16:18:59 +0200 Subject: [PATCH 4186/5486] Add chocopool story to marshmellow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6b9c1cae38..77bbd77d86 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -422,6 +422,8 @@ Take out your [crochet project](crochet/crochet.md) instead and finish that tedd [Light a fire?](light-fire/fire.md) +[jump in a chocolate pool?](chocopool/choco.md) + [Hungry Kya?](hungry/hungry.md) [Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) From 6c64028567d66d038e53007042e89cfc2dbb28f3 Mon Sep 17 00:00:00 2001 From: Reem Date: Sun, 14 Aug 2016 16:21:50 +0200 Subject: [PATCH 4187/5486] Add chocolate pool story to choco.md in chocopool --- english/chocopool/choco.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 english/chocopool/choco.md diff --git a/english/chocopool/choco.md b/english/chocopool/choco.md new file mode 100644 index 0000000000..bc2d9b6eb4 --- /dev/null +++ b/english/chocopool/choco.md @@ -0,0 +1,10 @@ + Now you are in the chocolate pool, you are wondering if there are any +living creatures in that pool. You keep swimming and swimming.However,you +can't find out how deep that pool is.The pool is so wide that you can't +even guess its width or its length. Suddenly, you hear a strange voice. +You drink some chocolate to keep you calm, but you can't stop trembling. +what do you think about this voice?? + +1.Is it a [banana boat](bananaboat/bboat.md) floating on the pool surface? + +2.Is it the sound of the [hazelnults](hazelnut/hazel.md) terittory? From 891e7af8168062bec5ef6b9e3b2f4c011de5451a Mon Sep 17 00:00:00 2001 From: Reem Date: Sun, 14 Aug 2016 16:46:30 +0200 Subject: [PATCH 4188/5486] Fix a typo in choco.md --- english/chocopool/choco.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/chocopool/choco.md b/english/chocopool/choco.md index bc2d9b6eb4..64b5a222bd 100644 --- a/english/chocopool/choco.md +++ b/english/chocopool/choco.md @@ -5,6 +5,6 @@ even guess its width or its length. Suddenly, you hear a strange voice. You drink some chocolate to keep you calm, but you can't stop trembling. what do you think about this voice?? -1.Is it a [banana boat](bananaboat/bboat.md) floating on the pool surface? +1.Is it a [bananaboat](bananaboat/bboat.md) floating on the pool surface? 2.Is it the sound of the [hazelnults](hazelnut/hazel.md) terittory? From 7c9c9785ae491e3c50f1fe164c237e8a6cee970f Mon Sep 17 00:00:00 2001 From: Reem Date: Sun, 14 Aug 2016 16:53:58 +0200 Subject: [PATCH 4189/5486] Add the bananaboat story The story is added to bboat.md in bananaboat subdirectory --- english/chocopool/bananaboat/bboat.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/chocopool/bananaboat/bboat.md diff --git a/english/chocopool/bananaboat/bboat.md b/english/chocopool/bananaboat/bboat.md new file mode 100644 index 0000000000..ce4ce6b27b --- /dev/null +++ b/english/chocopool/bananaboat/bboat.md @@ -0,0 +1,4 @@ +You suddenly see something yellow coming from far away. As it approaches, +you realise that it is really a banana boat sailing. You think for a moment. +"May be the captain is friendly.I can ask him where I am. I could even ask +him to take me with him as a worker on his boat." \ No newline at end of file From 4414b08e1b7c5a4d2f9658a957c23a986a9e5c95 Mon Sep 17 00:00:00 2001 From: Reem Date: Sun, 14 Aug 2016 17:00:57 +0200 Subject: [PATCH 4190/5486] Add the story of the hazelnuts army THe story is added to hazel.md in the hazelnuts subdirectory --- english/chocopool/hazelnuts/hazel.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/chocopool/hazelnuts/hazel.md diff --git a/english/chocopool/hazelnuts/hazel.md b/english/chocopool/hazelnuts/hazel.md new file mode 100644 index 0000000000..8c00fee023 --- /dev/null +++ b/english/chocopool/hazelnuts/hazel.md @@ -0,0 +1,5 @@ +You have heard alot about the notorious hazelnuts who usually live in +chocolate pools. "What will these fierce creatures do to me if they see me +here?",you thought to yourself. You have to flee,before they attack and +hide somewhere. Maybe if you swim some distance, you can find the army of +nutcrackers. You can join this army and prepare for the fight. From d1bc3ddaeb95e164e890e51e50a84253259597dc Mon Sep 17 00:00:00 2001 From: phantomcoder1996 Date: Sun, 14 Aug 2016 18:23:21 +0300 Subject: [PATCH 4191/5486] Update choco.md --- english/chocopool/choco.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/chocopool/choco.md b/english/chocopool/choco.md index 64b5a222bd..26e4386db3 100644 --- a/english/chocopool/choco.md +++ b/english/chocopool/choco.md @@ -7,4 +7,4 @@ what do you think about this voice?? 1.Is it a [bananaboat](bananaboat/bboat.md) floating on the pool surface? -2.Is it the sound of the [hazelnults](hazelnut/hazel.md) terittory? +2.Is it the sound of the [hazelnults](hazelnuts/hazel.md) terittory? From ac8f4354267907ecdbdb1f3ccc823ee09d0b4c4e Mon Sep 17 00:00:00 2001 From: dogukanerkut Date: Mon, 15 Aug 2016 02:06:03 +0300 Subject: [PATCH 4192/5486] add drop-the-mic story choice --- english/karaoke/karaoke/drop-mic/drop-the-mic.md | 9 +++++++++ english/karaoke/karaoke/sing.md | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 english/karaoke/karaoke/drop-mic/drop-the-mic.md diff --git a/english/karaoke/karaoke/drop-mic/drop-the-mic.md b/english/karaoke/karaoke/drop-mic/drop-the-mic.md new file mode 100644 index 0000000000..09bbe90f6a --- /dev/null +++ b/english/karaoke/karaoke/drop-mic/drop-the-mic.md @@ -0,0 +1,9 @@ +You made a fantasic exit from the karaoke bar. +You even see the eight-foot tall dinosaur wearing 3D glasses +desperately trying to clap you! + +You are full of adrenaline now and you can feel your heart pumping blood to your body viciously. +You suddenly recall what you did 5 minutes ago! You've completely ignored the girl of your dreams +and left the place just to be seen cool! + +Do you: \ No newline at end of file diff --git a/english/karaoke/karaoke/sing.md b/english/karaoke/karaoke/sing.md index a03e4a361d..e254491f3b 100644 --- a/english/karaoke/karaoke/sing.md +++ b/english/karaoke/karaoke/sing.md @@ -16,3 +16,5 @@ Do you: [check if she is real](girl-is-real/girl-is-real.md) [make a sandwich](sandwich/sandwich.md) + +[drop the mic and leave the place](drop-mic/drop-the-mic.md) \ No newline at end of file From 9c4d01fe7eaafbed7280ef632efb9cfc38c46f0b Mon Sep 17 00:00:00 2001 From: andychen Date: Sun, 14 Aug 2016 22:40:07 -0400 Subject: [PATCH 4193/5486] Add thisismydouban.md from andychen --- Chinese/andychen/thisismydouban.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Chinese/andychen/thisismydouban.md diff --git a/Chinese/andychen/thisismydouban.md b/Chinese/andychen/thisismydouban.md new file mode 100644 index 0000000000..cb6a456642 --- /dev/null +++ b/Chinese/andychen/thisismydouban.md @@ -0,0 +1,4 @@ +大家好，我叫Andy chen,这是我的豆瓣个人网址，里面有我感兴趣的电影、书籍、和音乐，当然也有我写的文章，如果你感兴趣， +feel free to check it out and add me as friend, 谢谢！ + +点击这里[here](https://www.douban.com/people/3279743/)访问我的主页。 \ No newline at end of file From afe912eeba7a5f3d0fb7e7f5f89c7b5665cbe441 Mon Sep 17 00:00:00 2001 From: andychen Date: Sun, 14 Aug 2016 22:43:14 -0400 Subject: [PATCH 4194/5486] add andychen's douban homepage. --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 35b6ede257..6c7deed48e 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -135,3 +135,5 @@ [数据数学家](DataScientist/数据科学家是啥.md) [推荐美剧：Stranger Things](推荐美剧/stranger.things.md) + +[我的豆瓣网页](andychen/thisismydouban.md) From 6277cc6ed4d15deaf1b8849549c14005f8fcb17c Mon Sep 17 00:00:00 2001 From: James Sheridan Date: Tue, 16 Aug 2016 09:43:18 -0400 Subject: [PATCH 4195/5486] Add link to ASDREAMS on amnesia.md --- english/amnesia/amnesia.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/amnesia/amnesia.md b/english/amnesia/amnesia.md index c27c502191..f2938e4854 100644 --- a/english/amnesia/amnesia.md +++ b/english/amnesia/amnesia.md @@ -18,6 +18,9 @@ Amnesia can be freaking awesome sometimes :) Or it can be highly disturbing. +Like when you wake up from a [dream](http://www.asdreams.org/) and slowly the vivid +memory of it fades away. Like switching from one life to another. + Or, it can be highly... oh, I forgot what I was going to say. Who am I? Where am I? What am I doing? From bc0f19163419d9e62296a0c1b37712518bd63c9c Mon Sep 17 00:00:00 2001 From: Oana Date: Tue, 16 Aug 2016 16:24:34 +0000 Subject: [PATCH 4196/5486] Add marmot --- romanian/panda/marmota.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 romanian/panda/marmota.md diff --git a/romanian/panda/marmota.md b/romanian/panda/marmota.md new file mode 100644 index 0000000000..1a7f15c52c --- /dev/null +++ b/romanian/panda/marmota.md @@ -0,0 +1 @@ +Staniolul invelea marmota in ciocolata. From 4fcb4575a3908b5eabad53e43642beff0f6ed3ec Mon Sep 17 00:00:00 2001 From: Oana Date: Tue, 16 Aug 2016 16:41:21 +0000 Subject: [PATCH 4197/5486] Make marmot reachable --- romanian/nalba.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/romanian/nalba.md b/romanian/nalba.md index 27823b846a..c6c670d8f5 100644 --- a/romanian/nalba.md +++ b/romanian/nalba.md @@ -70,6 +70,12 @@ Bineinteles ca o sa bea. Ginel stia ca asta inseamna sa fii mafiot la urma urmei [Beau tot](Beau/Beau_paharul_pana_la_fund.md) +Apoi ma trezesc chinuit de ganduri stranii. + +[Adevarate framantari filosofice](panda/marmota.md). + +Incep sa ma percep la persoana a III-a. + Subit se simtea usor si isi imagina ca zboara - buna [potiunea](potiune_fermecata/potiune.md) asta, gandi el. Parea ca devenise un [pitigoi lustragiu](pitigoi/pitigoi.md) pentru incisivii From 860e5fce43f5f57befb07c62c5d425d5588e2c37 Mon Sep 17 00:00:00 2001 From: Oana Date: Tue, 16 Aug 2016 16:42:25 +0000 Subject: [PATCH 4198/5486] Update marmot --- romanian/panda/marmota.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/romanian/panda/marmota.md b/romanian/panda/marmota.md index 1a7f15c52c..99ed3255f3 100644 --- a/romanian/panda/marmota.md +++ b/romanian/panda/marmota.md @@ -1 +1,3 @@ -Staniolul invelea marmota in ciocolata. +Staniolul invelea marmota in ciocolata. Sau ciocolata marmotea staniolul in velea? + + From 3b4a5f7f530e010e7355780af4040f642aa2c613 Mon Sep 17 00:00:00 2001 From: Anthony Pak Date: Tue, 16 Aug 2016 09:46:57 -0700 Subject: [PATCH 4199/5486] Added line about the meaning of life --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 77bbd77d86..72a8af6e1e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1081,3 +1081,5 @@ that one central question... will you? or will you not? [So Will you?](philosophy/questions.md) You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). + +Click [here](https://www.youtube.com/watch?v=aboZctrHfK8) to find out what the meaning of life is. From ebd4e9a4dbf0f4ef56abdbcb690e56869cd5b828 Mon Sep 17 00:00:00 2001 From: Ksan8 Date: Tue, 16 Aug 2016 16:33:33 -0700 Subject: [PATCH 4200/5486] Add revolution option and file --- english/revolution/revolution.md | 2 ++ english/watched/watched.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/revolution/revolution.md diff --git a/english/revolution/revolution.md b/english/revolution/revolution.md new file mode 100644 index 0000000000..b54df64471 --- /dev/null +++ b/english/revolution/revolution.md @@ -0,0 +1,2 @@ +After your encounter with the abyss, the unsettling chill has not +left. You must act. It is time for a revolution. \ No newline at end of file diff --git a/english/watched/watched.md b/english/watched/watched.md index 71e533b33b..1a042284a7 100644 --- a/english/watched/watched.md +++ b/english/watched/watched.md @@ -6,3 +6,5 @@ Does the abyss know that you're late with your tax return? Perhaps you'd like to lighten up and [bake some cookies.](../bake-cookies/cookies.md) Or evade the tax collection and [settle in Canada](../Canada/Canada.md). + +On second (or third) thought, it might be time for [revolution](../revolution/revolution.md). From 8f348fd646e37fca4c753a4e1f24a4c302e5b25c Mon Sep 17 00:00:00 2001 From: Welly Mulyadi Date: Wed, 17 Aug 2016 17:18:58 +1000 Subject: [PATCH 4201/5486] Add line about Franklin --- english/play-gta5/play-gta5.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/play-gta5/play-gta5.md b/english/play-gta5/play-gta5.md index d5429b2911..673d0e293e 100644 --- a/english/play-gta5/play-gta5.md +++ b/english/play-gta5/play-gta5.md @@ -2,4 +2,5 @@ Trevor killed a lot of rednecks with minigun. Michael cheated on Trevor. Both of them stole lots of money. +There's also Franklin, who's having life issues & wanting to do something ambitious no matter what the consequences are. It's a very sad story and a great game. From 08e9fc41f22a41dbcf3c53ce729e76e72823eeda Mon Sep 17 00:00:00 2001 From: BitOven Date: Wed, 17 Aug 2016 16:34:33 +0200 Subject: [PATCH 4202/5486] an introduction to the options --- espanol/jordiHurtado/jordiHurtado.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/jordiHurtado/jordiHurtado.md b/espanol/jordiHurtado/jordiHurtado.md index c1cb490e05..2a0da7cd26 100644 --- a/espanol/jordiHurtado/jordiHurtado.md +++ b/espanol/jordiHurtado/jordiHurtado.md @@ -1,3 +1,5 @@ +Jordi Hurtado, con su habitual simpatía, llegó a Canudos y se presentó ante ellos. Entonces, el Consejero... + [Y le dijo que organizara algo para entretener al ejèrcito que se avecinaba.](saberYganar/saberYganar.md) [Le dijo que fabricara una pociòn para no morir durante el ataque.](inmortal/inmortal.md) From a5b6b634e4b394d9ead444c71ed2476b4073593f Mon Sep 17 00:00:00 2001 From: Alick Mitchell Date: Wed, 17 Aug 2016 16:40:50 +0100 Subject: [PATCH 4203/5486] Metal teeth --- english/dentist/ouch.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/dentist/ouch.md b/english/dentist/ouch.md index bca3d820cf..98ca33e566 100644 --- a/english/dentist/ouch.md +++ b/english/dentist/ouch.md @@ -3,3 +3,4 @@ on the right side of your mouth. Shouldn't have eaten all those marshmallows. It's better to eat fruits and vegetables. But who can resist for marchmallows?! So, dont worry. Continue eating marshmellows. If you loose all you teeth, you can replace them with the artificial ones. +Or get metal teeth like the Bond villian Jaws. From ad9d9a2cfb795c90956c1ed3ebc83175ef51e272 Mon Sep 17 00:00:00 2001 From: akt Date: Wed, 17 Aug 2016 15:06:03 -0400 Subject: [PATCH 4204/5486] Add mine favourite proverb --- Gujarati/gujarati.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Gujarati/gujarati.md b/Gujarati/gujarati.md index b471525c29..e18838fc11 100644 --- a/Gujarati/gujarati.md +++ b/Gujarati/gujarati.md @@ -15,4 +15,7 @@ Gujarati language is great. Lord Krishna spoke or led to it. Mahatma Gandhi spok CS [go here](DhoklaStellarFafda~/CS.md) ટીપે ટીપે સરોવર બંધાય , કાંકરે કાંકરે પાડ બંધાય -This is my favourite Gujarati proverb copied from [here](http://gujarati-proverbs.tumblr.com/) \ No newline at end of file +This is my favourite Gujarati proverb copied from [here](http://gujarati-proverbs.tumblr.com/) + +જાગ્યા ત્યાંથી સવાર +Mine favourite(@ http://gujarati-proverbs.tumblr.com/) \ No newline at end of file From 2ff569829cabb090a810cc2d8942f3e5f22f6ffd Mon Sep 17 00:00:00 2001 From: lazyDroide Date: Fri, 19 Aug 2016 00:49:34 +0200 Subject: [PATCH 4205/5486] add eleccion --- espanol/eleccion/eleccion.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 espanol/eleccion/eleccion.md diff --git a/espanol/eleccion/eleccion.md b/espanol/eleccion/eleccion.md new file mode 100644 index 0000000000..8387c22d1e --- /dev/null +++ b/espanol/eleccion/eleccion.md @@ -0,0 +1,2 @@ +El mayor de sus temores, se hacia realidad. Se encontraba solo, observado por todos, ante la decision mas importante +de seguramente los ultimos años y nadie habia en quien apoyarse. \ No newline at end of file From e444ad5ce1ce0a98473a2830f4d5f05a876f031e Mon Sep 17 00:00:00 2001 From: lazyDroide Date: Fri, 19 Aug 2016 00:59:04 +0200 Subject: [PATCH 4206/5486] =?UTF-8?q?a=C3=B1adir=20link=20en=20archivo=20.?= =?UTF-8?q?md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- espanol/eleccion/eleccion.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/espanol/eleccion/eleccion.md b/espanol/eleccion/eleccion.md index 8387c22d1e..5264d7765a 100644 --- a/espanol/eleccion/eleccion.md +++ b/espanol/eleccion/eleccion.md @@ -1,2 +1,3 @@ -El mayor de sus temores, se hacia realidad. Se encontraba solo, observado por todos, ante la decision mas importante -de seguramente los ultimos años y nadie habia en quien apoyarse. \ No newline at end of file +[El mayor de sus temores, se habia hecho realidad.](udacity/create-your-own-adventure/tree/eleccion/espanol/eleccion) +Se encontraba solo, observado por todos, ante la decision mas importante de seguramente los ultimos años + y nadie habia en quien apoyarse. \ No newline at end of file From 54cca30706503420378195682d2890784fdeb3a1 Mon Sep 17 00:00:00 2001 From: lazyDroide Date: Fri, 19 Aug 2016 01:10:04 +0200 Subject: [PATCH 4207/5486] fix link a relativo --- espanol/eleccion/eleccion.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/eleccion/eleccion.md b/espanol/eleccion/eleccion.md index 5264d7765a..e50cc7503f 100644 --- a/espanol/eleccion/eleccion.md +++ b/espanol/eleccion/eleccion.md @@ -1,3 +1,3 @@ -[El mayor de sus temores, se habia hecho realidad.](udacity/create-your-own-adventure/tree/eleccion/espanol/eleccion) +[El mayor de sus temores, se habia hecho realidad.](../eleccion/eleccion.md) Se encontraba solo, observado por todos, ante la decision mas importante de seguramente los ultimos años y nadie habia en quien apoyarse. \ No newline at end of file From 348d8a4459133cba43505359daf0ee7b51838d58 Mon Sep 17 00:00:00 2001 From: lazyDroide Date: Fri, 19 Aug 2016 01:14:05 +0200 Subject: [PATCH 4208/5486] add cambios en canudos.md --- espanol/canudos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 6ed4cfc09a..753a4a06c8 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -157,4 +157,6 @@ Recordó algunos crímenes que pesaban sobre él y de la nada perdió el conocim Revelo que venia del futuro y que le daba dos opciones: - [Morir luchando como sabia que pasaria en el futuro](time/time.md) -- [Seguir sus instrucciones y ganar](time1/time1.md) \ No newline at end of file +- [Seguir sus instrucciones y ganar](time1/time1.md) + +[La eleccion](eleccion/eleccion.md) \ No newline at end of file From 23c92e6789ecba459f057866d02636b2203900ab Mon Sep 17 00:00:00 2001 From: mebreek Date: Fri, 19 Aug 2016 21:22:36 +0200 Subject: [PATCH 4209/5486] Add I love this course, and link --- arabic/salamoAlikom.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 514c52fa2a..57a412b340 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -24,4 +24,7 @@ [قرار شجاع](tough-decision/tough-decision.md) -[لتنبهر](amazed/amazed.md) توقف لحظة \ No newline at end of file +[لتنبهر](amazed/amazed.md) توقف لحظة + +هذه التجربة رائعة +[الكورس] أحب هذا (https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) \ No newline at end of file From 3970ae70e1b08d481a7ebb907379fe39fb94a8c6 Mon Sep 17 00:00:00 2001 From: mebreek Date: Fri, 19 Aug 2016 21:29:07 +0200 Subject: [PATCH 4210/5486] Trying to fix link --- arabic/salamoAlikom.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 57a412b340..e1107c906f 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -27,4 +27,4 @@ [لتنبهر](amazed/amazed.md) توقف لحظة هذه التجربة رائعة -[الكورس] أحب هذا (https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) \ No newline at end of file +[الكورس] أحب هذا(https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) \ No newline at end of file From 513678d26f27adecf28033e7faa5d85042fd8d10 Mon Sep 17 00:00:00 2001 From: mebreek Date: Fri, 19 Aug 2016 21:31:25 +0200 Subject: [PATCH 4211/5486] Trying to fix link 2nd time --- arabic/salamoAlikom.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index e1107c906f..115fa5c9ce 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -27,4 +27,5 @@ [لتنبهر](amazed/amazed.md) توقف لحظة هذه التجربة رائعة -[الكورس] أحب هذا(https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) \ No newline at end of file + +[أحب هذا الكورس](https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) \ No newline at end of file From 6707ff66b4b84444aca6c0292226e01e87d0bbb1 Mon Sep 17 00:00:00 2001 From: Dave Roye Date: Fri, 19 Aug 2016 17:15:22 -0500 Subject: [PATCH 4212/5486] Add the Knights who say Ni and a shrubbery --- english/Monty-Python/search.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/Monty-Python/search.md b/english/Monty-Python/search.md index 247174afa2..4c5f0b2b32 100644 --- a/english/Monty-Python/search.md +++ b/english/Monty-Python/search.md @@ -4,4 +4,8 @@ Ride to the nearest castle. Meet the black knight -Chop off his limbs \ No newline at end of file +Chop off his limbs + +[Run into the Knights who say "Ni!"](https://www.youtube.com/watch?v=zIV4poUZAQo) + +Go off to find a nice shrubbery \ No newline at end of file From 8a4c80fa07a5b7644e47029fd639d7f268bda9c7 Mon Sep 17 00:00:00 2001 From: Aleksei Date: Sat, 20 Aug 2016 12:10:24 +0300 Subject: [PATCH 4213/5486] Adds on to Travellings in russian --- russian/travelling/go-to-travel.md | 2 ++ russian/travelling/sky/sky.md | 1 + russian/zefir.md | 2 ++ 3 files changed, 5 insertions(+) create mode 100644 russian/travelling/sky/sky.md diff --git a/russian/travelling/go-to-travel.md b/russian/travelling/go-to-travel.md index 986fb0fc36..087f096840 100644 --- a/russian/travelling/go-to-travel.md +++ b/russian/travelling/go-to-travel.md @@ -2,6 +2,8 @@ Ваши действия: +[Поодняться в небо](sky/sky.md) + [Отправиться в пустыню](desert/desert.md) [Пройти через джунгли](jungle/jungle.md) diff --git a/russian/travelling/sky/sky.md b/russian/travelling/sky/sky.md new file mode 100644 index 0000000000..efab57fda4 --- /dev/null +++ b/russian/travelling/sky/sky.md @@ -0,0 +1 @@ +Вы сели в небольшрй самолет, запустили двигатель и взлетели.. \ No newline at end of file diff --git a/russian/zefir.md b/russian/zefir.md index 4e40bf56b8..a95c461874 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -22,6 +22,8 @@ Вчера вы хотели только прилечь на кровать, но накопившаяся усталость дала о себе знать и вы проспали 9 часов. Наступил день и теперь вы, полностью отдохнувший, готовы осуществить то, ради чего вы все это затеяли. +Взмахнув руками, вы наконец-то начинаете полет. + Ваши действия: [Пригласить профессора Воробьева](invite-proffesor/invite-proffesor.md) From a6e541659c67a69d5ee6e14b7fc5b50391c75607 Mon Sep 17 00:00:00 2001 From: Jano Date: Sat, 20 Aug 2016 18:25:28 +0200 Subject: [PATCH 4214/5486] Add new story option. --- Polish/przygoda/jedzenie/jedzenie.md | 2 ++ Polish/przygoda/jedzenie/skrzydla/skrzydla.md | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 Polish/przygoda/jedzenie/skrzydla/skrzydla.md diff --git a/Polish/przygoda/jedzenie/jedzenie.md b/Polish/przygoda/jedzenie/jedzenie.md index 470715bfd5..947fa87919 100644 --- a/Polish/przygoda/jedzenie/jedzenie.md +++ b/Polish/przygoda/jedzenie/jedzenie.md @@ -14,3 +14,5 @@ Gdy całe ptasie mleczko jest już zjedzone, dochodzisz do oczywistych wniosków [Mam ochotę zagrać w Wiedźmina trójkę](wiedzmin/wiedzmin.md) [Chce mi się spać](spanie/spanie.md) + +[Wyrosły mi skrzydła!](skrzydla/skrzydla.md) \ No newline at end of file diff --git a/Polish/przygoda/jedzenie/skrzydla/skrzydla.md b/Polish/przygoda/jedzenie/skrzydla/skrzydla.md new file mode 100644 index 0000000000..86bf4cf851 --- /dev/null +++ b/Polish/przygoda/jedzenie/skrzydla/skrzydla.md @@ -0,0 +1,6 @@ +Nabierasz rozpdu i wyskakujesz z mieszkania przez miejsce, ktre do niedawna byo twoim oknem. +Skrzyda unosz ci w powietrzu a pod tob rozpociela si niesamowity widok. +Cae miasto zamienio si w kraine sodkoci. +Elewacja budynkw pokrywaj tabliczki czekolady, a w parku zamiast drzew rosn lizaki. +Obserwacj nagle przerywa ci donony skrzek dochodzcy od strony zachodzcego soca. +Obiekty leci wprost na ciebie. Musisz podj decyzj co dalej robi. \ No newline at end of file From 6edfcc1a674fb4eb4d64fce0df017e92bf4000a7 Mon Sep 17 00:00:00 2001 From: Gan Deng Date: Sat, 20 Aug 2016 14:33:56 -0400 Subject: [PATCH 4215/5486] Add lushan/lushan_love_story. --- Chinese/lushan/lushan_love_story.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Chinese/lushan/lushan_love_story.md diff --git a/Chinese/lushan/lushan_love_story.md b/Chinese/lushan/lushan_love_story.md new file mode 100644 index 0000000000..e7126beefe --- /dev/null +++ b/Chinese/lushan/lushan_love_story.md @@ -0,0 +1,5 @@ +中美建交后，侨居美国的国民党将军周振武的女儿周筠（张瑜 饰）回到祖国观光，在庐山游玩的途中，她巧遇有志青年耿桦（郭凯敏 饰）。 +两个对祖国怀有无限热爱且充满远大志向的青年走到一起，经过短短几天的相处，他们渐渐产生了感情。 +然而很快耿桦便因此受到审查，周筠也郁郁离开。 +十年浩劫结束后，已是清华研究生的耿桦在庐山和周筠重逢，这对相爱之人不愿再被分开， +彼此约定婚期。而当耿桦的父亲得知周筠的身世时，却对这门婚事断然拒绝…… \ No newline at end of file From bfaa8ff2b5cda3333a1cd21de9445bf93a0d8937 Mon Sep 17 00:00:00 2001 From: Gan Deng Date: Sat, 20 Aug 2016 14:37:56 -0400 Subject: [PATCH 4216/5486] Add lushan love story link. --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 6c7deed48e..a843190c06 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -137,3 +137,5 @@ [推荐美剧：Stranger Things](推荐美剧/stranger.things.md) [我的豆瓣网页](andychen/thisismydouban.md) + +[庐山恋](lushan/lushan_love_story.md) From 10a34e29d521e23ae4db101b11c33e9708e38cfb Mon Sep 17 00:00:00 2001 From: Jim Hall Date: Sat, 20 Aug 2016 18:03:15 -0400 Subject: [PATCH 4217/5486] Politics finds it way into our adventure --- english/vote-the-president/hillary/Hillary.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/vote-the-president/hillary/Hillary.md b/english/vote-the-president/hillary/Hillary.md index a7f4996349..e8e523fd46 100644 --- a/english/vote-the-president/hillary/Hillary.md +++ b/english/vote-the-president/hillary/Hillary.md @@ -1,3 +1,5 @@ Congratulations. You made another Clinton president again. 99% of Hillary voters are actually Trump haters. -You have done God's work. [#NeverTrump](https://twitter.com/hashtag/NeverTrump?src=hash) \ No newline at end of file +You have done God's work. [#NeverTrump](https://twitter.com/hashtag/NeverTrump?src=hash) + +Neither are worth a vote. Choose the lesser of two evils. Not sure that is Hillary. \ No newline at end of file From be4035f6674c33301e8175995fb874faa816c7c9 Mon Sep 17 00:00:00 2001 From: Jim Hall Date: Sat, 20 Aug 2016 18:24:39 -0400 Subject: [PATCH 4218/5486] Add pizza to your bacon --- english/order-pizza/order-pizza.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/order-pizza/order-pizza.md b/english/order-pizza/order-pizza.md index 20dfc3474e..0d6fc8ec04 100644 --- a/english/order-pizza/order-pizza.md +++ b/english/order-pizza/order-pizza.md @@ -14,3 +14,5 @@ Another option also appears a [menu](http://fongspizza.com/) for Fong's pizza. Fong's serves delicious Asian Pizza and also offers exceptional [Tiki Drinks](http://liquor.com/slideshows/10-tiki-cocktails-to-kick-off-summer/). + +Add bacon to your pizza. Bacon makes everything taste better. From 04dc57e9bffb55c7da07aebcf5988ab501abe4bb Mon Sep 17 00:00:00 2001 From: Jim Hall Date: Sat, 20 Aug 2016 18:34:07 -0400 Subject: [PATCH 4219/5486] Revert "Politics finds it way into our adventure" This reverts commit 10a34e29d521e23ae4db101b11c33e9708e38cfb. --- english/vote-the-president/hillary/Hillary.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/vote-the-president/hillary/Hillary.md b/english/vote-the-president/hillary/Hillary.md index e8e523fd46..a7f4996349 100644 --- a/english/vote-the-president/hillary/Hillary.md +++ b/english/vote-the-president/hillary/Hillary.md @@ -1,5 +1,3 @@ Congratulations. You made another Clinton president again. 99% of Hillary voters are actually Trump haters. -You have done God's work. [#NeverTrump](https://twitter.com/hashtag/NeverTrump?src=hash) - -Neither are worth a vote. Choose the lesser of two evils. Not sure that is Hillary. \ No newline at end of file +You have done God's work. [#NeverTrump](https://twitter.com/hashtag/NeverTrump?src=hash) \ No newline at end of file From e56cb886ef3b39110ab867e95a60568ffd6ae483 Mon Sep 17 00:00:00 2001 From: Gustavo Sales Date: Sat, 20 Aug 2016 20:55:38 -0300 Subject: [PATCH 4220/5486] Add some comands to solve the bug --- portugues/colaborando.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 8519acdd7d..194b737376 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -61,3 +61,5 @@ BR BR BR Hue hue hue!!!! [História com um fim muito legal] (historia/fim.md) [Corrigiria o bug fazendo o seguinte] (jc/jc.md) + +[Tiraria o bug usando: git clone, git branch, git add, git commit e git push](gus_changes/gus_changes.md) From c509505542bdf91c4d0e16862f097651677ff979 Mon Sep 17 00:00:00 2001 From: Gustavo Sales Date: Sat, 20 Aug 2016 22:42:44 -0300 Subject: [PATCH 4221/5486] Add a correction --- portugues/colaborando.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 194b737376..eec56af590 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -62,4 +62,4 @@ BR BR BR Hue hue hue!!!! [Corrigiria o bug fazendo o seguinte] (jc/jc.md) -[Tiraria o bug usando: git clone, git branch, git add, git commit e git push](gus_changes/gus_changes.md) +Tiraria o bug usando: git clone, git branch, git add, git commit e git push ou acessaria o site From e1ddcc6569c977eb5508e846766f799693a14453 Mon Sep 17 00:00:00 2001 From: Gustavo Sales Date: Sat, 20 Aug 2016 22:54:14 -0300 Subject: [PATCH 4222/5486] Correct a line --- portugues/colaborando.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index eec56af590..a147544d7f 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -62,4 +62,6 @@ BR BR BR Hue hue hue!!!! [Corrigiria o bug fazendo o seguinte] (jc/jc.md) -Tiraria o bug usando: git clone, git branch, git add, git commit e git push ou acessaria o site +Usaria: git clone, git branch, git add, git commit e git push ou acessaria o site + From f95f3e15c15f98b34ba836646c7c41de880236ef Mon Sep 17 00:00:00 2001 From: Gustavo Sales Date: Sat, 20 Aug 2016 23:02:03 -0300 Subject: [PATCH 4223/5486] Correct line V2 --- portugues/colaborando.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index a147544d7f..96086ed6f2 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -62,6 +62,6 @@ BR BR BR Hue hue hue!!!! [Corrigiria o bug fazendo o seguinte] (jc/jc.md) -Usaria: git clone, git branch, git add, git commit e git push ou acessaria o site + +Usaria: git clone, branch, add, commit e push ou o site From 0529befe8d746a351e1d42169a387989fd0659ff Mon Sep 17 00:00:00 2001 From: Gustavo Sales Date: Sat, 20 Aug 2016 23:08:38 -0300 Subject: [PATCH 4224/5486] Corretc link --- portugues/colaborando.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 96086ed6f2..95b995d81d 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -62,6 +62,4 @@ BR BR BR Hue hue hue!!!! [Corrigiria o bug fazendo o seguinte] (jc/jc.md) - -Usaria: git clone, branch, add, commit e push ou o site - +[Usaria: git clone, branch, add, commit e push] (https://www.google.com.br/) From d2e8a435dc64560da16a0c701c307861b8ef97ce Mon Sep 17 00:00:00 2001 From: evgeniykrasyuk Date: Sun, 21 Aug 2016 14:36:00 +0300 Subject: [PATCH 4225/5486] Add massage door --- russian/go-to-swim/go-to-swim.md | 6 +++++- russian/go-to-swim/massage-door/massage.md | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 russian/go-to-swim/massage-door/massage.md diff --git a/russian/go-to-swim/go-to-swim.md b/russian/go-to-swim/go-to-swim.md index 991115a78c..1f779c734d 100644 --- a/russian/go-to-swim/go-to-swim.md +++ b/russian/go-to-swim/go-to-swim.md @@ -2,4 +2,8 @@ Прекрасный бассейн, с прозрачной, слегка голубоватой водой помог Вам освежиться и взбодрил Вас. После 30 минут плавания Вы замечаете что в дальнем углу бассейна есть две двери. -Одна с надписью "Массаж", а другая "Парилка". \ No newline at end of file +Одна с надписью "Массаж", а другая "Парилка". + +[Зайти в дверь с надписью "Массаж"](massage-door/massage.md) + + diff --git a/russian/go-to-swim/massage-door/massage.md b/russian/go-to-swim/massage-door/massage.md new file mode 100644 index 0000000000..3145410751 --- /dev/null +++ b/russian/go-to-swim/massage-door/massage.md @@ -0,0 +1 @@ +Вам предлагают выбрать вид массажа: спортивный или лечебный. From 0bab4c2e1e4206e23f344fc1066941b658ddd616 Mon Sep 17 00:00:00 2001 From: Eunbi Go Date: Sun, 21 Aug 2016 20:55:06 -0700 Subject: [PATCH 4226/5486] Add restroom. --- korean/marshmallow.md | 6 ++++-- korean/restroom/restroom.md | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 korean/restroom/restroom.md diff --git a/korean/marshmallow.md b/korean/marshmallow.md index a82488c9a1..99ec9e3bac 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -36,7 +36,7 @@ [볼을 꼬집어 본다](pinch/pinch.md) -라고 고민하지만 선택하기 위해서 [요가를 한다](yoga/yoga.md) +[요가를 한다](yoga/yoga.md) [내가 나비인지 나비가 나인지 철학적인 고민을 한다](philosophy/philosophy.md) @@ -44,4 +44,6 @@ [카페 성수에 간다](cafe-sungsu/cafe-sungsu.md) -[공부를 한다](study/study.md) \ No newline at end of file +[공부를 한다](study/study.md) + +[화장실에 간다] (restroom/restroom.md) \ No newline at end of file diff --git a/korean/restroom/restroom.md b/korean/restroom/restroom.md new file mode 100644 index 0000000000..6671b1c26b --- /dev/null +++ b/korean/restroom/restroom.md @@ -0,0 +1,11 @@ +화장실에서 할 일을 다 마쳤어요. 가볍고 시원한 기분으로 무엇을 할까요? + +[국회로 간다](filibuster/filibuster.md)? + +[노래를 부른다](sing-a-song/song.md)? + +[벽으로 돌진한다](rush/rush.md)? + +[어쩔줄 모르고 그냥 운다](cry/cry.md)? + +[방을 둘러본다](look-around/look-around.md)? \ No newline at end of file From b3351570da41eafec8fce1bfcfa3f1e06d4a8735 Mon Sep 17 00:00:00 2001 From: Eunbi Go Date: Sun, 21 Aug 2016 21:09:33 -0700 Subject: [PATCH 4227/5486] Modify what I modified.... --- korean/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/korean/marshmallow.md b/korean/marshmallow.md index 99ec9e3bac..59af24fef4 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -36,7 +36,7 @@ [볼을 꼬집어 본다](pinch/pinch.md) -[요가를 한다](yoga/yoga.md) +라고 고민하지만 선택하기 위해서 [요가를 한다](yoga/yoga.md) [내가 나비인지 나비가 나인지 철학적인 고민을 한다](philosophy/philosophy.md) From ced22f245349d42261a50b41ad415e339eb8fdee Mon Sep 17 00:00:00 2001 From: Eunbi Go Date: Sun, 21 Aug 2016 21:14:21 -0700 Subject: [PATCH 4228/5486] Modify links --- korean/restroom/restroom.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/korean/restroom/restroom.md b/korean/restroom/restroom.md index 6671b1c26b..4a9ae21ef6 100644 --- a/korean/restroom/restroom.md +++ b/korean/restroom/restroom.md @@ -1,11 +1,11 @@ 화장실에서 할 일을 다 마쳤어요. 가볍고 시원한 기분으로 무엇을 할까요? -[국회로 간다](filibuster/filibuster.md)? +[국회로 간다](../filibuster/filibuster.md)? -[노래를 부른다](sing-a-song/song.md)? +[노래를 부른다](../sing-a-song/song.md)? -[벽으로 돌진한다](rush/rush.md)? +[벽으로 돌진한다](../rush/rush.md)? -[어쩔줄 모르고 그냥 운다](cry/cry.md)? +[어쩔줄 모르고 그냥 운다](../cry/cry.md)? -[방을 둘러본다](look-around/look-around.md)? \ No newline at end of file +[방을 둘러본다](../look-around/look-around.md)? \ No newline at end of file From bf1fa3ba61cca6732b031daa4094d91c4ba7dc57 Mon Sep 17 00:00:00 2001 From: Soufyane Date: Tue, 23 Aug 2016 18:28:53 +0100 Subject: [PATCH 4229/5486] Add Lazy.md --- english/lazy.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/lazy.md diff --git a/english/lazy.md b/english/lazy.md new file mode 100644 index 0000000000..c50d3d801c --- /dev/null +++ b/english/lazy.md @@ -0,0 +1 @@ +i really don't know what to say and im so lazy to write a story \ No newline at end of file From 9762e3db991613f9f46076dd841e803b7b40f4ed Mon Sep 17 00:00:00 2001 From: Soufyane Date: Tue, 23 Aug 2016 18:41:06 +0100 Subject: [PATCH 4230/5486] add link to my story --- english/{ => lazy}/lazy.md | 0 english/marshmallow.md | 2 ++ 2 files changed, 2 insertions(+) rename english/{ => lazy}/lazy.md (100%) diff --git a/english/lazy.md b/english/lazy/lazy.md similarity index 100% rename from english/lazy.md rename to english/lazy/lazy.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 72a8af6e1e..9536a1a567 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1083,3 +1083,5 @@ that one central question... will you? or will you not? You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). Click [here](https://www.youtube.com/watch?v=aboZctrHfK8) to find out what the meaning of life is. + +so lazy [here](lazy/lazy.md) \ No newline at end of file From eba8242ba981152ec36a41554bdc57425891ba3e Mon Sep 17 00:00:00 2001 From: Yu Wang Date: Wed, 24 Aug 2016 14:37:27 +0200 Subject: [PATCH 4231/5486] Add a new story on Chinese page. --- .../Breaking.Bad.md" | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 "Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/Breaking.Bad.md" diff --git "a/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/Breaking.Bad.md" "b/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/Breaking.Bad.md" new file mode 100644 index 0000000000..44b2d2e662 --- /dev/null +++ "b/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/Breaking.Bad.md" @@ -0,0 +1,2 @@ +[Breaking Bad](https://en.wikipedia.org/wiki/Breaking_Bad), 又名《绝命毒师》，剧情主要内容是讲述一位在某中学教书的天才化学家得了肺癌，并且仅有数月的存活时间，偶然的机会他接触到制造毒品(drug, meth，冰毒)可以大赚一笔钱。于是，他打算运用自己 +的化学知识制作冰毒，为自己的化疗买单，顺便为自己儿子和即将出生的女儿攒够一笔钱以支持家庭未来的生活和开支。 他找到了一个合伙人，并且有了销售渠道，然而贩毒的过程并没有想象中的那么一帆风顺。。。 \ No newline at end of file From 39f51e1ac605344508dd71d0dce2e6289bfd05de Mon Sep 17 00:00:00 2001 From: Yu Wang Date: Wed, 24 Aug 2016 14:53:36 +0200 Subject: [PATCH 4232/5486] Fix the format problem and create new directory. --- Chinese/Breaking_Bad/Breaking.Bad.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Chinese/Breaking_Bad/Breaking.Bad.md diff --git a/Chinese/Breaking_Bad/Breaking.Bad.md b/Chinese/Breaking_Bad/Breaking.Bad.md new file mode 100644 index 0000000000..33c9d4f1b8 --- /dev/null +++ b/Chinese/Breaking_Bad/Breaking.Bad.md @@ -0,0 +1,6 @@ +[Breaking Bad](https://en.wikipedia.org/wiki/Breaking_Bad), 又名《绝命毒师》， +剧情主要内容是讲述一位在某中学教书的天才化学家得了肺癌， +并且仅有数月的存活时间，偶然的机会他接触到制造毒品(drug, meth，冰毒)可以大赚一笔钱。 +于是，他打算运用自己 +的化学知识制作冰毒，为自己的化疗买单，顺便为自己儿子和即将出生的女儿攒够一笔钱以支持家庭未来的生活和开支。 +他找到了一个合伙人，并且有了销售渠道，然而贩毒的过程并没有想象中的那么一帆风顺。。。 \ No newline at end of file From f9f40e26f735f4eb620df5762a9452fd9afdb1ca Mon Sep 17 00:00:00 2001 From: Yu Wang Date: Wed, 24 Aug 2016 15:00:00 +0200 Subject: [PATCH 4233/5486] Add a new line linking to my new story. --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index a843190c06..e65c5d2081 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -136,6 +136,8 @@ [推荐美剧：Stranger Things](推荐美剧/stranger.things.md) +[推荐美剧：Breaking Bad](Breaking_Bad/Breaking.Bad.md) + [我的豆瓣网页](andychen/thisismydouban.md) [庐山恋](lushan/lushan_love_story.md) From 4138a6a218184eb989f329b7a02fdf31e4ec1f1f Mon Sep 17 00:00:00 2001 From: Yu Wang Date: Wed, 24 Aug 2016 15:10:44 +0200 Subject: [PATCH 4234/5486] Add a return link to language.md --- Chinese/Breaking_Bad/Breaking.Bad.md | 4 +++- .../Breaking.Bad.md" | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 "Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/Breaking.Bad.md" diff --git a/Chinese/Breaking_Bad/Breaking.Bad.md b/Chinese/Breaking_Bad/Breaking.Bad.md index 33c9d4f1b8..69d8c9199f 100644 --- a/Chinese/Breaking_Bad/Breaking.Bad.md +++ b/Chinese/Breaking_Bad/Breaking.Bad.md @@ -3,4 +3,6 @@ 并且仅有数月的存活时间，偶然的机会他接触到制造毒品(drug, meth，冰毒)可以大赚一笔钱。 于是，他打算运用自己 的化学知识制作冰毒，为自己的化疗买单，顺便为自己儿子和即将出生的女儿攒够一笔钱以支持家庭未来的生活和开支。 -他找到了一个合伙人，并且有了销售渠道，然而贩毒的过程并没有想象中的那么一帆风顺。。。 \ No newline at end of file +他找到了一个合伙人，并且有了销售渠道，然而贩毒的过程并没有想象中的那么一帆风顺。。。 + +[返回，Return](../../language.md) \ No newline at end of file diff --git "a/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/Breaking.Bad.md" "b/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/Breaking.Bad.md" deleted file mode 100644 index 44b2d2e662..0000000000 --- "a/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/Breaking.Bad.md" +++ /dev/null @@ -1,2 +0,0 @@ -[Breaking Bad](https://en.wikipedia.org/wiki/Breaking_Bad), 又名《绝命毒师》，剧情主要内容是讲述一位在某中学教书的天才化学家得了肺癌，并且仅有数月的存活时间，偶然的机会他接触到制造毒品(drug, meth，冰毒)可以大赚一笔钱。于是，他打算运用自己 -的化学知识制作冰毒，为自己的化疗买单，顺便为自己儿子和即将出生的女儿攒够一笔钱以支持家庭未来的生活和开支。 他找到了一个合伙人，并且有了销售渠道，然而贩毒的过程并没有想象中的那么一帆风顺。。。 \ No newline at end of file From 132e43020b926a5271ee603fe795f3beebf1b701 Mon Sep 17 00:00:00 2001 From: Yu Wang Date: Wed, 24 Aug 2016 15:14:00 +0200 Subject: [PATCH 4235/5486] Breaking lines into more lines --- Chinese/Breaking_Bad/Breaking.Bad.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Chinese/Breaking_Bad/Breaking.Bad.md b/Chinese/Breaking_Bad/Breaking.Bad.md index 69d8c9199f..57513337b3 100644 --- a/Chinese/Breaking_Bad/Breaking.Bad.md +++ b/Chinese/Breaking_Bad/Breaking.Bad.md @@ -1,8 +1,15 @@ -[Breaking Bad](https://en.wikipedia.org/wiki/Breaking_Bad), 又名《绝命毒师》， +[Breaking Bad](https://en.wikipedia.org/wiki/Breaking_Bad), +又名《绝命毒师》， 剧情主要内容是讲述一位在某中学教书的天才化学家得了肺癌， -并且仅有数月的存活时间，偶然的机会他接触到制造毒品(drug, meth，冰毒)可以大赚一笔钱。 +并且仅有数月的存活时间， +偶然的机会他接触到制造毒品(drug, meth，冰毒) +可以大赚一笔钱。 于是，他打算运用自己 -的化学知识制作冰毒，为自己的化疗买单，顺便为自己儿子和即将出生的女儿攒够一笔钱以支持家庭未来的生活和开支。 -他找到了一个合伙人，并且有了销售渠道，然而贩毒的过程并没有想象中的那么一帆风顺。。。 +的化学知识制作冰毒， +为自己的化疗买单， +顺便为自己儿子和即将出生的女儿攒够一笔钱 +以支持家庭未来的生活和开支。 +他找到了一个合伙人，并且有了销售渠道， +然而贩毒的过程并没有想象中的那么一帆风顺。。。 [返回，Return](../../language.md) \ No newline at end of file From ba95872a20cc46fab3952a048e66079e461a42f9 Mon Sep 17 00:00:00 2001 From: chenglong zhang Date: Wed, 24 Aug 2016 12:19:54 -0400 Subject: [PATCH 4236/5486] Update the right option with the new story, you can continue add lines to that. --- english/eat-rainbows/right/hand-wash.md | 1 + english/eat-rainbows/right/right.md | 12 +++++++++++- english/eat-rainbows/right/soap.md | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 english/eat-rainbows/right/hand-wash.md create mode 100644 english/eat-rainbows/right/soap.md diff --git a/english/eat-rainbows/right/hand-wash.md b/english/eat-rainbows/right/hand-wash.md new file mode 100644 index 0000000000..00184246db --- /dev/null +++ b/english/eat-rainbows/right/hand-wash.md @@ -0,0 +1 @@ +OMG. Your hands started to hurt, but most of the stains were still on your cloth. diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md index 25ce7355d1..977cce6506 100644 --- a/english/eat-rainbows/right/right.md +++ b/english/eat-rainbows/right/right.md @@ -2,4 +2,14 @@ You turned right and slammed into another customer carrying a birthday cake. Ughh, cake from Safeway with lard icing! -Worst. Day. Ever. \ No newline at end of file +Worst. Day. Ever. + +Then you went directly to the bathroom trying to wash off the stains, however, +you hesitate whether you should use the soap or only hand-wash with tap water. + + + +[Soap](right/soap.md) + + +[hand-wash](right/hand-wash.md) diff --git a/english/eat-rainbows/right/soap.md b/english/eat-rainbows/right/soap.md new file mode 100644 index 0000000000..94d560e4c2 --- /dev/null +++ b/english/eat-rainbows/right/soap.md @@ -0,0 +1,2 @@ +oops! After used the soap, most of the stains have been washed. Only small parts +of stains remained. From ce1ed3e329bce1c561821aa4ccf0967fbab9bf5c Mon Sep 17 00:00:00 2001 From: chenglong zhang Date: Wed, 24 Aug 2016 12:48:02 -0400 Subject: [PATCH 4237/5486] Fix the new line issue. --- english/eat-rainbows/right/right.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md index 977cce6506..c410b47e5f 100644 --- a/english/eat-rainbows/right/right.md +++ b/english/eat-rainbows/right/right.md @@ -2,9 +2,7 @@ You turned right and slammed into another customer carrying a birthday cake. Ughh, cake from Safeway with lard icing! -Worst. Day. Ever. - -Then you went directly to the bathroom trying to wash off the stains, however, +Worst. Day. Ever.Then you went directly to the bathroom trying to wash off the stains, however, you hesitate whether you should use the soap or only hand-wash with tap water. From e4b244f26c66f12c01f4b9e6ebb1bf91f02b00e6 Mon Sep 17 00:00:00 2001 From: chenglong zhang Date: Wed, 24 Aug 2016 12:57:35 -0400 Subject: [PATCH 4238/5486] Add a line in right.md. --- english/eat-rainbows/right/right.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md index c410b47e5f..17a62df775 100644 --- a/english/eat-rainbows/right/right.md +++ b/english/eat-rainbows/right/right.md @@ -3,7 +3,7 @@ You turned right and slammed into another customer carrying a birthday cake. Ughh, cake from Safeway with lard icing! Worst. Day. Ever.Then you went directly to the bathroom trying to wash off the stains, however, -you hesitate whether you should use the soap or only hand-wash with tap water. +you hesitate whether you should use the soap or only hand-wash with tap water. What will you choose? From 0112621cc3c3af2a10d3ce004e8b2e4931fde531 Mon Sep 17 00:00:00 2001 From: chenglong zhang Date: Wed, 24 Aug 2016 13:04:47 -0400 Subject: [PATCH 4239/5486] Re-organize the directory. --- english/eat-rainbows/right/{ => hand-wash}/hand-wash.md | 0 english/eat-rainbows/right/right.md | 8 +++++--- english/eat-rainbows/right/{ => soap}/soap.md | 0 3 files changed, 5 insertions(+), 3 deletions(-) rename english/eat-rainbows/right/{ => hand-wash}/hand-wash.md (100%) rename english/eat-rainbows/right/{ => soap}/soap.md (100%) diff --git a/english/eat-rainbows/right/hand-wash.md b/english/eat-rainbows/right/hand-wash/hand-wash.md similarity index 100% rename from english/eat-rainbows/right/hand-wash.md rename to english/eat-rainbows/right/hand-wash/hand-wash.md diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md index 17a62df775..c31d481085 100644 --- a/english/eat-rainbows/right/right.md +++ b/english/eat-rainbows/right/right.md @@ -2,12 +2,14 @@ You turned right and slammed into another customer carrying a birthday cake. Ughh, cake from Safeway with lard icing! -Worst. Day. Ever.Then you went directly to the bathroom trying to wash off the stains, however, +Worst. Day. Ever. +Then you went directly to the bathroom trying to wash off the stains, however, you hesitate whether you should use the soap or only hand-wash with tap water. What will you choose? -[Soap](right/soap.md) +[Soap](right/soap/soap.md) -[hand-wash](right/hand-wash.md) + +[hand-wash](right/hand-wash/hand-wash.md) diff --git a/english/eat-rainbows/right/soap.md b/english/eat-rainbows/right/soap/soap.md similarity index 100% rename from english/eat-rainbows/right/soap.md rename to english/eat-rainbows/right/soap/soap.md From a213a356f295ffc2a02647a7bd37cb2b67217102 Mon Sep 17 00:00:00 2001 From: chenglong zhang Date: Wed, 24 Aug 2016 13:15:29 -0400 Subject: [PATCH 4240/5486] Directory issue fix. --- english/eat-rainbows/right/right.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md index c31d481085..45de07303f 100644 --- a/english/eat-rainbows/right/right.md +++ b/english/eat-rainbows/right/right.md @@ -9,7 +9,7 @@ you hesitate whether you should use the soap or only hand-wash with tap water. W -[Soap](right/soap/soap.md) +[Soap](english/eat-rainbows/soap/soap.md) -[hand-wash](right/hand-wash/hand-wash.md) +[hand-wash](english/eat-rainbows/hand-wash/hand-wash.md) From c3cbf6f93b484939aad140471d5a131c9ba9fe05 Mon Sep 17 00:00:00 2001 From: chenglong zhang Date: Wed, 24 Aug 2016 13:27:29 -0400 Subject: [PATCH 4241/5486] fix try 1 --- english/eat-rainbows/right/right.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md index 45de07303f..81b6888bcb 100644 --- a/english/eat-rainbows/right/right.md +++ b/english/eat-rainbows/right/right.md @@ -9,7 +9,7 @@ you hesitate whether you should use the soap or only hand-wash with tap water. W -[Soap](english/eat-rainbows/soap/soap.md) +[Soap](../english/eat-rainbows/soap/soap.md) -[hand-wash](english/eat-rainbows/hand-wash/hand-wash.md) +[hand-wash](../english/eat-rainbows/hand-wash/hand-wash.md) From 7686c5323703ef0effc516572dbc82c7e0753d5f Mon Sep 17 00:00:00 2001 From: chenglong zhang Date: Wed, 24 Aug 2016 13:37:08 -0400 Subject: [PATCH 4242/5486] fix try 2 --- english/eat-rainbows/right/hand-wash/hand-wash.md | 1 - english/eat-rainbows/right/right.md | 2 +- english/eat-rainbows/right/soap/soap.md | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 english/eat-rainbows/right/hand-wash/hand-wash.md delete mode 100644 english/eat-rainbows/right/soap/soap.md diff --git a/english/eat-rainbows/right/hand-wash/hand-wash.md b/english/eat-rainbows/right/hand-wash/hand-wash.md deleted file mode 100644 index 00184246db..0000000000 --- a/english/eat-rainbows/right/hand-wash/hand-wash.md +++ /dev/null @@ -1 +0,0 @@ -OMG. Your hands started to hurt, but most of the stains were still on your cloth. diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md index 81b6888bcb..905e725d6e 100644 --- a/english/eat-rainbows/right/right.md +++ b/english/eat-rainbows/right/right.md @@ -12,4 +12,4 @@ you hesitate whether you should use the soap or only hand-wash with tap water. W [Soap](../english/eat-rainbows/soap/soap.md) -[hand-wash](../english/eat-rainbows/hand-wash/hand-wash.md) +[Hand-wash](../english/eat-rainbows/hand-wash/hand-wash.md) diff --git a/english/eat-rainbows/right/soap/soap.md b/english/eat-rainbows/right/soap/soap.md deleted file mode 100644 index 94d560e4c2..0000000000 --- a/english/eat-rainbows/right/soap/soap.md +++ /dev/null @@ -1,2 +0,0 @@ -oops! After used the soap, most of the stains have been washed. Only small parts -of stains remained. From 4241cb5da72c0c3092f11554bf4f189ec29510b3 Mon Sep 17 00:00:00 2001 From: chenglong zhang Date: Wed, 24 Aug 2016 13:50:59 -0400 Subject: [PATCH 4243/5486] fix try 3 --- english/eat-rainbows/right/right.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md index 905e725d6e..a98c22841a 100644 --- a/english/eat-rainbows/right/right.md +++ b/english/eat-rainbows/right/right.md @@ -9,7 +9,7 @@ you hesitate whether you should use the soap or only hand-wash with tap water. W -[Soap](../english/eat-rainbows/soap/soap.md) +[Soap](create-your-own-adventure/english/eat-rainbows/soap/soap.md) -[Hand-wash](../english/eat-rainbows/hand-wash/hand-wash.md) +[Hand-wash](create-your-own-adventure/english/eat-rainbows/hand-wash/hand-wash.md) From ca9bb739c26e87484d9e2469612c6428ebee19b2 Mon Sep 17 00:00:00 2001 From: chenglong zhang Date: Wed, 24 Aug 2016 13:58:24 -0400 Subject: [PATCH 4244/5486] fix try 4 --- english/eat-rainbows/right/right.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/english/eat-rainbows/right/right.md b/english/eat-rainbows/right/right.md index a98c22841a..8776d30d8c 100644 --- a/english/eat-rainbows/right/right.md +++ b/english/eat-rainbows/right/right.md @@ -6,10 +6,7 @@ Worst. Day. Ever. Then you went directly to the bathroom trying to wash off the stains, however, you hesitate whether you should use the soap or only hand-wash with tap water. What will you choose? +[Soap](soap/soap.md) - -[Soap](create-your-own-adventure/english/eat-rainbows/soap/soap.md) - - -[Hand-wash](create-your-own-adventure/english/eat-rainbows/hand-wash/hand-wash.md) +[Hand-wash](hand-wash/hand-wash.md) From 8de0da23da0c260bf8f50b6354c10022e751e079 Mon Sep 17 00:00:00 2001 From: chenglong zhang Date: Wed, 24 Aug 2016 14:04:04 -0400 Subject: [PATCH 4245/5486] Add files via upload --- english/eat-rainbows/right/hand-wash/hand-wash.md | 1 + english/eat-rainbows/right/soap/soap.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/eat-rainbows/right/hand-wash/hand-wash.md create mode 100644 english/eat-rainbows/right/soap/soap.md diff --git a/english/eat-rainbows/right/hand-wash/hand-wash.md b/english/eat-rainbows/right/hand-wash/hand-wash.md new file mode 100644 index 0000000000..4e763c159a --- /dev/null +++ b/english/eat-rainbows/right/hand-wash/hand-wash.md @@ -0,0 +1 @@ +OMG. Your hands started to hurt, but most of the stains were still on your cloth. diff --git a/english/eat-rainbows/right/soap/soap.md b/english/eat-rainbows/right/soap/soap.md new file mode 100644 index 0000000000..2895496c50 --- /dev/null +++ b/english/eat-rainbows/right/soap/soap.md @@ -0,0 +1,2 @@ +oops! After used the soap, most of the stains have been washed. Only small parts +of stains remained. From 34e43956529a1f9b62ac5ed6b79b25e2895774d9 Mon Sep 17 00:00:00 2001 From: Ruben Date: Wed, 24 Aug 2016 23:10:06 +0500 Subject: [PATCH 4246/5486] Aclara que Zipi es el rubio --- espanol/canudos.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 753a4a06c8..bcc022baaf 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -1,8 +1,9 @@ -En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la +En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: Hizo llamar a [Zipi y Zape](zipizape/zipizape.md) para recibir al ejército. +(Zipi es el rubio) Hizo un gesto de [cansancio](cansancio/cansancio.md) From bca5f102ffb7b2d336a031ffc018b5435dadc4aa Mon Sep 17 00:00:00 2001 From: Ruben Date: Wed, 24 Aug 2016 23:24:10 +0500 Subject: [PATCH 4247/5486] cambios tontos --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index bcc022baaf..dfd2c278bc 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -1,4 +1,4 @@ -En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la +En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del imperio y la república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: From 358fbe5d4ab61ed834b576725452cb8ceba42b9d Mon Sep 17 00:00:00 2001 From: israel meza Date: Wed, 24 Aug 2016 16:10:20 -0400 Subject: [PATCH 4248/5486] Add line to pokemon-go.md --- english/pokemon-go/pokemon-go.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/pokemon-go/pokemon-go.md b/english/pokemon-go/pokemon-go.md index 683d221b33..28151795d6 100644 --- a/english/pokemon-go/pokemon-go.md +++ b/english/pokemon-go/pokemon-go.md @@ -4,3 +4,6 @@ the world in search of Pokemon! One night, after quitting your job, you are dreaming of [Marshmallows](../pikachu/pokeball.md) + +After all your travels you only managed to catch Ratata. It turns out the rarest +Pokemon where in your city all along. From 642586ec7940115cbb54f17b003832c7043fbed9 Mon Sep 17 00:00:00 2001 From: Paul W Roberson Date: Wed, 24 Aug 2016 15:29:56 -0500 Subject: [PATCH 4249/5486] add description of grue stench --- english/grue/grue.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/grue/grue.md b/english/grue/grue.md index 78b22ebf1d..621c54ce78 100644 --- a/english/grue/grue.md +++ b/english/grue/grue.md @@ -2,3 +2,5 @@ The grue is a sinister, lurking presence in the dark places of the earth. Its favorite diet is adventurers, but its insatiable appetite is tempered by its fear of light. No grue has ever been seen by the light of day, and few have survived its fearsome jaws to tell the tale. + +A grue also smells repulsive. From 555da247de56ef94880d7879240d706a96f085e6 Mon Sep 17 00:00:00 2001 From: kbammarito Date: Wed, 24 Aug 2016 16:30:54 -0400 Subject: [PATCH 4250/5486] add: inception --- english/inception/inception.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/inception/inception.md diff --git a/english/inception/inception.md b/english/inception/inception.md new file mode 100644 index 0000000000..3430a5039d --- /dev/null +++ b/english/inception/inception.md @@ -0,0 +1 @@ +Did you already make your totem? If not, you'd better hurry! \ No newline at end of file From 7105abad59a1c904fde8bdbad9b4af57dc5f66d5 Mon Sep 17 00:00:00 2001 From: kbammarito Date: Wed, 24 Aug 2016 16:31:36 -0400 Subject: [PATCH 4251/5486] update: marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 9536a1a567..510aa5a98c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -166,6 +166,8 @@ Or is this just [fantasy](https://www.youtube.com/watch?v=fJ9rUzIMcZQ)? Maybe it's a dream within a dream? Maybe dreaming and reality are one and the same. Maybe reality is an oxymoron when considering multiple dimensions. +Maybe you're in [Inception](inception/inception.md). + But it's probably not worth dwelling on that right now, you could be in danger. Grave danger. Oh No! From 3b81ed0265953d524500186b19a60e5a23abb210 Mon Sep 17 00:00:00 2001 From: Richard Yee Date: Wed, 24 Aug 2016 15:31:27 -0700 Subject: [PATCH 4252/5486] docs: updated impossible-adventure/start.md Added a youtube link in reference to a phrase said by a character from the video game Diablo --- english/impossible-adventure/start/start.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/impossible-adventure/start/start.md b/english/impossible-adventure/start/start.md index a388b56fdd..9021dd3723 100644 --- a/english/impossible-adventure/start/start.md +++ b/english/impossible-adventure/start/start.md @@ -1,5 +1,7 @@ +[...and listen...!](https://www.youtube.com/watch?v=tAVVy_x3Erg) + [STAY FOREVER!](https://youtu.be/i1_fDwX1VVY) [BWEEEEEEEEEEEEEUW](../tapbwe/tapbwe.md) -[...tap tap tap tap tap tap...](../bloop/bloop.md) \ No newline at end of file +[...tap tap tap tap tap tap...](../bloop/bloop.md) From 5c7292d1cdccc5ce579e7a37ec05de31f08548dd Mon Sep 17 00:00:00 2001 From: Richard Yee Date: Wed, 24 Aug 2016 15:35:21 -0700 Subject: [PATCH 4253/5486] docs: Updated run_out_the_dor.md Removed a repeating line in the start of the doc. --- english/run_out_the_door/run_out_the_door.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md index 5fa456515d..56ee49d7bf 100644 --- a/english/run_out_the_door/run_out_the_door.md +++ b/english/run_out_the_door/run_out_the_door.md @@ -1,5 +1,3 @@ -You immediately jump up and run out the nearest exit! - You immediately jump up and run out the nearest [exit](../new-exit/new-exit.md)! You find that a mysterious pool has formed right outside the door and with a splash From 01d9c7dce4719f7b98baf861a0f7dfda3c9a9ca8 Mon Sep 17 00:00:00 2001 From: Richard Yee Date: Wed, 24 Aug 2016 15:39:17 -0700 Subject: [PATCH 4254/5486] docs: Updated new-exit/new-exit.md and Added glimmering-portal/glimmering-portal.md Added a new link in new-exit.md that leads to glimmering-portal.md --- english/glimmering-portal/glimmering-portal.md | 1 + english/new-exit/new-exit.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 english/glimmering-portal/glimmering-portal.md diff --git a/english/glimmering-portal/glimmering-portal.md b/english/glimmering-portal/glimmering-portal.md new file mode 100644 index 0000000000..92d8d3579a --- /dev/null +++ b/english/glimmering-portal/glimmering-portal.md @@ -0,0 +1 @@ +You look around and see lava, fire, and brimstone! Oh no, what will you do now?! diff --git a/english/new-exit/new-exit.md b/english/new-exit/new-exit.md index 9aeb869fcb..41b8934562 100644 --- a/english/new-exit/new-exit.md +++ b/english/new-exit/new-exit.md @@ -1,4 +1,5 @@ From this exit, you found an entire new world full of mysteries. All the exits from original world to this world are closed and there is only one way to open it. -Explore more to find a way to open it. \ No newline at end of file + +[You walk through the glimmering portal...](../glimmering-portal/glimmering-portal.md) From 08f48be31cc6eaefc18c63f72483dce83c4e0662 Mon Sep 17 00:00:00 2001 From: Richard Yee Date: Wed, 24 Aug 2016 15:44:16 -0700 Subject: [PATCH 4255/5486] docs: Updated run_out_the_door.md Added previous line typo that I deleted due to the pull request bot not accepting changes that delete or modify a line. --- english/run_out_the_door/run_out_the_door.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md index 56ee49d7bf..5fa456515d 100644 --- a/english/run_out_the_door/run_out_the_door.md +++ b/english/run_out_the_door/run_out_the_door.md @@ -1,3 +1,5 @@ +You immediately jump up and run out the nearest exit! + You immediately jump up and run out the nearest [exit](../new-exit/new-exit.md)! You find that a mysterious pool has formed right outside the door and with a splash From 871ad210a2530bccf255f47307a123d6cd5a4f7e Mon Sep 17 00:00:00 2001 From: Richard Yee Date: Wed, 24 Aug 2016 15:46:29 -0700 Subject: [PATCH 4256/5486] docs: Updated new_exit.md Added previous line typo that I modified due to the pull request bot not accepting changes that delete or modify a line. --- english/new-exit/new-exit.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/new-exit/new-exit.md b/english/new-exit/new-exit.md index 41b8934562..39559ce79c 100644 --- a/english/new-exit/new-exit.md +++ b/english/new-exit/new-exit.md @@ -1,5 +1,6 @@ From this exit, you found an entire new world full of mysteries. All the exits from original world to this world are closed and there is only one way to open it. +Explore more to find a way to open it. [You walk through the glimmering portal...](../glimmering-portal/glimmering-portal.md) From 9118cf5e8a601311044879ccf54ab2ad74ae217b Mon Sep 17 00:00:00 2001 From: Sergei Zhavoronkov Date: Thu, 25 Aug 2016 07:56:15 +0800 Subject: [PATCH 4257/5486] docs: added new story to building-dep/tv/change-channel/ --- russian/buildings-dep/tv/change-channel/change-channel.md | 4 +++- .../looking-at-the-mirror/looking-at-the-mirror.md | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 russian/buildings-dep/tv/change-channel/looking-at-the-mirror/looking-at-the-mirror.md diff --git a/russian/buildings-dep/tv/change-channel/change-channel.md b/russian/buildings-dep/tv/change-channel/change-channel.md index 1db4fc75d1..1d61c3d2d4 100644 --- a/russian/buildings-dep/tv/change-channel/change-channel.md +++ b/russian/buildings-dep/tv/change-channel/change-channel.md @@ -1,2 +1,4 @@ Следующий канал - MTV - крутят клип с танцующими зефиринками. Мелодия вам знакома, хотя клип вы видите впервые. -Невольно начинаете подпевать. +Невольно начинаете подпевать. И тут вы чувствуете, что что-то с вами не так. Вы решаете подойти к зеркалу. + +[Вы подходите к зеркалу](looking-at-the-mirror/looking-at-the-mirror.md) diff --git a/russian/buildings-dep/tv/change-channel/looking-at-the-mirror/looking-at-the-mirror.md b/russian/buildings-dep/tv/change-channel/looking-at-the-mirror/looking-at-the-mirror.md new file mode 100644 index 0000000000..8a2475345e --- /dev/null +++ b/russian/buildings-dep/tv/change-channel/looking-at-the-mirror/looking-at-the-mirror.md @@ -0,0 +1,4 @@ +В зеркале на вас смотрит ЗЕФИРКА!!! ПАНИКА!!! Что же теперь делать думаете вы? Надо найти способ превратиться +обратно в человека. + + From da7e7f19fdbb3dcfe26936843d11abf0814f325b Mon Sep 17 00:00:00 2001 From: Sergei Zhavoronkov Date: Thu, 25 Aug 2016 08:05:04 +0800 Subject: [PATCH 4258/5486] fix: fixed story to new line --- russian/buildings-dep/tv/change-channel/change-channel.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/buildings-dep/tv/change-channel/change-channel.md b/russian/buildings-dep/tv/change-channel/change-channel.md index 1d61c3d2d4..07c7cb8d25 100644 --- a/russian/buildings-dep/tv/change-channel/change-channel.md +++ b/russian/buildings-dep/tv/change-channel/change-channel.md @@ -1,4 +1,5 @@ Следующий канал - MTV - крутят клип с танцующими зефиринками. Мелодия вам знакома, хотя клип вы видите впервые. -Невольно начинаете подпевать. И тут вы чувствуете, что что-то с вами не так. Вы решаете подойти к зеркалу. +Невольно начинаете подпевать. +И тут вы чувствуете, что что-то с вами не так. Вы решаете подойти к зеркалу. [Вы подходите к зеркалу](looking-at-the-mirror/looking-at-the-mirror.md) From 760b9a32753c917e07ab1aeab0ca7fa6bebd34c5 Mon Sep 17 00:00:00 2001 From: Sergei Zhavoronkov Date: Thu, 25 Aug 2016 08:13:24 +0800 Subject: [PATCH 4259/5486] fix: added space in the end of the line. --- russian/buildings-dep/tv/change-channel/change-channel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/buildings-dep/tv/change-channel/change-channel.md b/russian/buildings-dep/tv/change-channel/change-channel.md index 07c7cb8d25..171c0e7a3d 100644 --- a/russian/buildings-dep/tv/change-channel/change-channel.md +++ b/russian/buildings-dep/tv/change-channel/change-channel.md @@ -1,5 +1,5 @@ Следующий канал - MTV - крутят клип с танцующими зефиринками. Мелодия вам знакома, хотя клип вы видите впервые. -Невольно начинаете подпевать. +Невольно начинаете подпевать. И тут вы чувствуете, что что-то с вами не так. Вы решаете подойти к зеркалу. [Вы подходите к зеркалу](looking-at-the-mirror/looking-at-the-mirror.md) From 424c755a321842b81feb35e7d1fc72b6740cd554 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 25 Aug 2016 11:10:50 +0900 Subject: [PATCH 4260/5486] Add instagram story --- korean/instagram/insta.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 korean/instagram/insta.md diff --git a/korean/instagram/insta.md b/korean/instagram/insta.md new file mode 100644 index 0000000000..6c038eddde --- /dev/null +++ b/korean/instagram/insta.md @@ -0,0 +1,14 @@ +인스타그램에 인증샷을 올린다. 하트 숫자가 늘어나는 것을 보고 기분이 좋아졌다. + +이제 어떻게 할까요? + +[벽을 먹는다](eating-walls/eating-marshmallows.md)? + +[다시 잔다](sleep/marshmallow.md)? + +[노래를 부른다](sing-a-song/song.md)? + +[마쉬멜로라면 핫초코지~! 핫초코를 사러 나간다.](coco/coco.md) + +[카페 성수에 간다](cafe-sungsu/cafe-sungsu.md) + From ee4607fdfb13610c2662635a982453edea4e84f3 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 25 Aug 2016 11:16:02 +0900 Subject: [PATCH 4261/5486] Fix broken links and add a link to my page on marshmallow.md --- korean/instagram/insta.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/korean/instagram/insta.md b/korean/instagram/insta.md index 6c038eddde..c17b1f4e16 100644 --- a/korean/instagram/insta.md +++ b/korean/instagram/insta.md @@ -2,13 +2,13 @@ 이제 어떻게 할까요? -[벽을 먹는다](eating-walls/eating-marshmallows.md)? +[벽을 먹는다](../eating-walls/eating-marshmallows.md)? -[다시 잔다](sleep/marshmallow.md)? +[다시 잔다](../sleep/marshmallow.md)? -[노래를 부른다](sing-a-song/song.md)? +[노래를 부른다](../sing-a-song/song.md)? -[마쉬멜로라면 핫초코지~! 핫초코를 사러 나간다.](coco/coco.md) +[마쉬멜로라면 핫초코지~! 핫초코를 사러 나간다.](../coco/coco.md) -[카페 성수에 간다](cafe-sungsu/cafe-sungsu.md) +[카페 성수에 간다](../cafe-sungsu/cafe-sungsu.md) From 5dc7e7ec9937b1958c8b87c74d8072cd50e28680 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 25 Aug 2016 11:22:23 +0900 Subject: [PATCH 4262/5486] Fix the link so that my page is reachable from marshmallow.md --- korean/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/korean/marshmallow.md b/korean/marshmallow.md index 59af24fef4..f6d3ab1740 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -46,4 +46,6 @@ [공부를 한다](study/study.md) -[화장실에 간다] (restroom/restroom.md) \ No newline at end of file +[화장실에 간다] (restroom/restroom.md) + +[인스타그램에 인증샷을 올린다] (instagram/insta.md) From 8aef29c7ea717681c835dbe593d6df1c86378fa6 Mon Sep 17 00:00:00 2001 From: Harish Narain Date: Fri, 26 Aug 2016 01:04:15 +1000 Subject: [PATCH 4263/5486] Added my walrus section --- english/marshmallow.md | 4 +++- english/walrus/walrus.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/walrus/walrus.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 510aa5a98c..e55b147a72 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1086,4 +1086,6 @@ You take the time to contemplate the [nature of identity](nature-of-identity/nat Click [here](https://www.youtube.com/watch?v=aboZctrHfK8) to find out what the meaning of life is. -so lazy [here](lazy/lazy.md) \ No newline at end of file +so lazy [here](lazy/lazy.md) + +Click [here](walrus/walrus.md) \ No newline at end of file diff --git a/english/walrus/walrus.md b/english/walrus/walrus.md new file mode 100644 index 0000000000..0c01a05c41 --- /dev/null +++ b/english/walrus/walrus.md @@ -0,0 +1 @@ +I am the egg man...wooo...I am the egg man...woooo.....I am the walrus...cuckoocachoo! \ No newline at end of file From 18faa8aa67fe0b5a6dc86c80d2d8ee2868e973ce Mon Sep 17 00:00:00 2001 From: Richard Yee Date: Thu, 25 Aug 2016 13:10:37 -0700 Subject: [PATCH 4264/5486] docs: Updated forest/drag/drag.md with a new link to roaming_spirit.md --- english/forest/drag/stay/stay.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/forest/drag/stay/stay.md b/english/forest/drag/stay/stay.md index e2e07ae609..4457138942 100644 --- a/english/forest/drag/stay/stay.md +++ b/english/forest/drag/stay/stay.md @@ -1,3 +1,5 @@ The light slowly starts to dim until it disappears entirely. You realize you are standing next to your corpse. You are set -to roam the earth as a spirit for eternity. \ No newline at end of file +to roam the earth as a spirit for eternity. + +[Roaming Spirit...](../roaming_spirit/roaming_spirit.md) From 435478f4213cd2050c0224f28a93ede9564459a0 Mon Sep 17 00:00:00 2001 From: Richard Yee Date: Thu, 25 Aug 2016 13:14:15 -0700 Subject: [PATCH 4265/5486] docs: Added roaming_spirit.md story --- english/forest/drag/roaming_spirit/roaming_spirit.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/forest/drag/roaming_spirit/roaming_spirit.md diff --git a/english/forest/drag/roaming_spirit/roaming_spirit.md b/english/forest/drag/roaming_spirit/roaming_spirit.md new file mode 100644 index 0000000000..fd345c0e04 --- /dev/null +++ b/english/forest/drag/roaming_spirit/roaming_spirit.md @@ -0,0 +1,3 @@ +You wander around the forest and notice your new perceptions. The world seems livelier and full of colors and sounds. + +You see a man ahead of you, a spirit just like yourself. From 109d878f237fcd6ed0bf0e72eb0c6e203cd902f5 Mon Sep 17 00:00:00 2001 From: Egarat Kaoroprat Date: Thu, 25 Aug 2016 22:38:35 +0200 Subject: [PATCH 4266/5486] Add option --- german/Korallen/Hoehle/Unterwasserstation/Person/Person.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md index fab9901bef..4fe2f183ba 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md +++ b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md @@ -6,3 +6,5 @@ Er drückt Ihnen einen Stein in die Hand und sagt "Hier mein Junge, bring das in [Ihnen ist das alles nicht mehr Geheuer in dieser Hoehle, mit dem Stein in der Hand springen Sie wieder ins Wasser und schwimmen aus der Höhle](../../../Korallen.md) + +[Dann wachen Sie ploetzlich auf und bemerken, dass Sie ein Franzose/eine Französin sind.](../../../../../french/feu-de-camp.md) \ No newline at end of file From d76b5da1cf9c6fa819965b7d5fbefa358762db90 Mon Sep 17 00:00:00 2001 From: Egarat Date: Thu, 25 Aug 2016 22:42:02 +0200 Subject: [PATCH 4267/5486] Reduce line length --- german/Korallen/Hoehle/Unterwasserstation/Person/Person.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md index 4fe2f183ba..90ac88af07 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md +++ b/german/Korallen/Hoehle/Unterwasserstation/Person/Person.md @@ -7,4 +7,5 @@ Er drückt Ihnen einen Stein in die Hand und sagt "Hier mein Junge, bring das in [Ihnen ist das alles nicht mehr Geheuer in dieser Hoehle, mit dem Stein in der Hand springen Sie wieder ins Wasser und schwimmen aus der Höhle](../../../Korallen.md) -[Dann wachen Sie ploetzlich auf und bemerken, dass Sie ein Franzose/eine Französin sind.](../../../../../french/feu-de-camp.md) \ No newline at end of file +[Dann wachen Sie ploetzlich auf und bemerken, +dass Sie ein Franzose/eine Französin sind.](../../../../../french/feu-de-camp.md) From f0b3cbef9e9121debf2a441c097e97f42dc5aaf3 Mon Sep 17 00:00:00 2001 From: awbrown90 Date: Thu, 25 Aug 2016 17:16:43 -0600 Subject: [PATCH 4268/5486] feat: adding new path to story Adding a section in bored that allows you to study Japanese and then go to Japan where you will then need to use that Japanese. --- english/bored/bored.md | 2 ++ english/learn_japanese/japanese.md | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 english/learn_japanese/japanese.md diff --git a/english/bored/bored.md b/english/bored/bored.md index aa32b6e00d..a54c5584a1 100644 --- a/english/bored/bored.md +++ b/english/bored/bored.md @@ -10,4 +10,6 @@ "Or maybe [escape to the wilderness](../escape-to-the-wilderness/wilderness.md)?" +"You could always start [learning Japanese](../learn_japanese/japanese.md)?" + ["Maybe I should go to a jazz club?"](../jazz-guitar/jazz.md) diff --git a/english/learn_japanese/japanese.md b/english/learn_japanese/japanese.md new file mode 100644 index 0000000000..86c758b809 --- /dev/null +++ b/english/learn_japanese/japanese.md @@ -0,0 +1,7 @@ +You start digesting the Japanese language any way you can, studying books, watching movies, and +making Japanese friends. You decide that you enjoy studying Japanese so much that you keep at it for +years just to see how far you can go with it. Your boredom has faded years later and now all of +a sudden you find your self in Japan and hear a woman in Japanese say help, its time to put your +Japanese to the test and see what you can do. + +[help the woman in Japanese](../../japanese/cold/cold.md) From e3370a5e6f6a335ed4421525463b45ba38882373 Mon Sep 17 00:00:00 2001 From: Boris Krasnopevtsev Date: Fri, 26 Aug 2016 03:01:25 +0300 Subject: [PATCH 4269/5486] Add update to Android Marshmallow 6.0 --- english/android/marshmallow6.0.md | 8 ++++++++ english/marshmallow.md | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 english/android/marshmallow6.0.md diff --git a/english/android/marshmallow6.0.md b/english/android/marshmallow6.0.md new file mode 100644 index 0000000000..027a75d966 --- /dev/null +++ b/english/android/marshmallow6.0.md @@ -0,0 +1,8 @@ +You are on the right way, son! + +Check the updates for your smartphone now! + +There are two options here: + +1. You have an update, and won't read this further; +2. You are unlucky one, and you better [choose another path](../marshmallow.md); \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index e55b147a72..af0fed9f94 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -Once upon a time many authors collaborated to make meaningless linked story. +Once upon a time many authors collaborated to make meaningless linked story. NGE is [here] (NGE/NGE.md) @@ -1088,4 +1088,6 @@ Click [here](https://www.youtube.com/watch?v=aboZctrHfK8) to find out what the m so lazy [here](lazy/lazy.md) -Click [here](walrus/walrus.md) \ No newline at end of file +Click [here](walrus/walrus.md) + +[Update](android/marshmallow6.0.md) your Smartphone to the Marshmallow 6.0! \ No newline at end of file From 50e891b2d498fc204bfdada466538046dfc9d316 Mon Sep 17 00:00:00 2001 From: Boris Krasnopevtsev Date: Fri, 26 Aug 2016 03:13:30 +0300 Subject: [PATCH 4270/5486] Fix carriage returns --- english/marshmallow.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index af0fed9f94..d1aabe831b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -Once upon a time many authors collaborated to make meaningless linked story. +Once upon a time many authors collaborated to make meaningless linked story. NGE is [here] (NGE/NGE.md) @@ -1088,6 +1088,6 @@ Click [here](https://www.youtube.com/watch?v=aboZctrHfK8) to find out what the m so lazy [here](lazy/lazy.md) -Click [here](walrus/walrus.md) +[Update](android/marshmallow6.0.md) your Smartphone to the Marshmallow 6.0! -[Update](android/marshmallow6.0.md) your Smartphone to the Marshmallow 6.0! \ No newline at end of file +Click [here](walrus/walrus.md) \ No newline at end of file From 5e145abf8097ea6e6f93a7e0e473f222516d9b27 Mon Sep 17 00:00:00 2001 From: SuperCoon Date: Thu, 25 Aug 2016 21:02:10 -0400 Subject: [PATCH 4271/5486] Add the new file ukrainian/Crying/crying-in-the-corner.md --- ukrainian/Crying/crying-in-the-corner.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ukrainian/Crying/crying-in-the-corner.md diff --git a/ukrainian/Crying/crying-in-the-corner.md b/ukrainian/Crying/crying-in-the-corner.md new file mode 100644 index 0000000000..0533eb9080 --- /dev/null +++ b/ukrainian/Crying/crying-in-the-corner.md @@ -0,0 +1,3 @@ +Сховавшись та наплакавшись вдосталь я прийшла до тями. Потрібно було діяти та шукати порятунок... + +[Вирішую спробувати щось інше](../marshmallow.md) \ No newline at end of file From a856f9f4146e8735181cfd09d421fd20a4500868 Mon Sep 17 00:00:00 2001 From: SuperCoon Date: Thu, 25 Aug 2016 21:25:13 -0400 Subject: [PATCH 4272/5486] Create changes to Ukrainian file --- ukrainian/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 0746cdd59b..e960838b47 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -28,6 +28,8 @@ [Test!](test/test.md) +[Сховаюся в куток та буду плакати](Crying/crying-in-the-corner.md) + І, так, я теж не розумію, для чого мотузка, але в голову лізуть підозрілі думки! [Look around](look-around/look-around.md) From c4a1f1f49a74325413744f336ca7bd019c089265 Mon Sep 17 00:00:00 2001 From: Jens Larsen Date: Thu, 25 Aug 2016 19:13:53 -0700 Subject: [PATCH 4273/5486] Added Duck of Doom --- english/duck/duck.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/duck/duck.md diff --git a/english/duck/duck.md b/english/duck/duck.md new file mode 100644 index 0000000000..e02aee0dbb --- /dev/null +++ b/english/duck/duck.md @@ -0,0 +1,5 @@ +******CURSE****** +DUCK OF DOOM +******CURSE****** + +You should know better than to pick up a duck in a dungeon. Lose 2 levels. From 8807c0bb5ddba866b0c4daec0918ad26d1d0a938 Mon Sep 17 00:00:00 2001 From: Jens Larsen Date: Thu, 25 Aug 2016 19:15:25 -0700 Subject: [PATCH 4274/5486] Updated zork link to add the Duck of Doom link --- english/zork/zork.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/zork/zork.md b/english/zork/zork.md index f8d6852bbd..f432e265f3 100644 --- a/english/zork/zork.md +++ b/english/zork/zork.md @@ -15,3 +15,5 @@ There is also om twine on the ground. The work Zork brings back memories. Zork is life, Zork is love. + +Kick open the [door] (../duck/duck.md) From 2b43c557e0424b52a079d8164e27af1e1fc9b78e Mon Sep 17 00:00:00 2001 From: David Sabalete Date: Fri, 26 Aug 2016 12:20:56 +0200 Subject: [PATCH 4275/5486] Add new option 'correr' to catala/catala.md --- catala/catala.md | 2 ++ catala/correr/correr.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 catala/correr/correr.md diff --git a/catala/catala.md b/catala/catala.md index dd131e5231..4deef62540 100644 --- a/catala/catala.md +++ b/catala/catala.md @@ -23,3 +23,5 @@ Què fas? [somrius](somrius/somrius.md) [Entres en pànic absolut](panic/panic.md) + +[Corres cap a la paret més propera](correr/correr.md) \ No newline at end of file diff --git a/catala/correr/correr.md b/catala/correr/correr.md new file mode 100644 index 0000000000..82200543f0 --- /dev/null +++ b/catala/correr/correr.md @@ -0,0 +1,5 @@ +La ostia que et fots és de campionat! + +Que no saps que les parets no poden ser de núvol de sucre? + +És clar que no, si no les formigues t'entrarien a casa ;-P From c8f860b0bd9addc045d86f2627f211dd26683c55 Mon Sep 17 00:00:00 2001 From: Bryan Day Date: Sat, 27 Aug 2016 10:21:50 +0200 Subject: [PATCH 4276/5486] Added the quest for the nougat --- english/android-v6/use-android-v6.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/android-v6/use-android-v6.md b/english/android-v6/use-android-v6.md index 2b439e8ded..b0964343ba 100644 --- a/english/android-v6/use-android-v6.md +++ b/english/android-v6/use-android-v6.md @@ -17,4 +17,8 @@ The image changes and a border is now clear. A 3D green droid figure displays with V6.0 stamped on its metallic chest. In its arms is a single marshmallow. -The green droid figure bows down to a silvery apple. \ No newline at end of file +The green droid figure bows down to a silvery apple. + +In haste you take up the marshmallow as your charge. + +As you depart the little droid calls you to "Seek out from whence you came, and find the nougat..." \ No newline at end of file From f398eb71df7e3fef92a57e8eeff722daccbf98ae Mon Sep 17 00:00:00 2001 From: ccvwq Date: Sat, 27 Aug 2016 10:45:03 +0200 Subject: [PATCH 4277/5486] Add muszka for kowin option --- Polish/przygoda/jedzenie/korwin/korwin.md | 4 +++- Polish/przygoda/jedzenie/korwin/prezent3/muszka.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Polish/przygoda/jedzenie/korwin/prezent3/muszka.md diff --git a/Polish/przygoda/jedzenie/korwin/korwin.md b/Polish/przygoda/jedzenie/korwin/korwin.md index afa93d5cbf..fcd460e7f5 100644 --- a/Polish/przygoda/jedzenie/korwin/korwin.md +++ b/Polish/przygoda/jedzenie/korwin/korwin.md @@ -6,4 +6,6 @@ Jaki prezent podarujesz swojemu monarsze? [Złoty rewolwer](prezent/rewolwer.md) -[Złoty krawat](prezent2/krawat.md) \ No newline at end of file +[Złoty krawat](prezent2/krawat.md) + +[Zlota muszke](prezent3/muszka.md) diff --git a/Polish/przygoda/jedzenie/korwin/prezent3/muszka.md b/Polish/przygoda/jedzenie/korwin/prezent3/muszka.md new file mode 100644 index 0000000000..fbc68026a0 --- /dev/null +++ b/Polish/przygoda/jedzenie/korwin/prezent3/muszka.md @@ -0,0 +1 @@ +Korwin szaleje z radosci i mianuje ci premierem From acf84e30d36c3d00eec955b6dfae81a8ab9959f5 Mon Sep 17 00:00:00 2001 From: Agnes Mondorf Date: Sat, 27 Aug 2016 11:31:49 +0200 Subject: [PATCH 4278/5486] Add sentence to Fragen --- german/Fragen/fragen.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/Fragen/fragen.md b/german/Fragen/fragen.md index 3a1f38ce7f..e6c317c4ca 100644 --- a/german/Fragen/fragen.md +++ b/german/Fragen/fragen.md @@ -1,3 +1,4 @@ Sie haben den Mut und naehern sich ihr an. Sie fragen sie: "Entschuldigung, wie spaet ist es". Sie laechelt und beantwortet Ihre Frage: "Ich habe leider keine Armbanduhr..." -Jedoch holt sie sofort ihr Handy heraus, um weiter zu helfen. \ No newline at end of file +Jedoch holt sie sofort ihr Handy heraus, um weiter zu helfen. +Herr von Ribbeck auf Ribbeck im Havelland \ No newline at end of file From 3f5b98369b9ca0a54c2ed8362b4bfa2b7af361c7 Mon Sep 17 00:00:00 2001 From: Annie Date: Sat, 27 Aug 2016 13:15:42 -0500 Subject: [PATCH 4279/5486] Add my recommended thai song --- Thai/Songs/ThaiSong_FanJa.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Thai/Songs/ThaiSong_FanJa.md b/Thai/Songs/ThaiSong_FanJa.md index 2e938ad119..496a0ef6e2 100644 --- a/Thai/Songs/ThaiSong_FanJa.md +++ b/Thai/Songs/ThaiSong_FanJa.md @@ -34,3 +34,12 @@ by Torr Nov 7, 2015 Git/GitHub จงเจริญ โย่วๆ by [Off](http://www.facebook.com/off99555) อิอิ เทส ฮัลโหล ทดสอบ สตอรี่ บอทจงมา accept this pull request now + +======================================= +อ๊ากกกกกก....เพลงแฟนจ๋า 14 ปีแล้วเหรอเนี่ย(ตกใจแรงมากกกก) +แต่เราทันเพลงนี้...นั่นหมายความว่า เราแก่แล้วใช่ไหม? + +แต่ถ้าพูดถึงเพลงพี่เบิร์ด เราชอบเพลงนี้ที่สุด [เล่าสู่กันฟัง](https://www.youtube.com/watch?v=9SM2hywQIVo&noredirect=1) + +by Bale +============================================ \ No newline at end of file From 6b5288da4ca2c0fa6a3c94299e857084dfc1d8af Mon Sep 17 00:00:00 2001 From: Luisa Date: Sat, 27 Aug 2016 18:05:22 -0300 Subject: [PATCH 4280/5486] changes --- portugues/colaborando.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 95b995d81d..96bbdbe524 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -63,3 +63,5 @@ BR BR BR Hue hue hue!!!! [Corrigiria o bug fazendo o seguinte] (jc/jc.md) [Usaria: git clone, branch, add, commit e push] (https://www.google.com.br/) + +[Crio um novo branch e faço alterações no codigo do aplicativo, realizando commits,e uso o github para obter ajuda] (http://gitref.org/) \ No newline at end of file From 074523b6f1a9e7bc3665d5d2c3ec0f83bd320918 Mon Sep 17 00:00:00 2001 From: Luisa Date: Sat, 27 Aug 2016 18:29:19 -0300 Subject: [PATCH 4281/5486] correct the line --- portugues/colaborando.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 96bbdbe524..7938514c40 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -64,4 +64,4 @@ BR BR BR Hue hue hue!!!! [Usaria: git clone, branch, add, commit e push] (https://www.google.com.br/) -[Crio um novo branch e faço alterações no codigo do aplicativo, realizando commits,e uso o github para obter ajuda] (http://gitref.org/) \ No newline at end of file +[Crio um novo branch,olho o bug e uso o github para obter ajuda] (http://gitref.org/) \ No newline at end of file From 598fb5a545c5123218d2583f7ef47a1029d774fb Mon Sep 17 00:00:00 2001 From: Bruno Cunha Date: Sun, 28 Aug 2016 18:54:18 -0300 Subject: [PATCH 4282/5486] Adicionado mais escolhas para sartup.md --- portugues_pt/mundo/startup/acordo/acordo.md | 2 ++ portugues_pt/mundo/startup/demitir/demitir.md | 1 + portugues_pt/mundo/startup/startup.md | 7 ++++++- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 portugues_pt/mundo/startup/acordo/acordo.md create mode 100644 portugues_pt/mundo/startup/demitir/demitir.md diff --git a/portugues_pt/mundo/startup/acordo/acordo.md b/portugues_pt/mundo/startup/acordo/acordo.md new file mode 100644 index 0000000000..1694af489f --- /dev/null +++ b/portugues_pt/mundo/startup/acordo/acordo.md @@ -0,0 +1,2 @@ +Funcionários que não aceitaram o acordo pediram demissão. Mas aqueles +que continuaram fizeram a startup sair da crise. Agora eles recebem 500% mais do que antes \ No newline at end of file diff --git a/portugues_pt/mundo/startup/demitir/demitir.md b/portugues_pt/mundo/startup/demitir/demitir.md new file mode 100644 index 0000000000..46f111cc06 --- /dev/null +++ b/portugues_pt/mundo/startup/demitir/demitir.md @@ -0,0 +1 @@ +A maioria dos funcionários possuía família e passaram fome. Você está sendo perseguido nas ruas \ No newline at end of file diff --git a/portugues_pt/mundo/startup/startup.md b/portugues_pt/mundo/startup/startup.md index 456d1be237..6b329b5b4d 100644 --- a/portugues_pt/mundo/startup/startup.md +++ b/portugues_pt/mundo/startup/startup.md @@ -1 +1,6 @@ -Começava uma nova empresa com o novo produto revolucionário do mercado \ No newline at end of file +Começava uma nova empresa com o novo produto revolucionário do mercado. +A ideia era revolucionária, mas não foi a hora certa para fazê-la! Poucas pessoas +compraram seu novo produto e sua startup começou a entrar numa grande crise! + +[Teria que demitir 70% dos funcionários para tentar se recuperar] (demitir/demitir.md) +[Fazer acordo com funcionários para receberam 10% do salário durante um período] (acordo/acordo.md) From d3ca1f94c023e698ac1e2e943de08873eb8eb4ae Mon Sep 17 00:00:00 2001 From: Bruno Cunha Date: Sun, 28 Aug 2016 19:00:30 -0300 Subject: [PATCH 4283/5486] =?UTF-8?q?Retirado=20a=20modifica=C3=A7=C3=A3o?= =?UTF-8?q?=20da=20linha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues_pt/mundo/startup/startup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues_pt/mundo/startup/startup.md b/portugues_pt/mundo/startup/startup.md index 6b329b5b4d..d532819e5f 100644 --- a/portugues_pt/mundo/startup/startup.md +++ b/portugues_pt/mundo/startup/startup.md @@ -1,4 +1,4 @@ -Começava uma nova empresa com o novo produto revolucionário do mercado. +Começava uma nova empresa com o novo produto revolucionário do mercado A ideia era revolucionária, mas não foi a hora certa para fazê-la! Poucas pessoas compraram seu novo produto e sua startup começou a entrar numa grande crise! From f4b20de897534712d2f4d68feb773c956f4ff760 Mon Sep 17 00:00:00 2001 From: Bruno Cunha Date: Sun, 28 Aug 2016 19:03:15 -0300 Subject: [PATCH 4284/5486] Adiciona linha entre links --- portugues_pt/mundo/startup/startup.md | 1 + 1 file changed, 1 insertion(+) diff --git a/portugues_pt/mundo/startup/startup.md b/portugues_pt/mundo/startup/startup.md index d532819e5f..50872a1013 100644 --- a/portugues_pt/mundo/startup/startup.md +++ b/portugues_pt/mundo/startup/startup.md @@ -3,4 +3,5 @@ A ideia era revolucionária, mas não foi a hora certa para fazê-la! Poucas pes compraram seu novo produto e sua startup começou a entrar numa grande crise! [Teria que demitir 70% dos funcionários para tentar se recuperar] (demitir/demitir.md) + [Fazer acordo com funcionários para receberam 10% do salário durante um período] (acordo/acordo.md) From 861f15cb8ae289e47f7475c3dc81d27d80f2df7d Mon Sep 17 00:00:00 2001 From: Thomas Oechsle Date: Mon, 29 Aug 2016 00:43:14 +0200 Subject: [PATCH 4285/5486] add sentence to file duck.md --- english/duck/duck.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/duck/duck.md b/english/duck/duck.md index e02aee0dbb..a55fbf634c 100644 --- a/english/duck/duck.md +++ b/english/duck/duck.md @@ -3,3 +3,4 @@ DUCK OF DOOM ******CURSE****** You should know better than to pick up a duck in a dungeon. Lose 2 levels. +Make it better next time. From e885a6a758d4707b1acdf28d0fd5d165a611aab0 Mon Sep 17 00:00:00 2001 From: Michael M Date: Sun, 28 Aug 2016 23:28:14 -0500 Subject: [PATCH 4286/5486] Add an option to shred before falling asleep while playing guitar. --- english/guitar/guitar.md | 2 ++ english/guitar/shred/shred.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 english/guitar/shred/shred.md diff --git a/english/guitar/guitar.md b/english/guitar/guitar.md index 83629bc461..d32931bb43 100644 --- a/english/guitar/guitar.md +++ b/english/guitar/guitar.md @@ -3,4 +3,6 @@ realize that your fingers stink of garlic, as does your guitar. After thoroughly washing your hands and guitar strings you decide to go to sleep and start to have a crazy dream. +[You catch a second wind a rip out one more shredfest before bed](./shred/shred.md) + [Start dreaming](../dream/dream.md) \ No newline at end of file diff --git a/english/guitar/shred/shred.md b/english/guitar/shred/shred.md new file mode 100644 index 0000000000..8717332be0 --- /dev/null +++ b/english/guitar/shred/shred.md @@ -0,0 +1,5 @@ +You play every Dethklok song you can remember from Metalocalypse +and melt every face within a hundred mile radius. +You then attempt to play Free Bird in its entirety but fall asleep a half-hour in... + +[Start dreaming](../dream/dream.md) \ No newline at end of file From 4bd2196c1d102055b293315afe75f89a1f0e0d24 Mon Sep 17 00:00:00 2001 From: Michael M Date: Sun, 28 Aug 2016 23:40:56 -0500 Subject: [PATCH 4287/5486] Fix url to in shred.md --- english/guitar/shred/shred.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/guitar/shred/shred.md b/english/guitar/shred/shred.md index 8717332be0..227d919825 100644 --- a/english/guitar/shred/shred.md +++ b/english/guitar/shred/shred.md @@ -2,4 +2,4 @@ You play every Dethklok song you can remember from Metalocalypse and melt every face within a hundred mile radius. You then attempt to play Free Bird in its entirety but fall asleep a half-hour in... -[Start dreaming](../dream/dream.md) \ No newline at end of file +[Start dreaming](../../dream/dream.md) \ No newline at end of file From a6efc7d98d8b375487ea7d0b69f204bfd65f50df Mon Sep 17 00:00:00 2001 From: Michael M Date: Sun, 28 Aug 2016 23:43:19 -0500 Subject: [PATCH 4288/5486] Fix a typo in guitar.md --- english/guitar/guitar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/guitar/guitar.md b/english/guitar/guitar.md index d32931bb43..e31820ceaa 100644 --- a/english/guitar/guitar.md +++ b/english/guitar/guitar.md @@ -3,6 +3,6 @@ realize that your fingers stink of garlic, as does your guitar. After thoroughly washing your hands and guitar strings you decide to go to sleep and start to have a crazy dream. -[You catch a second wind a rip out one more shredfest before bed](./shred/shred.md) +[You catch a second wind and rip out one more shredfest before bed](./shred/shred.md) [Start dreaming](../dream/dream.md) \ No newline at end of file From a4c5b8bba60e1cb51568cb554f009fb0a0cf511a Mon Sep 17 00:00:00 2001 From: tian Date: Mon, 29 Aug 2016 01:01:12 -0400 Subject: [PATCH 4289/5486] Add next lyric --- english/walrus/walrus.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/walrus/walrus.md b/english/walrus/walrus.md index 0c01a05c41..19ba5a318e 100644 --- a/english/walrus/walrus.md +++ b/english/walrus/walrus.md @@ -1 +1,4 @@ -I am the egg man...wooo...I am the egg man...woooo.....I am the walrus...cuckoocachoo! \ No newline at end of file +I am the egg man...wooo...I am the egg man...woooo.....I am the walrus...cuckoocachoo! + +I am the goat man...weee...I am the goat man...weeee......I am the +walrus...rupelapadeee! \ No newline at end of file From cd0749a5f2b93e5a2d5dc8d90c8d658221c9a4e6 Mon Sep 17 00:00:00 2001 From: jw2340 Date: Mon, 29 Aug 2016 18:26:42 +0900 Subject: [PATCH 4290/5486] Edit shoreline and add two new options --- english/forest/fire/woods/follow/shoreline/river/river.md | 1 + english/forest/fire/woods/follow/shoreline/shoreline.md | 8 ++++++-- english/forest/fire/woods/follow/shoreline/wait/wait.md | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 english/forest/fire/woods/follow/shoreline/river/river.md create mode 100644 english/forest/fire/woods/follow/shoreline/wait/wait.md diff --git a/english/forest/fire/woods/follow/shoreline/river/river.md b/english/forest/fire/woods/follow/shoreline/river/river.md new file mode 100644 index 0000000000..c39a636a0d --- /dev/null +++ b/english/forest/fire/woods/follow/shoreline/river/river.md @@ -0,0 +1 @@ +You throw yourself back into the river and flow downstream. In the distance, you see a boat. You start swimming to the possibility of safety. \ No newline at end of file diff --git a/english/forest/fire/woods/follow/shoreline/shoreline.md b/english/forest/fire/woods/follow/shoreline/shoreline.md index 25b8d112c9..04bdbe690f 100644 --- a/english/forest/fire/woods/follow/shoreline/shoreline.md +++ b/english/forest/fire/woods/follow/shoreline/shoreline.md @@ -1,3 +1,7 @@ -A sense of relief passes through you as you scramble onto the rocky shoreline of the river.That moment is short lived. +A sense of relief passes through you as you scramble onto the rocky shoreline of the river. That moment is short-lived. -Deep within the dense forest comes an ominous growl. Something far larger,more dangerous than a bear.You freeze in fear \ No newline at end of file +Deep within the dense forest comes an ominous growl. Something far larger, more dangerous than a bear. You freeze in fear. + +[Wait for what's coming](wait/wait.md) + +[Continue flowing down the river](river/river.md) \ No newline at end of file diff --git a/english/forest/fire/woods/follow/shoreline/wait/wait.md b/english/forest/fire/woods/follow/shoreline/wait/wait.md new file mode 100644 index 0000000000..8d36e70aea --- /dev/null +++ b/english/forest/fire/woods/follow/shoreline/wait/wait.md @@ -0,0 +1 @@ +You wait, and the ominous creature appears. A giant 8-headed dragon appears. \ No newline at end of file From 8b5a5a693299bfb72d5e79e65ab40ba6190d8bc0 Mon Sep 17 00:00:00 2001 From: jw2340 Date: Mon, 29 Aug 2016 18:34:49 +0900 Subject: [PATCH 4291/5486] Undo typos --- english/forest/fire/woods/follow/shoreline/shoreline.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/forest/fire/woods/follow/shoreline/shoreline.md b/english/forest/fire/woods/follow/shoreline/shoreline.md index 04bdbe690f..0e6fb957d6 100644 --- a/english/forest/fire/woods/follow/shoreline/shoreline.md +++ b/english/forest/fire/woods/follow/shoreline/shoreline.md @@ -1,6 +1,6 @@ -A sense of relief passes through you as you scramble onto the rocky shoreline of the river. That moment is short-lived. +A sense of relief passes through you as you scramble onto the rocky shoreline of the river.That moment is short lived. -Deep within the dense forest comes an ominous growl. Something far larger, more dangerous than a bear. You freeze in fear. +Deep within the dense forest comes an ominous growl. Something far larger,more dangerous than a bear.You freeze in fear [Wait for what's coming](wait/wait.md) From ff5005c467eebbcf1619f2f030d332a9982a65ed Mon Sep 17 00:00:00 2001 From: jw2340 Date: Mon, 29 Aug 2016 18:38:49 +0900 Subject: [PATCH 4292/5486] Change to 2 lines --- english/forest/fire/woods/follow/shoreline/river/river.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/forest/fire/woods/follow/shoreline/river/river.md b/english/forest/fire/woods/follow/shoreline/river/river.md index c39a636a0d..bec67f1d52 100644 --- a/english/forest/fire/woods/follow/shoreline/river/river.md +++ b/english/forest/fire/woods/follow/shoreline/river/river.md @@ -1 +1,2 @@ -You throw yourself back into the river and flow downstream. In the distance, you see a boat. You start swimming to the possibility of safety. \ No newline at end of file +You throw yourself back into the river and flow downstream. +In the distance, you see a boat. You start swimming to the possibility of safety. \ No newline at end of file From 6ebe70eae0e38b7456691829e81d3547bfdaeea2 Mon Sep 17 00:00:00 2001 From: jw2340 Date: Mon, 29 Aug 2016 19:18:38 +0900 Subject: [PATCH 4293/5486] Add line --- english/forest/fire/woods/follow/shoreline/river/river.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/forest/fire/woods/follow/shoreline/river/river.md b/english/forest/fire/woods/follow/shoreline/river/river.md index bec67f1d52..abfd1b70fa 100644 --- a/english/forest/fire/woods/follow/shoreline/river/river.md +++ b/english/forest/fire/woods/follow/shoreline/river/river.md @@ -1,2 +1,3 @@ You throw yourself back into the river and flow downstream. -In the distance, you see a boat. You start swimming to the possibility of safety. \ No newline at end of file +In the distance, you see a boat. You start swimming to the possibility of safety. +The people in the boat see you. \ No newline at end of file From baf186216896450119db622b1e23a31f8987351a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Eren?= Date: Mon, 29 Aug 2016 22:47:28 +0300 Subject: [PATCH 4294/5486] Kusmaya devam et --- turkce/catalla-kaz/kus/kus.md | 2 ++ turkce/catalla-kaz/kus/kusmaya-devam/kusmaya-devam.md | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 turkce/catalla-kaz/kus/kusmaya-devam/kusmaya-devam.md diff --git a/turkce/catalla-kaz/kus/kus.md b/turkce/catalla-kaz/kus/kus.md index 1589e806d0..f53634d3db 100644 --- a/turkce/catalla-kaz/kus/kus.md +++ b/turkce/catalla-kaz/kus/kus.md @@ -9,3 +9,5 @@ Ama ya geçmezse? Bir yol bulup ilerlemek de bir seçenekti. Ne yapacaksın? + +[Durmak yok kusmaya devam](kusmaya-devam/kusmaya-devam.md) diff --git a/turkce/catalla-kaz/kus/kusmaya-devam/kusmaya-devam.md b/turkce/catalla-kaz/kus/kusmaya-devam/kusmaya-devam.md new file mode 100644 index 0000000000..97f98a0590 --- /dev/null +++ b/turkce/catalla-kaz/kus/kusmaya-devam/kusmaya-devam.md @@ -0,0 +1,7 @@ +Kustukça kusuyorsun. Öğle yemeği, kahvaltı derken neredeyse geçen + +akşamınkileri de çıkaracaksın. Bu kusma keşmekeşinin ardından nefes + +nefesesin. Kusmuk içinde, yere çömelmiş... Ve aniden tepende ilahi + +bir ışık hüzmesi görüyorsun. From 6be57f11bfe55fe96a7839b2d5f6b3f6b24fd21f Mon Sep 17 00:00:00 2001 From: Anomalee Date: Mon, 29 Aug 2016 18:16:19 -0400 Subject: [PATCH 4295/5486] Add unnatural door choice. --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index d1aabe831b..4bc36149f4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -264,6 +264,7 @@ Something lightly brushes the back of your neck, sending a chill down your spine Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. You hear a strange noise then turn and see a large, wooden door. +Too large, and yet too small, for the frame it rests in. You [walk through the door](./unnatural-door/unnatural-door.md) You turn for a third time and see a small, metal door. From 9635e23cf73aaaca6ed34d645a7823a29dc39f20 Mon Sep 17 00:00:00 2001 From: Anomalee Date: Mon, 29 Aug 2016 18:22:03 -0400 Subject: [PATCH 4296/5486] Add unnatural door page. --- english/unnatural_door/unnatual_door.md | 4 ++++ english/unnatural_door/unnatural_door.md | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 english/unnatural_door/unnatual_door.md create mode 100644 english/unnatural_door/unnatural_door.md diff --git a/english/unnatural_door/unnatual_door.md b/english/unnatural_door/unnatual_door.md new file mode 100644 index 0000000000..6b04b131ae --- /dev/null +++ b/english/unnatural_door/unnatual_door.md @@ -0,0 +1,4 @@ +You arrive in a room too small to contain everything inside. +Empty cubes made of only obtuse angles, and obsidian pillars that loop back on to themselves, are scattered throughout. +The sight of the impossible geometries within begins to warp your mind. +[Escape](../marshmallow.md) to whence you came or remain inside for eternity. \ No newline at end of file diff --git a/english/unnatural_door/unnatural_door.md b/english/unnatural_door/unnatural_door.md new file mode 100644 index 0000000000..5d44e8cd0a --- /dev/null +++ b/english/unnatural_door/unnatural_door.md @@ -0,0 +1,4 @@ +"If you want something done right, you have to do it yourself." + +Don't trust other people to do important things for you. +You have to do things yourself to control the quality of the results. \ No newline at end of file From 8f3b0cd56d38b26fa044a3ceeda261cb7136f9d1 Mon Sep 17 00:00:00 2001 From: Anomalee Date: Mon, 29 Aug 2016 18:23:08 -0400 Subject: [PATCH 4297/5486] Fix typo. --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 4bc36149f4..01a575aad9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -264,7 +264,8 @@ Something lightly brushes the back of your neck, sending a chill down your spine Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. You hear a strange noise then turn and see a large, wooden door. -Too large, and yet too small, for the frame it rests in. You [walk through the door](./unnatural-door/unnatural-door.md) +Too large, in fact, and yet too small, for the frame it rests in. +You [walk through the door](./unnatural-door/unnatural-door.md). You turn for a third time and see a small, metal door. From 1d5ee7bcca6d4946462c084084d0f7a5d76f040f Mon Sep 17 00:00:00 2001 From: Anomalee Date: Mon, 29 Aug 2016 18:25:58 -0400 Subject: [PATCH 4298/5486] Fix filename typo. --- english/unnatural_door/unnatual_door.md | 4 ---- english/unnatural_door/unnatural_door.md | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 english/unnatural_door/unnatual_door.md diff --git a/english/unnatural_door/unnatual_door.md b/english/unnatural_door/unnatual_door.md deleted file mode 100644 index 6b04b131ae..0000000000 --- a/english/unnatural_door/unnatual_door.md +++ /dev/null @@ -1,4 +0,0 @@ -You arrive in a room too small to contain everything inside. -Empty cubes made of only obtuse angles, and obsidian pillars that loop back on to themselves, are scattered throughout. -The sight of the impossible geometries within begins to warp your mind. -[Escape](../marshmallow.md) to whence you came or remain inside for eternity. \ No newline at end of file diff --git a/english/unnatural_door/unnatural_door.md b/english/unnatural_door/unnatural_door.md index 5d44e8cd0a..6b04b131ae 100644 --- a/english/unnatural_door/unnatural_door.md +++ b/english/unnatural_door/unnatural_door.md @@ -1,4 +1,4 @@ -"If you want something done right, you have to do it yourself." - -Don't trust other people to do important things for you. -You have to do things yourself to control the quality of the results. \ No newline at end of file +You arrive in a room too small to contain everything inside. +Empty cubes made of only obtuse angles, and obsidian pillars that loop back on to themselves, are scattered throughout. +The sight of the impossible geometries within begins to warp your mind. +[Escape](../marshmallow.md) to whence you came or remain inside for eternity. \ No newline at end of file From 92ec1ecf4948f3c53c4c63ecd56e5e2c1fc4a949 Mon Sep 17 00:00:00 2001 From: Anomalee Date: Mon, 29 Aug 2016 18:28:16 -0400 Subject: [PATCH 4299/5486] Fix link typo. --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 01a575aad9..57a323a3a1 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -265,7 +265,7 @@ Startled, you immediately whirl around to see who (or what) touched you...but th You hear a strange noise then turn and see a large, wooden door. Too large, in fact, and yet too small, for the frame it rests in. -You [walk through the door](./unnatural-door/unnatural-door.md). +You [walk through the door](./unnatural_door/unnatural_door.md). You turn for a third time and see a small, metal door. From 1ac99ecc51349ceb8c56b8348579d62feb4f9140 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 29 Aug 2016 15:31:05 -0700 Subject: [PATCH 4300/5486] Add black knight battle scene from YouTube --- english/Monty-Python/search.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/Monty-Python/search.md b/english/Monty-Python/search.md index 4c5f0b2b32..12e5132f4b 100644 --- a/english/Monty-Python/search.md +++ b/english/Monty-Python/search.md @@ -6,6 +6,8 @@ Meet the black knight Chop off his limbs +[It's only a flesh wound!](https://www.youtube.com/watch?v=zKhEw7nD9C4) + [Run into the Knights who say "Ni!"](https://www.youtube.com/watch?v=zIV4poUZAQo) Go off to find a nice shrubbery \ No newline at end of file From 76acb898423e171a4915d12da8a397e5c96d79d8 Mon Sep 17 00:00:00 2001 From: Anomalee Date: Mon, 29 Aug 2016 18:34:40 -0400 Subject: [PATCH 4301/5486] Fix wording in unnatural_door page. --- english/unnatural_door/unnatural_door.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/unnatural_door/unnatural_door.md b/english/unnatural_door/unnatural_door.md index 6b04b131ae..f734934268 100644 --- a/english/unnatural_door/unnatural_door.md +++ b/english/unnatural_door/unnatural_door.md @@ -1,4 +1,4 @@ You arrive in a room too small to contain everything inside. -Empty cubes made of only obtuse angles, and obsidian pillars that loop back on to themselves, are scattered throughout. +Scattered throughout are empty cubes made of only obtuse angles, and obsidian pillars that loop back on to themselves. The sight of the impossible geometries within begins to warp your mind. -[Escape](../marshmallow.md) to whence you came or remain inside for eternity. \ No newline at end of file +[Escape](../marshmallow.md) back through the door, or remain inside, mad for eternity. \ No newline at end of file From a8df7d983c1442cc71a846f1dddb480ef00738d4 Mon Sep 17 00:00:00 2001 From: "pablo.budelli" Date: Mon, 29 Aug 2016 23:00:08 -0300 Subject: [PATCH 4302/5486] add banquet line --- espanol/canudos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index dfd2c278bc..3002da7bf8 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -160,4 +160,6 @@ Revelo que venia del futuro y que le daba dos opciones: - [Seguir sus instrucciones y ganar](time1/time1.md) +Indico a sus ayudantes que comenzaran los preparativos para el mayor banquete de la historia del imperio. + [La eleccion](eleccion/eleccion.md) \ No newline at end of file From ed38bc8aa447f4459551ac91ab49b2395f4ec936 Mon Sep 17 00:00:00 2001 From: Eileen Duffner Date: Mon, 29 Aug 2016 21:58:03 -0500 Subject: [PATCH 4303/5486] feat: add new question with links to videos --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 57a323a3a1..828f1e819c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -10,6 +10,8 @@ spend your time [wisely](http://www.pythonchallenge.com/) [Click here](http://www.dvloper.me) to visit my dvloper.me blog . +Are you a [cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) or a [dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? + Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. From c912a58933fd78f6b980ac2a87ab1a9ed1eae24d Mon Sep 17 00:00:00 2001 From: Eileen Duffner Date: Mon, 29 Aug 2016 22:25:12 -0500 Subject: [PATCH 4304/5486] fix: put links a separate lines --- english/marshmallow.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 828f1e819c..aafe3999d9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -10,7 +10,13 @@ spend your time [wisely](http://www.pythonchallenge.com/) [Click here](http://www.dvloper.me) to visit my dvloper.me blog . -Are you a [cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) or a [dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? +Are you a: + +[cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) + +or a + +[dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. From 64a2396fd32862e7bb473d30eb86444f6f4bdacd Mon Sep 17 00:00:00 2001 From: Anne Regel Date: Tue, 30 Aug 2016 11:14:20 -0600 Subject: [PATCH 4305/5486] added an escape from the fall --- english/macgyver/tree/tree.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/macgyver/tree/tree.md diff --git a/english/macgyver/tree/tree.md b/english/macgyver/tree/tree.md new file mode 100644 index 0000000000..191ddeb315 --- /dev/null +++ b/english/macgyver/tree/tree.md @@ -0,0 +1,2 @@ +Like a cat, you grab for the tree and hold on with all of your considerable might. +You have escaped death for now but you still dangling off of a cliff. There are only two ways out, up or down. From 7545a1d31f53dd43fbeb239dbaa1c8cd5bbbd8de Mon Sep 17 00:00:00 2001 From: Anne Regel Date: Tue, 30 Aug 2016 11:15:03 -0600 Subject: [PATCH 4306/5486] added a link to new file --- english/macgyver/cliff/cliffjump.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/macgyver/cliff/cliffjump.md b/english/macgyver/cliff/cliffjump.md index 5515228e12..1a7d652f99 100644 --- a/english/macgyver/cliff/cliffjump.md +++ b/english/macgyver/cliff/cliffjump.md @@ -24,3 +24,5 @@ As you plummet off the cliff, you catch her eye and in that split second you rea [She is raising her arm to hurl the marshmallow back, let you fall, and take charge of marshmallow land](fall/fall.md) +[A tree is growing out from just below the lip of the cliff, you grab for it with lightning reflexes](tree/tree.md) + From 8d4fa834c847225c3d2432b757366bd936a6b838 Mon Sep 17 00:00:00 2001 From: Anne Regel Date: Tue, 30 Aug 2016 11:26:54 -0600 Subject: [PATCH 4307/5486] moved file to the correct location --- english/macgyver/{ => cliff}/tree/tree.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/macgyver/{ => cliff}/tree/tree.md (100%) diff --git a/english/macgyver/tree/tree.md b/english/macgyver/cliff/tree/tree.md similarity index 100% rename from english/macgyver/tree/tree.md rename to english/macgyver/cliff/tree/tree.md From f58c46085d3de0737669906c8f93fc635430265e Mon Sep 17 00:00:00 2001 From: WEI MA Date: Tue, 30 Aug 2016 16:07:34 -0700 Subject: [PATCH 4308/5486] Add cosmological argument --- english/marshmallow.md | 2 ++ english/philosophy/cosmological_argument.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 english/philosophy/cosmological_argument.md diff --git a/english/marshmallow.md b/english/marshmallow.md index d1aabe831b..6fdca0a040 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1082,6 +1082,8 @@ You realise that the philosphy of life in general boils down to that one central question... will you? or will you not? [So Will you?](philosophy/questions.md) +YOu recited [cosmological argument](philosophy/cosmological_argument.md) in the morning in hub. + You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). Click [here](https://www.youtube.com/watch?v=aboZctrHfK8) to find out what the meaning of life is. diff --git a/english/philosophy/cosmological_argument.md b/english/philosophy/cosmological_argument.md new file mode 100644 index 0000000000..1fb09cf60b --- /dev/null +++ b/english/philosophy/cosmological_argument.md @@ -0,0 +1,4 @@ +In the morning, you recited cosmological argument: +1. Whatever begins to exist has a cause. +2. The Universe began to exist. +3. Therefore, the Universe had a cause. \ No newline at end of file From fa1040c0ae16c5d7df064670cbc396b76beff3f1 Mon Sep 17 00:00:00 2001 From: WEI MA Date: Tue, 30 Aug 2016 16:34:57 -0700 Subject: [PATCH 4309/5486] Create a new dictionary for the new page --- english/exists/cosmological_argument.md | 4 ++++ english/marshmallow.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 english/exists/cosmological_argument.md diff --git a/english/exists/cosmological_argument.md b/english/exists/cosmological_argument.md new file mode 100644 index 0000000000..1fb09cf60b --- /dev/null +++ b/english/exists/cosmological_argument.md @@ -0,0 +1,4 @@ +In the morning, you recited cosmological argument: +1. Whatever begins to exist has a cause. +2. The Universe began to exist. +3. Therefore, the Universe had a cause. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 6fdca0a040..99d054dc62 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1082,7 +1082,7 @@ You realise that the philosphy of life in general boils down to that one central question... will you? or will you not? [So Will you?](philosophy/questions.md) -YOu recited [cosmological argument](philosophy/cosmological_argument.md) in the morning in hub. +YOu recited [cosmological argument](exists/cosmological_argument.md) in the morning in hub. You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). From bd665f9bdee1ed6a1ea930f0a66e2dcb687371b8 Mon Sep 17 00:00:00 2001 From: WEI MA Date: Tue, 30 Aug 2016 16:58:13 -0700 Subject: [PATCH 4310/5486] Create a link --- .../{exists => cosmological_argument}/cosmological_argument.md | 0 english/marshmallow.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename english/{exists => cosmological_argument}/cosmological_argument.md (100%) diff --git a/english/exists/cosmological_argument.md b/english/cosmological_argument/cosmological_argument.md similarity index 100% rename from english/exists/cosmological_argument.md rename to english/cosmological_argument/cosmological_argument.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 99d054dc62..bbc0039a1f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1082,7 +1082,7 @@ You realise that the philosphy of life in general boils down to that one central question... will you? or will you not? [So Will you?](philosophy/questions.md) -YOu recited [cosmological argument](exists/cosmological_argument.md) in the morning in hub. +You recited [cosmological argument](cosmological_argument/cosmological_argument.md) in the morning in hub. You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). From 8fd90e87aaed50cbf88796ce1874d5321ab3b657 Mon Sep 17 00:00:00 2001 From: WEI MA Date: Tue, 30 Aug 2016 17:03:14 -0700 Subject: [PATCH 4311/5486] Create a new link on an existing page --- english/philosophy/questions.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/philosophy/questions.md b/english/philosophy/questions.md index 5f2789e393..d4484820a6 100644 --- a/english/philosophy/questions.md +++ b/english/philosophy/questions.md @@ -1 +1,3 @@ -We have the questions. Now we need to find the answers. Look to the universe. \ No newline at end of file +We have the questions. Now we need to find the answers. Look to the universe. + +Maybe the Universe is created by [god](../../cosmological_argument/cosmological_argument.md) \ No newline at end of file From 8cd370d6d17f25e164befa47f08b21950ac1f78d Mon Sep 17 00:00:00 2001 From: WEI MA Date: Tue, 30 Aug 2016 17:07:49 -0700 Subject: [PATCH 4312/5486] Delete page on the same directory --- english/philosophy/cosmological_argument.md | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 english/philosophy/cosmological_argument.md diff --git a/english/philosophy/cosmological_argument.md b/english/philosophy/cosmological_argument.md deleted file mode 100644 index 1fb09cf60b..0000000000 --- a/english/philosophy/cosmological_argument.md +++ /dev/null @@ -1,4 +0,0 @@ -In the morning, you recited cosmological argument: -1. Whatever begins to exist has a cause. -2. The Universe began to exist. -3. Therefore, the Universe had a cause. \ No newline at end of file From ca851f12f0ea10ebd22fb58d5597bbb440c163e8 Mon Sep 17 00:00:00 2001 From: WEI MA Date: Tue, 30 Aug 2016 17:16:49 -0700 Subject: [PATCH 4313/5486] Fix the link --- english/philosophy/questions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/philosophy/questions.md b/english/philosophy/questions.md index d4484820a6..0e96e47e99 100644 --- a/english/philosophy/questions.md +++ b/english/philosophy/questions.md @@ -1,3 +1,3 @@ We have the questions. Now we need to find the answers. Look to the universe. -Maybe the Universe is created by [god](../../cosmological_argument/cosmological_argument.md) \ No newline at end of file +Maybe the Universe is created by [god](../cosmological_argument/cosmological_argument.md) \ No newline at end of file From fd8f46680b42946a97bca7e0f45761dbccc7ba2b Mon Sep 17 00:00:00 2001 From: Daniel Escobar Date: Tue, 30 Aug 2016 21:31:12 -0600 Subject: [PATCH 4314/5486] MEAN stack contribution to the story by DE. --- english/marshmallow.md | 4 +++- english/mean-stack/mean.md | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/mean-stack/mean.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 5360b20348..3a7dbf5991 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1102,4 +1102,6 @@ so lazy [here](lazy/lazy.md) [Update](android/marshmallow6.0.md) your Smartphone to the Marshmallow 6.0! -Click [here](walrus/walrus.md) \ No newline at end of file +Click [here](walrus/walrus.md) + +Click here to learn more about the MEAN stack [here](mean-stack/mean.md) \ No newline at end of file diff --git a/english/mean-stack/mean.md b/english/mean-stack/mean.md new file mode 100644 index 0000000000..5f009c5aa9 --- /dev/null +++ b/english/mean-stack/mean.md @@ -0,0 +1,5 @@ +MEAN stands for: + +M(ongoDB)E(express.js)A(Angular.js)N(node.js) + +This client/server full-stack Javascript framework helps developers build scalable web applications quickly. \ No newline at end of file From 608bd573e8c3946311eb37406509db2a5f78181d Mon Sep 17 00:00:00 2001 From: Raju George Date: Wed, 31 Aug 2016 12:07:21 +0530 Subject: [PATCH 4315/5486] Tintu mon story added --- english/tintumon-mallu/maina.md | 4 ++++ english/tintumon-mallu/tintu-main.md | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 english/tintumon-mallu/maina.md create mode 100644 english/tintumon-mallu/tintu-main.md diff --git a/english/tintumon-mallu/maina.md b/english/tintumon-mallu/maina.md new file mode 100644 index 0000000000..18c065856c --- /dev/null +++ b/english/tintumon-mallu/maina.md @@ -0,0 +1,4 @@ +Maina was sitting in the front of suresh's house. +When maina looked at suresh, she understood that suresh was lost in thoughts. +Maina decided to wake suresh from his thoughts. +So she made a sound "KLA KLA KLI KLI KLU KLU". And the rest is history. diff --git a/english/tintumon-mallu/tintu-main.md b/english/tintumon-mallu/tintu-main.md new file mode 100644 index 0000000000..23386010c6 --- /dev/null +++ b/english/tintumon-mallu/tintu-main.md @@ -0,0 +1,2 @@ +In Mallu land there was a boy called [Tintu](../../Malayalam/malayalam.md) +He was friends with [Maina](maina.md) \ No newline at end of file From 75357ef30d609d9f69661a24cdd73b3724fb63d1 Mon Sep 17 00:00:00 2001 From: Raju George Date: Wed, 31 Aug 2016 12:23:45 +0530 Subject: [PATCH 4316/5486] Moved maina.md to separate folder --- english/tintumon-mallu/{ => maina}/maina.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/tintumon-mallu/{ => maina}/maina.md (100%) diff --git a/english/tintumon-mallu/maina.md b/english/tintumon-mallu/maina/maina.md similarity index 100% rename from english/tintumon-mallu/maina.md rename to english/tintumon-mallu/maina/maina.md From 7e0242d552751e34fe834f2d9cd1e3a46de89372 Mon Sep 17 00:00:00 2001 From: Raju George Date: Wed, 31 Aug 2016 12:30:47 +0530 Subject: [PATCH 4317/5486] Linked file backto entry poing and added space --- Malayalam/malayalam.md | 3 +-- english/tintumon-mallu/tintu-main.md | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index ff7e65769d..8839bc469e 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -8,6 +8,5 @@ ശശിയുടെ [പ്ലിംഗ്](sasi/pling.md) കഥ -ടിന്റുമോന്റെ ചങ്ങതിആയിരുന്നു ശശി - +ടിന്റുമോന്റെ ചങ്ങതിആയിരുന്നു [ശശി] (../English/tintumon-mallu/tintu-main.md) diff --git a/english/tintumon-mallu/tintu-main.md b/english/tintumon-mallu/tintu-main.md index 23386010c6..c988ef3896 100644 --- a/english/tintumon-mallu/tintu-main.md +++ b/english/tintumon-mallu/tintu-main.md @@ -1,2 +1,3 @@ In Mallu land there was a boy called [Tintu](../../Malayalam/malayalam.md) -He was friends with [Maina](maina.md) \ No newline at end of file + +He was friends with [Maina](maina/maina.md) \ No newline at end of file From c40a89ac96aa87f841c583c4c0f2fcc3684abd8e Mon Sep 17 00:00:00 2001 From: Raju George Date: Wed, 31 Aug 2016 12:34:26 +0530 Subject: [PATCH 4318/5486] Updated link path to tintumon file --- Malayalam/malayalam.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index 8839bc469e..7af313f7c5 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -8,5 +8,5 @@ ശശിയുടെ [പ്ലിംഗ്](sasi/pling.md) കഥ -ടിന്റുമോന്റെ ചങ്ങതിആയിരുന്നു [ശശി] (../English/tintumon-mallu/tintu-main.md) +ടിന്റുമോന്റെ ചങ്ങതിആയിരുന്നു [ശശി] (../english/tintumon-mallu/tintu-main.md) From a35e60ace64d648304d0cee77e16620d2e1a6662 Mon Sep 17 00:00:00 2001 From: Raju George Date: Wed, 31 Aug 2016 12:43:51 +0530 Subject: [PATCH 4319/5486] Line modification reverted --- Malayalam/malayalam.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index 7af313f7c5..df63faa332 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -8,5 +8,7 @@ ശശിയുടെ [പ്ലിംഗ്](sasi/pling.md) കഥ -ടിന്റുമോന്റെ ചങ്ങതിആയിരുന്നു [ശശി] (../english/tintumon-mallu/tintu-main.md) +ടിന്റുമോന്റെ ചങ്ങതിആയിരുന്നു ശശി + +[ശശി] (../english/tintumon-mallu/tintu-main.md) From 5e0b382a98237c64bfee98c71c8d25f8922e3353 Mon Sep 17 00:00:00 2001 From: Stefan Walter Date: Wed, 31 Aug 2016 14:51:19 +0200 Subject: [PATCH 4320/5486] Added back option to the bierkeller --- german/schwimmen/hunger/bierkeller/bierkeller.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/schwimmen/hunger/bierkeller/bierkeller.md b/german/schwimmen/hunger/bierkeller/bierkeller.md index 240c1ca57b..1e1a3add0c 100644 --- a/german/schwimmen/hunger/bierkeller/bierkeller.md +++ b/german/schwimmen/hunger/bierkeller/bierkeller.md @@ -1,2 +1,4 @@ -Sie schwimmen zum schoenen fraenkischen Bierkeller am Rande des Ufers. Dort bestellen Sie sich erstmal +Sie schwimmen zum schoenen fraenkischen Bierkeller am Rande des Ufers. Dort bestellen Sie sich erstmal "a Seidla" und "a Kellerbladdn". Gestaerkt ueberlegen Sie sich was als naechstes zu tun ist. + +* Schwimmen sie zurück auf die [Insel](../../schwimmen/insel/insel.md) From 612cf5041a22fa7d7504144c3ac99c448097bf38 Mon Sep 17 00:00:00 2001 From: Stefan Walter Date: Wed, 31 Aug 2016 15:01:21 +0200 Subject: [PATCH 4321/5486] changed relative link --- german/schwimmen/hunger/bierkeller/bierkeller.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/schwimmen/hunger/bierkeller/bierkeller.md b/german/schwimmen/hunger/bierkeller/bierkeller.md index 1e1a3add0c..32fb01e5c5 100644 --- a/german/schwimmen/hunger/bierkeller/bierkeller.md +++ b/german/schwimmen/hunger/bierkeller/bierkeller.md @@ -1,4 +1,4 @@ Sie schwimmen zum schoenen fraenkischen Bierkeller am Rande des Ufers. Dort bestellen Sie sich erstmal "a Seidla" und "a Kellerbladdn". Gestaerkt ueberlegen Sie sich was als naechstes zu tun ist. -* Schwimmen sie zurück auf die [Insel](../../schwimmen/insel/insel.md) +* Schwimmen sie zurück auf die [Insel](../schwimmen/insel/insel.md) From 348acecbf64f7d02b5e161fe814eecbe57c0fd03 Mon Sep 17 00:00:00 2001 From: Stefan Walter Date: Wed, 31 Aug 2016 15:06:10 +0200 Subject: [PATCH 4322/5486] changed relative path again --- german/schwimmen/hunger/bierkeller/bierkeller.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/schwimmen/hunger/bierkeller/bierkeller.md b/german/schwimmen/hunger/bierkeller/bierkeller.md index 32fb01e5c5..e11b484426 100644 --- a/german/schwimmen/hunger/bierkeller/bierkeller.md +++ b/german/schwimmen/hunger/bierkeller/bierkeller.md @@ -1,4 +1,4 @@ Sie schwimmen zum schoenen fraenkischen Bierkeller am Rande des Ufers. Dort bestellen Sie sich erstmal "a Seidla" und "a Kellerbladdn". Gestaerkt ueberlegen Sie sich was als naechstes zu tun ist. -* Schwimmen sie zurück auf die [Insel](../schwimmen/insel/insel.md) +* Schwimmen sie zurück auf die [Insel](../../../schwimmen/insel/insel.md) From 8763ae4b3b89ab8bba850680580bb9f175d2d7eb Mon Sep 17 00:00:00 2001 From: Stefan Walter Date: Wed, 31 Aug 2016 16:17:11 +0200 Subject: [PATCH 4323/5486] Added a space at line end --- german/schwimmen/hunger/bierkeller/bierkeller.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/schwimmen/hunger/bierkeller/bierkeller.md b/german/schwimmen/hunger/bierkeller/bierkeller.md index e11b484426..8cabc6eec7 100644 --- a/german/schwimmen/hunger/bierkeller/bierkeller.md +++ b/german/schwimmen/hunger/bierkeller/bierkeller.md @@ -1,4 +1,4 @@ -Sie schwimmen zum schoenen fraenkischen Bierkeller am Rande des Ufers. Dort bestellen Sie sich erstmal +Sie schwimmen zum schoenen fraenkischen Bierkeller am Rande des Ufers. Dort bestellen Sie sich erstmal "a Seidla" und "a Kellerbladdn". Gestaerkt ueberlegen Sie sich was als naechstes zu tun ist. * Schwimmen sie zurück auf die [Insel](../../../schwimmen/insel/insel.md) From b384d8a9a785a64f8044891599d38e0323c460f2 Mon Sep 17 00:00:00 2001 From: Yuri A Date: Wed, 31 Aug 2016 17:58:06 +0300 Subject: [PATCH 4324/5486] Add new action selfie in russian --- russian/selfie/make_selfie.md | 3 +++ russian/zefir.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 russian/selfie/make_selfie.md diff --git a/russian/selfie/make_selfie.md b/russian/selfie/make_selfie.md new file mode 100644 index 0000000000..29beb47fb3 --- /dev/null +++ b/russian/selfie/make_selfie.md @@ -0,0 +1,3 @@ +Вы решаете срочно задокументировать свое посещение зефирного дома, чтобы поделиться с драгоценными подписчиками. +Но внезапно обнаруживаете, что телефон куда-то запропастился. + diff --git a/russian/zefir.md b/russian/zefir.md index a95c461874..06e4ea2688 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -112,4 +112,6 @@ [Буду клеить](glue/index.md) -[Включите музыку](music/turn_music.md) \ No newline at end of file +[Включите музыку](music/turn_music.md) + +[Наделаю селфи](selfie/make_selfie.md) From 10f701941e498b3a77108082b5b170155f746168 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 11 Sep 2016 23:47:58 +0100 Subject: [PATCH 4325/5486] Add 2's complement Raspberry Pi lines to scan-network.md --- english/iot/scan-network/scan-network.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/english/iot/scan-network/scan-network.md b/english/iot/scan-network/scan-network.md index f420d3ccfe..061e1e4905 100644 --- a/english/iot/scan-network/scan-network.md +++ b/english/iot/scan-network/scan-network.md @@ -5,3 +5,10 @@ His core temp starts to rise as his panic and extra clock cycles start to take e How is this possible! His clock cycles max out tyring to comprehend the situation. "Whats happened to the network!? Who is -1?" + +Suddenly a Raspberry stumbles in with a Pi on his ARM. Raspberry yawns and blinks tiredly at 192.168.100.1. "Thanks for the 2's compliment but broadcasting around here is considered impolite.....and you woke me to boot which I am less than grateful for". + +192.168.100.1 blushed and felt another core panic coming on. He didnt know where to look. + +"You might well look away. Imagine what I thought when I woke to hear the pitter patter of ICMP from the first address in my very respectable /24 subnet......could it be.....surely not.......a default router?" Rasberry said in an irritated tone. "Of course it wasn't. It was you, just another home assistance gadget configured as if he's the only RFC1918 address in the IoT" + From 0ebcf0b8a1306ccf9753a693cfa7082c63346264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D0=B4=D0=B8=D0=BC=20=D0=9B=D0=BE=D0=B3=D1=96?= =?UTF-8?q?=D0=BD?= Date: Fri, 16 Sep 2016 20:41:37 +0300 Subject: [PATCH 4326/5486] Add 'grab marshmallow option' to "break-through-wall/try-the-taste/try-the-taste.md" page --- ukrainian/break-through-wall/try-the-taste/try-the-taste.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ukrainian/break-through-wall/try-the-taste/try-the-taste.md b/ukrainian/break-through-wall/try-the-taste/try-the-taste.md index ce1d2e1d14..ae26ece85d 100644 --- a/ukrainian/break-through-wall/try-the-taste/try-the-taste.md +++ b/ukrainian/break-through-wall/try-the-taste/try-the-taste.md @@ -7,3 +7,5 @@ [Повернутися до кімнати за виделкою](../../marshmallow.md) [Ніщо не зможе відірвати мене від поїдання зефіру](continue-eating/continue-eating.md) + +[Наберу зефіру руками, а потім спробую підпалити зефір](../../fire/fire.md) \ No newline at end of file From 0fcf70ba917076cfe3257e5d56f737e4ccdb49b6 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 26 Sep 2016 09:43:04 -0700 Subject: [PATCH 4327/5486] Add file north/north.md and updated marshmallow.md --- english/marshmallow.md | 2 ++ english/north/north.md | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 english/north/north.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 3a7dbf5991..5832f15098 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -257,6 +257,8 @@ You decide to try to light a fire to melt some of the marshmallows so you look f You see a polar bear searching for food. +I see that you may be from the North. [How's it going?](./north/north.md) + [A Shotgun appears!](./shotgun/shotgun.md) [Whilst cycling backwards.](./cycling-backwards/cycling-backwards.md) diff --git a/english/north/north.md b/english/north/north.md new file mode 100644 index 0000000000..e5a074de79 --- /dev/null +++ b/english/north/north.md @@ -0,0 +1,14 @@ +Sometimes, in the gutter, you can't tell the ice from the broken glass. + +Don't hitchhike in The North. + +I have hitchhiked in The North. + +[You will try to confront The North](../explore-outside/journey-to-flaming-tower/start-running/confront/confront.md), +but when you go to find it, it will have paid your bill and left. No, it's not in the bathroom. + +The North is sometimes a [Greyhound experience](../explore-outside/journey-to-flaming-tower/jellybus/jellybus.md): +uncofortable, expensive, sleepless, and surrounded by wolves. + +You will start to tell stories about The North, but you will end up telling stories +about [yourself.](../tweet-it/tweet-it.md) From e6e2fcc8601ca775ff52c718223bdeeb35ccbd6a Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 26 Sep 2016 09:47:59 -0700 Subject: [PATCH 4328/5486] Trim north.md narrative --- english/north/north.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/english/north/north.md b/english/north/north.md index e5a074de79..7881d013ee 100644 --- a/english/north/north.md +++ b/english/north/north.md @@ -1,8 +1,4 @@ -Sometimes, in the gutter, you can't tell the ice from the broken glass. - -Don't hitchhike in The North. - -I have hitchhiked in The North. +The North will not be accounted for by a theory of The North. [You will try to confront The North](../explore-outside/journey-to-flaming-tower/start-running/confront/confront.md), but when you go to find it, it will have paid your bill and left. No, it's not in the bathroom. From 010837968b7cf2d95b5aeb3099903add7d5634c6 Mon Sep 17 00:00:00 2001 From: josegallo Date: Tue, 27 Sep 2016 11:56:01 +0200 Subject: [PATCH 4329/5486] Add the little history of Tyrion --- espanol/canudos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 3002da7bf8..7e50eacc53 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -162,4 +162,6 @@ Revelo que venia del futuro y que le daba dos opciones: Indico a sus ayudantes que comenzaran los preparativos para el mayor banquete de la historia del imperio. -[La eleccion](eleccion/eleccion.md) \ No newline at end of file +[La eleccion](eleccion/eleccion.md) + +Y llego [Tyrion Lannister](Tyrion/Tyrion.md) \ No newline at end of file From f459284b02ed52b0f706f5d4318c884ab5c10345 Mon Sep 17 00:00:00 2001 From: josegallo Date: Tue, 27 Sep 2016 12:02:36 +0200 Subject: [PATCH 4330/5486] Add /Tyrion --- espanol/Tyrion/Daenerys/Daenerys.md | 1 + espanol/Tyrion/Tyrion.md | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 espanol/Tyrion/Daenerys/Daenerys.md create mode 100644 espanol/Tyrion/Tyrion.md diff --git a/espanol/Tyrion/Daenerys/Daenerys.md b/espanol/Tyrion/Daenerys/Daenerys.md new file mode 100644 index 0000000000..0a44530df4 --- /dev/null +++ b/espanol/Tyrion/Daenerys/Daenerys.md @@ -0,0 +1 @@ +LLegó Daenerys montada en su dragón, y con una espectacular entrada les sonrío. Unos cayeron enamorados iso-facto pero otros la odiarion desde el principio. Nadie quedó impasible. \ No newline at end of file diff --git a/espanol/Tyrion/Tyrion.md b/espanol/Tyrion/Tyrion.md new file mode 100644 index 0000000000..bde221f678 --- /dev/null +++ b/espanol/Tyrion/Tyrion.md @@ -0,0 +1,7 @@ +Con la berborrea del chiquillo les convenció para que decidieran entre 3 opciones: + +Primera: unirse a los ejércitos de [Daenerys](Daenerys/Daenerys.md) + +Segunda: Irse a las [montañas](../montanas/montanas.md) + +Tercera: Aquí no ha pasado nada y dejar las cosas como al [principio](../canudos.md) \ No newline at end of file From d547beebb043171dec3f7a7d7330f97e878e5399 Mon Sep 17 00:00:00 2001 From: josegallo Date: Tue, 27 Sep 2016 12:17:48 +0200 Subject: [PATCH 4331/5486] Quiero dormir ... --- espanol/cansancio/cansancio.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/cansancio/cansancio.md b/espanol/cansancio/cansancio.md index c791e347e9..5111e32cac 100644 --- a/espanol/cansancio/cansancio.md +++ b/espanol/cansancio/cansancio.md @@ -1,3 +1,5 @@ He hecho la lección en un solo día Beatito. No busco gloria o reconocimiento... Solo quiero descansar. No sé si el ejercito es nuestro ejercito regresando triunfante, o el ejercito invasor que viene a Destruir. -Yo quiero dormir..... \ No newline at end of file +Yo quiero dormir..... + +Y sin darse cuenta al despertar volvio al [comienzo de la historia](../canudos.md) \ No newline at end of file From 3b63ec4689522585605dbb1ccba985342819d8f6 Mon Sep 17 00:00:00 2001 From: v85n Date: Tue, 27 Sep 2016 17:31:55 +0200 Subject: [PATCH 4332/5486] Add roof-top to the stairs. --- english/roof-top/roof-top.md | 1 + english/stairs/stairs.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/roof-top/roof-top.md diff --git a/english/roof-top/roof-top.md b/english/roof-top/roof-top.md new file mode 100644 index 0000000000..c39b6af82a --- /dev/null +++ b/english/roof-top/roof-top.md @@ -0,0 +1 @@ +You take a deep breath, enter bullet time mode and have a look around. \ No newline at end of file diff --git a/english/stairs/stairs.md b/english/stairs/stairs.md index 3b4b3c55da..dbf834892d 100644 --- a/english/stairs/stairs.md +++ b/english/stairs/stairs.md @@ -2,3 +2,5 @@ You race for the twisting stair case. The officer is catching up, but you race up the stairs. As you round your way up the stairs you hear the officer pounding up behind you. You glance back and see him only a few steps away! + +You reach the door to the [roof top](english/stairs/roof-top.md). \ No newline at end of file From aa2047b83be6230e2ac96d4dcabc2b9cdc21426a Mon Sep 17 00:00:00 2001 From: v85n Date: Tue, 27 Sep 2016 17:41:35 +0200 Subject: [PATCH 4333/5486] Fix path to the roof top --- english/stairs/stairs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/stairs/stairs.md b/english/stairs/stairs.md index dbf834892d..a3fadeffa1 100644 --- a/english/stairs/stairs.md +++ b/english/stairs/stairs.md @@ -3,4 +3,4 @@ but you race up the stairs. As you round your way up the stairs you hear the officer pounding up behind you. You glance back and see him only a few steps away! -You reach the door to the [roof top](english/stairs/roof-top.md). \ No newline at end of file +You reach the door to the [roof top](english/roof-top/roof-top.md). \ No newline at end of file From 89a2d8617dfd7adf5b71a0a10dfc929a0dc204e0 Mon Sep 17 00:00:00 2001 From: v85n Date: Tue, 27 Sep 2016 17:44:08 +0200 Subject: [PATCH 4334/5486] Fix path to the roof top, next try. --- english/stairs/stairs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/stairs/stairs.md b/english/stairs/stairs.md index a3fadeffa1..7816638ea1 100644 --- a/english/stairs/stairs.md +++ b/english/stairs/stairs.md @@ -3,4 +3,4 @@ but you race up the stairs. As you round your way up the stairs you hear the officer pounding up behind you. You glance back and see him only a few steps away! -You reach the door to the [roof top](english/roof-top/roof-top.md). \ No newline at end of file +You reach the door to the [roof top](../roof-top/roof-top.md). \ No newline at end of file From a232ea8537dc877458be742046ed5d7ef42d4adb Mon Sep 17 00:00:00 2001 From: Samuel Miller Date: Tue, 27 Sep 2016 20:27:06 -0600 Subject: [PATCH 4335/5486] Find yourself with the Neonic Lion! --- english/concert/concert.md | 3 +++ english/marshmallow.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 english/concert/concert.md diff --git a/english/concert/concert.md b/english/concert/concert.md new file mode 100644 index 0000000000..a42cf723ea --- /dev/null +++ b/english/concert/concert.md @@ -0,0 +1,3 @@ +At the David Gray [concert](https://www.youtube.com/watch?v=uGm5z8sJAFM) you join the +crowd in a sick live mobile light-show and find a wizard to sell you that voodoo you needed +to find yourself with the [Neonic Lion](http://www.neonic-live.com/). \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 3a7dbf5991..19751e6b9f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -227,6 +227,8 @@ An umbrella (closed) automagically appears in your left hand. You tentatively You are feeling very anxious at this point. +You can't decide if anything is worth it anymore so you loose yourself at a [David Gray concert.](concert/concert.md) + Goosebumps appear. This is because you do not like leather for ethical reasons. From d3a76741c316b4936d82ebb97287bf30039e5329 Mon Sep 17 00:00:00 2001 From: Jason Rudin Date: Tue, 27 Sep 2016 22:05:56 -0700 Subject: [PATCH 4336/5486] add google link to gtd option based on suggestion of text --- english/gtd/gtd.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/gtd/gtd.md b/english/gtd/gtd.md index 7804843fe8..6629122017 100644 --- a/english/gtd/gtd.md +++ b/english/gtd/gtd.md @@ -11,3 +11,5 @@ Come back to the marshmallow file and choose the "that" option when you're done with your work. Cheers! + +Click [here](http://www.google.com) to visit Google. From d5d5bdd99b161e6e7d8708f9c2571cabcb53bd3e Mon Sep 17 00:00:00 2001 From: Ed Date: Wed, 28 Sep 2016 05:00:03 -0400 Subject: [PATCH 4337/5486] Add to storyline --- english/steelers/steelers.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/steelers/steelers.md b/english/steelers/steelers.md index d4725d9d75..91035f0676 100644 --- a/english/steelers/steelers.md +++ b/english/steelers/steelers.md @@ -1 +1,5 @@ -Hah, just a ruse to get someone else to join Steeler Nation, ZING! \ No newline at end of file +Hah, just a ruse to get someone else to join Steeler Nation, ZING! + +I figured as much; but OK, count me in! If you're not a Steelers + +fan, then check out [here](../nfl-chiefs/nfl-chiefs.md) From 363b2b508cb48b756308d1b0a079da067ab57b9d Mon Sep 17 00:00:00 2001 From: Janne Nikunen Date: Wed, 28 Sep 2016 18:15:50 +0300 Subject: [PATCH 4338/5486] Add second phrase --- finnish/loyly/loyly.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/finnish/loyly/loyly.md b/finnish/loyly/loyly.md index d5a5c1f973..4649ae2dad 100644 --- a/finnish/loyly/loyly.md +++ b/finnish/loyly/loyly.md @@ -1 +1,2 @@ -Hiki valuu. \ No newline at end of file +Hiki valuu. +Kiuas pihisee. \ No newline at end of file From 731294525696c750a680d6ae84f1b9e4713d9f05 Mon Sep 17 00:00:00 2001 From: Silvia Date: Wed, 28 Sep 2016 09:28:00 -0700 Subject: [PATCH 4339/5486] Add link to song 'Soy Colombia' in youtube --- english/music/add_music.md | 3 +++ espanol/musica/grupo_mariachi.md | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/english/music/add_music.md b/english/music/add_music.md index 82c2a674ae..20d58c5d2b 100644 --- a/english/music/add_music.md +++ b/english/music/add_music.md @@ -10,3 +10,6 @@ At anytime an invitation You can't decline [And listen to it too!](https://www.youtube.com/watch?v=2ZBtPf7FOoM) + +Listen to this beautiful song: +[Soy Colombia](https://www.youtube.com/watch?v=GtgkAaaab_E) diff --git a/espanol/musica/grupo_mariachi.md b/espanol/musica/grupo_mariachi.md index f92303db9d..a373a2b57f 100644 --- a/espanol/musica/grupo_mariachi.md +++ b/espanol/musica/grupo_mariachi.md @@ -1 +1,4 @@ -Y fue entonces cuando apareció un grupo de Mariachi, listo para sorprender a la familia con un poco de música. \ No newline at end of file +Y fue entonces cuando apareció un grupo de Mariachi, listo para sorprender a la familia con un poco de música. + +Esto no es mariachi pero es una canción hermosa: +[Soy Colombia](https://www.youtube.com/watch?v=GtgkAaaab_E) From 0653448456ecc7f4f73053b199e92020e61e48e7 Mon Sep 17 00:00:00 2001 From: silvpas Date: Wed, 28 Sep 2016 09:45:31 -0700 Subject: [PATCH 4340/5486] Update grupo_mariachi.md --- espanol/musica/grupo_mariachi.md | 1 - 1 file changed, 1 deletion(-) diff --git a/espanol/musica/grupo_mariachi.md b/espanol/musica/grupo_mariachi.md index a373a2b57f..57925f09b7 100644 --- a/espanol/musica/grupo_mariachi.md +++ b/espanol/musica/grupo_mariachi.md @@ -1,4 +1,3 @@ Y fue entonces cuando apareció un grupo de Mariachi, listo para sorprender a la familia con un poco de música. - Esto no es mariachi pero es una canción hermosa: [Soy Colombia](https://www.youtube.com/watch?v=GtgkAaaab_E) From c5aa84729d9c74018766a5872a4996f1d1ea3104 Mon Sep 17 00:00:00 2001 From: silvpas Date: Wed, 28 Sep 2016 09:46:00 -0700 Subject: [PATCH 4341/5486] Update grupo_mariachi.md --- espanol/musica/grupo_mariachi.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/musica/grupo_mariachi.md b/espanol/musica/grupo_mariachi.md index 57925f09b7..a373a2b57f 100644 --- a/espanol/musica/grupo_mariachi.md +++ b/espanol/musica/grupo_mariachi.md @@ -1,3 +1,4 @@ Y fue entonces cuando apareció un grupo de Mariachi, listo para sorprender a la familia con un poco de música. + Esto no es mariachi pero es una canción hermosa: [Soy Colombia](https://www.youtube.com/watch?v=GtgkAaaab_E) From 304249be23c5621e3e3f62e7ec557677b51f8eb9 Mon Sep 17 00:00:00 2001 From: Daniel Askan Filsoof Mikkelsen Date: Wed, 28 Sep 2016 20:45:59 +0200 Subject: [PATCH 4342/5486] Add two options to the 'cykeltur' option --- danish/haervejen/cykeltur/cykeltur.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/danish/haervejen/cykeltur/cykeltur.md b/danish/haervejen/cykeltur/cykeltur.md index d56daa7b04..eefcce6fcb 100644 --- a/danish/haervejen/cykeltur/cykeltur.md +++ b/danish/haervejen/cykeltur/cykeltur.md @@ -6,3 +6,6 @@ Dagen er nu ved at være på hæld, og du kan ikke se noget der kunne ligne et gæstgiveri i nærheden. Hvad gør du? +[Holder en fed provinsfest for dig selv](https://www.youtube.com/watch?v=9_xIoJzZtKg). + +[Går i panik, smider cyklen og bryder ud i en erotisk, dog klodsede dans sammen med en tilfældig forbipasserende](https://www.youtube.com/watch?v=nYbI07YBFuI). \ No newline at end of file From fba53129b9374114909df6b1eb7a90b8141f609e Mon Sep 17 00:00:00 2001 From: Daniel Askan Filsoof Mikkelsen Date: Wed, 28 Sep 2016 20:57:33 +0200 Subject: [PATCH 4343/5486] Update cykeltur.md --- danish/haervejen/cykeltur/cykeltur.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/danish/haervejen/cykeltur/cykeltur.md b/danish/haervejen/cykeltur/cykeltur.md index eefcce6fcb..63960a0184 100644 --- a/danish/haervejen/cykeltur/cykeltur.md +++ b/danish/haervejen/cykeltur/cykeltur.md @@ -6,6 +6,7 @@ Dagen er nu ved at være på hæld, og du kan ikke se noget der kunne ligne et gæstgiveri i nærheden. Hvad gør du? + [Holder en fed provinsfest for dig selv](https://www.youtube.com/watch?v=9_xIoJzZtKg). -[Går i panik, smider cyklen og bryder ud i en erotisk, dog klodsede dans sammen med en tilfældig forbipasserende](https://www.youtube.com/watch?v=nYbI07YBFuI). \ No newline at end of file +[Går i panik, smider cyklen og bryder ud i en erotisk, dog klodsede dans sammen med en tilfældig forbipasserende](https://www.youtube.com/watch?v=nYbI07YBFuI). From 92dff49b142acfc49a452a3b95afda49d74503a3 Mon Sep 17 00:00:00 2001 From: josegallo Date: Wed, 28 Sep 2016 23:06:58 +0200 Subject: [PATCH 4344/5486] Resolve problems to merge Lines shorter than 120 chars. on espanol/Tyrion/Daenerys/Daenerys.md Deleting whitespaces on espanol/cansancio/cansancio.md --- espanol/cansancio/cansancio.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/espanol/cansancio/cansancio.md b/espanol/cansancio/cansancio.md index 5111e32cac..d8cd05abb2 100644 --- a/espanol/cansancio/cansancio.md +++ b/espanol/cansancio/cansancio.md @@ -1,5 +1,5 @@ He hecho la lección en un solo día Beatito. No busco gloria o reconocimiento... Solo quiero descansar. No sé si el ejercito es nuestro ejercito regresando triunfante, o el ejercito invasor que viene a Destruir. -Yo quiero dormir..... - +Yo quiero dormir..... + Y sin darse cuenta al despertar volvio al [comienzo de la historia](../canudos.md) \ No newline at end of file From 05b760b2492e02c5a0a5dc98672e84069bb0f9be Mon Sep 17 00:00:00 2001 From: josegallo Date: Wed, 28 Sep 2016 23:11:23 +0200 Subject: [PATCH 4345/5486] Change on daenerys.md --- espanol/Tyrion/Daenerys/Daenerys.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/espanol/Tyrion/Daenerys/Daenerys.md b/espanol/Tyrion/Daenerys/Daenerys.md index 0a44530df4..2ba3c5c4f4 100644 --- a/espanol/Tyrion/Daenerys/Daenerys.md +++ b/espanol/Tyrion/Daenerys/Daenerys.md @@ -1 +1,5 @@ -LLegó Daenerys montada en su dragón, y con una espectacular entrada les sonrío. Unos cayeron enamorados iso-facto pero otros la odiarion desde el principio. Nadie quedó impasible. \ No newline at end of file +LLegó Daenerys montada en su dragón, y con una espectacular entrada les sonrío. + +Unos cayeron enamorados iso-facto pero otros la odiarion desde el principio. + +Nadie quedó impasible. \ No newline at end of file From 923cca9700764742bd2a8b6a5aa8eacc88173039 Mon Sep 17 00:00:00 2001 From: Daniel Askan Filsoof Mikkelsen Date: Wed, 28 Sep 2016 23:28:20 +0200 Subject: [PATCH 4346/5486] Update cykeltur.md --- danish/haervejen/cykeltur/cykeltur.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/danish/haervejen/cykeltur/cykeltur.md b/danish/haervejen/cykeltur/cykeltur.md index 63960a0184..5482bfc3be 100644 --- a/danish/haervejen/cykeltur/cykeltur.md +++ b/danish/haervejen/cykeltur/cykeltur.md @@ -9,4 +9,6 @@ Hvad gør du? [Holder en fed provinsfest for dig selv](https://www.youtube.com/watch?v=9_xIoJzZtKg). -[Går i panik, smider cyklen og bryder ud i en erotisk, dog klodsede dans sammen med en tilfældig forbipasserende](https://www.youtube.com/watch?v=nYbI07YBFuI). +[Går i panik, smider cyklen og bryder ud i en erotisk, +dog klodsede dans sammen med en tilfældig +forbipasserende](https://www.youtube.com/watch?v=nYbI07YBFuI). From a70abc9f82c97f533f38ae9981403e30044e1cac Mon Sep 17 00:00:00 2001 From: vidyasagarv Date: Wed, 28 Sep 2016 21:45:58 -0400 Subject: [PATCH 4347/5486] Add stargazing story --- english/stargazing/stargazing.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/stargazing/stargazing.md diff --git a/english/stargazing/stargazing.md b/english/stargazing/stargazing.md new file mode 100644 index 0000000000..2506fa7f2d --- /dev/null +++ b/english/stargazing/stargazing.md @@ -0,0 +1,5 @@ +"Look at the stars" she said as she looked at him. They were laying on the lush green Great Lawn of the Central park, she likes admiring the sky because she could imagine themselves in another planet, maybe outside of the galaxy or somewhere out in the cosmos. + +"They are shining for you" his voice sounded soft. He seemed to be calm, even when he had a lot of panic on the inside. "They are scared because they know they'll never see us together again". + +He gave her a quick peck on her lips and took her hand to hold it like he never did before. They closed their eyes and a couple of minutes later everything vanished into the bright sunlight coming through a window and he woke up from his [dream].(../dream/dream.md) \ No newline at end of file From 06dd3ad860a3eba68f86ab613b1e707da5bd86b9 Mon Sep 17 00:00:00 2001 From: Vidya Sagar Date: Wed, 28 Sep 2016 21:51:47 -0400 Subject: [PATCH 4348/5486] Corrected stargazing.md --- english/stargazing/stargazing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/stargazing/stargazing.md b/english/stargazing/stargazing.md index 2506fa7f2d..3b99739386 100644 --- a/english/stargazing/stargazing.md +++ b/english/stargazing/stargazing.md @@ -2,4 +2,4 @@ "They are shining for you" his voice sounded soft. He seemed to be calm, even when he had a lot of panic on the inside. "They are scared because they know they'll never see us together again". -He gave her a quick peck on her lips and took her hand to hold it like he never did before. They closed their eyes and a couple of minutes later everything vanished into the bright sunlight coming through a window and he woke up from his [dream].(../dream/dream.md) \ No newline at end of file +He gave her a quick peck on her lips and took her hand to hold it like he never did before. They closed their eyes and a couple of minutes later everything vanished into the bright sunlight coming through a window and he woke up from his [dream](../dream/dream.md) From 47c17a736ea91882e7e07c3fba8726acb14c4e8a Mon Sep 17 00:00:00 2001 From: Vidya Sagar Date: Wed, 28 Sep 2016 22:22:59 -0400 Subject: [PATCH 4349/5486] Add link to stargazing --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 3a7dbf5991..b4c42b953e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1104,4 +1104,6 @@ so lazy [here](lazy/lazy.md) Click [here](walrus/walrus.md) -Click here to learn more about the MEAN stack [here](mean-stack/mean.md) \ No newline at end of file +Click here to learn more about the MEAN stack [here](mean-stack/mean.md) + +Do you like [stargazing](stargazing/stargazing.md) ? From f37f0a5fb286ad22a424bc7cecdaf5ba4544091e Mon Sep 17 00:00:00 2001 From: Vidya Sagar Date: Wed, 28 Sep 2016 22:28:45 -0400 Subject: [PATCH 4350/5486] Reduced character count to below 120 --- english/stargazing/stargazing.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/english/stargazing/stargazing.md b/english/stargazing/stargazing.md index 3b99739386..9130ddf561 100644 --- a/english/stargazing/stargazing.md +++ b/english/stargazing/stargazing.md @@ -1,5 +1,8 @@ -"Look at the stars" she said as she looked at him. They were laying on the lush green Great Lawn of the Central park, she likes admiring the sky because she could imagine themselves in another planet, maybe outside of the galaxy or somewhere out in the cosmos. - -"They are shining for you" his voice sounded soft. He seemed to be calm, even when he had a lot of panic on the inside. "They are scared because they know they'll never see us together again". - -He gave her a quick peck on her lips and took her hand to hold it like he never did before. They closed their eyes and a couple of minutes later everything vanished into the bright sunlight coming through a window and he woke up from his [dream](../dream/dream.md) +"Look at the stars" she said as she looked at him. +They were laying on the lush green Great Lawn of the Central park. +She likes admiring the sky because she could imagine themselves in another planet, maybe outside of the galaxy. +"They are shining for you" his voice sounded soft. He seemed to be calm, even when he had a lot of panic on the inside. +"They are scared because they know they'll never see us together again". +He gave her a quick peck on her lips and took her hand to hold it like he never did before. +They closed their eyes and a couple of minutes later everything vanished into the bright sunlight coming through a window. +Finally, he woke up from his [dream](../dream/dream.md) From 64922867e1917a6d197e53ac2442de3a9169e65b Mon Sep 17 00:00:00 2001 From: Vidya Sagar Date: Wed, 28 Sep 2016 22:37:46 -0400 Subject: [PATCH 4351/5486] Break down sentences to less than 120 characters --- english/stargazing/stargazing.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/stargazing/stargazing.md b/english/stargazing/stargazing.md index 9130ddf561..9e16475a5d 100644 --- a/english/stargazing/stargazing.md +++ b/english/stargazing/stargazing.md @@ -1,8 +1,14 @@ -"Look at the stars" she said as she looked at him. +"Look at the stars" she said as she looked at him. + They were laying on the lush green Great Lawn of the Central park. + She likes admiring the sky because she could imagine themselves in another planet, maybe outside of the galaxy. + "They are shining for you" his voice sounded soft. He seemed to be calm, even when he had a lot of panic on the inside. + "They are scared because they know they'll never see us together again". + He gave her a quick peck on her lips and took her hand to hold it like he never did before. + They closed their eyes and a couple of minutes later everything vanished into the bright sunlight coming through a window. Finally, he woke up from his [dream](../dream/dream.md) From 50f59c0666b310edd2487e7c5db5e0b65eb91fe9 Mon Sep 17 00:00:00 2001 From: Vidya Sagar Date: Wed, 28 Sep 2016 22:47:46 -0400 Subject: [PATCH 4352/5486] Update stargazing.md --- english/stargazing/stargazing.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/stargazing/stargazing.md b/english/stargazing/stargazing.md index 9e16475a5d..4e7c25e5aa 100644 --- a/english/stargazing/stargazing.md +++ b/english/stargazing/stargazing.md @@ -11,4 +11,5 @@ She likes admiring the sky because she could imagine themselves in another plane He gave her a quick peck on her lips and took her hand to hold it like he never did before. They closed their eyes and a couple of minutes later everything vanished into the bright sunlight coming through a window. + Finally, he woke up from his [dream](../dream/dream.md) From c55cc8a810cc2b4a501a9bf255169c2f1ac37fc7 Mon Sep 17 00:00:00 2001 From: Vidya Sagar Date: Wed, 28 Sep 2016 22:51:49 -0400 Subject: [PATCH 4353/5486] Final version of stargazing --- english/stargazing/stargazing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/stargazing/stargazing.md b/english/stargazing/stargazing.md index 4e7c25e5aa..f7b8db1276 100644 --- a/english/stargazing/stargazing.md +++ b/english/stargazing/stargazing.md @@ -8,8 +8,8 @@ She likes admiring the sky because she could imagine themselves in another plane "They are scared because they know they'll never see us together again". -He gave her a quick peck on her lips and took her hand to hold it like he never did before. +He gave her a quick peck on her lips and took her hand to hold it like he never did before. -They closed their eyes and a couple of minutes later everything vanished into the bright sunlight coming through a window. +They closed their eyes and a couple of minutes later everything vanished suddenly. Finally, he woke up from his [dream](../dream/dream.md) From af31de0f47cda6897fe30d917ebf8d917cfa90d6 Mon Sep 17 00:00:00 2001 From: kellim Date: Wed, 28 Sep 2016 20:56:03 -0700 Subject: [PATCH 4354/5486] Add New Years Stay at Home option --- english/or-do-you/or-do-you.md | 4 +++- english/stay-at-home/stay-at-home.md | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 english/stay-at-home/stay-at-home.md diff --git a/english/or-do-you/or-do-you.md b/english/or-do-you/or-do-you.md index 1acc869a37..f0c12aff75 100644 --- a/english/or-do-you/or-do-you.md +++ b/english/or-do-you/or-do-you.md @@ -1,3 +1,5 @@ Well, it was New Year's Eve. Even hardened stop-at-home-Sundays geeks like us go out for New Years. -You went out for [New Year's last year](../new-years/new-years.md), didn't you? \ No newline at end of file +You went out for [New Year's last year](../new-years/new-years.md), didn't you? + +Or did you [stay home and watch the countdown on TV](../stay-at-home/stay-at-home.md) \ No newline at end of file diff --git a/english/stay-at-home/stay-at-home.md b/english/stay-at-home/stay-at-home.md new file mode 100644 index 0000000000..c33853f81a --- /dev/null +++ b/english/stay-at-home/stay-at-home.md @@ -0,0 +1,2 @@ +You decided to stay at home on New Year's Eve instead of watching the countdown on TV. +What did you do after the countdown finished? \ No newline at end of file From 96bfcf03052cf683cd2039ebf147ca240c97ee3a Mon Sep 17 00:00:00 2001 From: kellim Date: Wed, 28 Sep 2016 21:03:49 -0700 Subject: [PATCH 4355/5486] Move Stay at Home option to correct folder --- english/or-do-you/or-do-you.md | 2 +- english/{ => or-do-you}/stay-at-home/stay-at-home.md | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename english/{ => or-do-you}/stay-at-home/stay-at-home.md (100%) diff --git a/english/or-do-you/or-do-you.md b/english/or-do-you/or-do-you.md index f0c12aff75..8224f8ffbc 100644 --- a/english/or-do-you/or-do-you.md +++ b/english/or-do-you/or-do-you.md @@ -2,4 +2,4 @@ Well, it was New Year's Eve. Even hardened stop-at-home-Sundays geeks like us go You went out for [New Year's last year](../new-years/new-years.md), didn't you? -Or did you [stay home and watch the countdown on TV](../stay-at-home/stay-at-home.md) \ No newline at end of file +Or did you [stay home and watch the countdown on TV](/stay-at-home/stay-at-home.md) \ No newline at end of file diff --git a/english/stay-at-home/stay-at-home.md b/english/or-do-you/stay-at-home/stay-at-home.md similarity index 100% rename from english/stay-at-home/stay-at-home.md rename to english/or-do-you/stay-at-home/stay-at-home.md From 2eb0781ca2c3791a0de71db6358df1c8faf62404 Mon Sep 17 00:00:00 2001 From: kellim Date: Wed, 28 Sep 2016 21:06:49 -0700 Subject: [PATCH 4356/5486] Fix stay at home URL --- english/or-do-you/or-do-you.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/or-do-you/or-do-you.md b/english/or-do-you/or-do-you.md index 8224f8ffbc..b34d3e618b 100644 --- a/english/or-do-you/or-do-you.md +++ b/english/or-do-you/or-do-you.md @@ -2,4 +2,4 @@ Well, it was New Year's Eve. Even hardened stop-at-home-Sundays geeks like us go You went out for [New Year's last year](../new-years/new-years.md), didn't you? -Or did you [stay home and watch the countdown on TV](/stay-at-home/stay-at-home.md) \ No newline at end of file +Or did you [stay home and watch the countdown on TV](stay-at-home/stay-at-home.md) \ No newline at end of file From d1cc30ddd2113cd7fd32459416fa744bf685d71f Mon Sep 17 00:00:00 2001 From: Leo Salinas Date: Wed, 28 Sep 2016 23:55:18 -0700 Subject: [PATCH 4357/5486] Add Only so much in a day. --- english/working/working.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/working/working.md b/english/working/working.md index 0aca86d95d..0829166866 100644 --- a/english/working/working.md +++ b/english/working/working.md @@ -2,4 +2,6 @@ You know you should be doing it. Stop wasting you'r time. -[Get back to work](../take-nap/cucumber-induced-nap.md) \ No newline at end of file +Only so much in a day. + +[Get back to work](../take-nap/cucumber-induced-nap.md) From b96566fea42a2f730ee5700dfae36a71ae746c2a Mon Sep 17 00:00:00 2001 From: Leo Salinas Date: Thu, 29 Sep 2016 00:51:43 -0700 Subject: [PATCH 4358/5486] Delete removed newline at end of file. --- english/working/working.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/working/working.md b/english/working/working.md index 0829166866..d7e224a3f6 100644 --- a/english/working/working.md +++ b/english/working/working.md @@ -4,4 +4,4 @@ Stop wasting you'r time. Only so much in a day. -[Get back to work](../take-nap/cucumber-induced-nap.md) +[Get back to work](../take-nap/cucumber-induced-nap.md) \ No newline at end of file From 236c62984dde25c5635b837b1e936569518c447a Mon Sep 17 00:00:00 2001 From: Leo Salinas Date: Thu, 29 Sep 2016 01:01:11 -0700 Subject: [PATCH 4359/5486] Add restored working.md to original file. --- english/working/working.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/working/working.md b/english/working/working.md index d7e224a3f6..0aca86d95d 100644 --- a/english/working/working.md +++ b/english/working/working.md @@ -2,6 +2,4 @@ You know you should be doing it. Stop wasting you'r time. -Only so much in a day. - [Get back to work](../take-nap/cucumber-induced-nap.md) \ No newline at end of file From 1fba73c3ebb7b8e7fdb783d95e2c77da70e9e502 Mon Sep 17 00:00:00 2001 From: Leo Salinas Date: Thu, 29 Sep 2016 01:04:43 -0700 Subject: [PATCH 4360/5486] Add Only so much in a day. --- english/working/working.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/working/working.md b/english/working/working.md index 0aca86d95d..d7e224a3f6 100644 --- a/english/working/working.md +++ b/english/working/working.md @@ -2,4 +2,6 @@ You know you should be doing it. Stop wasting you'r time. +Only so much in a day. + [Get back to work](../take-nap/cucumber-induced-nap.md) \ No newline at end of file From b5bc6c81a46178e6d584ca37687d1e0be81d999f Mon Sep 17 00:00:00 2001 From: Jhoan Beron Date: Thu, 29 Sep 2016 19:45:27 +0800 Subject: [PATCH 4361/5486] Arepas en el banquete --- espanol/canudos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 3002da7bf8..9d5d2340f7 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -162,4 +162,6 @@ Revelo que venia del futuro y que le daba dos opciones: Indico a sus ayudantes que comenzaran los preparativos para el mayor banquete de la historia del imperio. -[La eleccion](eleccion/eleccion.md) \ No newline at end of file +[La eleccion](eleccion/eleccion.md) + +El Consejero y Beatito coincidieron en que en el banquete se servirian [arepas](https://www.google.com.au/search?q=arepas&espv=2&biw=1680&bih=984&tbm=isch&tbo=u&source=univ&sa=X&ved=0ahUKEwjQ_vChv7TPAhXLjpQKHXflClAQiR4IpAE&dpr=1) de entrada. Y cada invitado podria comer [tantas como quisiera](exageracion/exageracion.md). \ No newline at end of file From a1e9a6f15a8e2f46bce73856bf1c854f2eeaeefd Mon Sep 17 00:00:00 2001 From: Jhoan Beron Date: Thu, 29 Sep 2016 19:55:33 +0800 Subject: [PATCH 4362/5486] breaking too-long line --- espanol/canudos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 9d5d2340f7..4a781a403c 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -164,4 +164,6 @@ Indico a sus ayudantes que comenzaran los preparativos para el mayor banquete de [La eleccion](eleccion/eleccion.md) -El Consejero y Beatito coincidieron en que en el banquete se servirian [arepas](https://www.google.com.au/search?q=arepas&espv=2&biw=1680&bih=984&tbm=isch&tbo=u&source=univ&sa=X&ved=0ahUKEwjQ_vChv7TPAhXLjpQKHXflClAQiR4IpAE&dpr=1) de entrada. Y cada invitado podria comer [tantas como quisiera](exageracion/exageracion.md). \ No newline at end of file +El Consejero y Beatito coincidieron en que en el banquete se servirian [arepas](https://es.wikipedia.org/wiki/Arepa). + +Y cada invitado podria comer [tantas como quisiera](exageracion/exageracion.md). \ No newline at end of file From a948144ed3df7b80eba9a344ef9ca05b11a3ba91 Mon Sep 17 00:00:00 2001 From: Jhoan Beron Date: Thu, 29 Sep 2016 20:19:25 +0800 Subject: [PATCH 4363/5486] changing line back to original position --- espanol/canudos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index f068f080bb..d978ab503e 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -164,8 +164,10 @@ Indico a sus ayudantes que comenzaran los preparativos para el mayor banquete de [La eleccion](eleccion/eleccion.md) +Y llego [Tyrion Lannister](Tyrion/Tyrion.md) + El Consejero y Beatito coincidieron en que en el banquete se servirian [arepas](https://es.wikipedia.org/wiki/Arepa). Y cada invitado podria comer [tantas como quisiera](exageracion/exageracion.md). -Y llego [Tyrion Lannister](Tyrion/Tyrion.md) + From 491eea56802ac6d51c19c1922eeb3576b22cd507 Mon Sep 17 00:00:00 2001 From: DeyvidJLira Date: Thu, 29 Sep 2016 10:57:29 -0300 Subject: [PATCH 4364/5486] Create the indie journey --- portugues/jornada-indie/O inicio.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 portugues/jornada-indie/O inicio.md diff --git a/portugues/jornada-indie/O inicio.md b/portugues/jornada-indie/O inicio.md new file mode 100644 index 0000000000..dc1e92010e --- /dev/null +++ b/portugues/jornada-indie/O inicio.md @@ -0,0 +1,19 @@ +Seja um desenvolvedor independente de jogos agora mesmo: +Você poderá riscar e rasgar diversas folhas; +Praticar arremesso de bola de papel; +Ficar frustado; +Aprenderá digitar até 3x mais rápido; +Criar magnificos ambientes 3D (desde que seu computador permita); +Criar incríveis jogos (dentro de suas limitações técnicas, essas vão atrapalhar bastante); +Será persistente quando aparecer um obstáculo; +Mesmo que não consiga encontrar o erro tentará incansavelmente descobrir a solução; +Descobrirá também que não havia erro nenhum pois você colocou o mesmo código novamente e inexplicavelmente +voltou a funcionar; +Verá seu computador travar muitas vezes; +Perceberá que não tem dinheiro para comprar recursos para seu jogo; +Terá raiva, ódio, estresse, ficará noites sem dormir; +Mas não desistirá, será persistente; +Lançara seu primeiro jogo; +E após varios dias verá que 10 pessoas adquiriram seu jogo (Uhuuuuuuuuuuuuuu); + +Venha agora mesmo para essa incrível jornada! \ No newline at end of file From 8f8ea4d9d9e9731bb8a8e3610f211ad5a6cd53c5 Mon Sep 17 00:00:00 2001 From: thechad45 Date: Thu, 29 Sep 2016 16:15:50 -0500 Subject: [PATCH 4365/5486] Add two options to the glimmering portal. --- english/glimmering-portal/glimmering-portal.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/glimmering-portal/glimmering-portal.md b/english/glimmering-portal/glimmering-portal.md index 92d8d3579a..2ed4804d52 100644 --- a/english/glimmering-portal/glimmering-portal.md +++ b/english/glimmering-portal/glimmering-portal.md @@ -1 +1,5 @@ You look around and see lava, fire, and brimstone! Oh no, what will you do now?! + +You could either [grab a drink](../enjoysoda/enjoysoda.md) + +Or [sweat](../sweat/sweat.md) it out. From 0b2fc74368f9be6b1a5cc305f9210a6f48168c0b Mon Sep 17 00:00:00 2001 From: thechad45 Date: Thu, 29 Sep 2016 17:00:59 -0500 Subject: [PATCH 4366/5486] Change directories --- english/enjoysoda/enjoysoda.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/enjoysoda/enjoysoda.md diff --git a/english/enjoysoda/enjoysoda.md b/english/enjoysoda/enjoysoda.md new file mode 100644 index 0000000000..7e56b54ade --- /dev/null +++ b/english/enjoysoda/enjoysoda.md @@ -0,0 +1 @@ +You cool your jets by taking a refreshing drink of your favorite soda. \ No newline at end of file From ecdc66b70c428c4368e415e41d75dfe092a632b0 Mon Sep 17 00:00:00 2001 From: thechad45 Date: Thu, 29 Sep 2016 17:01:49 -0500 Subject: [PATCH 4367/5486] Change Directory --- english/sweat/sweat.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/sweat/sweat.md diff --git a/english/sweat/sweat.md b/english/sweat/sweat.md new file mode 100644 index 0000000000..92fa49de70 --- /dev/null +++ b/english/sweat/sweat.md @@ -0,0 +1,3 @@ +You decide to sit down and take the opportunity to let the salty sweat +cleanse your pores because they desperately need it as you've been +spending far too much time learning about Git and GitHub. \ No newline at end of file From ec337d99d0388d225c1ab57628f384aae565b527 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 30 Sep 2016 02:15:44 +0100 Subject: [PATCH 4368/5486] Split longl lines --- english/iot/scan-network/scan-network.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/english/iot/scan-network/scan-network.md b/english/iot/scan-network/scan-network.md index 061e1e4905..9930253404 100644 --- a/english/iot/scan-network/scan-network.md +++ b/english/iot/scan-network/scan-network.md @@ -6,9 +6,12 @@ How is this possible! His clock cycles max out tyring to comprehend the situation. "Whats happened to the network!? Who is -1?" -Suddenly a Raspberry stumbles in with a Pi on his ARM. Raspberry yawns and blinks tiredly at 192.168.100.1. "Thanks for the 2's compliment but broadcasting around here is considered impolite.....and you woke me to boot which I am less than grateful for". +Suddenly a Raspberry stumbles in with a Pi on his ARM. Raspberry yawns and blinks tiredly at 192.168.100.1. +"Thanks for the 2's compliment but broadcasting around here is considered impolite.....and you woke me to boot which I am less than grateful for". 192.168.100.1 blushed and felt another core panic coming on. He didnt know where to look. -"You might well look away. Imagine what I thought when I woke to hear the pitter patter of ICMP from the first address in my very respectable /24 subnet......could it be.....surely not.......a default router?" Rasberry said in an irritated tone. "Of course it wasn't. It was you, just another home assistance gadget configured as if he's the only RFC1918 address in the IoT" +"You might well look away. Imagine what I thought when I woke to hear the pitter patter of ICMP from the first address +in my very respectable /24 subnet......could it be.....surely not.......a default router?" Rasberry said in an irritated tone. +"Of course it wasn't. It was you, just another home assistance gadget configured as if he's the only RFC1918 address in the IoT" From 3eb875272cfbe9aa153e29785e22425391118a6c Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 30 Sep 2016 02:26:51 +0100 Subject: [PATCH 4369/5486] Split more lines --- english/iot/scan-network/scan-network.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/english/iot/scan-network/scan-network.md b/english/iot/scan-network/scan-network.md index 9930253404..95eb421f44 100644 --- a/english/iot/scan-network/scan-network.md +++ b/english/iot/scan-network/scan-network.md @@ -6,12 +6,17 @@ How is this possible! His clock cycles max out tyring to comprehend the situation. "Whats happened to the network!? Who is -1?" -Suddenly a Raspberry stumbles in with a Pi on his ARM. Raspberry yawns and blinks tiredly at 192.168.100.1. -"Thanks for the 2's compliment but broadcasting around here is considered impolite.....and you woke me to boot which I am less than grateful for". +Suddenly a Raspberry stumbles in with a Pi on his ARM. +Raspberry yawns and blinks tiredly at 192.168.100.1. +"Thanks for the 2's compliment but broadcasting around here is considered impolite +.....and you woke me to boot which I am less than grateful for". 192.168.100.1 blushed and felt another core panic coming on. He didnt know where to look. -"You might well look away. Imagine what I thought when I woke to hear the pitter patter of ICMP from the first address -in my very respectable /24 subnet......could it be.....surely not.......a default router?" Rasberry said in an irritated tone. -"Of course it wasn't. It was you, just another home assistance gadget configured as if he's the only RFC1918 address in the IoT" +"You might well look away. Imagine what I thought when I woke to hear the +pitter patter of ICMP from the first address in my very respectable /24 +subnet......could it be.....surely not.......a default router?" Rasberry +said in an irritated tone. +"Of course it wasn't. It was you, just another home assistance gadget +configured as if he's the only RFC1918 address in the IoT" From 2e08a2dd4b2b42fd4a35695448dd7773206b8cbc Mon Sep 17 00:00:00 2001 From: Anky An Date: Fri, 30 Sep 2016 20:13:39 +1000 Subject: [PATCH 4370/5486] add learn-mandarin --- english/learn-mandarin/learn-mandarin.md | 2 ++ english/marshmallow.md | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 english/learn-mandarin/learn-mandarin.md diff --git a/english/learn-mandarin/learn-mandarin.md b/english/learn-mandarin/learn-mandarin.md new file mode 100644 index 0000000000..38ba616902 --- /dev/null +++ b/english/learn-mandarin/learn-mandarin.md @@ -0,0 +1,2 @@ +I love you in Mandarin is 我(wo)爱(ai)你(ni). It sounds like +"Wha(t) I nee(d)" without the sounds in braces. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index a0f3ed656f..53d48853cc 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1111,3 +1111,5 @@ Click [here](walrus/walrus.md) Click here to learn more about the MEAN stack [here](mean-stack/mean.md) Do you like [stargazing](stargazing/stargazing.md) ? + +Let's learn some [mandarin](learn-mandarin/learn-mandarin.md) From 4657cc3112418e58cdce21fd17262eb7f70387ff Mon Sep 17 00:00:00 2001 From: DeyvidJLira Date: Fri, 30 Sep 2016 09:24:39 -0300 Subject: [PATCH 4371/5486] Add link to indie journey (portugues) --- portugues/colaborando.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 7938514c40..f15f711e64 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -64,4 +64,6 @@ BR BR BR Hue hue hue!!!! [Usaria: git clone, branch, add, commit e push] (https://www.google.com.br/) -[Crio um novo branch,olho o bug e uso o github para obter ajuda] (http://gitref.org/) \ No newline at end of file +[Crio um novo branch,olho o bug e uso o github para obter ajuda] (http://gitref.org/) + +[Você quer ser um desenvolvedor de jogos independente](jornada-indie/O inicio.md) \ No newline at end of file From 535df5cbb88878a497144e95c1736eaa8886df75 Mon Sep 17 00:00:00 2001 From: gabriele Date: Fri, 30 Sep 2016 20:31:51 +0200 Subject: [PATCH 4372/5486] Add a new Italian Story --- Italian/lavorare/cazzeggiare/cazzeggiare.md | 1 + Italian/lavorare/lavorare.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Italian/lavorare/cazzeggiare/cazzeggiare.md create mode 100644 Italian/lavorare/lavorare.md diff --git a/Italian/lavorare/cazzeggiare/cazzeggiare.md b/Italian/lavorare/cazzeggiare/cazzeggiare.md new file mode 100644 index 0000000000..bf777f51e3 --- /dev/null +++ b/Italian/lavorare/cazzeggiare/cazzeggiare.md @@ -0,0 +1 @@ +[Noooo è meglio guardare !](../guardare/guarda.md) \ No newline at end of file diff --git a/Italian/lavorare/lavorare.md b/Italian/lavorare/lavorare.md new file mode 100644 index 0000000000..87747b2112 --- /dev/null +++ b/Italian/lavorare/lavorare.md @@ -0,0 +1,2 @@ +Ma siamo sicuri di aver voglia di lavorare ? +[O è meglio cazzeggiare ?](cazzeggiare/cazzeggiare.md) From 1f89e5bc0cea3425414aa22c48e6a232329ed7fb Mon Sep 17 00:00:00 2001 From: gabriele Date: Fri, 30 Sep 2016 20:36:25 +0200 Subject: [PATCH 4373/5486] Edit caramelle to add a new lavorare story --- Italian/caramelle.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Italian/caramelle.md b/Italian/caramelle.md index c40d30fac4..3ae305499e 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -25,4 +25,6 @@ Che fai? [Salgo in macchina] (ascoltare/profumato.md) -[Telefono ad Antonio Conte](antonio_conte/antonio.md) \ No newline at end of file +[Telefono ad Antonio Conte](antonio_conte/antonio.md) + +[Lavorare](lavorare/lavorare.md) \ No newline at end of file From a65e87224a02c704f2eef017443a8edf8a06ddff Mon Sep 17 00:00:00 2001 From: gabriele Date: Fri, 30 Sep 2016 20:41:05 +0200 Subject: [PATCH 4374/5486] edit to my own lavorare story --- Italian/lavorare/cazzeggiare/cazzeggiare.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Italian/lavorare/cazzeggiare/cazzeggiare.md b/Italian/lavorare/cazzeggiare/cazzeggiare.md index bf777f51e3..349fae4df0 100644 --- a/Italian/lavorare/cazzeggiare/cazzeggiare.md +++ b/Italian/lavorare/cazzeggiare/cazzeggiare.md @@ -1 +1 @@ -[Noooo è meglio guardare !](../guardare/guarda.md) \ No newline at end of file +[Noooo è meglio guardare !](../../guardare/guarda.md) \ No newline at end of file From 4ce9de789ecd4ebe5ead20411935ae90db64d8c2 Mon Sep 17 00:00:00 2001 From: scotty Date: Sat, 1 Oct 2016 20:11:26 -0700 Subject: [PATCH 4375/5486] Add a new path --- english/write-a-symphony/symphony.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/write-a-symphony/symphony.md b/english/write-a-symphony/symphony.md index 5cd9e56e03..a13c09ef37 100644 --- a/english/write-a-symphony/symphony.md +++ b/english/write-a-symphony/symphony.md @@ -6,4 +6,6 @@ Do you: [Call a doctor?](../call-a-doctor/doctor.md) -[Lower your creative ambitions?](../write-a-hiku/hiku.md) \ No newline at end of file +[Lower your creative ambitions?](../write-a-hiku/hiku.md) + +[Ask your cat to finish it for you](../ask-a-cat/cat.md) \ No newline at end of file From 1045cca7bf693ded81cfe2dd56912c05e29bec31 Mon Sep 17 00:00:00 2001 From: scotty Date: Sat, 1 Oct 2016 20:12:06 -0700 Subject: [PATCH 4376/5486] Add new story path with three options --- english/ask-a-cat/cat.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 english/ask-a-cat/cat.md diff --git a/english/ask-a-cat/cat.md b/english/ask-a-cat/cat.md new file mode 100644 index 0000000000..6a26debd23 --- /dev/null +++ b/english/ask-a-cat/cat.md @@ -0,0 +1,21 @@ +#What the Cat Said + +You ask your cat if she might be willing to finish writing your symphony +for you. "It's nearly halfway done!" you tell her. "I'll split the profits +with you!" + +Too late you realize that cats have no concept of fame or fiscal gain, and +that they have no particular musicality. Your cat reaches out a paw and +knocks over the cup of coffee you so foolishly set on the table next to +the only copy of your work. The ink you used was exceptionally poor and +immediately runs. + +Your symphony is ruined. + +Your cat doesn't care. + +[Take this as a sign to change careers.](../change-of-career/career.md) + +[Give the cat to your sister and become a dog person.](../dog-person/dog.md) + +[Eh, it wasn't that great a symphony anyway. Settle in for kitty cuddles](../cuddle-the-cat/cuddle-cat.md) From c3719bad551348f3eab6f57c9eef6709922b1207 Mon Sep 17 00:00:00 2001 From: scotty Date: Sat, 1 Oct 2016 20:13:13 -0700 Subject: [PATCH 4377/5486] Add story --- english/cuddle-the-cat/cuddle-cat.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/cuddle-the-cat/cuddle-cat.md diff --git a/english/cuddle-the-cat/cuddle-cat.md b/english/cuddle-the-cat/cuddle-cat.md new file mode 100644 index 0000000000..706eb6ed81 --- /dev/null +++ b/english/cuddle-the-cat/cuddle-cat.md @@ -0,0 +1,5 @@ +#Cuddle buddy + +You pick up your kitty and cuddle her for hours. She happily purrs. And +you happily purr back. Your cat looks at you like you're crazy, but what +are you going to do? From 0d1f36de7ed0054081c935d0d496c21737f961c0 Mon Sep 17 00:00:00 2001 From: scotty Date: Sat, 1 Oct 2016 20:14:12 -0700 Subject: [PATCH 4378/5486] Add new story with three (existing) paths --- english/change-of-career/career.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 english/change-of-career/career.md diff --git a/english/change-of-career/career.md b/english/change-of-career/career.md new file mode 100644 index 0000000000..05cef27c5a --- /dev/null +++ b/english/change-of-career/career.md @@ -0,0 +1,9 @@ +#Time to Rethink Your Life + +You sit yourself down and think about what kind of career you would like to have instead. + +[I want to be an artist!](../paint-a-picture/paint-a-picture.md) + +[Ugh, this is too hard. Lemme watch netflix instead](../netflix.netflix.md) + +[TOO MANY CHOICES! GET ME OUT OF HERE!](../run_out_the_door/run_out_the_door.md) From 2bae66f061da974fcf398da769d82a13e4d7e08b Mon Sep 17 00:00:00 2001 From: scotty Date: Sat, 1 Oct 2016 20:14:45 -0700 Subject: [PATCH 4379/5486] Add story file, no paths --- english/dog-person/dog.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/dog-person/dog.md diff --git a/english/dog-person/dog.md b/english/dog-person/dog.md new file mode 100644 index 0000000000..c258bd9272 --- /dev/null +++ b/english/dog-person/dog.md @@ -0,0 +1,6 @@ +#Call Me Dog Person + +You take your cat straight to your sister's house and drive yourself to +the nearest animal shelter. You tell the attendant you want a dog, and +he shows you to the back to take a look. There's so many to choose from! +HOW WILL YOU CHOOSE?? From 8c38c5bd52adf0c1ef212bc213154a6313cfbae0 Mon Sep 17 00:00:00 2001 From: scotty Date: Sat, 1 Oct 2016 20:18:07 -0700 Subject: [PATCH 4380/5486] Fix broken link --- english/change-of-career/career.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/change-of-career/career.md b/english/change-of-career/career.md index 05cef27c5a..3f69b8c5dd 100644 --- a/english/change-of-career/career.md +++ b/english/change-of-career/career.md @@ -4,6 +4,6 @@ You sit yourself down and think about what kind of career you would like to have [I want to be an artist!](../paint-a-picture/paint-a-picture.md) -[Ugh, this is too hard. Lemme watch netflix instead](../netflix.netflix.md) +[Ugh, this is too hard. Lemme watch netflix instead](../netflix/netflix.md) [TOO MANY CHOICES! GET ME OUT OF HERE!](../run_out_the_door/run_out_the_door.md) From 6ec9991dd5798339e00b126972b4bf7fffeef689 Mon Sep 17 00:00:00 2001 From: SS Date: Sun, 2 Oct 2016 18:27:25 +0530 Subject: [PATCH 4381/5486] Add news to marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 53d48853cc..3d87eae919 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1113,3 +1113,5 @@ Click here to learn more about the MEAN stack [here](mean-stack/mean.md) Do you like [stargazing](stargazing/stargazing.md) ? Let's learn some [mandarin](learn-mandarin/learn-mandarin.md) + +Eureka!! Nerons for storing social memories found, click [here](http://news.mit.edu/2016/scientists-identify-neurons-social-memory-0929) for more info. From e2960bcfa8d7b1b57ca64a8ea06c90094fab991d Mon Sep 17 00:00:00 2001 From: SS Date: Sun, 2 Oct 2016 18:39:52 +0530 Subject: [PATCH 4382/5486] Fix: ensure length of line is <=120 characters. --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 3d87eae919..28c759922f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1114,4 +1114,4 @@ Do you like [stargazing](stargazing/stargazing.md) ? Let's learn some [mandarin](learn-mandarin/learn-mandarin.md) -Eureka!! Nerons for storing social memories found, click [here](http://news.mit.edu/2016/scientists-identify-neurons-social-memory-0929) for more info. +Neurons for social memories, [more info](http://news.mit.edu/2016/scientists-identify-neurons-social-memory-0929) From 4bec2df5563e5b01204c9fc891ee4e004e961a47 Mon Sep 17 00:00:00 2001 From: simonliu009 Date: Mon, 3 Oct 2016 19:40:58 +0800 Subject: [PATCH 4383/5486] Add a new option to Chinese page and add a page for my option. --- Chinese/cloud/cloud.md | 2 ++ "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 Chinese/cloud/cloud.md diff --git a/Chinese/cloud/cloud.md b/Chinese/cloud/cloud.md new file mode 100644 index 0000000000..f9dffa6a15 --- /dev/null +++ b/Chinese/cloud/cloud.md @@ -0,0 +1,2 @@ +同是奇幻喜剧，相比《大话西游》里的棉花糖，我更喜欢《天使爱美丽》里面的小熊。 +这种对云朵的想象更加富有诗意。 \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index e65c5d2081..c961d29699 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -2,6 +2,8 @@ 前端攻城狮一枚。这枚攻城狮做出了很多网页，比如： +[好大一朵棉花糖](cloud/cloud.md) + [美貌是一种表情](beauty/beauty.md) [葫芦娃](oner0128/story.md) From bc4d1c65634ccbfafa524a0d1840c3e91d696178 Mon Sep 17 00:00:00 2001 From: jlal Date: Mon, 3 Oct 2016 16:05:01 +0200 Subject: [PATCH 4384/5486] Add a link back to the first page --- finnish/loyly/loyly.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/finnish/loyly/loyly.md b/finnish/loyly/loyly.md index 4649ae2dad..37582ed2ab 100644 --- a/finnish/loyly/loyly.md +++ b/finnish/loyly/loyly.md @@ -1,2 +1,4 @@ Hiki valuu. -Kiuas pihisee. \ No newline at end of file +Kiuas pihisee. + +Kylmä olut tulee mieleen. Takaisin [terrasiin](../sauna.md) From fd4292acfa04b4cb4f248e45dddf38d6389d84b4 Mon Sep 17 00:00:00 2001 From: David Thorpe Date: Mon, 3 Oct 2016 21:50:53 +0100 Subject: [PATCH 4385/5486] Add Bed path to story --- english/coffee/bed/bed.md | 5 +++++ english/coffee/coffee.md | 1 + 2 files changed, 6 insertions(+) create mode 100644 english/coffee/bed/bed.md diff --git a/english/coffee/bed/bed.md b/english/coffee/bed/bed.md new file mode 100644 index 0000000000..c99ccfb6c1 --- /dev/null +++ b/english/coffee/bed/bed.md @@ -0,0 +1,5 @@ +The coffee makes you feel tired and you go immediately to sleep + +or do you: + +[have another coffee](../../coffee/coffee.md) \ No newline at end of file diff --git a/english/coffee/coffee.md b/english/coffee/coffee.md index ba8ff371eb..070d2e230c 100644 --- a/english/coffee/coffee.md +++ b/english/coffee/coffee.md @@ -39,6 +39,7 @@ After having your coffee do you want to: [Procrastinate?](procrastinate/procrastinate.md) +[Go to bed?](bed/bed.md) . Coffee creates a great medium for people to have conversations about ideas and visions. From 6a3380873f82b20c82e6d62179257faeb50b8598 Mon Sep 17 00:00:00 2001 From: Praval Kapoor Date: Tue, 4 Oct 2016 02:45:38 +0200 Subject: [PATCH 4386/5486] Add part of my story --- german/Alkohol/Schatzkarte/Schatzkarte.md | 1 + german/Alkohol/alkohol.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 german/Alkohol/Schatzkarte/Schatzkarte.md diff --git a/german/Alkohol/Schatzkarte/Schatzkarte.md b/german/Alkohol/Schatzkarte/Schatzkarte.md new file mode 100644 index 0000000000..8eaf3bdfe6 --- /dev/null +++ b/german/Alkohol/Schatzkarte/Schatzkarte.md @@ -0,0 +1 @@ +Sie erinnern sich, dass Sie sich am Abend zuvor mit Ihren Freunden auf die Suche nach einem versteckten Schatz begeben haben. \ No newline at end of file diff --git a/german/Alkohol/alkohol.md b/german/Alkohol/alkohol.md index 4ffaca176f..fc88900708 100644 --- a/german/Alkohol/alkohol.md +++ b/german/Alkohol/alkohol.md @@ -17,3 +17,5 @@ was sie auf dem Boot finden können, zu behelfen. [Sie finden ein Feuerzeug](feuerzeug/feuerzeug.md) [Sie finden zwei Leichen](../Leichen/Leichen.md) + +[Sie finden eine Schatzkarte](Schatzkarte/Schatzkarte.md) From 24c5079d3d4cd23cb614a3f1afda77e519010d25 Mon Sep 17 00:00:00 2001 From: Praval Kapoor Date: Tue, 4 Oct 2016 02:51:39 +0200 Subject: [PATCH 4387/5486] Decrease line length --- german/Alkohol/Schatzkarte/Schatzkarte.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Alkohol/Schatzkarte/Schatzkarte.md b/german/Alkohol/Schatzkarte/Schatzkarte.md index 8eaf3bdfe6..ad42f60864 100644 --- a/german/Alkohol/Schatzkarte/Schatzkarte.md +++ b/german/Alkohol/Schatzkarte/Schatzkarte.md @@ -1 +1,3 @@ -Sie erinnern sich, dass Sie sich am Abend zuvor mit Ihren Freunden auf die Suche nach einem versteckten Schatz begeben haben. \ No newline at end of file +Sie erinnern sich, dass Sie sich am Abend zuvor mit Ihren +Freunden auf die Suche nach einem versteckten Schatz begeben +haben. \ No newline at end of file From 80868479ee62a686270bf66780130ba12d46aa0a Mon Sep 17 00:00:00 2001 From: Maharshi Rawal Date: Tue, 4 Oct 2016 13:53:18 +0530 Subject: [PATCH 4388/5486] Added a line. --- Gujarati/DhoklaStellarFafda~/CS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Gujarati/DhoklaStellarFafda~/CS.md b/Gujarati/DhoklaStellarFafda~/CS.md index 6428513788..a5105ea3a0 100644 --- a/Gujarati/DhoklaStellarFafda~/CS.md +++ b/Gujarati/DhoklaStellarFafda~/CS.md @@ -1,6 +1,7 @@ Are we rushing in or going sneaky beaky like... go go go mf.. +hu pan gujarati chu. From b435491089da7599d21e027c428f55fe3ffe1909 Mon Sep 17 00:00:00 2001 From: Andres Mancera Date: Tue, 4 Oct 2016 09:02:17 -0700 Subject: [PATCH 4389/5486] Sabores de arepas. --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index d978ab503e..a038d5917d 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -170,4 +170,4 @@ El Consejero y Beatito coincidieron en que en el banquete se servirian [arepas]( Y cada invitado podria comer [tantas como quisiera](exageracion/exageracion.md). - +Se servirian las siguientes arepas: Reina Pepeada, Mechada con amarillo, y Jamon con queso de cabra. From f1369027e2bb61c31c41ac25d55571ae15044e49 Mon Sep 17 00:00:00 2001 From: Andres Mancera Date: Tue, 4 Oct 2016 09:07:30 -0700 Subject: [PATCH 4390/5486] Restoring blank line --- espanol/canudos.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index a038d5917d..1f723a03eb 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -170,4 +170,5 @@ El Consejero y Beatito coincidieron en que en el banquete se servirian [arepas]( Y cada invitado podria comer [tantas como quisiera](exageracion/exageracion.md). + Se servirian las siguientes arepas: Reina Pepeada, Mechada con amarillo, y Jamon con queso de cabra. From be1488db17160ea348326eeee1dc1eabcba311a9 Mon Sep 17 00:00:00 2001 From: GRUNTY Date: Tue, 4 Oct 2016 13:48:16 -0400 Subject: [PATCH 4391/5486] Continue 2spooky --- english/combatration/combat_ration.md | 4 ++++ english/continueded/continueded.md | 2 ++ english/resurrect/resurrect.md | 5 +++++ 3 files changed, 11 insertions(+) create mode 100644 english/continueded/continueded.md create mode 100644 english/resurrect/resurrect.md diff --git a/english/combatration/combat_ration.md b/english/combatration/combat_ration.md index 042d1ef275..3a99212307 100644 --- a/english/combatration/combat_ration.md +++ b/english/combatration/combat_ration.md @@ -1,2 +1,6 @@ this combat ration is so nice. it is poisonous you ate and died + +But then General Skeltal rides up and requests you join his Skeleton Army +[Continue Ded](../continueded/continueded.md) +[Arise and join General Skeltal](../resurrect/resurrect.md) \ No newline at end of file diff --git a/english/continueded/continueded.md b/english/continueded/continueded.md new file mode 100644 index 0000000000..21234be134 --- /dev/null +++ b/english/continueded/continueded.md @@ -0,0 +1,2 @@ +You have elected to remain ded. +The skeleton wars have ended and your bones have turned to dust. \ No newline at end of file diff --git a/english/resurrect/resurrect.md b/english/resurrect/resurrect.md new file mode 100644 index 0000000000..d2fd9e3153 --- /dev/null +++ b/english/resurrect/resurrect.md @@ -0,0 +1,5 @@ +With a doot doot on his magic flute, General Skeltal brings you back from ded. + +With no organs, skin, hair, or other human things, you are relieved of the need to eat, breathe, +and sleep. You are the perfect fighting machine and you will bring glory and victory to the +SKELETON ARMY! \ No newline at end of file From 027d1b6cc74938be500e83816eb49be78a71a5ab Mon Sep 17 00:00:00 2001 From: MURLOCO Date: Tue, 4 Oct 2016 13:51:27 -0400 Subject: [PATCH 4392/5486] Add line breaks. --- english/combatration/combat_ration.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/combatration/combat_ration.md b/english/combatration/combat_ration.md index 3a99212307..60fe121c16 100644 --- a/english/combatration/combat_ration.md +++ b/english/combatration/combat_ration.md @@ -2,5 +2,7 @@ this combat ration is so nice. it is poisonous you ate and died But then General Skeltal rides up and requests you join his Skeleton Army + [Continue Ded](../continueded/continueded.md) -[Arise and join General Skeltal](../resurrect/resurrect.md) \ No newline at end of file + +[Arise and join General Skeltal](../resurrect/resurrect.md) From 7203bc01bb6b56b7268a872a756e060e1c91e879 Mon Sep 17 00:00:00 2001 From: VeL77 Date: Wed, 5 Oct 2016 00:38:19 +0300 Subject: [PATCH 4393/5486] Add story line to magic.md --- english/magic/magic.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/magic/magic.md b/english/magic/magic.md index ca0931d7f3..843b8a6e94 100644 --- a/english/magic/magic.md +++ b/english/magic/magic.md @@ -16,3 +16,4 @@ Continue on to the port and get on the big ship. Valar morghulis Valar dohaeris +These words spoken and you are now a faceless man, a merceiless assassin, on your way back to Braavos. From 5257b7a0d0bf3162cdbcb9b02a292c00779b45ea Mon Sep 17 00:00:00 2001 From: Michael Doroff Date: Tue, 4 Oct 2016 21:12:29 -0500 Subject: [PATCH 4394/5486] Add new Markdown File --- english/banking/banking.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 english/banking/banking.md diff --git a/english/banking/banking.md b/english/banking/banking.md new file mode 100644 index 0000000000..23f276a121 --- /dev/null +++ b/english/banking/banking.md @@ -0,0 +1,2 @@ +There comes a time in everyone's life when you must choose a bank. Make sure it's one +that won't defraud you.' From c58ce5be5d382c347f68ffcb79ff20a799426aff Mon Sep 17 00:00:00 2001 From: Michael Doroff Date: Tue, 4 Oct 2016 21:21:35 -0500 Subject: [PATCH 4395/5486] Make changes to love-udacity --- english/love-udacity/love-udacity.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/love-udacity/love-udacity.md b/english/love-udacity/love-udacity.md index 8c1823f125..b25248ed26 100644 --- a/english/love-udacity/love-udacity.md +++ b/english/love-udacity/love-udacity.md @@ -10,4 +10,6 @@ The question is do you keep using the free courses or plump for the nano-degree? Never stop learning! -But when things are getting really difficult, are you going to [quit](../quit/quit.md) \ No newline at end of file +But when things are getting really difficult, are you going to [quit](../quit/quit.md) + +No you aren't going to quit. There are a ton of other resouces, just please keep trying!' From 70feb28c6961dafae50b7bbc9e9d0f784b9bfa52 Mon Sep 17 00:00:00 2001 From: Oleksii Karpenko Date: Wed, 5 Oct 2016 22:00:27 +0300 Subject: [PATCH 4396/5486] Add my part of story --- ukrainian/marshmallow.md | 4 +++- ukrainian/the-wall/the-wall.md | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 ukrainian/the-wall/the-wall.md diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index e960838b47..d6a7db590e 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -40,4 +40,6 @@ [Візьму мобілочку і почну переглядати серіали](tv-show/tv-show.md) -[Викличу потусторонні сили](daemon/daemon.md) \ No newline at end of file +[Викличу потусторонні сили](daemon/daemon.md) + +[В телефоні ж є музічний плеєр](the-wall/the-wall.md) \ No newline at end of file diff --git a/ukrainian/the-wall/the-wall.md b/ukrainian/the-wall/the-wall.md new file mode 100644 index 0000000000..b2b47e04c3 --- /dev/null +++ b/ukrainian/the-wall/the-wall.md @@ -0,0 +1,4 @@ +В будь яких незрозумілих ситуаціях тербі слухати "The Wall" Pink Floyd. +Навіть якщо стіна з зефіру + +[Далі рішення прийде на рівні підсвідомості...](../marshmallow.md) \ No newline at end of file From 9a1bd224ae46266bac4860976cc1e31c837cd029 Mon Sep 17 00:00:00 2001 From: Michael Doroff Date: Wed, 5 Oct 2016 19:37:21 -0500 Subject: [PATCH 4397/5486] Make jumping more palatable --- english/jump/jump.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/jump/jump.md b/english/jump/jump.md index b4569bc4d5..907f49a677 100644 --- a/english/jump/jump.md +++ b/english/jump/jump.md @@ -4,4 +4,7 @@ The wind rushes through your face and you hit terminal velocity, you're quickly and very relevant words of wisdom from your friends Arthur Dent and Ford Prefect. "Flying is easy, all you have to do is throw yourself at the ground and miss." -Fortunately, you have terrible aim and you glide to safety toward the ground. \ No newline at end of file +Fortunately, you have terrible aim and you glide to safety toward the ground. + + +And then live a happy life with your significant other. From c34b7809084a40c372ebf25dc3e6bef633f46d3d Mon Sep 17 00:00:00 2001 From: Michael Doroff Date: Wed, 5 Oct 2016 19:50:04 -0500 Subject: [PATCH 4398/5486] Changing files around --- english/banking/banking.md | 2 -- english/lisp/lisp.md | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 english/banking/banking.md diff --git a/english/banking/banking.md b/english/banking/banking.md deleted file mode 100644 index 23f276a121..0000000000 --- a/english/banking/banking.md +++ /dev/null @@ -1,2 +0,0 @@ -There comes a time in everyone's life when you must choose a bank. Make sure it's one -that won't defraud you.' diff --git a/english/lisp/lisp.md b/english/lisp/lisp.md index e0b4569495..21c4c2a8e1 100644 --- a/english/lisp/lisp.md +++ b/english/lisp/lisp.md @@ -4,3 +4,7 @@ It thunders, "We hold the path of the Righteous. Blessed be he who follows the s The prompt pops up. "Long live the lambda!" + + + + From 3c5cca3152685395b7dcf9e8a1ed85617abcdfc0 Mon Sep 17 00:00:00 2001 From: Matthew Nerger Date: Wed, 5 Oct 2016 22:04:43 -0400 Subject: [PATCH 4399/5486] Update marshmallow.md --- english/marshmallow.md | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index d5bd12fccb..e79c70c91f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -103,16 +103,26 @@ The type of extreme mortal danger that so often accompanies confectionary inspir Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. -The man is not large but not small, but not average either. He is reciting poetry in a language you assume to be Egyptian, -though you are not familiar with Egyptian. You only assume this because of the small pictograms that seem to rise into the -air above his head when he speaks. One looks like a small bird. Another a small insect. A third is for all appearances the -third car your father ever bought you, a small Fiat 500, which though in the picture above the man's head is purple, was -in reality more of a mauve. It had a tendency to bark whenever you drove it over hills, not like the proud great dane from -Nova Scotia that most smaller cars tend to imitate when taking on tasks greater than their strengths, but rather more like -the small pomerainian who is now barking at the blue music notes hovering over the man's large-ish head, now peeing on the -back of the sofa, making it difficult for you to remember the name of that dude you totally scored with in the back of your -Fiat 500. You're finding it difficult to think. You sit down on the sofa to gather your thoughts. You think of all the men -you slept with on your hitch hiking journeys across the southern american continent. +The man is not large but not small, but not average either. +He is reciting poetry in a language you assume to be Egyptian, +though you are not familiar with Egyptian. You only assume this +because of the small pictograms that seem to rise into the +air above his head when he speaks. One looks like a small bird. +Another a small insect. A third is for all appearances the +third car your father ever bought you, a small Fiat 500, which +though in the picture above the man's head is purple, was +in reality more of a mauve. It had a tendency to bark whenever +you drove it over hills, not like the proud great dane from +Nova Scotia that most smaller cars tend to imitate when taking +on tasks greater than their strengths, but rather more like +the small pomerainian who is now barking at the blue music notes +hovering over the man's large-ish head, now peeing on the +back of the sofa, making it difficult for you to remember the +name of that dude you totally scored with in the back of your +Fiat 500. You're finding it difficult to think. You sit down on +the sofa to gather your thoughts. You think of all the men +you slept with on your hitch hiking journeys across the southern +american continent. [Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) From 6e6a8b4341851d1a05b48bac7008e36a8598739c Mon Sep 17 00:00:00 2001 From: Chandler Tayek Date: Thu, 6 Oct 2016 01:52:09 -0700 Subject: [PATCH 4400/5486] docs: First commit meaning of life --- english/marshmallow.md | 3 +++ english/meaning-of-life/meaning-of-life.md | 1 + 2 files changed, 4 insertions(+) create mode 100644 english/meaning-of-life/meaning-of-life.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 0dc616eacc..fd05ad6e6a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1136,3 +1136,6 @@ Do you like [stargazing](stargazing/stargazing.md) ? Let's learn some [mandarin](learn-mandarin/learn-mandarin.md) Neurons for social memories, [more info](http://news.mit.edu/2016/scientists-identify-neurons-social-memory-0929) + +What is the meaning of life? +To find out click [here](meaning-of-life/meaning-of-life.md). \ No newline at end of file diff --git a/english/meaning-of-life/meaning-of-life.md b/english/meaning-of-life/meaning-of-life.md new file mode 100644 index 0000000000..fbf5c89a93 --- /dev/null +++ b/english/meaning-of-life/meaning-of-life.md @@ -0,0 +1 @@ +What you make of it. \ No newline at end of file From 84d97e181f186ce9fb7972157578169a16dc0c67 Mon Sep 17 00:00:00 2001 From: Aaron Monteabaro Date: Thu, 6 Oct 2016 13:06:38 -0400 Subject: [PATCH 4401/5486] Modify roaming_spirit Add beer_sandwich --- .../drag/roaming_spirit/beer_sandwich/beer_sandwich.md | 6 ++++++ english/forest/drag/roaming_spirit/roaming_spirit.md | 4 ++++ 2 files changed, 10 insertions(+) create mode 100644 english/forest/drag/roaming_spirit/beer_sandwich/beer_sandwich.md diff --git a/english/forest/drag/roaming_spirit/beer_sandwich/beer_sandwich.md b/english/forest/drag/roaming_spirit/beer_sandwich/beer_sandwich.md new file mode 100644 index 0000000000..d888f5848c --- /dev/null +++ b/english/forest/drag/roaming_spirit/beer_sandwich/beer_sandwich.md @@ -0,0 +1,6 @@ +You ask the other spirit if he knows any good places to eat. + +He laughs and say he was gonna ask you the same thing. Instead +he remarks on how he didn't know spirits got hungry. You both +laugh. I guess you made a new friend, but you're both still +hungry. diff --git a/english/forest/drag/roaming_spirit/roaming_spirit.md b/english/forest/drag/roaming_spirit/roaming_spirit.md index fd345c0e04..28c0932153 100644 --- a/english/forest/drag/roaming_spirit/roaming_spirit.md +++ b/english/forest/drag/roaming_spirit/roaming_spirit.md @@ -1,3 +1,7 @@ You wander around the forest and notice your new perceptions. The world seems livelier and full of colors and sounds. You see a man ahead of you, a spirit just like yourself. + +You're suddenly hungry. Do spirits get hungry? + +Ask the other spirit if he knows where to get [a beer and a sandwich](beer_sandwich/beer_sandwich.md). From e53e945dd2ef694c7e0529249dd6416332def2d8 Mon Sep 17 00:00:00 2001 From: Carlos Guerrero Castro Date: Thu, 6 Oct 2016 18:06:36 -0500 Subject: [PATCH 4402/5486] Continue the mutant story --- espanol/Mutantes/Mutantes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/Mutantes/Mutantes.md b/espanol/Mutantes/Mutantes.md index ef203863a4..bcad318985 100644 --- a/espanol/Mutantes/Mutantes.md +++ b/espanol/Mutantes/Mutantes.md @@ -5,3 +5,5 @@ ejercito enemigo y convirtiendolos en sus marionetas personales. Con lo que no contaba era con que existan algunos soldados fieles a l, lo cual afectaba su control mental, pues en ocasiones hacan todo lo contrario a lo que l quera. +En vista de este percance, hizo sucumbir a los que provocaban este desperfecto para evitar +futuros problemas en sus planes de dominacion. From 28d0311fc2719e9cbd7561d54326f77913438b5b Mon Sep 17 00:00:00 2001 From: Skye Date: Thu, 6 Oct 2016 16:31:47 -0700 Subject: [PATCH 4403/5486] Add-Adipose: Mot waking - Mom's Non Mellow Advice --- english/adipose/adipose.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/english/adipose/adipose.md b/english/adipose/adipose.md index 3e255aa030..6fe7cac439 100644 --- a/english/adipose/adipose.md +++ b/english/adipose/adipose.md @@ -15,4 +15,11 @@ I must resolve this marshmallow dream. [Wake Up](awake/awake.md) -You realize you can't wake up. Or you are already awake. But you must continue because \ No newline at end of file +You realize you can't wake up. Or you are already awake. But you must continue because + +winter is coming. + +Hot cocoa will be sold at nearly every street corner, and your sweet scent will likely have the drinkers plucking pieces of your being for their drinks. Sure, it's not right as it's not consensual, but you have a hazy memory of a long ago cold night where you were running after having just passed a cocoa house. The people all started following you with their warm, steamy cups held fully out as they chanted "mellows, mellows". It eirily reminded you of a story you read as a young fluff, but the chant was, "brains, brains". + +You couldn't quite decide whether you were awake or asleep, but as time was running out, you remembered something your mother always told you... +[Mom's Advice](../advice_from_mother/advice_from_mother.md) From e2e4066f82b78a14d96a13b74bc9eb069835ea2b Mon Sep 17 00:00:00 2001 From: Skye Date: Thu, 6 Oct 2016 16:40:06 -0700 Subject: [PATCH 4404/5486] Style: Add line breaks for Casey <120 char lines --- english/adipose/adipose.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/english/adipose/adipose.md b/english/adipose/adipose.md index 6fe7cac439..459c2a1e92 100644 --- a/english/adipose/adipose.md +++ b/english/adipose/adipose.md @@ -19,7 +19,15 @@ You realize you can't wake up. Or you are already awake. But you must continue b winter is coming. -Hot cocoa will be sold at nearly every street corner, and your sweet scent will likely have the drinkers plucking pieces of your being for their drinks. Sure, it's not right as it's not consensual, but you have a hazy memory of a long ago cold night where you were running after having just passed a cocoa house. The people all started following you with their warm, steamy cups held fully out as they chanted "mellows, mellows". It eirily reminded you of a story you read as a young fluff, but the chant was, "brains, brains". +Hot cocoa will be sold at nearly every street corner, and your sweet +scent will likely have the drinkers plucking pieces of your being for their drinks. -You couldn't quite decide whether you were awake or asleep, but as time was running out, you remembered something your mother always told you... +Sure, it's not right as it's not consensual, but you have a hazy memory +of a long ago cold night where you were running after having just +passed a cocoa house. The people all started following you with their +warm, steamy cups held fully out as they chanted "mellows, mellows". +It eirily reminded you of a story you read as a young fluff, but the chant was, "brains, brains". + +You couldn't quite decide whether you were awake or asleep, +but as time was running out, you remembered something your mother always told you... [Mom's Advice](../advice_from_mother/advice_from_mother.md) From 62ceefb9c2ec01d2b0a13e10fbc516a7564085e3 Mon Sep 17 00:00:00 2001 From: Skye Date: Thu, 6 Oct 2016 18:18:50 -0700 Subject: [PATCH 4405/5486] Edit - Take 2 - Add CRLF at the end of most lines --- english/adipose/adipose.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/adipose/adipose.md b/english/adipose/adipose.md index 459c2a1e92..8846b01f3f 100644 --- a/english/adipose/adipose.md +++ b/english/adipose/adipose.md @@ -22,10 +22,10 @@ winter is coming. Hot cocoa will be sold at nearly every street corner, and your sweet scent will likely have the drinkers plucking pieces of your being for their drinks. -Sure, it's not right as it's not consensual, but you have a hazy memory +Sure, it's not right as it's not consensual, but you have a hazy memory of a long ago cold night where you were running after having just passed a cocoa house. The people all started following you with their -warm, steamy cups held fully out as they chanted "mellows, mellows". +warm, steamy cups held fully out as they chanted "mellows, mellows". It eirily reminded you of a story you read as a young fluff, but the chant was, "brains, brains". You couldn't quite decide whether you were awake or asleep, From cef7ec263e06bcb3ecb2e12dc5ef38e89e8fad2d Mon Sep 17 00:00:00 2001 From: Bachet Date: Fri, 7 Oct 2016 04:25:49 +0200 Subject: [PATCH 4406/5486] German - Bachet Story --- german/Singen/Fischerboot/fischer-boot.md | 7 +++++++ german/Singen/Walen/walen.md | 8 ++++++++ german/Singen/Welle/welle.md | 3 +++ german/Singen/singen.md | 6 ++++++ german/ruderboot.md | 4 +++- 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 german/Singen/Fischerboot/fischer-boot.md create mode 100644 german/Singen/Walen/walen.md create mode 100644 german/Singen/Welle/welle.md create mode 100644 german/Singen/singen.md diff --git a/german/Singen/Fischerboot/fischer-boot.md b/german/Singen/Fischerboot/fischer-boot.md new file mode 100644 index 0000000000..4e507b7555 --- /dev/null +++ b/german/Singen/Fischerboot/fischer-boot.md @@ -0,0 +1,7 @@ +Die Boot-Männer nehmen Sie und füttern Sie auch. +Seit sie Sie mit ihnen hatten, haben sie zu viele Fische täglich. +sie bleiben länger im Meer, so dass der Fischgeruch ist rund um das Boot zu verbreiten. +Eine Gruppe von Walen kommt und starten Sie das Boot aber alle Fische, die sie haben, sind klein angreifen. +sie entscheiden über die Start einer der Männer zu werfen, um die Wale zu halten weg. + +[sie werfen Sie](Walen/walen.md) \ No newline at end of file diff --git a/german/Singen/Walen/walen.md b/german/Singen/Walen/walen.md new file mode 100644 index 0000000000..d0fb9e7430 --- /dev/null +++ b/german/Singen/Walen/walen.md @@ -0,0 +1,8 @@ +Sie denken, dass Sie einer der Freunde diese Walen sein können und sie werden Ihnen helfen, wie Sie auf die National-Geographic sah. + +Ruhe in Frieden, mein Freund! + +Die weise Männer sagten einmal: +[Übung macht den Meister](https://www.youtube.com/watch?v=sS0PZSrI-GI) + +:) \ No newline at end of file diff --git a/german/Singen/Welle/welle.md b/german/Singen/Welle/welle.md new file mode 100644 index 0000000000..15a7138263 --- /dev/null +++ b/german/Singen/Welle/welle.md @@ -0,0 +1,3 @@ +Sie trinken viel Salzwasser und aufhören zu singen. Sie störte die Stetigkeit des Wassers, das die Aufmerksamkeit eines Raubfische bekommt. Dieser Fisch wurde von einer Gruppe von Walen gejagt. + +[Der Fisch entkommt und lässt Sie zu den Walen.](Walen/walen.md) \ No newline at end of file diff --git a/german/Singen/singen.md b/german/Singen/singen.md new file mode 100644 index 0000000000..0ad46f6fbb --- /dev/null +++ b/german/Singen/singen.md @@ -0,0 +1,6 @@ +Sie können sich nicht selbst stabilisieren und beginnen in Wasser zu fallen, aber nach einiger Panik, erfahren Sie, wie Sie Ihren Rücken zu strecken. +Sie beginnen, ein geeignetes Lied zu singen. [z.B. Cold Water](https://www.youtube.com/watch?v=a59gmGkq_pw) + +[Eine hohe Welle kommt.](Welle/welle.md) +[Sie werden von einem Fischerboot gefunden.](Fischerboot/fischer-boot.md) +[Ihre Frequenz eine Gruppe von Walen genannt.](Walen/walen.md) diff --git a/german/ruderboot.md b/german/ruderboot.md index bd79671d4b..7b402471ef 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -34,4 +34,6 @@ Werden Sie: [Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) -[Nase zuhalten und ins Wurstwasser springen](Wurstwasser/wurstwasser.md) \ No newline at end of file +[Nase zuhalten und ins Wurstwasser springen](Wurstwasser/wurstwasser.md) + +[Strecken den Rcken auf dem Wasser und beginnen zu singen und auf Hilfe warten](Singen/singen.md) \ No newline at end of file From 0221de8b5911afb374a571f93644ebbc3a6a14f2 Mon Sep 17 00:00:00 2001 From: Bachet Date: Fri, 7 Oct 2016 12:06:45 +0200 Subject: [PATCH 4407/5486] Continue German Story - Bachet --- german/Singen/Walen/walen.md | 2 +- german/Singen/Welle/welle.md | 4 +++- german/Singen/singen.md | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/german/Singen/Walen/walen.md b/german/Singen/Walen/walen.md index d0fb9e7430..9936f6256f 100644 --- a/german/Singen/Walen/walen.md +++ b/german/Singen/Walen/walen.md @@ -1,4 +1,4 @@ -Sie denken, dass Sie einer der Freunde diese Walen sein können und sie werden Ihnen helfen, wie Sie auf die National-Geographic sah. +Sie denken, dass Sie einer Freunde diese Walen sein können und sie werden Ihnen helfen, wie Sie auf die [Nat Geo](http://www.nationalgeographic.com/) sah. Ruhe in Frieden, mein Freund! diff --git a/german/Singen/Welle/welle.md b/german/Singen/Welle/welle.md index 15a7138263..c3c98af922 100644 --- a/german/Singen/Welle/welle.md +++ b/german/Singen/Welle/welle.md @@ -1,3 +1,5 @@ -Sie trinken viel Salzwasser und aufhören zu singen. Sie störte die Stetigkeit des Wassers, das die Aufmerksamkeit eines Raubfische bekommt. Dieser Fisch wurde von einer Gruppe von Walen gejagt. +Sie trinken viel Salzwasser und aufhören zu singen. +Sie störte die Stetigkeit des Wassers, das die Aufmerksamkeit eines Raubfische bekommt. +Dieser Fisch wurde von einer Gruppe von Walen gejagt. [Der Fisch entkommt und lässt Sie zu den Walen.](Walen/walen.md) \ No newline at end of file diff --git a/german/Singen/singen.md b/german/Singen/singen.md index 0ad46f6fbb..44d8170e54 100644 --- a/german/Singen/singen.md +++ b/german/Singen/singen.md @@ -1,6 +1,7 @@ -Sie können sich nicht selbst stabilisieren und beginnen in Wasser zu fallen, aber nach einiger Panik, erfahren Sie, wie Sie Ihren Rücken zu strecken. -Sie beginnen, ein geeignetes Lied zu singen. [z.B. Cold Water](https://www.youtube.com/watch?v=a59gmGkq_pw) +Sie können sich nicht selbst stabilisieren und beginnen in Wasser zu fallen. +Sie erfaheren nach einiger Panik, wenn Sie Ihren Rücken strecken. +Sie beginnen, ein geeignetes Lied zu singen. z.B. [Cold Water](https://www.youtube.com/watch?v=a59gmGkq_pw) [Eine hohe Welle kommt.](Welle/welle.md) [Sie werden von einem Fischerboot gefunden.](Fischerboot/fischer-boot.md) -[Ihre Frequenz eine Gruppe von Walen genannt.](Walen/walen.md) +[Ihre Frequenz eine Gruppe von Walen genannt.](Walen/walen.md) \ No newline at end of file From a9abb72c46ad22426c19ccea2ea9b071babca4ce Mon Sep 17 00:00:00 2001 From: Bachet Date: Fri, 7 Oct 2016 12:12:24 +0200 Subject: [PATCH 4408/5486] Continue Story - Bachet --- german/Singen/Fischerboot/fischer-boot.md | 7 ------- german/Singen/singen.md | 6 ++++++ german/ruderboot.md | 4 +--- 3 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 german/Singen/Fischerboot/fischer-boot.md diff --git a/german/Singen/Fischerboot/fischer-boot.md b/german/Singen/Fischerboot/fischer-boot.md deleted file mode 100644 index 4e507b7555..0000000000 --- a/german/Singen/Fischerboot/fischer-boot.md +++ /dev/null @@ -1,7 +0,0 @@ -Die Boot-Männer nehmen Sie und füttern Sie auch. -Seit sie Sie mit ihnen hatten, haben sie zu viele Fische täglich. -sie bleiben länger im Meer, so dass der Fischgeruch ist rund um das Boot zu verbreiten. -Eine Gruppe von Walen kommt und starten Sie das Boot aber alle Fische, die sie haben, sind klein angreifen. -sie entscheiden über die Start einer der Männer zu werfen, um die Wale zu halten weg. - -[sie werfen Sie](Walen/walen.md) \ No newline at end of file diff --git a/german/Singen/singen.md b/german/Singen/singen.md index 44d8170e54..b52f859acb 100644 --- a/german/Singen/singen.md +++ b/german/Singen/singen.md @@ -1,7 +1,13 @@ Sie können sich nicht selbst stabilisieren und beginnen in Wasser zu fallen. + Sie erfaheren nach einiger Panik, wenn Sie Ihren Rücken strecken. + Sie beginnen, ein geeignetes Lied zu singen. z.B. [Cold Water](https://www.youtube.com/watch?v=a59gmGkq_pw) +Plötzlich :O + [Eine hohe Welle kommt.](Welle/welle.md) + [Sie werden von einem Fischerboot gefunden.](Fischerboot/fischer-boot.md) + [Ihre Frequenz eine Gruppe von Walen genannt.](Walen/walen.md) \ No newline at end of file diff --git a/german/ruderboot.md b/german/ruderboot.md index 7b402471ef..bd79671d4b 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -34,6 +34,4 @@ Werden Sie: [Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) -[Nase zuhalten und ins Wurstwasser springen](Wurstwasser/wurstwasser.md) - -[Strecken den Rcken auf dem Wasser und beginnen zu singen und auf Hilfe warten](Singen/singen.md) \ No newline at end of file +[Nase zuhalten und ins Wurstwasser springen](Wurstwasser/wurstwasser.md) \ No newline at end of file From 731f712a841984aa1903c80f7e4bff564c9f423f Mon Sep 17 00:00:00 2001 From: Bachet Date: Fri, 7 Oct 2016 15:06:25 +0200 Subject: [PATCH 4409/5486] all less than 120 character per line --- german/Singen/Walen/walen.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/german/Singen/Walen/walen.md b/german/Singen/Walen/walen.md index 9936f6256f..e7d11362d8 100644 --- a/german/Singen/Walen/walen.md +++ b/german/Singen/Walen/walen.md @@ -1,8 +1,11 @@ -Sie denken, dass Sie einer Freunde diese Walen sein können und sie werden Ihnen helfen, wie Sie auf die [Nat Geo](http://www.nationalgeographic.com/) sah. +Sie denken, dass Sie einer Freunde diese Walen sein können und sie werden Ihnen helfen. + +Leben geht nicht wie Sie auf die [Nat Geo](http://www.nationalgeographic.com/) sah. Ruhe in Frieden, mein Freund! Die weise Männer sagten einmal: + [Übung macht den Meister](https://www.youtube.com/watch?v=sS0PZSrI-GI) :) \ No newline at end of file From 1558a81250eb22f58eb0b6edd57dcb50703bd0f4 Mon Sep 17 00:00:00 2001 From: Bachet Date: Fri, 7 Oct 2016 15:12:23 +0200 Subject: [PATCH 4410/5486] updates --- german/Singen/Fischerboot/fischer-boot.md | 11 +++++++++++ german/Singen/Welle/welle.md | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 german/Singen/Fischerboot/fischer-boot.md diff --git a/german/Singen/Fischerboot/fischer-boot.md b/german/Singen/Fischerboot/fischer-boot.md new file mode 100644 index 0000000000..32ecbb2b60 --- /dev/null +++ b/german/Singen/Fischerboot/fischer-boot.md @@ -0,0 +1,11 @@ +Die Boot-Männer nehmen Sie und füttern Sie auch. + +Seit sie Sie mit ihnen hatten, haben sie zu viele Fische täglich. + +sie bleiben länger im Meer, so dass der Fischgeruch ist rund um das Boot zu verbreiten. + +Eine Gruppe von Walen kommt und starten Sie das Boot aber alle Fische, die sie haben, sind klein angreifen. + +sie entscheiden über die Start einer der Männer zu werfen, um die Wale zu halten weg. + +[sie werfen Sie](../Walen/walen.md) \ No newline at end of file diff --git a/german/Singen/Welle/welle.md b/german/Singen/Welle/welle.md index c3c98af922..ae971e385c 100644 --- a/german/Singen/Welle/welle.md +++ b/german/Singen/Welle/welle.md @@ -1,5 +1,7 @@ Sie trinken viel Salzwasser und aufhören zu singen. + Sie störte die Stetigkeit des Wassers, das die Aufmerksamkeit eines Raubfische bekommt. + Dieser Fisch wurde von einer Gruppe von Walen gejagt. -[Der Fisch entkommt und lässt Sie zu den Walen.](Walen/walen.md) \ No newline at end of file +[Der Fisch entkommt und lässt Sie zu den Walen.](../Walen/walen.md) \ No newline at end of file From 7f5c1a1c1c3105ff5c4b81ecac66a4973c597340 Mon Sep 17 00:00:00 2001 From: Bachet Date: Fri, 7 Oct 2016 15:16:14 +0200 Subject: [PATCH 4411/5486] last update --- german/ruderboot.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/ruderboot.md b/german/ruderboot.md index bd79671d4b..31def12ce6 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -34,4 +34,6 @@ Werden Sie: [Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) -[Nase zuhalten und ins Wurstwasser springen](Wurstwasser/wurstwasser.md) \ No newline at end of file +[Nase zuhalten und ins Wurstwasser springen](Wurstwasser/wurstwasser.md) + +[Strecken Ihre Rcken auf dem Wasser und beginnen zu singen](Singen/singen.md) \ No newline at end of file From 6858f10e35bc9cd2eaff5d7e3714845d6eaaba42 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 7 Oct 2016 12:25:19 -0400 Subject: [PATCH 4412/5486] Add computer man --- english/Computer-Man/Computer-Man.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/Computer-Man/Computer-Man.md diff --git a/english/Computer-Man/Computer-Man.md b/english/Computer-Man/Computer-Man.md new file mode 100644 index 0000000000..1d03c9afae --- /dev/null +++ b/english/Computer-Man/Computer-Man.md @@ -0,0 +1,3 @@ +You're walking down the street, and the glint of a flashy new computer +catches your eye through the window. You walk into the store, and +meet.......the [computer man](https://www.youtube.com/watch?v=Hm4E8TcjF70). \ No newline at end of file From 9da6b3688bcbcc282f96eaa541c20a6735fea476 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 7 Oct 2016 12:36:24 -0400 Subject: [PATCH 4413/5486] Add link to my story from main story --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index fd05ad6e6a..f1f66d8e13 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1138,4 +1138,6 @@ Let's learn some [mandarin](learn-mandarin/learn-mandarin.md) Neurons for social memories, [more info](http://news.mit.edu/2016/scientists-identify-neurons-social-memory-0929) What is the meaning of life? -To find out click [here](meaning-of-life/meaning-of-life.md). \ No newline at end of file +To find out click [here](meaning-of-life/meaning-of-life.md). + +What is that shiny in the window? Come in and take a [look](Computer-Man.md) \ No newline at end of file From 6dcc5bd39e131acaf35d126a71a9d55dfd01c3bb Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 7 Oct 2016 13:06:50 -0400 Subject: [PATCH 4414/5486] Fix broken link --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index f1f66d8e13..4a27e8025b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1140,4 +1140,5 @@ Neurons for social memories, [more info](http://news.mit.edu/2016/scientists-ide What is the meaning of life? To find out click [here](meaning-of-life/meaning-of-life.md). -What is that shiny in the window? Come in and take a [look](Computer-Man.md) \ No newline at end of file +What is that shiny in the window? Come in and take a +[look](Computer-Man.md) \ No newline at end of file From f9927441dfe8e64854ed8984b96631ed51dc707a Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 7 Oct 2016 13:09:16 -0400 Subject: [PATCH 4415/5486] Fixed link path to add folder --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 4a27e8025b..7c0d01a9f3 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1141,4 +1141,4 @@ What is the meaning of life? To find out click [here](meaning-of-life/meaning-of-life.md). What is that shiny in the window? Come in and take a -[look](Computer-Man.md) \ No newline at end of file +[look](Computer-Man/Computer-Man.md) \ No newline at end of file From 7bebc15888d689ec30d5e32e16b750073c5fbbe6 Mon Sep 17 00:00:00 2001 From: Miguel Fernandez Date: Fri, 7 Oct 2016 13:45:31 -0400 Subject: [PATCH 4416/5486] Crea archivo castillo.md Este archivo, se utilizara como la referencia en el archivo canudos.md --- espanol/inverlandia/castillo.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 espanol/inverlandia/castillo.md diff --git a/espanol/inverlandia/castillo.md b/espanol/inverlandia/castillo.md new file mode 100644 index 0000000000..e69de29bb2 From b2fb4fe418c37289af060060057aaa57c880dfc5 Mon Sep 17 00:00:00 2001 From: Miguel Fernandez Date: Fri, 7 Oct 2016 13:52:57 -0400 Subject: [PATCH 4417/5486] Escribiendo la historia en el archivo --- espanol/inverlandia/castillo.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/inverlandia/castillo.md b/espanol/inverlandia/castillo.md index e69de29bb2..371b9b5c41 100644 --- a/espanol/inverlandia/castillo.md +++ b/espanol/inverlandia/castillo.md @@ -0,0 +1 @@ +Llego el invierno como Ned lo prometio, Jon y Sansa lo reciben juntos en Inverlandia. From 898f3a6ab9ee4b03f32defc3a82ec8fde9a7108e Mon Sep 17 00:00:00 2001 From: Miguel Fernandez Date: Fri, 7 Oct 2016 13:54:33 -0400 Subject: [PATCH 4418/5486] Cambia nombre arc., castillo.md -> inverlandia.md Me parecio mas apropiado cambiar el nombre del archivo a inverlandia. --- espanol/inverlandia/inverlandia.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/inverlandia/inverlandia.md diff --git a/espanol/inverlandia/inverlandia.md b/espanol/inverlandia/inverlandia.md new file mode 100644 index 0000000000..371b9b5c41 --- /dev/null +++ b/espanol/inverlandia/inverlandia.md @@ -0,0 +1 @@ +Llego el invierno como Ned lo prometio, Jon y Sansa lo reciben juntos en Inverlandia. From df68f4d023b594446d45961e6c0ecfb353d873ae Mon Sep 17 00:00:00 2001 From: Miguel Fernandez Date: Fri, 7 Oct 2016 14:08:23 -0400 Subject: [PATCH 4419/5486] Edita el archivo canudos.md --- espanol/canudos.md | 2 ++ espanol/inverlandia/castillo.md | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 espanol/inverlandia/castillo.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 1f723a03eb..e945233a88 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -172,3 +172,5 @@ Y cada invitado podria comer [tantas como quisiera](exageracion/exageracion.md). Se servirian las siguientes arepas: Reina Pepeada, Mechada con amarillo, y Jamon con queso de cabra. + +Llego el [invierno](inverlandia/inverlandia.md). diff --git a/espanol/inverlandia/castillo.md b/espanol/inverlandia/castillo.md deleted file mode 100644 index 371b9b5c41..0000000000 --- a/espanol/inverlandia/castillo.md +++ /dev/null @@ -1 +0,0 @@ -Llego el invierno como Ned lo prometio, Jon y Sansa lo reciben juntos en Inverlandia. From c71d04a5b6061b6573fb8df3faec693dd0a88912 Mon Sep 17 00:00:00 2001 From: ItaiMaoz Date: Fri, 7 Oct 2016 12:14:18 -0700 Subject: [PATCH 4420/5486] Add restart --- english/Computer-Man/Computer-Man.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/Computer-Man/Computer-Man.md b/english/Computer-Man/Computer-Man.md index 1d03c9afae..8cedb2bdb7 100644 --- a/english/Computer-Man/Computer-Man.md +++ b/english/Computer-Man/Computer-Man.md @@ -1,3 +1,5 @@ You're walking down the street, and the glint of a flashy new computer catches your eye through the window. You walk into the store, and -meet.......the [computer man](https://www.youtube.com/watch?v=Hm4E8TcjF70). \ No newline at end of file +meet.......the [computer man](https://www.youtube.com/watch?v=Hm4E8TcjF70). + +[Restart] (../Marshmallow.md) From 54a9506e5f4cce3b8d7e724437e27690ce7bea20 Mon Sep 17 00:00:00 2001 From: ItaiMaoz Date: Fri, 7 Oct 2016 12:14:59 -0700 Subject: [PATCH 4421/5486] Update Computer-Man.md --- english/Computer-Man/Computer-Man.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/Computer-Man/Computer-Man.md b/english/Computer-Man/Computer-Man.md index 8cedb2bdb7..cda27b4f17 100644 --- a/english/Computer-Man/Computer-Man.md +++ b/english/Computer-Man/Computer-Man.md @@ -2,4 +2,4 @@ You're walking down the street, and the glint of a flashy new computer catches your eye through the window. You walk into the store, and meet.......the [computer man](https://www.youtube.com/watch?v=Hm4E8TcjF70). -[Restart] (../Marshmallow.md) +[Restart] (./Marshmallow.md) From 378cd8f0d444434f4feabf8081e4b6e3885e4f69 Mon Sep 17 00:00:00 2001 From: ItaiMaoz Date: Fri, 7 Oct 2016 12:15:25 -0700 Subject: [PATCH 4422/5486] Update Computer-Man.md --- english/Computer-Man/Computer-Man.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/Computer-Man/Computer-Man.md b/english/Computer-Man/Computer-Man.md index cda27b4f17..523c4ebd33 100644 --- a/english/Computer-Man/Computer-Man.md +++ b/english/Computer-Man/Computer-Man.md @@ -2,4 +2,4 @@ You're walking down the street, and the glint of a flashy new computer catches your eye through the window. You walk into the store, and meet.......the [computer man](https://www.youtube.com/watch?v=Hm4E8TcjF70). -[Restart] (./Marshmallow.md) +[Restart] (../../Marshmallow.md) From 4b1ccf94638836be107fc5bc0032178b04ced571 Mon Sep 17 00:00:00 2001 From: ItaiMaoz Date: Fri, 7 Oct 2016 12:36:25 -0700 Subject: [PATCH 4423/5486] Update Computer-Man.md --- english/Computer-Man/Computer-Man.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/Computer-Man/Computer-Man.md b/english/Computer-Man/Computer-Man.md index 523c4ebd33..12bb612ca1 100644 --- a/english/Computer-Man/Computer-Man.md +++ b/english/Computer-Man/Computer-Man.md @@ -2,4 +2,4 @@ You're walking down the street, and the glint of a flashy new computer catches your eye through the window. You walk into the store, and meet.......the [computer man](https://www.youtube.com/watch?v=Hm4E8TcjF70). -[Restart] (../../Marshmallow.md) +[Restart] (/Marshmallow.md) From 8133751736b85b6016abd7ac27db1c6db3009162 Mon Sep 17 00:00:00 2001 From: ItaiMaoz Date: Fri, 7 Oct 2016 12:36:52 -0700 Subject: [PATCH 4424/5486] Update Computer-Man.md --- english/Computer-Man/Computer-Man.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/Computer-Man/Computer-Man.md b/english/Computer-Man/Computer-Man.md index 12bb612ca1..af3e6fb42d 100644 --- a/english/Computer-Man/Computer-Man.md +++ b/english/Computer-Man/Computer-Man.md @@ -2,4 +2,4 @@ You're walking down the street, and the glint of a flashy new computer catches your eye through the window. You walk into the store, and meet.......the [computer man](https://www.youtube.com/watch?v=Hm4E8TcjF70). -[Restart] (/Marshmallow.md) +[Restart] (/../Marshmallow.md) From c507172c0ad0c0d8c2f70888d5e484d15b02caf7 Mon Sep 17 00:00:00 2001 From: ItaiMaoz Date: Fri, 7 Oct 2016 12:38:50 -0700 Subject: [PATCH 4425/5486] Update Computer-Man.md --- english/Computer-Man/Computer-Man.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/Computer-Man/Computer-Man.md b/english/Computer-Man/Computer-Man.md index af3e6fb42d..8cedb2bdb7 100644 --- a/english/Computer-Man/Computer-Man.md +++ b/english/Computer-Man/Computer-Man.md @@ -2,4 +2,4 @@ You're walking down the street, and the glint of a flashy new computer catches your eye through the window. You walk into the store, and meet.......the [computer man](https://www.youtube.com/watch?v=Hm4E8TcjF70). -[Restart] (/../Marshmallow.md) +[Restart] (../Marshmallow.md) From 31243c300ab8ed081e2a0cdf41e0aa4eef17f762 Mon Sep 17 00:00:00 2001 From: ItaiMaoz Date: Fri, 7 Oct 2016 12:39:46 -0700 Subject: [PATCH 4426/5486] Update Computer-Man.md --- english/Computer-Man/Computer-Man.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/Computer-Man/Computer-Man.md b/english/Computer-Man/Computer-Man.md index 8cedb2bdb7..e196d4853e 100644 --- a/english/Computer-Man/Computer-Man.md +++ b/english/Computer-Man/Computer-Man.md @@ -2,4 +2,4 @@ You're walking down the street, and the glint of a flashy new computer catches your eye through the window. You walk into the store, and meet.......the [computer man](https://www.youtube.com/watch?v=Hm4E8TcjF70). -[Restart] (../Marshmallow.md) +[Restart] (../marshmallow.md) From e8584e7d6f21b5c9450d049ddebd93d9e71e567d Mon Sep 17 00:00:00 2001 From: Miguel Cardoso Date: Sat, 8 Oct 2016 20:00:01 +0100 Subject: [PATCH 4427/5486] Adicionar ideia a portugues_pt/mundo/voltaaomundo.md --- portugues_pt/mundo/voltaaomundo.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/portugues_pt/mundo/voltaaomundo.md b/portugues_pt/mundo/voltaaomundo.md index 17548aa67d..076346dbd9 100644 --- a/portugues_pt/mundo/voltaaomundo.md +++ b/portugues_pt/mundo/voltaaomundo.md @@ -14,3 +14,6 @@ O que seria este algo faltando? [Fundava uma nova Startup](startup/startup.md) Mas no daria para fazer tudo isso. Teria que escolher. + +Doar 1,000,000 ao IPO Porto! + From 5443a4596f3237325f731e585d7e0614353068a2 Mon Sep 17 00:00:00 2001 From: Fabian Date: Sat, 8 Oct 2016 22:19:41 +0200 Subject: [PATCH 4428/5486] add beten option --- german/beten/beten.md | 2 ++ german/ruderboot.md | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 german/beten/beten.md diff --git a/german/beten/beten.md b/german/beten/beten.md new file mode 100644 index 0000000000..794e3a8af3 --- /dev/null +++ b/german/beten/beten.md @@ -0,0 +1,2 @@ +Ihr Gebet wurde erhoert. Das fliegende Spaghettimonster erloest sie von ihrem Leid und laesst Sie in den Himmel aufsteigen. Sie genieen +den Biervulkan und die Stripperinnen, bis die SS zuschlaegt. \ No newline at end of file diff --git a/german/ruderboot.md b/german/ruderboot.md index 31def12ce6..f5843e8dde 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -36,4 +36,6 @@ Werden Sie: [Nase zuhalten und ins Wurstwasser springen](Wurstwasser/wurstwasser.md) -[Strecken Ihre Rcken auf dem Wasser und beginnen zu singen](Singen/singen.md) \ No newline at end of file +[Strecken Ihre Rcken auf dem Wasser und beginnen zu singen](Singen/singen.md) + +[Zum fliegenden Spaghettimonster beten, damit sie ueberleben?](beten/beten.md) \ No newline at end of file From 82a51e26a0b681cbe818667dd7937c30733e3f6e Mon Sep 17 00:00:00 2001 From: yolomeus Date: Sat, 8 Oct 2016 22:28:51 +0200 Subject: [PATCH 4429/5486] Update beten.md --- german/beten/beten.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/german/beten/beten.md b/german/beten/beten.md index 794e3a8af3..3dd114068e 100644 --- a/german/beten/beten.md +++ b/german/beten/beten.md @@ -1,2 +1,3 @@ -Ihr Gebet wurde erhoert. Das fliegende Spaghettimonster erloest sie von ihrem Leid und laesst Sie in den Himmel aufsteigen. Sie genieen -den Biervulkan und die Stripperinnen, bis die SS zuschlaegt. \ No newline at end of file +Ihr Gebet wurde erhoert. Das fliegende Spaghettimonster erloest sie von ihrem Leid +und laesst Sie in den Himmel aufsteigen. Sie genießen +den Biervulkan und die Stripperinnen, bis die SS zuschlaegt. From 67778be5df43c7a6213282b78a87fc7aea735250 Mon Sep 17 00:00:00 2001 From: nibdey Date: Sat, 8 Oct 2016 19:55:23 -0400 Subject: [PATCH 4430/5486] adding oriya --- language.md | 2 ++ oriya/oriya.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 oriya/oriya.md diff --git a/language.md b/language.md index 8f76e49066..b1495c973b 100644 --- a/language.md +++ b/language.md @@ -152,4 +152,6 @@ If GibberisHkjsbckjsjcn,[hereeekdcskj](Gibberish/Gibberish.md) To explore the বাংলা (bangla/bengali) search engine, news portals, and blogs [click here](bangla/bangla-portals.md). +If you speak oriya, click [here](oriya/oriya.md). + If you understand Tamil, திருநாவுக்கரசர் அருளிய தேவாரம் [இங்கே அழுத்தவும்](Tamil/Thevaram/thevarm.md) diff --git a/oriya/oriya.md b/oriya/oriya.md new file mode 100644 index 0000000000..3f47911fc7 --- /dev/null +++ b/oriya/oriya.md @@ -0,0 +1 @@ +Kemiti acha? From 4c3a67c40909c6453ab4677b36c84d3f7bb66c75 Mon Sep 17 00:00:00 2001 From: testaccount Date: Sat, 8 Oct 2016 23:53:15 -0400 Subject: [PATCH 4431/5486] add lines about animals and bamboo --- english/animal/animal.md | 3 +++ english/bamboo/bamboo-shoots.md | 1 + 2 files changed, 4 insertions(+) diff --git a/english/animal/animal.md b/english/animal/animal.md index c01c803917..b1b92d13df 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -34,3 +34,6 @@ phone numbers? This could happen. And you could exchange phone numbers and maybe spend the rest of your lives together, just because you chose to get a hedgehog, rather than a mouse!! + +My mother was a butterfly. Is that true? No it is not. + diff --git a/english/bamboo/bamboo-shoots.md b/english/bamboo/bamboo-shoots.md index a25506af32..c24627a7ed 100644 --- a/english/bamboo/bamboo-shoots.md +++ b/english/bamboo/bamboo-shoots.md @@ -9,3 +9,4 @@ You don't know what to do.The pandas continue to walk towards you. You begin retreating slowly.Suddenly,one of the pandas speed up. +How strong is scaffolding made of bamboo you ask? From 3b7bdf4ab0d6e04e3ad2a27a83a89a85c5f008a7 Mon Sep 17 00:00:00 2001 From: Wolfgang Stemberger Date: Sun, 9 Oct 2016 14:35:54 +0200 Subject: [PATCH 4432/5486] add a sentence on attractive woman --- .../aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/german/finger-ins-loch/hoelzernes-Paddel/aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md b/german/finger-ins-loch/hoelzernes-Paddel/aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md index 0079cfaef1..47d853fc2d 100644 --- a/german/finger-ins-loch/hoelzernes-Paddel/aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md +++ b/german/finger-ins-loch/hoelzernes-Paddel/aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md @@ -1,3 +1,6 @@ Sie werden herzlich aufgenommen, als Held gefeiert und eingeladen mitzutanzen. Nach ein paar Tänzen sind Sie selber so in Ekstase, dass Sie sich auf -der Stelle ein Boot, mit einem Loch, auf den Bauch tätowieren lassen. \ No newline at end of file +der Stelle ein Boot, mit einem Loch, auf den Bauch tätowieren lassen. + +Nun beginnen Sie sich in die tanzende Menge zu mischen und ziehen die Blicke +einer attraktiven Frau auf sich. \ No newline at end of file From 70af3930f42cf03dfa06d4fce3ca064ede4a4c52 Mon Sep 17 00:00:00 2001 From: Wolfgang Stemberger Date: Sun, 9 Oct 2016 14:43:54 +0200 Subject: [PATCH 4433/5486] add sentence on starting rain --- .../aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/finger-ins-loch/hoelzernes-Paddel/aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md b/german/finger-ins-loch/hoelzernes-Paddel/aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md index 47d853fc2d..9560e4c43c 100644 --- a/german/finger-ins-loch/hoelzernes-Paddel/aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md +++ b/german/finger-ins-loch/hoelzernes-Paddel/aufmerksam_machen/ans_Ufer_ziehen/am_Ufer.md @@ -3,4 +3,4 @@ Nach ein paar Tänzen sind Sie selber so in Ekstase, dass Sie sich auf der Stelle ein Boot, mit einem Loch, auf den Bauch tätowieren lassen. Nun beginnen Sie sich in die tanzende Menge zu mischen und ziehen die Blicke -einer attraktiven Frau auf sich. \ No newline at end of file +einer attraktiven Frau auf sich. Ploetzlich faengt es stark zu regnen an. \ No newline at end of file From 9c8520e3abe0e916323b52286a8e5bd6a232ba44 Mon Sep 17 00:00:00 2001 From: Siarhei Barsukou Date: Mon, 10 Oct 2016 12:17:08 +0300 Subject: [PATCH 4434/5486] Add garden story sentences --- russian/garden/garden.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/garden/garden.md b/russian/garden/garden.md index 8932fc6811..889cf3160a 100644 --- a/russian/garden/garden.md +++ b/russian/garden/garden.md @@ -1 +1,2 @@ -Zapahi v sadu prosto zamechatelnye, no pora zavrakat'. \ No newline at end of file +Zapahi v sadu prosto zamechatelnye, no pora zavrakat'. +Ибо завтрак остывает уже \ No newline at end of file From b209d8022371869e1de94b5c2634b32c3c283953 Mon Sep 17 00:00:00 2001 From: Eric Araujo Date: Mon, 10 Oct 2016 14:53:23 +0200 Subject: [PATCH 4435/5486] Including some story and feeling some gaps. --- portugues/colaborando.md | 2 +- portugues/fada/fada.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index f15f711e64..067df2453b 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -66,4 +66,4 @@ BR BR BR Hue hue hue!!!! [Crio um novo branch,olho o bug e uso o github para obter ajuda] (http://gitref.org/) -[Você quer ser um desenvolvedor de jogos independente](jornada-indie/O inicio.md) \ No newline at end of file +[Você quer ser um desenvolvedor de jogos independente](jornada-indie/O inicio.md) diff --git a/portugues/fada/fada.md b/portugues/fada/fada.md index d2c0b5cb61..a74fdc6896 100644 --- a/portugues/fada/fada.md +++ b/portugues/fada/fada.md @@ -2,4 +2,6 @@ Senta e chora até que sua fada madrinha apareça. Ela simpatiza com você e te [Você deseja que ela solucione o bug para você](solucao/solucao.md) -[Você pede 1 milhão de reais e nunca mais se preocupa com Git e Github na vida](dinheiro/dinheiro.md) \ No newline at end of file +[Você pede 1 milhão de reais e nunca mais se preocupa com Git e Github na vida](dinheiro/dinheiro.md) + +[Você pergunta qual a resposta para o problema da vida, do universo e tudo mais](resposta/universo.md) From 5e454ca633b0aace649c3564efea2473a1e058d6 Mon Sep 17 00:00:00 2001 From: Eric Araujo Date: Mon, 10 Oct 2016 14:56:25 +0200 Subject: [PATCH 4436/5486] Adding universo document --- portugues/fada/resposta/universo.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 portugues/fada/resposta/universo.md diff --git a/portugues/fada/resposta/universo.md b/portugues/fada/resposta/universo.md new file mode 100644 index 0000000000..5cb4ae319c --- /dev/null +++ b/portugues/fada/resposta/universo.md @@ -0,0 +1,7 @@ +Você pergunta qual a resposta para o problema da vida, do universo e tudo mais. Ela então te entrega O Guia do Mochileiro das Galáxias e desaparece. Você então + +Chora e joga o livro no lixo. + +Abraça sua toalha para secar suas lágrimas e começa a ler o livro. + +Desiste de consertar o seu bug e começa a construir um computador capaz de responder a questão da vida do universo e tudo mais pra você. From c77b503c5ec6a5c4ef288419bbecb9907e5dd73e Mon Sep 17 00:00:00 2001 From: Eric Araujo Date: Mon, 10 Oct 2016 15:02:53 +0200 Subject: [PATCH 4437/5486] Fixing robots request --- portugues/fada/resposta/universo.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/fada/resposta/universo.md b/portugues/fada/resposta/universo.md index 5cb4ae319c..835eb66b48 100644 --- a/portugues/fada/resposta/universo.md +++ b/portugues/fada/resposta/universo.md @@ -1,4 +1,6 @@ -Você pergunta qual a resposta para o problema da vida, do universo e tudo mais. Ela então te entrega O Guia do Mochileiro das Galáxias e desaparece. Você então +Você pergunta qual a resposta para o problema da vida, do universo e tudo mais. + +Ela então te entrega O Guia do Mochileiro das Galáxias e desaparece. Você então Chora e joga o livro no lixo. From a27736e279522117e888c77ecf24d68037c5c532 Mon Sep 17 00:00:00 2001 From: Eric Araujo Date: Mon, 10 Oct 2016 15:04:21 +0200 Subject: [PATCH 4438/5486] More fixing --- portugues/fada/resposta/universo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/fada/resposta/universo.md b/portugues/fada/resposta/universo.md index 835eb66b48..2b803b4a6c 100644 --- a/portugues/fada/resposta/universo.md +++ b/portugues/fada/resposta/universo.md @@ -6,4 +6,4 @@ Chora e joga o livro no lixo. Abraça sua toalha para secar suas lágrimas e começa a ler o livro. -Desiste de consertar o seu bug e começa a construir um computador capaz de responder a questão da vida do universo e tudo mais pra você. +Desiste do bug e começa a constroi um computador capaz de responder a questão você. From 1d0d527371e9fe0c4ec8f1ad9e3dc2d26c1fa46b Mon Sep 17 00:00:00 2001 From: Daniel Beasley Date: Mon, 10 Oct 2016 11:25:05 -0400 Subject: [PATCH 4439/5486] Add more chill music --- english/chillmusic/chillmusic.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/chillmusic/chillmusic.md b/english/chillmusic/chillmusic.md index 6aebc287f8..639822a344 100644 --- a/english/chillmusic/chillmusic.md +++ b/english/chillmusic/chillmusic.md @@ -2,4 +2,6 @@ Click here to listen to some relaxing [acoustic guitar](https://www.youtube.com/ Click here instead if you want to listen to some [relaxing rock](https://www.youtube.com/watch?v=JVJVAHLJleU). -Click [here](https://www.youtube.com/watch?v=c3lid40q2ew) to hear a lovely piano piece. \ No newline at end of file +Click [here](https://www.youtube.com/watch?v=c3lid40q2ew) to hear a lovely piano piece. + +Click to enjoy the soothing tones of [Rick Astley, Never gonna give you up](https://www.youtube.com/watch?v=2HQaBWziYvY) \ No newline at end of file From e22c9ec218f34a289a6a8fd89288ed80d694c925 Mon Sep 17 00:00:00 2001 From: Dennis Cribbs Date: Tue, 11 Oct 2016 03:17:26 -0400 Subject: [PATCH 4440/5486] Updated Batman --- english/batman/batman.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index 0ba357a521..847c74caca 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -40,4 +40,6 @@ Now that Bruce Wayne is grown old, he has proclaimed that I should take over his Over my dead body!! Says Robin. -John Cena comes busting through the wall and screams: \ No newline at end of file +John Cena comes busting through the wall and screams: + +YOU CAN'T SEE ME! \ No newline at end of file From 94c162710b589ce4bb1a611e0eea0724cb2a13d7 Mon Sep 17 00:00:00 2001 From: Dennis Cribbs Date: Tue, 11 Oct 2016 03:22:18 -0400 Subject: [PATCH 4441/5486] Updated Batman --- english/batman/batman.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index 847c74caca..8e8a091f66 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -42,4 +42,4 @@ Over my dead body!! Says Robin. John Cena comes busting through the wall and screams: -YOU CAN'T SEE ME! \ No newline at end of file +"I'm batman!" \ No newline at end of file From d21ade57bae73e387aca03608120fcf6db4b988a Mon Sep 17 00:00:00 2001 From: sujayb Date: Tue, 11 Oct 2016 21:35:13 +0530 Subject: [PATCH 4442/5486] add my story wand @casey-collab --- english/wand/wand.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/wand/wand.md diff --git a/english/wand/wand.md b/english/wand/wand.md new file mode 100644 index 0000000000..d8888fb6d4 --- /dev/null +++ b/english/wand/wand.md @@ -0,0 +1 @@ +I am using a wand that I got from [Harry Potter !!](../movie-ripoffs/hogwarts/hogwarts.md) From 0b474cb30b4555ea4cb3b4e63542dd7071f3ed31 Mon Sep 17 00:00:00 2001 From: sujayb Date: Tue, 11 Oct 2016 21:51:47 +0530 Subject: [PATCH 4443/5486] add marshmallow to wand link --- english/marshmallow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 7c0d01a9f3..b59e6e9a02 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -342,7 +342,7 @@ I felt a sudden ease of mind. Where is Hermione Granger when you need her? Where I ask you? Oh, I know. Click [here](hermione/hermioneHere.md) -You pick up the fork and wrap it in rope to fashion a crappy wand. +You pick up the fork and wrap it in rope to fashion a crappy [wand](./wand/wand.md) . Pointing it at the door, eyes closed, "Alohomora..." @@ -1141,4 +1141,4 @@ What is the meaning of life? To find out click [here](meaning-of-life/meaning-of-life.md). What is that shiny in the window? Come in and take a -[look](Computer-Man/Computer-Man.md) \ No newline at end of file +[look](Computer-Man/Computer-Man.md) From 1387e9f698e9c265b51056a55bf8757731665529 Mon Sep 17 00:00:00 2001 From: sujayb Date: Tue, 11 Oct 2016 22:00:49 +0530 Subject: [PATCH 4444/5486] I get it now --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b59e6e9a02..aecff1bdc0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -342,7 +342,9 @@ I felt a sudden ease of mind. Where is Hermione Granger when you need her? Where I ask you? Oh, I know. Click [here](hermione/hermioneHere.md) -You pick up the fork and wrap it in rope to fashion a crappy [wand](./wand/wand.md) . +You pick up the fork and wrap it in rope to fashion a crappy wand. + +For more on wand history [here](./wand/wand.md). Pointing it at the door, eyes closed, "Alohomora..." From ddb94cf254d9c9bedfd9c4ce3050c5c929406e41 Mon Sep 17 00:00:00 2001 From: Tomasz Smieszkol Date: Wed, 12 Oct 2016 10:53:42 +0200 Subject: [PATCH 4445/5486] added new options in the Polish version (the witcher branch) --- Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.txt diff --git a/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.txt b/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.txt new file mode 100644 index 0000000000..2736fea334 --- /dev/null +++ b/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.txt @@ -0,0 +1,2 @@ +Rzucasz zaklecie IGNI - z twoich rak strzelaja plomienie ognia, ktore kierujesz na nerda, przy okazji podpalajac meble stojace wzdluz sciany. Nerd wydaje okropny krzyk. Na jego twarzy pojawiaja sie nagle zmiany. Wydaje ci sie, ze on caly zmienia sie - jego cialo powoli rosnie i zmienia ksztat. I nagle dociera to do ciebie - on nie jest czlowiekiem. To wampir, w dodatku z gatunku tych wyszych... +Oj, zebys chociaz mial ze soba swoj srebrny miecz... Jak sie obronisz? \ No newline at end of file From f1d2aade7cd3ae906b7105c00c77e9b3383c7a8d Mon Sep 17 00:00:00 2001 From: Tomasz Smieszkol Date: Wed, 12 Oct 2016 11:11:06 +0200 Subject: [PATCH 4446/5486] new options in the Polish version --- Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.md | 7 +++++++ Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.txt | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.md delete mode 100644 Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.txt diff --git a/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.md b/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.md new file mode 100644 index 0000000000..aaa1ba960a --- /dev/null +++ b/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.md @@ -0,0 +1,7 @@ +Rzucasz zaklecie IGNI - z twoich rak strzelaja plomienie ognia, ktore kierujesz na nerda, przy okazji podpalajac meble stojace wzdluz sciany. +Nerd wydaje okropny krzyk. Na jego twarzy pojawiaja sie nagle zmiany. Wydaje ci sie, ze on caly zmienia sie - +jego cialo powoli rosnie i zmienia ksztalt. I nagle dociera to do ciebie - on nie jest czlowiekiem. +To wampir, w dodatku z gatunku tych wyzszych... +Oj, zebys chociaz mial ze soba swoj srebrny miecz... + +Jak sie obronisz? \ No newline at end of file diff --git a/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.txt b/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.txt deleted file mode 100644 index 2736fea334..0000000000 --- a/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.txt +++ /dev/null @@ -1,2 +0,0 @@ -Rzucasz zaklecie IGNI - z twoich rak strzelaja plomienie ognia, ktore kierujesz na nerda, przy okazji podpalajac meble stojace wzdluz sciany. Nerd wydaje okropny krzyk. Na jego twarzy pojawiaja sie nagle zmiany. Wydaje ci sie, ze on caly zmienia sie - jego cialo powoli rosnie i zmienia ksztat. I nagle dociera to do ciebie - on nie jest czlowiekiem. To wampir, w dodatku z gatunku tych wyszych... -Oj, zebys chociaz mial ze soba swoj srebrny miecz... Jak sie obronisz? \ No newline at end of file From 9051bc26b4415dae479ef66ae6c502376f24c30f Mon Sep 17 00:00:00 2001 From: Tomasz Smieszkol Date: Wed, 12 Oct 2016 11:13:54 +0200 Subject: [PATCH 4447/5486] update --- Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.md b/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.md index aaa1ba960a..7f02541555 100644 --- a/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.md +++ b/Polish/przygoda/jedzenie/wiedzmin/placki/igni/igni.md @@ -1,4 +1,5 @@ -Rzucasz zaklecie IGNI - z twoich rak strzelaja plomienie ognia, ktore kierujesz na nerda, przy okazji podpalajac meble stojace wzdluz sciany. +Rzucasz zaklecie IGNI - z twoich rak strzelaja plomienie ognia, ktore kierujesz na nerda, +przy okazji podpalajac meble stojace wzdluz sciany. Nerd wydaje okropny krzyk. Na jego twarzy pojawiaja sie nagle zmiany. Wydaje ci sie, ze on caly zmienia sie - jego cialo powoli rosnie i zmienia ksztalt. I nagle dociera to do ciebie - on nie jest czlowiekiem. To wampir, w dodatku z gatunku tych wyzszych... From 551d2964507b2776afa7871b43f5e4f05420b807 Mon Sep 17 00:00:00 2001 From: Tomasz Smieszkol Date: Wed, 12 Oct 2016 11:18:52 +0200 Subject: [PATCH 4448/5486] new links added --- Polish/przygoda/jedzenie/wiedzmin/placki/placki.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Polish/przygoda/jedzenie/wiedzmin/placki/placki.md b/Polish/przygoda/jedzenie/wiedzmin/placki/placki.md index 0c3b16f82e..5b55d3ee4b 100644 --- a/Polish/przygoda/jedzenie/wiedzmin/placki/placki.md +++ b/Polish/przygoda/jedzenie/wiedzmin/placki/placki.md @@ -1,2 +1,6 @@ Nie pytajac Cie o zdanie, nerd z nadludzka sila ciagnie Cie w strone ciemnego pomieszczenia. Nie masz wiele czasu, a opcji niewiele. Co robisz?? + +najlepszą obroną jest atak - [rzucasz zaklecie IGNI](igni/igni.md) + +najlepszą obroną jest... ucieczka - [teleportujesz sie do innej krainy](../../../../kadarka/kadarka.md) From 9ccde70c598a83db9b21ca2fd0500647610b6437 Mon Sep 17 00:00:00 2001 From: saksham0037 Date: Wed, 12 Oct 2016 15:45:10 +0530 Subject: [PATCH 4449/5486] Add about Akshay Kumar --- hindi/Akshay_Kumar/akshay_kumar | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 hindi/Akshay_Kumar/akshay_kumar diff --git a/hindi/Akshay_Kumar/akshay_kumar b/hindi/Akshay_Kumar/akshay_kumar new file mode 100644 index 0000000000..cdb4392c09 --- /dev/null +++ b/hindi/Akshay_Kumar/akshay_kumar @@ -0,0 +1,5 @@ +Rajiv Hari Om Bhatia (born 9 September 1967), better known by his stage name Akshay Kumar, is an Indian-born Canadian[1] actor, producer and martial artist who has appeared in over a hundred Hindi films.[2] He has been nominated for Filmfare Awards several times, winning it two times. When he began his acting career in the 1990s, he primarily starred in action films and was known for his appearances in films of the "Khiladi series" as well as other action films such as Waqt Hamara Hai (1993), Mohra (1994), Elaan (1994), Suhaag (1994), Sapoot (1996), Jaanwar (1999). + +Later, Kumar also gained fame for his drama, romance, action and comic roles. His performances in romance films like Yeh Dillagi (1994), Dhadkan (2000), Andaaz (2003) and Namastey London (2007), as well as drama films such as Waqt: The Race Against Time (2005). His comic performances in comedy films such as Hera Pheri (2000), Mujhse Shaadi Karogi (2004), Garam Masala (2005), Bhagam Bhag (2006), Bhool Bhulaiyaa (2007), and Singh Is Kinng (2008) met with acclaim. In 2007, he starred in four consecutive commercially successful films. Kumar hit a rough patch since 2009 to 2011 but came back with two successes, Housefull 2 (2012) and Rowdy Rathore (2012) with both of them grossing over ₹1 billion (US$15 million). His other films like OMG (2012), Tees Maar Khan (2013), Holiday (2014), Gabbar Is Back (2015), Airlift (2016) and Rustom (2016) were highly successful critically and commercially. In February 2013, many media outlets reported that the net box-office collection of Kumar's films had crossed ₹20 billion (US$300 million) and he was the first and the only Bollywood actor to do so.[3] Box Office India listed Kumar as one of the most successful actors in the history of Indian Cinema.[4][5][6]Having done so, he has established himself as a leading contemporary actor of Hindi cinema.[7] + +Apart from acting, Kumar has also worked as a stunt actor; he has often performed many dangerous stunts in his films, which has earned him the sobriquet "Indian Jackie Chan".[8][9] In 2008, he hosted the show Fear Factor – Khatron Ke Khiladi. The next year, he founded the Hari Om Entertainment production company.[10] In 2008, the University of Windsor conferred an Honorary Doctorate on Kumar in recognition of his contribution to Indian cinema. The following year he was awarded the Padma Shri by the Government of India. In 2011, The Asian Awards honoured Kumar for his outstanding achievement in Cinema. In 2012, he founded another production company called Grazing Goat Pictures. In 2014, Kumar launched TV realty show Dare 2 Dance. He also owns the team Khalsa Warriors in the World Kabaddi League. In 2015, Kumar was ranked 9th in Forbes' first global list of highest-paid actors in the world \ No newline at end of file From 53b5f32893418f86bc9381461b0bc2de0f21607f Mon Sep 17 00:00:00 2001 From: Ankur Sharma Date: Wed, 12 Oct 2016 15:55:55 +0530 Subject: [PATCH 4450/5486] Add a new dialouge --- hindi/hrithik/hrithik.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hindi/hrithik/hrithik.md b/hindi/hrithik/hrithik.md index cf4d4ac777..a068385601 100644 --- a/hindi/hrithik/hrithik.md +++ b/hindi/hrithik/hrithik.md @@ -1,2 +1,3 @@ Yaha dekhne ke liye kuch nahi bacha, Suzanne sab kuch le gyi. -Ghar vapis jaane ke liye [यहाँ देखें](../bollywood.md) +Ghar vapis jaane ke liye +Mai apne papa se seekh kar aya hu[यहाँ देखें](../bollywood.md) From 2e9886210a415395e75d80998277ee3d750b2e5a Mon Sep 17 00:00:00 2001 From: Ankur Sharma Date: Wed, 12 Oct 2016 16:00:56 +0530 Subject: [PATCH 4451/5486] Add a new dialouge of Hrithik --- hindi/hrithik/hrithik.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hindi/hrithik/hrithik.md b/hindi/hrithik/hrithik.md index a068385601..3ae0fe679a 100644 --- a/hindi/hrithik/hrithik.md +++ b/hindi/hrithik/hrithik.md @@ -1,3 +1,3 @@ Yaha dekhne ke liye kuch nahi bacha, Suzanne sab kuch le gyi. -Ghar vapis jaane ke liye -Mai apne papa se seekh kar aya hu[यहाँ देखें](../bollywood.md) +Ghar vapis jaane ke liye [यहाँ देखें](../bollywood.md) +Mai apne papa se seekhkar aya hu. From c9e3444bb2f91df4fa046e16c381d634f68734d3 Mon Sep 17 00:00:00 2001 From: saksham0037 Date: Wed, 12 Oct 2016 16:10:01 +0530 Subject: [PATCH 4452/5486] Make changes according to the guidlines --- hindi/Akshay_Kumar/akshay_kumar | 1 + 1 file changed, 1 insertion(+) diff --git a/hindi/Akshay_Kumar/akshay_kumar b/hindi/Akshay_Kumar/akshay_kumar index cdb4392c09..cb58b10ddc 100644 --- a/hindi/Akshay_Kumar/akshay_kumar +++ b/hindi/Akshay_Kumar/akshay_kumar @@ -1,3 +1,4 @@ +Here are some facts given about Akshay Kumar, to know more click [here](https://en.wikipedia.org/wiki/Akshay_Kumar) Rajiv Hari Om Bhatia (born 9 September 1967), better known by his stage name Akshay Kumar, is an Indian-born Canadian[1] actor, producer and martial artist who has appeared in over a hundred Hindi films.[2] He has been nominated for Filmfare Awards several times, winning it two times. When he began his acting career in the 1990s, he primarily starred in action films and was known for his appearances in films of the "Khiladi series" as well as other action films such as Waqt Hamara Hai (1993), Mohra (1994), Elaan (1994), Suhaag (1994), Sapoot (1996), Jaanwar (1999). Later, Kumar also gained fame for his drama, romance, action and comic roles. His performances in romance films like Yeh Dillagi (1994), Dhadkan (2000), Andaaz (2003) and Namastey London (2007), as well as drama films such as Waqt: The Race Against Time (2005). His comic performances in comedy films such as Hera Pheri (2000), Mujhse Shaadi Karogi (2004), Garam Masala (2005), Bhagam Bhag (2006), Bhool Bhulaiyaa (2007), and Singh Is Kinng (2008) met with acclaim. In 2007, he starred in four consecutive commercially successful films. Kumar hit a rough patch since 2009 to 2011 but came back with two successes, Housefull 2 (2012) and Rowdy Rathore (2012) with both of them grossing over ₹1 billion (US$15 million). His other films like OMG (2012), Tees Maar Khan (2013), Holiday (2014), Gabbar Is Back (2015), Airlift (2016) and Rustom (2016) were highly successful critically and commercially. In February 2013, many media outlets reported that the net box-office collection of Kumar's films had crossed ₹20 billion (US$300 million) and he was the first and the only Bollywood actor to do so.[3] Box Office India listed Kumar as one of the most successful actors in the history of Indian Cinema.[4][5][6]Having done so, he has established himself as a leading contemporary actor of Hindi cinema.[7] From e79d9b6909f0278ba68580d5c3edb6fe89b5fa23 Mon Sep 17 00:00:00 2001 From: saksham0037 Date: Wed, 12 Oct 2016 16:14:05 +0530 Subject: [PATCH 4453/5486] Make changes according to guidelin 2 --- hindi/Akshay_Kumar/{akshay_kumar => akshay_kumar.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hindi/Akshay_Kumar/{akshay_kumar => akshay_kumar.md} (100%) diff --git a/hindi/Akshay_Kumar/akshay_kumar b/hindi/Akshay_Kumar/akshay_kumar.md similarity index 100% rename from hindi/Akshay_Kumar/akshay_kumar rename to hindi/Akshay_Kumar/akshay_kumar.md From 933f0b22f032b5c22384a2c757bf052d9c39110f Mon Sep 17 00:00:00 2001 From: saksham0037 Date: Wed, 12 Oct 2016 16:52:30 +0530 Subject: [PATCH 4454/5486] Make some more changes to fit th guidlines 3 --- hindi/Akshay_Kumar/akshay_kumar.md | 6 ++---- hindi/joke/joke.md | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hindi/Akshay_Kumar/akshay_kumar.md b/hindi/Akshay_Kumar/akshay_kumar.md index cb58b10ddc..4bf0c24ecf 100644 --- a/hindi/Akshay_Kumar/akshay_kumar.md +++ b/hindi/Akshay_Kumar/akshay_kumar.md @@ -1,6 +1,4 @@ -Here are some facts given about Akshay Kumar, to know more click [here](https://en.wikipedia.org/wiki/Akshay_Kumar) -Rajiv Hari Om Bhatia (born 9 September 1967), better known by his stage name Akshay Kumar, is an Indian-born Canadian[1] actor, producer and martial artist who has appeared in over a hundred Hindi films.[2] He has been nominated for Filmfare Awards several times, winning it two times. When he began his acting career in the 1990s, he primarily starred in action films and was known for his appearances in films of the "Khiladi series" as well as other action films such as Waqt Hamara Hai (1993), Mohra (1994), Elaan (1994), Suhaag (1994), Sapoot (1996), Jaanwar (1999). +Here are some facts given about Akshay Kumar, to know more +click [here](https://en.wikipedia.org/wiki/Akshay_Kumar) -Later, Kumar also gained fame for his drama, romance, action and comic roles. His performances in romance films like Yeh Dillagi (1994), Dhadkan (2000), Andaaz (2003) and Namastey London (2007), as well as drama films such as Waqt: The Race Against Time (2005). His comic performances in comedy films such as Hera Pheri (2000), Mujhse Shaadi Karogi (2004), Garam Masala (2005), Bhagam Bhag (2006), Bhool Bhulaiyaa (2007), and Singh Is Kinng (2008) met with acclaim. In 2007, he starred in four consecutive commercially successful films. Kumar hit a rough patch since 2009 to 2011 but came back with two successes, Housefull 2 (2012) and Rowdy Rathore (2012) with both of them grossing over ₹1 billion (US$15 million). His other films like OMG (2012), Tees Maar Khan (2013), Holiday (2014), Gabbar Is Back (2015), Airlift (2016) and Rustom (2016) were highly successful critically and commercially. In February 2013, many media outlets reported that the net box-office collection of Kumar's films had crossed ₹20 billion (US$300 million) and he was the first and the only Bollywood actor to do so.[3] Box Office India listed Kumar as one of the most successful actors in the history of Indian Cinema.[4][5][6]Having done so, he has established himself as a leading contemporary actor of Hindi cinema.[7] -Apart from acting, Kumar has also worked as a stunt actor; he has often performed many dangerous stunts in his films, which has earned him the sobriquet "Indian Jackie Chan".[8][9] In 2008, he hosted the show Fear Factor – Khatron Ke Khiladi. The next year, he founded the Hari Om Entertainment production company.[10] In 2008, the University of Windsor conferred an Honorary Doctorate on Kumar in recognition of his contribution to Indian cinema. The following year he was awarded the Padma Shri by the Government of India. In 2011, The Asian Awards honoured Kumar for his outstanding achievement in Cinema. In 2012, he founded another production company called Grazing Goat Pictures. In 2014, Kumar launched TV realty show Dare 2 Dance. He also owns the team Khalsa Warriors in the World Kabaddi League. In 2015, Kumar was ranked 9th in Forbes' first global list of highest-paid actors in the world \ No newline at end of file diff --git a/hindi/joke/joke.md b/hindi/joke/joke.md index affe79857c..6dca37b549 100644 --- a/hindi/joke/joke.md +++ b/hindi/joke/joke.md @@ -1,3 +1,4 @@ +[here](hindi/Akshay_Kumar/akshay_kumar.md) खूब लंबा-तगड़ा एक पहलवान बस में चढ़ा। कंडक्टर: भाई साहब, टिकट? From 39414954b9cb4c355f531715b075c98abbdd50f2 Mon Sep 17 00:00:00 2001 From: saksham0037 Date: Wed, 12 Oct 2016 19:13:24 +0530 Subject: [PATCH 4455/5486] Add link to my file in joke.md --- hindi/joke/joke.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hindi/joke/joke.md b/hindi/joke/joke.md index 6dca37b549..06c02fb6a7 100644 --- a/hindi/joke/joke.md +++ b/hindi/joke/joke.md @@ -1,4 +1,4 @@ -[here](hindi/Akshay_Kumar/akshay_kumar.md) +[here](https://github.com/udacity/create-your-own-adventure/blob/master/hindi/Akshay_Kumar/akshay_kumar.md) खूब लंबा-तगड़ा एक पहलवान बस में चढ़ा। कंडक्टर: भाई साहब, टिकट? From bb1fb71dd4aac786a2f56bccd1fc94e13af815e2 Mon Sep 17 00:00:00 2001 From: saksham0037 Date: Wed, 12 Oct 2016 19:26:54 +0530 Subject: [PATCH 4456/5486] this time adding a correct link --- hindi/joke/joke.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hindi/joke/joke.md b/hindi/joke/joke.md index 06c02fb6a7..ad1a8b14a5 100644 --- a/hindi/joke/joke.md +++ b/hindi/joke/joke.md @@ -1,4 +1,4 @@ -[here](https://github.com/udacity/create-your-own-adventure/blob/master/hindi/Akshay_Kumar/akshay_kumar.md) +[here](https://github.com/saksham0037/create-your-own-adventure/blob/edit/hindi/Akshay_Kumar/akshay_kumar.md) खूब लंबा-तगड़ा एक पहलवान बस में चढ़ा। कंडक्टर: भाई साहब, टिकट? From a47a8fe7f602e0abbd1e319d98f7a7a8a860d933 Mon Sep 17 00:00:00 2001 From: Valentin Vonnemann Date: Wed, 12 Oct 2016 16:32:22 +0200 Subject: [PATCH 4457/5486] Add new option to /german/schwimmen/ --- german/schwimmen/schwimmen.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/german/schwimmen/schwimmen.md b/german/schwimmen/schwimmen.md index 8fd017ff87..68e264bd85 100644 --- a/german/schwimmen/schwimmen.md +++ b/german/schwimmen/schwimmen.md @@ -4,6 +4,8 @@ Sie erreichen Sie mit letzter Kraft und erholen sich erst einmal am Strand. Doch Man sollte ... +... [etwas scharfes finden, vielleicht einen Stein, und diese Fischerleine aus den Flügeln kriegen.](fluegel_trocknen.md) + ... was zu Essen suchen, denn nach dem Schwimmen hat man immer Hunger [Hunger](hunger/hunger.md) From f26f57dcde386bd7c6fd21fbf6edf1536c335bec Mon Sep 17 00:00:00 2001 From: Valentin Vonnemann Date: Wed, 12 Oct 2016 16:37:14 +0200 Subject: [PATCH 4458/5486] Refactor: now the addition is called fluegel_freischneiden instead of trocknen --- german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md | 0 german/schwimmen/schwimmen.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md diff --git a/german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md b/german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/german/schwimmen/schwimmen.md b/german/schwimmen/schwimmen.md index 68e264bd85..6df889206d 100644 --- a/german/schwimmen/schwimmen.md +++ b/german/schwimmen/schwimmen.md @@ -4,7 +4,7 @@ Sie erreichen Sie mit letzter Kraft und erholen sich erst einmal am Strand. Doch Man sollte ... -... [etwas scharfes finden, vielleicht einen Stein, und diese Fischerleine aus den Flügeln kriegen.](fluegel_trocknen.md) +... [etwas scharfes finden, vielleicht einen Stein, und diese Fischerleine aus den Flügeln kriegen.](fluegel_freischneiden.md) ... was zu Essen suchen, denn nach dem Schwimmen hat man immer Hunger [Hunger](hunger/hunger.md) From 030a50447910d46dc41658cb348f42effc275fdb Mon Sep 17 00:00:00 2001 From: Valentin Vonnemann Date: Wed, 12 Oct 2016 16:41:35 +0200 Subject: [PATCH 4459/5486] Add new page fluegel_freischneiden --- german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md | 1 + 1 file changed, 1 insertion(+) diff --git a/german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md b/german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md index e69de29bb2..5bddc2041a 100644 --- a/german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md +++ b/german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md @@ -0,0 +1 @@ +Dort hinten, an den Klippen aus scharfkantigen Felsen wird sich etwas finden lassen. Dieser Stein ist perfekt. Endlich sind die Flügel frei. Erst einmal strecken und jetzt ... \ No newline at end of file From 9951eb7813500bbb415ebe1762c8f91532aaa747 Mon Sep 17 00:00:00 2001 From: Valentin Vonnemann Date: Wed, 12 Oct 2016 16:52:44 +0200 Subject: [PATCH 4460/5486] Fixing the broken link, relative link to fluegel_freischneiden.md next page wasn't working --- german/schwimmen/schwimmen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/schwimmen/schwimmen.md b/german/schwimmen/schwimmen.md index 6df889206d..ad8515094f 100644 --- a/german/schwimmen/schwimmen.md +++ b/german/schwimmen/schwimmen.md @@ -4,7 +4,7 @@ Sie erreichen Sie mit letzter Kraft und erholen sich erst einmal am Strand. Doch Man sollte ... -... [etwas scharfes finden, vielleicht einen Stein, und diese Fischerleine aus den Flügeln kriegen.](fluegel_freischneiden.md) +... [etwas scharfes finden, vielleicht einen Stein, und diese Fischerleine aus den Flügeln kriegen.](fluegel_freischneiden/fluegel_freischneiden.md) ... was zu Essen suchen, denn nach dem Schwimmen hat man immer Hunger [Hunger](hunger/hunger.md) From df10aed5928c037f8cd1471c8614c41ac8e71064 Mon Sep 17 00:00:00 2001 From: Valentin Vonnemann Date: Wed, 12 Oct 2016 16:58:58 +0200 Subject: [PATCH 4461/5486] Refactor lines shorter for readability --- .../schwimmen/fluegel_freischneiden/fluegel_freischneiden.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md b/german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md index 5bddc2041a..fbef6eca0b 100644 --- a/german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md +++ b/german/schwimmen/fluegel_freischneiden/fluegel_freischneiden.md @@ -1 +1,4 @@ -Dort hinten, an den Klippen aus scharfkantigen Felsen wird sich etwas finden lassen. Dieser Stein ist perfekt. Endlich sind die Flügel frei. Erst einmal strecken und jetzt ... \ No newline at end of file +Dort hinten, an den Klippen aus scharfkantigen Felsen wird sich etwas finden lassen. +Dieser Stein ist perfekt. Endlich sind die Flügel frei. + +Erst einmal strecken und jetzt ... \ No newline at end of file From 3f698e4a7b68a71922845102b7ba36082cdef04c Mon Sep 17 00:00:00 2001 From: Valentin Vonnemann Date: Wed, 12 Oct 2016 17:05:12 +0200 Subject: [PATCH 4462/5486] Fixing line lenght in /schwimmen.md --- german/schwimmen/schwimmen.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/schwimmen/schwimmen.md b/german/schwimmen/schwimmen.md index ad8515094f..e4334a6a17 100644 --- a/german/schwimmen/schwimmen.md +++ b/german/schwimmen/schwimmen.md @@ -4,7 +4,8 @@ Sie erreichen Sie mit letzter Kraft und erholen sich erst einmal am Strand. Doch Man sollte ... -... [etwas scharfes finden, vielleicht einen Stein, und diese Fischerleine aus den Flügeln kriegen.](fluegel_freischneiden/fluegel_freischneiden.md) +... [etwas scharfes finden, vielleicht einen Stein, +und diese Fischerleine aus den Flügeln kriegen.](fluegel_freischneiden/fluegel_freischneiden.md) ... was zu Essen suchen, denn nach dem Schwimmen hat man immer Hunger [Hunger](hunger/hunger.md) From ac6c4968e114037ed7c22081353a7b42f25bf01f Mon Sep 17 00:00:00 2001 From: Valentin Vonnemann Date: Wed, 12 Oct 2016 17:07:30 +0200 Subject: [PATCH 4463/5486] The last fix broke the link, no link is fixed --- german/schwimmen/schwimmen.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/german/schwimmen/schwimmen.md b/german/schwimmen/schwimmen.md index e4334a6a17..e465930223 100644 --- a/german/schwimmen/schwimmen.md +++ b/german/schwimmen/schwimmen.md @@ -4,8 +4,9 @@ Sie erreichen Sie mit letzter Kraft und erholen sich erst einmal am Strand. Doch Man sollte ... -... [etwas scharfes finden, vielleicht einen Stein, -und diese Fischerleine aus den Flügeln kriegen.](fluegel_freischneiden/fluegel_freischneiden.md) +... etwas scharfes finden, vielleicht einen Stein, +und diese Fischerleine aus den Flügeln kriegen. +[Flügel](fluegel_freischneiden/fluegel_freischneiden.md) ... was zu Essen suchen, denn nach dem Schwimmen hat man immer Hunger [Hunger](hunger/hunger.md) @@ -13,7 +14,6 @@ und diese Fischerleine aus den Flügeln kriegen.](fluegel_freischneiden/fluegel_ ... ein sicheres Lager aufbauen, denn wer weiß schon welche Gefahren auf einer Insel lauern [Gefahr](gefahr/gefahr.md) - ... sich erst einmal auf der Insel umschauen und dann entscheiden wie es weiter geht. [Insel](insel/insel.md) From d77e2d20478aec92c7e8f9135069b8952a45c302 Mon Sep 17 00:00:00 2001 From: Valentin Vonnemann Date: Wed, 12 Oct 2016 17:09:45 +0200 Subject: [PATCH 4464/5486] I accidently deleted a line --- german/schwimmen/schwimmen.md | 1 + 1 file changed, 1 insertion(+) diff --git a/german/schwimmen/schwimmen.md b/german/schwimmen/schwimmen.md index e465930223..f1ee029cd5 100644 --- a/german/schwimmen/schwimmen.md +++ b/german/schwimmen/schwimmen.md @@ -14,6 +14,7 @@ und diese Fischerleine aus den Flügeln kriegen. ... ein sicheres Lager aufbauen, denn wer weiß schon welche Gefahren auf einer Insel lauern [Gefahr](gefahr/gefahr.md) + ... sich erst einmal auf der Insel umschauen und dann entscheiden wie es weiter geht. [Insel](insel/insel.md) From 804be1cb79f1295a065a6358b1f012e9a8f7462e Mon Sep 17 00:00:00 2001 From: saksham0037 Date: Wed, 12 Oct 2016 21:37:01 +0530 Subject: [PATCH 4465/5486] Another attempt --- hindi/joke/joke.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hindi/joke/joke.md b/hindi/joke/joke.md index ad1a8b14a5..a7a2e43b2c 100644 --- a/hindi/joke/joke.md +++ b/hindi/joke/joke.md @@ -1,4 +1,4 @@ -[here](https://github.com/saksham0037/create-your-own-adventure/blob/edit/hindi/Akshay_Kumar/akshay_kumar.md) +[here](../Akshay_Kumar/akshay_kumar.md) खूब लंबा-तगड़ा एक पहलवान बस में चढ़ा। कंडक्टर: भाई साहब, टिकट? From ea5271984cbd85e1c85b2800df96e9de4a8f7df0 Mon Sep 17 00:00:00 2001 From: UrbanNovak Date: Thu, 13 Oct 2016 12:10:59 +0200 Subject: [PATCH 4466/5486] Add new galaxy --- slovenian/dom/domaca-spalnica.md | 1 + slovenian/galaksija-alfa/galaksija-alfa.md | 1 + .../svetlo-vijoli\304\215na.md" | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 slovenian/dom/domaca-spalnica.md create mode 100644 slovenian/galaksija-alfa/galaksija-alfa.md diff --git a/slovenian/dom/domaca-spalnica.md b/slovenian/dom/domaca-spalnica.md new file mode 100644 index 0000000000..a9fdcb137e --- /dev/null +++ b/slovenian/dom/domaca-spalnica.md @@ -0,0 +1 @@ +Prebudil si se v domači spalnici. diff --git a/slovenian/galaksija-alfa/galaksija-alfa.md b/slovenian/galaksija-alfa/galaksija-alfa.md new file mode 100644 index 0000000000..77c8585222 --- /dev/null +++ b/slovenian/galaksija-alfa/galaksija-alfa.md @@ -0,0 +1 @@ +Znašel si se v galaksiji alfa. diff --git "a/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" "b/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" index 4a14b970ab..38f1638f16 100644 --- "a/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" +++ "b/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" @@ -1 +1,14 @@ -Znašel si se v sobi svetlo vijolične barve. +Znašel si se v sobi svetlo vijolične barve. Soba je slabo osvetljena. Vrata so izginila. +Na sredini sobe sta dva naslonjača. Eden je moder, drugi pa rdeč. +V kotu sobe stoji temnopolt moški, srednjih let in višje postave. +Oblečen je v dolg črn usnjen plašč, njegove oči pa se skrivajo za temnimi očali. +Moški ti ponudi naslonjač, vendar te opozori: +Če se vsedeš na rdeč stol, boš odšel z njim v vzporedni svet in staro življenje boš pozabil. +Če se vsedeš na moder stol, se boš zbudil doma in svetlo vijolične sobe se ne boš spomnil. + +Kako se odločiš? + +[Usedeš se na moder stol.](../dom/domaca-spalnica.md) + +[Usedeš se na rdeč stol.](../galaksija-alfa/galaksija-alfa.md) + \ No newline at end of file From ec8385d2edc1f6ed016d54b2dcdccf183a523ada Mon Sep 17 00:00:00 2001 From: UrbanNovak Date: Thu, 13 Oct 2016 12:22:52 +0200 Subject: [PATCH 4467/5486] Add a brake line. --- "slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git "a/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" "b/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" index 38f1638f16..a885322fb0 100644 --- "a/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" +++ "b/slovenian/svetlo-vijoli\304\215na/svetlo-vijoli\304\215na.md" @@ -1,4 +1,5 @@ -Znašel si se v sobi svetlo vijolične barve. Soba je slabo osvetljena. Vrata so izginila. +Znašel si se v sobi svetlo vijolične barve. +Soba je slabo osvetljena. Vrata so izginila. Na sredini sobe sta dva naslonjača. Eden je moder, drugi pa rdeč. V kotu sobe stoji temnopolt moški, srednjih let in višje postave. Oblečen je v dolg črn usnjen plašč, njegove oči pa se skrivajo za temnimi očali. From 2fce0a131275cc49557706b85a96b59a774ca8c8 Mon Sep 17 00:00:00 2001 From: Lucas Horiye Date: Thu, 13 Oct 2016 09:08:08 -0300 Subject: [PATCH 4468/5486] =?UTF-8?q?Alterando=20o=20fim=20da=20hist=C3=B3?= =?UTF-8?q?ria?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/historia/fim.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/historia/fim.md b/portugues/historia/fim.md index 62df7c1784..19255c07ce 100644 --- a/portugues/historia/fim.md +++ b/portugues/historia/fim.md @@ -1 +1,3 @@ -Fim muito legal :) \ No newline at end of file +Fim muito legal :) + +Ainda não acabou \ No newline at end of file From 9ceec39080aaf700e1afe8d765848b2c9951a717 Mon Sep 17 00:00:00 2001 From: Lucas Horiye Date: Thu, 13 Oct 2016 09:24:35 -0300 Subject: [PATCH 4469/5486] alterando... --- portugues/historia/fim.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/historia/fim.md b/portugues/historia/fim.md index 62df7c1784..19255c07ce 100644 --- a/portugues/historia/fim.md +++ b/portugues/historia/fim.md @@ -1 +1,3 @@ -Fim muito legal :) \ No newline at end of file +Fim muito legal :) + +Ainda não acabou \ No newline at end of file From 51de663ab5d934b2b61754d59a122552b7526647 Mon Sep 17 00:00:00 2001 From: zzpanqing Date: Thu, 13 Oct 2016 16:36:46 +0200 Subject: [PATCH 4470/5486] Update youBecomeGay.md --- Chinese/youBecomeGay/youBecomeGay.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Chinese/youBecomeGay/youBecomeGay.md b/Chinese/youBecomeGay/youBecomeGay.md index 3aec10703e..51ca24b0ab 100644 --- a/Chinese/youBecomeGay/youBecomeGay.md +++ b/Chinese/youBecomeGay/youBecomeGay.md @@ -1,3 +1,4 @@ 你却成了🐔。 -唧唧复唧唧，可愿作我妻？ \ No newline at end of file +唧唧复唧唧，可愿作我妻？ +恨不相逢未嫁时，可惜名花有主。 From b514a00304652852fc68b88b06317d6b0d1496ed Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 14 Oct 2016 08:09:05 +0900 Subject: [PATCH 4471/5486] Add option to learn Chinese --- english/learn_japanese/japanese.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/learn_japanese/japanese.md b/english/learn_japanese/japanese.md index 86c758b809..084cc04c9e 100644 --- a/english/learn_japanese/japanese.md +++ b/english/learn_japanese/japanese.md @@ -5,3 +5,5 @@ a sudden you find your self in Japan and hear a woman in Japanese say help, its Japanese to the test and see what you can do. [help the woman in Japanese](../../japanese/cold/cold.md) + +You realise she`s actually Chinese. [Learn Mandarin instead.](../learn-mandarin/learn-mandarin.md) \ No newline at end of file From 2fb5952eaffa2f8d9169b3032e7ac52909f28d79 Mon Sep 17 00:00:00 2001 From: Jeffrey DeLeo Date: Thu, 13 Oct 2016 17:19:46 -0700 Subject: [PATCH 4472/5486] for those who don't know about cookies --- english/bake-cookies/cookies.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/bake-cookies/cookies.md b/english/bake-cookies/cookies.md index 078715b5e6..5e3879119d 100644 --- a/english/bake-cookies/cookies.md +++ b/english/bake-cookies/cookies.md @@ -20,3 +20,5 @@ Do you: [Want to get high?](../weed/weed.md) [Call a doctor?](../call-a-doctor/doctor.md) + +[Don't know what a cookie is?](https://en.wikipedia.org/wiki/Chocolate_chip_cookie) From 6375b4147ef807b9883181fd8d88759721e2d892 Mon Sep 17 00:00:00 2001 From: Fabian Lopez Date: Thu, 13 Oct 2016 20:27:08 -0500 Subject: [PATCH 4473/5486] all of this because of a bad start --- espanol/canudos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index e945233a88..b76e964fa3 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -174,3 +174,5 @@ Y cada invitado podria comer [tantas como quisiera](exageracion/exageracion.md). Se servirian las siguientes arepas: Reina Pepeada, Mechada con amarillo, y Jamon con queso de cabra. Llego el [invierno](inverlandia/inverlandia.md). + +Gritó que se escribiría la más aburrida historia, basada en un mal comienzo. From 6aca820566e596243702280a8ca2fc3b6bb8e92b Mon Sep 17 00:00:00 2001 From: berkobob Date: Fri, 14 Oct 2016 18:50:25 +0100 Subject: [PATCH 4474/5486] Add london to the story --- english/london/london.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/london/london.md diff --git a/english/london/london.md b/english/london/london.md new file mode 100644 index 0000000000..8a6256134b --- /dev/null +++ b/english/london/london.md @@ -0,0 +1,6 @@ +I really have no idea what's going on or what I'm supposed to be doing. +I forked the repositroy +I cloned it +I created a branch +I created a new folder and file within it (this one) +I'm now going to try commit these changes and send a pull request - hopefully From c334f81071daabcd8e631f166e74f279e3b9daec Mon Sep 17 00:00:00 2001 From: berkobob Date: Fri, 14 Oct 2016 18:58:57 +0100 Subject: [PATCH 4475/5486] Add an option for London --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index aecff1bdc0..5dfae125d8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -36,6 +36,7 @@ Who is better? [Click Here] (ironman/ironman.md) to vote for Iron Man [Click here] (00_8_Agent/The_name_is_Bond_Milton_Bond.md) to vote for a Special Agent +[click here] (london/london.md) to vote for london January 2017 approaches. You have two presidential candidates to vote for. From 80d051321673f18f699a25d888e9aacda1596d53 Mon Sep 17 00:00:00 2001 From: Nandan1996 Date: Fri, 14 Oct 2016 23:38:51 +0530 Subject: [PATCH 4476/5486] Add maithli-most respectable language from bihar --- maithli/maithli.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 maithli/maithli.md diff --git a/maithli/maithli.md b/maithli/maithli.md new file mode 100644 index 0000000000..e69de29bb2 From 433fde660d8e86001b361f1ebccfa6a312642bd0 Mon Sep 17 00:00:00 2001 From: Nandan1996 Date: Fri, 14 Oct 2016 23:48:57 +0530 Subject: [PATCH 4477/5486] Add some content to maithli.md --- maithli/maithli.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maithli/maithli.md b/maithli/maithli.md index e69de29bb2..8af171ac18 100644 --- a/maithli/maithli.md +++ b/maithli/maithli.md @@ -0,0 +1,3 @@ +Hello..Looks like interested in maithili.. +Have a look at the national award wining upcoming maithli movie.. +[mithila-makhan](https://www.youtube.com/watch?v=oL4bf7GQHtk) \ No newline at end of file From 139521eecfa351e3329771d63e1b9f144caa5f56 Mon Sep 17 00:00:00 2001 From: Nandan1996 Date: Sat, 15 Oct 2016 00:56:16 +0530 Subject: [PATCH 4478/5486] Add maithli --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index b1495c973b..9c9eea272d 100644 --- a/language.md +++ b/language.md @@ -155,3 +155,5 @@ To explore the বাংলা (bangla/bengali) search engine, news portals, an If you speak oriya, click [here](oriya/oriya.md). If you understand Tamil, திருநாவுக்கரசர் அருளிய தேவாரம் [இங்கே அழுத்தவும்](Tamil/Thevaram/thevarm.md) + +if you understand maithli, click [here...](maithli/maithli.md) From 9945754da1ddf635d7a85e48873e2a27e07bcef8 Mon Sep 17 00:00:00 2001 From: Anna Stein Date: Sat, 15 Oct 2016 14:50:08 -0400 Subject: [PATCH 4479/5486] Add more to vegetable advice --- english/advice_from_mother/advice_from_mother.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/advice_from_mother/advice_from_mother.md b/english/advice_from_mother/advice_from_mother.md index 8c7872f49d..0dba37df24 100644 --- a/english/advice_from_mother/advice_from_mother.md +++ b/english/advice_from_mother/advice_from_mother.md @@ -7,6 +7,6 @@ into the bar. just a random test -My mother also told me that I should eat my vegetables. +My mother also told me that I should eat my vegetables. Something about them being good for me. But at that time, I was at the age that I thought "If it doesn't taste good, it just can't be good for me". "[She answers.](../bear-story/bear-story.md)" From a530125ab7f4f5f83094c7c53dfa261988476899 Mon Sep 17 00:00:00 2001 From: Kasper Astrup Eriksen Date: Sun, 16 Oct 2016 11:55:49 +0200 Subject: [PATCH 4480/5486] Add run_out_of_door option to expired-milk --- english/sleep/more-sleep/expired-milk/expired-milk.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/sleep/more-sleep/expired-milk/expired-milk.md b/english/sleep/more-sleep/expired-milk/expired-milk.md index 46d92852f1..96daad3c86 100644 --- a/english/sleep/more-sleep/expired-milk/expired-milk.md +++ b/english/sleep/more-sleep/expired-milk/expired-milk.md @@ -19,4 +19,6 @@ What do you do now: [Tell mom about the milk](tell-mom/tell-mom.md) +[Run out the door](../../../run_out_the_door/run_out_the_door.md) + [Go back to sleep.](even-more-sleep/even-more-sleep.md) \ No newline at end of file From 75ef5ca1c28649496ba781e0a8b1c887fcfb7777 Mon Sep 17 00:00:00 2001 From: David Snaddon Date: Mon, 17 Oct 2016 00:28:22 +0800 Subject: [PATCH 4481/5486] braaivleis added to the afrikaans food list --- afrikaans/braaivleis/braaivleis.md | 1 + afrikaans/kos.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 afrikaans/braaivleis/braaivleis.md diff --git a/afrikaans/braaivleis/braaivleis.md b/afrikaans/braaivleis/braaivleis.md new file mode 100644 index 0000000000..2e9c0237d5 --- /dev/null +++ b/afrikaans/braaivleis/braaivleis.md @@ -0,0 +1 @@ +mmmmmmm, dit smaak lekker. diff --git a/afrikaans/kos.md b/afrikaans/kos.md index fdc4c43ad2..7944298d4d 100644 --- a/afrikaans/kos.md +++ b/afrikaans/kos.md @@ -2,3 +2,4 @@ Jy voel honger. Jy besluit om iets eg Afrikaans te eet. Jy besluit om een van di - [Beskuit] (./beskuit/beskuit.md) +- [braaivleis] (./braaivleis/braaivleis.md) From 855fafb2c0425d9d08d23ad8be8d2fa87aed8a1c Mon Sep 17 00:00:00 2001 From: dpz81 Date: Sun, 16 Oct 2016 18:50:02 +0200 Subject: [PATCH 4482/5486] Add new possible path to catalonian adventure 'aixecar' --- catala/aixecar/aixecar.md | 4 +++- catala/aixecar/menjar/menjar.md | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 catala/aixecar/menjar/menjar.md diff --git a/catala/aixecar/aixecar.md b/catala/aixecar/aixecar.md index a9993a1521..407ee980da 100644 --- a/catala/aixecar/aixecar.md +++ b/catala/aixecar/aixecar.md @@ -8,4 +8,6 @@ Què fas? [busques una sortida](../sortir/sortir.md) -[Intentes convertirte en super guerrer](guerrer/guerrer.md) \ No newline at end of file +[Intentes convertirte en super guerrer](guerrer/guerrer.md) + +[Agafes un troç de taula i te'l comences a cruspir](menjar/menjar.md) \ No newline at end of file diff --git a/catala/aixecar/menjar/menjar.md b/catala/aixecar/menjar/menjar.md new file mode 100644 index 0000000000..18912b63c6 --- /dev/null +++ b/catala/aixecar/menjar/menjar.md @@ -0,0 +1,4 @@ +Mentre menjes la xocolata, et sopréns perque trobes que te gust de pollastre, i comences a sospitar que potser has trobat una escletxa a Matrix. +De sobte algú pica a la porta. + +Toc Toc Toc! Que fàs? \ No newline at end of file From 22e16c9e59f9a826620340826c53a220f1a3348a Mon Sep 17 00:00:00 2001 From: Lennart Telwest Date: Sun, 16 Oct 2016 18:58:25 +0200 Subject: [PATCH 4483/5486] Nur ein Bier. --- german/Alkohol/alkohol.md | 1 + 1 file changed, 1 insertion(+) diff --git a/german/Alkohol/alkohol.md b/german/Alkohol/alkohol.md index fc88900708..8763c2f1cf 100644 --- a/german/Alkohol/alkohol.md +++ b/german/Alkohol/alkohol.md @@ -3,6 +3,7 @@ dass Sie angetrunken mit Ihren 3 besten Freunde ins Boot gestiegen sind, können sich jedoch seitdem an nichts mehr erinnern. Schließlich hatten Sie acht Tequila. Vorab tranken sie bereits 5 Bier. Von dem Cuba Libre ganz zu schweigen. +Und dabei sollte es doch bei einem Bier bleiben. Was ist passiert? From 5dd062995cf0c658685e1fb17c69e016054e2a7c Mon Sep 17 00:00:00 2001 From: dpz81 Date: Sun, 16 Oct 2016 18:59:57 +0200 Subject: [PATCH 4484/5486] Fixed length of the first line, which was more than 12 char long. Now it's 79 --- catala/aixecar/menjar/menjar.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catala/aixecar/menjar/menjar.md b/catala/aixecar/menjar/menjar.md index 18912b63c6..5633e2d8f6 100644 --- a/catala/aixecar/menjar/menjar.md +++ b/catala/aixecar/menjar/menjar.md @@ -1,4 +1,5 @@ -Mentre menjes la xocolata, et sopréns perque trobes que te gust de pollastre, i comences a sospitar que potser has trobat una escletxa a Matrix. +Mentre menjes la xocolata, et sopréns perque trobes que te gust de pollastre, +i comences a sospitar que potser has trobat una escletxa a Matrix. De sobte algú pica a la porta. Toc Toc Toc! Que fàs? \ No newline at end of file From 075d5b2163391c4efa13828b853129ce4d7112ee Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 16 Oct 2016 21:52:06 -0400 Subject: [PATCH 4485/5486] Add more detail to the Marshmallow Chief's history. --- english/chief-history/chief-history.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/english/chief-history/chief-history.md b/english/chief-history/chief-history.md index 94b6333dfd..fe26241502 100644 --- a/english/chief-history/chief-history.md +++ b/english/chief-history/chief-history.md @@ -5,6 +5,11 @@ The Chief looks at you questionably. He takes out two foldable chairs and unfolds them. "Make yourself comfortable, I will tell you my tale." +As you listen to him tell his tale, you feelings both of desire +(for marshmallows and chocolate) and of revulsion (occasioned by +the thought of over-indulgence). You force yourself to concentrate, +and are treated to a surprising revelation: + You discover that the Marshmallow Chief earned his title through an annual competition held throughout the Marshmallow Kingdom. Before being bestowed with Marshmallow-y powers, he was just a normal From e5af2cbe22a1491f08a85e972f14f92b2703ba4e Mon Sep 17 00:00:00 2001 From: ErikaLearned Date: Sun, 16 Oct 2016 19:29:39 -0700 Subject: [PATCH 4486/5486] Add a line to self-loathing --- english/vomit/self-loathing/self-loathing.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/vomit/self-loathing/self-loathing.md b/english/vomit/self-loathing/self-loathing.md index 39cde76011..3ad5076d40 100644 --- a/english/vomit/self-loathing/self-loathing.md +++ b/english/vomit/self-loathing/self-loathing.md @@ -1 +1,3 @@ You couldn't possibly hate yourself anymore right now. + +This is even worse than the incident with the grasshopper. \ No newline at end of file From 3831ed07b38e02a5297bdcac76c496fcf5303dee Mon Sep 17 00:00:00 2001 From: Ivo Stranic Date: Sun, 16 Oct 2016 21:05:40 -0700 Subject: [PATCH 4487/5486] Add rain line. --- croatian/sljez.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/croatian/sljez.md b/croatian/sljez.md index 035fca65a2..ddddbcf50c 100644 --- a/croatian/sljez.md +++ b/croatian/sljez.md @@ -13,3 +13,5 @@ Kad pogledas na stranu, sljezova ruka ti pokusava zgrabiti upaljac/ Napokon shvatis da je sljez samosvjestan! Brzo zgrabiš upaljač, prestravljeno trčeći prema najbližim vratima. + +Vani pada kisa. From 28d43d31ef2e2ee206d0bd8aaa1f26113239e6e0 Mon Sep 17 00:00:00 2001 From: John Gibson Date: Mon, 17 Oct 2016 09:28:06 -0700 Subject: [PATCH 4488/5486] Added line to end about eyes staring as you get eaten. --- english/lovecraftian/shoggoth.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/lovecraftian/shoggoth.md b/english/lovecraftian/shoggoth.md index 19b9c31a53..d4d8fc6cc2 100644 --- a/english/lovecraftian/shoggoth.md +++ b/english/lovecraftian/shoggoth.md @@ -1 +1,3 @@ You are eaten by a horrible, eldritch Shoggoth. + +It's many eyes stare at you as you are consumed. From 6c47423ac9d14b094a36579ca35bb716a015f70d Mon Sep 17 00:00:00 2001 From: John Gibson Date: Mon, 17 Oct 2016 09:55:28 -0700 Subject: [PATCH 4489/5486] Added this hurts. --- english/lovecraftian/shoggoth.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/lovecraftian/shoggoth.md b/english/lovecraftian/shoggoth.md index d4d8fc6cc2..2db9f74d53 100644 --- a/english/lovecraftian/shoggoth.md +++ b/english/lovecraftian/shoggoth.md @@ -1,3 +1,4 @@ You are eaten by a horrible, eldritch Shoggoth. It's many eyes stare at you as you are consumed. +This really hurts. From f8076453bddf07cc2800688923f7b84e1b51e4e3 Mon Sep 17 00:00:00 2001 From: Javier Gutierrez Date: Mon, 17 Oct 2016 19:50:00 +0200 Subject: [PATCH 4490/5486] continue my history --- espanol/canudos.md | 2 ++ espanol/resines/resines.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 espanol/resines/resines.md diff --git a/espanol/canudos.md b/espanol/canudos.md index b76e964fa3..978d764260 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -176,3 +176,5 @@ Se servirian las siguientes arepas: Reina Pepeada, Mechada con amarillo, y Jamon Llego el [invierno](inverlandia/inverlandia.md). Gritó que se escribiría la más aburrida historia, basada en un mal comienzo. + +Y [Resines](resines/resines.md) despertó de lo quer parecía un mal sueño. \ No newline at end of file diff --git a/espanol/resines/resines.md b/espanol/resines/resines.md new file mode 100644 index 0000000000..7617d0fe4d --- /dev/null +++ b/espanol/resines/resines.md @@ -0,0 +1 @@ +Porque esto en tiempos de Pajares y Esteso no pasaba, las cosas acababan como debían ser. \ No newline at end of file From 715620caf3de6da638c1dc0d7bfe1fcd890d4d1d Mon Sep 17 00:00:00 2001 From: Nicolas Chiaruttini Date: Mon, 17 Oct 2016 23:40:32 +0200 Subject: [PATCH 4491/5486] add chantilly escape option --- french/dessine/miel/forest/approcher.md | 1 + french/dessine/miel/forest/chantilly/asperge.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 french/dessine/miel/forest/chantilly/asperge.md diff --git a/french/dessine/miel/forest/approcher.md b/french/dessine/miel/forest/approcher.md index f224214aa1..9b7dee84c2 100644 --- a/french/dessine/miel/forest/approcher.md +++ b/french/dessine/miel/forest/approcher.md @@ -5,4 +5,5 @@ Si seulement je pouvais lui parler et lui demander pitie...! Je décide de... [Partir a courrir pour me sauver de l'ours](fuite/fuite.md) +[Je sors mon syphon a crème chantilly et l'asperge.] (chantilly/asperge.md) diff --git a/french/dessine/miel/forest/chantilly/asperge.md b/french/dessine/miel/forest/chantilly/asperge.md new file mode 100644 index 0000000000..9d87dd8bf8 --- /dev/null +++ b/french/dessine/miel/forest/chantilly/asperge.md @@ -0,0 +1,2 @@ +En plein sur les babines! +L'ours kiffe grave la chantilly - il vous fait les yeux du chat de Shrek puis vous leche le reste de miel que vous avez sur la main. \ No newline at end of file From fcc044c7039179088791dc96ff85a68793edf1b3 Mon Sep 17 00:00:00 2001 From: Nicolas Chiaruttini Date: Mon, 17 Oct 2016 23:44:35 +0200 Subject: [PATCH 4492/5486] return character problem on windows fix maybe --- french/dessine/miel/forest/approcher.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/french/dessine/miel/forest/approcher.md b/french/dessine/miel/forest/approcher.md index 9b7dee84c2..3fc002246b 100644 --- a/french/dessine/miel/forest/approcher.md +++ b/french/dessine/miel/forest/approcher.md @@ -5,5 +5,7 @@ Si seulement je pouvais lui parler et lui demander pitie...! Je décide de... [Partir a courrir pour me sauver de l'ours](fuite/fuite.md) + + [Je sors mon syphon a crème chantilly et l'asperge.] (chantilly/asperge.md) From c493c3729d51697083c118f17ca880b608fd2503 Mon Sep 17 00:00:00 2001 From: Nicolas Chiaruttini Date: Mon, 17 Oct 2016 23:51:30 +0200 Subject: [PATCH 4493/5486] breaks into lines of less than 120 characters --- french/dessine/miel/forest/chantilly/asperge.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/french/dessine/miel/forest/chantilly/asperge.md b/french/dessine/miel/forest/chantilly/asperge.md index 9d87dd8bf8..95a5618ed0 100644 --- a/french/dessine/miel/forest/chantilly/asperge.md +++ b/french/dessine/miel/forest/chantilly/asperge.md @@ -1,2 +1,3 @@ En plein sur les babines! -L'ours kiffe grave la chantilly - il vous fait les yeux du chat de Shrek puis vous leche le reste de miel que vous avez sur la main. \ No newline at end of file +L'ours kiffe grave la chantilly. +Il vous fait les yeux du chat de Shrek puis vous leche le reste de miel que vous avez sur la main. \ No newline at end of file From 3c23ed1bffe1cd8adecf52f64dd12772085860fc Mon Sep 17 00:00:00 2001 From: Tim Watson Date: Mon, 17 Oct 2016 16:42:54 -0700 Subject: [PATCH 4494/5486] added stuff to duck.md --- english/duck/duck.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/duck/duck.md b/english/duck/duck.md index a55fbf634c..64c518632c 100644 --- a/english/duck/duck.md +++ b/english/duck/duck.md @@ -4,3 +4,7 @@ DUCK OF DOOM You should know better than to pick up a duck in a dungeon. Lose 2 levels. Make it better next time. + +Wait, what was that noise? + +[Investigate](../cave/cave.md) \ No newline at end of file From 0ad15d8813c354dfec7734076fc4bea7241c2989 Mon Sep 17 00:00:00 2001 From: Anthony Pillitiere Date: Mon, 17 Oct 2016 21:12:28 -0400 Subject: [PATCH 4495/5486] Add double inception --- english/inception/double_inception/double_inception.md | 1 + english/inception/inception.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/inception/double_inception/double_inception.md diff --git a/english/inception/double_inception/double_inception.md b/english/inception/double_inception/double_inception.md new file mode 100644 index 0000000000..0d1941fad9 --- /dev/null +++ b/english/inception/double_inception/double_inception.md @@ -0,0 +1 @@ +Everything is Soooooo SSssssslllooooowwwwww! You have to wake twice! \ No newline at end of file diff --git a/english/inception/inception.md b/english/inception/inception.md index 3430a5039d..b97c029811 100644 --- a/english/inception/inception.md +++ b/english/inception/inception.md @@ -1 +1,3 @@ -Did you already make your totem? If not, you'd better hurry! \ No newline at end of file +Did you already make your totem? If not, you'd better hurry! + +Go into [DOUBLE INCEPTION](double_inception/double_inception.md). \ No newline at end of file From 4662f6f38d3146ac0316996150bc054b126332d5 Mon Sep 17 00:00:00 2001 From: Naveed Ul Islam Date: Mon, 17 Oct 2016 20:28:49 -0500 Subject: [PATCH 4496/5486] Add my part to the story --- english/necklace/necklace.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/necklace/necklace.md b/english/necklace/necklace.md index 5f9d1b2111..a6ba9b2231 100644 --- a/english/necklace/necklace.md +++ b/english/necklace/necklace.md @@ -8,3 +8,4 @@ Marshmallow here I come I wil eat you in peace. After making about 3 necklaces, I realized this is will be the next big hit of the 22nd century, so I decided to make a startup marketing to those individuals who are into fashion as well as having a sweet tooth. +But then I realized that all of it was in vain and all I had done could not benefit me at least and the society as a whole. From 04ab428200f64299c444f4a3ff30c2a54730dc03 Mon Sep 17 00:00:00 2001 From: Anthony Pillitiere Date: Mon, 17 Oct 2016 21:36:34 -0400 Subject: [PATCH 4497/5486] Update files with blank line at end --- english/inception/double_inception/double_inception.md | 2 +- english/inception/inception.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/english/inception/double_inception/double_inception.md b/english/inception/double_inception/double_inception.md index 0d1941fad9..a875e843ef 100644 --- a/english/inception/double_inception/double_inception.md +++ b/english/inception/double_inception/double_inception.md @@ -1 +1 @@ -Everything is Soooooo SSssssslllooooowwwwww! You have to wake twice! \ No newline at end of file +Everything is Soooooo SSssssslllooooowwwwww! You have to wake twice! diff --git a/english/inception/inception.md b/english/inception/inception.md index b97c029811..99c8b8af06 100644 --- a/english/inception/inception.md +++ b/english/inception/inception.md @@ -1,3 +1,3 @@ Did you already make your totem? If not, you'd better hurry! -Go into [DOUBLE INCEPTION](double_inception/double_inception.md). \ No newline at end of file +Go into [DOUBLE INCEPTION](double_inception/double_inception.md). From aec309f08f64a9856366ceccf1bebeceac6336e5 Mon Sep 17 00:00:00 2001 From: Naveed Ul Islam Date: Mon, 17 Oct 2016 20:46:07 -0500 Subject: [PATCH 4498/5486] Restrict number of characters per line to 120 --- english/necklace/necklace.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/necklace/necklace.md b/english/necklace/necklace.md index a6ba9b2231..62a986d476 100644 --- a/english/necklace/necklace.md +++ b/english/necklace/necklace.md @@ -8,4 +8,5 @@ Marshmallow here I come I wil eat you in peace. After making about 3 necklaces, I realized this is will be the next big hit of the 22nd century, so I decided to make a startup marketing to those individuals who are into fashion as well as having a sweet tooth. -But then I realized that all of it was in vain and all I had done could not benefit me at least and the society as a whole. +But then I realized that all of it was in vain and all I had done could not benefit me at least and the society as a +whole. From a88e0ce3e139dd75154e60a794234641fea7d3e6 Mon Sep 17 00:00:00 2001 From: Manas Date: Tue, 18 Oct 2016 14:15:24 +0530 Subject: [PATCH 4499/5486] Modify marshmallow.md and add a new path to the story to Trip-Yourself-Hue --- english/Trip-Yourself-Hue/trippy.md | 5 +++ english/marshmallow.md | 60 +++++++++++++++-------------- 2 files changed, 36 insertions(+), 29 deletions(-) create mode 100644 english/Trip-Yourself-Hue/trippy.md diff --git a/english/Trip-Yourself-Hue/trippy.md b/english/Trip-Yourself-Hue/trippy.md new file mode 100644 index 0000000000..446754a223 --- /dev/null +++ b/english/Trip-Yourself-Hue/trippy.md @@ -0,0 +1,5 @@ +Choose your poison, get your brains all mooshed up - +--> [Pony](https://www.youtube.com/watch?v=X0gyqsPdWFE) +--> [Horse](https://www.youtube.com/watch?v=QCGcCC065CY) +--> [Cake](https://vimeo.com/128877443) +--> [MaryJane](https://www.youtube.com/watch?v=JIpv81BH8Wo) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5dfae125d8..cf39ead2c9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -2,7 +2,7 @@ Once upon a time many authors collaborated to make meaningless linked story. NGE is [here] (NGE/NGE.md) -[start](mad/mad.md) your journey into world of mad +[start](mad/mad.md) your journey into world of mad or @@ -12,14 +12,14 @@ spend your time [wisely](http://www.pythonchallenge.com/) Are you a: -[cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) +[cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) -or a +or a [dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? -Your adventure begins. You realize there are hundreds of paths for you to choose from. -Which way should you go? Only you can decide. +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. Oh so many decisions - what will you do?? @@ -74,9 +74,9 @@ DOING will definitely keep your sharpened with latest skills (which you can get [Know about the life of this world](00-Life-of-this-world/Life of this world.md) -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) Vist the master [liquid](liquid/liquid.md). @@ -190,23 +190,23 @@ Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. The man is not large but not small, but not average either. -He is reciting poetry in a language you assume to be Egyptian, +He is reciting poetry in a language you assume to be Egyptian, though you are not familiar with Egyptian. You only assume this -because of the small pictograms that seem to rise into the +because of the small pictograms that seem to rise into the air above his head when he speaks. One looks like a small bird. -Another a small insect. A third is for all appearances the +Another a small insect. A third is for all appearances the third car your father ever bought you, a small Fiat 500, which -though in the picture above the man's head is purple, was +though in the picture above the man's head is purple, was in reality more of a mauve. It had a tendency to bark whenever -you drove it over hills, not like the proud great dane from +you drove it over hills, not like the proud great dane from Nova Scotia that most smaller cars tend to imitate when taking -on tasks greater than their strengths, but rather more like +on tasks greater than their strengths, but rather more like the small pomerainian who is now barking at the blue music notes -hovering over the man's large-ish head, now peeing on the +hovering over the man's large-ish head, now peeing on the back of the sofa, making it difficult for you to remember the -name of that dude you totally scored with in the back of your +name of that dude you totally scored with in the back of your Fiat 500. You're finding it difficult to think. You sit down on -the sofa to gather your thoughts. You think of all the men +the sofa to gather your thoughts. You think of all the men you slept with on your hitch hiking journeys across the southern american continent. @@ -849,7 +849,7 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now +Despite the little conundrum that you resolved, you realize that it's now Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" @@ -871,9 +871,9 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines +When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. +there are two options you must choose from. You may either do [this](gtd/gtd.md), @@ -885,12 +885,12 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" Yourself? @@ -906,7 +906,7 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive](divergence/divergence.md) or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) @@ -963,7 +963,7 @@ Do you want to build a [snowman?] (snowman/snowman.md) It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) -I think I'll try defying gravity. +I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) @@ -991,7 +991,7 @@ Explore the unknown. Most people die without ever visiting this [place.](underwa As you attempt this, a voice booms!! -The [boom](day-dream/day-dream.md) +The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) @@ -1003,7 +1003,7 @@ You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). -So what to do next? Three doors appear and all other ways out disappear. +So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. @@ -1045,7 +1045,7 @@ The lannisters always pays thier debts, says tyrion lannister. Interesting [char Time to [move to Canada](Canada/Canada.md), eh? -You struggle to find a line break to add your own adventure. +You struggle to find a line break to add your own adventure. You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) @@ -1056,7 +1056,7 @@ You're reincarnated as a green starfish but wish you were [blue instead.](starfi [Motivate yourself](Motivate/Motivate.md) -You wake up as Harry Potter ... and are facing Voldemort in a duel? +You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... @@ -1090,7 +1090,7 @@ The password is [xyzzy](plugh/plugh.md) [Say "Hi" to Guangwu](Guangwu/Guangwu.md) -Perishing in an avalanche of words, in a mundane collection of sentences called "stories". +Perishing in an avalanche of words, in a mundane collection of sentences called "stories". [Devastated?](devastated_greatness/devastated_greatness.md) Ever the fan of [Doug Adams](doug-adams/doug-adams.md). @@ -1120,7 +1120,7 @@ You realise that the philosphy of life in general boils down to that one central question... will you? or will you not? [So Will you?](philosophy/questions.md) -You recited [cosmological argument](cosmological_argument/cosmological_argument.md) in the morning in hub. +You recited [cosmological argument](cosmological_argument/cosmological_argument.md) in the morning in hub. You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). @@ -1145,3 +1145,5 @@ To find out click [here](meaning-of-life/meaning-of-life.md). What is that shiny in the window? Come in and take a [look](Computer-Man/Computer-Man.md) + +Wanna trip your self? If yes Hue has a place you would like to [enter](Trip-Yourself-Hue/trippy.md) From 3d3263adab20426b3be2bc603791af8073eabeb2 Mon Sep 17 00:00:00 2001 From: manas94gupta Date: Tue, 18 Oct 2016 14:42:43 +0530 Subject: [PATCH 4500/5486] Delete marshmallow.md --- english/marshmallow.md | 1149 ---------------------------------------- 1 file changed, 1149 deletions(-) delete mode 100644 english/marshmallow.md diff --git a/english/marshmallow.md b/english/marshmallow.md deleted file mode 100644 index cf39ead2c9..0000000000 --- a/english/marshmallow.md +++ /dev/null @@ -1,1149 +0,0 @@ -Once upon a time many authors collaborated to make meaningless linked story. - -NGE is [here] (NGE/NGE.md) - -[start](mad/mad.md) your journey into world of mad - -or - -spend your time [wisely](http://www.pythonchallenge.com/) - -[Click here](http://www.dvloper.me) to visit my dvloper.me blog . - -Are you a: - -[cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) - -or a - -[dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? - -Your adventure begins. You realize there are hundreds of paths for you to choose from. -Which way should you go? Only you can decide. - -Oh so many decisions - what will you do?? - -You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! - -Take some [time](meditation/meditation.md) off! - -Life is full of twists and turns like but try to cheer yourself and people around you. [Click Here](Happy/happie.md) - -Who is better? - -[Click Here](captain/captain.md) to vote for Captain America - -[Click Here] (ironman/ironman.md) to vote for Iron Man - -[Click here] (00_8_Agent/The_name_is_Bond_Milton_Bond.md) to vote for a Special Agent -[click here] (london/london.md) to vote for london - -January 2017 approaches. You have two presidential candidates to vote for. - -[Click](vote-the-president/trump/trump.md) here to vote for Donald Trump. - -[Click](vote-the-president/hillary/Hillary.md) here to vote for Hillary Clinton. - -You don't like either of these candidates. -So instead, you decide to [write a symphony](write-a-symphony/symphony.md) -or -[paint a picture](paint-a-picture/paint-a-picture.md). - -Keith the Unicorn approaches you. -He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) - -It is time to begin your adventure. -Your search for the grail begins [now](Monty-Python/search.md) - -Down one path you see a person standing in the middle of the path. -They look familiar somehow, but you just can't figure out who they are. -They seem friendly so you decide to go [talk to them.](friendly-person/friendly-person.md) - -Ask them to join you on a life changing [quest?](zuluquest/choosequest.md) - -Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) - -How about some [chill music](chillmusic/chillmusic.md)? - -[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) - -You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. - -I also agree only way to find way is to keep climbing or walking or studying or learning or all of this is DOING. -DOING will definitely keep your sharpened with latest skills (which you can get by the way from Udacity !!!) - -[Know about the life of this world](00-Life-of-this-world/Life of this world.md) - -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down - -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) - -Vist the master [liquid](liquid/liquid.md). - -Drink some [bear](bear/bear.md) - -[play](http://pcottle.github.io/learnGitBranching/) with the (git) branches - -and search for your [destiny](destiny/destiny.md). - -Before we begin, do you need a [warm-up?](warm-up/warm-up.md) - -Once you're warmed up, why not try a [work out?](work-out/work-out.md) - -or maybe [eat that delicious cucumber sandwich?](sandwich/sandwich.md) - -After warming up, take a minute and reflect on your [love for udacity](love-udacity/love-udacity.md) - -You are are man (or woman) for all seasons but need help in choosing -your travel destinations.. Of course we are happy to help you with these -[suggestions](travel-destinations/travel-destinations.md) - -Meet a [Schrodingers cat](schrodinger-cat/schrodinger-cat.md) - -Another visitor! [Stay a while...](impossible-adventure/start/start.md) - -[I am the one who knocks](say-my-name/say-my-name.md) - -[The Secret to Life...Seriously](https://www.youtube.com/watch?v=dQw4w9WgXcQ) - -[Some inspirational Lines](the-nights/the-nights.md) - -[Time for some teachings on life and success](swami-vivekananda/swami-vivekananda.md) - -One morning, you wake up in a strange room with marshmallows for walls. - -Marshmallows smell funny. What is a marshmallow anyway? - -Unexpectedly, the Chief Marshmallow demands to see your [references](references/references.md). - -Show him your [references](https://youtu.be/uZbjlsX0DNY?t=10s). - -The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtube.com/watch?v=s9Dp20ydm1E) - -*(Must be a Tuesday.)* - -Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. - -Or a [Wednesday](make_changes_GitHub/make_changes_GitHub.md)... - -[Thursday](doug-adams/arthur-dent/arthur-dent.md)... maybe even a Friday, but definetely not a Saturday. - -Ok, we have to consider Saturday too. - -[this crazy thought popped into your head](yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md) - -Alice doesn't live here anymore, [or does she?](scarab/goddess.md) - -But not Monday; you never go out on a Sunday evening......[or do you](./or-do-you/or-do-you.md)? - -Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. - -For a second, you decide whether or not to just [go back to sleep](go-back-to-sleep/go-back-to-sleep.md) - -Then, you consider playing a [chess puzzle](chess/chess.md) - -A sound from a Hitchcock movie fills the room, then quickly fades away. - -Was it the sound of a cry from the shower? - -Was it the sound of birds? - -It sounded like it could have been a [heffalump](heffalump/heffalump.md) - -No... perhaps not. - -Not at all. - -I think it was an [animal](animal/animal.md). - -Nope, it was [Tim Berners-Lee](https://en.wikipedia.org/wiki/Tim_Berners-Lee) sobbing in despair. - -Thinking back, there are no memories to suggest that this should have been -anything but an ordinary morning. You didn't go out last night, you don't -usually take intoxicants, what's happening...? - -Maybe this is a dream? - -Or a [memory](memories/memories.md)? - -Or is it just boring old [real-life](real-life/real-life.md)? - -Or [The Force](https://www.youtube.com/watch?v=cFn-NobVaoI&feature=youtu.be)! - -Or is this just [fantasy](https://www.youtube.com/watch?v=fJ9rUzIMcZQ)? - -Maybe it's a dream within a dream? Maybe dreaming and reality are one and the -same. Maybe reality is an oxymoron when considering multiple dimensions. - -Maybe you're in [Inception](inception/inception.md). - -But it's probably not worth dwelling on that right now, you could be in danger. - -Grave danger. Oh No! - -*(Is there another kind?)* - -I actually used to know a guy named Dave Granger. We sure had some good times! Anyway, the possibility of danger lurks. - -The type of extreme mortal danger that so often accompanies confectionary inspired interior design. -Quickly surveying your immediate surrounds, you notice a garishly dressed, -vacant-eyed young man lounging on a nearby sofa. - -The man is not large but not small, but not average either. -He is reciting poetry in a language you assume to be Egyptian, -though you are not familiar with Egyptian. You only assume this -because of the small pictograms that seem to rise into the -air above his head when he speaks. One looks like a small bird. -Another a small insect. A third is for all appearances the -third car your father ever bought you, a small Fiat 500, which -though in the picture above the man's head is purple, was -in reality more of a mauve. It had a tendency to bark whenever -you drove it over hills, not like the proud great dane from -Nova Scotia that most smaller cars tend to imitate when taking -on tasks greater than their strengths, but rather more like -the small pomerainian who is now barking at the blue music notes -hovering over the man's large-ish head, now peeing on the -back of the sofa, making it difficult for you to remember the -name of that dude you totally scored with in the back of your -Fiat 500. You're finding it difficult to think. You sit down on -the sofa to gather your thoughts. You think of all the men -you slept with on your hitch hiking journeys across the southern -american continent. - -[Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) - -You recall what a man said to you once: "Live as one of them, Kal-El, to discover -where your strength and your power are needed. Always hold in your heart the -pride of your special heritage. They can be a great people, Kal-El; they wish to -be. They only lack the light to show the way. For this reason above all, their -capacity for good, I have sent them you... my only son." - -[Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) - -Call in the [Justice League!](./justice-league/justice-league.md) - -[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) - -[That sure sounds familiar...](./sounds-familiar/sounds-familiar.md) - -These marshmallows are numerous and they look so delicious. -... despite the feeling they're somehow judging you for only wearing one sock. - -[Turn one of the marshmallows into gold.](./alchemy/alchemy.md) - -You reach out to grab a handful of the marshmallow wall, but you can't seem to take the handful away from the wall. - -You also seem to be wearing an uncomfortable and restrictive jacket made of leather... - -You don't own any uncomfortable and restrictive leather jackets... How did you end up sleeping in one? - -Suddenly, fuzzy memories of a tavern and an exotic woman... -a house made of candy... -closets full of umbrellas and leather. - -An umbrella (closed) automagically appears in your left hand. You tentatively - -[poke the wall](./poke-the-wall/poke-the-wall.md) with it. - -[You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) - -You are feeling very anxious at this point. - -You can't decide if anything is worth it anymore so you loose yourself at a [David Gray concert.](concert/concert.md) - -Goosebumps appear. - -This is because you do not like leather for ethical reasons. - -Leather is all over [San Fransisco](sanfran/sanfran.md). - -[Ethical reason? Seriously?](./ethical-reason/ethical-reason.md) - -You begin to break out of the jacket and find a lighter, a fork, and rope. - -You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. - -But only find out that the chocolate has expired [132 days ago](./132-days-ago/132-days-ago.md). - -Do you want to [try to fill the remaining space in the sock with marshmallows](./fill-sock/fill-sock.md)? - -You are not sure who placed these objects near you or why. - -But you have a growing sense that these mundane objects are vital to your survival. - -You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. - -[You have the suspicion that you are being closely watched.](./watched/watched.md) - -[Of course, it's that man on the sofa; go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) - -[Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) - -You see a polar bear searching for food. - -I see that you may be from the North. [How's it going?](./north/north.md) - -[A Shotgun appears!](./shotgun/shotgun.md) - -[Whilst cycling backwards.](./cycling-backwards/cycling-backwards.md) - -"Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" - -You hear a small bird sound in the distance. - -But it sounds like it might be coming out of speakers. - -Something lightly brushes the back of your neck, sending a chill down your spine! - -Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. - -You hear a strange noise then turn and see a large, wooden door. -Too large, in fact, and yet too small, for the frame it rests in. -You [walk through the door](./unnatural_door/unnatural_door.md). - -You turn for a third time and see a small, metal door. - -You knock, hear nothing and decide to [enter](./strange-room/room.md). - -Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air -for alien life forms. - -When you look away, a marshmallow hand attempts to grab the lighter. - -But you are too quick for the marshmallow! - -The realization suddenly dawns upon you the marshmallow is self aware! - -You try to bury your contribution because you are slightly - -Embarrassed by the exercise. - -If you don't do something quickly, this marshmallow belly will digest you! - -Marshmallows are going to rule the world! - -Long live marshmallows! - -For a few moments you think to yourself, with all these marshmallows, you have some rice krispy squres. - -Hold the image of the marshmallow and... - -Sing softly the song of it's people as you... - -BUT!!!! wait a minute... Do you hear that?? - -A soft echo of a torrent is fading from far... - -I felt a sudden ease of mind. - -"Ok", I said to myself, "I need to get -[out of here](outta-here/outta-here.md)" - -"But first I must remember the magic spell needed to open the enchanted door!" -Where is Hermione Granger when you need her? Where I ask you? -Oh, I know. Click [here](hermione/hermioneHere.md) - -You pick up the fork and wrap it in rope to fashion a crappy wand. - -For more on wand history [here](./wand/wand.md). - -Pointing it at the door, eyes closed, "Alohomora..." - -Nothing seems to be happening. - -You pause for a second, awaiting a spectacular sight. - -Sheepishly you look down on the crappy wand in your hand. - -You must be doing something wrong. You drink a beer and think about it, then Ah-ha! - -so many [beer](drink-beer/drink-beer.md) options.. - -You notice your pants are now glowing, so you must have been holding the wand upside down. - -Suddenly, you become aware of the need to take a leak. -You can't hold it. You wonder, Are glowing pants waterproof? -You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) - - -Do you: - -Give up and [start over](marshmallow.md). - -[Listen to Tales of the Inexpressable (By Shpongle)](https://www.youtube.com/watch?v=6WTxC8wnXQo) - -[Watch the new Star Wars trailer](https://www.youtube.com/watch?v=sGbxmsDFVnE) - -[Watch the second new Star Wars trailer](https://www.youtube.com/watch?v=ngElkyQ6Rhs) - -[Live Tweet the situation](tweet-it/tweet-it.md) - -[Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) - -Take out your [knitting project](knit/knit.md) and finish your sock heel turn. - -Take out your [crochet project](crochet/crochet.md) instead and finish that teddy bear you've been working on. - -[Realize you are in the ...](in-matrix/matrix.md) - -[Realize you better call Saul](better-call-saul/saul.md) - -[Turn off all the lights](lightsoff/lightsoff.md) - -[Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) - -[Feel a sudden urge to dance](https://youtu.be/dQw4w9WgXcQ) - -[Make changes on GitHub to revise this crazy story](make_changes_GitHub/make_changes_GitHub.md) - -[Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) - -[Go eat some rainbows](eat-rainbows/rainbows.md) - -[Admire your glowing pants](glowing-pants/glowing-pants.md) - -[Grab some coffee?](coffee/coffee.md) - -[Grab some wine?](wine/wine.md) - -[Call the GhostBusters](ghostbusters/ghostbusters.md) - -[Talk to Bob Barker](bob-barker/barker.md) - -[Hop on a plane](forest/forest.md) - -[Spend so long trying to decide that you fall asleep](sleep-and-wake/sleep_and_wake.md) - -[Cry out for your Mommy](cry-out-for-mommy/oh_mommy.md) - -[Enter a Dim Reality](Enter-a-dim-reality/Dim_reality.md) - -[Watch the Warriors vs Cavaliers game 1 of the NBA Finals](warriors-game/watch-warriors.md) - -[Peek through the keyhole to reveal what is beyond](world-war-marshmallows/world-war-marshmallows.md) - -[Try the more effective "Apparation" spell to teleport elsewhere](movie-ripoffs/hogwarts/hogwarts.md) - -[Begin to feel suspicious](lucidream/luciddream.md) - -[Want to break free](yuha/yuha.md) - -[Open the door and run outside](open-door/open-door.md) - -[Give the marshmallow entity a turing test](turing-test/turing-test.md) - -[Step into an adjacent room to check your social media hubs](social-media/social-media.md) - -[Try and interact with the marshmallow hand](interact/interact.md) - -[Check your phone for date, time and location?](check-your-phone/check-your-phone.md) - -[Check mspaintadventures](mspa/mspa.md) - -[Lunge for the lighter](lunge-for-the-lighter/lunge-for-the-lighter.md) - -[Ask to Alice](ask-to-alice/ask-to-alice.md) - -[Close your eyes](experience/experience.md) - -[Grab the lighter first?](lighter/grab-lighter.md) - -[Make a swing with rope and jacket](enjoy-DreamRide/ride.md) - -[Start eating the walls?](eating-walls/eating-marshmallows.md) - -[Give the marshmallow to the polar bear?](polar-bear/polar-bear.md) - -[Realize you are in Minecraft](you-are-in-minecraft/minecraft.md) - -[Try to pull a MacGyver with the lighter, fork and rope?](macgyver/macgyver.md) - -[Quickly run outside and explore?](explore-outside/explore-outside.md) - -[Light a fire?](light-fire/fire.md) - -[jump in a chocolate pool?](chocopool/choco.md) - -[Hungry Kya?](hungry/hungry.md) - -[Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) - -[Dig a hole with your bare hands?](hands/hands.md) - -[Go back to sleep?](sleep/marshmallow.md) - -[Stay puft?](staypuft/marshmallowman.md) - -[Dig at the walls with a fork](dig/dig.md) - -[Invite some friends over?](invite-friends/friends.md) - -[Look for a way out?](find-exit/leave.md) - -[Count the marshmallows?](count-the-marshmellows/count-the-marshmellows.md) - -[Begin to dance to pass the time?](dance/dance.md) - -[You pinch yourself to see whether you are dreaming?](pinch/pinch.md) - -[Promise to yourself this is the last time you take hallucinogenic mushrooms?](shrooms/never-again.md) - -[Think this is too surreal and decide to try the French version instead?](../french/feu-de-camp.md) - -[Think this is a dream, and jam the fork into your hand to wake up?](fork-jam/not_dreaming.md) - -[Go out and collect mushroom?](mushroom/collect_mushroom.md) - -[Try to walk around](virtualreality/oculus.md) - -[Make one of those weird marshmallow Jell-O salads?](marshmallow-jello-o-salad/the-kind-your-grandma-used-to-make.md) - -[Begin to sing out of fear?](sing/sing.md) - -[Go meditate and ponder about your next step?](meditate/meditate.md) - -[Scream out of fear?](scream/scream.md) - -[Get to work on the best batch of cookies ever made?](bake-cookies/cookies.md) - -[Start tying knots on the fork?](fork-knots/melt-with-fork.md) - -[Start pondering how you got yourself in a sticky situation?](ponder/ponder-about-life.md) - -[Create a new jacket out of marshmallows?](jacket/marshmallow-jacket.md) - -[Go straight to the solution!](http://youtu.be/dQw4w9WgXcQ) - -[Cook them marshmallows](http://youtu.be/dQw4w9WgXcQ) - -[Explore Wikipedia](wikipedia/wiki.md) - -[Whip out your spork, start a fire and make giant s'mores?](http://easybaked.files.wordpress.com/2011/10/smores4.jpg) - -[Ask yourself how you got yourself into this situation - AGAIN?](shrooms/never-again.md) - -[Challenge the Marshmallows to a Rock Off!](challenge-marshmellow-to-rock-off/tenacious-d.md) - -[Call a doctor](call-a-doctor/doctor.md) - -[Remember that pill you took](adipose/adipose.md) - -[Light up the wall](light-up/light-up.md) - -[Hide the lighter fork and rope in your pocket](hide/hide-chk.md) - -[Make a necklace out of the marshmallows](necklace/necklace.md) - -[Light up the wall 2](light-up2/light-up2.md) - -[Switch on your laptop and..](netflix/netflix.md) - -[Lion King ](no-worries/hakuna-matata.md) - -[Perform some magic](magic/magic.md) - -[Raise your self so high](khudi/buland_very_high.md) - -[Put yourself back in the straitjacket](backinstraitjacket/backinstraitjacket.md) - -[Find the bird](find-bird/bird.md) - -[Attempt to befriend the marshmellow man](make-friends/make-friends.md) - -[Try to use one of your pokemon?](pokemon/pikachu_wins.md) - -[Throw a rock at it and see if it moves](moving/moving.md) - -[Start tickling the marshmallow](tickle/tickle.md) - -[Enter the time tunnel](timeTunnel/timeTunnel.md) - -[Tie the marshmallow's hands and legs](tying/tying.md) - -[Use the fork, Luke!](use-the-fork-luke/use-the-fork.md) - -[B b b bird bird bird, bird is the word](birdistheword/birdistheword.md) - -[Quote of the day](quote-of-the-day/quote.md) - -[Escape and find a phone to call...](call-these-guys/calltheseguys.md) - -[Play some cricket](play-some-cricket/playsomecricket.md) - -[Run back and forth quickly slamming into the walls](indigestion/indigestion.md) - -[In their tongue he is Dovhakiin, DragonBorn, FUS ROH DAH](fus-roh-dah/fus-roh-dah.md) - -[The walls start closing in](malaria/malaria.md) - -[Come to Nepal](nepal/nepal.md) - -[Order Pizza](order-pizza/order-pizza.md) - -[Summon your robot army](robot-army/robots-everywhere.md) - -[Oh dear! You ended up in Candyland!](candyland/diabetes.md) - -[Give 'em the Leslie Howard!](slap-it-hard/teach-it-a-lesson.md) - -[You punch the first person you see!](punch/punch.md) - -[Hulk smash?](hulk/smash.md) - -[Marsh Attack!!!](marshmallow-attack/marsh-attack.md) - -[Got Lost](getsLost/getsLost.md) - -[Try to make smores](smores/smores.md) - -[Summon your humble servant](humbleservant/humbleservant.md) - -[Summon the magical snuffbox](snuffbox/snuffbox.md) - -[Become the One?](matrix/matrix.md) - -[Melt all the marshmallows to make s'mores?](meltmarshmallows/meltmarshmallows.md) - -[Want to cook boneless pork shoulder roast?](pork/roast.md) - -[Take a selfie?](selfie/selfie.md) - -[Say something](blah-balh/blah-blah.md) - -[Try the Marshmallow Test on it?](https://youtu.be/QX_oy9614HQ) - -[Become an Octodog](be-octodog/octodog.md) - -[Make a Marshmallow cake](https://www.youtube.com/watch?v=3l1SY3QREv4) - -[I'm Batman](I'm-batman/batman.md) - -[You realize you are in NeverLand and you are - never going come... so you sing the Tinker Bell song](https://youtu.be/Sopngy6uucw) - -[You decide to become a marshmallow yourself.](becomemarshmallow/becomemarshmallow.md) - -[Explain Fizzbin to the marshmallow hand?](fizzbin/explain-fizzbin.md) - -[Drool on the Marshmallow to show demonstrate your digestive superiority](drool/droolstrategem.md) - -[Eat the Marshmallow](eatmarshmallow/eatmarshmallow.md) - -[Escape into Willy Wonka Lego-World](lego-world/lego-world.md) - -[Eat breakfast](../english/breakfast/breakfast.md) - -[After breakfast you lookup triathlon](triathlon/triathlon.md) - -[The inception protocol](dream_in_dream/inception.md) - -[Choose the blue pill or the red pill?](choose-pill/choose-pill.md) - -[Pull out your proton pack!](ghost-buster/ghost-busted.md) - -[You take the red pill](red-pill/red-pill.md) - -[Twas the Night Before Christmas](night-night/tale.md) - -[Check Reddit for any useful information.](reddit/ask-reddit.md) - -[Watch Up](watch-movie/Up.md) - -[Give up and search for oil fields](oil-field/oil-field.md) - -[Appear on Falkor’s Back](appear-on-falkors-back/falkor.md) - -[Sit and ponder how you got into this situation](thesituation/situation.md) - -[Smart Ape roasting a marshmellow](https://www.youtube.com/watch?v=_ZEBrHe4hVs) - -[Bruce Wayne is BATS !!](batman/batman.md) - -[Use your chance, master self-control](self-control/self-control.md) - -[Have a Pip-Boy](pipboy/pipboy.md) - -[Call upon one of your past lives as avatar](avatar/air.md) - -[Play some GTA5](play-gta5/play-gta5.md) - -[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) - -[Search for gluten](search-for-gluten/search-for-gluten.md) - -[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) - -[Go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) - -[Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) - -[Commit suicide](commit-suicide/suicide.md) - -[Make an appointment with the dentist](dentist/ouch.md) - -[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) - -[You Google what to do](https://www.google.co.in/) - -[Abdul kalam quotes on overcoming fear](apj/apj.md) - -[If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) - -[There's no such thing as a free lunch.](free-lunch/free-lunch.md) - -[Follow the dog...](play-with-dog/dog.md) - -[What is LOVE ?](love/love.md) - -[Got to Singapore](singapore/singapore.md) - -[Talk to Finn](talk-to-finn/finn.md) - -[Play Guitar](guitar/guitar.md) - -[Contemplate the meaning of life](meaning/meaning.md) - -[Rinse the marshmallow under the tap then eat it](dysentry/dysentry.md) - -[Wake up!](wake-up/wake-up.md) - -[Thank Mr. Skeltal](2spooky/2spooky.md) - -[Utilize your wand once again...](utilize-wand/fork-rope-wand.md) - -[Draw a trapezoid](trapezoid/trapezoid.md) - -[Stop, hammertime!](hammertime/hammertime.md) - -[Analyze the composition of the marshmallow](analyze/analysis.md) - -[Watch Barcelona game](watch-barca/watch-barca.md) - -[Oops! this story ain't ending..](unending-story/unending-story.md) - -[Code](code/code.md) - -[Screaming goat is screaming](https://youtu.be/kh6c0SOfkH4) - -[Play on miniclip!] (papa-louie/papa-louie.md) - -[Visit Sturgis 2015!](sturgis2015/sturgis.md) - -[Attack marshmallow pikachu!](pikachu/pokeball.md) - -"I have problems with my sleep," you realise. "I'm going to [move to New York](new-york/new-york.md)." - -[Summon Dragons of the Khaleesi](dragons/fire-everywhere.md) - -[Bounce](bounce/bounce.md) - -[Play some DotA 2](play-dota2/play-dota2.md) - -[Play Starcraft 2](starcraft2/starcraft2.md) - -[Play some Geometry Dash](play-geometrydash/play-geometrydash.md) - -[See if there is a Udacity course on the subject](udacity/udacity.md) - -Click [here](young/young.md) to listen to music. - -[Consult Flann O'Brien](flann-o-brien/truth-is-odd.md) - -[Attack it with a lightsaber](lightsaber/lightsaber.md) - -[Decide to browse Reddit instead](https://www.reddit.com/) - -[It's time to take a vacation] (licked-cat/vacation.md) - -And then you realize that Burning Man is over, so no real vacations :( - -[present-tense](present-tense/present-tense.md) - -[Think about happy thoughts while spinning around in circles](my-story/my-story.md) - -[Story of DKER](DKER/DKER.md) - -[Get your prostate checked](prostate/prostate.md) - -If you eat a lot, you should also [exercise](exercise/exercise.md) - -A quick brown fox jumps over the lazy dog! - -[Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) - -[Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) - -[Watch a recording of an awesome jazz concert](https://www.youtube.com/watch?v=VMb3PX9gq78) - -whilst wandering through the vastness of this universe. - -[But what universe is this?](universe-test/blaze_verse.md) - -Either way we are cool, right? - -This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. - -You decide that you do not want to visit the miracle man. [You check your -phone to find something else to do](check-phone/check-phone.md). - -And you plug-in to [play some music](play-music/playmusic.md). - -The next thing you know, you're up all night in Croatia mixing a new playlist - -You remember the story of a [robot](happy-robot/happy-robot.md). - -Wondering how you got here, you feel a strange tingling in your hands, almost as if -they are responding to your new surroundings. You feel an urge to gesture forward, -and as you do a large pink marshmallow shoots out of your hand into the wall before you. -[Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) - -[The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) - -All in a hard days work, do you play some [music](play-music/playmusic.md). - -As you hold your pot of precious hunny, you begin to [hear an ominous voice...](ominous-voice/ominous-voice.md) - -Honesty in a hard way [Watch it](few-good-men/fgm.md) - -Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube.com/watch?v=lAF8D0ugyVk) - -But the call of of nature wasn't going away so you push open the toilet door and go in.. - -Just then you recall the news story of what is causing the -[strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. - -...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) - -You escape into a [recording studio](more_cowbell/more_cowbell.md) - -Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) - -And then you stumble upon something [completely different](http://www.atlasobscura.com/) - -After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) - - -[What about skydiving](skydiving/skydiving.md) - -*Story intensifies!* - -You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie... - -Instead of going to the movies, you decide to [solve the gase crisis](plow/plow.md) instead. - -You made it through the day and are starting to get sleepy... [Time to fall asleep](marshmallow.md) - -You wake up in front of a computer screen. You begin reading -the text of a markdown file called marshmallow.md. As you read -you realize that the story is about you! -[remember this story!](this-story-is-about-you/this-story-is-about-you.md) - -This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) - -[Call a random number](call-a-random-number/answer.md) - - -You must be lonely. [Want a friend?](robofriend/AIRobot.md) - -When I code over my weekend, I feel that this becomes my [whole life](code-my-life/code-my-life.md). - -Suddenly you feel a strong craving for [something.](craving/craving.md) - -Despite the little conundrum that you resolved, you realize that it's now -Friday, December 4th. - -"Wait a minute", you gasped, "The English Premier League is on tomorrow!!" - -With that new revelation in mind, you quickly make like David Hasselhoff -and wiggle your wrist to show off a nice particular watch that even listens -to you when you speak to it. - -["Ahem!"](my-adventure/my-adventure.md) - -So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... ->>>>>>> deb66146d3bd0481a4c19d27b8ef289b939d4156 - -["Train Ride!"] (train-ride/train-ride.md) - -I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/star-wars.md) - -"What's a Heffelump?" asked Sheffield inquisitively. - -"I dont't know! Why should I care?" replied Donald Trump. - -When faced with a lot of work and impending deadlines -in the (not so near) future, -there are two options you must choose from. - -You may either do [this](gtd/gtd.md), - - or [that](procrastinate/procrastinate.md). - - This is one weird story. Did anybody read the whole page? - - I sure did not. This is as weird as it gets. - -[Get Crazy!](crazy/crazy.md) - -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim -[move to Boston](boston/boston.md)." - -Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! - -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" - -Yourself? - -Instead of reading this entire story, you decide to go see the new star wars! - -As you're walking down the street you see [something](millenium-falcon/flyaway.md) - -You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). - -[Do you have my stapler?](stapler/stapler.md) - -[Build a car](build-a-car/build-a-car.md) - -What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? - -The divergence is coming, [survive](divergence/divergence.md) or perish? - -[Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) - -You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) - -You start off strong... - -But there are [too many hurdles in your way](hurdles/hurdles.md). - -"What a joke?", he said, after looking at the [news](joke/joke.md) - -Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... - -It says you should [brew some beer](beer-brewer/beer-brewer.md). - -The [news](joke/joke.md) says it all my people! - -Bible says... As you sow, so shall you [reap](think/growrich.md) - -So shall you reap, and the [steelers](steelers/steelers.md) know that all too well! - -Until you realize that even marshmallows need [LOVE](https://www.youtube.com/watch?v=i5fZ__mnHbU). - -Marcel needs a new pair of shoes, will you buy shoes for [Marcel](https://www.youtube.com/watch?v=VF9-sEbqDvU)? - -You look up and out to the ocean. In the distance you see a [mermaid](mermaid/mermaid.md) - -The mermaid above died, but [don't worry...](mermaid2/mermaid.md) - -A fairy tale about [a shoemaker and elves](elves-and-shoemaker/elves-and-shoemaker.md) - -The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) - -The understanding of git [go here](Booyah/booyah.md) - -[Link to Git Official Website] (git/git.md) - -[link to google website] (kumar/kumar.md) - -Hi i got this one for udacity team. - -As the sand encompassed her toes and -the ocean-spray breezed through her nose - -she froze... - -But the cold never bothered me anyway. - -Let it go, let it gooo... - -CANT HOLD IT BACK ANY MORE - -Do you want to build a [snowman?] (snowman/snowman.md) - -It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) - -I think I'll try defying gravity. - -Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) - -[Paint It Black](paint-it-black/PaintItBlack.md) - -[Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) - -[To Infinity and Beyond](math/math.md) - -[I hope you aren't using a poorly built crawler on this](./marshmallow.md) - -[Read my story](magic2/magic2.md) - -[..and recall that Carl Johnson might be alive](Carl/carl-johnson.md) - -[Or, forget it all, and jump off the cliff](cliff/cliff.md) - -[Make a pie chart](http://i.imgur.com/uaFES1b.jpg) - -[Read a story of a crouch dragon](crouch-dragon/crouch-dragon.md) - -[Write a hiku](write-a-hiku/hiku.md) - -Explore the unknown. Most people die without ever visiting this [place.](underwater/scuba-diving.md) - -As you attempt this, a voice booms!! - -The [boom](day-dream/day-dream.md) - -Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) - -You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) - -For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) - -You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). - -You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). - -So what to do next? Three doors appear and all other ways out disappear. -So you pick the [right door](mysterydoor/mysterydoor.md) - -You put your [cowboy hat](cowboy/cowboy.md) back on your head. - -Or... or... or... Oh, I forgot! -You foget something, but you decide to [move on](move-on/move-on.md). - -You follow the panda up the nearest tree, chewing bamboo shoots as you go [bamboo-shoots](bamboo/bamboo-shoots.md) - -And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) - -[Do nothing.](nothing/do-nothing.md) - -[Rent a hydroplaning dog sled to get you to the other side of the world] (dog-sled/dogsled.md) - -Toasted [marshmallow](toasted/smores_pie.md) - -While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. -[The new record is!](new_warriors_record/new_warriors_record.md) - -Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). - -Life is full of [puzzles](LifePuzzle/LifePuzzle.md). - -You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". - -A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) - -Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) - -If you have read this far, then you must be in pain. -Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. - -As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. - -Health and Life Lovely [Quotes](./health/health.md) - -The lannisters always pays thier debts, says tyrion lannister. Interesting [character](./gameofthrones/tyrion.md) he is. - -Time to [move to Canada](Canada/Canada.md), eh? - -You struggle to find a line break to add your own adventure. -You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) - - - -The crushing weight of all these options causes you to [end your life.](end/end.md) - -You're reincarnated as a green starfish but wish you were [blue instead.](starfish/starfish.md) - -[Motivate yourself](Motivate/Motivate.md) - -You wake up as Harry Potter ... and are facing Voldemort in a duel? -What should you [do](magicaladventure/decision_time/decision_time.md) - -My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... - -[Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. - -You decide you want to be a pirate and remember a show called -[onepiece](onepiece/op.md) - -You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Taiwan.md)! - -you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) - -Time to check out the latest [Total War - Warhammer](total-war/war-start.md)! - -You wake up in the morning and your [computer is looking out of the window](computer-window/computer-window.md) - -Instragram, a great place to spend time. [Visit my profile](https://www.instagram.com/coding.imagination/) - -You've been charged with treason against the King. You wake up in [prison](prison/prison.md). - -My visit to the [zoo](zoo/zoo.md). - -You wake up confused, you faint you go back in [time](time-travel/time-travel.md) - -[The Hungry Prince](hungry_prince/hungry_prince.md) - -[The Angry Prince](angry_prince/angry_prince.md) - -The password is [xyzzy](plugh/plugh.md) - -[Say "Hi" to Guangwu](Guangwu/Guangwu.md) - -Perishing in an avalanche of words, in a mundane collection of sentences called "stories". -[Devastated?](devastated_greatness/devastated_greatness.md) - -Ever the fan of [Doug Adams](doug-adams/doug-adams.md). - -If you really want to know the answer to the question.... -"What is the answer to Life, the Universe and Everything?" then you -need some [Deep Thought](doug-adams/deep-thought/deep-thought.md) - -Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit - -[Discover](discover-new-genres/discover-new-genres.md) a new genre of music! - -[Watch](https://www.youtube.com/watch?v=-XJN7qqFqPE) Too Many Puppies! - -You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... - -You decide to quit your job to play [Pokemon Go](pokemon-go/pokemon-go.md) full time. - -Learn about something random [here](https://en.wikipedia.org/wiki/Special:Random)! - -Learn about Ankesh [here](characters/ankesh.md) - -[Hold the door!](hold_the_door/hodor.md) [Spoiller GOT] ->>>>>>> b6c70ae2fc2160a4b1b9c8639b4567de6b5a4a93 - -You realise that the philosphy of life in general boils down to -that one central question... will you? or will you not? -[So Will you?](philosophy/questions.md) - -You recited [cosmological argument](cosmological_argument/cosmological_argument.md) in the morning in hub. - -You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). - -Click [here](https://www.youtube.com/watch?v=aboZctrHfK8) to find out what the meaning of life is. - -so lazy [here](lazy/lazy.md) - -[Update](android/marshmallow6.0.md) your Smartphone to the Marshmallow 6.0! - -Click [here](walrus/walrus.md) - -Click here to learn more about the MEAN stack [here](mean-stack/mean.md) - -Do you like [stargazing](stargazing/stargazing.md) ? - -Let's learn some [mandarin](learn-mandarin/learn-mandarin.md) - -Neurons for social memories, [more info](http://news.mit.edu/2016/scientists-identify-neurons-social-memory-0929) - -What is the meaning of life? -To find out click [here](meaning-of-life/meaning-of-life.md). - -What is that shiny in the window? Come in and take a -[look](Computer-Man/Computer-Man.md) - -Wanna trip your self? If yes Hue has a place you would like to [enter](Trip-Yourself-Hue/trippy.md) From 93f363f3be72efca30a1a04d3d9e8e89325b5882 Mon Sep 17 00:00:00 2001 From: Manas Date: Tue, 18 Oct 2016 14:54:30 +0530 Subject: [PATCH 4501/5486] Modify marshmallow.md and add a new path to story to Trip-Yourself-Hue --- english/marshmallow.md | 1149 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1149 insertions(+) create mode 100644 english/marshmallow.md diff --git a/english/marshmallow.md b/english/marshmallow.md new file mode 100644 index 0000000000..82aac81cf3 --- /dev/null +++ b/english/marshmallow.md @@ -0,0 +1,1149 @@ +Once upon a time many authors collaborated to make meaningless linked story. + +NGE is [here] (NGE/NGE.md) + +[start](mad/mad.md) your journey into world of mad + +or + +spend your time [wisely](http://www.pythonchallenge.com/) + +[Click here](http://www.dvloper.me) to visit my dvloper.me blog . + +Are you a: + +[cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) + +or a + +[dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? + +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. + +Oh so many decisions - what will you do?? + +You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! + +Take some [time](meditation/meditation.md) off! + +Life is full of twists and turns like but try to cheer yourself and people around you. [Click Here](Happy/happie.md) + +Who is better? + +[Click Here](captain/captain.md) to vote for Captain America + +[Click Here] (ironman/ironman.md) to vote for Iron Man + +[Click here] (00_8_Agent/The_name_is_Bond_Milton_Bond.md) to vote for a Special Agent +[click here] (london/london.md) to vote for london + +January 2017 approaches. You have two presidential candidates to vote for. + +[Click](vote-the-president/trump/trump.md) here to vote for Donald Trump. + +[Click](vote-the-president/hillary/Hillary.md) here to vote for Hillary Clinton. + +You don't like either of these candidates. +So instead, you decide to [write a symphony](write-a-symphony/symphony.md) +or +[paint a picture](paint-a-picture/paint-a-picture.md). + +Keith the Unicorn approaches you. +He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) + +It is time to begin your adventure. +Your search for the grail begins [now](Monty-Python/search.md) + +Down one path you see a person standing in the middle of the path. +They look familiar somehow, but you just can't figure out who they are. +They seem friendly so you decide to go [talk to them.](friendly-person/friendly-person.md) + +Ask them to join you on a life changing [quest?](zuluquest/choosequest.md) + +Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) + +How about some [chill music](chillmusic/chillmusic.md)? + +[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) + +You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. + +I also agree only way to find way is to keep climbing or walking or studying or learning or all of this is DOING. +DOING will definitely keep your sharpened with latest skills (which you can get by the way from Udacity !!!) + +[Know about the life of this world](00-Life-of-this-world/Life of this world.md) + +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down + +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) + +Vist the master [liquid](liquid/liquid.md). + +Drink some [bear](bear/bear.md) + +[play](http://pcottle.github.io/learnGitBranching/) with the (git) branches + +and search for your [destiny](destiny/destiny.md). + +Before we begin, do you need a [warm-up?](warm-up/warm-up.md) + +Once you're warmed up, why not try a [work out?](work-out/work-out.md) + +or maybe [eat that delicious cucumber sandwich?](sandwich/sandwich.md) + +After warming up, take a minute and reflect on your [love for udacity](love-udacity/love-udacity.md) + +You are are man (or woman) for all seasons but need help in choosing +your travel destinations.. Of course we are happy to help you with these +[suggestions](travel-destinations/travel-destinations.md) + +Meet a [Schrodingers cat](schrodinger-cat/schrodinger-cat.md) + +Another visitor! [Stay a while...](impossible-adventure/start/start.md) + +[I am the one who knocks](say-my-name/say-my-name.md) + +[The Secret to Life...Seriously](https://www.youtube.com/watch?v=dQw4w9WgXcQ) + +[Some inspirational Lines](the-nights/the-nights.md) + +[Time for some teachings on life and success](swami-vivekananda/swami-vivekananda.md) + +One morning, you wake up in a strange room with marshmallows for walls. + +Marshmallows smell funny. What is a marshmallow anyway? + +Unexpectedly, the Chief Marshmallow demands to see your [references](references/references.md). + +Show him your [references](https://youtu.be/uZbjlsX0DNY?t=10s). + +The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtube.com/watch?v=s9Dp20ydm1E) + +*(Must be a Tuesday.)* + +Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. + +Or a [Wednesday](make_changes_GitHub/make_changes_GitHub.md)... + +[Thursday](doug-adams/arthur-dent/arthur-dent.md)... maybe even a Friday, but definetely not a Saturday. + +Ok, we have to consider Saturday too. + +[this crazy thought popped into your head](yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md) + +Alice doesn't live here anymore, [or does she?](scarab/goddess.md) + +But not Monday; you never go out on a Sunday evening......[or do you](./or-do-you/or-do-you.md)? + +Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. + +For a second, you decide whether or not to just [go back to sleep](go-back-to-sleep/go-back-to-sleep.md) + +Then, you consider playing a [chess puzzle](chess/chess.md) + +A sound from a Hitchcock movie fills the room, then quickly fades away. + +Was it the sound of a cry from the shower? + +Was it the sound of birds? + +It sounded like it could have been a [heffalump](heffalump/heffalump.md) + +No... perhaps not. + +Not at all. + +I think it was an [animal](animal/animal.md). + +Nope, it was [Tim Berners-Lee](https://en.wikipedia.org/wiki/Tim_Berners-Lee) sobbing in despair. + +Thinking back, there are no memories to suggest that this should have been +anything but an ordinary morning. You didn't go out last night, you don't +usually take intoxicants, what's happening...? + +Maybe this is a dream? + +Or a [memory](memories/memories.md)? + +Or is it just boring old [real-life](real-life/real-life.md)? + +Or [The Force](https://www.youtube.com/watch?v=cFn-NobVaoI&feature=youtu.be)! + +Or is this just [fantasy](https://www.youtube.com/watch?v=fJ9rUzIMcZQ)? + +Maybe it's a dream within a dream? Maybe dreaming and reality are one and the +same. Maybe reality is an oxymoron when considering multiple dimensions. + +Maybe you're in [Inception](inception/inception.md). + +But it's probably not worth dwelling on that right now, you could be in danger. + +Grave danger. Oh No! + +*(Is there another kind?)* + +I actually used to know a guy named Dave Granger. We sure had some good times! Anyway, the possibility of danger lurks. + +The type of extreme mortal danger that so often accompanies confectionary inspired interior design. +Quickly surveying your immediate surrounds, you notice a garishly dressed, +vacant-eyed young man lounging on a nearby sofa. + +The man is not large but not small, but not average either. +He is reciting poetry in a language you assume to be Egyptian, +though you are not familiar with Egyptian. You only assume this +because of the small pictograms that seem to rise into the +air above his head when he speaks. One looks like a small bird. +Another a small insect. A third is for all appearances the +third car your father ever bought you, a small Fiat 500, which +though in the picture above the man's head is purple, was +in reality more of a mauve. It had a tendency to bark whenever +you drove it over hills, not like the proud great dane from +Nova Scotia that most smaller cars tend to imitate when taking +on tasks greater than their strengths, but rather more like +the small pomerainian who is now barking at the blue music notes +hovering over the man's large-ish head, now peeing on the +back of the sofa, making it difficult for you to remember the +name of that dude you totally scored with in the back of your +Fiat 500. You're finding it difficult to think. You sit down on +the sofa to gather your thoughts. You think of all the men +you slept with on your hitch hiking journeys across the southern +american continent. + +[Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) + +You recall what a man said to you once: "Live as one of them, Kal-El, to discover +where your strength and your power are needed. Always hold in your heart the +pride of your special heritage. They can be a great people, Kal-El; they wish to +be. They only lack the light to show the way. For this reason above all, their +capacity for good, I have sent them you... my only son." + +[Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) + +Call in the [Justice League!](./justice-league/justice-league.md) + +[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) + +[That sure sounds familiar...](./sounds-familiar/sounds-familiar.md) + +These marshmallows are numerous and they look so delicious. +... despite the feeling they're somehow judging you for only wearing one sock. + +[Turn one of the marshmallows into gold.](./alchemy/alchemy.md) + +You reach out to grab a handful of the marshmallow wall, but you can't seem to take the handful away from the wall. + +You also seem to be wearing an uncomfortable and restrictive jacket made of leather... + +You don't own any uncomfortable and restrictive leather jackets... How did you end up sleeping in one? + +Suddenly, fuzzy memories of a tavern and an exotic woman... +a house made of candy... +closets full of umbrellas and leather. + +An umbrella (closed) automagically appears in your left hand. You tentatively + +[poke the wall](./poke-the-wall/poke-the-wall.md) with it. + +[You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) + +You are feeling very anxious at this point. + +You can't decide if anything is worth it anymore so you loose yourself at a [David Gray concert.](concert/concert.md) + +Goosebumps appear. + +This is because you do not like leather for ethical reasons. + +Leather is all over [San Fransisco](sanfran/sanfran.md). + +[Ethical reason? Seriously?](./ethical-reason/ethical-reason.md) + +You begin to break out of the jacket and find a lighter, a fork, and rope. + +You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. + +But only find out that the chocolate has expired [132 days ago](./132-days-ago/132-days-ago.md). + +Do you want to [try to fill the remaining space in the sock with marshmallows](./fill-sock/fill-sock.md)? + +You are not sure who placed these objects near you or why. + +But you have a growing sense that these mundane objects are vital to your survival. + +You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. + +[You have the suspicion that you are being closely watched.](./watched/watched.md) + +[Of course, it's that man on the sofa; go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) + +[Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) + +You see a polar bear searching for food. + +I see that you may be from the North. [How's it going?](./north/north.md) + +[A Shotgun appears!](./shotgun/shotgun.md) + +[Whilst cycling backwards.](./cycling-backwards/cycling-backwards.md) + +"Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" + +You hear a small bird sound in the distance. + +But it sounds like it might be coming out of speakers. + +Something lightly brushes the back of your neck, sending a chill down your spine! + +Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. + +You hear a strange noise then turn and see a large, wooden door. +Too large, in fact, and yet too small, for the frame it rests in. +You [walk through the door](./unnatural_door/unnatural_door.md). + +You turn for a third time and see a small, metal door. + +You knock, hear nothing and decide to [enter](./strange-room/room.md). + +Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air +for alien life forms. + +When you look away, a marshmallow hand attempts to grab the lighter. + +But you are too quick for the marshmallow! + +The realization suddenly dawns upon you the marshmallow is self aware! + +You try to bury your contribution because you are slightly + +Embarrassed by the exercise. + +If you don't do something quickly, this marshmallow belly will digest you! + +Marshmallows are going to rule the world! + +Long live marshmallows! + +For a few moments you think to yourself, with all these marshmallows, you have some rice krispy squres. + +Hold the image of the marshmallow and... + +Sing softly the song of it's people as you... + +BUT!!!! wait a minute... Do you hear that?? + +A soft echo of a torrent is fading from far... + +I felt a sudden ease of mind. + +"Ok", I said to myself, "I need to get +[out of here](outta-here/outta-here.md)" + +"But first I must remember the magic spell needed to open the enchanted door!" +Where is Hermione Granger when you need her? Where I ask you? +Oh, I know. Click [here](hermione/hermioneHere.md) + +You pick up the fork and wrap it in rope to fashion a crappy wand. + +For more on wand history [here](./wand/wand.md). + +Pointing it at the door, eyes closed, "Alohomora..." + +Nothing seems to be happening. + +You pause for a second, awaiting a spectacular sight. + +Sheepishly you look down on the crappy wand in your hand. + +You must be doing something wrong. You drink a beer and think about it, then Ah-ha! + +so many [beer](drink-beer/drink-beer.md) options.. + +You notice your pants are now glowing, so you must have been holding the wand upside down. + +Suddenly, you become aware of the need to take a leak. +You can't hold it. You wonder, Are glowing pants waterproof? +You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) + + +Do you: + +Give up and [start over](marshmallow.md). + +[Listen to Tales of the Inexpressable (By Shpongle)](https://www.youtube.com/watch?v=6WTxC8wnXQo) + +[Watch the new Star Wars trailer](https://www.youtube.com/watch?v=sGbxmsDFVnE) + +[Watch the second new Star Wars trailer](https://www.youtube.com/watch?v=ngElkyQ6Rhs) + +[Live Tweet the situation](tweet-it/tweet-it.md) + +[Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) + +Take out your [knitting project](knit/knit.md) and finish your sock heel turn. + +Take out your [crochet project](crochet/crochet.md) instead and finish that teddy bear you've been working on. + +[Realize you are in the ...](in-matrix/matrix.md) + +[Realize you better call Saul](better-call-saul/saul.md) + +[Turn off all the lights](lightsoff/lightsoff.md) + +[Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) + +[Feel a sudden urge to dance](https://youtu.be/dQw4w9WgXcQ) + +[Make changes on GitHub to revise this crazy story](make_changes_GitHub/make_changes_GitHub.md) + +[Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) + +[Go eat some rainbows](eat-rainbows/rainbows.md) + +[Admire your glowing pants](glowing-pants/glowing-pants.md) + +[Grab some coffee?](coffee/coffee.md) + +[Grab some wine?](wine/wine.md) + +[Call the GhostBusters](ghostbusters/ghostbusters.md) + +[Talk to Bob Barker](bob-barker/barker.md) + +[Hop on a plane](forest/forest.md) + +[Spend so long trying to decide that you fall asleep](sleep-and-wake/sleep_and_wake.md) + +[Cry out for your Mommy](cry-out-for-mommy/oh_mommy.md) + +[Enter a Dim Reality](Enter-a-dim-reality/Dim_reality.md) + +[Watch the Warriors vs Cavaliers game 1 of the NBA Finals](warriors-game/watch-warriors.md) + +[Peek through the keyhole to reveal what is beyond](world-war-marshmallows/world-war-marshmallows.md) + +[Try the more effective "Apparation" spell to teleport elsewhere](movie-ripoffs/hogwarts/hogwarts.md) + +[Begin to feel suspicious](lucidream/luciddream.md) + +[Want to break free](yuha/yuha.md) + +[Open the door and run outside](open-door/open-door.md) + +[Give the marshmallow entity a turing test](turing-test/turing-test.md) + +[Step into an adjacent room to check your social media hubs](social-media/social-media.md) + +[Try and interact with the marshmallow hand](interact/interact.md) + +[Check your phone for date, time and location?](check-your-phone/check-your-phone.md) + +[Check mspaintadventures](mspa/mspa.md) + +[Lunge for the lighter](lunge-for-the-lighter/lunge-for-the-lighter.md) + +[Ask to Alice](ask-to-alice/ask-to-alice.md) + +[Close your eyes](experience/experience.md) + +[Grab the lighter first?](lighter/grab-lighter.md) + +[Make a swing with rope and jacket](enjoy-DreamRide/ride.md) + +[Start eating the walls?](eating-walls/eating-marshmallows.md) + +[Give the marshmallow to the polar bear?](polar-bear/polar-bear.md) + +[Realize you are in Minecraft](you-are-in-minecraft/minecraft.md) + +[Try to pull a MacGyver with the lighter, fork and rope?](macgyver/macgyver.md) + +[Quickly run outside and explore?](explore-outside/explore-outside.md) + +[Light a fire?](light-fire/fire.md) + +[jump in a chocolate pool?](chocopool/choco.md) + +[Hungry Kya?](hungry/hungry.md) + +[Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) + +[Dig a hole with your bare hands?](hands/hands.md) + +[Go back to sleep?](sleep/marshmallow.md) + +[Stay puft?](staypuft/marshmallowman.md) + +[Dig at the walls with a fork](dig/dig.md) + +[Invite some friends over?](invite-friends/friends.md) + +[Look for a way out?](find-exit/leave.md) + +[Count the marshmallows?](count-the-marshmellows/count-the-marshmellows.md) + +[Begin to dance to pass the time?](dance/dance.md) + +[You pinch yourself to see whether you are dreaming?](pinch/pinch.md) + +[Promise to yourself this is the last time you take hallucinogenic mushrooms?](shrooms/never-again.md) + +[Think this is too surreal and decide to try the French version instead?](../french/feu-de-camp.md) + +[Think this is a dream, and jam the fork into your hand to wake up?](fork-jam/not_dreaming.md) + +[Go out and collect mushroom?](mushroom/collect_mushroom.md) + +[Try to walk around](virtualreality/oculus.md) + +[Make one of those weird marshmallow Jell-O salads?](marshmallow-jello-o-salad/the-kind-your-grandma-used-to-make.md) + +[Begin to sing out of fear?](sing/sing.md) + +[Go meditate and ponder about your next step?](meditate/meditate.md) + +[Scream out of fear?](scream/scream.md) + +[Get to work on the best batch of cookies ever made?](bake-cookies/cookies.md) + +[Start tying knots on the fork?](fork-knots/melt-with-fork.md) + +[Start pondering how you got yourself in a sticky situation?](ponder/ponder-about-life.md) + +[Create a new jacket out of marshmallows?](jacket/marshmallow-jacket.md) + +[Go straight to the solution!](http://youtu.be/dQw4w9WgXcQ) + +[Cook them marshmallows](http://youtu.be/dQw4w9WgXcQ) + +[Explore Wikipedia](wikipedia/wiki.md) + +[Whip out your spork, start a fire and make giant s'mores?](http://easybaked.files.wordpress.com/2011/10/smores4.jpg) + +[Ask yourself how you got yourself into this situation - AGAIN?](shrooms/never-again.md) + +[Challenge the Marshmallows to a Rock Off!](challenge-marshmellow-to-rock-off/tenacious-d.md) + +[Call a doctor](call-a-doctor/doctor.md) + +[Remember that pill you took](adipose/adipose.md) + +[Light up the wall](light-up/light-up.md) + +[Hide the lighter fork and rope in your pocket](hide/hide-chk.md) + +[Make a necklace out of the marshmallows](necklace/necklace.md) + +[Light up the wall 2](light-up2/light-up2.md) + +[Switch on your laptop and..](netflix/netflix.md) + +[Lion King ](no-worries/hakuna-matata.md) + +[Perform some magic](magic/magic.md) + +[Raise your self so high](khudi/buland_very_high.md) + +[Put yourself back in the straitjacket](backinstraitjacket/backinstraitjacket.md) + +[Find the bird](find-bird/bird.md) + +[Attempt to befriend the marshmellow man](make-friends/make-friends.md) + +[Try to use one of your pokemon?](pokemon/pikachu_wins.md) + +[Throw a rock at it and see if it moves](moving/moving.md) + +[Start tickling the marshmallow](tickle/tickle.md) + +[Enter the time tunnel](timeTunnel/timeTunnel.md) + +[Tie the marshmallow's hands and legs](tying/tying.md) + +[Use the fork, Luke!](use-the-fork-luke/use-the-fork.md) + +[B b b bird bird bird, bird is the word](birdistheword/birdistheword.md) + +[Quote of the day](quote-of-the-day/quote.md) + +[Escape and find a phone to call...](call-these-guys/calltheseguys.md) + +[Play some cricket](play-some-cricket/playsomecricket.md) + +[Run back and forth quickly slamming into the walls](indigestion/indigestion.md) + +[In their tongue he is Dovhakiin, DragonBorn, FUS ROH DAH](fus-roh-dah/fus-roh-dah.md) + +[The walls start closing in](malaria/malaria.md) + +[Come to Nepal](nepal/nepal.md) + +[Order Pizza](order-pizza/order-pizza.md) + +[Summon your robot army](robot-army/robots-everywhere.md) + +[Oh dear! You ended up in Candyland!](candyland/diabetes.md) + +[Give 'em the Leslie Howard!](slap-it-hard/teach-it-a-lesson.md) + +[You punch the first person you see!](punch/punch.md) + +[Hulk smash?](hulk/smash.md) + +[Marsh Attack!!!](marshmallow-attack/marsh-attack.md) + +[Got Lost](getsLost/getsLost.md) + +[Try to make smores](smores/smores.md) + +[Summon your humble servant](humbleservant/humbleservant.md) + +[Summon the magical snuffbox](snuffbox/snuffbox.md) + +[Become the One?](matrix/matrix.md) + +[Melt all the marshmallows to make s'mores?](meltmarshmallows/meltmarshmallows.md) + +[Want to cook boneless pork shoulder roast?](pork/roast.md) + +[Take a selfie?](selfie/selfie.md) + +[Say something](blah-balh/blah-blah.md) + +[Try the Marshmallow Test on it?](https://youtu.be/QX_oy9614HQ) + +[Become an Octodog](be-octodog/octodog.md) + +[Make a Marshmallow cake](https://www.youtube.com/watch?v=3l1SY3QREv4) + +[I'm Batman](I'm-batman/batman.md) + +[You realize you are in NeverLand and you are + never going come... so you sing the Tinker Bell song](https://youtu.be/Sopngy6uucw) + +[You decide to become a marshmallow yourself.](becomemarshmallow/becomemarshmallow.md) + +[Explain Fizzbin to the marshmallow hand?](fizzbin/explain-fizzbin.md) + +[Drool on the Marshmallow to show demonstrate your digestive superiority](drool/droolstrategem.md) + +[Eat the Marshmallow](eatmarshmallow/eatmarshmallow.md) + +[Escape into Willy Wonka Lego-World](lego-world/lego-world.md) + +[Eat breakfast](../english/breakfast/breakfast.md) + +[After breakfast you lookup triathlon](triathlon/triathlon.md) + +[The inception protocol](dream_in_dream/inception.md) + +[Choose the blue pill or the red pill?](choose-pill/choose-pill.md) + +[Pull out your proton pack!](ghost-buster/ghost-busted.md) + +[You take the red pill](red-pill/red-pill.md) + +[Twas the Night Before Christmas](night-night/tale.md) + +[Check Reddit for any useful information.](reddit/ask-reddit.md) + +[Watch Up](watch-movie/Up.md) + +[Give up and search for oil fields](oil-field/oil-field.md) + +[Appear on Falkor’s Back](appear-on-falkors-back/falkor.md) + +[Sit and ponder how you got into this situation](thesituation/situation.md) + +[Smart Ape roasting a marshmellow](https://www.youtube.com/watch?v=_ZEBrHe4hVs) + +[Bruce Wayne is BATS !!](batman/batman.md) + +[Use your chance, master self-control](self-control/self-control.md) + +[Have a Pip-Boy](pipboy/pipboy.md) + +[Call upon one of your past lives as avatar](avatar/air.md) + +[Play some GTA5](play-gta5/play-gta5.md) + +[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) + +[Search for gluten](search-for-gluten/search-for-gluten.md) + +[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) + +[Go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) + +[Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) + +[Commit suicide](commit-suicide/suicide.md) + +[Make an appointment with the dentist](dentist/ouch.md) + +[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) + +[You Google what to do](https://www.google.co.in/) + +[Abdul kalam quotes on overcoming fear](apj/apj.md) + +[If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) + +[There's no such thing as a free lunch.](free-lunch/free-lunch.md) + +[Follow the dog...](play-with-dog/dog.md) + +[What is LOVE ?](love/love.md) + +[Got to Singapore](singapore/singapore.md) + +[Talk to Finn](talk-to-finn/finn.md) + +[Play Guitar](guitar/guitar.md) + +[Contemplate the meaning of life](meaning/meaning.md) + +[Rinse the marshmallow under the tap then eat it](dysentry/dysentry.md) + +[Wake up!](wake-up/wake-up.md) + +[Thank Mr. Skeltal](2spooky/2spooky.md) + +[Utilize your wand once again...](utilize-wand/fork-rope-wand.md) + +[Draw a trapezoid](trapezoid/trapezoid.md) + +[Stop, hammertime!](hammertime/hammertime.md) + +[Analyze the composition of the marshmallow](analyze/analysis.md) + +[Watch Barcelona game](watch-barca/watch-barca.md) + +[Oops! this story ain't ending..](unending-story/unending-story.md) + +[Code](code/code.md) + +[Screaming goat is screaming](https://youtu.be/kh6c0SOfkH4) + +[Play on miniclip!] (papa-louie/papa-louie.md) + +[Visit Sturgis 2015!](sturgis2015/sturgis.md) + +[Attack marshmallow pikachu!](pikachu/pokeball.md) + +"I have problems with my sleep," you realise. "I'm going to [move to New York](new-york/new-york.md)." + +[Summon Dragons of the Khaleesi](dragons/fire-everywhere.md) + +[Bounce](bounce/bounce.md) + +[Play some DotA 2](play-dota2/play-dota2.md) + +[Play Starcraft 2](starcraft2/starcraft2.md) + +[Play some Geometry Dash](play-geometrydash/play-geometrydash.md) + +[See if there is a Udacity course on the subject](udacity/udacity.md) + +Click [here](young/young.md) to listen to music. + +[Consult Flann O'Brien](flann-o-brien/truth-is-odd.md) + +[Attack it with a lightsaber](lightsaber/lightsaber.md) + +[Decide to browse Reddit instead](https://www.reddit.com/) + +[It's time to take a vacation] (licked-cat/vacation.md) + +And then you realize that Burning Man is over, so no real vacations :( + +[present-tense](present-tense/present-tense.md) + +[Think about happy thoughts while spinning around in circles](my-story/my-story.md) + +[Story of DKER](DKER/DKER.md) + +[Get your prostate checked](prostate/prostate.md) + +If you eat a lot, you should also [exercise](exercise/exercise.md) + +A quick brown fox jumps over the lazy dog! + +[Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) + +[Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) + +[Watch a recording of an awesome jazz concert](https://www.youtube.com/watch?v=VMb3PX9gq78) + +whilst wandering through the vastness of this universe. + +[But what universe is this?](universe-test/blaze_verse.md) + +Either way we are cool, right? + +This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. + +You decide that you do not want to visit the miracle man. [You check your +phone to find something else to do](check-phone/check-phone.md). + +And you plug-in to [play some music](play-music/playmusic.md). + +The next thing you know, you're up all night in Croatia mixing a new playlist + +You remember the story of a [robot](happy-robot/happy-robot.md). + +Wondering how you got here, you feel a strange tingling in your hands, almost as if +they are responding to your new surroundings. You feel an urge to gesture forward, +and as you do a large pink marshmallow shoots out of your hand into the wall before you. +[Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) + +[The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) + +All in a hard days work, do you play some [music](play-music/playmusic.md). + +As you hold your pot of precious hunny, you begin to [hear an ominous voice...](ominous-voice/ominous-voice.md) + +Honesty in a hard way [Watch it](few-good-men/fgm.md) + +Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube.com/watch?v=lAF8D0ugyVk) + +But the call of of nature wasn't going away so you push open the toilet door and go in.. + +Just then you recall the news story of what is causing the +[strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. + +...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) + +You escape into a [recording studio](more_cowbell/more_cowbell.md) + +Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) + +And then you stumble upon something [completely different](http://www.atlasobscura.com/) + +After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) + + +[What about skydiving](skydiving/skydiving.md) + +*Story intensifies!* + +You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie... + +Instead of going to the movies, you decide to [solve the gase crisis](plow/plow.md) instead. + +You made it through the day and are starting to get sleepy... [Time to fall asleep](marshmallow.md) + +You wake up in front of a computer screen. You begin reading +the text of a markdown file called marshmallow.md. As you read +you realize that the story is about you! +[remember this story!](this-story-is-about-you/this-story-is-about-you.md) + +This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) + +[Call a random number](call-a-random-number/answer.md) + + +You must be lonely. [Want a friend?](robofriend/AIRobot.md) + +When I code over my weekend, I feel that this becomes my [whole life](code-my-life/code-my-life.md). + +Suddenly you feel a strong craving for [something.](craving/craving.md) + +Despite the little conundrum that you resolved, you realize that it's now +Friday, December 4th. + +"Wait a minute", you gasped, "The English Premier League is on tomorrow!!" + +With that new revelation in mind, you quickly make like David Hasselhoff +and wiggle your wrist to show off a nice particular watch that even listens +to you when you speak to it. + +["Ahem!"](my-adventure/my-adventure.md) + +So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... +>>>>>>> deb66146d3bd0481a4c19d27b8ef289b939d4156 + +["Train Ride!"] (train-ride/train-ride.md) + +I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/star-wars.md) + +"What's a Heffelump?" asked Sheffield inquisitively. + +"I dont't know! Why should I care?" replied Donald Trump. + +When faced with a lot of work and impending deadlines +in the (not so near) future, +there are two options you must choose from. + +You may either do [this](gtd/gtd.md), + + or [that](procrastinate/procrastinate.md). + + This is one weird story. Did anybody read the whole page? + + I sure did not. This is as weird as it gets. + +[Get Crazy!](crazy/crazy.md) + +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +[move to Boston](boston/boston.md)." + +Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! + +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" + +Yourself? + +Instead of reading this entire story, you decide to go see the new star wars! + +As you're walking down the street you see [something](millenium-falcon/flyaway.md) + +You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). + +[Do you have my stapler?](stapler/stapler.md) + +[Build a car](build-a-car/build-a-car.md) + +What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? + +The divergence is coming, [survive](divergence/divergence.md) or perish? + +[Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) + +You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) + +You start off strong... + +But there are [too many hurdles in your way](hurdles/hurdles.md). + +"What a joke?", he said, after looking at the [news](joke/joke.md) + +Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... + +It says you should [brew some beer](beer-brewer/beer-brewer.md). + +The [news](joke/joke.md) says it all my people! + +Bible says... As you sow, so shall you [reap](think/growrich.md) + +So shall you reap, and the [steelers](steelers/steelers.md) know that all too well! + +Until you realize that even marshmallows need [LOVE](https://www.youtube.com/watch?v=i5fZ__mnHbU). + +Marcel needs a new pair of shoes, will you buy shoes for [Marcel](https://www.youtube.com/watch?v=VF9-sEbqDvU)? + +You look up and out to the ocean. In the distance you see a [mermaid](mermaid/mermaid.md) + +The mermaid above died, but [don't worry...](mermaid2/mermaid.md) + +A fairy tale about [a shoemaker and elves](elves-and-shoemaker/elves-and-shoemaker.md) + +The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) + +The understanding of git [go here](Booyah/booyah.md) + +[Link to Git Official Website] (git/git.md) + +[link to google website] (kumar/kumar.md) + +Hi i got this one for udacity team. + +As the sand encompassed her toes and +the ocean-spray breezed through her nose + +she froze... + +But the cold never bothered me anyway. + +Let it go, let it gooo... + +CANT HOLD IT BACK ANY MORE + +Do you want to build a [snowman?] (snowman/snowman.md) + +It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) + +I think I'll try defying gravity. + +Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) + +[Paint It Black](paint-it-black/PaintItBlack.md) + +[Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) + +[To Infinity and Beyond](math/math.md) + +[I hope you aren't using a poorly built crawler on this](./marshmallow.md) + +[Read my story](magic2/magic2.md) + +[..and recall that Carl Johnson might be alive](Carl/carl-johnson.md) + +[Or, forget it all, and jump off the cliff](cliff/cliff.md) + +[Make a pie chart](http://i.imgur.com/uaFES1b.jpg) + +[Read a story of a crouch dragon](crouch-dragon/crouch-dragon.md) + +[Write a hiku](write-a-hiku/hiku.md) + +Explore the unknown. Most people die without ever visiting this [place.](underwater/scuba-diving.md) + +As you attempt this, a voice booms!! + +The [boom](day-dream/day-dream.md) + +Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) + +You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) + +For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) + +You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). + +You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). + +So what to do next? Three doors appear and all other ways out disappear. +So you pick the [right door](mysterydoor/mysterydoor.md) + +You put your [cowboy hat](cowboy/cowboy.md) back on your head. + +Or... or... or... Oh, I forgot! +You foget something, but you decide to [move on](move-on/move-on.md). + +You follow the panda up the nearest tree, chewing bamboo shoots as you go [bamboo-shoots](bamboo/bamboo-shoots.md) + +And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) + +[Do nothing.](nothing/do-nothing.md) + +[Rent a hydroplaning dog sled to get you to the other side of the world] (dog-sled/dogsled.md) + +Toasted [marshmallow](toasted/smores_pie.md) + +While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. +[The new record is!](new_warriors_record/new_warriors_record.md) + +Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). + +Life is full of [puzzles](LifePuzzle/LifePuzzle.md). + +You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". + +A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) + +Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) + +If you have read this far, then you must be in pain. +Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. + +As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. + +Health and Life Lovely [Quotes](./health/health.md) + +The lannisters always pays thier debts, says tyrion lannister. Interesting [character](./gameofthrones/tyrion.md) he is. + +Time to [move to Canada](Canada/Canada.md), eh? + +You struggle to find a line break to add your own adventure. +You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) + + + +The crushing weight of all these options causes you to [end your life.](end/end.md) + +You're reincarnated as a green starfish but wish you were [blue instead.](starfish/starfish.md) + +[Motivate yourself](Motivate/Motivate.md) + +You wake up as Harry Potter ... and are facing Voldemort in a duel? +What should you [do](magicaladventure/decision_time/decision_time.md) + +My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... + +[Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. + +You decide you want to be a pirate and remember a show called +[onepiece](onepiece/op.md) + +You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Taiwan.md)! + +you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) + +Time to check out the latest [Total War - Warhammer](total-war/war-start.md)! + +You wake up in the morning and your [computer is looking out of the window](computer-window/computer-window.md) + +Instragram, a great place to spend time. [Visit my profile](https://www.instagram.com/coding.imagination/) + +You've been charged with treason against the King. You wake up in [prison](prison/prison.md). + +My visit to the [zoo](zoo/zoo.md). + +You wake up confused, you faint you go back in [time](time-travel/time-travel.md) + +[The Hungry Prince](hungry_prince/hungry_prince.md) + +[The Angry Prince](angry_prince/angry_prince.md) + +The password is [xyzzy](plugh/plugh.md) + +[Say "Hi" to Guangwu](Guangwu/Guangwu.md) + +Perishing in an avalanche of words, in a mundane collection of sentences called "stories". +[Devastated?](devastated_greatness/devastated_greatness.md) + +Ever the fan of [Doug Adams](doug-adams/doug-adams.md). + +If you really want to know the answer to the question.... +"What is the answer to Life, the Universe and Everything?" then you +need some [Deep Thought](doug-adams/deep-thought/deep-thought.md) + +Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit + +[Discover](discover-new-genres/discover-new-genres.md) a new genre of music! + +[Watch](https://www.youtube.com/watch?v=-XJN7qqFqPE) Too Many Puppies! + +You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... + +You decide to quit your job to play [Pokemon Go](pokemon-go/pokemon-go.md) full time. + +Learn about something random [here](https://en.wikipedia.org/wiki/Special:Random)! + +Learn about Ankesh [here](characters/ankesh.md) + +[Hold the door!](hold_the_door/hodor.md) [Spoiller GOT] +>>>>>>> b6c70ae2fc2160a4b1b9c8639b4567de6b5a4a93 + +You realise that the philosphy of life in general boils down to +that one central question... will you? or will you not? +[So Will you?](philosophy/questions.md) + +You recited [cosmological argument](cosmological_argument/cosmological_argument.md) in the morning in hub. + +You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). + +Click [here](https://www.youtube.com/watch?v=aboZctrHfK8) to find out what the meaning of life is. + +so lazy [here](lazy/lazy.md) + +[Update](android/marshmallow6.0.md) your Smartphone to the Marshmallow 6.0! + +Click [here](walrus/walrus.md) + +Click here to learn more about the MEAN stack [here](mean-stack/mean.md) + +Do you like [stargazing](stargazing/stargazing.md) ? + +Let's learn some [mandarin](learn-mandarin/learn-mandarin.md) + +Neurons for social memories, [more info](http://news.mit.edu/2016/scientists-identify-neurons-social-memory-0929) + +What is the meaning of life? +To find out click [here](meaning-of-life/meaning-of-life.md). + +What is that shiny in the window? Come in and take a +[look](Computer-Man/Computer-Man.md) + +Wanna trip yourself? Hue has got a place you would like to [enter](Trip-Yourself-Hue/trippy.md) From 5741961760631f138fa3771ad18b61f322789e74 Mon Sep 17 00:00:00 2001 From: manas94gupta Date: Tue, 18 Oct 2016 14:57:23 +0530 Subject: [PATCH 4502/5486] Delete marshmallow.md --- english/marshmallow.md | 1149 ---------------------------------------- 1 file changed, 1149 deletions(-) delete mode 100644 english/marshmallow.md diff --git a/english/marshmallow.md b/english/marshmallow.md deleted file mode 100644 index 82aac81cf3..0000000000 --- a/english/marshmallow.md +++ /dev/null @@ -1,1149 +0,0 @@ -Once upon a time many authors collaborated to make meaningless linked story. - -NGE is [here] (NGE/NGE.md) - -[start](mad/mad.md) your journey into world of mad - -or - -spend your time [wisely](http://www.pythonchallenge.com/) - -[Click here](http://www.dvloper.me) to visit my dvloper.me blog . - -Are you a: - -[cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) - -or a - -[dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? - -Your adventure begins. You realize there are hundreds of paths for you to choose from. -Which way should you go? Only you can decide. - -Oh so many decisions - what will you do?? - -You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! - -Take some [time](meditation/meditation.md) off! - -Life is full of twists and turns like but try to cheer yourself and people around you. [Click Here](Happy/happie.md) - -Who is better? - -[Click Here](captain/captain.md) to vote for Captain America - -[Click Here] (ironman/ironman.md) to vote for Iron Man - -[Click here] (00_8_Agent/The_name_is_Bond_Milton_Bond.md) to vote for a Special Agent -[click here] (london/london.md) to vote for london - -January 2017 approaches. You have two presidential candidates to vote for. - -[Click](vote-the-president/trump/trump.md) here to vote for Donald Trump. - -[Click](vote-the-president/hillary/Hillary.md) here to vote for Hillary Clinton. - -You don't like either of these candidates. -So instead, you decide to [write a symphony](write-a-symphony/symphony.md) -or -[paint a picture](paint-a-picture/paint-a-picture.md). - -Keith the Unicorn approaches you. -He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) - -It is time to begin your adventure. -Your search for the grail begins [now](Monty-Python/search.md) - -Down one path you see a person standing in the middle of the path. -They look familiar somehow, but you just can't figure out who they are. -They seem friendly so you decide to go [talk to them.](friendly-person/friendly-person.md) - -Ask them to join you on a life changing [quest?](zuluquest/choosequest.md) - -Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) - -How about some [chill music](chillmusic/chillmusic.md)? - -[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) - -You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. - -I also agree only way to find way is to keep climbing or walking or studying or learning or all of this is DOING. -DOING will definitely keep your sharpened with latest skills (which you can get by the way from Udacity !!!) - -[Know about the life of this world](00-Life-of-this-world/Life of this world.md) - -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down - -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) - -Vist the master [liquid](liquid/liquid.md). - -Drink some [bear](bear/bear.md) - -[play](http://pcottle.github.io/learnGitBranching/) with the (git) branches - -and search for your [destiny](destiny/destiny.md). - -Before we begin, do you need a [warm-up?](warm-up/warm-up.md) - -Once you're warmed up, why not try a [work out?](work-out/work-out.md) - -or maybe [eat that delicious cucumber sandwich?](sandwich/sandwich.md) - -After warming up, take a minute and reflect on your [love for udacity](love-udacity/love-udacity.md) - -You are are man (or woman) for all seasons but need help in choosing -your travel destinations.. Of course we are happy to help you with these -[suggestions](travel-destinations/travel-destinations.md) - -Meet a [Schrodingers cat](schrodinger-cat/schrodinger-cat.md) - -Another visitor! [Stay a while...](impossible-adventure/start/start.md) - -[I am the one who knocks](say-my-name/say-my-name.md) - -[The Secret to Life...Seriously](https://www.youtube.com/watch?v=dQw4w9WgXcQ) - -[Some inspirational Lines](the-nights/the-nights.md) - -[Time for some teachings on life and success](swami-vivekananda/swami-vivekananda.md) - -One morning, you wake up in a strange room with marshmallows for walls. - -Marshmallows smell funny. What is a marshmallow anyway? - -Unexpectedly, the Chief Marshmallow demands to see your [references](references/references.md). - -Show him your [references](https://youtu.be/uZbjlsX0DNY?t=10s). - -The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtube.com/watch?v=s9Dp20ydm1E) - -*(Must be a Tuesday.)* - -Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. - -Or a [Wednesday](make_changes_GitHub/make_changes_GitHub.md)... - -[Thursday](doug-adams/arthur-dent/arthur-dent.md)... maybe even a Friday, but definetely not a Saturday. - -Ok, we have to consider Saturday too. - -[this crazy thought popped into your head](yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md) - -Alice doesn't live here anymore, [or does she?](scarab/goddess.md) - -But not Monday; you never go out on a Sunday evening......[or do you](./or-do-you/or-do-you.md)? - -Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. - -For a second, you decide whether or not to just [go back to sleep](go-back-to-sleep/go-back-to-sleep.md) - -Then, you consider playing a [chess puzzle](chess/chess.md) - -A sound from a Hitchcock movie fills the room, then quickly fades away. - -Was it the sound of a cry from the shower? - -Was it the sound of birds? - -It sounded like it could have been a [heffalump](heffalump/heffalump.md) - -No... perhaps not. - -Not at all. - -I think it was an [animal](animal/animal.md). - -Nope, it was [Tim Berners-Lee](https://en.wikipedia.org/wiki/Tim_Berners-Lee) sobbing in despair. - -Thinking back, there are no memories to suggest that this should have been -anything but an ordinary morning. You didn't go out last night, you don't -usually take intoxicants, what's happening...? - -Maybe this is a dream? - -Or a [memory](memories/memories.md)? - -Or is it just boring old [real-life](real-life/real-life.md)? - -Or [The Force](https://www.youtube.com/watch?v=cFn-NobVaoI&feature=youtu.be)! - -Or is this just [fantasy](https://www.youtube.com/watch?v=fJ9rUzIMcZQ)? - -Maybe it's a dream within a dream? Maybe dreaming and reality are one and the -same. Maybe reality is an oxymoron when considering multiple dimensions. - -Maybe you're in [Inception](inception/inception.md). - -But it's probably not worth dwelling on that right now, you could be in danger. - -Grave danger. Oh No! - -*(Is there another kind?)* - -I actually used to know a guy named Dave Granger. We sure had some good times! Anyway, the possibility of danger lurks. - -The type of extreme mortal danger that so often accompanies confectionary inspired interior design. -Quickly surveying your immediate surrounds, you notice a garishly dressed, -vacant-eyed young man lounging on a nearby sofa. - -The man is not large but not small, but not average either. -He is reciting poetry in a language you assume to be Egyptian, -though you are not familiar with Egyptian. You only assume this -because of the small pictograms that seem to rise into the -air above his head when he speaks. One looks like a small bird. -Another a small insect. A third is for all appearances the -third car your father ever bought you, a small Fiat 500, which -though in the picture above the man's head is purple, was -in reality more of a mauve. It had a tendency to bark whenever -you drove it over hills, not like the proud great dane from -Nova Scotia that most smaller cars tend to imitate when taking -on tasks greater than their strengths, but rather more like -the small pomerainian who is now barking at the blue music notes -hovering over the man's large-ish head, now peeing on the -back of the sofa, making it difficult for you to remember the -name of that dude you totally scored with in the back of your -Fiat 500. You're finding it difficult to think. You sit down on -the sofa to gather your thoughts. You think of all the men -you slept with on your hitch hiking journeys across the southern -american continent. - -[Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) - -You recall what a man said to you once: "Live as one of them, Kal-El, to discover -where your strength and your power are needed. Always hold in your heart the -pride of your special heritage. They can be a great people, Kal-El; they wish to -be. They only lack the light to show the way. For this reason above all, their -capacity for good, I have sent them you... my only son." - -[Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) - -Call in the [Justice League!](./justice-league/justice-league.md) - -[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) - -[That sure sounds familiar...](./sounds-familiar/sounds-familiar.md) - -These marshmallows are numerous and they look so delicious. -... despite the feeling they're somehow judging you for only wearing one sock. - -[Turn one of the marshmallows into gold.](./alchemy/alchemy.md) - -You reach out to grab a handful of the marshmallow wall, but you can't seem to take the handful away from the wall. - -You also seem to be wearing an uncomfortable and restrictive jacket made of leather... - -You don't own any uncomfortable and restrictive leather jackets... How did you end up sleeping in one? - -Suddenly, fuzzy memories of a tavern and an exotic woman... -a house made of candy... -closets full of umbrellas and leather. - -An umbrella (closed) automagically appears in your left hand. You tentatively - -[poke the wall](./poke-the-wall/poke-the-wall.md) with it. - -[You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) - -You are feeling very anxious at this point. - -You can't decide if anything is worth it anymore so you loose yourself at a [David Gray concert.](concert/concert.md) - -Goosebumps appear. - -This is because you do not like leather for ethical reasons. - -Leather is all over [San Fransisco](sanfran/sanfran.md). - -[Ethical reason? Seriously?](./ethical-reason/ethical-reason.md) - -You begin to break out of the jacket and find a lighter, a fork, and rope. - -You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. - -But only find out that the chocolate has expired [132 days ago](./132-days-ago/132-days-ago.md). - -Do you want to [try to fill the remaining space in the sock with marshmallows](./fill-sock/fill-sock.md)? - -You are not sure who placed these objects near you or why. - -But you have a growing sense that these mundane objects are vital to your survival. - -You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. - -[You have the suspicion that you are being closely watched.](./watched/watched.md) - -[Of course, it's that man on the sofa; go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) - -[Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) - -You see a polar bear searching for food. - -I see that you may be from the North. [How's it going?](./north/north.md) - -[A Shotgun appears!](./shotgun/shotgun.md) - -[Whilst cycling backwards.](./cycling-backwards/cycling-backwards.md) - -"Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" - -You hear a small bird sound in the distance. - -But it sounds like it might be coming out of speakers. - -Something lightly brushes the back of your neck, sending a chill down your spine! - -Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. - -You hear a strange noise then turn and see a large, wooden door. -Too large, in fact, and yet too small, for the frame it rests in. -You [walk through the door](./unnatural_door/unnatural_door.md). - -You turn for a third time and see a small, metal door. - -You knock, hear nothing and decide to [enter](./strange-room/room.md). - -Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air -for alien life forms. - -When you look away, a marshmallow hand attempts to grab the lighter. - -But you are too quick for the marshmallow! - -The realization suddenly dawns upon you the marshmallow is self aware! - -You try to bury your contribution because you are slightly - -Embarrassed by the exercise. - -If you don't do something quickly, this marshmallow belly will digest you! - -Marshmallows are going to rule the world! - -Long live marshmallows! - -For a few moments you think to yourself, with all these marshmallows, you have some rice krispy squres. - -Hold the image of the marshmallow and... - -Sing softly the song of it's people as you... - -BUT!!!! wait a minute... Do you hear that?? - -A soft echo of a torrent is fading from far... - -I felt a sudden ease of mind. - -"Ok", I said to myself, "I need to get -[out of here](outta-here/outta-here.md)" - -"But first I must remember the magic spell needed to open the enchanted door!" -Where is Hermione Granger when you need her? Where I ask you? -Oh, I know. Click [here](hermione/hermioneHere.md) - -You pick up the fork and wrap it in rope to fashion a crappy wand. - -For more on wand history [here](./wand/wand.md). - -Pointing it at the door, eyes closed, "Alohomora..." - -Nothing seems to be happening. - -You pause for a second, awaiting a spectacular sight. - -Sheepishly you look down on the crappy wand in your hand. - -You must be doing something wrong. You drink a beer and think about it, then Ah-ha! - -so many [beer](drink-beer/drink-beer.md) options.. - -You notice your pants are now glowing, so you must have been holding the wand upside down. - -Suddenly, you become aware of the need to take a leak. -You can't hold it. You wonder, Are glowing pants waterproof? -You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) - - -Do you: - -Give up and [start over](marshmallow.md). - -[Listen to Tales of the Inexpressable (By Shpongle)](https://www.youtube.com/watch?v=6WTxC8wnXQo) - -[Watch the new Star Wars trailer](https://www.youtube.com/watch?v=sGbxmsDFVnE) - -[Watch the second new Star Wars trailer](https://www.youtube.com/watch?v=ngElkyQ6Rhs) - -[Live Tweet the situation](tweet-it/tweet-it.md) - -[Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) - -Take out your [knitting project](knit/knit.md) and finish your sock heel turn. - -Take out your [crochet project](crochet/crochet.md) instead and finish that teddy bear you've been working on. - -[Realize you are in the ...](in-matrix/matrix.md) - -[Realize you better call Saul](better-call-saul/saul.md) - -[Turn off all the lights](lightsoff/lightsoff.md) - -[Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) - -[Feel a sudden urge to dance](https://youtu.be/dQw4w9WgXcQ) - -[Make changes on GitHub to revise this crazy story](make_changes_GitHub/make_changes_GitHub.md) - -[Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) - -[Go eat some rainbows](eat-rainbows/rainbows.md) - -[Admire your glowing pants](glowing-pants/glowing-pants.md) - -[Grab some coffee?](coffee/coffee.md) - -[Grab some wine?](wine/wine.md) - -[Call the GhostBusters](ghostbusters/ghostbusters.md) - -[Talk to Bob Barker](bob-barker/barker.md) - -[Hop on a plane](forest/forest.md) - -[Spend so long trying to decide that you fall asleep](sleep-and-wake/sleep_and_wake.md) - -[Cry out for your Mommy](cry-out-for-mommy/oh_mommy.md) - -[Enter a Dim Reality](Enter-a-dim-reality/Dim_reality.md) - -[Watch the Warriors vs Cavaliers game 1 of the NBA Finals](warriors-game/watch-warriors.md) - -[Peek through the keyhole to reveal what is beyond](world-war-marshmallows/world-war-marshmallows.md) - -[Try the more effective "Apparation" spell to teleport elsewhere](movie-ripoffs/hogwarts/hogwarts.md) - -[Begin to feel suspicious](lucidream/luciddream.md) - -[Want to break free](yuha/yuha.md) - -[Open the door and run outside](open-door/open-door.md) - -[Give the marshmallow entity a turing test](turing-test/turing-test.md) - -[Step into an adjacent room to check your social media hubs](social-media/social-media.md) - -[Try and interact with the marshmallow hand](interact/interact.md) - -[Check your phone for date, time and location?](check-your-phone/check-your-phone.md) - -[Check mspaintadventures](mspa/mspa.md) - -[Lunge for the lighter](lunge-for-the-lighter/lunge-for-the-lighter.md) - -[Ask to Alice](ask-to-alice/ask-to-alice.md) - -[Close your eyes](experience/experience.md) - -[Grab the lighter first?](lighter/grab-lighter.md) - -[Make a swing with rope and jacket](enjoy-DreamRide/ride.md) - -[Start eating the walls?](eating-walls/eating-marshmallows.md) - -[Give the marshmallow to the polar bear?](polar-bear/polar-bear.md) - -[Realize you are in Minecraft](you-are-in-minecraft/minecraft.md) - -[Try to pull a MacGyver with the lighter, fork and rope?](macgyver/macgyver.md) - -[Quickly run outside and explore?](explore-outside/explore-outside.md) - -[Light a fire?](light-fire/fire.md) - -[jump in a chocolate pool?](chocopool/choco.md) - -[Hungry Kya?](hungry/hungry.md) - -[Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) - -[Dig a hole with your bare hands?](hands/hands.md) - -[Go back to sleep?](sleep/marshmallow.md) - -[Stay puft?](staypuft/marshmallowman.md) - -[Dig at the walls with a fork](dig/dig.md) - -[Invite some friends over?](invite-friends/friends.md) - -[Look for a way out?](find-exit/leave.md) - -[Count the marshmallows?](count-the-marshmellows/count-the-marshmellows.md) - -[Begin to dance to pass the time?](dance/dance.md) - -[You pinch yourself to see whether you are dreaming?](pinch/pinch.md) - -[Promise to yourself this is the last time you take hallucinogenic mushrooms?](shrooms/never-again.md) - -[Think this is too surreal and decide to try the French version instead?](../french/feu-de-camp.md) - -[Think this is a dream, and jam the fork into your hand to wake up?](fork-jam/not_dreaming.md) - -[Go out and collect mushroom?](mushroom/collect_mushroom.md) - -[Try to walk around](virtualreality/oculus.md) - -[Make one of those weird marshmallow Jell-O salads?](marshmallow-jello-o-salad/the-kind-your-grandma-used-to-make.md) - -[Begin to sing out of fear?](sing/sing.md) - -[Go meditate and ponder about your next step?](meditate/meditate.md) - -[Scream out of fear?](scream/scream.md) - -[Get to work on the best batch of cookies ever made?](bake-cookies/cookies.md) - -[Start tying knots on the fork?](fork-knots/melt-with-fork.md) - -[Start pondering how you got yourself in a sticky situation?](ponder/ponder-about-life.md) - -[Create a new jacket out of marshmallows?](jacket/marshmallow-jacket.md) - -[Go straight to the solution!](http://youtu.be/dQw4w9WgXcQ) - -[Cook them marshmallows](http://youtu.be/dQw4w9WgXcQ) - -[Explore Wikipedia](wikipedia/wiki.md) - -[Whip out your spork, start a fire and make giant s'mores?](http://easybaked.files.wordpress.com/2011/10/smores4.jpg) - -[Ask yourself how you got yourself into this situation - AGAIN?](shrooms/never-again.md) - -[Challenge the Marshmallows to a Rock Off!](challenge-marshmellow-to-rock-off/tenacious-d.md) - -[Call a doctor](call-a-doctor/doctor.md) - -[Remember that pill you took](adipose/adipose.md) - -[Light up the wall](light-up/light-up.md) - -[Hide the lighter fork and rope in your pocket](hide/hide-chk.md) - -[Make a necklace out of the marshmallows](necklace/necklace.md) - -[Light up the wall 2](light-up2/light-up2.md) - -[Switch on your laptop and..](netflix/netflix.md) - -[Lion King ](no-worries/hakuna-matata.md) - -[Perform some magic](magic/magic.md) - -[Raise your self so high](khudi/buland_very_high.md) - -[Put yourself back in the straitjacket](backinstraitjacket/backinstraitjacket.md) - -[Find the bird](find-bird/bird.md) - -[Attempt to befriend the marshmellow man](make-friends/make-friends.md) - -[Try to use one of your pokemon?](pokemon/pikachu_wins.md) - -[Throw a rock at it and see if it moves](moving/moving.md) - -[Start tickling the marshmallow](tickle/tickle.md) - -[Enter the time tunnel](timeTunnel/timeTunnel.md) - -[Tie the marshmallow's hands and legs](tying/tying.md) - -[Use the fork, Luke!](use-the-fork-luke/use-the-fork.md) - -[B b b bird bird bird, bird is the word](birdistheword/birdistheword.md) - -[Quote of the day](quote-of-the-day/quote.md) - -[Escape and find a phone to call...](call-these-guys/calltheseguys.md) - -[Play some cricket](play-some-cricket/playsomecricket.md) - -[Run back and forth quickly slamming into the walls](indigestion/indigestion.md) - -[In their tongue he is Dovhakiin, DragonBorn, FUS ROH DAH](fus-roh-dah/fus-roh-dah.md) - -[The walls start closing in](malaria/malaria.md) - -[Come to Nepal](nepal/nepal.md) - -[Order Pizza](order-pizza/order-pizza.md) - -[Summon your robot army](robot-army/robots-everywhere.md) - -[Oh dear! You ended up in Candyland!](candyland/diabetes.md) - -[Give 'em the Leslie Howard!](slap-it-hard/teach-it-a-lesson.md) - -[You punch the first person you see!](punch/punch.md) - -[Hulk smash?](hulk/smash.md) - -[Marsh Attack!!!](marshmallow-attack/marsh-attack.md) - -[Got Lost](getsLost/getsLost.md) - -[Try to make smores](smores/smores.md) - -[Summon your humble servant](humbleservant/humbleservant.md) - -[Summon the magical snuffbox](snuffbox/snuffbox.md) - -[Become the One?](matrix/matrix.md) - -[Melt all the marshmallows to make s'mores?](meltmarshmallows/meltmarshmallows.md) - -[Want to cook boneless pork shoulder roast?](pork/roast.md) - -[Take a selfie?](selfie/selfie.md) - -[Say something](blah-balh/blah-blah.md) - -[Try the Marshmallow Test on it?](https://youtu.be/QX_oy9614HQ) - -[Become an Octodog](be-octodog/octodog.md) - -[Make a Marshmallow cake](https://www.youtube.com/watch?v=3l1SY3QREv4) - -[I'm Batman](I'm-batman/batman.md) - -[You realize you are in NeverLand and you are - never going come... so you sing the Tinker Bell song](https://youtu.be/Sopngy6uucw) - -[You decide to become a marshmallow yourself.](becomemarshmallow/becomemarshmallow.md) - -[Explain Fizzbin to the marshmallow hand?](fizzbin/explain-fizzbin.md) - -[Drool on the Marshmallow to show demonstrate your digestive superiority](drool/droolstrategem.md) - -[Eat the Marshmallow](eatmarshmallow/eatmarshmallow.md) - -[Escape into Willy Wonka Lego-World](lego-world/lego-world.md) - -[Eat breakfast](../english/breakfast/breakfast.md) - -[After breakfast you lookup triathlon](triathlon/triathlon.md) - -[The inception protocol](dream_in_dream/inception.md) - -[Choose the blue pill or the red pill?](choose-pill/choose-pill.md) - -[Pull out your proton pack!](ghost-buster/ghost-busted.md) - -[You take the red pill](red-pill/red-pill.md) - -[Twas the Night Before Christmas](night-night/tale.md) - -[Check Reddit for any useful information.](reddit/ask-reddit.md) - -[Watch Up](watch-movie/Up.md) - -[Give up and search for oil fields](oil-field/oil-field.md) - -[Appear on Falkor’s Back](appear-on-falkors-back/falkor.md) - -[Sit and ponder how you got into this situation](thesituation/situation.md) - -[Smart Ape roasting a marshmellow](https://www.youtube.com/watch?v=_ZEBrHe4hVs) - -[Bruce Wayne is BATS !!](batman/batman.md) - -[Use your chance, master self-control](self-control/self-control.md) - -[Have a Pip-Boy](pipboy/pipboy.md) - -[Call upon one of your past lives as avatar](avatar/air.md) - -[Play some GTA5](play-gta5/play-gta5.md) - -[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) - -[Search for gluten](search-for-gluten/search-for-gluten.md) - -[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) - -[Go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) - -[Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) - -[Commit suicide](commit-suicide/suicide.md) - -[Make an appointment with the dentist](dentist/ouch.md) - -[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) - -[You Google what to do](https://www.google.co.in/) - -[Abdul kalam quotes on overcoming fear](apj/apj.md) - -[If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) - -[There's no such thing as a free lunch.](free-lunch/free-lunch.md) - -[Follow the dog...](play-with-dog/dog.md) - -[What is LOVE ?](love/love.md) - -[Got to Singapore](singapore/singapore.md) - -[Talk to Finn](talk-to-finn/finn.md) - -[Play Guitar](guitar/guitar.md) - -[Contemplate the meaning of life](meaning/meaning.md) - -[Rinse the marshmallow under the tap then eat it](dysentry/dysentry.md) - -[Wake up!](wake-up/wake-up.md) - -[Thank Mr. Skeltal](2spooky/2spooky.md) - -[Utilize your wand once again...](utilize-wand/fork-rope-wand.md) - -[Draw a trapezoid](trapezoid/trapezoid.md) - -[Stop, hammertime!](hammertime/hammertime.md) - -[Analyze the composition of the marshmallow](analyze/analysis.md) - -[Watch Barcelona game](watch-barca/watch-barca.md) - -[Oops! this story ain't ending..](unending-story/unending-story.md) - -[Code](code/code.md) - -[Screaming goat is screaming](https://youtu.be/kh6c0SOfkH4) - -[Play on miniclip!] (papa-louie/papa-louie.md) - -[Visit Sturgis 2015!](sturgis2015/sturgis.md) - -[Attack marshmallow pikachu!](pikachu/pokeball.md) - -"I have problems with my sleep," you realise. "I'm going to [move to New York](new-york/new-york.md)." - -[Summon Dragons of the Khaleesi](dragons/fire-everywhere.md) - -[Bounce](bounce/bounce.md) - -[Play some DotA 2](play-dota2/play-dota2.md) - -[Play Starcraft 2](starcraft2/starcraft2.md) - -[Play some Geometry Dash](play-geometrydash/play-geometrydash.md) - -[See if there is a Udacity course on the subject](udacity/udacity.md) - -Click [here](young/young.md) to listen to music. - -[Consult Flann O'Brien](flann-o-brien/truth-is-odd.md) - -[Attack it with a lightsaber](lightsaber/lightsaber.md) - -[Decide to browse Reddit instead](https://www.reddit.com/) - -[It's time to take a vacation] (licked-cat/vacation.md) - -And then you realize that Burning Man is over, so no real vacations :( - -[present-tense](present-tense/present-tense.md) - -[Think about happy thoughts while spinning around in circles](my-story/my-story.md) - -[Story of DKER](DKER/DKER.md) - -[Get your prostate checked](prostate/prostate.md) - -If you eat a lot, you should also [exercise](exercise/exercise.md) - -A quick brown fox jumps over the lazy dog! - -[Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) - -[Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) - -[Watch a recording of an awesome jazz concert](https://www.youtube.com/watch?v=VMb3PX9gq78) - -whilst wandering through the vastness of this universe. - -[But what universe is this?](universe-test/blaze_verse.md) - -Either way we are cool, right? - -This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. - -You decide that you do not want to visit the miracle man. [You check your -phone to find something else to do](check-phone/check-phone.md). - -And you plug-in to [play some music](play-music/playmusic.md). - -The next thing you know, you're up all night in Croatia mixing a new playlist - -You remember the story of a [robot](happy-robot/happy-robot.md). - -Wondering how you got here, you feel a strange tingling in your hands, almost as if -they are responding to your new surroundings. You feel an urge to gesture forward, -and as you do a large pink marshmallow shoots out of your hand into the wall before you. -[Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) - -[The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) - -All in a hard days work, do you play some [music](play-music/playmusic.md). - -As you hold your pot of precious hunny, you begin to [hear an ominous voice...](ominous-voice/ominous-voice.md) - -Honesty in a hard way [Watch it](few-good-men/fgm.md) - -Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube.com/watch?v=lAF8D0ugyVk) - -But the call of of nature wasn't going away so you push open the toilet door and go in.. - -Just then you recall the news story of what is causing the -[strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. - -...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) - -You escape into a [recording studio](more_cowbell/more_cowbell.md) - -Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) - -And then you stumble upon something [completely different](http://www.atlasobscura.com/) - -After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) - - -[What about skydiving](skydiving/skydiving.md) - -*Story intensifies!* - -You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie... - -Instead of going to the movies, you decide to [solve the gase crisis](plow/plow.md) instead. - -You made it through the day and are starting to get sleepy... [Time to fall asleep](marshmallow.md) - -You wake up in front of a computer screen. You begin reading -the text of a markdown file called marshmallow.md. As you read -you realize that the story is about you! -[remember this story!](this-story-is-about-you/this-story-is-about-you.md) - -This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) - -[Call a random number](call-a-random-number/answer.md) - - -You must be lonely. [Want a friend?](robofriend/AIRobot.md) - -When I code over my weekend, I feel that this becomes my [whole life](code-my-life/code-my-life.md). - -Suddenly you feel a strong craving for [something.](craving/craving.md) - -Despite the little conundrum that you resolved, you realize that it's now -Friday, December 4th. - -"Wait a minute", you gasped, "The English Premier League is on tomorrow!!" - -With that new revelation in mind, you quickly make like David Hasselhoff -and wiggle your wrist to show off a nice particular watch that even listens -to you when you speak to it. - -["Ahem!"](my-adventure/my-adventure.md) - -So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... ->>>>>>> deb66146d3bd0481a4c19d27b8ef289b939d4156 - -["Train Ride!"] (train-ride/train-ride.md) - -I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/star-wars.md) - -"What's a Heffelump?" asked Sheffield inquisitively. - -"I dont't know! Why should I care?" replied Donald Trump. - -When faced with a lot of work and impending deadlines -in the (not so near) future, -there are two options you must choose from. - -You may either do [this](gtd/gtd.md), - - or [that](procrastinate/procrastinate.md). - - This is one weird story. Did anybody read the whole page? - - I sure did not. This is as weird as it gets. - -[Get Crazy!](crazy/crazy.md) - -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim -[move to Boston](boston/boston.md)." - -Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! - -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" - -Yourself? - -Instead of reading this entire story, you decide to go see the new star wars! - -As you're walking down the street you see [something](millenium-falcon/flyaway.md) - -You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). - -[Do you have my stapler?](stapler/stapler.md) - -[Build a car](build-a-car/build-a-car.md) - -What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? - -The divergence is coming, [survive](divergence/divergence.md) or perish? - -[Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) - -You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) - -You start off strong... - -But there are [too many hurdles in your way](hurdles/hurdles.md). - -"What a joke?", he said, after looking at the [news](joke/joke.md) - -Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... - -It says you should [brew some beer](beer-brewer/beer-brewer.md). - -The [news](joke/joke.md) says it all my people! - -Bible says... As you sow, so shall you [reap](think/growrich.md) - -So shall you reap, and the [steelers](steelers/steelers.md) know that all too well! - -Until you realize that even marshmallows need [LOVE](https://www.youtube.com/watch?v=i5fZ__mnHbU). - -Marcel needs a new pair of shoes, will you buy shoes for [Marcel](https://www.youtube.com/watch?v=VF9-sEbqDvU)? - -You look up and out to the ocean. In the distance you see a [mermaid](mermaid/mermaid.md) - -The mermaid above died, but [don't worry...](mermaid2/mermaid.md) - -A fairy tale about [a shoemaker and elves](elves-and-shoemaker/elves-and-shoemaker.md) - -The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) - -The understanding of git [go here](Booyah/booyah.md) - -[Link to Git Official Website] (git/git.md) - -[link to google website] (kumar/kumar.md) - -Hi i got this one for udacity team. - -As the sand encompassed her toes and -the ocean-spray breezed through her nose - -she froze... - -But the cold never bothered me anyway. - -Let it go, let it gooo... - -CANT HOLD IT BACK ANY MORE - -Do you want to build a [snowman?] (snowman/snowman.md) - -It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) - -I think I'll try defying gravity. - -Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) - -[Paint It Black](paint-it-black/PaintItBlack.md) - -[Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) - -[To Infinity and Beyond](math/math.md) - -[I hope you aren't using a poorly built crawler on this](./marshmallow.md) - -[Read my story](magic2/magic2.md) - -[..and recall that Carl Johnson might be alive](Carl/carl-johnson.md) - -[Or, forget it all, and jump off the cliff](cliff/cliff.md) - -[Make a pie chart](http://i.imgur.com/uaFES1b.jpg) - -[Read a story of a crouch dragon](crouch-dragon/crouch-dragon.md) - -[Write a hiku](write-a-hiku/hiku.md) - -Explore the unknown. Most people die without ever visiting this [place.](underwater/scuba-diving.md) - -As you attempt this, a voice booms!! - -The [boom](day-dream/day-dream.md) - -Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) - -You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) - -For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) - -You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). - -You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). - -So what to do next? Three doors appear and all other ways out disappear. -So you pick the [right door](mysterydoor/mysterydoor.md) - -You put your [cowboy hat](cowboy/cowboy.md) back on your head. - -Or... or... or... Oh, I forgot! -You foget something, but you decide to [move on](move-on/move-on.md). - -You follow the panda up the nearest tree, chewing bamboo shoots as you go [bamboo-shoots](bamboo/bamboo-shoots.md) - -And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) - -[Do nothing.](nothing/do-nothing.md) - -[Rent a hydroplaning dog sled to get you to the other side of the world] (dog-sled/dogsled.md) - -Toasted [marshmallow](toasted/smores_pie.md) - -While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. -[The new record is!](new_warriors_record/new_warriors_record.md) - -Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). - -Life is full of [puzzles](LifePuzzle/LifePuzzle.md). - -You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". - -A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) - -Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) - -If you have read this far, then you must be in pain. -Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. - -As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. - -Health and Life Lovely [Quotes](./health/health.md) - -The lannisters always pays thier debts, says tyrion lannister. Interesting [character](./gameofthrones/tyrion.md) he is. - -Time to [move to Canada](Canada/Canada.md), eh? - -You struggle to find a line break to add your own adventure. -You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) - - - -The crushing weight of all these options causes you to [end your life.](end/end.md) - -You're reincarnated as a green starfish but wish you were [blue instead.](starfish/starfish.md) - -[Motivate yourself](Motivate/Motivate.md) - -You wake up as Harry Potter ... and are facing Voldemort in a duel? -What should you [do](magicaladventure/decision_time/decision_time.md) - -My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... - -[Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. - -You decide you want to be a pirate and remember a show called -[onepiece](onepiece/op.md) - -You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Taiwan.md)! - -you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) - -Time to check out the latest [Total War - Warhammer](total-war/war-start.md)! - -You wake up in the morning and your [computer is looking out of the window](computer-window/computer-window.md) - -Instragram, a great place to spend time. [Visit my profile](https://www.instagram.com/coding.imagination/) - -You've been charged with treason against the King. You wake up in [prison](prison/prison.md). - -My visit to the [zoo](zoo/zoo.md). - -You wake up confused, you faint you go back in [time](time-travel/time-travel.md) - -[The Hungry Prince](hungry_prince/hungry_prince.md) - -[The Angry Prince](angry_prince/angry_prince.md) - -The password is [xyzzy](plugh/plugh.md) - -[Say "Hi" to Guangwu](Guangwu/Guangwu.md) - -Perishing in an avalanche of words, in a mundane collection of sentences called "stories". -[Devastated?](devastated_greatness/devastated_greatness.md) - -Ever the fan of [Doug Adams](doug-adams/doug-adams.md). - -If you really want to know the answer to the question.... -"What is the answer to Life, the Universe and Everything?" then you -need some [Deep Thought](doug-adams/deep-thought/deep-thought.md) - -Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit - -[Discover](discover-new-genres/discover-new-genres.md) a new genre of music! - -[Watch](https://www.youtube.com/watch?v=-XJN7qqFqPE) Too Many Puppies! - -You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... - -You decide to quit your job to play [Pokemon Go](pokemon-go/pokemon-go.md) full time. - -Learn about something random [here](https://en.wikipedia.org/wiki/Special:Random)! - -Learn about Ankesh [here](characters/ankesh.md) - -[Hold the door!](hold_the_door/hodor.md) [Spoiller GOT] ->>>>>>> b6c70ae2fc2160a4b1b9c8639b4567de6b5a4a93 - -You realise that the philosphy of life in general boils down to -that one central question... will you? or will you not? -[So Will you?](philosophy/questions.md) - -You recited [cosmological argument](cosmological_argument/cosmological_argument.md) in the morning in hub. - -You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). - -Click [here](https://www.youtube.com/watch?v=aboZctrHfK8) to find out what the meaning of life is. - -so lazy [here](lazy/lazy.md) - -[Update](android/marshmallow6.0.md) your Smartphone to the Marshmallow 6.0! - -Click [here](walrus/walrus.md) - -Click here to learn more about the MEAN stack [here](mean-stack/mean.md) - -Do you like [stargazing](stargazing/stargazing.md) ? - -Let's learn some [mandarin](learn-mandarin/learn-mandarin.md) - -Neurons for social memories, [more info](http://news.mit.edu/2016/scientists-identify-neurons-social-memory-0929) - -What is the meaning of life? -To find out click [here](meaning-of-life/meaning-of-life.md). - -What is that shiny in the window? Come in and take a -[look](Computer-Man/Computer-Man.md) - -Wanna trip yourself? Hue has got a place you would like to [enter](Trip-Yourself-Hue/trippy.md) From 020a9070bf3b414d3a7c939a27a18bccec5b225f Mon Sep 17 00:00:00 2001 From: Manas Date: Tue, 18 Oct 2016 14:59:12 +0530 Subject: [PATCH 4503/5486] Modify marshmallow.md and add a new path to the story to Trip-Yourself-Hue --- english/marshmallow.md | 1147 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1147 insertions(+) create mode 100644 english/marshmallow.md diff --git a/english/marshmallow.md b/english/marshmallow.md new file mode 100644 index 0000000000..5dfae125d8 --- /dev/null +++ b/english/marshmallow.md @@ -0,0 +1,1147 @@ +Once upon a time many authors collaborated to make meaningless linked story. + +NGE is [here] (NGE/NGE.md) + +[start](mad/mad.md) your journey into world of mad + +or + +spend your time [wisely](http://www.pythonchallenge.com/) + +[Click here](http://www.dvloper.me) to visit my dvloper.me blog . + +Are you a: + +[cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) + +or a + +[dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? + +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. + +Oh so many decisions - what will you do?? + +You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! + +Take some [time](meditation/meditation.md) off! + +Life is full of twists and turns like but try to cheer yourself and people around you. [Click Here](Happy/happie.md) + +Who is better? + +[Click Here](captain/captain.md) to vote for Captain America + +[Click Here] (ironman/ironman.md) to vote for Iron Man + +[Click here] (00_8_Agent/The_name_is_Bond_Milton_Bond.md) to vote for a Special Agent +[click here] (london/london.md) to vote for london + +January 2017 approaches. You have two presidential candidates to vote for. + +[Click](vote-the-president/trump/trump.md) here to vote for Donald Trump. + +[Click](vote-the-president/hillary/Hillary.md) here to vote for Hillary Clinton. + +You don't like either of these candidates. +So instead, you decide to [write a symphony](write-a-symphony/symphony.md) +or +[paint a picture](paint-a-picture/paint-a-picture.md). + +Keith the Unicorn approaches you. +He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) + +It is time to begin your adventure. +Your search for the grail begins [now](Monty-Python/search.md) + +Down one path you see a person standing in the middle of the path. +They look familiar somehow, but you just can't figure out who they are. +They seem friendly so you decide to go [talk to them.](friendly-person/friendly-person.md) + +Ask them to join you on a life changing [quest?](zuluquest/choosequest.md) + +Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) + +How about some [chill music](chillmusic/chillmusic.md)? + +[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) + +You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. + +I also agree only way to find way is to keep climbing or walking or studying or learning or all of this is DOING. +DOING will definitely keep your sharpened with latest skills (which you can get by the way from Udacity !!!) + +[Know about the life of this world](00-Life-of-this-world/Life of this world.md) + +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down + +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) + +Vist the master [liquid](liquid/liquid.md). + +Drink some [bear](bear/bear.md) + +[play](http://pcottle.github.io/learnGitBranching/) with the (git) branches + +and search for your [destiny](destiny/destiny.md). + +Before we begin, do you need a [warm-up?](warm-up/warm-up.md) + +Once you're warmed up, why not try a [work out?](work-out/work-out.md) + +or maybe [eat that delicious cucumber sandwich?](sandwich/sandwich.md) + +After warming up, take a minute and reflect on your [love for udacity](love-udacity/love-udacity.md) + +You are are man (or woman) for all seasons but need help in choosing +your travel destinations.. Of course we are happy to help you with these +[suggestions](travel-destinations/travel-destinations.md) + +Meet a [Schrodingers cat](schrodinger-cat/schrodinger-cat.md) + +Another visitor! [Stay a while...](impossible-adventure/start/start.md) + +[I am the one who knocks](say-my-name/say-my-name.md) + +[The Secret to Life...Seriously](https://www.youtube.com/watch?v=dQw4w9WgXcQ) + +[Some inspirational Lines](the-nights/the-nights.md) + +[Time for some teachings on life and success](swami-vivekananda/swami-vivekananda.md) + +One morning, you wake up in a strange room with marshmallows for walls. + +Marshmallows smell funny. What is a marshmallow anyway? + +Unexpectedly, the Chief Marshmallow demands to see your [references](references/references.md). + +Show him your [references](https://youtu.be/uZbjlsX0DNY?t=10s). + +The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtube.com/watch?v=s9Dp20ydm1E) + +*(Must be a Tuesday.)* + +Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. + +Or a [Wednesday](make_changes_GitHub/make_changes_GitHub.md)... + +[Thursday](doug-adams/arthur-dent/arthur-dent.md)... maybe even a Friday, but definetely not a Saturday. + +Ok, we have to consider Saturday too. + +[this crazy thought popped into your head](yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md) + +Alice doesn't live here anymore, [or does she?](scarab/goddess.md) + +But not Monday; you never go out on a Sunday evening......[or do you](./or-do-you/or-do-you.md)? + +Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. + +For a second, you decide whether or not to just [go back to sleep](go-back-to-sleep/go-back-to-sleep.md) + +Then, you consider playing a [chess puzzle](chess/chess.md) + +A sound from a Hitchcock movie fills the room, then quickly fades away. + +Was it the sound of a cry from the shower? + +Was it the sound of birds? + +It sounded like it could have been a [heffalump](heffalump/heffalump.md) + +No... perhaps not. + +Not at all. + +I think it was an [animal](animal/animal.md). + +Nope, it was [Tim Berners-Lee](https://en.wikipedia.org/wiki/Tim_Berners-Lee) sobbing in despair. + +Thinking back, there are no memories to suggest that this should have been +anything but an ordinary morning. You didn't go out last night, you don't +usually take intoxicants, what's happening...? + +Maybe this is a dream? + +Or a [memory](memories/memories.md)? + +Or is it just boring old [real-life](real-life/real-life.md)? + +Or [The Force](https://www.youtube.com/watch?v=cFn-NobVaoI&feature=youtu.be)! + +Or is this just [fantasy](https://www.youtube.com/watch?v=fJ9rUzIMcZQ)? + +Maybe it's a dream within a dream? Maybe dreaming and reality are one and the +same. Maybe reality is an oxymoron when considering multiple dimensions. + +Maybe you're in [Inception](inception/inception.md). + +But it's probably not worth dwelling on that right now, you could be in danger. + +Grave danger. Oh No! + +*(Is there another kind?)* + +I actually used to know a guy named Dave Granger. We sure had some good times! Anyway, the possibility of danger lurks. + +The type of extreme mortal danger that so often accompanies confectionary inspired interior design. +Quickly surveying your immediate surrounds, you notice a garishly dressed, +vacant-eyed young man lounging on a nearby sofa. + +The man is not large but not small, but not average either. +He is reciting poetry in a language you assume to be Egyptian, +though you are not familiar with Egyptian. You only assume this +because of the small pictograms that seem to rise into the +air above his head when he speaks. One looks like a small bird. +Another a small insect. A third is for all appearances the +third car your father ever bought you, a small Fiat 500, which +though in the picture above the man's head is purple, was +in reality more of a mauve. It had a tendency to bark whenever +you drove it over hills, not like the proud great dane from +Nova Scotia that most smaller cars tend to imitate when taking +on tasks greater than their strengths, but rather more like +the small pomerainian who is now barking at the blue music notes +hovering over the man's large-ish head, now peeing on the +back of the sofa, making it difficult for you to remember the +name of that dude you totally scored with in the back of your +Fiat 500. You're finding it difficult to think. You sit down on +the sofa to gather your thoughts. You think of all the men +you slept with on your hitch hiking journeys across the southern +american continent. + +[Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) + +You recall what a man said to you once: "Live as one of them, Kal-El, to discover +where your strength and your power are needed. Always hold in your heart the +pride of your special heritage. They can be a great people, Kal-El; they wish to +be. They only lack the light to show the way. For this reason above all, their +capacity for good, I have sent them you... my only son." + +[Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) + +Call in the [Justice League!](./justice-league/justice-league.md) + +[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) + +[That sure sounds familiar...](./sounds-familiar/sounds-familiar.md) + +These marshmallows are numerous and they look so delicious. +... despite the feeling they're somehow judging you for only wearing one sock. + +[Turn one of the marshmallows into gold.](./alchemy/alchemy.md) + +You reach out to grab a handful of the marshmallow wall, but you can't seem to take the handful away from the wall. + +You also seem to be wearing an uncomfortable and restrictive jacket made of leather... + +You don't own any uncomfortable and restrictive leather jackets... How did you end up sleeping in one? + +Suddenly, fuzzy memories of a tavern and an exotic woman... +a house made of candy... +closets full of umbrellas and leather. + +An umbrella (closed) automagically appears in your left hand. You tentatively + +[poke the wall](./poke-the-wall/poke-the-wall.md) with it. + +[You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) + +You are feeling very anxious at this point. + +You can't decide if anything is worth it anymore so you loose yourself at a [David Gray concert.](concert/concert.md) + +Goosebumps appear. + +This is because you do not like leather for ethical reasons. + +Leather is all over [San Fransisco](sanfran/sanfran.md). + +[Ethical reason? Seriously?](./ethical-reason/ethical-reason.md) + +You begin to break out of the jacket and find a lighter, a fork, and rope. + +You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. + +But only find out that the chocolate has expired [132 days ago](./132-days-ago/132-days-ago.md). + +Do you want to [try to fill the remaining space in the sock with marshmallows](./fill-sock/fill-sock.md)? + +You are not sure who placed these objects near you or why. + +But you have a growing sense that these mundane objects are vital to your survival. + +You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. + +[You have the suspicion that you are being closely watched.](./watched/watched.md) + +[Of course, it's that man on the sofa; go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) + +[Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) + +You see a polar bear searching for food. + +I see that you may be from the North. [How's it going?](./north/north.md) + +[A Shotgun appears!](./shotgun/shotgun.md) + +[Whilst cycling backwards.](./cycling-backwards/cycling-backwards.md) + +"Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" + +You hear a small bird sound in the distance. + +But it sounds like it might be coming out of speakers. + +Something lightly brushes the back of your neck, sending a chill down your spine! + +Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. + +You hear a strange noise then turn and see a large, wooden door. +Too large, in fact, and yet too small, for the frame it rests in. +You [walk through the door](./unnatural_door/unnatural_door.md). + +You turn for a third time and see a small, metal door. + +You knock, hear nothing and decide to [enter](./strange-room/room.md). + +Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air +for alien life forms. + +When you look away, a marshmallow hand attempts to grab the lighter. + +But you are too quick for the marshmallow! + +The realization suddenly dawns upon you the marshmallow is self aware! + +You try to bury your contribution because you are slightly + +Embarrassed by the exercise. + +If you don't do something quickly, this marshmallow belly will digest you! + +Marshmallows are going to rule the world! + +Long live marshmallows! + +For a few moments you think to yourself, with all these marshmallows, you have some rice krispy squres. + +Hold the image of the marshmallow and... + +Sing softly the song of it's people as you... + +BUT!!!! wait a minute... Do you hear that?? + +A soft echo of a torrent is fading from far... + +I felt a sudden ease of mind. + +"Ok", I said to myself, "I need to get +[out of here](outta-here/outta-here.md)" + +"But first I must remember the magic spell needed to open the enchanted door!" +Where is Hermione Granger when you need her? Where I ask you? +Oh, I know. Click [here](hermione/hermioneHere.md) + +You pick up the fork and wrap it in rope to fashion a crappy wand. + +For more on wand history [here](./wand/wand.md). + +Pointing it at the door, eyes closed, "Alohomora..." + +Nothing seems to be happening. + +You pause for a second, awaiting a spectacular sight. + +Sheepishly you look down on the crappy wand in your hand. + +You must be doing something wrong. You drink a beer and think about it, then Ah-ha! + +so many [beer](drink-beer/drink-beer.md) options.. + +You notice your pants are now glowing, so you must have been holding the wand upside down. + +Suddenly, you become aware of the need to take a leak. +You can't hold it. You wonder, Are glowing pants waterproof? +You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) + + +Do you: + +Give up and [start over](marshmallow.md). + +[Listen to Tales of the Inexpressable (By Shpongle)](https://www.youtube.com/watch?v=6WTxC8wnXQo) + +[Watch the new Star Wars trailer](https://www.youtube.com/watch?v=sGbxmsDFVnE) + +[Watch the second new Star Wars trailer](https://www.youtube.com/watch?v=ngElkyQ6Rhs) + +[Live Tweet the situation](tweet-it/tweet-it.md) + +[Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) + +Take out your [knitting project](knit/knit.md) and finish your sock heel turn. + +Take out your [crochet project](crochet/crochet.md) instead and finish that teddy bear you've been working on. + +[Realize you are in the ...](in-matrix/matrix.md) + +[Realize you better call Saul](better-call-saul/saul.md) + +[Turn off all the lights](lightsoff/lightsoff.md) + +[Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) + +[Feel a sudden urge to dance](https://youtu.be/dQw4w9WgXcQ) + +[Make changes on GitHub to revise this crazy story](make_changes_GitHub/make_changes_GitHub.md) + +[Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) + +[Go eat some rainbows](eat-rainbows/rainbows.md) + +[Admire your glowing pants](glowing-pants/glowing-pants.md) + +[Grab some coffee?](coffee/coffee.md) + +[Grab some wine?](wine/wine.md) + +[Call the GhostBusters](ghostbusters/ghostbusters.md) + +[Talk to Bob Barker](bob-barker/barker.md) + +[Hop on a plane](forest/forest.md) + +[Spend so long trying to decide that you fall asleep](sleep-and-wake/sleep_and_wake.md) + +[Cry out for your Mommy](cry-out-for-mommy/oh_mommy.md) + +[Enter a Dim Reality](Enter-a-dim-reality/Dim_reality.md) + +[Watch the Warriors vs Cavaliers game 1 of the NBA Finals](warriors-game/watch-warriors.md) + +[Peek through the keyhole to reveal what is beyond](world-war-marshmallows/world-war-marshmallows.md) + +[Try the more effective "Apparation" spell to teleport elsewhere](movie-ripoffs/hogwarts/hogwarts.md) + +[Begin to feel suspicious](lucidream/luciddream.md) + +[Want to break free](yuha/yuha.md) + +[Open the door and run outside](open-door/open-door.md) + +[Give the marshmallow entity a turing test](turing-test/turing-test.md) + +[Step into an adjacent room to check your social media hubs](social-media/social-media.md) + +[Try and interact with the marshmallow hand](interact/interact.md) + +[Check your phone for date, time and location?](check-your-phone/check-your-phone.md) + +[Check mspaintadventures](mspa/mspa.md) + +[Lunge for the lighter](lunge-for-the-lighter/lunge-for-the-lighter.md) + +[Ask to Alice](ask-to-alice/ask-to-alice.md) + +[Close your eyes](experience/experience.md) + +[Grab the lighter first?](lighter/grab-lighter.md) + +[Make a swing with rope and jacket](enjoy-DreamRide/ride.md) + +[Start eating the walls?](eating-walls/eating-marshmallows.md) + +[Give the marshmallow to the polar bear?](polar-bear/polar-bear.md) + +[Realize you are in Minecraft](you-are-in-minecraft/minecraft.md) + +[Try to pull a MacGyver with the lighter, fork and rope?](macgyver/macgyver.md) + +[Quickly run outside and explore?](explore-outside/explore-outside.md) + +[Light a fire?](light-fire/fire.md) + +[jump in a chocolate pool?](chocopool/choco.md) + +[Hungry Kya?](hungry/hungry.md) + +[Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) + +[Dig a hole with your bare hands?](hands/hands.md) + +[Go back to sleep?](sleep/marshmallow.md) + +[Stay puft?](staypuft/marshmallowman.md) + +[Dig at the walls with a fork](dig/dig.md) + +[Invite some friends over?](invite-friends/friends.md) + +[Look for a way out?](find-exit/leave.md) + +[Count the marshmallows?](count-the-marshmellows/count-the-marshmellows.md) + +[Begin to dance to pass the time?](dance/dance.md) + +[You pinch yourself to see whether you are dreaming?](pinch/pinch.md) + +[Promise to yourself this is the last time you take hallucinogenic mushrooms?](shrooms/never-again.md) + +[Think this is too surreal and decide to try the French version instead?](../french/feu-de-camp.md) + +[Think this is a dream, and jam the fork into your hand to wake up?](fork-jam/not_dreaming.md) + +[Go out and collect mushroom?](mushroom/collect_mushroom.md) + +[Try to walk around](virtualreality/oculus.md) + +[Make one of those weird marshmallow Jell-O salads?](marshmallow-jello-o-salad/the-kind-your-grandma-used-to-make.md) + +[Begin to sing out of fear?](sing/sing.md) + +[Go meditate and ponder about your next step?](meditate/meditate.md) + +[Scream out of fear?](scream/scream.md) + +[Get to work on the best batch of cookies ever made?](bake-cookies/cookies.md) + +[Start tying knots on the fork?](fork-knots/melt-with-fork.md) + +[Start pondering how you got yourself in a sticky situation?](ponder/ponder-about-life.md) + +[Create a new jacket out of marshmallows?](jacket/marshmallow-jacket.md) + +[Go straight to the solution!](http://youtu.be/dQw4w9WgXcQ) + +[Cook them marshmallows](http://youtu.be/dQw4w9WgXcQ) + +[Explore Wikipedia](wikipedia/wiki.md) + +[Whip out your spork, start a fire and make giant s'mores?](http://easybaked.files.wordpress.com/2011/10/smores4.jpg) + +[Ask yourself how you got yourself into this situation - AGAIN?](shrooms/never-again.md) + +[Challenge the Marshmallows to a Rock Off!](challenge-marshmellow-to-rock-off/tenacious-d.md) + +[Call a doctor](call-a-doctor/doctor.md) + +[Remember that pill you took](adipose/adipose.md) + +[Light up the wall](light-up/light-up.md) + +[Hide the lighter fork and rope in your pocket](hide/hide-chk.md) + +[Make a necklace out of the marshmallows](necklace/necklace.md) + +[Light up the wall 2](light-up2/light-up2.md) + +[Switch on your laptop and..](netflix/netflix.md) + +[Lion King ](no-worries/hakuna-matata.md) + +[Perform some magic](magic/magic.md) + +[Raise your self so high](khudi/buland_very_high.md) + +[Put yourself back in the straitjacket](backinstraitjacket/backinstraitjacket.md) + +[Find the bird](find-bird/bird.md) + +[Attempt to befriend the marshmellow man](make-friends/make-friends.md) + +[Try to use one of your pokemon?](pokemon/pikachu_wins.md) + +[Throw a rock at it and see if it moves](moving/moving.md) + +[Start tickling the marshmallow](tickle/tickle.md) + +[Enter the time tunnel](timeTunnel/timeTunnel.md) + +[Tie the marshmallow's hands and legs](tying/tying.md) + +[Use the fork, Luke!](use-the-fork-luke/use-the-fork.md) + +[B b b bird bird bird, bird is the word](birdistheword/birdistheword.md) + +[Quote of the day](quote-of-the-day/quote.md) + +[Escape and find a phone to call...](call-these-guys/calltheseguys.md) + +[Play some cricket](play-some-cricket/playsomecricket.md) + +[Run back and forth quickly slamming into the walls](indigestion/indigestion.md) + +[In their tongue he is Dovhakiin, DragonBorn, FUS ROH DAH](fus-roh-dah/fus-roh-dah.md) + +[The walls start closing in](malaria/malaria.md) + +[Come to Nepal](nepal/nepal.md) + +[Order Pizza](order-pizza/order-pizza.md) + +[Summon your robot army](robot-army/robots-everywhere.md) + +[Oh dear! You ended up in Candyland!](candyland/diabetes.md) + +[Give 'em the Leslie Howard!](slap-it-hard/teach-it-a-lesson.md) + +[You punch the first person you see!](punch/punch.md) + +[Hulk smash?](hulk/smash.md) + +[Marsh Attack!!!](marshmallow-attack/marsh-attack.md) + +[Got Lost](getsLost/getsLost.md) + +[Try to make smores](smores/smores.md) + +[Summon your humble servant](humbleservant/humbleservant.md) + +[Summon the magical snuffbox](snuffbox/snuffbox.md) + +[Become the One?](matrix/matrix.md) + +[Melt all the marshmallows to make s'mores?](meltmarshmallows/meltmarshmallows.md) + +[Want to cook boneless pork shoulder roast?](pork/roast.md) + +[Take a selfie?](selfie/selfie.md) + +[Say something](blah-balh/blah-blah.md) + +[Try the Marshmallow Test on it?](https://youtu.be/QX_oy9614HQ) + +[Become an Octodog](be-octodog/octodog.md) + +[Make a Marshmallow cake](https://www.youtube.com/watch?v=3l1SY3QREv4) + +[I'm Batman](I'm-batman/batman.md) + +[You realize you are in NeverLand and you are + never going come... so you sing the Tinker Bell song](https://youtu.be/Sopngy6uucw) + +[You decide to become a marshmallow yourself.](becomemarshmallow/becomemarshmallow.md) + +[Explain Fizzbin to the marshmallow hand?](fizzbin/explain-fizzbin.md) + +[Drool on the Marshmallow to show demonstrate your digestive superiority](drool/droolstrategem.md) + +[Eat the Marshmallow](eatmarshmallow/eatmarshmallow.md) + +[Escape into Willy Wonka Lego-World](lego-world/lego-world.md) + +[Eat breakfast](../english/breakfast/breakfast.md) + +[After breakfast you lookup triathlon](triathlon/triathlon.md) + +[The inception protocol](dream_in_dream/inception.md) + +[Choose the blue pill or the red pill?](choose-pill/choose-pill.md) + +[Pull out your proton pack!](ghost-buster/ghost-busted.md) + +[You take the red pill](red-pill/red-pill.md) + +[Twas the Night Before Christmas](night-night/tale.md) + +[Check Reddit for any useful information.](reddit/ask-reddit.md) + +[Watch Up](watch-movie/Up.md) + +[Give up and search for oil fields](oil-field/oil-field.md) + +[Appear on Falkor’s Back](appear-on-falkors-back/falkor.md) + +[Sit and ponder how you got into this situation](thesituation/situation.md) + +[Smart Ape roasting a marshmellow](https://www.youtube.com/watch?v=_ZEBrHe4hVs) + +[Bruce Wayne is BATS !!](batman/batman.md) + +[Use your chance, master self-control](self-control/self-control.md) + +[Have a Pip-Boy](pipboy/pipboy.md) + +[Call upon one of your past lives as avatar](avatar/air.md) + +[Play some GTA5](play-gta5/play-gta5.md) + +[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) + +[Search for gluten](search-for-gluten/search-for-gluten.md) + +[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) + +[Go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) + +[Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) + +[Commit suicide](commit-suicide/suicide.md) + +[Make an appointment with the dentist](dentist/ouch.md) + +[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) + +[You Google what to do](https://www.google.co.in/) + +[Abdul kalam quotes on overcoming fear](apj/apj.md) + +[If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) + +[There's no such thing as a free lunch.](free-lunch/free-lunch.md) + +[Follow the dog...](play-with-dog/dog.md) + +[What is LOVE ?](love/love.md) + +[Got to Singapore](singapore/singapore.md) + +[Talk to Finn](talk-to-finn/finn.md) + +[Play Guitar](guitar/guitar.md) + +[Contemplate the meaning of life](meaning/meaning.md) + +[Rinse the marshmallow under the tap then eat it](dysentry/dysentry.md) + +[Wake up!](wake-up/wake-up.md) + +[Thank Mr. Skeltal](2spooky/2spooky.md) + +[Utilize your wand once again...](utilize-wand/fork-rope-wand.md) + +[Draw a trapezoid](trapezoid/trapezoid.md) + +[Stop, hammertime!](hammertime/hammertime.md) + +[Analyze the composition of the marshmallow](analyze/analysis.md) + +[Watch Barcelona game](watch-barca/watch-barca.md) + +[Oops! this story ain't ending..](unending-story/unending-story.md) + +[Code](code/code.md) + +[Screaming goat is screaming](https://youtu.be/kh6c0SOfkH4) + +[Play on miniclip!] (papa-louie/papa-louie.md) + +[Visit Sturgis 2015!](sturgis2015/sturgis.md) + +[Attack marshmallow pikachu!](pikachu/pokeball.md) + +"I have problems with my sleep," you realise. "I'm going to [move to New York](new-york/new-york.md)." + +[Summon Dragons of the Khaleesi](dragons/fire-everywhere.md) + +[Bounce](bounce/bounce.md) + +[Play some DotA 2](play-dota2/play-dota2.md) + +[Play Starcraft 2](starcraft2/starcraft2.md) + +[Play some Geometry Dash](play-geometrydash/play-geometrydash.md) + +[See if there is a Udacity course on the subject](udacity/udacity.md) + +Click [here](young/young.md) to listen to music. + +[Consult Flann O'Brien](flann-o-brien/truth-is-odd.md) + +[Attack it with a lightsaber](lightsaber/lightsaber.md) + +[Decide to browse Reddit instead](https://www.reddit.com/) + +[It's time to take a vacation] (licked-cat/vacation.md) + +And then you realize that Burning Man is over, so no real vacations :( + +[present-tense](present-tense/present-tense.md) + +[Think about happy thoughts while spinning around in circles](my-story/my-story.md) + +[Story of DKER](DKER/DKER.md) + +[Get your prostate checked](prostate/prostate.md) + +If you eat a lot, you should also [exercise](exercise/exercise.md) + +A quick brown fox jumps over the lazy dog! + +[Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) + +[Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) + +[Watch a recording of an awesome jazz concert](https://www.youtube.com/watch?v=VMb3PX9gq78) + +whilst wandering through the vastness of this universe. + +[But what universe is this?](universe-test/blaze_verse.md) + +Either way we are cool, right? + +This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. + +You decide that you do not want to visit the miracle man. [You check your +phone to find something else to do](check-phone/check-phone.md). + +And you plug-in to [play some music](play-music/playmusic.md). + +The next thing you know, you're up all night in Croatia mixing a new playlist + +You remember the story of a [robot](happy-robot/happy-robot.md). + +Wondering how you got here, you feel a strange tingling in your hands, almost as if +they are responding to your new surroundings. You feel an urge to gesture forward, +and as you do a large pink marshmallow shoots out of your hand into the wall before you. +[Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) + +[The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) + +All in a hard days work, do you play some [music](play-music/playmusic.md). + +As you hold your pot of precious hunny, you begin to [hear an ominous voice...](ominous-voice/ominous-voice.md) + +Honesty in a hard way [Watch it](few-good-men/fgm.md) + +Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube.com/watch?v=lAF8D0ugyVk) + +But the call of of nature wasn't going away so you push open the toilet door and go in.. + +Just then you recall the news story of what is causing the +[strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. + +...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) + +You escape into a [recording studio](more_cowbell/more_cowbell.md) + +Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) + +And then you stumble upon something [completely different](http://www.atlasobscura.com/) + +After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) + + +[What about skydiving](skydiving/skydiving.md) + +*Story intensifies!* + +You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie... + +Instead of going to the movies, you decide to [solve the gase crisis](plow/plow.md) instead. + +You made it through the day and are starting to get sleepy... [Time to fall asleep](marshmallow.md) + +You wake up in front of a computer screen. You begin reading +the text of a markdown file called marshmallow.md. As you read +you realize that the story is about you! +[remember this story!](this-story-is-about-you/this-story-is-about-you.md) + +This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) + +[Call a random number](call-a-random-number/answer.md) + + +You must be lonely. [Want a friend?](robofriend/AIRobot.md) + +When I code over my weekend, I feel that this becomes my [whole life](code-my-life/code-my-life.md). + +Suddenly you feel a strong craving for [something.](craving/craving.md) + +Despite the little conundrum that you resolved, you realize that it's now +Friday, December 4th. + +"Wait a minute", you gasped, "The English Premier League is on tomorrow!!" + +With that new revelation in mind, you quickly make like David Hasselhoff +and wiggle your wrist to show off a nice particular watch that even listens +to you when you speak to it. + +["Ahem!"](my-adventure/my-adventure.md) + +So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... +>>>>>>> deb66146d3bd0481a4c19d27b8ef289b939d4156 + +["Train Ride!"] (train-ride/train-ride.md) + +I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/star-wars.md) + +"What's a Heffelump?" asked Sheffield inquisitively. + +"I dont't know! Why should I care?" replied Donald Trump. + +When faced with a lot of work and impending deadlines +in the (not so near) future, +there are two options you must choose from. + +You may either do [this](gtd/gtd.md), + + or [that](procrastinate/procrastinate.md). + + This is one weird story. Did anybody read the whole page? + + I sure did not. This is as weird as it gets. + +[Get Crazy!](crazy/crazy.md) + +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +[move to Boston](boston/boston.md)." + +Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! + +"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" + +Yourself? + +Instead of reading this entire story, you decide to go see the new star wars! + +As you're walking down the street you see [something](millenium-falcon/flyaway.md) + +You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). + +[Do you have my stapler?](stapler/stapler.md) + +[Build a car](build-a-car/build-a-car.md) + +What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? + +The divergence is coming, [survive](divergence/divergence.md) or perish? + +[Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) + +You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) + +You start off strong... + +But there are [too many hurdles in your way](hurdles/hurdles.md). + +"What a joke?", he said, after looking at the [news](joke/joke.md) + +Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... + +It says you should [brew some beer](beer-brewer/beer-brewer.md). + +The [news](joke/joke.md) says it all my people! + +Bible says... As you sow, so shall you [reap](think/growrich.md) + +So shall you reap, and the [steelers](steelers/steelers.md) know that all too well! + +Until you realize that even marshmallows need [LOVE](https://www.youtube.com/watch?v=i5fZ__mnHbU). + +Marcel needs a new pair of shoes, will you buy shoes for [Marcel](https://www.youtube.com/watch?v=VF9-sEbqDvU)? + +You look up and out to the ocean. In the distance you see a [mermaid](mermaid/mermaid.md) + +The mermaid above died, but [don't worry...](mermaid2/mermaid.md) + +A fairy tale about [a shoemaker and elves](elves-and-shoemaker/elves-and-shoemaker.md) + +The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) + +The understanding of git [go here](Booyah/booyah.md) + +[Link to Git Official Website] (git/git.md) + +[link to google website] (kumar/kumar.md) + +Hi i got this one for udacity team. + +As the sand encompassed her toes and +the ocean-spray breezed through her nose + +she froze... + +But the cold never bothered me anyway. + +Let it go, let it gooo... + +CANT HOLD IT BACK ANY MORE + +Do you want to build a [snowman?] (snowman/snowman.md) + +It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) + +I think I'll try defying gravity. + +Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) + +[Paint It Black](paint-it-black/PaintItBlack.md) + +[Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) + +[To Infinity and Beyond](math/math.md) + +[I hope you aren't using a poorly built crawler on this](./marshmallow.md) + +[Read my story](magic2/magic2.md) + +[..and recall that Carl Johnson might be alive](Carl/carl-johnson.md) + +[Or, forget it all, and jump off the cliff](cliff/cliff.md) + +[Make a pie chart](http://i.imgur.com/uaFES1b.jpg) + +[Read a story of a crouch dragon](crouch-dragon/crouch-dragon.md) + +[Write a hiku](write-a-hiku/hiku.md) + +Explore the unknown. Most people die without ever visiting this [place.](underwater/scuba-diving.md) + +As you attempt this, a voice booms!! + +The [boom](day-dream/day-dream.md) + +Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) + +You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) + +For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) + +You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). + +You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). + +So what to do next? Three doors appear and all other ways out disappear. +So you pick the [right door](mysterydoor/mysterydoor.md) + +You put your [cowboy hat](cowboy/cowboy.md) back on your head. + +Or... or... or... Oh, I forgot! +You foget something, but you decide to [move on](move-on/move-on.md). + +You follow the panda up the nearest tree, chewing bamboo shoots as you go [bamboo-shoots](bamboo/bamboo-shoots.md) + +And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) + +[Do nothing.](nothing/do-nothing.md) + +[Rent a hydroplaning dog sled to get you to the other side of the world] (dog-sled/dogsled.md) + +Toasted [marshmallow](toasted/smores_pie.md) + +While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. +[The new record is!](new_warriors_record/new_warriors_record.md) + +Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). + +Life is full of [puzzles](LifePuzzle/LifePuzzle.md). + +You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". + +A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) + +Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) + +If you have read this far, then you must be in pain. +Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. + +As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. + +Health and Life Lovely [Quotes](./health/health.md) + +The lannisters always pays thier debts, says tyrion lannister. Interesting [character](./gameofthrones/tyrion.md) he is. + +Time to [move to Canada](Canada/Canada.md), eh? + +You struggle to find a line break to add your own adventure. +You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) + + + +The crushing weight of all these options causes you to [end your life.](end/end.md) + +You're reincarnated as a green starfish but wish you were [blue instead.](starfish/starfish.md) + +[Motivate yourself](Motivate/Motivate.md) + +You wake up as Harry Potter ... and are facing Voldemort in a duel? +What should you [do](magicaladventure/decision_time/decision_time.md) + +My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... + +[Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. + +You decide you want to be a pirate and remember a show called +[onepiece](onepiece/op.md) + +You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Taiwan.md)! + +you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) + +Time to check out the latest [Total War - Warhammer](total-war/war-start.md)! + +You wake up in the morning and your [computer is looking out of the window](computer-window/computer-window.md) + +Instragram, a great place to spend time. [Visit my profile](https://www.instagram.com/coding.imagination/) + +You've been charged with treason against the King. You wake up in [prison](prison/prison.md). + +My visit to the [zoo](zoo/zoo.md). + +You wake up confused, you faint you go back in [time](time-travel/time-travel.md) + +[The Hungry Prince](hungry_prince/hungry_prince.md) + +[The Angry Prince](angry_prince/angry_prince.md) + +The password is [xyzzy](plugh/plugh.md) + +[Say "Hi" to Guangwu](Guangwu/Guangwu.md) + +Perishing in an avalanche of words, in a mundane collection of sentences called "stories". +[Devastated?](devastated_greatness/devastated_greatness.md) + +Ever the fan of [Doug Adams](doug-adams/doug-adams.md). + +If you really want to know the answer to the question.... +"What is the answer to Life, the Universe and Everything?" then you +need some [Deep Thought](doug-adams/deep-thought/deep-thought.md) + +Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit + +[Discover](discover-new-genres/discover-new-genres.md) a new genre of music! + +[Watch](https://www.youtube.com/watch?v=-XJN7qqFqPE) Too Many Puppies! + +You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... + +You decide to quit your job to play [Pokemon Go](pokemon-go/pokemon-go.md) full time. + +Learn about something random [here](https://en.wikipedia.org/wiki/Special:Random)! + +Learn about Ankesh [here](characters/ankesh.md) + +[Hold the door!](hold_the_door/hodor.md) [Spoiller GOT] +>>>>>>> b6c70ae2fc2160a4b1b9c8639b4567de6b5a4a93 + +You realise that the philosphy of life in general boils down to +that one central question... will you? or will you not? +[So Will you?](philosophy/questions.md) + +You recited [cosmological argument](cosmological_argument/cosmological_argument.md) in the morning in hub. + +You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). + +Click [here](https://www.youtube.com/watch?v=aboZctrHfK8) to find out what the meaning of life is. + +so lazy [here](lazy/lazy.md) + +[Update](android/marshmallow6.0.md) your Smartphone to the Marshmallow 6.0! + +Click [here](walrus/walrus.md) + +Click here to learn more about the MEAN stack [here](mean-stack/mean.md) + +Do you like [stargazing](stargazing/stargazing.md) ? + +Let's learn some [mandarin](learn-mandarin/learn-mandarin.md) + +Neurons for social memories, [more info](http://news.mit.edu/2016/scientists-identify-neurons-social-memory-0929) + +What is the meaning of life? +To find out click [here](meaning-of-life/meaning-of-life.md). + +What is that shiny in the window? Come in and take a +[look](Computer-Man/Computer-Man.md) From d7904ce5736aca73ebb9533df506e8ea6d315792 Mon Sep 17 00:00:00 2001 From: manas94gupta Date: Tue, 18 Oct 2016 15:02:46 +0530 Subject: [PATCH 4504/5486] Update marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5dfae125d8..4d8a59eb0f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1145,3 +1145,5 @@ To find out click [here](meaning-of-life/meaning-of-life.md). What is that shiny in the window? Come in and take a [look](Computer-Man/Computer-Man.md) + +Wanna trip yourself? Hue has a place you would like to [enter](Trip-Yourself-Hue/trippy.md) From f1176312e0784a86a3dc495f66b109b3d27e25ee Mon Sep 17 00:00:00 2001 From: manas94gupta Date: Tue, 18 Oct 2016 15:08:42 +0530 Subject: [PATCH 4505/5486] Update trippy.md --- english/Trip-Yourself-Hue/trippy.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/english/Trip-Yourself-Hue/trippy.md b/english/Trip-Yourself-Hue/trippy.md index 446754a223..8024b22dd9 100644 --- a/english/Trip-Yourself-Hue/trippy.md +++ b/english/Trip-Yourself-Hue/trippy.md @@ -1,5 +1,5 @@ -Choose your poison, get your brains all mooshed up - ---> [Pony](https://www.youtube.com/watch?v=X0gyqsPdWFE) ---> [Horse](https://www.youtube.com/watch?v=QCGcCC065CY) ---> [Cake](https://vimeo.com/128877443) +Choose your poison, get your brains all mooshed up +---> [Pony](https://www.youtube.com/watch?v=X0gyqsPdWFE) +--> [Horse](https://www.youtube.com/watch?v=QCGcCC065CY) +--> [Cake](https://vimeo.com/128877443) --> [MaryJane](https://www.youtube.com/watch?v=JIpv81BH8Wo) From 1e80b78c4b7555dc60eef522668d642c94462e30 Mon Sep 17 00:00:00 2001 From: manas94gupta Date: Tue, 18 Oct 2016 15:12:27 +0530 Subject: [PATCH 4506/5486] Update trippy.md --- english/Trip-Yourself-Hue/trippy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/Trip-Yourself-Hue/trippy.md b/english/Trip-Yourself-Hue/trippy.md index 8024b22dd9..f2dab9a4a1 100644 --- a/english/Trip-Yourself-Hue/trippy.md +++ b/english/Trip-Yourself-Hue/trippy.md @@ -1,5 +1,5 @@ -Choose your poison, get your brains all mooshed up ----> [Pony](https://www.youtube.com/watch?v=X0gyqsPdWFE) +Choose your poison, get your brains all mooshed up +--> [Pony](https://www.youtube.com/watch?v=X0gyqsPdWFE) --> [Horse](https://www.youtube.com/watch?v=QCGcCC065CY) --> [Cake](https://vimeo.com/128877443) --> [MaryJane](https://www.youtube.com/watch?v=JIpv81BH8Wo) From 1c26a4a702110d06cc6b14bf0dfe45436d0b3be8 Mon Sep 17 00:00:00 2001 From: manas94gupta Date: Tue, 18 Oct 2016 15:13:45 +0530 Subject: [PATCH 4507/5486] Update trippy.md and added line breaks --- english/Trip-Yourself-Hue/trippy.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/english/Trip-Yourself-Hue/trippy.md b/english/Trip-Yourself-Hue/trippy.md index f2dab9a4a1..ea0de8c575 100644 --- a/english/Trip-Yourself-Hue/trippy.md +++ b/english/Trip-Yourself-Hue/trippy.md @@ -1,5 +1,8 @@ Choose your poison, get your brains all mooshed up --> [Pony](https://www.youtube.com/watch?v=X0gyqsPdWFE) + --> [Horse](https://www.youtube.com/watch?v=QCGcCC065CY) ---> [Cake](https://vimeo.com/128877443) ---> [MaryJane](https://www.youtube.com/watch?v=JIpv81BH8Wo) + +--> [Cake](https://vimeo.com/128877443) + +--> [MaryJane](https://www.youtube.com/watch?v=JIpv81BH8Wo) From d80812c4087c5c1e0e2d6479c510383bef67932a Mon Sep 17 00:00:00 2001 From: manas94gupta Date: Tue, 18 Oct 2016 15:14:02 +0530 Subject: [PATCH 4508/5486] Update trippy.md --- english/Trip-Yourself-Hue/trippy.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/Trip-Yourself-Hue/trippy.md b/english/Trip-Yourself-Hue/trippy.md index ea0de8c575..8a499cc84e 100644 --- a/english/Trip-Yourself-Hue/trippy.md +++ b/english/Trip-Yourself-Hue/trippy.md @@ -1,4 +1,5 @@ Choose your poison, get your brains all mooshed up + --> [Pony](https://www.youtube.com/watch?v=X0gyqsPdWFE) --> [Horse](https://www.youtube.com/watch?v=QCGcCC065CY) From a2b724e1a0fe7ce90c544a0ebfebc5748a2097f4 Mon Sep 17 00:00:00 2001 From: Moshe Sh <7moshe7@gmail.com> Date: Tue, 18 Oct 2016 19:47:49 +0300 Subject: [PATCH 4509/5486] Add time machine travel adventure --- english/marshmallow.md | 2 ++ english/time-machine/time-machine.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 english/time-machine/time-machine.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 5dfae125d8..f82a9a830f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -25,6 +25,8 @@ Oh so many decisions - what will you do?? You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! +[Build time machine](time-machine/time-machine.md) + Take some [time](meditation/meditation.md) off! Life is full of twists and turns like but try to cheer yourself and people around you. [Click Here](Happy/happie.md) diff --git a/english/time-machine/time-machine.md b/english/time-machine/time-machine.md new file mode 100644 index 0000000000..8c26229c95 --- /dev/null +++ b/english/time-machine/time-machine.md @@ -0,0 +1,4 @@ +I have already built the time machine, the machine is designed to use one-time and then it disappears. +There is no way back to the current time. + +Which part of the world, and what time you want to travel? And why? From 76eee26662023028528eebc98b20f2c1e2a53b5f Mon Sep 17 00:00:00 2001 From: Tommy Strauser Date: Tue, 18 Oct 2016 19:44:31 -0500 Subject: [PATCH 4510/5486] Add a new option to the zoo stage to get better at English --- english/get-better-at-english/english.md | 1 + english/zoo/zoo.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/get-better-at-english/english.md diff --git a/english/get-better-at-english/english.md b/english/get-better-at-english/english.md new file mode 100644 index 0000000000..008fc4bc8d --- /dev/null +++ b/english/get-better-at-english/english.md @@ -0,0 +1 @@ +You find a whole series of English books at the zoo and spend all afternoon reading them! \ No newline at end of file diff --git a/english/zoo/zoo.md b/english/zoo/zoo.md index 51909649cc..c984079beb 100644 --- a/english/zoo/zoo.md +++ b/english/zoo/zoo.md @@ -2,4 +2,6 @@ Recently I visited a zoo in my hometown. It was an awesome experience to be part nature. I saw a lot of tigers, elephants, deer and a whole lot of other [animals](../animal/animal.md) I was pretty thirsty. There is a lemonade stand over there. -I head over and buy some [lemonade](../drink/lemonade/lemonade.md) \ No newline at end of file +I head over and buy some [lemonade](../drink/lemonade/lemonade.md) + +I choose to get better at [English](../get-better-at-english/english.md) \ No newline at end of file From 2c6da024e3a55a3c6a67279ca0a3f690db4ed67a Mon Sep 17 00:00:00 2001 From: Rushabh Gandhi Date: Wed, 19 Oct 2016 00:10:57 -0700 Subject: [PATCH 4511/5486] Add slapa-da-bass option --- english/marshmallow.md | 2 ++ english/slapa-da-bass/slapa-da-bass.md | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 english/slapa-da-bass/slapa-da-bass.md diff --git a/english/marshmallow.md b/english/marshmallow.md index d22e0320f2..a313ffc96a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1149,3 +1149,5 @@ What is that shiny in the window? Come in and take a [look](Computer-Man/Computer-Man.md) Wanna trip yourself? Hue has a place you would like to [enter](Trip-Yourself-Hue/trippy.md) + +You decide to [slapa-da-bass](slapa-da-bass/slapa-da-bass.md) diff --git a/english/slapa-da-bass/slapa-da-bass.md b/english/slapa-da-bass/slapa-da-bass.md new file mode 100644 index 0000000000..8ed909d368 --- /dev/null +++ b/english/slapa-da-bass/slapa-da-bass.md @@ -0,0 +1,7 @@ +You start witch a funky [canned heat by Jamiroquai](https://www.youtube.com/watch?v=Z7lSfg6QR78). +The audience loves it. You play some more groovy numbers and end with the classic +[Aeroplane by Red Hot Chili Peppers](https://www.youtube.com/watch?v=tpFk2RTxoE8). + +Just as you are finishing the solo, you snap the G string which hits you in the eye +and you feel pain and hear the audience laughing at you. To your relief, it is a +dream and you [realize this is a dream.](../is-this-a-dream/is-this-a-dream.md) \ No newline at end of file From d5f5d65ad4fa39bb68024705275f9ab7dd46f924 Mon Sep 17 00:00:00 2001 From: Adie Date: Wed, 19 Oct 2016 13:56:19 +0000 Subject: [PATCH 4512/5486] feat: Add link to Back to Work podcast --- english/gtd/gtd.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/gtd/gtd.md b/english/gtd/gtd.md index 6629122017..5caa8260f3 100644 --- a/english/gtd/gtd.md +++ b/english/gtd/gtd.md @@ -13,3 +13,5 @@ Come back to the marshmallow file and choose the Cheers! Click [here](http://www.google.com) to visit Google. + +Or follow the teachings of [Back to Work](5by5.tv/b2w/) \ No newline at end of file From 0baece87d87b53bfe408f678e8e5a1244b979c3d Mon Sep 17 00:00:00 2001 From: Adie Date: Wed, 19 Oct 2016 14:03:05 +0000 Subject: [PATCH 4513/5486] fix: URL updated --- english/gtd/gtd.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/gtd/gtd.md b/english/gtd/gtd.md index 5caa8260f3..1b0d3c7edc 100644 --- a/english/gtd/gtd.md +++ b/english/gtd/gtd.md @@ -14,4 +14,4 @@ Cheers! Click [here](http://www.google.com) to visit Google. -Or follow the teachings of [Back to Work](5by5.tv/b2w/) \ No newline at end of file +Or follow the teachings of [Back to Work](http://5by5.tv/b2w/) \ No newline at end of file From ed7bdbb79e2156fc3546767d96e280f5fcc99165 Mon Sep 17 00:00:00 2001 From: Dan Gold Date: Wed, 19 Oct 2016 11:30:33 -0400 Subject: [PATCH 4514/5486] add C# option --- language.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/language.md b/language.md index 9c9eea272d..263bc5dec0 100644 --- a/language.md +++ b/language.md @@ -157,3 +157,6 @@ If you speak oriya, click [here](oriya/oriya.md). If you understand Tamil, திருநாவுக்கரசர் அருளிய தேவாரம் [இங்கே அழுத்தவும்](Tamil/Thevaram/thevarm.md) if you understand maithli, click [here...](maithli/maithli.md) + +if (you.understand("C#")) here.click(); + From 1b6638ee2bca8b18830f7a907b0348b1c51f967a Mon Sep 17 00:00:00 2001 From: tamirfind Date: Wed, 19 Oct 2016 18:51:04 +0300 Subject: [PATCH 4515/5486] update story --- english/painting/Another_World/another_world.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/painting/Another_World/another_world.md diff --git a/english/painting/Another_World/another_world.md b/english/painting/Another_World/another_world.md new file mode 100644 index 0000000000..8e8708f6f3 --- /dev/null +++ b/english/painting/Another_World/another_world.md @@ -0,0 +1,3 @@ +You wake up and notice you're a totally different place from where you were before. +You're outside, it's a nice sunny day with a few clouds. +You get back on your feet when you suddenly hear a scream. \ No newline at end of file From e9582a01b6be502dacc11ddec77f18c0769bfb1b Mon Sep 17 00:00:00 2001 From: tamirfind Date: Wed, 19 Oct 2016 18:55:53 +0300 Subject: [PATCH 4516/5486] continue the story --- english/painting/painting.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/painting/painting.md b/english/painting/painting.md index 5a779ef5dc..873eb9d35c 100644 --- a/english/painting/painting.md +++ b/english/painting/painting.md @@ -2,3 +2,5 @@ Casting your gaze down the hallway, one painting catches your interest. You walk up to the large painting, so big you could almost jump into it. It is of three strange looking black orbs with eyes, feet, and a strange hats. They are all marching single file in line on a nice sunny day with a few clouds in the background. + +[You start on running and jump into the painting](Another_World/another_world.md) \ No newline at end of file From 17c161f578a6ab47cb15e308722d7aa2340e94a1 Mon Sep 17 00:00:00 2001 From: Dan Gold Date: Wed, 19 Oct 2016 19:34:15 -0400 Subject: [PATCH 4517/5486] add paint-by-numbers picture --- english/painting/painting.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/painting/painting.md b/english/painting/painting.md index 5a779ef5dc..876819aa1f 100644 --- a/english/painting/painting.md +++ b/english/painting/painting.md @@ -2,3 +2,5 @@ Casting your gaze down the hallway, one painting catches your interest. You walk up to the large painting, so big you could almost jump into it. It is of three strange looking black orbs with eyes, feet, and a strange hats. They are all marching single file in line on a nice sunny day with a few clouds in the background. + +There is also a paint-by-numbers picture of a clown, but never mind that. From d02d02a5b71088f7f1ed7428219539fe06c1ab71 Mon Sep 17 00:00:00 2001 From: Ryan Boyer Date: Thu, 20 Oct 2016 10:13:00 -0400 Subject: [PATCH 4518/5486] Add horky option to Gibberish (no link) --- Gibberish/HorkPorkDork/horky.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Gibberish/HorkPorkDork/horky.md diff --git a/Gibberish/HorkPorkDork/horky.md b/Gibberish/HorkPorkDork/horky.md new file mode 100644 index 0000000000..a10c23d01a --- /dev/null +++ b/Gibberish/HorkPorkDork/horky.md @@ -0,0 +1,2 @@ +Horky Porky Dorky Senor Morky Dorky Porky McJorky Forty porty. +Gesundtite. \ No newline at end of file From b076eb3f6408158e14b3a56bfe14088d40fffb7d Mon Sep 17 00:00:00 2001 From: Ryan Boyer Date: Thu, 20 Oct 2016 10:15:36 -0400 Subject: [PATCH 4519/5486] Add Bobah to Gibberish --- Gibberish/BooBahTahTah/BoBah.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Gibberish/BooBahTahTah/BoBah.md diff --git a/Gibberish/BooBahTahTah/BoBah.md b/Gibberish/BooBahTahTah/BoBah.md new file mode 100644 index 0000000000..caf2bf163f --- /dev/null +++ b/Gibberish/BooBahTahTah/BoBah.md @@ -0,0 +1,4 @@ +Bo Bah Bah Bah boo. Boop Doop do wap pa dap. De De De da do. +From da la fram, cram de la cram. Hip hop de pop. +Trip tra da la tralalala, "enter if you dare". No la +compra a la buscara en la entuentra con el avión. \ No newline at end of file From 705d4bb147b2ff62380dbc82b48911901a09d816 Mon Sep 17 00:00:00 2001 From: Ryan Boyer Date: Thu, 20 Oct 2016 10:17:35 -0400 Subject: [PATCH 4520/5486] Add Nini to Gibberish --- Gibberish/NiNi-sigh/NiNi.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Gibberish/NiNi-sigh/NiNi.md diff --git a/Gibberish/NiNi-sigh/NiNi.md b/Gibberish/NiNi-sigh/NiNi.md new file mode 100644 index 0000000000..4305c422de --- /dev/null +++ b/Gibberish/NiNi-sigh/NiNi.md @@ -0,0 +1,5 @@ +Nininah. Nininahnah. asdfjkl; asdfjkl; +Nininah. Ninininahnah. asdfjkl; asdfjkl; +Nininah. Nininininahnah. asdfjkl; asdfjkl; +This is what happens at graduate school. +Nininininininah. \ No newline at end of file From 8506fa14d94c75a923c817c2a229f84aab4a1aab Mon Sep 17 00:00:00 2001 From: Ryan Boyer Date: Thu, 20 Oct 2016 10:27:32 -0400 Subject: [PATCH 4521/5486] Update Gibberish with Horky, BooBah, and NiNi --- Gibberish/Gibberish.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Gibberish/Gibberish.md b/Gibberish/Gibberish.md index 4d5124fb2b..28945076b5 100644 --- a/Gibberish/Gibberish.md +++ b/Gibberish/Gibberish.md @@ -13,3 +13,7 @@ alksdjfö jibber jobber joober, gibberish is for goobers. kdnavna knakdn knakdn ind faondf alkd fadk blkajd asdglkjdsFH A SGLKAHSJD S sdflhjgaj dat goober. + +¿Cookies con la frrrechtara city poor [food](Gibberish/HorkPorkDork/horky.md)? +Von tran the BARACHARAS dentro [flipflopfloooopers](Gibberish/BooBahTahTah/BoBah.md)? +Integral(5x^3 - htan(x), dx) titila [MATHEMATICS](Gibberish/NiNi-sigh/NiNi.md)? From 1b9d47fe362f8fcd12eebbc5ef72cb8e03f483ad Mon Sep 17 00:00:00 2001 From: Ryan Boyer Date: Thu, 20 Oct 2016 10:29:18 -0400 Subject: [PATCH 4522/5486] Add blank lines between Gibberish options --- Gibberish/Gibberish.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gibberish/Gibberish.md b/Gibberish/Gibberish.md index 28945076b5..2b01e0a07a 100644 --- a/Gibberish/Gibberish.md +++ b/Gibberish/Gibberish.md @@ -15,5 +15,7 @@ kdnavna knakdn knakdn ind faondf alkd fadk blkajd asdglkjdsFH A SGLKAHSJD S sdflhjgaj dat goober. ¿Cookies con la frrrechtara city poor [food](Gibberish/HorkPorkDork/horky.md)? + Von tran the BARACHARAS dentro [flipflopfloooopers](Gibberish/BooBahTahTah/BoBah.md)? + Integral(5x^3 - htan(x), dx) titila [MATHEMATICS](Gibberish/NiNi-sigh/NiNi.md)? From b37b4d745f56b25337b7ee11abd1f72b6d85a059 Mon Sep 17 00:00:00 2001 From: Ryan Boyer Date: Thu, 20 Oct 2016 10:33:44 -0400 Subject: [PATCH 4523/5486] Fix relative paths in Gibberish.md options --- Gibberish/Gibberish.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gibberish/Gibberish.md b/Gibberish/Gibberish.md index 2b01e0a07a..5f878ff4b7 100644 --- a/Gibberish/Gibberish.md +++ b/Gibberish/Gibberish.md @@ -14,8 +14,8 @@ jibber jobber joober, gibberish is for goobers. kdnavna knakdn knakdn ind faondf alkd fadk blkajd asdglkjdsFH A SGLKAHSJD S sdflhjgaj dat goober. -¿Cookies con la frrrechtara city poor [food](Gibberish/HorkPorkDork/horky.md)? +¿Cookies con la frrrechtara city poor [food](/HorkPorkDork/horky.md)? -Von tran the BARACHARAS dentro [flipflopfloooopers](Gibberish/BooBahTahTah/BoBah.md)? +Von tran the BARACHARAS dentro [flipflopfloooopers](/BooBahTahTah/BoBah.md)? -Integral(5x^3 - htan(x), dx) titila [MATHEMATICS](Gibberish/NiNi-sigh/NiNi.md)? +Integral(5x^3 - htan(x), dx) titila [MATHEMATICS](/NiNi-sigh/NiNi.md)? From d3abf179c7982975008d9850d0b052374341bc06 Mon Sep 17 00:00:00 2001 From: Ryan Boyer Date: Thu, 20 Oct 2016 10:43:21 -0400 Subject: [PATCH 4524/5486] Fix relative links in Gibberish.md --- Gibberish/Gibberish.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gibberish/Gibberish.md b/Gibberish/Gibberish.md index 5f878ff4b7..8556dc58dc 100644 --- a/Gibberish/Gibberish.md +++ b/Gibberish/Gibberish.md @@ -14,8 +14,8 @@ jibber jobber joober, gibberish is for goobers. kdnavna knakdn knakdn ind faondf alkd fadk blkajd asdglkjdsFH A SGLKAHSJD S sdflhjgaj dat goober. -¿Cookies con la frrrechtara city poor [food](/HorkPorkDork/horky.md)? +¿Cookies con la frrrechtara city poor [food](HorkPorkDork/horky.md)? -Von tran the BARACHARAS dentro [flipflopfloooopers](/BooBahTahTah/BoBah.md)? +Von tran the BARACHARAS dentro [flipflopfloooopers](BooBahTahTah/BoBah.md)? -Integral(5x^3 - htan(x), dx) titila [MATHEMATICS](/NiNi-sigh/NiNi.md)? +Integral(5x^3 - htan(x), dx) titila [MATHEMATICS](NiNi-sigh/NiNi.md)? From a78601f92fabf5f37ebb65b150a6114130e4790f Mon Sep 17 00:00:00 2001 From: Thiago Lima Date: Thu, 20 Oct 2016 14:32:55 -0300 Subject: [PATCH 4525/5486] Add mushrooms story --- portugues/cogumelos/cogumelos.md | 1 + portugues/colaborando.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 portugues/cogumelos/cogumelos.md diff --git a/portugues/cogumelos/cogumelos.md b/portugues/cogumelos/cogumelos.md new file mode 100644 index 0000000000..1f8056937c --- /dev/null +++ b/portugues/cogumelos/cogumelos.md @@ -0,0 +1 @@ +Você tem uma onda muito louca e andando pela terra do nunca e lutando com o capital gancho você tem a idéia para consertar o erro do bug. \ No newline at end of file diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 067df2453b..ea0e2de168 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -9,6 +9,8 @@ Você: [Caguei, vou ver um video no xvideos](xvideos/xvideos.md) +[Encontra uns cogumelos na geladeira e decide consumi-los](cogumelos/cogumelos.md) + [Procura o repositório do aplicativo?](colabora/colaborar.md) [Começa a pensar como solucionar o bug e resolve olhar no codigo fonte](pesquisa/codFonte.md) From 36e0d94d7c9b917cba22aeac1abf68ceaa1ad5a4 Mon Sep 17 00:00:00 2001 From: Thiago Lima Date: Thu, 20 Oct 2016 14:47:03 -0300 Subject: [PATCH 4526/5486] decrease lenght of line --- portugues/cogumelos/cogumelos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/cogumelos/cogumelos.md b/portugues/cogumelos/cogumelos.md index 1f8056937c..d9b025fc7b 100644 --- a/portugues/cogumelos/cogumelos.md +++ b/portugues/cogumelos/cogumelos.md @@ -1 +1 @@ -Você tem uma onda muito louca e andando pela terra do nunca e lutando com o capital gancho você tem a idéia para consertar o erro do bug. \ No newline at end of file +Você tem uma onda muito louca e lutando com o capital gancho na terra do nunca e você tem a idéia para consertar o bug. \ No newline at end of file From 278d4b897f4ca6c0765bcb528514aa3bc6452a9c Mon Sep 17 00:00:00 2001 From: Graham Thompson Date: Thu, 20 Oct 2016 13:42:51 -0700 Subject: [PATCH 4527/5486] adds an option for existential dread after pondering --- english/existential-dread/existential-dread.md | 5 +++++ english/ponder/ponder-about-life.md | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/existential-dread/existential-dread.md diff --git a/english/existential-dread/existential-dread.md b/english/existential-dread/existential-dread.md new file mode 100644 index 0000000000..275a593d09 --- /dev/null +++ b/english/existential-dread/existential-dread.md @@ -0,0 +1,5 @@ +You are overcome with existential dread. Who are you? What are these marshmallows doing here? +Should you take one now or will you get more later if you wait? What does that say about you +if you do? Overwhelmed by the possible implications of your actions and unable to confront +the fundamental questions they raise about the nature of self you curl into a ball and +stare at your belly button. diff --git a/english/ponder/ponder-about-life.md b/english/ponder/ponder-about-life.md index 9a9b325422..2539046e81 100644 --- a/english/ponder/ponder-about-life.md +++ b/english/ponder/ponder-about-life.md @@ -11,4 +11,6 @@ Do you: [Ponder some more](ponder-some-more/ponder-some-more.md) -[Bake a cake?](../dance/bake-a-cake/bake-a-cake.md) \ No newline at end of file +[Give in to existential dread?](../existential-dread/existential-dread.md) + +[Bake a cake?](../dance/bake-a-cake/bake-a-cake.md) From 1ae7463b242ede8a323d611e2d51e8ec4b418633 Mon Sep 17 00:00:00 2001 From: Graham Thompson Date: Thu, 20 Oct 2016 13:51:20 -0700 Subject: [PATCH 4528/5486] fixes error where cake choice was moved --- english/ponder/ponder-about-life.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/ponder/ponder-about-life.md b/english/ponder/ponder-about-life.md index 2539046e81..4f6d0cf13e 100644 --- a/english/ponder/ponder-about-life.md +++ b/english/ponder/ponder-about-life.md @@ -11,6 +11,6 @@ Do you: [Ponder some more](ponder-some-more/ponder-some-more.md) -[Give in to existential dread?](../existential-dread/existential-dread.md) - [Bake a cake?](../dance/bake-a-cake/bake-a-cake.md) + +[Give in to existential dread?](../existential-dread/existential-dread.md) From 80e0e1d7e1cbc7c4078d4aba004ce5878b026358 Mon Sep 17 00:00:00 2001 From: samanthablasbalg Date: Fri, 21 Oct 2016 13:53:57 -0400 Subject: [PATCH 4529/5486] Add some lines about whether the reader should pick up the device or run away --- english/lightsaber/wampa/wampa.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/lightsaber/wampa/wampa.md b/english/lightsaber/wampa/wampa.md index be764f8e7c..923bfe279a 100644 --- a/english/lightsaber/wampa/wampa.md +++ b/english/lightsaber/wampa/wampa.md @@ -11,3 +11,6 @@ You stumble over a small metalic box in the stubby grass. Upon closer inspectio the roar is actually coming from this box. It has some kind of proximity sensor that triggers it. Now why would someone have left this lying here? +You puzzle over this for a few moments, debating whether to pick up the +device or not. There could be dire consequences either way. Pick it up +or run away? Such a difficult decision! \ No newline at end of file From fe8c27b275e3ad2d9669b17608a7cae7382f609e Mon Sep 17 00:00:00 2001 From: Mmachi Obiorah Date: Fri, 21 Oct 2016 14:44:14 -0500 Subject: [PATCH 4530/5486] add play option to chocolateOrSleep.md --- english/chocolateOrSleep/chocolateOrSleep.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/chocolateOrSleep/chocolateOrSleep.md b/english/chocolateOrSleep/chocolateOrSleep.md index 416a3382fd..9c0f076d2e 100644 --- a/english/chocolateOrSleep/chocolateOrSleep.md +++ b/english/chocolateOrSleep/chocolateOrSleep.md @@ -2,3 +2,5 @@ Would you like some more [chocolate](../search_for_chocolate/search_for_chocolat would you like to [sing](../sing/sing.md)? + +would you like to [play](../play-music.md)? From 8796a9967c6e8db151fe06e79ffa5029d2112802 Mon Sep 17 00:00:00 2001 From: Mmachi Obiorah Date: Fri, 21 Oct 2016 14:47:01 -0500 Subject: [PATCH 4531/5486] correct path to play in ChocolateOrSleep.md --- english/chocolateOrSleep/chocolateOrSleep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/chocolateOrSleep/chocolateOrSleep.md b/english/chocolateOrSleep/chocolateOrSleep.md index 9c0f076d2e..929729cb09 100644 --- a/english/chocolateOrSleep/chocolateOrSleep.md +++ b/english/chocolateOrSleep/chocolateOrSleep.md @@ -3,4 +3,4 @@ Would you like some more [chocolate](../search_for_chocolate/search_for_chocolat would you like to [sing](../sing/sing.md)? -would you like to [play](../play-music.md)? +would you like to [play](../play-music/playmusic.md)? From d88a5f792ad81b3c11b05d567d9e1648932ca98d Mon Sep 17 00:00:00 2001 From: Mmachi Obiorah Date: Fri, 21 Oct 2016 15:07:28 -0500 Subject: [PATCH 4532/5486] add option drive the cat ... to ChocolateOrSleep.md --- english/chocolateOrSleep/chocolateOrSleep.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/chocolateOrSleep/chocolateOrSleep.md b/english/chocolateOrSleep/chocolateOrSleep.md index 929729cb09..64fe0638cf 100644 --- a/english/chocolateOrSleep/chocolateOrSleep.md +++ b/english/chocolateOrSleep/chocolateOrSleep.md @@ -4,3 +4,5 @@ Would you like some more [chocolate](../search_for_chocolate/search_for_chocolat would you like to [sing](../sing/sing.md)? would you like to [play](../play-music/playmusic.md)? + +Or maybe you'd like to [drive the cat to your sisters house](../dop-person/dog.md)? From f88c8d90561a88b98043af467cb1140f24b85032 Mon Sep 17 00:00:00 2001 From: Thomas Manos Bajis Date: Fri, 21 Oct 2016 16:10:18 -0400 Subject: [PATCH 4533/5486] Added a story about the great Spiderman --- english/TheSpider/Spiderman.md | 11 +++++++++++ english/TheSpider/do-homework/study.md | 7 +++++++ english/TheSpider/save-world/victory.md | 5 +++++ 3 files changed, 23 insertions(+) create mode 100644 english/TheSpider/Spiderman.md create mode 100644 english/TheSpider/do-homework/study.md create mode 100644 english/TheSpider/save-world/victory.md diff --git a/english/TheSpider/Spiderman.md b/english/TheSpider/Spiderman.md new file mode 100644 index 0000000000..7572b67f25 --- /dev/null +++ b/english/TheSpider/Spiderman.md @@ -0,0 +1,11 @@ +You were scared, unable to move as your skin starts to burn! + +The spider bit you. + +That night you lay restless, trying to sleep. + +You wake up the next day; strong and fast, what do you do? + +[Save the world](save-world/victory.md) + +[Do your homework](do-homework/study.md) \ No newline at end of file diff --git a/english/TheSpider/do-homework/study.md b/english/TheSpider/do-homework/study.md new file mode 100644 index 0000000000..ccb8c44e4c --- /dev/null +++ b/english/TheSpider/do-homework/study.md @@ -0,0 +1,7 @@ +WHAT ARE YOU DOING? + +THERE IS CRIME EVERYWHERE + +PUT DOWN THAT BOOK AND TRY AGAIN + +[Try again](Spiderman.md) \ No newline at end of file diff --git a/english/TheSpider/save-world/victory.md b/english/TheSpider/save-world/victory.md new file mode 100644 index 0000000000..1c6a8dc42d --- /dev/null +++ b/english/TheSpider/save-world/victory.md @@ -0,0 +1,5 @@ +YOU'VE SAVED THE WORLD. + +WITH GREAT POWER COMES GREAT RESPONSIBILITY + +Excellent job. Pat yourself on the back. You're done. \ No newline at end of file From d8f095add0aa4e7980785bf8a320738df759f4c4 Mon Sep 17 00:00:00 2001 From: Mmachi Obiorah Date: Fri, 21 Oct 2016 15:11:20 -0500 Subject: [PATCH 4534/5486] resolve broken drive cat to sisters house in chocolateOrSleep.md --- english/chocolateOrSleep/chocolateOrSleep.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/chocolateOrSleep/chocolateOrSleep.md b/english/chocolateOrSleep/chocolateOrSleep.md index 64fe0638cf..bae7abbf28 100644 --- a/english/chocolateOrSleep/chocolateOrSleep.md +++ b/english/chocolateOrSleep/chocolateOrSleep.md @@ -5,4 +5,4 @@ would you like to [sing](../sing/sing.md)? would you like to [play](../play-music/playmusic.md)? -Or maybe you'd like to [drive the cat to your sisters house](../dop-person/dog.md)? +Or maybe you'd like to [drive the cat to your sisters house](../dog-person/dog.md)? From e34e6876de2c786e197dff2ff6457078390d9300 Mon Sep 17 00:00:00 2001 From: Thomas Manos Bajis Date: Fri, 21 Oct 2016 16:38:29 -0400 Subject: [PATCH 4535/5486] Fixed broken link --- english/TheSpider/do-homework/study.md | 1 - 1 file changed, 1 deletion(-) diff --git a/english/TheSpider/do-homework/study.md b/english/TheSpider/do-homework/study.md index ccb8c44e4c..7d04c0e0f2 100644 --- a/english/TheSpider/do-homework/study.md +++ b/english/TheSpider/do-homework/study.md @@ -4,4 +4,3 @@ THERE IS CRIME EVERYWHERE PUT DOWN THAT BOOK AND TRY AGAIN -[Try again](Spiderman.md) \ No newline at end of file From 0f15878abe76c0b47d7be5ecbb57f539281a642d Mon Sep 17 00:00:00 2001 From: Thomas Manos Bajis Date: Fri, 21 Oct 2016 16:42:28 -0400 Subject: [PATCH 4536/5486] Placed a link to Spiderman story --- english/ironman/jarvis/jarvis.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/ironman/jarvis/jarvis.md b/english/ironman/jarvis/jarvis.md index b54d942843..11dce931e2 100644 --- a/english/ironman/jarvis/jarvis.md +++ b/english/ironman/jarvis/jarvis.md @@ -1,4 +1,6 @@ Just A Rather Very Intelligent System, or J.A.R.V.I.S. It is Tony Stark's artificially intelligent computer. It is programmed to speak with a male voice in a British accent. -J.A.R.V.I.S. is now merged with Vision [Source](http://marvel-movies.wikia.com/wiki/J.A.R.V.I.S.). \ No newline at end of file +J.A.R.V.I.S. is now merged with Vision [Source](http://marvel-movies.wikia.com/wiki/J.A.R.V.I.S.). + +Now, checkout the story of Spiderman! [Spiderman](Spiderman.md) From 937ea18f1961a3c8a71c20b980bbfc0e4fd3d074 Mon Sep 17 00:00:00 2001 From: Thomas Manos Bajis Date: Fri, 21 Oct 2016 16:44:47 -0400 Subject: [PATCH 4537/5486] tried placing link on seperate line --- english/ironman/jarvis/jarvis.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/ironman/jarvis/jarvis.md b/english/ironman/jarvis/jarvis.md index 11dce931e2..07e37e978f 100644 --- a/english/ironman/jarvis/jarvis.md +++ b/english/ironman/jarvis/jarvis.md @@ -3,4 +3,6 @@ It is Tony Stark's artificially intelligent computer. It is programmed to speak with a male voice in a British accent. J.A.R.V.I.S. is now merged with Vision [Source](http://marvel-movies.wikia.com/wiki/J.A.R.V.I.S.). -Now, checkout the story of Spiderman! [Spiderman](Spiderman.md) +Now, checkout the story of Spiderman. + +[Spiderman](Spiderman.md) From 094fd60413703ba89ce202a8460fc93911d05e7a Mon Sep 17 00:00:00 2001 From: Thomas Manos Bajis Date: Fri, 21 Oct 2016 16:54:43 -0400 Subject: [PATCH 4538/5486] fixed the link by adding the entire directory --- english/ironman/jarvis/jarvis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/ironman/jarvis/jarvis.md b/english/ironman/jarvis/jarvis.md index 07e37e978f..e53f255892 100644 --- a/english/ironman/jarvis/jarvis.md +++ b/english/ironman/jarvis/jarvis.md @@ -5,4 +5,4 @@ J.A.R.V.I.S. is now merged with Vision [Source](http://marvel-movies.wikia.com/w Now, checkout the story of Spiderman. -[Spiderman](Spiderman.md) +[Spiderman](TheSpider/Spiderman.md) From e803988ea55d4a8adffa54112caea1686165f392 Mon Sep 17 00:00:00 2001 From: Thomas Manos Bajis Date: Fri, 21 Oct 2016 16:59:00 -0400 Subject: [PATCH 4539/5486] added even more detailed directory to link --- english/ironman/jarvis/jarvis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/ironman/jarvis/jarvis.md b/english/ironman/jarvis/jarvis.md index e53f255892..f54a441a62 100644 --- a/english/ironman/jarvis/jarvis.md +++ b/english/ironman/jarvis/jarvis.md @@ -5,4 +5,4 @@ J.A.R.V.I.S. is now merged with Vision [Source](http://marvel-movies.wikia.com/w Now, checkout the story of Spiderman. -[Spiderman](TheSpider/Spiderman.md) +[Spiderman](english/TheSpider/Spiderman.md) From 99c8a29e1251b553fb9d66f01566f2256d3ba858 Mon Sep 17 00:00:00 2001 From: Thomas Manos Bajis Date: Fri, 21 Oct 2016 17:09:11 -0400 Subject: [PATCH 4540/5486] replaced link in directory before jarvis --- english/ironman/ironman.md | 6 +++++- english/ironman/jarvis/jarvis.md | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/english/ironman/ironman.md b/english/ironman/ironman.md index 0fbb027290..abf1379583 100644 --- a/english/ironman/ironman.md +++ b/english/ironman/ironman.md @@ -3,4 +3,8 @@ Wrong Choice. A man of honour beats a genius billionaire playboy philanthropist. Let's watch the trailer of him fighting captain america [here](https://youtu.be/uVdV-lxRPFo). -However, [J.A.R.V.I.S.](jarvis/jarvis.md) is developing a secret plan. \ No newline at end of file +However, [J.A.R.V.I.S.](jarvis/jarvis.md) is developing a secret plan. + +Now, checkout the story of Spiderman. + +[Spiderman](../TheSpider/Spiderman.md) diff --git a/english/ironman/jarvis/jarvis.md b/english/ironman/jarvis/jarvis.md index f54a441a62..b0aa570a07 100644 --- a/english/ironman/jarvis/jarvis.md +++ b/english/ironman/jarvis/jarvis.md @@ -2,7 +2,3 @@ Just A Rather Very Intelligent System, or J.A.R.V.I.S. It is Tony Stark's artificially intelligent computer. It is programmed to speak with a male voice in a British accent. J.A.R.V.I.S. is now merged with Vision [Source](http://marvel-movies.wikia.com/wiki/J.A.R.V.I.S.). - -Now, checkout the story of Spiderman. - -[Spiderman](english/TheSpider/Spiderman.md) From 4e2e7510812a9cc7379ad5638377e9e792bc500a Mon Sep 17 00:00:00 2001 From: celiagomezdev Date: Sat, 22 Oct 2016 00:11:17 +0200 Subject: [PATCH 4541/5486] Create y option ponyrosa.md --- espanol/ponyrosa/ponyrosa.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 espanol/ponyrosa/ponyrosa.md diff --git a/espanol/ponyrosa/ponyrosa.md b/espanol/ponyrosa/ponyrosa.md new file mode 100644 index 0000000000..ea52c388c2 --- /dev/null +++ b/espanol/ponyrosa/ponyrosa.md @@ -0,0 +1,3 @@ +Ese pony rosa, que podía hablar, comunicó a los asistentes que el fin andaba cerca, y que todo sería culpa de Resines. +Los asistentes, atónitos, abuchearon enérgicamente al pony rosa. -"Nos has hecho un spoiler, ¡idiota!" gritaban, junto a otros improperios. +El pony rosa avanzó rápido tras los periodistas, desapareciendo de la escena para siempre. From 46726c2cbc5ada2bccbe4db0714ad9c8b8ba25be Mon Sep 17 00:00:00 2001 From: celiagomezdev Date: Sat, 22 Oct 2016 00:14:30 +0200 Subject: [PATCH 4542/5486] Update ponyrosa.md --- espanol/ponyrosa/ponyrosa.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/ponyrosa/ponyrosa.md b/espanol/ponyrosa/ponyrosa.md index ea52c388c2..6d75f5ac0f 100644 --- a/espanol/ponyrosa/ponyrosa.md +++ b/espanol/ponyrosa/ponyrosa.md @@ -1,3 +1,3 @@ -Ese pony rosa, que podía hablar, comunicó a los asistentes que el fin andaba cerca, y que todo sería culpa de Resines. +Ese pony rosa, que podía hablar, comunicó a los asistentes que el fin andaba cerca, y que todo sería culpa de "Xhsnxbhs" (nombre del actor). Los asistentes, atónitos, abuchearon enérgicamente al pony rosa. -"Nos has hecho un spoiler, ¡idiota!" gritaban, junto a otros improperios. El pony rosa avanzó rápido tras los periodistas, desapareciendo de la escena para siempre. From 53b3e93070fbe6e7ab5cf9d4aa1576501b65b63b Mon Sep 17 00:00:00 2001 From: celiagomezdev Date: Sat, 22 Oct 2016 00:15:09 +0200 Subject: [PATCH 4543/5486] 2 Update ponyrosa.md --- espanol/ponyrosa/ponyrosa.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/ponyrosa/ponyrosa.md b/espanol/ponyrosa/ponyrosa.md index 6d75f5ac0f..7e394a4f44 100644 --- a/espanol/ponyrosa/ponyrosa.md +++ b/espanol/ponyrosa/ponyrosa.md @@ -1,3 +1,3 @@ Ese pony rosa, que podía hablar, comunicó a los asistentes que el fin andaba cerca, y que todo sería culpa de "Xhsnxbhs" (nombre del actor). -Los asistentes, atónitos, abuchearon enérgicamente al pony rosa. -"Nos has hecho un spoiler, ¡idiota!" gritaban, junto a otros improperios. +Los asistentes, atónitos, abuchearon enérgicamente al pony rosa. -"Nos has hecho un spoiler, ¡tonto!" gritaban, junto a otros improperios. El pony rosa avanzó rápido tras los periodistas, desapareciendo de la escena para siempre. From b0c9b4e32060bc306209bab50898b2cc9feabf1e Mon Sep 17 00:00:00 2001 From: celiagomezdev Date: Sat, 22 Oct 2016 00:22:35 +0200 Subject: [PATCH 4544/5486] Update canudos.md with option pony-rosa --- espanol/canudos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 978d764260..43ca45f280 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -19,6 +19,8 @@ Hizo un gesto de [cansancio](cansancio/cansancio.md) [Llegó el periodista miope con noticias importantes.](noticias/noticias.md) +Pero pronto apareció un [pony rosa](ponyrosa/ponyrosa.md) acaparando todo el protagonismo. + [Suddenly realized he was far from home and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyArrives.md) @@ -177,4 +179,4 @@ Llego el [invierno](inverlandia/inverlandia.md). Gritó que se escribiría la más aburrida historia, basada en un mal comienzo. -Y [Resines](resines/resines.md) despertó de lo quer parecía un mal sueño. \ No newline at end of file +Y [Resines](resines/resines.md) despertó de lo quer parecía un mal sueño. From acee26bc0c1e2828c880e036b3e4050c1184cbcd Mon Sep 17 00:00:00 2001 From: celiagomezdev Date: Sat, 22 Oct 2016 00:23:22 +0200 Subject: [PATCH 4545/5486] Update again canudos.md with pony-rosa option --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 43ca45f280..0d111b1503 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -19,7 +19,7 @@ Hizo un gesto de [cansancio](cansancio/cansancio.md) [Llegó el periodista miope con noticias importantes.](noticias/noticias.md) -Pero pronto apareció un [pony rosa](ponyrosa/ponyrosa.md) acaparando todo el protagonismo. +Pero de repente apareció un [pony rosa](ponyrosa/ponyrosa.md) acaparando todo el protagonismo. [Suddenly realized he was far from home and doesn't know how to speak Spanish.](../english/TheEpicSax/111_TheEpicSaxGuyArrives.md) From 9e74fb71c4486b8af86187b61ea39b8538fab883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Celia=20G=C3=B3mez=20de=20Villaved=C3=B3n=20Pedrosa?= Date: Sat, 22 Oct 2016 00:44:54 +0200 Subject: [PATCH 4546/5486] Update ponyrosa option message --- espanol/ponyrosa/ponyrosa.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/espanol/ponyrosa/ponyrosa.md b/espanol/ponyrosa/ponyrosa.md index 7e394a4f44..984ee3b0e9 100644 --- a/espanol/ponyrosa/ponyrosa.md +++ b/espanol/ponyrosa/ponyrosa.md @@ -1,3 +1 @@ -Ese pony rosa, que podía hablar, comunicó a los asistentes que el fin andaba cerca, y que todo sería culpa de "Xhsnxbhs" (nombre del actor). -Los asistentes, atónitos, abuchearon enérgicamente al pony rosa. -"Nos has hecho un spoiler, ¡tonto!" gritaban, junto a otros improperios. -El pony rosa avanzó rápido tras los periodistas, desapareciendo de la escena para siempre. +Ese pony rosa, que podía hablar, comunicó a los asistentes que el fin andaba cerca. From ebd400a5e541c7ef8382b69796da53d4bd7010c9 Mon Sep 17 00:00:00 2001 From: luqiang21 Date: Fri, 21 Oct 2016 18:26:53 -0600 Subject: [PATCH 4547/5486] add content into Story.md --- Chinese/DesertHell/OldStory/Story.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Chinese/DesertHell/OldStory/Story.md b/Chinese/DesertHell/OldStory/Story.md index 74ae63bd1a..444c220304 100644 --- a/Chinese/DesertHell/OldStory/Story.md +++ b/Chinese/DesertHell/OldStory/Story.md @@ -8,3 +8,4 @@ [他讲的什么？](./Story.md) [突然](./Cat2Dog/变成狗了.md) +哈哈哈哈哈 \ No newline at end of file From a2e6a0ba4f95a28f59a1731eafc8d6ba932a4e08 Mon Sep 17 00:00:00 2001 From: quinndumala Date: Sat, 22 Oct 2016 11:54:16 +0800 Subject: [PATCH 4548/5486] Add a line of cebuano text --- Philippines/salamat.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index d540f154ee..abf9412636 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -15,3 +15,5 @@ Ngayon ay ating sundan ang mga kaganapan sa Pilipinas. Kamakailan ay nanalong Presidente si [Duterte] (duterte/duterte.md). O kung gusto mo namang kumain, tara [kain] (kain/kain.md) tayo ! + +Kinsay balo mag binisaya dinhi? From 8d4896159f747e330dd793047f1da8d71aae442b Mon Sep 17 00:00:00 2001 From: Yuwen Tan Date: Sat, 22 Oct 2016 16:35:27 -0500 Subject: [PATCH 4549/5486] Add new story about soccer by yt --- english/Soccer/soccer.md | 1 + english/marshmallow.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/Soccer/soccer.md diff --git a/english/Soccer/soccer.md b/english/Soccer/soccer.md new file mode 100644 index 0000000000..d826f675c4 --- /dev/null +++ b/english/Soccer/soccer.md @@ -0,0 +1 @@ +The very first question you should ask yourself is about the position you want to play. diff --git a/english/marshmallow.md b/english/marshmallow.md index a313ffc96a..f6ce767416 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1151,3 +1151,5 @@ What is that shiny in the window? Come in and take a Wanna trip yourself? Hue has a place you would like to [enter](Trip-Yourself-Hue/trippy.md) You decide to [slapa-da-bass](slapa-da-bass/slapa-da-bass.md) + +If you want to play soccer, click [here](Soccer/soccer.md) \ No newline at end of file From 9408c562cb99669349bf71a4361c7a9ff0b85a07 Mon Sep 17 00:00:00 2001 From: AMAN Date: Sun, 23 Oct 2016 11:34:59 +0530 Subject: [PATCH 4550/5486] Add link to Milkha Singh's wiki page --- punjabi/punjabi.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/punjabi/punjabi.md b/punjabi/punjabi.md index 217cd6b032..902bcd4789 100644 --- a/punjabi/punjabi.md +++ b/punjabi/punjabi.md @@ -2,4 +2,6 @@ Click [here](ajit/ajitnews.md) for punjabi news Click [here](pollywood/movies.md) for Punjabi movies -Click [here](movies/movies.md) for Punjabi movies \ No newline at end of file +Click [here](movies/movies.md) for Punjabi movies + +Click [here](https://en.wikipedia.org/wiki/Milkha_Singh) to know about Milkha Singh, "the flying sikh". \ No newline at end of file From 67a23df1d74018de454834573c4bca246008fcde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Figen=20G=C3=BCng=C3=B6r?= Date: Sun, 23 Oct 2016 15:06:32 +0300 Subject: [PATCH 4551/5486] Add new option and related option page --- .../metali-cek/cakmakla-ilerle/cakmakla-ilerle.md | 4 +++- .../hatmiye-yakalan/hatmiye-yakalan.md | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiye-yakalan/hatmiye-yakalan.md diff --git a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md index 4e78ebdf62..e155471701 100644 --- a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md +++ b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md @@ -1,3 +1,5 @@ Hızla karanlığa daldın ve çakmak alevinin zayıf ışığı rehberliğinde koşmaya başladın. -Hatmiçiçeği arkandan büyük bir hışımla geliyor ve aradaki fark gitgide kapanıyor. \ No newline at end of file +Hatmiçiçeği arkandan büyük bir hışımla geliyor ve aradaki fark gitgide kapanıyor. + +[Hatmi Çiçeğine Yakalan](hatmiye-yakalan/hatmiye-yakalan.md) diff --git a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiye-yakalan/hatmiye-yakalan.md b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiye-yakalan/hatmiye-yakalan.md new file mode 100644 index 0000000000..5bc04c77df --- /dev/null +++ b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiye-yakalan/hatmiye-yakalan.md @@ -0,0 +1,11 @@ +Hatmi çiçeği seni yakalar. + +Köküyle bacaklarından seni sarmalamaya başlar. + +Bir yandan da çiçekleri ağzına girer. + +Sarmalama yukarı doğru devam ederken elindeki zippo çakmak düşmeye başlar. + +Aynı anda hatmi çiçeğini yediğinden mide bağırsaklarındaki sıkışmış gaz ortaya çıkar. + +Bu olay tam da zippo çakmak popo hizana denk geldiğinde vuku bulduğundan büyük bir patlama meydana gelir. From 67b7a209f33ebd002bc19ad26d3072c0aac7a5ea Mon Sep 17 00:00:00 2001 From: The Fig Date: Mon, 24 Oct 2016 01:06:07 +0300 Subject: [PATCH 4552/5486] Add "hatmiyle-yuzles" option and its page --- .../metali-cek/cakmakla-ilerle/cakmakla-ilerle.md | 2 ++ .../cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md diff --git a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md index e155471701..f21527a90e 100644 --- a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md +++ b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md @@ -3,3 +3,5 @@ Hızla karanlığa daldın ve çakmak alevinin zayıf ışığı rehberliğinde Hatmiçiçeği arkandan büyük bir hışımla geliyor ve aradaki fark gitgide kapanıyor. [Hatmi Çiçeğine Yakalan](hatmiye-yakalan/hatmiye-yakalan.md) + +[Hatmi Çiçeği İle Yüzleş](hatmiyle-yuzles/hatmiyle-yuzles.md) diff --git a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md new file mode 100644 index 0000000000..db2674f4ce --- /dev/null +++ b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md @@ -0,0 +1,8 @@ +Hatmi çiçeğinden çılgınlar gibi kaçarken birden kafana bir şey dank eder. + +"Bir dakika ya, ben niye bu çiçekten kaçıyorum? Altı üstü bir çiçek. + Belki de suyunu fazla kaçırmıştır.Bir konuşalım bakalım, derdi neymiş?" + +Koşmayı bırakıp, arkanı dönersin. + +Hatmi çiçeği de durup seni inceler ve : From 4ee2a2e6381202a8b62f397d031dfed01b35defa Mon Sep 17 00:00:00 2001 From: Aleksandar Blazanovic Date: Sun, 23 Oct 2016 16:47:01 -0700 Subject: [PATCH 4553/5486] =?UTF-8?q?Dosetio=20se=20=C5=A1ta=20bi=20mu=20n?= =?UTF-8?q?ajlbolje=20prijalo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serbian/start.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/serbian/start.md b/serbian/start.md index efdc16369f..97a1fb6721 100644 --- a/serbian/start.md +++ b/serbian/start.md @@ -13,4 +13,6 @@ Mlada radnica ga je ljubazno gledala. Rekla je: "Da li ste mozda zainteresovani za neki dezert?" [klikni ovde](dezert/dezert.md) -"Možda bi Vam prijao niški burek sa eurokremom?" [klikni ovde](burekKrem/krem.md) \ No newline at end of file +"Možda bi Vam prijao niški burek sa eurokremom?" [klikni ovde](burekKrem/krem.md) + +Mislio se dugo šta bi mu najbolje za mamurluk prijalo i onde se dosetio. \ No newline at end of file From 43d4e964c2733ccaca540c866c4c936223806f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Figen=20G=C3=BCng=C3=B6r?= Date: Mon, 24 Oct 2016 02:53:25 +0300 Subject: [PATCH 4554/5486] Add "olu-taklidi-yap" option and its page --- .../catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md | 2 ++ .../cakmakla-ilerle/olu-taklidi-yap/olu-taklidi-yap.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 turkce/catalla-kaz/metali-cek/cakmakla-ilerle/olu-taklidi-yap/olu-taklidi-yap.md diff --git a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md index e155471701..e9564b36e9 100644 --- a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md +++ b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/cakmakla-ilerle.md @@ -3,3 +3,5 @@ Hızla karanlığa daldın ve çakmak alevinin zayıf ışığı rehberliğinde Hatmiçiçeği arkandan büyük bir hışımla geliyor ve aradaki fark gitgide kapanıyor. [Hatmi Çiçeğine Yakalan](hatmiye-yakalan/hatmiye-yakalan.md) + +[Ölü Taklidi Yap](olu-taklidi-yap/olu-taklidi-yap.md) diff --git a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/olu-taklidi-yap/olu-taklidi-yap.md b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/olu-taklidi-yap/olu-taklidi-yap.md new file mode 100644 index 0000000000..62bb92661a --- /dev/null +++ b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/olu-taklidi-yap/olu-taklidi-yap.md @@ -0,0 +1,3 @@ +Koşmaktan artık bacaklarında mecal kalmadı. + +Dayanamayıp kendini yere atarsın ve ölü taklidi yapmaya başlarsın. From 016d193b9c6b6561a4a630200527c5a399aed479 Mon Sep 17 00:00:00 2001 From: adblack Date: Sun, 23 Oct 2016 19:17:21 -0500 Subject: [PATCH 4555/5486] Add encounter with a bear --- english/forest/shelter/pet-bear/pet-bear.md | 2 ++ english/forest/shelter/play-dead/play-dead.md | 6 ++++++ english/forest/shelter/shelter.md | 6 ++++++ 3 files changed, 14 insertions(+) create mode 100644 english/forest/shelter/pet-bear/pet-bear.md create mode 100644 english/forest/shelter/play-dead/play-dead.md diff --git a/english/forest/shelter/pet-bear/pet-bear.md b/english/forest/shelter/pet-bear/pet-bear.md new file mode 100644 index 0000000000..2a08e1f581 --- /dev/null +++ b/english/forest/shelter/pet-bear/pet-bear.md @@ -0,0 +1,2 @@ +You reach towards the bear's head with your right hand. This startles the +bear. It scurries backwards out of the tent and runs away. diff --git a/english/forest/shelter/play-dead/play-dead.md b/english/forest/shelter/play-dead/play-dead.md new file mode 100644 index 0000000000..a9d5fcea1e --- /dev/null +++ b/english/forest/shelter/play-dead/play-dead.md @@ -0,0 +1,6 @@ +You close your eyes and remain still as the bear licks you several more times. +Its breath smells horrible! It stops licking you. You hear it move around the +tent. You hear the sound of wrappers being torn. The bear is eating your food! +Many minutes seem to pass while you listen to it eating your food. Finally, you +hear it leave the tent. You continue to play dead for a while, and then you open +your eyes. diff --git a/english/forest/shelter/shelter.md b/english/forest/shelter/shelter.md index cf1ad8b08b..4e799cba3a 100644 --- a/english/forest/shelter/shelter.md +++ b/english/forest/shelter/shelter.md @@ -10,3 +10,9 @@ But you do not despair And then you deploy your tent and sleep. +Suddenly, you feel a warm, wet sensation on your face. You open your eyes and +see a bear licking you. + +[Play dead.](play-dead/play-dead.md) + +[Pet the bear.](pet-bear/pet-bear.md) From 65aab3d9b6dc5ca868e47cafef56eda4836142b8 Mon Sep 17 00:00:00 2001 From: Lacie Wilson Date: Sun, 23 Oct 2016 20:31:41 -0700 Subject: [PATCH 4556/5486] Add line at end --- english/love/love.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/love/love.md b/english/love/love.md index c90d1c8b62..4561e5a09e 100644 --- a/english/love/love.md +++ b/english/love/love.md @@ -47,3 +47,4 @@ Our hearts, always as one. - Anthony Kolos - God is love. +Love. From eeb06149bac0f98d0727b6f8ca88a5ba71b748d6 Mon Sep 17 00:00:00 2001 From: Dan Holland Date: Mon, 24 Oct 2016 13:09:54 -0500 Subject: [PATCH 4557/5486] Added new option for unicorn/no --- english/unicorn/no/no.md | 4 +++- english/unicorn/no/super-vet/super-vet.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/unicorn/no/super-vet/super-vet.md diff --git a/english/unicorn/no/no.md b/english/unicorn/no/no.md index fb77838539..7088adad52 100644 --- a/english/unicorn/no/no.md +++ b/english/unicorn/no/no.md @@ -1,4 +1,6 @@ You lie and say that you're all out. Keith the Unicorn looks at you suspiciously and says he doesn't believe you. His eyes are jaundiced, and he's better off without the smoke, but you worry that he may have the power to read minds. -You feel awkward and realise that unicorns named Keith are overrated so [you wake up](../existence/existence.md). +You're worried about Keith's health so you [give him the card of a good supernatural vet you know](./super-vet/super-vet.md) + +You feel awkward and realise that unicorns named Keith are overrated so [you wake up](../existence/existence.md). \ No newline at end of file diff --git a/english/unicorn/no/super-vet/super-vet.md b/english/unicorn/no/super-vet/super-vet.md new file mode 100644 index 0000000000..7f34f9a15b --- /dev/null +++ b/english/unicorn/no/super-vet/super-vet.md @@ -0,0 +1 @@ +You pull the vets business card from your pocket and hold it outstreched in your hand to Keith. The unicorn gives you an angry look and you're not sure if it's because you've been too forward about his health or that he doesn't have hands with which to take the card. \ No newline at end of file From d38bd926e0156f6d27b55d66ac16d386e161e6ad Mon Sep 17 00:00:00 2001 From: Dan Holland Date: Mon, 24 Oct 2016 13:17:32 -0500 Subject: [PATCH 4558/5486] Corrected changes for acceptance by bot. --- english/unicorn/no/no.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/unicorn/no/no.md b/english/unicorn/no/no.md index 7088adad52..840c030cc5 100644 --- a/english/unicorn/no/no.md +++ b/english/unicorn/no/no.md @@ -1,6 +1,6 @@ You lie and say that you're all out. Keith the Unicorn looks at you suspiciously and says he doesn't believe you. His eyes are jaundiced, and he's better off without the smoke, but you worry that he may have the power to read minds. -You're worried about Keith's health so you [give him the card of a good supernatural vet you know](./super-vet/super-vet.md) +You feel awkward and realise that unicorns named Keith are overrated so [you wake up](../existence/existence.md). -You feel awkward and realise that unicorns named Keith are overrated so [you wake up](../existence/existence.md). \ No newline at end of file +You're worried about Keith's health so you [give him the card of a good supernatural vet you know](./super-vet/super-vet.md) \ No newline at end of file From d7259ce32e6c23b05c729283e7d1908ad503805c Mon Sep 17 00:00:00 2001 From: djolland Date: Mon, 24 Oct 2016 13:22:55 -0500 Subject: [PATCH 4559/5486] Reduced line length for acceptance by bot --- english/unicorn/no/no.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/unicorn/no/no.md b/english/unicorn/no/no.md index 840c030cc5..d2c12d1291 100644 --- a/english/unicorn/no/no.md +++ b/english/unicorn/no/no.md @@ -3,4 +3,5 @@ His eyes are jaundiced, and he's better off without the smoke, but you worry tha You feel awkward and realise that unicorns named Keith are overrated so [you wake up](../existence/existence.md). -You're worried about Keith's health so you [give him the card of a good supernatural vet you know](./super-vet/super-vet.md) \ No newline at end of file +You're worried about Keith's health so you +[give him the card of a good supernatural vet you know](./super-vet/super-vet.md) From 79f768206b34306bc3afa41a1073519e9a0c5a07 Mon Sep 17 00:00:00 2001 From: djolland Date: Mon, 24 Oct 2016 13:23:30 -0500 Subject: [PATCH 4560/5486] Reduced line length for acceptance by bot --- english/unicorn/no/super-vet/super-vet.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/unicorn/no/super-vet/super-vet.md b/english/unicorn/no/super-vet/super-vet.md index 7f34f9a15b..7e11a949ca 100644 --- a/english/unicorn/no/super-vet/super-vet.md +++ b/english/unicorn/no/super-vet/super-vet.md @@ -1 +1,3 @@ -You pull the vets business card from your pocket and hold it outstreched in your hand to Keith. The unicorn gives you an angry look and you're not sure if it's because you've been too forward about his health or that he doesn't have hands with which to take the card. \ No newline at end of file +You pull the vets business card from your pocket and hold it outstreched in your hand to Keith. +The unicorn gives you an angry look and you're not sure if it's because you've been too forward +about his health or that he doesn't have hands with which to take the card. From d8dc10edd2fbae6e30a74a0a2b3d40c6f71ee158 Mon Sep 17 00:00:00 2001 From: athena-xcy Date: Mon, 24 Oct 2016 18:46:16 -0400 Subject: [PATCH 4561/5486] Update Jay_Chou.md --- Chinese/Jay_Chou/Jay_Chou.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Chinese/Jay_Chou/Jay_Chou.md b/Chinese/Jay_Chou/Jay_Chou.md index 54ba284a58..64ab254328 100644 --- a/Chinese/Jay_Chou/Jay_Chou.md +++ b/Chinese/Jay_Chou/Jay_Chou.md @@ -1,2 +1,4 @@ 周杰伦自从参加了中国好声音之后，觉得比以前幽默多了，哎哟不错哦！哈哈！ -也许是生了女儿的原因，杰伦现在变得更有亲和力了 \ No newline at end of file +也许是生了女儿的原因，杰伦现在变得更有亲和力了 + +五年之后，周杰伦就带着闺女来参加爸爸去哪儿了。 From c063eeac94b89679f9db76d62946a108dc12b7fe Mon Sep 17 00:00:00 2001 From: athena-xcy Date: Mon, 24 Oct 2016 18:49:17 -0400 Subject: [PATCH 4562/5486] Update trump.md --- english/vote-the-president/trump/trump.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/vote-the-president/trump/trump.md b/english/vote-the-president/trump/trump.md index ae985aaeb0..7515d4bcf9 100644 --- a/english/vote-the-president/trump/trump.md +++ b/english/vote-the-president/trump/trump.md @@ -8,6 +8,7 @@ Know about [Latest hit from Trump Floyd "The Wall"](./trump-floyd-the-wall/thewa You must have a tiny.. pair of hands. +Let's make America bigly again with my tiny pair of hands! From 23a97813db6810f8e972a090a86a6132c141deeb Mon Sep 17 00:00:00 2001 From: athena-xcy Date: Mon, 24 Oct 2016 18:51:53 -0400 Subject: [PATCH 4563/5486] =?UTF-8?q?Update=20=E5=A4=A7=E8=AF=9D=E8=A5=BF?= =?UTF-8?q?=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index c961d29699..53ffa0dea2 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -143,3 +143,5 @@ [我的豆瓣网页](andychen/thisismydouban.md) [庐山恋](lushan/lushan_love_story.md) + +[你以为可以点？] From 4f0458141ae87d9024ca4ceaaa7da2419de729dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Phillip=20Va=C3=9Fen?= Date: Tue, 25 Oct 2016 02:31:44 +0200 Subject: [PATCH 4564/5486] ADD: New (Deutsche) Storyline from the beginning to the end. Some additional files, some reused. --- german/Smartphone/Internet/Internet.md | 8 ++++++++ german/Smartphone/Internet/Rettung/Facebook.md | 5 +++++ german/Smartphone/Internet/Rettung/Kumpel.md | 1 + german/Smartphone/Internet/keinAkku.md | 4 ++++ german/Smartphone/Internet/keinInternet.md | 4 ++++ german/Smartphone/smartphone.md | 10 ++++++++++ german/ruderboot.md | 2 ++ 7 files changed, 34 insertions(+) create mode 100644 german/Smartphone/Internet/Internet.md create mode 100644 german/Smartphone/Internet/Rettung/Facebook.md create mode 100644 german/Smartphone/Internet/Rettung/Kumpel.md create mode 100644 german/Smartphone/Internet/keinAkku.md create mode 100644 german/Smartphone/Internet/keinInternet.md create mode 100644 german/Smartphone/smartphone.md diff --git a/german/Smartphone/Internet/Internet.md b/german/Smartphone/Internet/Internet.md new file mode 100644 index 0000000000..d1f2e5c26a --- /dev/null +++ b/german/Smartphone/Internet/Internet.md @@ -0,0 +1,8 @@ +Du bemerkst das das Booten des Smartphones so lange gedauert hat, das du mittlerweile bis zu den Knien im Wasser stehst. Das Ruderboot ist zum Glück aus Holz und geht nicht ganz unter. +Da du Internetempfang und einen aktzeptablen Akkustand hast, ... + +[machst du erstmal ein gut gelauntes Selfie und postest es auf Facebook.](Rettung/Facebook.md) + +[schreibst deinem besten Kumpel eine WhatsApp, das er dich an deiner aktuellen GPS Position abholen soll](Rettung/Kumpel.md) + +[erstmal deine Lieblings Nachrichten-Website aufrufen...](Internet.md) \ No newline at end of file diff --git a/german/Smartphone/Internet/Rettung/Facebook.md b/german/Smartphone/Internet/Rettung/Facebook.md new file mode 100644 index 0000000000..aa15319a8c --- /dev/null +++ b/german/Smartphone/Internet/Rettung/Facebook.md @@ -0,0 +1,5 @@ +Das Selfie kommt sehr positiv an. Du erhälst die höchste Like-Zahl, zu der du es je gebracht hast! + +Das macht dich Glücklich! + +Leider möchte dir keiner deiner Facebook-Freunde aus deiner misslichen Lage helfen. [Du wirst schwimmen müssen.](../../../schwimmen/schwimmen.md) \ No newline at end of file diff --git a/german/Smartphone/Internet/Rettung/Kumpel.md b/german/Smartphone/Internet/Rettung/Kumpel.md new file mode 100644 index 0000000000..b95707b554 --- /dev/null +++ b/german/Smartphone/Internet/Rettung/Kumpel.md @@ -0,0 +1 @@ +Dein Kumpel kommt dich tatsächlich abholen und du wirst gerettet! \ No newline at end of file diff --git a/german/Smartphone/Internet/keinAkku.md b/german/Smartphone/Internet/keinAkku.md new file mode 100644 index 0000000000..e8bee09947 --- /dev/null +++ b/german/Smartphone/Internet/keinAkku.md @@ -0,0 +1,4 @@ +Du echauffrierst dich zunächst 10 Minuten über deinen unfähigen Smartphone-Hersteller. Dann entscheidest du dich dazu ... + + +[los zu schwimmen](../../schwimmen/schwimmen.md) \ No newline at end of file diff --git a/german/Smartphone/Internet/keinInternet.md b/german/Smartphone/Internet/keinInternet.md new file mode 100644 index 0000000000..29a5fce802 --- /dev/null +++ b/german/Smartphone/Internet/keinInternet.md @@ -0,0 +1,4 @@ +Du echauffrierst dich zunächst 10 Minuten über deinen schlechten Netzanbieter. Dann entscheidest du dich dazu ... + + +[los zu schwimmen](../../schwimmen/schwimmen.md) \ No newline at end of file diff --git a/german/Smartphone/smartphone.md b/german/Smartphone/smartphone.md new file mode 100644 index 0000000000..bde49c44d4 --- /dev/null +++ b/german/Smartphone/smartphone.md @@ -0,0 +1,10 @@ +Gründlich durchsuchst du all deine Hosentaschen... +in der zuletzt geprüften Tasche findest du es. Hastig schaltest du das Smartphone ein um zu prüfen wie voll der Akku noch ist und ob du Internetempfang hast... + +Nachdem das Smartphone gebootet wurde siehst du... + +[dass du vollen Internetempfang hast!](Internet/Internet.md) + +[kein Internetempfang hast.](Internet/keinInternet.md) + +[nach nur 2 Sekunden geht das Smartphone wieder aus, da der Akku zu schwach ist.](Internet/keinAkku.md) \ No newline at end of file diff --git a/german/ruderboot.md b/german/ruderboot.md index f5843e8dde..4c2b117525 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -8,6 +8,8 @@ Werden Sie: [Festellen, dass Sie doch kein Deutsch sprechen](../language.md) +[Erschrocken prfen, ob das Smartphone noch in der Hosentasche ist...](Smartphone/smartphone.md) + [Zunchst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) [Laut um Hilfe schreien?](Hilfeschrei/Hilfeschrei.md) From 446db22b2bd14e00c3c31afa63daf4b5e62377be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Phillip=20Va=C3=9Fen?= Date: Tue, 25 Oct 2016 02:51:42 +0200 Subject: [PATCH 4565/5486] Modifiy: dir structure and line length --- german/Smartphone/Internet/Internet.md | 8 -------- german/Smartphone/Internet/Rettung/Facebook.md | 5 ----- german/Smartphone/Internet/Rettung/Kumpel.md | 1 - german/Smartphone/Internet/keinAkku.md | 4 ---- german/Smartphone/Internet/keinInternet.md | 4 ---- german/Smartphone/smartphone.md | 9 +++++---- 6 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 german/Smartphone/Internet/Internet.md delete mode 100644 german/Smartphone/Internet/Rettung/Facebook.md delete mode 100644 german/Smartphone/Internet/Rettung/Kumpel.md delete mode 100644 german/Smartphone/Internet/keinAkku.md delete mode 100644 german/Smartphone/Internet/keinInternet.md diff --git a/german/Smartphone/Internet/Internet.md b/german/Smartphone/Internet/Internet.md deleted file mode 100644 index d1f2e5c26a..0000000000 --- a/german/Smartphone/Internet/Internet.md +++ /dev/null @@ -1,8 +0,0 @@ -Du bemerkst das das Booten des Smartphones so lange gedauert hat, das du mittlerweile bis zu den Knien im Wasser stehst. Das Ruderboot ist zum Glück aus Holz und geht nicht ganz unter. -Da du Internetempfang und einen aktzeptablen Akkustand hast, ... - -[machst du erstmal ein gut gelauntes Selfie und postest es auf Facebook.](Rettung/Facebook.md) - -[schreibst deinem besten Kumpel eine WhatsApp, das er dich an deiner aktuellen GPS Position abholen soll](Rettung/Kumpel.md) - -[erstmal deine Lieblings Nachrichten-Website aufrufen...](Internet.md) \ No newline at end of file diff --git a/german/Smartphone/Internet/Rettung/Facebook.md b/german/Smartphone/Internet/Rettung/Facebook.md deleted file mode 100644 index aa15319a8c..0000000000 --- a/german/Smartphone/Internet/Rettung/Facebook.md +++ /dev/null @@ -1,5 +0,0 @@ -Das Selfie kommt sehr positiv an. Du erhälst die höchste Like-Zahl, zu der du es je gebracht hast! - -Das macht dich Glücklich! - -Leider möchte dir keiner deiner Facebook-Freunde aus deiner misslichen Lage helfen. [Du wirst schwimmen müssen.](../../../schwimmen/schwimmen.md) \ No newline at end of file diff --git a/german/Smartphone/Internet/Rettung/Kumpel.md b/german/Smartphone/Internet/Rettung/Kumpel.md deleted file mode 100644 index b95707b554..0000000000 --- a/german/Smartphone/Internet/Rettung/Kumpel.md +++ /dev/null @@ -1 +0,0 @@ -Dein Kumpel kommt dich tatsächlich abholen und du wirst gerettet! \ No newline at end of file diff --git a/german/Smartphone/Internet/keinAkku.md b/german/Smartphone/Internet/keinAkku.md deleted file mode 100644 index e8bee09947..0000000000 --- a/german/Smartphone/Internet/keinAkku.md +++ /dev/null @@ -1,4 +0,0 @@ -Du echauffrierst dich zunächst 10 Minuten über deinen unfähigen Smartphone-Hersteller. Dann entscheidest du dich dazu ... - - -[los zu schwimmen](../../schwimmen/schwimmen.md) \ No newline at end of file diff --git a/german/Smartphone/Internet/keinInternet.md b/german/Smartphone/Internet/keinInternet.md deleted file mode 100644 index 29a5fce802..0000000000 --- a/german/Smartphone/Internet/keinInternet.md +++ /dev/null @@ -1,4 +0,0 @@ -Du echauffrierst dich zunächst 10 Minuten über deinen schlechten Netzanbieter. Dann entscheidest du dich dazu ... - - -[los zu schwimmen](../../schwimmen/schwimmen.md) \ No newline at end of file diff --git a/german/Smartphone/smartphone.md b/german/Smartphone/smartphone.md index bde49c44d4..15234df3e2 100644 --- a/german/Smartphone/smartphone.md +++ b/german/Smartphone/smartphone.md @@ -1,10 +1,11 @@ Gründlich durchsuchst du all deine Hosentaschen... -in der zuletzt geprüften Tasche findest du es. Hastig schaltest du das Smartphone ein um zu prüfen wie voll der Akku noch ist und ob du Internetempfang hast... +in der zuletzt geprüften Tasche findest du es. Hastig schaltest du das Smartphone +ein um zu prüfen wie voll der Akku noch ist und ob du Internetempfang hast... Nachdem das Smartphone gebootet wurde siehst du... -[dass du vollen Internetempfang hast!](Internet/Internet.md) +[dass du vollen Internetempfang hast!](Internet/Internet/Internet.md) -[kein Internetempfang hast.](Internet/keinInternet.md) +[kein Internetempfang hast.](Internet/keinInternet/keinInternet.md) -[nach nur 2 Sekunden geht das Smartphone wieder aus, da der Akku zu schwach ist.](Internet/keinAkku.md) \ No newline at end of file +[nach nur 2 Sekunden geht das Smartphone wieder aus, da der Akku zu schwach ist.](Internet/keinAkku/keinAkku.md) \ No newline at end of file From e1dc1bf32e0c321ed4e67b6491def575889f5977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Phillip=20Va=C3=9Fen?= Date: Tue, 25 Oct 2016 02:55:50 +0200 Subject: [PATCH 4566/5486] Fixing dir structure --- german/Smartphone/Internet/Internet.md | 8 ++++++++ german/Smartphone/Rettung/Facebook/Facebook.md | 5 +++++ german/Smartphone/Rettung/Kumpel/Kumpel.md | 1 + german/Smartphone/keinAkku/keinAkku.md | 4 ++++ german/Smartphone/keinInternet/keinInternet.md | 4 ++++ german/Smartphone/smartphone.md | 6 +++--- 6 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 german/Smartphone/Internet/Internet.md create mode 100644 german/Smartphone/Rettung/Facebook/Facebook.md create mode 100644 german/Smartphone/Rettung/Kumpel/Kumpel.md create mode 100644 german/Smartphone/keinAkku/keinAkku.md create mode 100644 german/Smartphone/keinInternet/keinInternet.md diff --git a/german/Smartphone/Internet/Internet.md b/german/Smartphone/Internet/Internet.md new file mode 100644 index 0000000000..f50d826715 --- /dev/null +++ b/german/Smartphone/Internet/Internet.md @@ -0,0 +1,8 @@ +Du bemerkst das das Booten des Smartphones so lange gedauert hat, das du mittlerweile bis zu den Knien im Wasser stehst. Das Ruderboot ist zum Glück aus Holz und geht nicht ganz unter. +Da du Internetempfang und einen aktzeptablen Akkustand hast, ... + +[machst du erstmal ein gut gelauntes Selfie und postest es auf Facebook.](../Rettung/Facebook/Facebook.md) + +[schreibst deinem besten Kumpel eine WhatsApp, das er dich an deiner aktuellen GPS Position abholen soll](../Rettung/Kumpel/Kumpel.md) + +[erstmal deine Lieblings Nachrichten-Website aufrufen...](Internet.md) \ No newline at end of file diff --git a/german/Smartphone/Rettung/Facebook/Facebook.md b/german/Smartphone/Rettung/Facebook/Facebook.md new file mode 100644 index 0000000000..e01be9e3bd --- /dev/null +++ b/german/Smartphone/Rettung/Facebook/Facebook.md @@ -0,0 +1,5 @@ +Das Selfie kommt sehr positiv an. Du erhälst die höchste Like-Zahl, zu der du es je gebracht hast! + +Das macht dich Glücklich! + +Leider möchte dir keiner deiner Facebook-Freunde aus deiner misslichen Lage helfen. [Du wirst schwimmen müssen.](../../../../schwimmen/schwimmen.md) \ No newline at end of file diff --git a/german/Smartphone/Rettung/Kumpel/Kumpel.md b/german/Smartphone/Rettung/Kumpel/Kumpel.md new file mode 100644 index 0000000000..b95707b554 --- /dev/null +++ b/german/Smartphone/Rettung/Kumpel/Kumpel.md @@ -0,0 +1 @@ +Dein Kumpel kommt dich tatsächlich abholen und du wirst gerettet! \ No newline at end of file diff --git a/german/Smartphone/keinAkku/keinAkku.md b/german/Smartphone/keinAkku/keinAkku.md new file mode 100644 index 0000000000..4ca7eb5f95 --- /dev/null +++ b/german/Smartphone/keinAkku/keinAkku.md @@ -0,0 +1,4 @@ +Du echauffrierst dich zunächst 10 Minuten über deinen unfähigen Smartphone-Hersteller. +Dann entscheidest du dich dazu ... + +[los zu schwimmen](../../../schwimmen/schwimmen.md) \ No newline at end of file diff --git a/german/Smartphone/keinInternet/keinInternet.md b/german/Smartphone/keinInternet/keinInternet.md new file mode 100644 index 0000000000..9b5c0e3e14 --- /dev/null +++ b/german/Smartphone/keinInternet/keinInternet.md @@ -0,0 +1,4 @@ +Du echauffrierst dich zunächst 10 Minuten über deinen schlechten Netzanbieter. Dann entscheidest du dich dazu ... + + +[los zu schwimmen](../../../schwimmen/schwimmen.md) \ No newline at end of file diff --git a/german/Smartphone/smartphone.md b/german/Smartphone/smartphone.md index 15234df3e2..3d258e89cd 100644 --- a/german/Smartphone/smartphone.md +++ b/german/Smartphone/smartphone.md @@ -4,8 +4,8 @@ ein um zu prüfen wie voll der Akku noch ist und ob du Internetempfang hast... Nachdem das Smartphone gebootet wurde siehst du... -[dass du vollen Internetempfang hast!](Internet/Internet/Internet.md) +[dass du vollen Internetempfang hast!](Internet/Internet.md) -[kein Internetempfang hast.](Internet/keinInternet/keinInternet.md) +[kein Internetempfang hast.](keinInternet/keinInternet.md) -[nach nur 2 Sekunden geht das Smartphone wieder aus, da der Akku zu schwach ist.](Internet/keinAkku/keinAkku.md) \ No newline at end of file +[nach nur 2 Sekunden geht das Smartphone wieder aus, da der Akku zu schwach ist.](keinAkku/keinAkku.md) \ No newline at end of file From 83295699eb6dfc50892b53d4d5f1bd0529cc7acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Phillip=20Va=C3=9Fen?= Date: Tue, 25 Oct 2016 02:58:54 +0200 Subject: [PATCH 4567/5486] fix dir structure again --- german/Smartphone/Rettung/Facebook/Facebook.md | 2 +- german/Smartphone/keinAkku/keinAkku.md | 2 +- german/Smartphone/keinInternet/keinInternet.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/german/Smartphone/Rettung/Facebook/Facebook.md b/german/Smartphone/Rettung/Facebook/Facebook.md index e01be9e3bd..2dab80a573 100644 --- a/german/Smartphone/Rettung/Facebook/Facebook.md +++ b/german/Smartphone/Rettung/Facebook/Facebook.md @@ -2,4 +2,4 @@ Das Selfie kommt sehr positiv an. Du erhälst die höchste Like-Zahl, zu der du Das macht dich Glücklich! -Leider möchte dir keiner deiner Facebook-Freunde aus deiner misslichen Lage helfen. [Du wirst schwimmen müssen.](../../../../schwimmen/schwimmen.md) \ No newline at end of file +Leider möchte dir keiner deiner Facebook-Freunde aus deiner misslichen Lage helfen. [Du wirst schwimmen müssen.](../../../schwimmen/schwimmen.md) \ No newline at end of file diff --git a/german/Smartphone/keinAkku/keinAkku.md b/german/Smartphone/keinAkku/keinAkku.md index 4ca7eb5f95..e40d53d458 100644 --- a/german/Smartphone/keinAkku/keinAkku.md +++ b/german/Smartphone/keinAkku/keinAkku.md @@ -1,4 +1,4 @@ Du echauffrierst dich zunächst 10 Minuten über deinen unfähigen Smartphone-Hersteller. Dann entscheidest du dich dazu ... -[los zu schwimmen](../../../schwimmen/schwimmen.md) \ No newline at end of file +[los zu schwimmen](../../schwimmen/schwimmen.md) \ No newline at end of file diff --git a/german/Smartphone/keinInternet/keinInternet.md b/german/Smartphone/keinInternet/keinInternet.md index 9b5c0e3e14..29a5fce802 100644 --- a/german/Smartphone/keinInternet/keinInternet.md +++ b/german/Smartphone/keinInternet/keinInternet.md @@ -1,4 +1,4 @@ Du echauffrierst dich zunächst 10 Minuten über deinen schlechten Netzanbieter. Dann entscheidest du dich dazu ... -[los zu schwimmen](../../../schwimmen/schwimmen.md) \ No newline at end of file +[los zu schwimmen](../../schwimmen/schwimmen.md) \ No newline at end of file From 45e83fb699a3e196e6e6b48307755aeb3a481716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Phillip=20Va=C3=9Fen?= Date: Tue, 25 Oct 2016 03:03:56 +0200 Subject: [PATCH 4568/5486] last fix --- german/Smartphone/Internet/Internet.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Smartphone/Internet/Internet.md b/german/Smartphone/Internet/Internet.md index f50d826715..d4598e1a6d 100644 --- a/german/Smartphone/Internet/Internet.md +++ b/german/Smartphone/Internet/Internet.md @@ -1,4 +1,6 @@ -Du bemerkst das das Booten des Smartphones so lange gedauert hat, das du mittlerweile bis zu den Knien im Wasser stehst. Das Ruderboot ist zum Glück aus Holz und geht nicht ganz unter. +Du bemerkst das das Booten des Smartphones so lange gedauert hat, +dass du mittlerweile bis zu den Knien im Wasser stehst. +Das Ruderboot ist zum Glück aus Holz und geht nicht ganz unter. Da du Internetempfang und einen aktzeptablen Akkustand hast, ... [machst du erstmal ein gut gelauntes Selfie und postest es auf Facebook.](../Rettung/Facebook/Facebook.md) From 4daed8c8a8d47fb19cf015d77aac38eee5e7b14e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Phillip=20Va=C3=9Fen?= Date: Tue, 25 Oct 2016 03:07:05 +0200 Subject: [PATCH 4569/5486] really last fix... --- german/Smartphone/Internet/Internet.md | 3 ++- german/Smartphone/Rettung/Facebook/Facebook.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/german/Smartphone/Internet/Internet.md b/german/Smartphone/Internet/Internet.md index d4598e1a6d..19c0398cb2 100644 --- a/german/Smartphone/Internet/Internet.md +++ b/german/Smartphone/Internet/Internet.md @@ -5,6 +5,7 @@ Da du Internetempfang und einen aktzeptablen Akkustand hast, ... [machst du erstmal ein gut gelauntes Selfie und postest es auf Facebook.](../Rettung/Facebook/Facebook.md) -[schreibst deinem besten Kumpel eine WhatsApp, das er dich an deiner aktuellen GPS Position abholen soll](../Rettung/Kumpel/Kumpel.md) +[schreibst deinem besten Kumpel eine WhatsApp, +ob er dich an deiner aktuellen GPS Position abholen kann.](../Rettung/Kumpel/Kumpel.md) [erstmal deine Lieblings Nachrichten-Website aufrufen...](Internet.md) \ No newline at end of file diff --git a/german/Smartphone/Rettung/Facebook/Facebook.md b/german/Smartphone/Rettung/Facebook/Facebook.md index 2dab80a573..b8c97c1981 100644 --- a/german/Smartphone/Rettung/Facebook/Facebook.md +++ b/german/Smartphone/Rettung/Facebook/Facebook.md @@ -2,4 +2,5 @@ Das Selfie kommt sehr positiv an. Du erhälst die höchste Like-Zahl, zu der du Das macht dich Glücklich! -Leider möchte dir keiner deiner Facebook-Freunde aus deiner misslichen Lage helfen. [Du wirst schwimmen müssen.](../../../schwimmen/schwimmen.md) \ No newline at end of file +Leider möchte dir keiner deiner Facebook-Freunde aus deiner misslichen Lage helfen. +[Du wirst schwimmen müssen.](../../../schwimmen/schwimmen.md) \ No newline at end of file From 70f4311b7f55ac7ab493cb21eee64105580a94f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Phillip=20Va=C3=9Fen?= Date: Tue, 25 Oct 2016 03:09:13 +0200 Subject: [PATCH 4570/5486] Final syntax fix, again. after all those fixex... I might be able to recreate the casey-bot ;) --- german/Smartphone/Internet/Internet.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/german/Smartphone/Internet/Internet.md b/german/Smartphone/Internet/Internet.md index 19c0398cb2..7749a073b1 100644 --- a/german/Smartphone/Internet/Internet.md +++ b/german/Smartphone/Internet/Internet.md @@ -5,7 +5,7 @@ Da du Internetempfang und einen aktzeptablen Akkustand hast, ... [machst du erstmal ein gut gelauntes Selfie und postest es auf Facebook.](../Rettung/Facebook/Facebook.md) -[schreibst deinem besten Kumpel eine WhatsApp, -ob er dich an deiner aktuellen GPS Position abholen kann.](../Rettung/Kumpel/Kumpel.md) +[schreibst deinem besten Kumpel eine WhatsApp](../Rettung/Kumpel/Kumpel.md), +ob er dich an deiner aktuellen GPS Position abholen kann. [erstmal deine Lieblings Nachrichten-Website aufrufen...](Internet.md) \ No newline at end of file From e9e89495771700008bf152ac5b06b4417621f207 Mon Sep 17 00:00:00 2001 From: Alejandra Soto Date: Mon, 24 Oct 2016 20:47:53 -0500 Subject: [PATCH 4571/5486] Add batman to the adventure --- espanol/batman/Batman.md | 1 + espanol/canudos.md | 2 ++ espanol/robin/robin.md | 1 + 3 files changed, 4 insertions(+) create mode 100644 espanol/batman/Batman.md create mode 100644 espanol/robin/robin.md diff --git a/espanol/batman/Batman.md b/espanol/batman/Batman.md new file mode 100644 index 0000000000..e70938a281 --- /dev/null +++ b/espanol/batman/Batman.md @@ -0,0 +1 @@ +No puedes ser Batman cuando yo soy el verdadero Batman, sigue y se un [Robin] (robin/robin.md) \ No newline at end of file diff --git a/espanol/canudos.md b/espanol/canudos.md index 0d111b1503..39aa8daf01 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -180,3 +180,5 @@ Llego el [invierno](inverlandia/inverlandia.md). Gritó que se escribiría la más aburrida historia, basada en un mal comienzo. Y [Resines](resines/resines.md) despertó de lo quer parecía un mal sueño. + +Al despertar Resines te pregunta si eres [Batman](batman/batman.md) diff --git a/espanol/robin/robin.md b/espanol/robin/robin.md new file mode 100644 index 0000000000..a818577af0 --- /dev/null +++ b/espanol/robin/robin.md @@ -0,0 +1 @@ +Nadie quiere ser Robin, mejor vuelve al inicio de [todo] (canudos.md) \ No newline at end of file From 7ac7cc2a499ffe305ac204d514aeb6cd6591095b Mon Sep 17 00:00:00 2001 From: Alejandra Soto Date: Mon, 24 Oct 2016 21:01:27 -0500 Subject: [PATCH 4572/5486] Fix broken links --- espanol/batman/Batman.md | 2 +- espanol/canudos.md | 2 +- espanol/robin/robin.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/espanol/batman/Batman.md b/espanol/batman/Batman.md index e70938a281..0e4cea4dd7 100644 --- a/espanol/batman/Batman.md +++ b/espanol/batman/Batman.md @@ -1 +1 @@ -No puedes ser Batman cuando yo soy el verdadero Batman, sigue y se un [Robin] (robin/robin.md) \ No newline at end of file +No puedes ser Batman cuando yo soy el verdadero Batman, sigue y se un [Robin](robin/robin.md) \ No newline at end of file diff --git a/espanol/canudos.md b/espanol/canudos.md index 39aa8daf01..bb8bb5bb09 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -181,4 +181,4 @@ Gritó que se escribiría la más aburrida historia, basada en un mal comienzo. Y [Resines](resines/resines.md) despertó de lo quer parecía un mal sueño. -Al despertar Resines te pregunta si eres [Batman](batman/batman.md) +Al despertar Resines te pregunta si eres [Batman](batman/Batman.md) diff --git a/espanol/robin/robin.md b/espanol/robin/robin.md index a818577af0..fb49f0b490 100644 --- a/espanol/robin/robin.md +++ b/espanol/robin/robin.md @@ -1 +1 @@ -Nadie quiere ser Robin, mejor vuelve al inicio de [todo] (canudos.md) \ No newline at end of file +Nadie quiere ser Robin, mejor vuelve al inicio de [todo](canudos.md) \ No newline at end of file From 50ce49e813236f18054dae3a84b8a98f05e6e1b5 Mon Sep 17 00:00:00 2001 From: Alejandra Soto Date: Mon, 24 Oct 2016 21:04:20 -0500 Subject: [PATCH 4573/5486] Correct links :D --- espanol/batman/Batman.md | 2 +- espanol/robin/robin.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/espanol/batman/Batman.md b/espanol/batman/Batman.md index 0e4cea4dd7..645d7bddba 100644 --- a/espanol/batman/Batman.md +++ b/espanol/batman/Batman.md @@ -1 +1 @@ -No puedes ser Batman cuando yo soy el verdadero Batman, sigue y se un [Robin](robin/robin.md) \ No newline at end of file +No puedes ser Batman cuando yo soy el verdadero Batman, sigue y se un [Robin](../robin/robin.md) \ No newline at end of file diff --git a/espanol/robin/robin.md b/espanol/robin/robin.md index fb49f0b490..088a604839 100644 --- a/espanol/robin/robin.md +++ b/espanol/robin/robin.md @@ -1 +1 @@ -Nadie quiere ser Robin, mejor vuelve al inicio de [todo](canudos.md) \ No newline at end of file +Nadie quiere ser Robin, mejor vuelve al inicio de [todo](../canudos.md) \ No newline at end of file From 6c3b0682a3a39c3cea4471322ca6ff260e804e99 Mon Sep 17 00:00:00 2001 From: antatianka Date: Mon, 24 Oct 2016 19:14:07 -0700 Subject: [PATCH 4574/5486] add file with story --- english/git_disadvantage/git_disadvantage.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/git_disadvantage/git_disadvantage.md diff --git a/english/git_disadvantage/git_disadvantage.md b/english/git_disadvantage/git_disadvantage.md new file mode 100644 index 0000000000..4d46c6b11f --- /dev/null +++ b/english/git_disadvantage/git_disadvantage.md @@ -0,0 +1,5 @@ +When it comes to version control, there are many talks about Git these days. + +There are a lot of articles about proving its effectiveness and describing its advantages before other CVS. + +Just speak about disadvantage... sometimes in a flaw in the process of work git requires brain involvement. \ No newline at end of file From 7a4589814fbabff1e583f6923cb90d3328137a42 Mon Sep 17 00:00:00 2001 From: antatianka Date: Mon, 24 Oct 2016 19:19:31 -0700 Subject: [PATCH 4575/5486] put link for my story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index f6ce767416..647494d26b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -948,6 +948,8 @@ The understanding of git [go here](Booyah/booyah.md) [link to google website] (kumar/kumar.md) +Do you want to know [Git disadvantage?] (git_disadvantage/git_disadvantage.md) + Hi i got this one for udacity team. As the sand encompassed her toes and From 755e7862d4898c7c7ee380378f90510548f67142 Mon Sep 17 00:00:00 2001 From: acsimoes Date: Tue, 25 Oct 2016 17:29:45 +0100 Subject: [PATCH 4576/5486] Ended the story. --- portugues_pt/sorvete/sorvete.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/portugues_pt/sorvete/sorvete.md b/portugues_pt/sorvete/sorvete.md index 1b98fed184..bf06e95a1b 100644 --- a/portugues_pt/sorvete/sorvete.md +++ b/portugues_pt/sorvete/sorvete.md @@ -1 +1,2 @@ -Comeu todo o sorvete e morreu de diabetes. \ No newline at end of file +Comeu todo o sorvete e morreu de diabetes. +E assim terminou a história de Fernando o comedor de sorvetes. \ No newline at end of file From 55435df4bc331392f83c2c0f2f664984ad2a7261 Mon Sep 17 00:00:00 2001 From: Chase Date: Tue, 25 Oct 2016 10:08:30 -0700 Subject: [PATCH 4577/5486] Add /forest/scream/climb storyline --- english/forest/scream/climb/climb.md | 25 +++++++++++++++++++++++++ english/forest/scream/scream.md | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 english/forest/scream/climb/climb.md diff --git a/english/forest/scream/climb/climb.md b/english/forest/scream/climb/climb.md new file mode 100644 index 0000000000..fe10db8ede --- /dev/null +++ b/english/forest/scream/climb/climb.md @@ -0,0 +1,25 @@ +You decide to climb the nearest tree where your parachute is hanging. Perhaps +you can use your large parachute to scare the tiger away. Habitat loss has made +the Malayan tiger extremely hungry and ferocious towards humans. + +From your knees you stand up on your left leg without ever taking your eyes off +the tiger. The tiger crouches, ears forward, pupils dilated, mouth focused. + +You try to nimbly stand upon your right leg. You can still feel the sharp pain +from your right shin, but your spiking adrenaline has made you numb to +everything but the fight or flight of the moment. The tiger wiggles, testing its +hind legs for stability. + +You rush up. "SNAP" You hear your fibula break before you feel the renewed +searing pain radiate upwards. You fall to the ground in a lump. The tiger +pounces. + +It grabs your right shin securly in hits jaws. The broken bone allows +the tiger to rip the shin, ankle, and foot cleanly away. + +You crawl to the nearest tree only a few meters away. With all of your energy +you grab its low, thick branches and climb. From a safe perch you notice that +your parachute is still 15 meters above you. You fasten a tourniquet and pass +out. + +The tiger finishes his quick feast and gazes upward, mouth agape, panting. \ No newline at end of file diff --git a/english/forest/scream/scream.md b/english/forest/scream/scream.md index 84e46ce28d..93b44ed063 100644 --- a/english/forest/scream/scream.md +++ b/english/forest/scream/scream.md @@ -21,3 +21,5 @@ What will you do? [Play dead](dead/dead.md) [Run towards the tiger](run/run.md) + +[Climb the nearest tree](climb/climb.md) \ No newline at end of file From cb9234056e5ce13a93276a86e1ec19a7f1711648 Mon Sep 17 00:00:00 2001 From: aziaziazi Date: Tue, 25 Oct 2016 23:28:18 +0200 Subject: [PATCH 4578/5486] Add tweet-to-maman option --- french/appel-maman/appeler-maman.md | 2 ++ french/appel-maman/twitter/tweet.md | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 french/appel-maman/twitter/tweet.md diff --git a/french/appel-maman/appeler-maman.md b/french/appel-maman/appeler-maman.md index 2f4f39cc86..61b0a14a90 100644 --- a/french/appel-maman/appeler-maman.md +++ b/french/appel-maman/appeler-maman.md @@ -2,4 +2,6 @@ Ma mère a toujours de bons coonseils! Le problème c'est qu'elle ne répond pas... aaargghhh Que faire ? +[Je tweete maman](twitter/tweet.md) + [Je revois mes autres options](../feu-de-camp.md) \ No newline at end of file diff --git a/french/appel-maman/twitter/tweet.md b/french/appel-maman/twitter/tweet.md new file mode 100644 index 0000000000..a32fb95cd2 --- /dev/null +++ b/french/appel-maman/twitter/tweet.md @@ -0,0 +1,6 @@ +"maman, je suis dans une maison en pain d'épice #help" +Je vais un peu sur instagram en attendant et... oh ! Maman a répondu ! + +"zoejfoziézecniozu" + +Zut, ce doit être le chat qui marche sur le clavier... \ No newline at end of file From bf95dff5bf07997f2e6bbbd9e633b39144d753b5 Mon Sep 17 00:00:00 2001 From: Zarko Gvozdenovic Date: Wed, 26 Oct 2016 12:30:14 +0200 Subject: [PATCH 4579/5486] Odluka je pala --- serbian/start.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/serbian/start.md b/serbian/start.md index 97a1fb6721..7c39c40f06 100644 --- a/serbian/start.md +++ b/serbian/start.md @@ -15,4 +15,6 @@ Mlada radnica ga je ljubazno gledala. Rekla je: "Možda bi Vam prijao niški burek sa eurokremom?" [klikni ovde](burekKrem/krem.md) -Mislio se dugo šta bi mu najbolje za mamurluk prijalo i onde se dosetio. \ No newline at end of file +Mislio se dugo šta bi mu najbolje za mamurluk prijalo i onde se dosetio. + +"Daćete mi jedan sa sirom, jedan jogurt i jedan niški za dezert, molim vas." From e95774fe60a97bc5d59b2d9e8e647c9e4ea743a4 Mon Sep 17 00:00:00 2001 From: aziaziazi Date: Wed, 26 Oct 2016 16:39:09 +0200 Subject: [PATCH 4580/5486] Add trouer-mur to open internet communication indoor --- french/google/google.md | 4 +++- french/google/trouer-mur/reseau.md | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 french/google/trouer-mur/reseau.md diff --git a/french/google/google.md b/french/google/google.md index 04b2d78f92..1d6a282449 100644 --- a/french/google/google.md +++ b/french/google/google.md @@ -3,4 +3,6 @@ Vous sortez votre telephone de votre poche. Malheureuseument, le pain d'epice semble bloquer toutes communications. -[Je dois trouver autre chose](../feu-de-camp.md) \ No newline at end of file +[Je dois trouver autre chose](../feu-de-camp.md) + +[J'enfonce mon bras dans un mur](trouer-mur/reseau.md) \ No newline at end of file diff --git a/french/google/trouer-mur/reseau.md b/french/google/trouer-mur/reseau.md new file mode 100644 index 0000000000..c1b4c55898 --- /dev/null +++ b/french/google/trouer-mur/reseau.md @@ -0,0 +1,7 @@ +Mon bras s'enfonce. Je pousse un peu plus loin et... de l'air ! +Je retire mon bras et un souffle s'engouffre dans la maison en pain d'épice... +C'est Internet !! Ouiii du réseau ! Des url s'empresent sur mon écran. + +[Je clique sur la première](https://www.youtube.com/watch?v=oHg5SJYRHA0) + +[Je tweete maman](../../appel-maman/twitter/tweet.md) \ No newline at end of file From f00a133576bb575c2ac9ad3e70931d10612429f3 Mon Sep 17 00:00:00 2001 From: Ahmed Elshaarany Date: Wed, 26 Oct 2016 08:44:10 -0700 Subject: [PATCH 4581/5486] Add soccerfan story --- english/soccerfan/soccerfan.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/soccerfan/soccerfan.md diff --git a/english/soccerfan/soccerfan.md b/english/soccerfan/soccerfan.md new file mode 100644 index 0000000000..44743a9921 --- /dev/null +++ b/english/soccerfan/soccerfan.md @@ -0,0 +1 @@ +You really should love soccer, it's a thrilling game. You should travel and watch your favorite team plae. \ No newline at end of file From 3d5b92c81f2e64044efc54fe8757ff71ae3458e7 Mon Sep 17 00:00:00 2001 From: Ahmed Elshaarany Date: Wed, 26 Oct 2016 08:46:06 -0700 Subject: [PATCH 4582/5486] Fix typo --- english/soccerfan/soccerfan.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/soccerfan/soccerfan.md b/english/soccerfan/soccerfan.md index 44743a9921..1332700e19 100644 --- a/english/soccerfan/soccerfan.md +++ b/english/soccerfan/soccerfan.md @@ -1 +1 @@ -You really should love soccer, it's a thrilling game. You should travel and watch your favorite team plae. \ No newline at end of file +You really should love soccer, it's a thrilling game. You should travel and watch your favorite team play. \ No newline at end of file From 608f15d7f9ee1f50850ab8e62464129ad5ac84c4 Mon Sep 17 00:00:00 2001 From: Ahmed Elshaarany Date: Wed, 26 Oct 2016 08:59:26 -0700 Subject: [PATCH 4583/5486] Add link to my story --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 647494d26b..654418f1d9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1154,4 +1154,6 @@ Wanna trip yourself? Hue has a place you would like to [enter](Trip-Yourself-Hue You decide to [slapa-da-bass](slapa-da-bass/slapa-da-bass.md) -If you want to play soccer, click [here](Soccer/soccer.md) \ No newline at end of file +If you want to play soccer, click [here](Soccer/soccer.md) + +If you are a soccer fan, see your team [here](soccerfan/soccerfan.md) \ No newline at end of file From b5f6efbc6d7e4d3bbf4d6009fed5dad068c102f5 Mon Sep 17 00:00:00 2001 From: Erick Chacon Date: Wed, 26 Oct 2016 14:00:42 -0400 Subject: [PATCH 4584/5486] Add prompt for revolution choices --- english/revolution/revolution.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/english/revolution/revolution.md b/english/revolution/revolution.md index b54df64471..86c06b805b 100644 --- a/english/revolution/revolution.md +++ b/english/revolution/revolution.md @@ -1,2 +1,9 @@ After your encounter with the abyss, the unsettling chill has not -left. You must act. It is time for a revolution. \ No newline at end of file +left. You must act. It is time for a revolution. + +The US presidential elections are coming up this Nov. 8. It is +time for the people's voices to be heard. Our choices are: + +[Go to an economic crash with Trump.](choices/Trump.md) + +[Go to war with Clinton.](choices/Clinton.md) \ No newline at end of file From 537520bb4c47512271cc1fd8f18f2ecbb5df8226 Mon Sep 17 00:00:00 2001 From: Erick Chacon Date: Wed, 26 Oct 2016 14:01:42 -0400 Subject: [PATCH 4585/5486] Add results of revolution choices --- english/revolution/choices/Clinton.md | 1 + english/revolution/choices/Trump.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 english/revolution/choices/Clinton.md create mode 100644 english/revolution/choices/Trump.md diff --git a/english/revolution/choices/Clinton.md b/english/revolution/choices/Clinton.md new file mode 100644 index 0000000000..b21278744d --- /dev/null +++ b/english/revolution/choices/Clinton.md @@ -0,0 +1 @@ +You have chosen to accept the anhilation of your people. \ No newline at end of file diff --git a/english/revolution/choices/Trump.md b/english/revolution/choices/Trump.md new file mode 100644 index 0000000000..71debdf6de --- /dev/null +++ b/english/revolution/choices/Trump.md @@ -0,0 +1 @@ +You have chosen to give up your persuit of financial independence. \ No newline at end of file From cebe597c88017a7009c020658a22b1f13dfa5b9d Mon Sep 17 00:00:00 2001 From: Erick Chacon Date: Wed, 26 Oct 2016 14:22:29 -0400 Subject: [PATCH 4586/5486] Add a folder for each page. Modify revolution.md file --- english/revolution/{choices => choice_1}/Clinton.md | 0 english/revolution/{choices => choice_2}/Trump.md | 0 english/revolution/revolution.md | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename english/revolution/{choices => choice_1}/Clinton.md (100%) rename english/revolution/{choices => choice_2}/Trump.md (100%) diff --git a/english/revolution/choices/Clinton.md b/english/revolution/choice_1/Clinton.md similarity index 100% rename from english/revolution/choices/Clinton.md rename to english/revolution/choice_1/Clinton.md diff --git a/english/revolution/choices/Trump.md b/english/revolution/choice_2/Trump.md similarity index 100% rename from english/revolution/choices/Trump.md rename to english/revolution/choice_2/Trump.md diff --git a/english/revolution/revolution.md b/english/revolution/revolution.md index 86c06b805b..72a0d32d39 100644 --- a/english/revolution/revolution.md +++ b/english/revolution/revolution.md @@ -4,6 +4,6 @@ left. You must act. It is time for a revolution. The US presidential elections are coming up this Nov. 8. It is time for the people's voices to be heard. Our choices are: -[Go to an economic crash with Trump.](choices/Trump.md) +[Go to war with Clinton.](choice_1/Clinton.md) -[Go to war with Clinton.](choices/Clinton.md) \ No newline at end of file +[Go to an economic crash with Trump.](choice_2/Trump.md) \ No newline at end of file From 0d633b42bd4cddabd2809a81369836706a3584fd Mon Sep 17 00:00:00 2001 From: rob Date: Wed, 26 Oct 2016 21:07:00 +0100 Subject: [PATCH 4587/5486] Add shiny-device directory and shiny-device.md --- english/shiny-device/shiny-device.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/shiny-device/shiny-device.md diff --git a/english/shiny-device/shiny-device.md b/english/shiny-device/shiny-device.md new file mode 100644 index 0000000000..e244e4b2ba --- /dev/null +++ b/english/shiny-device/shiny-device.md @@ -0,0 +1,3 @@ +Me: hello computerman, what wares do you have for me? + +Computer-Man: What about that shiny one that caught your eye in the window? \ No newline at end of file From 95655c0ca32629a75de62746c491801ea16c2c60 Mon Sep 17 00:00:00 2001 From: inyoka Date: Fri, 28 Oct 2016 12:28:25 +0700 Subject: [PATCH 4588/5486] Added the phrse Ni Hao to the mandarin. --- english/learn-mandarin/learn-mandarin.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/learn-mandarin/learn-mandarin.md b/english/learn-mandarin/learn-mandarin.md index 38ba616902..864d13a4ef 100644 --- a/english/learn-mandarin/learn-mandarin.md +++ b/english/learn-mandarin/learn-mandarin.md @@ -1,2 +1,6 @@ I love you in Mandarin is 我(wo)爱(ai)你(ni). It sounds like -"Wha(t) I nee(d)" without the sounds in braces. \ No newline at end of file +"Wha(t) I nee(d)" without the sounds in braces. +Hello in Mandarin is 你(ni)好(hao), it sounds like 'knee how'. +Roughly translated it means 'You Good'. +Adding 吗(ma) at the end, turns it into a question but only +do that if you know the person really well. From 42db0b97185277212e5666d1010c1ca398d8c76e Mon Sep 17 00:00:00 2001 From: Soledad Aranibar Date: Fri, 28 Oct 2016 00:01:38 -0700 Subject: [PATCH 4589/5486] feat: Add libro story to spanish version --- espanol/canudos.md | 2 ++ espanol/libro/libro.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 espanol/libro/libro.md diff --git a/espanol/canudos.md b/espanol/canudos.md index bb8bb5bb09..fd0a18ca92 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -182,3 +182,5 @@ Gritó que se escribiría la más aburrida historia, basada en un mal comienzo. Y [Resines](resines/resines.md) despertó de lo quer parecía un mal sueño. Al despertar Resines te pregunta si eres [Batman](batman/Batman.md) + +A lo que respondes: "Yo solo vine aquí a hablar de mi [libro](libro/libro.md)". \ No newline at end of file diff --git a/espanol/libro/libro.md b/espanol/libro/libro.md new file mode 100644 index 0000000000..a5c12b6547 --- /dev/null +++ b/espanol/libro/libro.md @@ -0,0 +1 @@ +Un libro muy malo que cuenta una [historia sin sentido](../canudos.md) From e2cf83c910ae163d112e98d430716d2cef804157 Mon Sep 17 00:00:00 2001 From: rob Date: Fri, 28 Oct 2016 17:42:13 +0100 Subject: [PATCH 4590/5486] Add link to shiny-device.md from marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5dfae125d8..5a8e24e9d5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1145,3 +1145,5 @@ To find out click [here](meaning-of-life/meaning-of-life.md). What is that shiny in the window? Come in and take a [look](Computer-Man/Computer-Man.md) + +The [shiny device](shiny-device/shiny-device.md) From 59a6ff8f9b6c2bd4190f52504f01b5333ddc5bf9 Mon Sep 17 00:00:00 2001 From: Megs Date: Fri, 28 Oct 2016 16:32:41 -0400 Subject: [PATCH 4591/5486] Add view map option to minecraft storyline --- english/you-are-in-minecraft/minecraft.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/you-are-in-minecraft/minecraft.md b/english/you-are-in-minecraft/minecraft.md index 8e6abc4dab..0ddc9c0030 100644 --- a/english/you-are-in-minecraft/minecraft.md +++ b/english/you-are-in-minecraft/minecraft.md @@ -14,6 +14,8 @@ Do you: [Sit back down, and go to sleep?](../sleep/more-sleep/more-sleep.md) +[Take a look at your map?](https://encrypted-tbn1.gstatic.com/images?q=tbn:ANd9GcR09wlFl-ZHxM7nBml4E4_W9eLNTDyp4X9nZX7IcNuDO3a7KC7p_A) + [Go exploring outside?](../explore-outside/explore-outside.md) [Light-fire?](../light-fire/fire.md) From 3a00bf77d97815d1c6222d58061fe4ffe4c58ba6 Mon Sep 17 00:00:00 2001 From: Megs Date: Fri, 28 Oct 2016 16:38:23 -0400 Subject: [PATCH 4592/5486] Correct line length of minecraft view map option --- english/you-are-in-minecraft/minecraft.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/you-are-in-minecraft/minecraft.md b/english/you-are-in-minecraft/minecraft.md index 0ddc9c0030..86c6be4db9 100644 --- a/english/you-are-in-minecraft/minecraft.md +++ b/english/you-are-in-minecraft/minecraft.md @@ -14,7 +14,8 @@ Do you: [Sit back down, and go to sleep?](../sleep/more-sleep/more-sleep.md) -[Take a look at your map?](https://encrypted-tbn1.gstatic.com/images?q=tbn:ANd9GcR09wlFl-ZHxM7nBml4E4_W9eLNTDyp4X9nZX7IcNuDO3a7KC7p_A) +[Take a look at your map?](https://encrypted-tbn1.gstatic.com/images?q=tbn:ANd9GcR09wlFl- +HxM7nBml4E4_W9eLNTDyp4X9nZX7IcNuDO3a7KC7p_A) [Go exploring outside?](../explore-outside/explore-outside.md) From 02784e897df39611af58d84660521b08290c00db Mon Sep 17 00:00:00 2001 From: Sunny Mui Date: Fri, 28 Oct 2016 15:52:18 -0700 Subject: [PATCH 4593/5486] add rub cat belly option to cuddle cat story --- english/cuddle-the-cat/cuddle-cat.md | 2 ++ english/cuddle-the-cat/rub-cat-belly/rub-cat-belly.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/cuddle-the-cat/rub-cat-belly/rub-cat-belly.md diff --git a/english/cuddle-the-cat/cuddle-cat.md b/english/cuddle-the-cat/cuddle-cat.md index 706eb6ed81..0313e57100 100644 --- a/english/cuddle-the-cat/cuddle-cat.md +++ b/english/cuddle-the-cat/cuddle-cat.md @@ -3,3 +3,5 @@ You pick up your kitty and cuddle her for hours. She happily purrs. And you happily purr back. Your cat looks at you like you're crazy, but what are you going to do? + +[Try to rub your cat's belly](/rub-cat-belly/rub-cat-belly.md) diff --git a/english/cuddle-the-cat/rub-cat-belly/rub-cat-belly.md b/english/cuddle-the-cat/rub-cat-belly/rub-cat-belly.md new file mode 100644 index 0000000000..a407d2c05d --- /dev/null +++ b/english/cuddle-the-cat/rub-cat-belly/rub-cat-belly.md @@ -0,0 +1,3 @@ +Your cat flops down on the floor with his belly sticking out. +You start stroking his belly as he lets out a purr, then suddenly he grabs your arm +and starts nibbling on you while kicking the crap out of your arm with his hind legs. It's a trap! \ No newline at end of file From b5152905213f08e0d8a96821c6e9cdbf81b4f8a5 Mon Sep 17 00:00:00 2001 From: Sunny Mui Date: Fri, 28 Oct 2016 16:06:34 -0700 Subject: [PATCH 4594/5486] fix relative link --- english/cuddle-the-cat/cuddle-cat.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/cuddle-the-cat/cuddle-cat.md b/english/cuddle-the-cat/cuddle-cat.md index 0313e57100..56aa2a4ac4 100644 --- a/english/cuddle-the-cat/cuddle-cat.md +++ b/english/cuddle-the-cat/cuddle-cat.md @@ -4,4 +4,4 @@ You pick up your kitty and cuddle her for hours. She happily purrs. And you happily purr back. Your cat looks at you like you're crazy, but what are you going to do? -[Try to rub your cat's belly](/rub-cat-belly/rub-cat-belly.md) +[Try to rub your cat's belly](rub-cat-belly/rub-cat-belly.md) From 3c20dcbc6266f9e0c130cdc5670dc21f551ecf8b Mon Sep 17 00:00:00 2001 From: Danila Date: Sun, 30 Oct 2016 11:38:25 +0100 Subject: [PATCH 4595/5486] Add line to vodka story --- russian/gusli/vodka/vodka2/vodka2.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/gusli/vodka/vodka2/vodka2.md b/russian/gusli/vodka/vodka2/vodka2.md index b38a9df462..e149538334 100644 --- a/russian/gusli/vodka/vodka2/vodka2.md +++ b/russian/gusli/vodka/vodka2/vodka2.md @@ -1,2 +1,4 @@ А собственно, зачем идти за второй? Отработанными движениями отрываем от стены очередной кусок зефира и придаем -ему форму Белуги. Новый опыт не пропьешь - напиток получился мирового класса... \ No newline at end of file +ему форму Белуги. Новый опыт не пропьешь - напиток получился мирового класса... + +Может пора начинать экспорт? \ No newline at end of file From 4cafb70c615dff423cde31b2322dd27eb86d9167 Mon Sep 17 00:00:00 2001 From: Murat Genctav Date: Sun, 30 Oct 2016 17:31:30 +0300 Subject: [PATCH 4596/5486] Add options to hatmiyle-yuzles --- .../cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md index db2674f4ce..93ccaf015c 100644 --- a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md +++ b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md @@ -6,3 +6,12 @@ Hatmi çiçeğinden çılgınlar gibi kaçarken birden kafana bir şey dank eder Koşmayı bırakıp, arkanı dönersin. Hatmi çiçeği de durup seni inceler ve : + +"Bakıyorum betin benzin atmış, soğuk ter döküyorsun. Hasta olacaksın. +Doğru sanatçıyı seçersen sana kendini iyi hissettirecek bir karışım +içireceğim. Ama yanılırsan seni hatmişekerinden bir denize atacağım." + +Hangi sanatçıyı seçerdin? + +[Barış Manço](baris-manco/baris-manco.md) +[Göksel](goksel/goksel.md) \ No newline at end of file From 5b363eb228553f3853f8c46a3deb6158ab8ed6e7 Mon Sep 17 00:00:00 2001 From: Murat Genctav Date: Sun, 30 Oct 2016 17:38:33 +0300 Subject: [PATCH 4597/5486] Add files associated with the options in hatmiyle-yuzles.md --- .../hatmiyle-yuzles/baris-manco/baris-manco.md | 6 ++++++ .../cakmakla-ilerle/hatmiyle-yuzles/goksel/goksel.md | 0 2 files changed, 6 insertions(+) create mode 100644 turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/baris-manco/baris-manco.md create mode 100644 turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/goksel/goksel.md diff --git a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/baris-manco/baris-manco.md b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/baris-manco/baris-manco.md new file mode 100644 index 0000000000..da94c4f708 --- /dev/null +++ b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/baris-manco/baris-manco.md @@ -0,0 +1,6 @@ +Tebrikler. Doğru sanatçıyı tahmin ettin ve Barış Manço tarifiyle +nane, limon kabuğu, hatmi çiçeği, tere otu, tarçın ve zencefil +ile hazırlanmış şifalı karışımı içtin. Rahatladın ve biraz da +uyku çöktü üzerine ve dalıp gittin. + +Uyandığında bir de baktın ki, ... \ No newline at end of file diff --git a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/goksel/goksel.md b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/goksel/goksel.md new file mode 100644 index 0000000000..e69de29bb2 From 0d722e190a40a67f01220e064fc487906f1aed7c Mon Sep 17 00:00:00 2001 From: Murat Genctav Date: Sun, 30 Oct 2016 17:46:34 +0300 Subject: [PATCH 4598/5486] fix: Add blank line between options --- .../cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md | 1 + 1 file changed, 1 insertion(+) diff --git a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md index 93ccaf015c..4501b60676 100644 --- a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md +++ b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/hatmiyle-yuzles.md @@ -14,4 +14,5 @@ içireceğim. Ama yanılırsan seni hatmişekerinden bir denize atacağım." Hangi sanatçıyı seçerdin? [Barış Manço](baris-manco/baris-manco.md) + [Göksel](goksel/goksel.md) \ No newline at end of file From 22be2e9a172038b3be3b57556803d39ce7daf604 Mon Sep 17 00:00:00 2001 From: Murat Genctav Date: Sun, 30 Oct 2016 17:57:41 +0300 Subject: [PATCH 4599/5486] Start story for goksel option. --- .../cakmakla-ilerle/hatmiyle-yuzles/goksel/goksel.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/goksel/goksel.md b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/goksel/goksel.md index e69de29bb2..465395e6fa 100644 --- a/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/goksel/goksel.md +++ b/turkce/catalla-kaz/metali-cek/cakmakla-ilerle/hatmiyle-yuzles/goksel/goksel.md @@ -0,0 +1,5 @@ +Bir denize düştün ki burası bildiğin denizlere benzemiyor. + +Hatmişekerinden bir deniz bu. + +Bataklık gibi seni içine çekiyor; ne yüzebiliyor ne de yürüyebiliyorsun. \ No newline at end of file From 1245783ca22ebdcdf7fa67ddd3f63a532d97e5ba Mon Sep 17 00:00:00 2001 From: sayan Date: Mon, 31 Oct 2016 01:32:08 +0530 Subject: [PATCH 4600/5486] Add my fav soccer team ManU --- english/ManU/ManU.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/ManU/ManU.md diff --git a/english/ManU/ManU.md b/english/ManU/ManU.md new file mode 100644 index 0000000000..4325bee78c --- /dev/null +++ b/english/ManU/ManU.md @@ -0,0 +1 @@ +I really like Man U. Though the 2016 team is not so great, I still support my team. \ No newline at end of file From 8b1d1c9ffcc457634aa4e8fa7a9a335945b87446 Mon Sep 17 00:00:00 2001 From: sayan Date: Mon, 31 Oct 2016 01:33:26 +0530 Subject: [PATCH 4601/5486] Add line for Manu --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 8dddf395b0..883aed4be0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1160,3 +1160,4 @@ If you want to play soccer, click [here](Soccer/soccer.md) If you are a soccer fan, see your team [here](soccerfan/soccerfan.md) +I am also a soccer fan, I am a Man U fan from EPL. To see Man U click [here](ManU/ManU.md) \ No newline at end of file From 1750858f53f11c9021d11679749a7c7eb5c2e985 Mon Sep 17 00:00:00 2001 From: adblack Date: Sun, 30 Oct 2016 18:53:03 -0500 Subject: [PATCH 4602/5486] Add english/forest/scream/run/run-again/ storyline --- .../forest/scream/run/run-again/run-again.md | 26 +++++++++++++++++++ english/forest/scream/run/run.md | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 english/forest/scream/run/run-again/run-again.md diff --git a/english/forest/scream/run/run-again/run-again.md b/english/forest/scream/run/run-again/run-again.md new file mode 100644 index 0000000000..e6fd58f767 --- /dev/null +++ b/english/forest/scream/run/run-again/run-again.md @@ -0,0 +1,26 @@ +You get to your feet ignoring the pain in your right leg. + +You hold the parachute behind you like a cape and run towards the tiger while +screaming at the top of your lungs. + +The parachute inflates behind you and makes you appear several times larger than +you really are. + +The tiger flinches as the larger you rushes towards him. He quickly twists his +body away from you and runs off. + +You stop chasing the tiger. + +You make a mental note never to scream for help in a forest again. + +You decide your next move is to ... + +[Drag yourself further into the woods.](../../../drag/drag.md) + +[Try to gather materials for a signal fire.](../../../fire/fire.md) + +[Check your pockets.](../../../pockets/pockets.md) + +[Make a shelter from the parachute.](../../../shelter/shelter.md) + +[Eat all of your rations in a panic.](../../../eat/eat.md) diff --git a/english/forest/scream/run/run.md b/english/forest/scream/run/run.md index 93cfd2f78f..5c23655851 100644 --- a/english/forest/scream/run/run.md +++ b/english/forest/scream/run/run.md @@ -18,3 +18,5 @@ The tiger, having watched all of this, is staring at you with a hungry look. You, armed with a parachute, have to make a choice. Should you... + +[Run at the tiger with the parachute.](run-again/run-again.md) From 1544fc8d1afd5e6249f6d8fd26e00ae0225d2bd7 Mon Sep 17 00:00:00 2001 From: Wayan Saryada Date: Mon, 31 Oct 2016 21:23:08 +0800 Subject: [PATCH 4603/5486] Add adventures in Bahasa Indonesia. --- indonesia/bahasa-indonesia.md | 1 + language.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 indonesia/bahasa-indonesia.md diff --git a/indonesia/bahasa-indonesia.md b/indonesia/bahasa-indonesia.md new file mode 100644 index 0000000000..b6de87cf73 --- /dev/null +++ b/indonesia/bahasa-indonesia.md @@ -0,0 +1 @@ +Selamat datang kawan... diff --git a/language.md b/language.md index 263bc5dec0..8b0f4489ad 100644 --- a/language.md +++ b/language.md @@ -160,3 +160,4 @@ if you understand maithli, click [here...](maithli/maithli.md) if (you.understand("C#")) here.click(); +if you speak Bahasa Indonesia [klik disini](indonesia/bahasa-indonesia.md) From 3cfdd61164090c7631cdd09a898ad51743963a46 Mon Sep 17 00:00:00 2001 From: Wapika Date: Mon, 31 Oct 2016 14:32:30 +0100 Subject: [PATCH 4604/5486] Add flowers field option --- .../miel/forest/fuite/champs-de-fleurs/champs-de-fleurs.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 french/dessine/miel/forest/fuite/champs-de-fleurs/champs-de-fleurs.md diff --git a/french/dessine/miel/forest/fuite/champs-de-fleurs/champs-de-fleurs.md b/french/dessine/miel/forest/fuite/champs-de-fleurs/champs-de-fleurs.md new file mode 100644 index 0000000000..61808b7c54 --- /dev/null +++ b/french/dessine/miel/forest/fuite/champs-de-fleurs/champs-de-fleurs.md @@ -0,0 +1,5 @@ +Alors que l'ours est occupé à se gaver de miel, vous vous éclipser discrètement. +Voyant une porte dérobée, vous la prenez et tomber nez-à-nez avec un immense champs de fleurs. +Vous décider de traverser ce champs mais après quelques mètres, vous ressentez une étrange fatigue. + +[Reprendre le chemin inverse](https://github.com/udacity/create-your-own-adventure/blob/master/french/dessine/porte.md). From 844c2775f4e09e274d831034bb3e5c64d6fcbec2 Mon Sep 17 00:00:00 2001 From: SUNGJOON LIM Date: Mon, 31 Oct 2016 23:25:02 +0900 Subject: [PATCH 4605/5486] Add option to sleep in crying state --- korean/cry/cry.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/korean/cry/cry.md b/korean/cry/cry.md index e9bf7ff393..1d8c684ccb 100644 --- a/korean/cry/cry.md +++ b/korean/cry/cry.md @@ -9,3 +9,5 @@ [마시멜로를 먹는다](../eating-walls/eating-marshmallows.md) [노래를 부른다](../sing-a-song/song.md) + +[잠을 잔다](../sleep/marshmallow.md) From 55fd3d60b207a8dc45d725e42f923b5dd2aa9265 Mon Sep 17 00:00:00 2001 From: Wapika Date: Mon, 31 Oct 2016 17:07:03 +0100 Subject: [PATCH 4606/5486] fix typo --- french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md diff --git a/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md b/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md new file mode 100644 index 0000000000..b799a03f39 --- /dev/null +++ b/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md @@ -0,0 +1,5 @@ +Alors que l'ours est occupé à se gaver de miel, vous vous éclipsez discrètement. +Voyant une porte dérobée, vous la prenez et tomber nez-à-nez avec un immense champs de fleurs. +Vous décider de traverser ce champs mais après quelques mètres, vous ressentez une étrange fatigue. + +[Reprendre le chemin inverse](https://github.com/udacity/create-your-own-adventure/blob/master/french/dessine/porte.md). From 567d40d39d11744a128773b944289d5249cb8f9a Mon Sep 17 00:00:00 2001 From: Wapika Date: Mon, 31 Oct 2016 17:13:07 +0100 Subject: [PATCH 4607/5486] add option --- .../miel/forest/fuite/champs-de-fleurs/champs-de-fleurs.md | 5 ----- french/dessine/miel/forest/fuite/fuite.md | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 french/dessine/miel/forest/fuite/champs-de-fleurs/champs-de-fleurs.md diff --git a/french/dessine/miel/forest/fuite/champs-de-fleurs/champs-de-fleurs.md b/french/dessine/miel/forest/fuite/champs-de-fleurs/champs-de-fleurs.md deleted file mode 100644 index 61808b7c54..0000000000 --- a/french/dessine/miel/forest/fuite/champs-de-fleurs/champs-de-fleurs.md +++ /dev/null @@ -1,5 +0,0 @@ -Alors que l'ours est occupé à se gaver de miel, vous vous éclipser discrètement. -Voyant une porte dérobée, vous la prenez et tomber nez-à-nez avec un immense champs de fleurs. -Vous décider de traverser ce champs mais après quelques mètres, vous ressentez une étrange fatigue. - -[Reprendre le chemin inverse](https://github.com/udacity/create-your-own-adventure/blob/master/french/dessine/porte.md). diff --git a/french/dessine/miel/forest/fuite/fuite.md b/french/dessine/miel/forest/fuite/fuite.md index b55105e2da..28b1c2e1f0 100644 --- a/french/dessine/miel/forest/fuite/fuite.md +++ b/french/dessine/miel/forest/fuite/fuite.md @@ -1,2 +1,4 @@ Je decide de me sauver de l'ours en courrant vers la porte par laquelle je -suis passe. Apres quelques pas l'ours m'a rattrape et se delecte du miel... \ No newline at end of file +suis passe. Apres quelques pas l'ours m'a rattrape et se delecte du miel... + +[En profiter pour s'éclipser](https://github.com/Wapika/create-your-own-adventure/blob/champs-de-fleurs/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md). From 8d3a2cc7395d2bc99a18df52fedfe4ede8151d8a Mon Sep 17 00:00:00 2001 From: Wapika Date: Mon, 31 Oct 2016 17:21:48 +0100 Subject: [PATCH 4608/5486] fix relative links --- french/dessine/miel/forest/fuite/fuite.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/french/dessine/miel/forest/fuite/fuite.md b/french/dessine/miel/forest/fuite/fuite.md index 28b1c2e1f0..18990fb249 100644 --- a/french/dessine/miel/forest/fuite/fuite.md +++ b/french/dessine/miel/forest/fuite/fuite.md @@ -1,4 +1,4 @@ Je decide de me sauver de l'ours en courrant vers la porte par laquelle je suis passe. Apres quelques pas l'ours m'a rattrape et se delecte du miel... -[En profiter pour s'éclipser](https://github.com/Wapika/create-your-own-adventure/blob/champs-de-fleurs/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md). +[En profiter pour s'éclipser](champs/champs-de-fleurs.md). From e4b6862af3070713375e6f2850aa3ae59a6f9ac1 Mon Sep 17 00:00:00 2001 From: Wapika Date: Mon, 31 Oct 2016 17:29:02 +0100 Subject: [PATCH 4609/5486] fix relative path --- french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md b/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md index b799a03f39..499587981f 100644 --- a/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md +++ b/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md @@ -2,4 +2,4 @@ Alors que l'ours est occupé à se gaver de miel, vous vous éclipsez discrètem Voyant une porte dérobée, vous la prenez et tomber nez-à-nez avec un immense champs de fleurs. Vous décider de traverser ce champs mais après quelques mètres, vous ressentez une étrange fatigue. -[Reprendre le chemin inverse](https://github.com/udacity/create-your-own-adventure/blob/master/french/dessine/porte.md). +[Reprendre le chemin inverse](french/dessine/porte.md). From 31ae6dca0b7b68a00a3bc7ad2ae6ac1fc9d7c08a Mon Sep 17 00:00:00 2001 From: Wapika Date: Mon, 31 Oct 2016 17:33:04 +0100 Subject: [PATCH 4610/5486] fix relative links --- french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md b/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md index 499587981f..ca7babd00d 100644 --- a/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md +++ b/french/dessine/miel/forest/fuite/champs/champs-de-fleurs.md @@ -2,4 +2,4 @@ Alors que l'ours est occupé à se gaver de miel, vous vous éclipsez discrètem Voyant une porte dérobée, vous la prenez et tomber nez-à-nez avec un immense champs de fleurs. Vous décider de traverser ce champs mais après quelques mètres, vous ressentez une étrange fatigue. -[Reprendre le chemin inverse](french/dessine/porte.md). +[Reprendre le chemin inverse](../../../../porte.md). From 86e4186ae887ce1e800de805ee3ffced168b913d Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Mon, 31 Oct 2016 19:36:09 +0100 Subject: [PATCH 4611/5486] Added a link to new_friend to beer_sandwich --- .../forest/drag/roaming_spirit/beer_sandwich/beer_sandwich.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/forest/drag/roaming_spirit/beer_sandwich/beer_sandwich.md b/english/forest/drag/roaming_spirit/beer_sandwich/beer_sandwich.md index d888f5848c..383a84955a 100644 --- a/english/forest/drag/roaming_spirit/beer_sandwich/beer_sandwich.md +++ b/english/forest/drag/roaming_spirit/beer_sandwich/beer_sandwich.md @@ -4,3 +4,6 @@ He laughs and say he was gonna ask you the same thing. Instead he remarks on how he didn't know spirits got hungry. You both laugh. I guess you made a new friend, but you're both still hungry. + +Your new friend asks you if you know anything about spirits and +you tell him [that you do know something about them](new_friend/new_friend.md). From a4b6cc14fe6cb5cb83f5c79dda947bd720591847 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Mon, 31 Oct 2016 19:37:38 +0100 Subject: [PATCH 4612/5486] Added text to new_friend.md --- .../drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md diff --git a/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md b/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md new file mode 100644 index 0000000000..8e47708174 --- /dev/null +++ b/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md @@ -0,0 +1 @@ +You tell him that you know about an old tale that says that spirits can interact with living creatures From b9f4f60ed9ded17476006c9c33ca0b7694bf0777 Mon Sep 17 00:00:00 2001 From: Konstantinos Dimakis Date: Mon, 31 Oct 2016 20:49:43 +0200 Subject: [PATCH 4613/5486] Add on 33hours/explore-outside story --- english/33hours/explore-outside/outside.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/33hours/explore-outside/outside.md b/english/33hours/explore-outside/outside.md index 620bfa5c58..169220d45b 100644 --- a/english/33hours/explore-outside/outside.md +++ b/english/33hours/explore-outside/outside.md @@ -5,4 +5,5 @@ left and your right. You stand there several minutes, but see no cars at all. The motel parking lot is completely empty. It looks to be abandoned. There are no other buildings around for as far as you can see. -[Go back inside and explore the motel room.](../explore-room/room.md) \ No newline at end of file +[Go back inside and explore the motel room.](../explore-room/room.md) +[Start walking east, on the highway](./explore-east.md) \ No newline at end of file From 3f3aebac4e57428883e29fcd85429382d21ba737 Mon Sep 17 00:00:00 2001 From: Konstantinos Dimakis Date: Mon, 31 Oct 2016 20:59:34 +0200 Subject: [PATCH 4614/5486] big: fix link --- english/33hours/explore-outside/outside.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/33hours/explore-outside/outside.md b/english/33hours/explore-outside/outside.md index 169220d45b..33420d1419 100644 --- a/english/33hours/explore-outside/outside.md +++ b/english/33hours/explore-outside/outside.md @@ -6,4 +6,5 @@ The motel parking lot is completely empty. It looks to be abandoned. There are n you can see. [Go back inside and explore the motel room.](../explore-room/room.md) -[Start walking east, on the highway](./explore-east.md) \ No newline at end of file + +[Start walking east, on the highway](/explore-east.md) \ No newline at end of file From 9ac48f3729d3d9616c67bd83bf1a30dac1c0b3f7 Mon Sep 17 00:00:00 2001 From: Konstantinos Dimakis Date: Mon, 31 Oct 2016 21:01:16 +0200 Subject: [PATCH 4615/5486] bug: fix link 2 --- english/33hours/explore-outside/outside.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/33hours/explore-outside/outside.md b/english/33hours/explore-outside/outside.md index 33420d1419..aa7e1daef9 100644 --- a/english/33hours/explore-outside/outside.md +++ b/english/33hours/explore-outside/outside.md @@ -7,4 +7,4 @@ you can see. [Go back inside and explore the motel room.](../explore-room/room.md) -[Start walking east, on the highway](/explore-east.md) \ No newline at end of file +[Start walking east, on the highway](../explore-room/explore-east.md) \ No newline at end of file From 117f46d20789b7088f0ddf6416e716f3f8f48035 Mon Sep 17 00:00:00 2001 From: Konstantinos Dimakis Date: Mon, 31 Oct 2016 21:04:12 +0200 Subject: [PATCH 4616/5486] bug: fix link 3 --- english/33hours/explore-outside/outside.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/33hours/explore-outside/outside.md b/english/33hours/explore-outside/outside.md index aa7e1daef9..d8ce1008f7 100644 --- a/english/33hours/explore-outside/outside.md +++ b/english/33hours/explore-outside/outside.md @@ -7,4 +7,4 @@ you can see. [Go back inside and explore the motel room.](../explore-room/room.md) -[Start walking east, on the highway](../explore-room/explore-east.md) \ No newline at end of file +[Start walking east, on the highway](create-your-own-adventure/english/33hours/explore-outside/explore-east.md) \ No newline at end of file From 178a8aedf2c3ae117fbcc57a63736325c59dbcca Mon Sep 17 00:00:00 2001 From: nomis Date: Mon, 31 Oct 2016 21:58:40 +0100 Subject: [PATCH 4617/5486] New part of the story --- german/schwimmen/insel/fs_aussen/fragen/fragen.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 german/schwimmen/insel/fs_aussen/fragen/fragen.md diff --git a/german/schwimmen/insel/fs_aussen/fragen/fragen.md b/german/schwimmen/insel/fs_aussen/fragen/fragen.md new file mode 100644 index 0000000000..042e1981c3 --- /dev/null +++ b/german/schwimmen/insel/fs_aussen/fragen/fragen.md @@ -0,0 +1,11 @@ +Du wendest dich dem lteren Herren zu, der etwas verlegen guckt, und nach einer Pause fragst du: Was +ist hier los, wie knnen Sie mich erwarten? Haben Sie mich hierher gebracht? +Dann denkst du, das kann doch nicht sein, ich bin doch selbst hier her geschwommen. Es kann doch gar +keiner wissen, wo ich lang schwimmen wrde. Eigentlich solltest du Angst haben, aber du fhlst dich +sicher, nur sehr verwirrt. Ein starkes Gefhl sagt dir, dass du hier richtig bist. +Ich wei was Sie denken, es geht jedem so. Antwortet der Herr. Die Insel gehrt zu unserer Tarnvor- +richtung, alles Andere wrde ich Ihnen gerne spter erklren. Wir haben Sie schon lange begleitet, +wir kennen Sie gut nun wird es Zeit, dass Sie auch uns kennen lernen. Bitte begleiten Sie mich. + +Du bist verwirrt aber gleichzeitig auch neugierig und +[folgst seiner Aufforderung ohne weitere Fragen.](./fs_innen/fs_innen.md) From 4c977c2e9cdd99a5259b12a8d63deb8fa11b8448 Mon Sep 17 00:00:00 2001 From: Konstantinos Dimakis Date: Mon, 31 Oct 2016 23:00:07 +0200 Subject: [PATCH 4618/5486] bug: fix link 4 --- english/33hours/explore-outside/outside.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/33hours/explore-outside/outside.md b/english/33hours/explore-outside/outside.md index d8ce1008f7..6bf8cdc58b 100644 --- a/english/33hours/explore-outside/outside.md +++ b/english/33hours/explore-outside/outside.md @@ -7,4 +7,4 @@ you can see. [Go back inside and explore the motel room.](../explore-room/room.md) -[Start walking east, on the highway](create-your-own-adventure/english/33hours/explore-outside/explore-east.md) \ No newline at end of file +[Start walking east, on the highway](explore-east.md) \ No newline at end of file From 7fcc9626ae67e4a61540d9255b9d2466039f7413 Mon Sep 17 00:00:00 2001 From: Konstantinos Dimakis Date: Mon, 31 Oct 2016 23:02:45 +0200 Subject: [PATCH 4619/5486] bug: fix link 5 --- english/33hours/explore-outside/outside.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/33hours/explore-outside/outside.md b/english/33hours/explore-outside/outside.md index 6bf8cdc58b..7138eb1369 100644 --- a/english/33hours/explore-outside/outside.md +++ b/english/33hours/explore-outside/outside.md @@ -7,4 +7,4 @@ you can see. [Go back inside and explore the motel room.](../explore-room/room.md) -[Start walking east, on the highway](explore-east.md) \ No newline at end of file +[Start walking east, on the highway](./explore-east.md) \ No newline at end of file From 0ecd57b59e34dcc2ac672240c2eeb97425c11242 Mon Sep 17 00:00:00 2001 From: nomis Date: Mon, 31 Oct 2016 22:03:21 +0100 Subject: [PATCH 4620/5486] Add new option to fs_aussen --- german/schwimmen/insel/fs_aussen/fs_aussen.md | 1 + 1 file changed, 1 insertion(+) diff --git a/german/schwimmen/insel/fs_aussen/fs_aussen.md b/german/schwimmen/insel/fs_aussen/fs_aussen.md index 715bd8298f..9d041df67b 100644 --- a/german/schwimmen/insel/fs_aussen/fs_aussen.md +++ b/german/schwimmen/insel/fs_aussen/fs_aussen.md @@ -10,4 +10,5 @@ genauer gesagt: gleitet deine Hand vollkommen berührungslos durch eben diesen Z Offenbar ist dieser Strauch, ja ist der ganze Waldsaum nicht real, sonder eine Art Projektion. +Du wendest dich dem älteren Herren zu um ihn zu fragen, was hier eigentlich passiert. [Zurück](../insel.md) From f808a5877040cb098c1710b3098d5528763b9c00 Mon Sep 17 00:00:00 2001 From: nomis Date: Mon, 31 Oct 2016 22:06:19 +0100 Subject: [PATCH 4621/5486] add link to option --- german/schwimmen/insel/fs_aussen/fs_aussen.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/schwimmen/insel/fs_aussen/fs_aussen.md b/german/schwimmen/insel/fs_aussen/fs_aussen.md index 9d041df67b..8ce9f08acb 100644 --- a/german/schwimmen/insel/fs_aussen/fs_aussen.md +++ b/german/schwimmen/insel/fs_aussen/fs_aussen.md @@ -10,5 +10,6 @@ genauer gesagt: gleitet deine Hand vollkommen berührungslos durch eben diesen Z Offenbar ist dieser Strauch, ja ist der ganze Waldsaum nicht real, sonder eine Art Projektion. -Du wendest dich dem älteren Herren zu um ihn zu fragen, was hier eigentlich passiert. +Du wendest dich dem älteren Herren zu um ihn zu fragen, was hier eigentlich passiert. [Fragen](./fragen/fragen.md) + [Zurück](../insel.md) From 9ca00ab64297d8e2eba0c0b99105e2173311a5f0 Mon Sep 17 00:00:00 2001 From: Konstantinos Dimakis Date: Mon, 31 Oct 2016 23:08:02 +0200 Subject: [PATCH 4622/5486] bug: fix link 6 --- english/33hours/explore-outside/outside.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/33hours/explore-outside/outside.md b/english/33hours/explore-outside/outside.md index 7138eb1369..6777e59d81 100644 --- a/english/33hours/explore-outside/outside.md +++ b/english/33hours/explore-outside/outside.md @@ -7,4 +7,4 @@ you can see. [Go back inside and explore the motel room.](../explore-room/room.md) -[Start walking east, on the highway](./explore-east.md) \ No newline at end of file +[Start walking east, on the highway](explore-outside-east/explore-east.md) \ No newline at end of file From cf61820e00ffc29f0ec12ced66a5a540ab19daa0 Mon Sep 17 00:00:00 2001 From: Konstantinos Dimakis Date: Mon, 31 Oct 2016 23:09:38 +0200 Subject: [PATCH 4623/5486] bug: fix link 7 --- .../33hours/explore-outside/explore-outside-east/explore-east.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 english/33hours/explore-outside/explore-outside-east/explore-east.md diff --git a/english/33hours/explore-outside/explore-outside-east/explore-east.md b/english/33hours/explore-outside/explore-outside-east/explore-east.md new file mode 100644 index 0000000000..e69de29bb2 From f9a6825d80965e05c16125287a5a7185bf045608 Mon Sep 17 00:00:00 2001 From: Konstantinos Dimakis Date: Mon, 31 Oct 2016 23:11:04 +0200 Subject: [PATCH 4624/5486] bug: fix link 8 --- .../33hours/explore-outside/explore-outside-east/explore-east.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/33hours/explore-outside/explore-outside-east/explore-east.md b/english/33hours/explore-outside/explore-outside-east/explore-east.md index e69de29bb2..baa70ced00 100644 --- a/english/33hours/explore-outside/explore-outside-east/explore-east.md +++ b/english/33hours/explore-outside/explore-outside-east/explore-east.md @@ -0,0 +1 @@ +Suddenly a car shows up and it's heading right towards you. \ No newline at end of file From 1e9609da92c7a873a903e53ec87f1627a8e0df68 Mon Sep 17 00:00:00 2001 From: nomis Date: Mon, 31 Oct 2016 22:27:42 +0100 Subject: [PATCH 4625/5486] Fix link in fragen --- german/schwimmen/insel/fs_aussen/fragen/fragen.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/schwimmen/insel/fs_aussen/fragen/fragen.md b/german/schwimmen/insel/fs_aussen/fragen/fragen.md index 042e1981c3..9d9d29634a 100644 --- a/german/schwimmen/insel/fs_aussen/fragen/fragen.md +++ b/german/schwimmen/insel/fs_aussen/fragen/fragen.md @@ -8,4 +8,4 @@ richtung, alles Andere w wir kennen Sie gut nun wird es Zeit, dass Sie auch uns kennen lernen. Bitte begleiten Sie mich. Du bist verwirrt aber gleichzeitig auch neugierig und -[folgst seiner Aufforderung ohne weitere Fragen.](./fs_innen/fs_innen.md) +[folgst seiner Aufforderung ohne weitere Fragen.](../../fs_innen/fs_innen.md) From a08242e828773a7f6a47d58e69ed25b66ac285bb Mon Sep 17 00:00:00 2001 From: nomis Date: Mon, 31 Oct 2016 22:37:57 +0100 Subject: [PATCH 4626/5486] =?UTF-8?q?Add=20link=20zur=C3=BCck=20to=20page?= =?UTF-8?q?=20fragen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/schwimmen/insel/fs_aussen/fragen/fragen.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/german/schwimmen/insel/fs_aussen/fragen/fragen.md b/german/schwimmen/insel/fs_aussen/fragen/fragen.md index 9d9d29634a..4fe62c2f27 100644 --- a/german/schwimmen/insel/fs_aussen/fragen/fragen.md +++ b/german/schwimmen/insel/fs_aussen/fragen/fragen.md @@ -9,3 +9,5 @@ wir kennen Sie gut Du bist verwirrt aber gleichzeitig auch neugierig und [folgst seiner Aufforderung ohne weitere Fragen.](../../fs_innen/fs_innen.md) + +[Zurck](../fs_aussen.md) From 8a8f942160344657efef90fe49b8a3340980616d Mon Sep 17 00:00:00 2001 From: Kyohei Mizutani Date: Tue, 1 Nov 2016 17:31:03 +0900 Subject: [PATCH 4627/5486] Add story --- japanese/cold/cold.md | 4 +++- japanese/hello/hello.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 japanese/hello/hello.md diff --git a/japanese/cold/cold.md b/japanese/cold/cold.md index d8266dca3f..3fc4235cc3 100644 --- a/japanese/cold/cold.md +++ b/japanese/cold/cold.md @@ -1 +1,3 @@ -なんか急に寒くなってきた。窓際から「助けて～」らしき女性の声を聞こえ振り向くと、白衣の女性が座っている。 \ No newline at end of file +なんか急に寒くなってきた。窓際から「助けて～」らしき女性の声を聞こえ振り向くと、白衣の女性が座っている。 + +気になったので[声をかける](../hello/hello.md) \ No newline at end of file diff --git a/japanese/hello/hello.md b/japanese/hello/hello.md new file mode 100644 index 0000000000..3bbda56616 --- /dev/null +++ b/japanese/hello/hello.md @@ -0,0 +1 @@ +女性はゆっくりと顔をあげる。街頭に照らされた彼女の顔は... \ No newline at end of file From 577a7425809cae814247a8225f1a01de98bff8d9 Mon Sep 17 00:00:00 2001 From: Egor Konovalov Date: Tue, 1 Nov 2016 13:56:14 +0300 Subject: [PATCH 4628/5486] =?UTF-8?q?docs:=20=D0=BF=D1=80=D0=BE=D0=B4?= =?UTF-8?q?=D0=BE=D0=BB=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- russian/instagram/instagram.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/russian/instagram/instagram.md b/russian/instagram/instagram.md index 2524b89d37..df93a379cd 100644 --- a/russian/instagram/instagram.md +++ b/russian/instagram/instagram.md @@ -1 +1,3 @@ -Внезапно увидев фотки со вчерашнего вечера становиться ясно как я попал сюда, но что же делать дальше? \ No newline at end of file +Внезапно увидев фотки со вчерашнего вечера становиться ясно как я попал сюда, но что же делать дальше? + +Единственная мысль которая приходит на ум - позвонить снова тому лысому демону который преложил выбрать из двух таблеток одну. From b2cf12af326f494e2d0aae88d25c055ec21a8951 Mon Sep 17 00:00:00 2001 From: Egor Konovalov Date: Tue, 1 Nov 2016 14:11:06 +0300 Subject: [PATCH 4629/5486] =?UTF-8?q?=D0=91=D0=B5=D1=81=D0=B5=D0=B4=D0=B0?= =?UTF-8?q?=20=D1=81=20=D0=94=D0=B5=D0=BC=D0=BE=D0=BD=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- russian/instagram/demon-story/demon.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 russian/instagram/demon-story/demon.md diff --git a/russian/instagram/demon-story/demon.md b/russian/instagram/demon-story/demon.md new file mode 100644 index 0000000000..8b53be5967 --- /dev/null +++ b/russian/instagram/demon-story/demon.md @@ -0,0 +1,5 @@ +- Хе-хе. Очнулся таки, путешественничек. Давай там долго не засиживайся, а то скоро вернется Ведьмочка-Танечка и ты можешь +сильно испортить себе настроение поняв с кем ты вчера уснул. У нас на сегодня с тобой много дел. В отделе зеленых чертей +случился локальный кризис - пришел большой заказ на "привидиться" ряду высокопоставленных персонажей. +Надеюсь ты не забыл, что работаешь теперь на меня? + From 606ea7fdbb2fb8f2b3d46098274bed4e0a48007f Mon Sep 17 00:00:00 2001 From: Egor Konovalov Date: Tue, 1 Nov 2016 14:15:01 +0300 Subject: [PATCH 4630/5486] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BA=20=D0=B1=D0=B5=D1=81=D0=B5=D0=B4=D0=B5=20=D1=81?= =?UTF-8?q?=20=D0=94=D0=B5=D0=BC=D0=BE=D0=BD=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- russian/instagram/instagram.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/russian/instagram/instagram.md b/russian/instagram/instagram.md index df93a379cd..bce4585e1f 100644 --- a/russian/instagram/instagram.md +++ b/russian/instagram/instagram.md @@ -1,3 +1,5 @@ Внезапно увидев фотки со вчерашнего вечера становиться ясно как я попал сюда, но что же делать дальше? Единственная мысль которая приходит на ум - позвонить снова тому лысому демону который преложил выбрать из двух таблеток одну. + +[Позвонить на странный номер Демона] (/demon-story/demon.md) From 1a8c0c4ec2ee0962496a7fa7fe2e78297c0ff15f Mon Sep 17 00:00:00 2001 From: Egor Konovalov Date: Tue, 1 Nov 2016 14:17:24 +0300 Subject: [PATCH 4631/5486] =?UTF-8?q?=D0=9F=D1=83=D1=82=D1=8C=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=BE=D0=BB=D0=B6=D0=B5=D0=BD=20=D0=BD=D0=B0?= =?UTF-8?q?=D1=87=D0=B8=D0=BD=D0=B0=D1=82=D1=8C=D1=81=D1=8F=20=D1=81=20'/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- russian/instagram/instagram.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/instagram/instagram.md b/russian/instagram/instagram.md index bce4585e1f..c1b3be5c62 100644 --- a/russian/instagram/instagram.md +++ b/russian/instagram/instagram.md @@ -2,4 +2,4 @@ Единственная мысль которая приходит на ум - позвонить снова тому лысому демону который преложил выбрать из двух таблеток одну. -[Позвонить на странный номер Демона] (/demon-story/demon.md) +[Позвонить на странный номер Демона] (demon-story/demon.md) From 9b2798c884084f432f35c9474301f22939060a68 Mon Sep 17 00:00:00 2001 From: Egor Konovalov Date: Tue, 1 Nov 2016 16:44:02 +0300 Subject: [PATCH 4632/5486] =?UTF-8?q?=D0=A1=D1=82=D1=80=D0=BE=D0=BA=D0=B0?= =?UTF-8?q?=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BA=D0=BE=D1=80?= =?UTF-8?q?=D0=BE=D1=87=D0=B5=20120=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- russian/instagram/demon-story/demon.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/russian/instagram/demon-story/demon.md b/russian/instagram/demon-story/demon.md index 8b53be5967..8afde56e80 100644 --- a/russian/instagram/demon-story/demon.md +++ b/russian/instagram/demon-story/demon.md @@ -1,5 +1,5 @@ -- Хе-хе. Очнулся таки, путешественничек. Давай там долго не засиживайся, а то скоро вернется Ведьмочка-Танечка и ты можешь -сильно испортить себе настроение поняв с кем ты вчера уснул. У нас на сегодня с тобой много дел. В отделе зеленых чертей -случился локальный кризис - пришел большой заказ на "привидиться" ряду высокопоставленных персонажей. -Надеюсь ты не забыл, что работаешь теперь на меня? +- Хе-хе. Очнулся таки, путешественничек. Давай там долго не засиживайся, а то скоро вернется Ведьмочка-Танечка +и ты можешь сильно испортить себе настроение поняв с кем ты вчера уснул. У нас на сегодня с тобой много дел. +В отделе зеленых чертей случился локальный кризис - пришел большой заказ на "привидиться" +ряду высокопоставленных персонажей. Надеюсь ты не забыл, что работаешь теперь на меня? From 1386b8ae698274eb9d9c9f9bf96ab6a610e6c813 Mon Sep 17 00:00:00 2001 From: Egor Konovalov Date: Tue, 1 Nov 2016 16:47:34 +0300 Subject: [PATCH 4633/5486] =?UTF-8?q?=D0=A1=D1=82=D1=80=D0=BE=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BA=D0=BE=D1=80=D0=BE=D1=87=D0=B5=20120=20=D1=81=D0=B8?= =?UTF-8?q?=D0=BC=D0=B2=D0=BE=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- russian/instagram/instagram.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/instagram/instagram.md b/russian/instagram/instagram.md index c1b3be5c62..8f010ee051 100644 --- a/russian/instagram/instagram.md +++ b/russian/instagram/instagram.md @@ -1,5 +1,6 @@ Внезапно увидев фотки со вчерашнего вечера становиться ясно как я попал сюда, но что же делать дальше? -Единственная мысль которая приходит на ум - позвонить снова тому лысому демону который преложил выбрать из двух таблеток одну. +Единственная мысль которая приходит на ум - позвонить снова тому лысому демону который преложил +выбрать из двух таблеток одну. [Позвонить на странный номер Демона] (demon-story/demon.md) From 1c887b0fbe8c5d890ac895ad3e8869a868793ab0 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 1 Nov 2016 14:39:29 -0700 Subject: [PATCH 4634/5486] meet donkey IA :) --- russian/eating-walls/breakfast/visit-rabbit/visit-rabbit.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/eating-walls/breakfast/visit-rabbit/visit-rabbit.md b/russian/eating-walls/breakfast/visit-rabbit/visit-rabbit.md index 3f3d935104..799eaced8b 100644 --- a/russian/eating-walls/breakfast/visit-rabbit/visit-rabbit.md +++ b/russian/eating-walls/breakfast/visit-rabbit/visit-rabbit.md @@ -1,4 +1,5 @@ Подойдя к песчаному косогору вы обнаруживаете, что вход в нору Кролика выложен зефиром, а коврик вообще сделан из шоколада. -Ну вот, как же теперь ноги вытирать?! \ No newline at end of file +Ну вот, как же теперь ноги вытирать?! +Рядом стоит ослик ИА и доедает звонок из пастилы. \ No newline at end of file From d746c608c14afc4c408a06b5de911c4edb4ea202 Mon Sep 17 00:00:00 2001 From: Maurizio Pucci Date: Tue, 1 Nov 2016 23:50:36 +0100 Subject: [PATCH 4635/5486] feat(italian): add new option --- Italian/caramelle.md | 4 +++- Italian/luce/luce.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Italian/luce/luce.md diff --git a/Italian/caramelle.md b/Italian/caramelle.md index 3ae305499e..c5d690890d 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -27,4 +27,6 @@ Che fai? [Telefono ad Antonio Conte](antonio_conte/antonio.md) -[Lavorare](lavorare/lavorare.md) \ No newline at end of file +[Lavorare](lavorare/lavorare.md) + +[Accendo la luce](luce/luce.md) diff --git a/Italian/luce/luce.md b/Italian/luce/luce.md new file mode 100644 index 0000000000..37bbc4fc46 --- /dev/null +++ b/Italian/luce/luce.md @@ -0,0 +1 @@ +Allungo la mano alla ricerca di un interruttore. From 3ab014ac12d10c9b80cf00b0969a947101003e8c Mon Sep 17 00:00:00 2001 From: plvilla Date: Thu, 3 Nov 2016 01:54:29 +0800 Subject: [PATCH 4636/5486] Update salamat.md Add meow line and link to meow/meow.md --- Philippines/salamat.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index abf9412636..10a748df86 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -17,3 +17,5 @@ Kamakailan ay nanalong Presidente si [Duterte] (duterte/duterte.md). O kung gusto mo namang kumain, tara [kain] (kain/kain.md) tayo ! Kinsay balo mag binisaya dinhi? + +meow meow meow? [meow!](meow/meow.md) From 7fe32962e36f5e6f1a36e3d4a182c3a42aae70f5 Mon Sep 17 00:00:00 2001 From: plvilla Date: Thu, 3 Nov 2016 01:56:31 +0800 Subject: [PATCH 4637/5486] Create meow.md --- Philippines/meow/meow.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Philippines/meow/meow.md diff --git a/Philippines/meow/meow.md b/Philippines/meow/meow.md new file mode 100644 index 0000000000..3d0ffaf283 --- /dev/null +++ b/Philippines/meow/meow.md @@ -0,0 +1,4 @@ +meow meow meow meow meow meow meow? +meow meow meow. +meow! +meow meow... MEWO! From b09d36c5208d69bebfaea2ed90f4c3a617f29087 Mon Sep 17 00:00:00 2001 From: plvilla Date: Thu, 3 Nov 2016 01:57:19 +0800 Subject: [PATCH 4638/5486] Update meow.md --- Philippines/meow/meow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Philippines/meow/meow.md b/Philippines/meow/meow.md index 3d0ffaf283..8f07db54d5 100644 --- a/Philippines/meow/meow.md +++ b/Philippines/meow/meow.md @@ -1,4 +1,4 @@ meow meow meow meow meow meow meow? meow meow meow. meow! -meow meow... MEWO! +meow meow... [MEWO!](../salamat.md) From 9d807126332d94e2e7f1aa34123c96e061b5f5d1 Mon Sep 17 00:00:00 2001 From: wxhgit Date: Wed, 2 Nov 2016 16:41:17 -0700 Subject: [PATCH 4639/5486] add first line --- .../\346\221\270\351\207\221\346\240\241\345\260\211.md" | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git "a/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" "b/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" index 26ebec4ef8..4cc8d60c33 100644 --- "a/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" +++ "b/Chinese/\346\221\270\351\207\221\346\240\241\345\260\211/\346\221\270\351\207\221\346\240\241\345\260\211.md" @@ -1,2 +1,4 @@ 500年后化身胡八一，继承了摸金校尉的香火！ -寻找那彼岸之花。 \ No newline at end of file +寻找那彼岸之花。 + +自学成才的盗墓高手，用高科技手段探寻远古的秘密。绝不是为了古墓中那一点点金银财宝，而是要把另一个时间域的经历展现给今人。 \ No newline at end of file From 22a1cda3149261bef81a922c75f602007c1007f9 Mon Sep 17 00:00:00 2001 From: vivshaw Date: Wed, 2 Nov 2016 20:06:50 -0400 Subject: [PATCH 4640/5486] Add link to grue end --- english/run_out_the_door/run_out_the_door.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md index 5fa456515d..b3160e666c 100644 --- a/english/run_out_the_door/run_out_the_door.md +++ b/english/run_out_the_door/run_out_the_door.md @@ -18,3 +18,5 @@ You... [Go back inside](../marshmallow.md) and reclaim your rightful position in mediocrity. Decide to [start dancing bachata](../start-dancing/startDancing.md) and everybody start to clap and cheer you up. + +[Trip and stumble into a pitch-black cave.](grue/grue.md) From 72fbf73a4dbcf810ec3be44027510048ad0b5712 Mon Sep 17 00:00:00 2001 From: vivshaw Date: Wed, 2 Nov 2016 20:07:38 -0400 Subject: [PATCH 4641/5486] Create grue.md --- english/run_out_the_door/grue/grue.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/run_out_the_door/grue/grue.md diff --git a/english/run_out_the_door/grue/grue.md b/english/run_out_the_door/grue/grue.md new file mode 100644 index 0000000000..ca253a57e6 --- /dev/null +++ b/english/run_out_the_door/grue/grue.md @@ -0,0 +1,6 @@ +It is pitch black. You are likely to be eaten by a grue. + +But actually, these grues turn out to be Python devs. +You use your newfound GitHub powers to help the grues with some bugfixes in their latest open-source cave project. +They choose not to devour you, and you integrate peacefully into grue society. +FOSS saves the day again, and Richard Stallman cries a single tear of joy. From 5341f29548246ec66f979df3135d2cd731fb3269 Mon Sep 17 00:00:00 2001 From: wxhgit Date: Wed, 2 Nov 2016 17:54:44 -0700 Subject: [PATCH 4642/5486] add one line to little me --- english/little-me/little-me.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/little-me/little-me.md b/english/little-me/little-me.md index 0d95d3f40f..bb1b77c04f 100644 --- a/english/little-me/little-me.md +++ b/english/little-me/little-me.md @@ -8,4 +8,6 @@ You Choose To: [Feed him Candy](../little-me/Candy/Candy.md) -[Pray](../little-me/Pray/Pray.md) \ No newline at end of file +[Pray](../little-me/Pray/Pray.md) + +But now I became a real human being on earth. I don't know why, just as I don't know why at first I was a alien. \ No newline at end of file From 124f0405b52571cac169e47cd9d07462f1971c6b Mon Sep 17 00:00:00 2001 From: Flavio D Johansson Date: Wed, 2 Nov 2016 23:03:28 -0200 Subject: [PATCH 4643/5486] Add new option to the cockroach issue --- portugues/barata/Biluga/biluga.md | 6 ++++++ portugues/barata/baratadavizinha.md | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 portugues/barata/Biluga/biluga.md diff --git a/portugues/barata/Biluga/biluga.md b/portugues/barata/Biluga/biluga.md new file mode 100644 index 0000000000..821f9f3695 --- /dev/null +++ b/portugues/barata/Biluga/biluga.md @@ -0,0 +1,6 @@ +Diz aí Biluguinha o que "cê" vai fazer. +Eu vou comprar um inseticida pra me defender. +Diz aí Biluguinha o que "cê" vai fazer. +Eu vou comprar um soco pra me defender. + +Ele vai dar uma socada na barata dela ( x4 ) diff --git a/portugues/barata/baratadavizinha.md b/portugues/barata/baratadavizinha.md index bbc7ab1978..7acb03f8c3 100644 --- a/portugues/barata/baratadavizinha.md +++ b/portugues/barata/baratadavizinha.md @@ -15,4 +15,6 @@ a barata da vizinha está na minha cama. [Diz aí Alexandre o que "cê" vai fazer:](Alexandre/alexandre.md) +[Diz aí Biluguinha o que "cê" vai fazer:](Biluga/biluga.md) + E vc? O que "cê" vai fazer? \ No newline at end of file From a69759015f1401a586ee1f42f146b51e7ee5aee3 Mon Sep 17 00:00:00 2001 From: Flavio D Johansson Date: Wed, 2 Nov 2016 23:13:20 -0200 Subject: [PATCH 4644/5486] fix: Change inseticida to soco --- portugues/barata/Biluga/biluga.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portugues/barata/Biluga/biluga.md b/portugues/barata/Biluga/biluga.md index 821f9f3695..4bdf8814fd 100644 --- a/portugues/barata/Biluga/biluga.md +++ b/portugues/barata/Biluga/biluga.md @@ -1,5 +1,5 @@ Diz aí Biluguinha o que "cê" vai fazer. -Eu vou comprar um inseticida pra me defender. +Eu vou comprar um soco pra me defender. Diz aí Biluguinha o que "cê" vai fazer. Eu vou comprar um soco pra me defender. From 9b15561cb594e303d1f7198ca3e753eb2545d6d3 Mon Sep 17 00:00:00 2001 From: Paul Qua Date: Wed, 2 Nov 2016 22:17:46 -0500 Subject: [PATCH 4645/5486] Add new sentence to lawn-mower --- english/lawn-mower/lawn-mower.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/lawn-mower/lawn-mower.md b/english/lawn-mower/lawn-mower.md index 0e4d503c51..cb2eb439e8 100644 --- a/english/lawn-mower/lawn-mower.md +++ b/english/lawn-mower/lawn-mower.md @@ -6,4 +6,6 @@ You pull and pull and pull on the cord, but it just won't start. What do you do? +Buy a new one! + [Give up and keep exploring?](../explore-outside/explore-outside.md) \ No newline at end of file From 3225d79a2e4caa67f73aa0fe9663787333a489c3 Mon Sep 17 00:00:00 2001 From: naifalrashed Date: Thu, 3 Nov 2016 14:12:00 +0300 Subject: [PATCH 4646/5486] add programming resources for arabic language --- arabic/learn/whattolearn/programming/programming.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arabic/learn/whattolearn/programming/programming.md b/arabic/learn/whattolearn/programming/programming.md index a7e6b6aa80..f1080ca138 100644 --- a/arabic/learn/whattolearn/programming/programming.md +++ b/arabic/learn/whattolearn/programming/programming.md @@ -1,3 +1,5 @@ ممكن أن تبدأ [بهذا](https://www.udacity.com) وهذا ايضا [هنا](https://www.codeschool.com) + +وهذه بعض المحتوى العربي لتعلم البرمجة https://www.rwaq.org From 39bd5457f71d492be4a9ba02825dc24f9bd2ce27 Mon Sep 17 00:00:00 2001 From: "bharat.suri" Date: Thu, 3 Nov 2016 20:40:35 +0530 Subject: [PATCH 4647/5486] Add to life puzzle. --- english/LifePuzzle/LifePuzzle.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/LifePuzzle/LifePuzzle.md b/english/LifePuzzle/LifePuzzle.md index de51d5213b..94f0d0577c 100644 --- a/english/LifePuzzle/LifePuzzle.md +++ b/english/LifePuzzle/LifePuzzle.md @@ -6,6 +6,7 @@ so as to maintain your original density. You are then thrown into an empty glass blender. The blades will start moving in 60 seconds. What do you do? +I use the thrust generated by the blades to pull myself out of the blender. [Ask a question on Quora?](../ask-on-quora/ask-on-quora.md) From 7245e3ac712683f4a1e5a046eac152c67e323c5e Mon Sep 17 00:00:00 2001 From: Andre Date: Thu, 3 Nov 2016 16:26:01 +0000 Subject: [PATCH 4648/5486] Add story to portugues_pt/emprego/criar_emprego --- portugues_pt/colaborar.md | 4 +++- portugues_pt/emprego/criar_emprego.md | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 portugues_pt/emprego/criar_emprego.md diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index e5bf7fa540..30f5fc5b29 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -29,4 +29,6 @@ Lembra-se que deixou a [chaleira a ferver água](chaleira/chaleira.md). Para visitar Portugal clica [aqui](https://www.visitportugal.com/pt-pt). -[O que fazer](http://www.timeout.com/city-guides/things-to-do-in-lisbon/) em Lisboa. \ No newline at end of file +[O que fazer](http://www.timeout.com/city-guides/things-to-do-in-lisbon/) em Lisboa. + +Pensava numa forma de criar [emprego](emprego/criar_emprego.md) na minha terra natal. \ No newline at end of file diff --git a/portugues_pt/emprego/criar_emprego.md b/portugues_pt/emprego/criar_emprego.md new file mode 100644 index 0000000000..66728272fd --- /dev/null +++ b/portugues_pt/emprego/criar_emprego.md @@ -0,0 +1,3 @@ +1 - Estudar as potencialidades humanas e naturais da zona. +2 - +3 - \ No newline at end of file From 6dfcda60b0fc0ed7fdeeb148bfd00e7b18775280 Mon Sep 17 00:00:00 2001 From: AnaKupenov Date: Thu, 3 Nov 2016 16:15:29 -0700 Subject: [PATCH 4649/5486] add new story for main character with tied hands --- bulgarian/burning_room.md | 2 ++ bulgarian/tied_hands/tied_hands.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 bulgarian/tied_hands/tied_hands.md diff --git a/bulgarian/burning_room.md b/bulgarian/burning_room.md index 5773373cfa..f4e18858ac 100644 --- a/bulgarian/burning_room.md +++ b/bulgarian/burning_room.md @@ -21,3 +21,5 @@ 9. [Пиеш си хапчетата, взимаш от на Алексиев бурканитe](./Aleksiev/TodorAleksiev.md) 10. [Решаваш, че си попаднал в Твърде лично и ти си Лиъм Нийсън.](./taken/taken.md) + +11. [Протягаш ръка към пистолета, но установяваш че ръцете ти са вързани.](./tied_hands/tied_hands.md) diff --git a/bulgarian/tied_hands/tied_hands.md b/bulgarian/tied_hands/tied_hands.md new file mode 100644 index 0000000000..23c62938f7 --- /dev/null +++ b/bulgarian/tied_hands/tied_hands.md @@ -0,0 +1 @@ +Усешташ че те обхваща паника. Това е краят, или ...? From 13a60bd52200d796e6b2f3b510551d370ae13d4d Mon Sep 17 00:00:00 2001 From: James Small Date: Fri, 4 Nov 2016 14:58:48 -0400 Subject: [PATCH 4650/5486] Add new line supporting files --- english/persistent/persistent.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/persistent/persistent.md diff --git a/english/persistent/persistent.md b/english/persistent/persistent.md new file mode 100644 index 0000000000..92d9c9708a --- /dev/null +++ b/english/persistent/persistent.md @@ -0,0 +1,4 @@ +The great persist all the way to the end. What does it feel like to get there? + +[Ask Alex](http://www.russianmachineneverbreaks.com/wp-content/uploads/2015/03/alex-ovechkin-goal-50.jpg) + From ceec192635bedc11589d65b769636acab3b5fdf8 Mon Sep 17 00:00:00 2001 From: James Small Date: Fri, 4 Nov 2016 15:00:11 -0400 Subject: [PATCH 4651/5486] Add new line --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 883aed4be0..5cb2e4f21c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1160,4 +1160,6 @@ If you want to play soccer, click [here](Soccer/soccer.md) If you are a soccer fan, see your team [here](soccerfan/soccerfan.md) -I am also a soccer fan, I am a Man U fan from EPL. To see Man U click [here](ManU/ManU.md) \ No newline at end of file +I am also a soccer fan, I am a Man U fan from EPL. To see Man U click [here](ManU/ManU.md) + +Wow, you made it to the end! You are determined, [see](persistent/persistent.md) what awaits. From 2ebfbf5b0503c9d01f7f3b230c933a802523aba2 Mon Sep 17 00:00:00 2001 From: Monica Date: Sat, 5 Nov 2016 15:54:52 -0400 Subject: [PATCH 4652/5486] Add a warning line to the time-machine page. --- english/time-machine/time-machine.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/time-machine/time-machine.md b/english/time-machine/time-machine.md index 8c26229c95..beefa3de9d 100644 --- a/english/time-machine/time-machine.md +++ b/english/time-machine/time-machine.md @@ -1,4 +1,6 @@ I have already built the time machine, the machine is designed to use one-time and then it disappears. There is no way back to the current time. +So think carefully before you choose. + Which part of the world, and what time you want to travel? And why? From 0ffb0f2ff3a20065f0fe5f68f31e12117d6aa115 Mon Sep 17 00:00:00 2001 From: Echizen1605 <980561079@qq.com> Date: Sun, 6 Nov 2016 10:36:32 +0800 Subject: [PATCH 4653/5486] I change my_story. --- english/light-fire/fire.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/light-fire/fire.md b/english/light-fire/fire.md index 423cd4924c..c433362002 100644 --- a/english/light-fire/fire.md +++ b/english/light-fire/fire.md @@ -16,6 +16,7 @@ walls for you to squeeze through. But then you notice a rat entering that opening too. The rat smiles and says, "Come on, let's go!" +I add them. [Enter that opening](magic-world/alice.md) From 401a615734ed4eb3499879a8af68af19b2e0c0ed Mon Sep 17 00:00:00 2001 From: Echizen1605 <980561079@qq.com> Date: Sun, 6 Nov 2016 11:13:53 +0800 Subject: [PATCH 4654/5486] I think there is no conflict and now I am able to merge. --- english/light-fire/fire.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/light-fire/fire.md b/english/light-fire/fire.md index c433362002..f555892b89 100644 --- a/english/light-fire/fire.md +++ b/english/light-fire/fire.md @@ -17,6 +17,7 @@ But then you notice a rat entering that opening too. The rat smiles and says, "Come on, let's go!" I add them. +There is no conflict！ [Enter that opening](magic-world/alice.md) From e6214aaa519029cf7067ab89552f6c4ffe4a692f Mon Sep 17 00:00:00 2001 From: crperezt Date: Sat, 5 Nov 2016 21:50:18 -0700 Subject: [PATCH 4655/5486] Add time machine narratives. --- english/time-machine/time-machine.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/english/time-machine/time-machine.md b/english/time-machine/time-machine.md index beefa3de9d..6a177cd0da 100644 --- a/english/time-machine/time-machine.md +++ b/english/time-machine/time-machine.md @@ -4,3 +4,10 @@ There is no way back to the current time. So think carefully before you choose. Which part of the world, and what time you want to travel? And why? + +[You decide to travel to 2135 and say goodbye to the moonmen](https://www.youtube.com/watch?v=TgqiSBxvdws) + +[You travel to 2017 and meet with an Apple Engineer](https://www.youtube.com/watch?v=-XSC_UG5_kU) + +[You turn back](english/marshmallow.md) + From 258cab98bf09daa0e27331b4848eb33ec98c56c4 Mon Sep 17 00:00:00 2001 From: crperezt Date: Sat, 5 Nov 2016 21:59:10 -0700 Subject: [PATCH 4656/5486] Fix broken link --- english/time-machine/time-machine.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/time-machine/time-machine.md b/english/time-machine/time-machine.md index 6a177cd0da..348d5b6464 100644 --- a/english/time-machine/time-machine.md +++ b/english/time-machine/time-machine.md @@ -9,5 +9,5 @@ Which part of the world, and what time you want to travel? And why? [You travel to 2017 and meet with an Apple Engineer](https://www.youtube.com/watch?v=-XSC_UG5_kU) -[You turn back](english/marshmallow.md) +[You turn back](../marshmallow.md) From daef94666e1e5222378cd994d1f7b14fcb0b6cce Mon Sep 17 00:00:00 2001 From: WaiShen Date: Sun, 6 Nov 2016 20:01:17 +0800 Subject: [PATCH 4657/5486] Add the story of waishen --- Chinese/waishen/waishen_story.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Chinese/waishen/waishen_story.md diff --git a/Chinese/waishen/waishen_story.md b/Chinese/waishen/waishen_story.md new file mode 100644 index 0000000000..c87f73d001 --- /dev/null +++ b/Chinese/waishen/waishen_story.md @@ -0,0 +1 @@ +500年后转世为凡人，名曰歪神。养育了两只神兽龙猫。 \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 53ffa0dea2..4fd77aa7f0 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -144,4 +144,6 @@ [庐山恋](lushan/lushan_love_story.md) +[歪神现世](waishen/waishen_story.md) + [你以为可以点？] From c2601122d25ef6a44d2d14d0cb1580eae10d93fd Mon Sep 17 00:00:00 2001 From: Cassandra Carr Date: Sun, 6 Nov 2016 12:37:29 -0500 Subject: [PATCH 4658/5486] Add options to run.md --- english/work-out/run/run.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/work-out/run/run.md b/english/work-out/run/run.md index 11ab67ae54..12265c238e 100644 --- a/english/work-out/run/run.md +++ b/english/work-out/run/run.md @@ -1,4 +1,10 @@ You lace up your 10 year old tennis shoes and hit the road running. +What happens?: Unfortunatly you're not quite as fit as you were in highschool, and -turn around after half a kilometer. Better than nothing! \ No newline at end of file +turn around after half a kilometer. Better than nothing! +[kuddos-for-trying](kuddos-for-trying/kuddos-for-trying.md) + +Or... + +Your inspired to run a marathon! [marathon](marathon/marathon.md) \ No newline at end of file From 1fbb5b6cd16c00cc48a973d8aaff0a09e7ed3c88 Mon Sep 17 00:00:00 2001 From: Cassandra Carr Date: Sun, 6 Nov 2016 12:38:20 -0500 Subject: [PATCH 4659/5486] Add kuddos-for-trying.md and marathon.md as options for run.md --- english/work-out/run/kuddos-for-trying/kuddos-for-trying.md | 1 + english/work-out/run/marathon/marathon.md | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 english/work-out/run/kuddos-for-trying/kuddos-for-trying.md create mode 100644 english/work-out/run/marathon/marathon.md diff --git a/english/work-out/run/kuddos-for-trying/kuddos-for-trying.md b/english/work-out/run/kuddos-for-trying/kuddos-for-trying.md new file mode 100644 index 0000000000..3a457ca27c --- /dev/null +++ b/english/work-out/run/kuddos-for-trying/kuddos-for-trying.md @@ -0,0 +1 @@ +Congrats for trying! Now what to do? \ No newline at end of file diff --git a/english/work-out/run/marathon/marathon.md b/english/work-out/run/marathon/marathon.md new file mode 100644 index 0000000000..b7e8a6edd4 --- /dev/null +++ b/english/work-out/run/marathon/marathon.md @@ -0,0 +1,3 @@ +You're an inspiration and decided to sign up for a marathon! + +Now lace up those shoes and start your training! \ No newline at end of file From e180d674ad793d9932d83d68feb9d1925caafef1 Mon Sep 17 00:00:00 2001 From: Cassandra Carr Date: Sun, 6 Nov 2016 12:49:22 -0500 Subject: [PATCH 4660/5486] Fix typo --- english/work-out/run/run.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/work-out/run/run.md b/english/work-out/run/run.md index 12265c238e..19e30332aa 100644 --- a/english/work-out/run/run.md +++ b/english/work-out/run/run.md @@ -7,4 +7,4 @@ turn around after half a kilometer. Better than nothing! Or... -Your inspired to run a marathon! [marathon](marathon/marathon.md) \ No newline at end of file +You're inspired to run a marathon! [marathon](marathon/marathon.md) \ No newline at end of file From b714ab01e496227d8fe154b8e54b228fc20b2aae Mon Sep 17 00:00:00 2001 From: Cassandra Carr Date: Sun, 6 Nov 2016 13:09:48 -0500 Subject: [PATCH 4661/5486] Fix to run.md so no lines are deleted --- english/work-out/run/run.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/english/work-out/run/run.md b/english/work-out/run/run.md index 19e30332aa..a6c6f825f5 100644 --- a/english/work-out/run/run.md +++ b/english/work-out/run/run.md @@ -1,10 +1,13 @@ You lace up your 10 year old tennis shoes and hit the road running. -What happens?: Unfortunatly you're not quite as fit as you were in highschool, and -turn around after half a kilometer. Better than nothing! +turn around after half a kilometer. Better than nothing! + +Now what? +No more running for you! [kuddos-for-trying](kuddos-for-trying/kuddos-for-trying.md) Or... -You're inspired to run a marathon! [marathon](marathon/marathon.md) \ No newline at end of file +You're inspired to push through the pain and train +to run a marathon! [marathon](marathon/marathon.md) \ No newline at end of file From cfe5057d20d219f163d7563d79510c0c0086c73a Mon Sep 17 00:00:00 2001 From: Kyrylo Gryshko Date: Mon, 7 Nov 2016 00:20:40 +0200 Subject: [PATCH 4662/5486] finding chocolate while digging wall with fork --- ukrainian/make-a-hole/in-the-wall.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ukrainian/make-a-hole/in-the-wall.md b/ukrainian/make-a-hole/in-the-wall.md index 720bfbeb83..57aaac200a 100644 --- a/ukrainian/make-a-hole/in-the-wall.md +++ b/ukrainian/make-a-hole/in-the-wall.md @@ -1 +1,9 @@ -Оговтуюсь від шоку, беру виделку і виковирюю дирку у зефіровій стіні.. Що буде зі мною далі? \ No newline at end of file +Оговтуюсь від шоку, беру виделку і виковирюю дирку у зефіровій стіні. +Після двадцяти сантиметрів зефірової стіни потрапляю на шар шоколаду. +В кімнаті прохолодно і шоколад доволі твердий тож копати його важче ніж зефір. + +Думаю, що робити далі... + +[трошки поплакти бо нема з ким подiлитися шоколадом](../../Crying/crying-in-the-corner.md) + +[стерти коротку память та розпочати все спочатку наче нічого і не було](../../marshmallow.md) From f27277eda62b95363fc7b9cd4eef8eb1bd2cce41 Mon Sep 17 00:00:00 2001 From: Kyrylo Gryshko Date: Mon, 7 Nov 2016 00:22:36 +0200 Subject: [PATCH 4663/5486] Update in-the-wall.md --- ukrainian/make-a-hole/in-the-wall.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ukrainian/make-a-hole/in-the-wall.md b/ukrainian/make-a-hole/in-the-wall.md index 57aaac200a..81b5aa6e46 100644 --- a/ukrainian/make-a-hole/in-the-wall.md +++ b/ukrainian/make-a-hole/in-the-wall.md @@ -4,6 +4,6 @@ Думаю, що робити далі... -[трошки поплакти бо нема з ким подiлитися шоколадом](../../Crying/crying-in-the-corner.md) +[трошки поплакти бо нема з ким подiлитися шоколадом](../Crying/crying-in-the-corner.md) -[стерти коротку память та розпочати все спочатку наче нічого і не було](../../marshmallow.md) +[стерти коротку память та розпочати все спочатку наче нічого і не було](../marshmallow.md) From 924484f77860da0adcdcf74fff513e742ec43bdb Mon Sep 17 00:00:00 2001 From: Kyrylo Gryshko Date: Mon, 7 Nov 2016 00:23:44 +0200 Subject: [PATCH 4664/5486] Update in-the-wall.md --- ukrainian/make-a-hole/in-the-wall.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/make-a-hole/in-the-wall.md b/ukrainian/make-a-hole/in-the-wall.md index 81b5aa6e46..123fd4397b 100644 --- a/ukrainian/make-a-hole/in-the-wall.md +++ b/ukrainian/make-a-hole/in-the-wall.md @@ -6,4 +6,4 @@ [трошки поплакти бо нема з ким подiлитися шоколадом](../Crying/crying-in-the-corner.md) -[стерти коротку память та розпочати все спочатку наче нічого і не було](../marshmallow.md) +[стерти коротку память та розпочати все спочатку, наче нічого і не було](../marshmallow.md) From cc81d31e6b48640d9110a5c348eded03401250b3 Mon Sep 17 00:00:00 2001 From: Kyrylo Gryshko Date: Mon, 7 Nov 2016 00:28:53 +0200 Subject: [PATCH 4665/5486] Update in-the-wall.md --- ukrainian/make-a-hole/in-the-wall.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ukrainian/make-a-hole/in-the-wall.md b/ukrainian/make-a-hole/in-the-wall.md index 123fd4397b..d52cadddb1 100644 --- a/ukrainian/make-a-hole/in-the-wall.md +++ b/ukrainian/make-a-hole/in-the-wall.md @@ -1,4 +1,5 @@ -Оговтуюсь від шоку, беру виделку і виковирюю дирку у зефіровій стіні. +Оговтуюсь від шоку, беру виделку і виковирюю дирку у зефіровій стіні.. Що буде зі мною далі? + Після двадцяти сантиметрів зефірової стіни потрапляю на шар шоколаду. В кімнаті прохолодно і шоколад доволі твердий тож копати його важче ніж зефір. From 547ba2db1688eb9bb2326f1c29af87b34c1d43d6 Mon Sep 17 00:00:00 2001 From: Kyrylo Gryshko Date: Mon, 7 Nov 2016 00:29:30 +0200 Subject: [PATCH 4666/5486] Update in-the-wall.md --- ukrainian/make-a-hole/in-the-wall.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/make-a-hole/in-the-wall.md b/ukrainian/make-a-hole/in-the-wall.md index d52cadddb1..411fbb3cf3 100644 --- a/ukrainian/make-a-hole/in-the-wall.md +++ b/ukrainian/make-a-hole/in-the-wall.md @@ -1,7 +1,7 @@ Оговтуюсь від шоку, беру виделку і виковирюю дирку у зефіровій стіні.. Що буде зі мною далі? Після двадцяти сантиметрів зефірової стіни потрапляю на шар шоколаду. -В кімнаті прохолодно і шоколад доволі твердий тож копати його важче ніж зефір. +В кімнаті прохолодно і шоколад доволі твердий, тож копати його значно важче ніж зефір. Думаю, що робити далі... From bf9eb91d893f9ff996736d43b42e15e4595d74dd Mon Sep 17 00:00:00 2001 From: Kyrylo Gryshko Date: Mon, 7 Nov 2016 00:46:17 +0200 Subject: [PATCH 4667/5486] Update in-the-wall.md --- ukrainian/make-a-hole/in-the-wall.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/make-a-hole/in-the-wall.md b/ukrainian/make-a-hole/in-the-wall.md index 411fbb3cf3..4c7c698f4a 100644 --- a/ukrainian/make-a-hole/in-the-wall.md +++ b/ukrainian/make-a-hole/in-the-wall.md @@ -3,7 +3,7 @@ Після двадцяти сантиметрів зефірової стіни потрапляю на шар шоколаду. В кімнаті прохолодно і шоколад доволі твердий, тож копати його значно важче ніж зефір. -Думаю, що робити далі... +Думаю, що робити... [трошки поплакти бо нема з ким подiлитися шоколадом](../Crying/crying-in-the-corner.md) From 05ab21c07d67b3c5f9edac72305a879d6d1b3949 Mon Sep 17 00:00:00 2001 From: Ken Q Date: Sun, 6 Nov 2016 16:55:13 -0800 Subject: [PATCH 4668/5486] update zork to be udacious --- english/zork/zork.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/zork/zork.md b/english/zork/zork.md index f432e265f3..9a5ef71d55 100644 --- a/english/zork/zork.md +++ b/english/zork/zork.md @@ -16,4 +16,6 @@ The work Zork brings back memories. Zork is life, Zork is love. +Zork is udacious. + Kick open the [door] (../duck/duck.md) From 1b9510b73cc5e7e4889709b1aa4f7183fde6a3e5 Mon Sep 17 00:00:00 2001 From: al825 Date: Sun, 6 Nov 2016 21:08:36 -0800 Subject: [PATCH 4669/5486] Add a never ended story to the english story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5cb2e4f21c..6ab40a8924 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1163,3 +1163,5 @@ If you are a soccer fan, see your team [here](soccerfan/soccerfan.md) I am also a soccer fan, I am a Man U fan from EPL. To see Man U click [here](ManU/ManU.md) Wow, you made it to the end! You are determined, [see](persistent/persistent.md) what awaits. + +Wait! This is not the end! OMG [click me](never_ended/never_ended.md) From 10d40d0de61639d5a9e5bf6b190392f8dbe4130f Mon Sep 17 00:00:00 2001 From: al825 Date: Sun, 6 Nov 2016 21:14:31 -0800 Subject: [PATCH 4670/5486] Add a never_ended story --- english/never_ended/never_ended.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/never_ended/never_ended.md diff --git a/english/never_ended/never_ended.md b/english/never_ended/never_ended.md new file mode 100644 index 0000000000..e6f9b4fd9b --- /dev/null +++ b/english/never_ended/never_ended.md @@ -0,0 +1,6 @@ +while True { + Long long ago, there is a high high montain; and there is a small small temple on the high high mountain. + There are two monks in the temple, an old old monk and a young young monk. + The old old monk is telling stories to the young young monk. + Here is the story: +} \ No newline at end of file From 49a903b2afe2b45290d52b074177d3ea3761826c Mon Sep 17 00:00:00 2001 From: Yogesh Telang Date: Mon, 7 Nov 2016 15:16:53 +0530 Subject: [PATCH 4671/5486] Add Tiger Shroff --- hindi/bollywood.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index ecae0b0850..a5e89ec555 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -31,4 +31,6 @@ Click [Here](king/king.md) to read the story of a great King. To know about real india hero click [Bhagat Singh](Bhagat_Singh/bhagat_singh.md) -Check out [Alia Bhatt](https://www.instagram.com/aliaabhatt/?hl=en) \ No newline at end of file +Check out [Alia Bhatt](https://www.instagram.com/aliaabhatt/?hl=en) + +Check out [Tiger Shroff](https://www.instagram.com/tigerjackieshroff/?hl=en) \ No newline at end of file From 6304295a28604356c0e032dd0be6d54daf7b2bc5 Mon Sep 17 00:00:00 2001 From: Erbs Date: Mon, 7 Nov 2016 14:16:54 +0100 Subject: [PATCH 4672/5486] Add new option and link to an existing page. --- german/Fragen/fragen.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Fragen/fragen.md b/german/Fragen/fragen.md index e6c317c4ca..a0bff66391 100644 --- a/german/Fragen/fragen.md +++ b/german/Fragen/fragen.md @@ -1,4 +1,6 @@ Sie haben den Mut und naehern sich ihr an. Sie fragen sie: "Entschuldigung, wie spaet ist es". Sie laechelt und beantwortet Ihre Frage: "Ich habe leider keine Armbanduhr..." Jedoch holt sie sofort ihr Handy heraus, um weiter zu helfen. -Herr von Ribbeck auf Ribbeck im Havelland \ No newline at end of file +Herr von Ribbeck auf Ribbeck im Havelland + +[Sie bemerkt, dass ihr Handy leer ist und errtet leicht] (../Smartphone/keinAkku/keinAkku.md) \ No newline at end of file From 37d5e2ee2c3aff7afa773d15e5c7b2edbbef84d0 Mon Sep 17 00:00:00 2001 From: Jemsheer K D Date: Tue, 8 Nov 2016 12:23:55 +0530 Subject: [PATCH 4673/5486] add Tintu and Teacher Joke --- Malayalam/malayalam.md | 2 ++ Malayalam/tintu/tintu-teacher.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 Malayalam/tintu/tintu-teacher.md diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index df63faa332..bc9533979d 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -12,3 +12,5 @@ [ശശി] (../english/tintumon-mallu/tintu-main.md) +[ടിന്റുവും മാഷും] (../malayalam/tintu/tintu-teacher.md) + diff --git a/Malayalam/tintu/tintu-teacher.md b/Malayalam/tintu/tintu-teacher.md new file mode 100644 index 0000000000..9ceb1c48d3 --- /dev/null +++ b/Malayalam/tintu/tintu-teacher.md @@ -0,0 +1,3 @@ + +മാഷ്‌ : കരയിലും വെള്ളത്തിലും ജീവിക്കുന്ന 5 ജീവികളുടെ പേര് പറയൂ. +ടിന്‍റു : 2 ആമ, 3 തവള \ No newline at end of file From cc8e95c815ea723243e8047a4ef25a90e54442dc Mon Sep 17 00:00:00 2001 From: Jemsheer K D Date: Tue, 8 Nov 2016 12:40:51 +0530 Subject: [PATCH 4674/5486] Fixed reachability for story --- Malayalam/malayalam.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index bc9533979d..bfd9ed0a61 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -10,7 +10,7 @@ ടിന്റുമോന്റെ ചങ്ങതിആയിരുന്നു ശശി -[ശശി] (../english/tintumon-mallu/tintu-main.md) +[ശശി] (english/tintumon-mallu/tintu-main.md) -[ടിന്റുവും മാഷും] (../malayalam/tintu/tintu-teacher.md) +[ടിന്റുവും മാഷും] (malayalam/tintu/tintu-teacher.md) From a303bdb6b6e427343ee7752825ca148e5379472b Mon Sep 17 00:00:00 2001 From: Jemsheer K D Date: Tue, 8 Nov 2016 13:26:11 +0530 Subject: [PATCH 4675/5486] Fixed link reachability issue --- Malayalam/malayalam.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Malayalam/malayalam.md b/Malayalam/malayalam.md index bfd9ed0a61..02d1d5123e 100644 --- a/Malayalam/malayalam.md +++ b/Malayalam/malayalam.md @@ -10,7 +10,7 @@ ടിന്റുമോന്റെ ചങ്ങതിആയിരുന്നു ശശി -[ശശി] (english/tintumon-mallu/tintu-main.md) +[ശശി] (../english/tintumon-mallu/tintu-main.md) -[ടിന്റുവും മാഷും] (malayalam/tintu/tintu-teacher.md) +[ടിന്റുവും മാഷും] (../Malayalam/tintu/tintu-teacher.md) From 95e3d7570d745da12997a5670b0c3557848bb4bc Mon Sep 17 00:00:00 2001 From: colin ferster Date: Tue, 8 Nov 2016 14:19:13 -0800 Subject: [PATCH 4676/5486] added a new page to the story about fish on pogo sticks --- english/cycling-forwards/cycling-forwards.md | 3 +++ english/cycling-forwards/pogofish.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 english/cycling-forwards/pogofish.md diff --git a/english/cycling-forwards/cycling-forwards.md b/english/cycling-forwards/cycling-forwards.md index ac2d879019..d2cbdef3ca 100644 --- a/english/cycling-forwards/cycling-forwards.md +++ b/english/cycling-forwards/cycling-forwards.md @@ -1 +1,4 @@ But everyone knows that fish only like to cycle forwards. It's the only way they can breathe while juggling. + +Of course this was true for a long time, until a freak mutation occured and these fish were better able to survive, +forever [evolving the way that fish travel](pogofish/pogofish.md). \ No newline at end of file diff --git a/english/cycling-forwards/pogofish.md b/english/cycling-forwards/pogofish.md new file mode 100644 index 0000000000..f0f55bbce1 --- /dev/null +++ b/english/cycling-forwards/pogofish.md @@ -0,0 +1,2 @@ +Of course pogo fish were at a natural advantage; while they always need to hop forwards, +it's also possible to travel upwards. From f5cca25d4f219d6b202c6606b1748c83357af09e Mon Sep 17 00:00:00 2001 From: colin ferster Date: Tue, 8 Nov 2016 14:22:59 -0800 Subject: [PATCH 4677/5486] fix directory structrue --- english/cycling-forwards/{ => pogofish}/pogofish.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/cycling-forwards/{ => pogofish}/pogofish.md (100%) diff --git a/english/cycling-forwards/pogofish.md b/english/cycling-forwards/pogofish/pogofish.md similarity index 100% rename from english/cycling-forwards/pogofish.md rename to english/cycling-forwards/pogofish/pogofish.md From 77ddacd670c013bad6c31045fe3ae23f9f0ba7e0 Mon Sep 17 00:00:00 2001 From: colin ferster Date: Tue, 8 Nov 2016 14:30:25 -0800 Subject: [PATCH 4678/5486] add link from the front page --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 6ab40a8924..b980c6b9cf 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -291,6 +291,8 @@ I see that you may be from the North. [How's it going?](./north/north.md) "Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" +In a brief moment of clarity, you decide it's time for a change and start to [cycle forwards](./cycling-forwards/cycling-forwards.md) + You hear a small bird sound in the distance. But it sounds like it might be coming out of speakers. From ab157c1a42853a8d9e7b283ac052bcb77e03d29d Mon Sep 17 00:00:00 2001 From: colin ferster Date: Tue, 8 Nov 2016 14:30:38 -0800 Subject: [PATCH 4679/5486] fix link --- english/cycling-forwards/cycling-forwards.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/cycling-forwards/cycling-forwards.md b/english/cycling-forwards/cycling-forwards.md index d2cbdef3ca..6dade9eaeb 100644 --- a/english/cycling-forwards/cycling-forwards.md +++ b/english/cycling-forwards/cycling-forwards.md @@ -1,4 +1,4 @@ But everyone knows that fish only like to cycle forwards. It's the only way they can breathe while juggling. -Of course this was true for a long time, until a freak mutation occured and these fish were better able to survive, -forever [evolving the way that fish travel](pogofish/pogofish.md). \ No newline at end of file +Of course this was true for a long time, until a freak mutation involving a salmon and a pogo-stick occured, +forever [evolving the way that fish travel](./pogofish/pogofish.md). From 67e9d8d53491dc532f1011b13adde8f3cd0dbe80 Mon Sep 17 00:00:00 2001 From: colin ferster Date: Tue, 8 Nov 2016 14:33:18 -0800 Subject: [PATCH 4680/5486] fix punctuation --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index b980c6b9cf..7ec6b9e84b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -291,7 +291,7 @@ I see that you may be from the North. [How's it going?](./north/north.md) "Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" -In a brief moment of clarity, you decide it's time for a change and start to [cycle forwards](./cycling-forwards/cycling-forwards.md) +In a brief moment of clarity, you decide it's time for a change and start to [cycle forwards](./cycling-forwards/cycling-forwards.md). You hear a small bird sound in the distance. From 953a1ac7695542d1d0e5b7fc5c873c047c992177 Mon Sep 17 00:00:00 2001 From: colin ferster Date: Tue, 8 Nov 2016 14:35:06 -0800 Subject: [PATCH 4681/5486] added to the story --- english/cycling-forwards/pogofish/pogofish.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/cycling-forwards/pogofish/pogofish.md b/english/cycling-forwards/pogofish/pogofish.md index f0f55bbce1..05a7b50fba 100644 --- a/english/cycling-forwards/pogofish/pogofish.md +++ b/english/cycling-forwards/pogofish/pogofish.md @@ -1,2 +1,2 @@ -Of course pogo fish were at a natural advantage; while they always need to hop forwards, -it's also possible to travel upwards. +Of course pogo fish were at a natural advantage; while they always needed to generally hop forwards, +it was also possible to travel upwards and downwards, repeatedly. From e17eaa5f2051c571c5e8cc78fced0827e7068e30 Mon Sep 17 00:00:00 2001 From: colin ferster Date: Tue, 8 Nov 2016 14:39:52 -0800 Subject: [PATCH 4682/5486] shortened long line --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 7ec6b9e84b..cf7b9a238e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -291,7 +291,8 @@ I see that you may be from the North. [How's it going?](./north/north.md) "Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" -In a brief moment of clarity, you decide it's time for a change and start to [cycle forwards](./cycling-forwards/cycling-forwards.md). +In a brief moment of clarity, you decide it's time for a change and start to +[cycle forwards](./cycling-forwards/cycling-forwards.md). You hear a small bird sound in the distance. From bf6958efb0da14fdaf6b3ba74364b980e0995484 Mon Sep 17 00:00:00 2001 From: vladimirjeune Date: Wed, 9 Nov 2016 01:26:38 -0500 Subject: [PATCH 4683/5486] feat: Add 2 choices to story and a destination story Added 2 choices to super-vet.md and a link to a video. Furthermore, added a destination story that someone else may add choices to later. --- english/unicorn/no/super-vet/super-vet.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/english/unicorn/no/super-vet/super-vet.md b/english/unicorn/no/super-vet/super-vet.md index 7e11a949ca..efaf3406b4 100644 --- a/english/unicorn/no/super-vet/super-vet.md +++ b/english/unicorn/no/super-vet/super-vet.md @@ -1,3 +1,12 @@ You pull the vets business card from your pocket and hold it outstreched in your hand to Keith. The unicorn gives you an angry look and you're not sure if it's because you've been too forward about his health or that he doesn't have hands with which to take the card. + +You nearly admit that this whole time you have been thinking about riding him like a bucking +bronco. Like in [this] (https://www.youtube.com/watch?v=GiHXnSkP6Qw) cowboy video you saw +this morning. But just in case he can't read your mind you make a +different choice. + +[Read the card to him] (read-card/read-card.md) + +[Back away slowly and go collect mushrooms] (../../../mushroom/mushroom.md) From 5596ef87da93a383f735221e431fbf86f347f965 Mon Sep 17 00:00:00 2001 From: vladimirjeune Date: Wed, 9 Nov 2016 01:35:26 -0500 Subject: [PATCH 4684/5486] feat: Change punctuation of story. --- english/unicorn/no/super-vet/super-vet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/unicorn/no/super-vet/super-vet.md b/english/unicorn/no/super-vet/super-vet.md index efaf3406b4..991bca1238 100644 --- a/english/unicorn/no/super-vet/super-vet.md +++ b/english/unicorn/no/super-vet/super-vet.md @@ -4,7 +4,7 @@ about his health or that he doesn't have hands with which to take the card. You nearly admit that this whole time you have been thinking about riding him like a bucking bronco. Like in [this] (https://www.youtube.com/watch?v=GiHXnSkP6Qw) cowboy video you saw -this morning. But just in case he can't read your mind you make a +this morning. But just in case he can't read your mind, you make a different choice. [Read the card to him] (read-card/read-card.md) From af340176317c1e23800bb658a5e5e8c411857526 Mon Sep 17 00:00:00 2001 From: vladimirjeune Date: Wed, 9 Nov 2016 01:47:22 -0500 Subject: [PATCH 4685/5486] feat: Create a super-vet.md choice landing page Create choice from super-vet.md. Other people can add choices from here. --- .../unicorn/no/super-vet/read-card/read-card.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 english/unicorn/no/super-vet/read-card/read-card.md diff --git a/english/unicorn/no/super-vet/read-card/read-card.md b/english/unicorn/no/super-vet/read-card/read-card.md new file mode 100644 index 0000000000..851e18905b --- /dev/null +++ b/english/unicorn/no/super-vet/read-card/read-card.md @@ -0,0 +1,16 @@ +Front: +Dr. McStuffins MD +World Class Imaginary Animal Veterinarian +Specialty in hoofed/winged mythological creatures. +Centaurs, Pegasi, Unicorns, Minotaurs... No humans. + +Office hours: 9:30 PM - 12:00 PM; 1:30 PM - 3:00 PM | M, W + 10:30 PM - 12:00 PM; | Th + +#12 Grimmauld Place +Kings Cross, CA 77777 + +--- + +Back: +Leave review on Yelp for free de-licing on next visit. \ No newline at end of file From d241fe7c154f449ba353d7b8afb79e4d8012a404 Mon Sep 17 00:00:00 2001 From: vladimirjeune Date: Wed, 9 Nov 2016 02:42:27 -0500 Subject: [PATCH 4686/5486] fix: Fix the name of the file for the mushroom choice Fix the incorrect name of the mushroom file. --- english/unicorn/no/super-vet/super-vet.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/unicorn/no/super-vet/super-vet.md b/english/unicorn/no/super-vet/super-vet.md index 991bca1238..4958b0ece3 100644 --- a/english/unicorn/no/super-vet/super-vet.md +++ b/english/unicorn/no/super-vet/super-vet.md @@ -4,9 +4,9 @@ about his health or that he doesn't have hands with which to take the card. You nearly admit that this whole time you have been thinking about riding him like a bucking bronco. Like in [this] (https://www.youtube.com/watch?v=GiHXnSkP6Qw) cowboy video you saw -this morning. But just in case he can't read your mind, you make a +this morning. But just in case he can't read your mind; you make a different choice. [Read the card to him] (read-card/read-card.md) -[Back away slowly and go collect mushrooms] (../../../mushroom/mushroom.md) +[Back away slowly and go collect mushrooms] (../../../mushroom/collect_mushroom.md) From f6dc6f84b85b087d0e3ca5add0d82df61bb76867 Mon Sep 17 00:00:00 2001 From: vladimirjeune Date: Wed, 9 Nov 2016 02:50:02 -0500 Subject: [PATCH 4687/5486] fix: Fix typos that make text look odd Attempt to fix accidental markdown interpretation in text. --- english/unicorn/no/super-vet/read-card/read-card.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/english/unicorn/no/super-vet/read-card/read-card.md b/english/unicorn/no/super-vet/read-card/read-card.md index 851e18905b..33b34f2ce9 100644 --- a/english/unicorn/no/super-vet/read-card/read-card.md +++ b/english/unicorn/no/super-vet/read-card/read-card.md @@ -7,10 +7,9 @@ Centaurs, Pegasi, Unicorns, Minotaurs... No humans. Office hours: 9:30 PM - 12:00 PM; 1:30 PM - 3:00 PM | M, W 10:30 PM - 12:00 PM; | Th -#12 Grimmauld Place +Number 12 Grimmauld Place Kings Cross, CA 77777 ---- Back: Leave review on Yelp for free de-licing on next visit. \ No newline at end of file From 2f192937aebaee6dfe14458417d8c23ac21a49d9 Mon Sep 17 00:00:00 2001 From: kursmappe Date: Wed, 9 Nov 2016 13:37:26 +0100 Subject: [PATCH 4688/5486] Add existing option "schwimmen" to page "kreuzfahrt" --- .../insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md index 01b9b3eb8b..4666903b0f 100644 --- a/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md +++ b/german/Hilfeschrei/Vertrauen/insMaul/gloeckchen/klingeln/kreuzfahrt/kreuzfahrt.md @@ -5,4 +5,6 @@ Oh nein, ich bin auf einem Kreuzfahrtschiff gelandet! Na gut, wenigstens bin ich hier sicher, denkst du noch, da siehst du, wie -sich mit Highspeed zwei große Schlauchboote voller Bewaffneter dem Schiff nähern ... \ No newline at end of file +sich mit Highspeed zwei große Schlauchboote voller Bewaffneter dem Schiff nähern ... + +[Du entscheidest dich für die Flucht durch das Wasser und springst von Bord](../../../../../../schwimmen/schwimmen.md) \ No newline at end of file From 0f386e5c61df54b6fdb4e6ae8091e6236ecb01b1 Mon Sep 17 00:00:00 2001 From: Solet Date: Wed, 9 Nov 2016 21:27:13 +0000 Subject: [PATCH 4689/5486] Add line to bufar arros --- catala/dormir/bufar/bufar_arros.md | 1 + 1 file changed, 1 insertion(+) diff --git a/catala/dormir/bufar/bufar_arros.md b/catala/dormir/bufar/bufar_arros.md index 6e120ba8f0..d735928b1c 100644 --- a/catala/dormir/bufar/bufar_arros.md +++ b/catala/dormir/bufar/bufar_arros.md @@ -1,3 +1,4 @@ Agafes una cullerada i bufes per a que es refredi per no controles la teva fora i tot el contingut de la cullera surt volant i queda escampat pel terra i les parets de l'habitaci. +L'arrs bullent comena a derretir les parets i s'obre un forat cap a un altre mn. From fcd929497eda805a45db3ad884c454d4d863af5c Mon Sep 17 00:00:00 2001 From: "a. b. c" Date: Thu, 10 Nov 2016 11:47:01 +0100 Subject: [PATCH 4690/5486] ads an option what to do after your fight with the bear and the bees. --- english/forest/fire/fight/fight.md | 8 +++++++- english/forest/fire/fight/forest/forest.md | 2 ++ english/forest/fire/fight/nap/nap.md | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 english/forest/fire/fight/forest/forest.md create mode 100644 english/forest/fire/fight/nap/nap.md diff --git a/english/forest/fire/fight/fight.md b/english/forest/fire/fight/fight.md index 60865744e8..2556327e26 100644 --- a/english/forest/fire/fight/fight.md +++ b/english/forest/fire/fight/fight.md @@ -11,4 +11,10 @@ into a nearby lake until they fly away. You climb out of the water dripping wet. The bees have gone. The sweet honey beckons to you. You saunter forward, remembering your first sip of mead. You quickly scoop a jar of honey from the thrashed beehive, stash it in your -waterskin, and scamper back to camp unscathed. \ No newline at end of file +waterskin, and scamper back to camp unscathed. + +Do you think + +[this was enough hard work for today and take a nap under a tree](nap/nap.md) + +[or do you go for another hunt into the forest?](forest/forest.md) \ No newline at end of file diff --git a/english/forest/fire/fight/forest/forest.md b/english/forest/fire/fight/forest/forest.md new file mode 100644 index 0000000000..991fcf4a65 --- /dev/null +++ b/english/forest/fire/fight/forest/forest.md @@ -0,0 +1,2 @@ +To take your spear, wash of the blood of the bear and go back into the forest. After a while where you always missed the quite shy deer that is in sight occasionally you think it might be better to climb on a tree and +hide there. \ No newline at end of file diff --git a/english/forest/fire/fight/nap/nap.md b/english/forest/fire/fight/nap/nap.md new file mode 100644 index 0000000000..f208e93c7d --- /dev/null +++ b/english/forest/fire/fight/nap/nap.md @@ -0,0 +1,2 @@ +You take some moss and grass to make up a soft bed under one of the trees. Soon you fall +asleep and a strange dream about a fox and a coyote starts to evolve. \ No newline at end of file From 141840cf31d9010b293e0b2b8b6100f46e425bf6 Mon Sep 17 00:00:00 2001 From: "a. b. c" Date: Thu, 10 Nov 2016 11:52:52 +0100 Subject: [PATCH 4691/5486] create line breaks to fit the 120 chars per line --- english/forest/fire/fight/forest/forest.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/forest/fire/fight/forest/forest.md b/english/forest/fire/fight/forest/forest.md index 991fcf4a65..616f4ed385 100644 --- a/english/forest/fire/fight/forest/forest.md +++ b/english/forest/fire/fight/forest/forest.md @@ -1,2 +1,3 @@ -To take your spear, wash of the blood of the bear and go back into the forest. After a while where you always missed the quite shy deer that is in sight occasionally you think it might be better to climb on a tree and -hide there. \ No newline at end of file +To take your spear, wash of the blood of the bear and go back into the forest. +After a while where you always missed the quite shy deer that is in sight +occasionally you think it might be better to climb on a tree and hide there. \ No newline at end of file From c3ba98b598c6084af50a62d3daefc29d3ba2f9ec Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Thu, 10 Nov 2016 13:27:13 -0700 Subject: [PATCH 4692/5486] Clarify what actually happened on the record-setting dogsled adventure. --- english/dog-sled/dogsled.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/english/dog-sled/dogsled.md b/english/dog-sled/dogsled.md index 7a7e00c709..01a888ae88 100644 --- a/english/dog-sled/dogsled.md +++ b/english/dog-sled/dogsled.md @@ -1,2 +1,16 @@ You embark on a dog sled adventure across the globe, setting the record for the fastest time. Then you realize you're -[right back where you started](../marshmallow.md). \ No newline at end of file +[right back where you started](../marshmallow.md). + +Unbeknownst to you, but amply apparent to your dogs, your acute case of snowblindness had caused you +to go far off course. On the way out of town on your record-setting trip you hit your head on a +low branch. With you unconscious, the sled dogs took the opportunity to eat a weeks worth of +rations. Lathargic with their bulging bellies, the dogs pulled you back to town so that they could +sleep in their cosy dog houses. + +You slowly clue in to your prediciment when you can't explain why you're still wearing the same pair +of underwear you left with. What will you tell the local villagers who so graciously supported your +adventure? + +[Move to Canada](../Canada/Canada.md)? + +Leave town and play [Pokemon Go](../pokemon-go/pokemon-go.md) full time? From 5924fa1a08beeda296fb84005650dc40cea1277a Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Thu, 10 Nov 2016 13:33:38 -0700 Subject: [PATCH 4693/5486] Fix spelling mistake. --- english/dog-sled/dogsled.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dog-sled/dogsled.md b/english/dog-sled/dogsled.md index 01a888ae88..ef1dfc2a79 100644 --- a/english/dog-sled/dogsled.md +++ b/english/dog-sled/dogsled.md @@ -4,7 +4,7 @@ You embark on a dog sled adventure across the globe, setting the record for the Unbeknownst to you, but amply apparent to your dogs, your acute case of snowblindness had caused you to go far off course. On the way out of town on your record-setting trip you hit your head on a low branch. With you unconscious, the sled dogs took the opportunity to eat a weeks worth of -rations. Lathargic with their bulging bellies, the dogs pulled you back to town so that they could +rations. Lethargic with their bulging bellies, the dogs pulled you back to town so that they could sleep in their cosy dog houses. You slowly clue in to your prediciment when you can't explain why you're still wearing the same pair From 71d2775b72cc826eb3cecc2c38018b2d5e6768f0 Mon Sep 17 00:00:00 2001 From: Wonu Lee Date: Fri, 11 Nov 2016 12:28:28 +0900 Subject: [PATCH 4694/5486] Add light-fire/look-around --- korean/light-fire/fire.md | 4 +++- korean/light-fire/look-around/look-around.md | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 korean/light-fire/look-around/look-around.md diff --git a/korean/light-fire/fire.md b/korean/light-fire/fire.md index 8d48216aa5..9dd9e39677 100644 --- a/korean/light-fire/fire.md +++ b/korean/light-fire/fire.md @@ -8,4 +8,6 @@ [다시 잔다](../sleep/marshmallow.md)? -밖으로 [달아난다](run-away/run-away.md)? \ No newline at end of file +밖으로 [달아난다](run-away/run-away.md)? + +[주위를 살펴본다](look-around/look-around.md) diff --git a/korean/light-fire/look-around/look-around.md b/korean/light-fire/look-around/look-around.md new file mode 100644 index 0000000000..25989c3d72 --- /dev/null +++ b/korean/light-fire/look-around/look-around.md @@ -0,0 +1,3 @@ +내가 왜 이런 곳에.. + +어? 이게 뭐지? From 1061b8fadbf1599563cab28ce70bc2cae4431023 Mon Sep 17 00:00:00 2001 From: Fabricio Oliveira Date: Fri, 11 Nov 2016 16:29:32 +1100 Subject: [PATCH 4695/5486] Includes hamana option --- Gibberish/Gibberish.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gibberish/Gibberish.md b/Gibberish/Gibberish.md index 8556dc58dc..821dd407e9 100644 --- a/Gibberish/Gibberish.md +++ b/Gibberish/Gibberish.md @@ -19,3 +19,5 @@ blkajd asdglkjdsFH A SGLKAHSJD S sdflhjgaj dat goober. Von tran the BARACHARAS dentro [flipflopfloooopers](BooBahTahTah/BoBah.md)? Integral(5x^3 - htan(x), dx) titila [MATHEMATICS](NiNi-sigh/NiNi.md)? + +[Hamana](Hamanana/hamana-hamana.md)? From 95ec6d6983268372375fd305816e68db732d7c02 Mon Sep 17 00:00:00 2001 From: Fabricio Oliveira Date: Fri, 11 Nov 2016 16:31:16 +1100 Subject: [PATCH 4696/5486] Hamana hamana --- Gibberish/Hamanana/hamana-hamana.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Gibberish/Hamanana/hamana-hamana.md diff --git a/Gibberish/Hamanana/hamana-hamana.md b/Gibberish/Hamanana/hamana-hamana.md new file mode 100644 index 0000000000..68ef2efc7f --- /dev/null +++ b/Gibberish/Hamanana/hamana-hamana.md @@ -0,0 +1 @@ +Hamana hamana hamana, hamana hamana, hamana hamana. \ No newline at end of file From 45e28a0b1ed1a6e9a86a6b5490a9f3fe2a4a1559 Mon Sep 17 00:00:00 2001 From: Marco Zannini Date: Fri, 11 Nov 2016 12:55:50 +0100 Subject: [PATCH 4697/5486] add zanzara --- Italian/ascoltare/profumato.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Italian/ascoltare/profumato.md b/Italian/ascoltare/profumato.md index 43c58cefba..67d0e28798 100644 --- a/Italian/ascoltare/profumato.md +++ b/Italian/ascoltare/profumato.md @@ -1,3 +1,4 @@ Parto e ascolto il programma più profumato d'Italia [Tutto Esaurito!] (http://www.105.net/sezioni/651/tutto-esaurito) -A colaccccioneeee! \ No newline at end of file +A colaccccioneeee! +w la zanzara \ No newline at end of file From 37d84b880509ac3f461359a054e998c5e9574218 Mon Sep 17 00:00:00 2001 From: Marco Zannini Date: Fri, 11 Nov 2016 13:01:13 +0100 Subject: [PATCH 4698/5486] zanzara --- Italian/ascoltare/profumato.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Italian/ascoltare/profumato.md b/Italian/ascoltare/profumato.md index 67d0e28798..dc4a8acda9 100644 --- a/Italian/ascoltare/profumato.md +++ b/Italian/ascoltare/profumato.md @@ -1,4 +1,4 @@ Parto e ascolto il programma più profumato d'Italia [Tutto Esaurito!] (http://www.105.net/sezioni/651/tutto-esaurito) A colaccccioneeee! -w la zanzara \ No newline at end of file +zanzara rules \ No newline at end of file From e5329f6bc22af69281891124dfa622fd3bfea2e9 Mon Sep 17 00:00:00 2001 From: Daria Date: Sat, 12 Nov 2016 14:34:28 +0300 Subject: [PATCH 4699/5486] add cocoa --- russian/minesweeper/minesweeper.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/russian/minesweeper/minesweeper.md b/russian/minesweeper/minesweeper.md index fd486daf84..f46e140a03 100644 --- a/russian/minesweeper/minesweeper.md +++ b/russian/minesweeper/minesweeper.md @@ -1,2 +1,5 @@ Первое, что вам пришло в голову - это написать зефирного сапера в зефирном браузере. Вы сели и написали его за восемь с половиной часов. + +Теперь можно сварить себе большую кружку какао и насладиться своим творением, +попивая за игрой ароматный шоколадный напиток с парой кусочков зефирной стены. From 859bb7528740ed71efa174be839cb6c99ea96776 Mon Sep 17 00:00:00 2001 From: Adam Shai Date: Sat, 12 Nov 2016 16:01:29 +0200 Subject: [PATCH 4700/5486] Add an orc kidnap when drinking soda --- english/enjoysoda/enjoysoda.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/english/enjoysoda/enjoysoda.md b/english/enjoysoda/enjoysoda.md index 7e56b54ade..f6ac977a94 100644 --- a/english/enjoysoda/enjoysoda.md +++ b/english/enjoysoda/enjoysoda.md @@ -1 +1,6 @@ -You cool your jets by taking a refreshing drink of your favorite soda. \ No newline at end of file +You cool your jets by taking a refreshing drink of your favorite soda. +While drinking your soda, you start to feel somewhat dizzy. Before you +can grab to your thoughts you fall to the ground but barely manage to +keep your eyes open. Suddenly an orc raises you and puts your light body up +on his muscular and slimy shoulder. By the time he does his third step +you're already passed out. From 8cf986e5c8f7a11d024ccd07f1800bc0a87b7430 Mon Sep 17 00:00:00 2001 From: Mo Date: Sat, 12 Nov 2016 20:06:14 +0100 Subject: [PATCH 4701/5486] Add a sentence, the story the Choking Doberman, to marshmallow.md Add dog_finger folder and dog_finger.md file in english folder --- english/dog_finger/dog_finger.md | 15 +++++++++++++++ english/marshmallow.md | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 english/dog_finger/dog_finger.md diff --git a/english/dog_finger/dog_finger.md b/english/dog_finger/dog_finger.md new file mode 100644 index 0000000000..d29bae0e75 --- /dev/null +++ b/english/dog_finger/dog_finger.md @@ -0,0 +1,15 @@ +while True { + One night, a couple who had been out for a few too many drinks came home to find + their dog choking in the living room. The man panicked and fainted, but the woman decided to call + her old friend, a vet, and arranged to drop the dog off at the vet clinic. + + After dropping off the dog, she decides to go home and get her husband into bed. It takes her a while + to do this, and in the meantime, the phone rings. The vet screams hysterically that they need + to get out of the house immediately. So without any clue as to what’s going on, the couple leave + the house as quickly as possible. + + As they come down the stairs, several policemen run up to meet them. When the woman ask + what the problem is, a policeman gently tells her that the dog was choking on a man’s finger. A burglar + must still be present in their home. Soon enough, the former owner + of the finger is found unconscious in the bedroom. +} \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index cf7b9a238e..b11fc5be3b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1168,3 +1168,5 @@ I am also a soccer fan, I am a Man U fan from EPL. To see Man U click [here](Man Wow, you made it to the end! You are determined, [see](persistent/persistent.md) what awaits. Wait! This is not the end! OMG [click me](never_ended/never_ended.md) + +have you already heard the story of the Choking Doberman? [click me](dog_finger/dog_finger.md) \ No newline at end of file From 5c9d31685ffd812b6e496730291b31337943602a Mon Sep 17 00:00:00 2001 From: alinealvesvianna Date: Sat, 12 Nov 2016 23:57:39 -0200 Subject: [PATCH 4702/5486] =?UTF-8?q?incluindo=20hist=C3=B3ria.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/colaborando.md | 2 ++ portugues/simpatia/incenso/incenso.md | 1 + portugues/simpatia/resolver/resolver.md | 1 + portugues/simpatia/simpatia.md | 5 +++++ 4 files changed, 9 insertions(+) create mode 100644 portugues/simpatia/incenso/incenso.md create mode 100644 portugues/simpatia/resolver/resolver.md create mode 100644 portugues/simpatia/simpatia.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index ea0e2de168..54a4aa0cdc 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -69,3 +69,5 @@ BR BR BR Hue hue hue!!!! [Crio um novo branch,olho o bug e uso o github para obter ajuda] (http://gitref.org/) [Você quer ser um desenvolvedor de jogos independente](jornada-indie/O inicio.md) + +[Você faz uma simpatia para o código funcionar](simpatia/simpatia.md) diff --git a/portugues/simpatia/incenso/incenso.md b/portugues/simpatia/incenso/incenso.md new file mode 100644 index 0000000000..28cc44d0a5 --- /dev/null +++ b/portugues/simpatia/incenso/incenso.md @@ -0,0 +1 @@ +Você desmaia com o cheiro do incenso e depois de algumas horas desacordado, você volta a si e descobre que o incenso caiu no computador, e botou fogo em tudo. Por sorte seu vizinho sente o cheiro de queimado, chama os bombeiros e te leva para o hospital. Parabéns, o bug não se resolveu, mas você continua vivo! diff --git a/portugues/simpatia/resolver/resolver.md b/portugues/simpatia/resolver/resolver.md new file mode 100644 index 0000000000..ba822d7b65 --- /dev/null +++ b/portugues/simpatia/resolver/resolver.md @@ -0,0 +1 @@ +Você chora, procura ajuda no stack overflow, faz milhões de alterações e o código começa a dar um novo bug. Então depois de 1 ano tentando, você desiste, vira hippie e vai vender miçanga na praia. diff --git a/portugues/simpatia/simpatia.md b/portugues/simpatia/simpatia.md new file mode 100644 index 0000000000..ac62cca91e --- /dev/null +++ b/portugues/simpatia/simpatia.md @@ -0,0 +1,5 @@ +Você acende um incenso de Âmbar-Elo, e descobre que esse treco fede que é um horror. + +[Você apaga o incenso e tenta resolver o bug sem intervenção do além](resolver/resolver.md) + +[Você aguenta o cheiro, deixa o incenso acesso, e vê no que dá](incenso/incenso.md) From 76fd3d92be44a708c75b41adf78737c40bcf6a70 Mon Sep 17 00:00:00 2001 From: alinealvesvianna Date: Sun, 13 Nov 2016 00:08:10 -0200 Subject: [PATCH 4703/5486] \"Colocando o texto com 120 caracteres por linha, @casey-collab\" --- portugues/simpatia/incenso/incenso.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/simpatia/incenso/incenso.md b/portugues/simpatia/incenso/incenso.md index 28cc44d0a5..620a1d81a6 100644 --- a/portugues/simpatia/incenso/incenso.md +++ b/portugues/simpatia/incenso/incenso.md @@ -1 +1,3 @@ -Você desmaia com o cheiro do incenso e depois de algumas horas desacordado, você volta a si e descobre que o incenso caiu no computador, e botou fogo em tudo. Por sorte seu vizinho sente o cheiro de queimado, chama os bombeiros e te leva para o hospital. Parabéns, o bug não se resolveu, mas você continua vivo! +Você desmaia com o cheiro do incenso e depois de algumas horas desacordado, você volta a si e descobre que o +incenso caiu no computador, e botou fogo em tudo. Por sorte seu vizinho sente o cheiro de queimado, chama +os bombeiros e te leva para o hospital. Parabéns, o bug não se resolveu, mas você continua vivo! From 5ec06878da8f864483039d1c137f61ba0f549c16 Mon Sep 17 00:00:00 2001 From: alinealvesvianna Date: Sun, 13 Nov 2016 00:13:35 -0200 Subject: [PATCH 4704/5486] \"Botando arquivo com menos de 120 caracteres por linha, @casey-collab\" --- portugues/simpatia/resolver/resolver.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/simpatia/resolver/resolver.md b/portugues/simpatia/resolver/resolver.md index ba822d7b65..099b442459 100644 --- a/portugues/simpatia/resolver/resolver.md +++ b/portugues/simpatia/resolver/resolver.md @@ -1 +1,3 @@ -Você chora, procura ajuda no stack overflow, faz milhões de alterações e o código começa a dar um novo bug. Então depois de 1 ano tentando, você desiste, vira hippie e vai vender miçanga na praia. +Você chora, procura ajuda no stack overflow, faz milhões de alterações e o +código começa a dar um novo bug. Então depois de 1 ano tentando, você +desiste, vira hippie e vai vender miçanga na praia. From f21e2525a09dca5ee75c434cab08e75bb15de310 Mon Sep 17 00:00:00 2001 From: dzenyu Date: Sun, 13 Nov 2016 23:46:57 +0800 Subject: [PATCH 4705/5486] add a ref link for "heiheihei" --- Chinese/Donggewudi/Donggeheiheihei.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/Donggewudi/Donggeheiheihei.md b/Chinese/Donggewudi/Donggeheiheihei.md index 70af190b4a..3fcbaff22a 100644 --- a/Chinese/Donggewudi/Donggeheiheihei.md +++ b/Chinese/Donggewudi/Donggeheiheihei.md @@ -1,4 +1,4 @@ -孙悟空变成了东哥，就此解放了压抑数百年的欲望，看见石头就想嘿嘿嘿 +孙悟空变成了东哥，就此解放了压抑数百年的欲望，看见石头就想[嘿嘿嘿](https://youtu.be/_7-e7DsUgUs) 直到有一天，被宠幸的石头开口说话： From 37efc48a640be3a18004fc288d621831e46b77db Mon Sep 17 00:00:00 2001 From: dzenyu Date: Sun, 13 Nov 2016 23:55:07 +0800 Subject: [PATCH 4706/5486] add reference for an expression --- Chinese/Donggewudi/Donggeheiheihei.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Chinese/Donggewudi/Donggeheiheihei.md b/Chinese/Donggewudi/Donggeheiheihei.md index 70af190b4a..334daae4da 100644 --- a/Chinese/Donggewudi/Donggeheiheihei.md +++ b/Chinese/Donggewudi/Donggeheiheihei.md @@ -7,3 +7,5 @@ 由此嘿嘿嘿 东哥也很喜欢操[大白](../Baymax/Baymax.md) + +若你對嘿嘿嘿好奇，請點[這裡](https://youtu.be/_7-e7DsUgUs) From 2ec9b73ada26c363d32d67e3c1ea1f9471a25e2f Mon Sep 17 00:00:00 2001 From: dzenyu Date: Sun, 13 Nov 2016 23:57:47 +0800 Subject: [PATCH 4707/5486] withdraw the deletion of a sentence (actually addition though) --- Chinese/Donggewudi/Donggeheiheihei.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/Donggewudi/Donggeheiheihei.md b/Chinese/Donggewudi/Donggeheiheihei.md index 02d844b96e..334daae4da 100644 --- a/Chinese/Donggewudi/Donggeheiheihei.md +++ b/Chinese/Donggewudi/Donggeheiheihei.md @@ -1,4 +1,4 @@ -孙悟空变成了东哥，就此解放了压抑数百年的欲望，看见石头就想[嘿嘿嘿](https://youtu.be/_7-e7DsUgUs) +孙悟空变成了东哥，就此解放了压抑数百年的欲望，看见石头就想嘿嘿嘿 直到有一天，被宠幸的石头开口说话： From 427ef82712c5f02ecf835962e6cbfd3095fb1ee9 Mon Sep 17 00:00:00 2001 From: jchpmn Date: Sun, 13 Nov 2016 13:57:39 -0600 Subject: [PATCH 4708/5486] Add sentence about large bats --- english/duck/duck.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/duck/duck.md b/english/duck/duck.md index 64c518632c..1e4cc4d84e 100644 --- a/english/duck/duck.md +++ b/english/duck/duck.md @@ -7,4 +7,6 @@ Make it better next time. Wait, what was that noise? +Large bats fly over your head. + [Investigate](../cave/cave.md) \ No newline at end of file From d0048c69c2581151bc58f6076038a764c152e201 Mon Sep 17 00:00:00 2001 From: ale-de-vries Date: Sun, 13 Nov 2016 19:13:46 -0500 Subject: [PATCH 4709/5486] Add schok and new options --- dutch/sms/schok.md | 1 + dutch/sms/sms.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 dutch/sms/schok.md diff --git a/dutch/sms/schok.md b/dutch/sms/schok.md new file mode 100644 index 0000000000..8e37a5c758 --- /dev/null +++ b/dutch/sms/schok.md @@ -0,0 +1 @@ +OH NEE, de stroopwafels zijn op!! Wat nu? Zal ik nieuwe kopen, stelen of bakken? \ No newline at end of file diff --git a/dutch/sms/sms.md b/dutch/sms/sms.md index c4125c5ded..1e8968215a 100644 --- a/dutch/sms/sms.md +++ b/dutch/sms/sms.md @@ -2,5 +2,5 @@ Een sms, wanneer krijg je nou nog een sms? Het was niet van de overheid, niet van oma. Toch maar klikken. -En toen kwam de schok... +En toen kwam [de schok](schok.md)... From f71644533ffd9185bc23f132c366c82a3d0e32da Mon Sep 17 00:00:00 2001 From: ale-de-vries Date: Sun, 13 Nov 2016 19:22:34 -0500 Subject: [PATCH 4710/5486] Add watnu --- dutch/sms/sms.md | 4 ++-- dutch/watnu/watnu.md | 1 + dutch/watnu/watnu.npp | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 dutch/watnu/watnu.md create mode 100644 dutch/watnu/watnu.npp diff --git a/dutch/sms/sms.md b/dutch/sms/sms.md index 1e8968215a..c8a6e85cfe 100644 --- a/dutch/sms/sms.md +++ b/dutch/sms/sms.md @@ -2,5 +2,5 @@ Een sms, wanneer krijg je nou nog een sms? Het was niet van de overheid, niet van oma. Toch maar klikken. -En toen kwam [de schok](schok.md)... - +En toen kwam de schok... +[Wat nu](../watnu/watnu.md)? \ No newline at end of file diff --git a/dutch/watnu/watnu.md b/dutch/watnu/watnu.md new file mode 100644 index 0000000000..43cb8647b7 --- /dev/null +++ b/dutch/watnu/watnu.md @@ -0,0 +1 @@ +Wat een probleem! Hoe kan ik nu aan nieuwe stroopwafels komen? \ No newline at end of file diff --git a/dutch/watnu/watnu.npp b/dutch/watnu/watnu.npp new file mode 100644 index 0000000000..43cb8647b7 --- /dev/null +++ b/dutch/watnu/watnu.npp @@ -0,0 +1 @@ +Wat een probleem! Hoe kan ik nu aan nieuwe stroopwafels komen? \ No newline at end of file From c4a9039fa91ee6420084f922ec975137b12dd9db Mon Sep 17 00:00:00 2001 From: ale-de-vries Date: Sun, 13 Nov 2016 19:23:41 -0500 Subject: [PATCH 4711/5486] remove old files --- dutch/sms/schok.md | 1 - dutch/watnu/watnu.npp | 1 - 2 files changed, 2 deletions(-) delete mode 100644 dutch/sms/schok.md delete mode 100644 dutch/watnu/watnu.npp diff --git a/dutch/sms/schok.md b/dutch/sms/schok.md deleted file mode 100644 index 8e37a5c758..0000000000 --- a/dutch/sms/schok.md +++ /dev/null @@ -1 +0,0 @@ -OH NEE, de stroopwafels zijn op!! Wat nu? Zal ik nieuwe kopen, stelen of bakken? \ No newline at end of file diff --git a/dutch/watnu/watnu.npp b/dutch/watnu/watnu.npp deleted file mode 100644 index 43cb8647b7..0000000000 --- a/dutch/watnu/watnu.npp +++ /dev/null @@ -1 +0,0 @@ -Wat een probleem! Hoe kan ik nu aan nieuwe stroopwafels komen? \ No newline at end of file From 25a68ae95dccf491d2a83767344a89c068f7c55b Mon Sep 17 00:00:00 2001 From: ale-de-vries Date: Sun, 13 Nov 2016 19:26:38 -0500 Subject: [PATCH 4712/5486] Fix conflict --- dutch/sms/sms.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dutch/sms/sms.md b/dutch/sms/sms.md index c8a6e85cfe..5145821598 100644 --- a/dutch/sms/sms.md +++ b/dutch/sms/sms.md @@ -3,4 +3,5 @@ Een sms, wanneer krijg je nou nog een sms? Het was niet van de overheid, niet van oma. Toch maar klikken. En toen kwam de schok... -[Wat nu](../watnu/watnu.md)? \ No newline at end of file +[Wat nu](../watnu/watnu.md)? + \ No newline at end of file From 8329469f14d73e9311f00db4d60c4958eb74d56b Mon Sep 17 00:00:00 2001 From: ale-de-vries Date: Sun, 13 Nov 2016 19:27:58 -0500 Subject: [PATCH 4713/5486] Fix conflict --- dutch/sms/sms.md | 1 + 1 file changed, 1 insertion(+) diff --git a/dutch/sms/sms.md b/dutch/sms/sms.md index 5145821598..b6130a7537 100644 --- a/dutch/sms/sms.md +++ b/dutch/sms/sms.md @@ -4,4 +4,5 @@ Het was niet van de overheid, niet van oma. Toch maar klikken. En toen kwam de schok... [Wat nu](../watnu/watnu.md)? + \ No newline at end of file From 95fe1e4e1ec6bae2a8916b8478237232e266fbd5 Mon Sep 17 00:00:00 2001 From: dwdrajesh Date: Sun, 13 Nov 2016 19:50:44 -0500 Subject: [PATCH 4714/5486] Correct and add information on Art of Living organization --- hindi/art-of-living/art-of-living.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hindi/art-of-living/art-of-living.md b/hindi/art-of-living/art-of-living.md index 6f7f8d1719..4eee26bfd8 100644 --- a/hindi/art-of-living/art-of-living.md +++ b/hindi/art-of-living/art-of-living.md @@ -1,6 +1,9 @@ Founded in 1981 by Sri Sri Ravi Shankar,The Art of Living is an educational and humanitarian movement engaged in stress-management and service initiatives. -The organization operates globally in 154 countries and has touched the lives -of over 370 million people. +The organization operates globally in 156 countries and has touched the lives +of over 370 million people. +It is also considered to be the world's largest volunteer-based NGO by India today newspaper. [link](http://indiatoday.intoday.in/education/story/sri-sri-ravi-shankars-59th-birthday-10-interesting-facts/1/437746.html) +It has its headquarter in Bangalore, India, a city in Southern India. +They conduct many musical and meditation programs across India and in other countries. To know more, kindly visit this [link](http://www.artofliving.org/in-en) \ No newline at end of file From 1d59eb7822e07e6565534c1805591b23ee93e30b Mon Sep 17 00:00:00 2001 From: dwdrajesh Date: Sun, 13 Nov 2016 19:55:53 -0500 Subject: [PATCH 4715/5486] Added information on Art of living organization --- hindi/art-of-living/art-of-living.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hindi/art-of-living/art-of-living.md b/hindi/art-of-living/art-of-living.md index 4eee26bfd8..649c9db4d8 100644 --- a/hindi/art-of-living/art-of-living.md +++ b/hindi/art-of-living/art-of-living.md @@ -1,9 +1,13 @@ Founded in 1981 by Sri Sri Ravi Shankar,The Art of Living is an educational and humanitarian movement engaged in stress-management and service initiatives. -The organization operates globally in 156 countries and has touched the lives -of over 370 million people. +The organization operates globally in 154 countries and has touched the lives +of over 370 million people. + +To know more, kindly visit this [link](http://www.artofliving.org/in-en) + It is also considered to be the world's largest volunteer-based NGO by India today newspaper. [link](http://indiatoday.intoday.in/education/story/sri-sri-ravi-shankars-59th-birthday-10-interesting-facts/1/437746.html) It has its headquarter in Bangalore, India, a city in Southern India. They conduct many musical and meditation programs across India and in other countries. -To know more, kindly visit this [link](http://www.artofliving.org/in-en) \ No newline at end of file + + From 9c07beef8e5888685e5e07fadd9c63a630a77518 Mon Sep 17 00:00:00 2001 From: dwdrajesh Date: Sun, 13 Nov 2016 20:03:34 -0500 Subject: [PATCH 4716/5486] corrected --- hindi/art-of-living/art-of-living.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hindi/art-of-living/art-of-living.md b/hindi/art-of-living/art-of-living.md index 649c9db4d8..72a4405f5d 100644 --- a/hindi/art-of-living/art-of-living.md +++ b/hindi/art-of-living/art-of-living.md @@ -5,7 +5,7 @@ of over 370 million people. To know more, kindly visit this [link](http://www.artofliving.org/in-en) -It is also considered to be the world's largest volunteer-based NGO by India today newspaper. [link](http://indiatoday.intoday.in/education/story/sri-sri-ravi-shankars-59th-birthday-10-interesting-facts/1/437746.html) +It is also considered to be the world's largest volunteer-based NGO by India today newspaper. It has its headquarter in Bangalore, India, a city in Southern India. They conduct many musical and meditation programs across India and in other countries. From ae5367fdda265235bae9fa2f64efb57a53876822 Mon Sep 17 00:00:00 2001 From: Andre Gambaro Date: Mon, 14 Nov 2016 17:36:54 -0200 Subject: [PATCH 4717/5486] adding my history --- portugues_pt/colaborar.md | 6 +++++- portugues_pt/italia/italia.md | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 portugues_pt/italia/italia.md diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index 30f5fc5b29..70443b8d46 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -31,4 +31,8 @@ Para visitar Portugal clica [aqui](https://www.visitportugal.com/pt-pt). [O que fazer](http://www.timeout.com/city-guides/things-to-do-in-lisbon/) em Lisboa. -Pensava numa forma de criar [emprego](emprego/criar_emprego.md) na minha terra natal. \ No newline at end of file +Pensava numa forma de criar [emprego](emprego/criar_emprego.md) na minha terra natal. + +Iria passear na [Itália](italia/italia.md) + +Investiria no [saturnov](http://www.saturnov.com/) \ No newline at end of file diff --git a/portugues_pt/italia/italia.md b/portugues_pt/italia/italia.md new file mode 100644 index 0000000000..53ab4d90ac --- /dev/null +++ b/portugues_pt/italia/italia.md @@ -0,0 +1,3 @@ + +Visitaria vários locais turísticos além de parentes e amigos... + From 306732c4b5cf6e085e11eb45a95e1519fe4d9470 Mon Sep 17 00:00:00 2001 From: Andre Gambaro Date: Mon, 14 Nov 2016 18:06:35 -0200 Subject: [PATCH 4718/5486] new place to visit: coliseu --- portugues_pt/italia/italia.md | 1 + 1 file changed, 1 insertion(+) diff --git a/portugues_pt/italia/italia.md b/portugues_pt/italia/italia.md index 53ab4d90ac..c384f69801 100644 --- a/portugues_pt/italia/italia.md +++ b/portugues_pt/italia/italia.md @@ -1,3 +1,4 @@ Visitaria vários locais turísticos além de parentes e amigos... +Visitar o Coliseu \ No newline at end of file From 3fd5ac30108f29444f7380cfeb5a6491e4261249 Mon Sep 17 00:00:00 2001 From: Phillip Lo Date: Tue, 15 Nov 2016 11:30:07 +1300 Subject: [PATCH 4719/5486] Add Tree of Savior and Ragnarok online description. --- english/marshmallow.md | 4 +++- english/tos/tos.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/tos/tos.md diff --git a/english/marshmallow.md b/english/marshmallow.md index b11fc5be3b..7aacd0cfec 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1169,4 +1169,6 @@ Wow, you made it to the end! You are determined, [see](persistent/persistent.md Wait! This is not the end! OMG [click me](never_ended/never_ended.md) -have you already heard the story of the Choking Doberman? [click me](dog_finger/dog_finger.md) \ No newline at end of file +have you already heard the story of the Choking Doberman? [click me](dog_finger/dog_finger.md) + +Join me in [Tree of Savior!](tos/tos.md) \ No newline at end of file diff --git a/english/tos/tos.md b/english/tos/tos.md new file mode 100644 index 0000000000..1e395e90dc --- /dev/null +++ b/english/tos/tos.md @@ -0,0 +1 @@ +[Tree of Savior](https://treeofsavior.com/) is the spiritual successor to the classic MMORPG [Ragnarok Online](iro.ragnarokonline.com/) \ No newline at end of file From 4a2cfc11f099344c7e5bee636a6f06088f041dfc Mon Sep 17 00:00:00 2001 From: Phillip Lo Date: Tue, 15 Nov 2016 11:35:10 +1300 Subject: [PATCH 4720/5486] Add line break so less characters per line. --- english/tos/tos.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/tos/tos.md b/english/tos/tos.md index 1e395e90dc..5a8d085b41 100644 --- a/english/tos/tos.md +++ b/english/tos/tos.md @@ -1 +1,2 @@ -[Tree of Savior](https://treeofsavior.com/) is the spiritual successor to the classic MMORPG [Ragnarok Online](iro.ragnarokonline.com/) \ No newline at end of file +[Tree of Savior](https://treeofsavior.com/) is the spiritual successor +to the classic MMORPG [Ragnarok Online](iro.ragnarokonline.com/) \ No newline at end of file From 09c52c05d9169d1b5d1d5501d116e2aabefd8e4d Mon Sep 17 00:00:00 2001 From: Phillip Lo Date: Tue, 15 Nov 2016 11:45:14 +1300 Subject: [PATCH 4721/5486] Change link to ragnarok online. --- english/tos/tos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/tos/tos.md b/english/tos/tos.md index 5a8d085b41..7096896a5e 100644 --- a/english/tos/tos.md +++ b/english/tos/tos.md @@ -1,2 +1,2 @@ [Tree of Savior](https://treeofsavior.com/) is the spiritual successor -to the classic MMORPG [Ragnarok Online](iro.ragnarokonline.com/) \ No newline at end of file +to the classic MMORPG [Ragnarok Online](http://www.playragnarok.com/) \ No newline at end of file From e1380ccd1aa2cc48cd136c8fa893bc99f41d28c6 Mon Sep 17 00:00:00 2001 From: Phillip Lo Date: Tue, 15 Nov 2016 11:48:38 +1300 Subject: [PATCH 4722/5486] Add blank line between 2 links. --- english/tos/tos.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/tos/tos.md b/english/tos/tos.md index 7096896a5e..3c95a1c995 100644 --- a/english/tos/tos.md +++ b/english/tos/tos.md @@ -1,2 +1,3 @@ -[Tree of Savior](https://treeofsavior.com/) is the spiritual successor +[Tree of Savior](https://treeofsavior.com/) is the spiritual successor + to the classic MMORPG [Ragnarok Online](http://www.playragnarok.com/) \ No newline at end of file From a5d2f3631123c591b28f0f5381a221d757f4eff8 Mon Sep 17 00:00:00 2001 From: Phillip Lo Date: Tue, 15 Nov 2016 11:51:30 +1300 Subject: [PATCH 4723/5486] Change link to Tree of Savior. --- english/tos/tos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/tos/tos.md b/english/tos/tos.md index 3c95a1c995..2cbf688948 100644 --- a/english/tos/tos.md +++ b/english/tos/tos.md @@ -1,3 +1,3 @@ -[Tree of Savior](https://treeofsavior.com/) is the spiritual successor +[Tree of Savior](http://www.tosbase.com/) is the spiritual successor to the classic MMORPG [Ragnarok Online](http://www.playragnarok.com/) \ No newline at end of file From c120972b18319e91da9920ec579a592a32e74081 Mon Sep 17 00:00:00 2001 From: Naiyu Jiang Date: Mon, 14 Nov 2016 19:57:56 -0500 Subject: [PATCH 4724/5486] Create a lotus file --- ...20\203\351\245\274\345\271\262\351\201\220\346\203\263" | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 "Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263" diff --git "a/Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263" "b/Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263" new file mode 100644 index 0000000000..5edb837358 --- /dev/null +++ "b/Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263" @@ -0,0 +1,7 @@ +桌子上刚好有lotus饼干，我就拿起来吃了几块 + +然后把空的矿泉水瓶扔到垃圾桶里 + +把一直晃着我眼睛的台灯换个方向 + +有生之年，我也想当一次至尊宝 From 600aaac6781a3e4e63cbb3f6718d6d151a160f3f Mon Sep 17 00:00:00 2001 From: Naiyu Jiang Date: Mon, 14 Nov 2016 19:59:47 -0500 Subject: [PATCH 4725/5486] =?UTF-8?q?Rename=20=E5=90=83=E9=A5=BC=E5=B9=B2?= =?UTF-8?q?=E9=81=90=E6=83=B3=20to=20=E5=90=83=E9=A5=BC=E5=B9=B2=E9=81=90?= =?UTF-8?q?=E6=83=B3.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...45\220\203\351\245\274\345\271\262\351\201\220\346\203\263.md" | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename "Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263" => "Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263.md" (100%) diff --git "a/Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263" "b/Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263.md" similarity index 100% rename from "Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263" rename to "Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263.md" From 81b4289a482e7dea0995fffb2dc6a653ba3a3976 Mon Sep 17 00:00:00 2001 From: Naiyu Jiang Date: Mon, 14 Nov 2016 20:04:12 -0500 Subject: [PATCH 4726/5486] =?UTF-8?q?Add=20lotus=20to=20=E5=A4=A7=E8=AF=9D?= =?UTF-8?q?=E8=A5=BF=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 4fd77aa7f0..658dcb0ae9 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -147,3 +147,5 @@ [歪神现世](waishen/waishen_story.md) [你以为可以点？] + +[吃饼干遐想](lotus/吃饼干遐想.md) From 9b4db996f7fedcefab84eae691a6d20dfe385930 Mon Sep 17 00:00:00 2001 From: Naiyu Jiang Date: Mon, 14 Nov 2016 20:06:40 -0500 Subject: [PATCH 4727/5486] =?UTF-8?q?Update=20=E5=90=83=E9=A5=BC=E5=B9=B2?= =?UTF-8?q?=E9=81=90=E6=83=B3.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...\203\351\245\274\345\271\262\351\201\220\346\203\263.md" | 6 ++++++ 1 file changed, 6 insertions(+) diff --git "a/Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263.md" "b/Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263.md" index 5edb837358..d12c0ee497 100644 --- "a/Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263.md" +++ "b/Chinese/lotus/\345\220\203\351\245\274\345\271\262\351\201\220\346\203\263.md" @@ -5,3 +5,9 @@ 把一直晃着我眼睛的台灯换个方向 有生之年，我也想当一次至尊宝 + + + +如果你当不了，没关系 + +[回过头](../大话西游.md)，看看别的至尊宝是怎么说的吧 From d52737d0f90297ef86368f0d94bd2ce8789349f2 Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 15 Nov 2016 16:57:40 +0530 Subject: [PATCH 4728/5486] feat:add my story line --- english/daughter/file.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/daughter/file.md diff --git a/english/daughter/file.md b/english/daughter/file.md new file mode 100644 index 0000000000..8a5613f407 --- /dev/null +++ b/english/daughter/file.md @@ -0,0 +1,4 @@ + +A month before their anniversary, she secretly ordered a suit online for him. + +Even miles away, the daughter didn't stop surprising her dad. From b6f1c67589b21384346a34e66c7495021fcab0dc Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 15 Nov 2016 17:15:37 +0530 Subject: [PATCH 4729/5486] add snake in dream story --- english/dream/swim/Snake/snake.md | 1 + english/dream/swim/swim.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 english/dream/swim/Snake/snake.md diff --git a/english/dream/swim/Snake/snake.md b/english/dream/swim/Snake/snake.md new file mode 100644 index 0000000000..03411a9d80 --- /dev/null +++ b/english/dream/swim/Snake/snake.md @@ -0,0 +1 @@ +You have been ensnared by a snake. You have been tied up by the snake's body. \ No newline at end of file diff --git a/english/dream/swim/swim.md b/english/dream/swim/swim.md index 35dbfbd11c..dac21cd05e 100644 --- a/english/dream/swim/swim.md +++ b/english/dream/swim/swim.md @@ -11,3 +11,5 @@ A pain shoots up your legs. You glance down to where your feet should be only to flipper wrapped tightly in the ends of licorice whips. You are trapped. Your dream is going horribly wrong. You have been ensnared by... + +[Snake](../dream/livethedream/swim/snake.md) From df13522b5a27013ef76376de28c2b736932d6bde Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 15 Nov 2016 17:21:03 +0530 Subject: [PATCH 4730/5486] corrected link in swim --- english/dream/swim/swim.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/swim/swim.md b/english/dream/swim/swim.md index dac21cd05e..710565bece 100644 --- a/english/dream/swim/swim.md +++ b/english/dream/swim/swim.md @@ -12,4 +12,4 @@ flipper wrapped tightly in the ends of licorice whips. You are trapped. Your dream is going horribly wrong. You have been ensnared by... -[Snake](../dream/livethedream/swim/snake.md) +[Snake](../dream/livethedream/swim/snake/snake.md) From 965817ef33e4361be53b30f1afd9143b22d4f9bf Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 15 Nov 2016 17:22:09 +0530 Subject: [PATCH 4731/5486] delete unlinked story --- english/daughter/file.md | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 english/daughter/file.md diff --git a/english/daughter/file.md b/english/daughter/file.md deleted file mode 100644 index 8a5613f407..0000000000 --- a/english/daughter/file.md +++ /dev/null @@ -1,4 +0,0 @@ - -A month before their anniversary, she secretly ordered a suit online for him. - -Even miles away, the daughter didn't stop surprising her dad. From ec04c4840145eca1179afecbb68444921c3663be Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 15 Nov 2016 17:32:06 +0530 Subject: [PATCH 4732/5486] correct link --- english/dream/swim/swim.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/swim/swim.md b/english/dream/swim/swim.md index 710565bece..1fd8cc78af 100644 --- a/english/dream/swim/swim.md +++ b/english/dream/swim/swim.md @@ -12,4 +12,4 @@ flipper wrapped tightly in the ends of licorice whips. You are trapped. Your dream is going horribly wrong. You have been ensnared by... -[Snake](../dream/livethedream/swim/snake/snake.md) +[Snake](../dream/swim/snake/snake.md) From 87ea3591053e25e79ca1fe010dfc14425aaf88cf Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 15 Nov 2016 17:34:00 +0530 Subject: [PATCH 4733/5486] correct link --- english/dream/swim/swim.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/swim/swim.md b/english/dream/swim/swim.md index 1fd8cc78af..9f6e7070bf 100644 --- a/english/dream/swim/swim.md +++ b/english/dream/swim/swim.md @@ -12,4 +12,4 @@ flipper wrapped tightly in the ends of licorice whips. You are trapped. Your dream is going horribly wrong. You have been ensnared by... -[Snake](../dream/swim/snake/snake.md) +[Snake](../swim/snake/snake.md) From 1053c677230fe920663e52faf6b460ae97240c04 Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 15 Nov 2016 17:37:21 +0530 Subject: [PATCH 4734/5486] correct link --- english/dream/swim/swim.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/swim/swim.md b/english/dream/swim/swim.md index 9f6e7070bf..43b587f6e8 100644 --- a/english/dream/swim/swim.md +++ b/english/dream/swim/swim.md @@ -12,4 +12,4 @@ flipper wrapped tightly in the ends of licorice whips. You are trapped. Your dream is going horribly wrong. You have been ensnared by... -[Snake](../swim/snake/snake.md) +[Snake](../swim/snake/snake.md) \ No newline at end of file From d9fb42fe11c82c3b98e597e2e7e1ed8e37220378 Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 15 Nov 2016 17:38:59 +0530 Subject: [PATCH 4735/5486] correct link --- english/dream/swim/swim.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/swim/swim.md b/english/dream/swim/swim.md index 43b587f6e8..fdd2277b3d 100644 --- a/english/dream/swim/swim.md +++ b/english/dream/swim/swim.md @@ -12,4 +12,4 @@ flipper wrapped tightly in the ends of licorice whips. You are trapped. Your dream is going horribly wrong. You have been ensnared by... -[Snake](../swim/snake/snake.md) \ No newline at end of file +[Snake](../swim/Snake/snake.md) \ No newline at end of file From 94ed84968a89f904cb1ab0ee8856f389d59f4c4b Mon Sep 17 00:00:00 2001 From: Brenn Kucey Date: Tue, 15 Nov 2016 11:15:27 -0800 Subject: [PATCH 4736/5486] add swim to bubble option to keep story going --- english/mysterious-pool/glowing-eyes/caught_up/plants.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/mysterious-pool/glowing-eyes/caught_up/plants.md b/english/mysterious-pool/glowing-eyes/caught_up/plants.md index 6b4c0ed276..01af36f12f 100644 --- a/english/mysterious-pool/glowing-eyes/caught_up/plants.md +++ b/english/mysterious-pool/glowing-eyes/caught_up/plants.md @@ -1,3 +1,4 @@ You try to swim back up to regain breath, but then you notice that your leg is caught up by some water plants pulling you back in! Oh no.... +Quick, [swim to the bubble!](../../giant-bubble/giant-bubble.md) From 321b1fac5f984abb80ef038a2dd23dd32e89998e Mon Sep 17 00:00:00 2001 From: Brenn Kucey Date: Tue, 15 Nov 2016 11:19:43 -0800 Subject: [PATCH 4737/5486] bring reader back to options during mysterious pool story --- english/mysterious-pool/glowing-eyes/caught_up/plants.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/mysterious-pool/glowing-eyes/caught_up/plants.md b/english/mysterious-pool/glowing-eyes/caught_up/plants.md index 01af36f12f..20a049b7bf 100644 --- a/english/mysterious-pool/glowing-eyes/caught_up/plants.md +++ b/english/mysterious-pool/glowing-eyes/caught_up/plants.md @@ -1,4 +1,4 @@ You try to swim back up to regain breath, but then you notice that your leg is caught up by some water plants pulling you back in! Oh no.... -Quick, [swim to the bubble!](../../giant-bubble/giant-bubble.md) +Quick, [try something else!](../../giant-bubble/giant-bubble.md) From def36e99f92ec0db83c0537522865b24b7a90321 Mon Sep 17 00:00:00 2001 From: Phillip Lo Date: Wed, 16 Nov 2016 09:39:47 +1300 Subject: [PATCH 4738/5486] Add front end web development nanodegree description. --- english/front_end/front_end.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/front_end/front_end.md diff --git a/english/front_end/front_end.md b/english/front_end/front_end.md new file mode 100644 index 0000000000..ca40d7552d --- /dev/null +++ b/english/front_end/front_end.md @@ -0,0 +1,5 @@ +Master the skills required to become a Front-End Web Developer, +and start building beautiful, responsive websites +optimized for mobile and desktop performance. + +[Front-End Web Developer Nanodegree](https://www.udacity.com/course/front-end-web-developer-nanodegree--nd001?v=fe1) \ No newline at end of file From dd630014952ab051b35574260d1326b61496b9fd Mon Sep 17 00:00:00 2001 From: Phillip Lo Date: Wed, 16 Nov 2016 09:48:01 +1300 Subject: [PATCH 4739/5486] Save marshmallow.md. --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 7aacd0cfec..69e127f9b6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1171,4 +1171,6 @@ Wait! This is not the end! OMG [click me](never_ended/never_ended.md) have you already heard the story of the Choking Doberman? [click me](dog_finger/dog_finger.md) -Join me in [Tree of Savior!](tos/tos.md) \ No newline at end of file +Join me in [Tree of Savior!](tos/tos.md) + +Let's do the [Front-end Web Developer Nanodegree](front_end/front_end.md) together! \ No newline at end of file From eb83b5e9767935507452b6abce48652f6f4ef9b7 Mon Sep 17 00:00:00 2001 From: Faiaz Zaman Date: Wed, 16 Nov 2016 18:49:45 +1100 Subject: [PATCH 4740/5486] docs: The one and only Khaleesi --- english/valarmorghulis/valarmorghulis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/valarmorghulis/valarmorghulis.md b/english/valarmorghulis/valarmorghulis.md index 4a3cdc6a2a..82070fe6d3 100644 --- a/english/valarmorghulis/valarmorghulis.md +++ b/english/valarmorghulis/valarmorghulis.md @@ -1,4 +1,4 @@ A guy appears and replies with "valar dohaeris" and gives you a small coin. -You admire the coin for a while and when you realize, the man disappeared. +The Khaleesi stands up for herself against her brother Viserys after the would-be king of Westeros finally takes things too far. It's not long after this that Viserys finally gets the crown he deserves -- though not the one he wanted -- when Khal Drogo has molten gold poured onto his head. With no hope, but with a coin in the pocket, the only logical path is [here](../use-the-fork-luke/use-the-fork.md). From f1a9e708605ab6361541e12346ae1c984c03df33 Mon Sep 17 00:00:00 2001 From: Faiaz Zaman Date: Wed, 16 Nov 2016 19:05:57 +1100 Subject: [PATCH 4741/5486] fix: No more than 120 characters in a line. --- english/valarmorghulis/valarmorghulis.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/english/valarmorghulis/valarmorghulis.md b/english/valarmorghulis/valarmorghulis.md index 82070fe6d3..5c346e815f 100644 --- a/english/valarmorghulis/valarmorghulis.md +++ b/english/valarmorghulis/valarmorghulis.md @@ -1,4 +1,9 @@ A guy appears and replies with "valar dohaeris" and gives you a small coin. -The Khaleesi stands up for herself against her brother Viserys after the would-be king of Westeros finally takes things too far. It's not long after this that Viserys finally gets the crown he deserves -- though not the one he wanted -- when Khal Drogo has molten gold poured onto his head. +You admire the coin for a while and when you realize, the man disappeared. +The Khaleesi stands up for herself against her brother Viserys after the +would-be king of Westeros finally takes things too far. It's not long +after this that Viserys finally gets the crown he +deserves -- though not the one he wanted +-- when Khal Drogo has molten gold poured onto his head. With no hope, but with a coin in the pocket, the only logical path is [here](../use-the-fork-luke/use-the-fork.md). From 951abdc2dc3e490193dfb2f6aca0d83e81e384bb Mon Sep 17 00:00:00 2001 From: valentina Date: Wed, 16 Nov 2016 14:25:21 +0530 Subject: [PATCH 4742/5486] Add a note to thank Udacity --- english/love-udacity/love-udacity.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/love-udacity/love-udacity.md b/english/love-udacity/love-udacity.md index b25248ed26..7b4b6f4880 100644 --- a/english/love-udacity/love-udacity.md +++ b/english/love-udacity/love-udacity.md @@ -13,3 +13,5 @@ Never stop learning! But when things are getting really difficult, are you going to [quit](../quit/quit.md) No you aren't going to quit. There are a ton of other resouces, just please keep trying!' + +Thanks alot Udacity for teaching me git and github From 886ca2567fafa44d903c66b6d025456639b74694 Mon Sep 17 00:00:00 2001 From: Shantanu Kshire Date: Thu, 17 Nov 2016 23:45:14 +0530 Subject: [PATCH 4743/5486] "Add android course" --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 69e127f9b6..3bffafca8b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1173,4 +1173,6 @@ have you already heard the story of the Choking Doberman? [click me](dog_finger/ Join me in [Tree of Savior!](tos/tos.md) -Let's do the [Front-end Web Developer Nanodegree](front_end/front_end.md) together! \ No newline at end of file +Let's do the [Front-end Web Developer Nanodegree](front_end/front_end.md) together! + +How about we all [learn android](https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) ! \ No newline at end of file From d193f7b48ed599058dbc8b8f27d4961f3df0d33f Mon Sep 17 00:00:00 2001 From: Wei Date: Thu, 17 Nov 2016 11:27:27 -0800 Subject: [PATCH 4744/5486] Added Jiangjinjiu.md --- Chinese/Jiangjinjiu.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Chinese/Jiangjinjiu.md diff --git a/Chinese/Jiangjinjiu.md b/Chinese/Jiangjinjiu.md new file mode 100644 index 0000000000..dfee53f1e2 --- /dev/null +++ b/Chinese/Jiangjinjiu.md @@ -0,0 +1,16 @@ +将进酒 + +李白 + +君不见，黄河之水天上来，奔流到海不复回。 +君不见，高堂明镜悲白发，朝如青丝暮成雪。 +人生得意须尽欢，莫使金樽空对月。 +天生我材必有用，千金散尽还复来。 +烹羊宰牛且为乐，会须一饮三百杯。 +岑夫子，丹丘生，将进酒，杯莫停。 +与君歌一曲，请君为我倾耳听。 +钟鼓馔玉不足贵，但愿长醉不复醒。 +古来圣贤皆寂寞，惟有饮者留其名。 +陈王昔时宴平乐，斗酒十千恣欢谑。 +主人何为言少钱，径须沽取对君酌。 +五花马，千金裘，呼儿将出换美酒，与尔同销万古愁。 \ No newline at end of file From aaf9cca343921ad61f394c69b82df185834f6929 Mon Sep 17 00:00:00 2001 From: flintsteel7 Date: Thu, 17 Nov 2016 12:07:39 -0800 Subject: [PATCH 4745/5486] Add things to do in Minecraft --- .../focus_on_gathering_wood/build_a_ship/build_a_ship.md | 5 +++++ .../focus_on_gathering_wood/build_a_tower/build_a_tower.md | 7 +++++++ .../focus_on_gathering_wood/focus_on_gathering_wood.md | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/build_a_ship/build_a_ship.md create mode 100644 english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/build_a_tower/build_a_tower.md diff --git a/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/build_a_ship/build_a_ship.md b/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/build_a_ship/build_a_ship.md new file mode 100644 index 0000000000..8275b0fe4b --- /dev/null +++ b/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/build_a_ship/build_a_ship.md @@ -0,0 +1,5 @@ +You spend hours and hours building a magnificent sailing vessel in which to conquer the seas! + +Unfortunately, once completed, your realize this is Minecraft, and your ship can't move. + +Hopefully you have a nice view from the poop deck. diff --git a/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/build_a_tower/build_a_tower.md b/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/build_a_tower/build_a_tower.md new file mode 100644 index 0000000000..f66e2a3f98 --- /dev/null +++ b/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/build_a_tower/build_a_tower.md @@ -0,0 +1,7 @@ +You toil for days constructing the tallest tower known to man. + +After placing your the last block of wood from your inventory, you look out over the land. + +Unfortunetely, this is Minecraft, and the view distance is crap, so you can't see much. + +But it's a nice tower anyway. diff --git a/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md b/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md index 0f03cd6278..1b3bfc9f8e 100644 --- a/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md +++ b/english/you-are-in-minecraft/gather_wood/focus_on_gathering_wood/focus_on_gathering_wood.md @@ -3,4 +3,8 @@ You turn a tree into lumber. Crafting an axe you attack another, quicker. You happen upon a forest, and declare yourself a lumber baron. Before you know it, the once lush environment has been clear cut. -You have the saplings to replant a mighty forest, or the wood to build a massive structure. \ No newline at end of file +You have the saplings to replant a mighty forest, or the wood to build a massive structure. + +[Build a tower](build_a_tower/build_a_tower.md) + +[Build a ship](build_a_ship/build_a_ship.md) From 67a64564180edc188e86631bc80b4e9bce5455b5 Mon Sep 17 00:00:00 2001 From: Wei Date: Thu, 17 Nov 2016 14:02:10 -0800 Subject: [PATCH 4746/5486] Added link --- Chinese/{ => Jiangjinjiu}/Jiangjinjiu.md | 0 language.md | 50 ++++++++++++------------ 2 files changed, 26 insertions(+), 24 deletions(-) rename Chinese/{ => Jiangjinjiu}/Jiangjinjiu.md (100%) diff --git a/Chinese/Jiangjinjiu.md b/Chinese/Jiangjinjiu/Jiangjinjiu.md similarity index 100% rename from Chinese/Jiangjinjiu.md rename to Chinese/Jiangjinjiu/Jiangjinjiu.md diff --git a/language.md b/language.md index 8b0f4489ad..f5d77e1eae 100644 --- a/language.md +++ b/language.md @@ -24,6 +24,8 @@ If you speak the language of love, [kiss here](love/love.md) 如果你说中文而且想要了解一个新的世界，[请点击这里](Chinese/DesertHell/NewWorld.md). +如果你喜欢李白的将进酒，［点击这里］(Chinese/Jiangjinjiu/Jiangjinjiu.md). + Si hablas español, pasa [por aquí](espanol/canudos.md). اذا كنت تتحدث العربية، [اضغط هنا](arabic/salamoAlikom.md) @@ -137,27 +139,27 @@ Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) As jy Afrikaans kan praat, gaan [hier](afrikaans/kos.md) -======= -Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) - -If you speak Gujarati, go [here](Gujarati/gujarati.md). - -If you want learn Telugu, click [here](Telugu/Telugu.md). - -If you want to know more about IoT, click [here](english/iot/intro.md). - -If GibberisHkjsbckjsjcn,[hereeekdcskj](Gibberish/Gibberish.md) - -તમે ગુજરાતી છો તો [અહી](Gujarati/અમે ગુજરાતી લોકો છીએ/અમે ગુજરાતી લોકો છીએ.md) જાઓ - -To explore the বাংলা (bangla/bengali) search engine, news portals, and blogs [click here](bangla/bangla-portals.md). - -If you speak oriya, click [here](oriya/oriya.md). - -If you understand Tamil, திருநாவுக்கரசர் அருளிய தேவாரம் [இங்கே அழுத்தவும்](Tamil/Thevaram/thevarm.md) - -if you understand maithli, click [here...](maithli/maithli.md) - -if (you.understand("C#")) here.click(); - -if you speak Bahasa Indonesia [klik disini](indonesia/bahasa-indonesia.md) +======= +Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) + +If you speak Gujarati, go [here](Gujarati/gujarati.md). + +If you want learn Telugu, click [here](Telugu/Telugu.md). + +If you want to know more about IoT, click [here](english/iot/intro.md). + +If GibberisHkjsbckjsjcn,[hereeekdcskj](Gibberish/Gibberish.md) + +તમે ગુજરાતી છો તો [અહી](Gujarati/અમે ગુજરાતી લોકો છીએ/અમે ગુજરાતી લોકો છીએ.md) જાઓ + +To explore the বাংলা (bangla/bengali) search engine, news portals, and blogs [click here](bangla/bangla-portals.md). + +If you speak oriya, click [here](oriya/oriya.md). + +If you understand Tamil, திருநாவுக்கரசர் அருளிய தேவாரம் [இங்கே அழுத்தவும்](Tamil/Thevaram/thevarm.md) + +if you understand maithli, click [here...](maithli/maithli.md) + +if (you.understand("C#")) here.click(); + +if you speak Bahasa Indonesia [klik disini](indonesia/bahasa-indonesia.md) From 9b0adae9f91968876b9ce47100656780ff60b5a9 Mon Sep 17 00:00:00 2001 From: Wei Date: Thu, 17 Nov 2016 14:22:52 -0800 Subject: [PATCH 4747/5486] Updated Text --- language.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language.md b/language.md index f5d77e1eae..6e00ccc3c5 100644 --- a/language.md +++ b/language.md @@ -24,7 +24,7 @@ If you speak the language of love, [kiss here](love/love.md) 如果你说中文而且想要了解一个新的世界，[请点击这里](Chinese/DesertHell/NewWorld.md). -如果你喜欢李白的将进酒，［点击这里］(Chinese/Jiangjinjiu/Jiangjinjiu.md). +如果你喜欢李白的将进酒. Click [Here］(Chinese/Jiangjinjiu/Jiangjinjiu.md) Si hablas español, pasa [por aquí](espanol/canudos.md). From d52ccdd14525230d41227fbfd4991c7e0e6756b6 Mon Sep 17 00:00:00 2001 From: Wei Date: Thu, 17 Nov 2016 14:25:34 -0800 Subject: [PATCH 4748/5486] Changed to end --- language.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/language.md b/language.md index 6e00ccc3c5..d2cdd24413 100644 --- a/language.md +++ b/language.md @@ -24,8 +24,6 @@ If you speak the language of love, [kiss here](love/love.md) 如果你说中文而且想要了解一个新的世界，[请点击这里](Chinese/DesertHell/NewWorld.md). -如果你喜欢李白的将进酒. Click [Here］(Chinese/Jiangjinjiu/Jiangjinjiu.md) - Si hablas español, pasa [por aquí](espanol/canudos.md). اذا كنت تتحدث العربية، [اضغط هنا](arabic/salamoAlikom.md) @@ -163,3 +161,5 @@ if you understand maithli, click [here...](maithli/maithli.md) if (you.understand("C#")) here.click(); if you speak Bahasa Indonesia [klik disini](indonesia/bahasa-indonesia.md) + +如果你喜欢李白的将进酒. Click [Here］(Chinese/Jiangjinjiu/Jiangjinjiu.md) From 8b14f8d180cc4bca360c023d4baeb3aaca3e1c77 Mon Sep 17 00:00:00 2001 From: Wei Date: Thu, 17 Nov 2016 14:41:24 -0800 Subject: [PATCH 4749/5486] Fix the link to the story --- Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md | 16 ++++++ Chinese/DesertHell/NewWorld.md | 2 + language.md | 50 +++++++++---------- 3 files changed, 42 insertions(+), 26 deletions(-) create mode 100644 Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md diff --git a/Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md b/Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md new file mode 100644 index 0000000000..dfee53f1e2 --- /dev/null +++ b/Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md @@ -0,0 +1,16 @@ +将进酒 + +李白 + +君不见，黄河之水天上来，奔流到海不复回。 +君不见，高堂明镜悲白发，朝如青丝暮成雪。 +人生得意须尽欢，莫使金樽空对月。 +天生我材必有用，千金散尽还复来。 +烹羊宰牛且为乐，会须一饮三百杯。 +岑夫子，丹丘生，将进酒，杯莫停。 +与君歌一曲，请君为我倾耳听。 +钟鼓馔玉不足贵，但愿长醉不复醒。 +古来圣贤皆寂寞，惟有饮者留其名。 +陈王昔时宴平乐，斗酒十千恣欢谑。 +主人何为言少钱，径须沽取对君酌。 +五花马，千金裘，呼儿将出换美酒，与尔同销万古愁。 \ No newline at end of file diff --git a/Chinese/DesertHell/NewWorld.md b/Chinese/DesertHell/NewWorld.md index 1a0db0e915..62e48351a0 100644 --- a/Chinese/DesertHell/NewWorld.md +++ b/Chinese/DesertHell/NewWorld.md @@ -6,3 +6,5 @@ end [他讲的什么？](./OldStory/Story.md) [我不想听，继续往前走。](./Walk/Walk.md) + +老头子说，李白的将进酒，你们听过吗？ ［听将进酒］(./Jiangjinjiu/Jiangjinjiu.md) diff --git a/language.md b/language.md index d2cdd24413..8b0f4489ad 100644 --- a/language.md +++ b/language.md @@ -137,29 +137,27 @@ Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) As jy Afrikaans kan praat, gaan [hier](afrikaans/kos.md) -======= -Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) - -If you speak Gujarati, go [here](Gujarati/gujarati.md). - -If you want learn Telugu, click [here](Telugu/Telugu.md). - -If you want to know more about IoT, click [here](english/iot/intro.md). - -If GibberisHkjsbckjsjcn,[hereeekdcskj](Gibberish/Gibberish.md) - -તમે ગુજરાતી છો તો [અહી](Gujarati/અમે ગુજરાતી લોકો છીએ/અમે ગુજરાતી લોકો છીએ.md) જાઓ - -To explore the বাংলা (bangla/bengali) search engine, news portals, and blogs [click here](bangla/bangla-portals.md). - -If you speak oriya, click [here](oriya/oriya.md). - -If you understand Tamil, திருநாவுக்கரசர் அருளிய தேவாரம் [இங்கே அழுத்தவும்](Tamil/Thevaram/thevarm.md) - -if you understand maithli, click [here...](maithli/maithli.md) - -if (you.understand("C#")) here.click(); - -if you speak Bahasa Indonesia [klik disini](indonesia/bahasa-indonesia.md) - -如果你喜欢李白的将进酒. Click [Here］(Chinese/Jiangjinjiu/Jiangjinjiu.md) +======= +Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) + +If you speak Gujarati, go [here](Gujarati/gujarati.md). + +If you want learn Telugu, click [here](Telugu/Telugu.md). + +If you want to know more about IoT, click [here](english/iot/intro.md). + +If GibberisHkjsbckjsjcn,[hereeekdcskj](Gibberish/Gibberish.md) + +તમે ગુજરાતી છો તો [અહી](Gujarati/અમે ગુજરાતી લોકો છીએ/અમે ગુજરાતી લોકો છીએ.md) જાઓ + +To explore the বাংলা (bangla/bengali) search engine, news portals, and blogs [click here](bangla/bangla-portals.md). + +If you speak oriya, click [here](oriya/oriya.md). + +If you understand Tamil, திருநாவுக்கரசர் அருளிய தேவாரம் [இங்கே அழுத்தவும்](Tamil/Thevaram/thevarm.md) + +if you understand maithli, click [here...](maithli/maithli.md) + +if (you.understand("C#")) here.click(); + +if you speak Bahasa Indonesia [klik disini](indonesia/bahasa-indonesia.md) From a12f62066a12d497530860b6260214f657da5877 Mon Sep 17 00:00:00 2001 From: Patrick Behrens Date: Thu, 17 Nov 2016 14:55:21 -0800 Subject: [PATCH 4750/5486] Add two lines to crazy.md --- english/crazy/crazy.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/crazy/crazy.md b/english/crazy/crazy.md index 220c27e7e0..ab3dc0c73f 100644 --- a/english/crazy/crazy.md +++ b/english/crazy/crazy.md @@ -20,3 +20,6 @@ something is seriously wrong with us No the others are the insane +But really, what is insanity? + +Do the insane know they're insane? From 659c34430ba123405df449d1e4559b2b5aacbd72 Mon Sep 17 00:00:00 2001 From: Wei Date: Thu, 17 Nov 2016 15:03:46 -0800 Subject: [PATCH 4751/5486] Fix the link issue --- Chinese/DesertHell/NewWorld.md | 2 +- Chinese/DesertHell/{Jiangjinjiu => Walk}/Jiangjinjiu.md | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename Chinese/DesertHell/{Jiangjinjiu => Walk}/Jiangjinjiu.md (100%) diff --git a/Chinese/DesertHell/NewWorld.md b/Chinese/DesertHell/NewWorld.md index 62e48351a0..14dca6fee6 100644 --- a/Chinese/DesertHell/NewWorld.md +++ b/Chinese/DesertHell/NewWorld.md @@ -7,4 +7,4 @@ end [我不想听，继续往前走。](./Walk/Walk.md) -老头子说，李白的将进酒，你们听过吗？ ［听将进酒］(./Jiangjinjiu/Jiangjinjiu.md) +老头子说，李白的将进酒，你们听过吗？ [没听过](./Walk/Jiangjinjiu.md) diff --git a/Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md b/Chinese/DesertHell/Walk/Jiangjinjiu.md similarity index 100% rename from Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md rename to Chinese/DesertHell/Walk/Jiangjinjiu.md From 8c108cd2b6c16e40dcae88d87294403c128e0363 Mon Sep 17 00:00:00 2001 From: Wei Date: Thu, 17 Nov 2016 15:16:27 -0800 Subject: [PATCH 4752/5486] Fix Folder Issue --- Chinese/DesertHell/{Walk => Jiangjinjiu}/Jiangjinjiu.md | 0 Chinese/DesertHell/NewWorld.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename Chinese/DesertHell/{Walk => Jiangjinjiu}/Jiangjinjiu.md (100%) diff --git a/Chinese/DesertHell/Walk/Jiangjinjiu.md b/Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md similarity index 100% rename from Chinese/DesertHell/Walk/Jiangjinjiu.md rename to Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md diff --git a/Chinese/DesertHell/NewWorld.md b/Chinese/DesertHell/NewWorld.md index 14dca6fee6..e1994ad531 100644 --- a/Chinese/DesertHell/NewWorld.md +++ b/Chinese/DesertHell/NewWorld.md @@ -7,4 +7,4 @@ end [我不想听，继续往前走。](./Walk/Walk.md) -老头子说，李白的将进酒，你们听过吗？ [没听过](./Walk/Jiangjinjiu.md) +老头子说，李白的将进酒，你们听过吗？ [没听过](./Jiangjinjiu/Jiangjinjiu.md) From 0be0ec8dd3f0e9c2a2e5b3dca28b3f4a8144ad30 Mon Sep 17 00:00:00 2001 From: Wei Date: Thu, 17 Nov 2016 18:31:15 -0800 Subject: [PATCH 4753/5486] Relocated Jiangjinjiu file --- Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md | 9 +++++---- Chinese/DesertHell/NewWorld.md | 2 +- Chinese/Jiangjinjiu/Jiangjinjiu.md | 16 ---------------- 3 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 Chinese/Jiangjinjiu/Jiangjinjiu.md diff --git a/Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md b/Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md index dfee53f1e2..d6648c578e 100644 --- a/Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md +++ b/Chinese/DesertHell/Jiangjinjiu/Jiangjinjiu.md @@ -1,6 +1,7 @@ 将进酒 -李白 +唐代 + 君不见，黄河之水天上来，奔流到海不复回。 君不见，高堂明镜悲白发，朝如青丝暮成雪。 @@ -8,9 +9,9 @@ 天生我材必有用，千金散尽还复来。 烹羊宰牛且为乐，会须一饮三百杯。 岑夫子，丹丘生，将进酒，杯莫停。 -与君歌一曲，请君为我倾耳听。 -钟鼓馔玉不足贵，但愿长醉不复醒。 -古来圣贤皆寂寞，惟有饮者留其名。 +与君歌一曲，请君为我倾耳听。(倾耳听 一作：侧耳听) +钟鼓馔玉不足贵，但愿长醉不复醒。(不足贵 一作：何足贵；不复醒 一作：不愿醒/不用醒) +古来圣贤皆寂寞，惟有饮者留其名。(古来 一作：自古；惟 通：唯) 陈王昔时宴平乐，斗酒十千恣欢谑。 主人何为言少钱，径须沽取对君酌。 五花马，千金裘，呼儿将出换美酒，与尔同销万古愁。 \ No newline at end of file diff --git a/Chinese/DesertHell/NewWorld.md b/Chinese/DesertHell/NewWorld.md index e1994ad531..e8b0024eed 100644 --- a/Chinese/DesertHell/NewWorld.md +++ b/Chinese/DesertHell/NewWorld.md @@ -7,4 +7,4 @@ end [我不想听，继续往前走。](./Walk/Walk.md) -老头子说，李白的将进酒，你们听过吗？ [没听过](./Jiangjinjiu/Jiangjinjiu.md) +[老头突然念起了李白的将进酒](./Jiangjinjiu/Jiangjinjiu.md) \ No newline at end of file diff --git a/Chinese/Jiangjinjiu/Jiangjinjiu.md b/Chinese/Jiangjinjiu/Jiangjinjiu.md deleted file mode 100644 index dfee53f1e2..0000000000 --- a/Chinese/Jiangjinjiu/Jiangjinjiu.md +++ /dev/null @@ -1,16 +0,0 @@ -将进酒 - -李白 - -君不见，黄河之水天上来，奔流到海不复回。 -君不见，高堂明镜悲白发，朝如青丝暮成雪。 -人生得意须尽欢，莫使金樽空对月。 -天生我材必有用，千金散尽还复来。 -烹羊宰牛且为乐，会须一饮三百杯。 -岑夫子，丹丘生，将进酒，杯莫停。 -与君歌一曲，请君为我倾耳听。 -钟鼓馔玉不足贵，但愿长醉不复醒。 -古来圣贤皆寂寞，惟有饮者留其名。 -陈王昔时宴平乐，斗酒十千恣欢谑。 -主人何为言少钱，径须沽取对君酌。 -五花马，千金裘，呼儿将出换美酒，与尔同销万古愁。 \ No newline at end of file From b08db91ca917ff37184250571812b3a21a492f33 Mon Sep 17 00:00:00 2001 From: dalide Date: Thu, 17 Nov 2016 21:48:14 -0600 Subject: [PATCH 4754/5486] Add a small goal --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 3bffafca8b..b409dc5522 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1175,4 +1175,6 @@ Join me in [Tree of Savior!](tos/tos.md) Let's do the [Front-end Web Developer Nanodegree](front_end/front_end.md) together! -How about we all [learn android](https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) ! \ No newline at end of file +How about we all [learn android](https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) ! + +Let's finish a small goal, [for example](set_up_a_small_goal/setup_a_small_goal.md) \ No newline at end of file From 5b40e6e57f6b4cb74456cb0e33fddbc72c8e56a7 Mon Sep 17 00:00:00 2001 From: dalide Date: Thu, 17 Nov 2016 21:59:56 -0600 Subject: [PATCH 4755/5486] Add the file of explaining the goal --- english/set_up_a_small_goal/setup_a_small_goal.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/set_up_a_small_goal/setup_a_small_goal.md diff --git a/english/set_up_a_small_goal/setup_a_small_goal.md b/english/set_up_a_small_goal/setup_a_small_goal.md new file mode 100644 index 0000000000..bdd97abc9b --- /dev/null +++ b/english/set_up_a_small_goal/setup_a_small_goal.md @@ -0,0 +1 @@ +before you do big thing, we should make process step by step. Let's finish a small goal first, for example, making 100million dollars. \ No newline at end of file From 20c9422ed4ebf4554b1206cf6e42949d6ab22517 Mon Sep 17 00:00:00 2001 From: dalide Date: Thu, 17 Nov 2016 22:05:53 -0600 Subject: [PATCH 4756/5486] Break the file up into multiple lines --- english/set_up_a_small_goal/setup_a_small_goal.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/set_up_a_small_goal/setup_a_small_goal.md b/english/set_up_a_small_goal/setup_a_small_goal.md index bdd97abc9b..6a3dd0f6d3 100644 --- a/english/set_up_a_small_goal/setup_a_small_goal.md +++ b/english/set_up_a_small_goal/setup_a_small_goal.md @@ -1 +1,3 @@ -before you do big thing, we should make process step by step. Let's finish a small goal first, for example, making 100million dollars. \ No newline at end of file +before you do big thing, we should make process +step by step. Let's finish a small goal first, +for example, making 100million dollars. \ No newline at end of file From 91c9a871724a559bbdf1f7f407ae0e01986aa33f Mon Sep 17 00:00:00 2001 From: lucthomas Date: Fri, 18 Nov 2016 06:42:51 +0100 Subject: [PATCH 4757/5486] docs: Add one storyline --- english/Monty-Python/search.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/Monty-Python/search.md b/english/Monty-Python/search.md index 12e5132f4b..19745a4d17 100644 --- a/english/Monty-Python/search.md +++ b/english/Monty-Python/search.md @@ -10,4 +10,6 @@ Chop off his limbs [Run into the Knights who say "Ni!"](https://www.youtube.com/watch?v=zIV4poUZAQo) -Go off to find a nice shrubbery \ No newline at end of file +Go off to find a nice shrubbery + +[Run into the Knights who say "Ni!" again!](https://www.youtube.com/watch?v=zIV4poUZAQo) From cbbfa45b445e6919b2e8e4eb10995fb630d7eaaf Mon Sep 17 00:00:00 2001 From: Carolyn Miaral Date: Thu, 17 Nov 2016 22:52:09 -0700 Subject: [PATCH 4758/5486] Add story in Philippines --- Philippines/bob-ong/bob-ong.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Philippines/bob-ong/bob-ong.md diff --git a/Philippines/bob-ong/bob-ong.md b/Philippines/bob-ong/bob-ong.md new file mode 100644 index 0000000000..0b5e4b04d5 --- /dev/null +++ b/Philippines/bob-ong/bob-ong.md @@ -0,0 +1,16 @@ +Ano ang unang libro ni Bob Ong ang nabasa mo? +1. ABNKKBSNPLAKo?! (Mga Kwentong Chalk ni Bob Ong) +2. Macarthur +3. Stainless Longganisa +4. Alamat ng Gubat +5. Bakit Baliktad Magbasa Ng Libro Ang Mga Pilipino? + +Bakit mo binasa ang libro ni Bob Ong? +1. Dahil siya ay dating web developer +2. May nagpahiram sa iyo ng libro +3. Na engganyo kang basahin dahil "uso" +4. Wala lang + +Sino ang mas paborito mo si Bob Ong o Jericho Rosales? + +Nahilo ka na ba? Sige ito ang gamot [gamot] (../salamat.md)sa hilo. \ No newline at end of file From 3e08bd92bc272968b5c752e27f5a700affb0db1c Mon Sep 17 00:00:00 2001 From: Carolyn Date: Thu, 17 Nov 2016 22:58:04 -0700 Subject: [PATCH 4759/5486] Add link to bob-ong --- Philippines/salamat.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index 10a748df86..a65992331f 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -19,3 +19,7 @@ O kung gusto mo namang kumain, tara [kain] (kain/kain.md) tayo ! Kinsay balo mag binisaya dinhi? meow meow meow? [meow!](meow/meow.md) + +Sumali sa usapan ng mga fan ni Bob Ong [Bob Ong] (bob-ong/bob-ong.md). +Alamin kung gaano mo kakilala ang iyong idolo. +Petsa: Nobyembre 17, 2016 From 592b60ef2850c1dc480acb4f4daa66930006260a Mon Sep 17 00:00:00 2001 From: Carolyn Date: Thu, 17 Nov 2016 22:58:37 -0700 Subject: [PATCH 4760/5486] Update bob-ong.md --- Philippines/bob-ong/bob-ong.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Philippines/bob-ong/bob-ong.md b/Philippines/bob-ong/bob-ong.md index 0b5e4b04d5..e72eb99b40 100644 --- a/Philippines/bob-ong/bob-ong.md +++ b/Philippines/bob-ong/bob-ong.md @@ -13,4 +13,4 @@ Bakit mo binasa ang libro ni Bob Ong? Sino ang mas paborito mo si Bob Ong o Jericho Rosales? -Nahilo ka na ba? Sige ito ang gamot [gamot] (../salamat.md)sa hilo. \ No newline at end of file +Nahilo ka na ba? Sige ito ang gamot [gamot] (../salamat.md) sa hilo. From 157d3ee28e6596bc0e55b83a60a7ff4441104328 Mon Sep 17 00:00:00 2001 From: Daniel Gattringer Date: Fri, 18 Nov 2016 09:58:53 +0100 Subject: [PATCH 4761/5486] Add a new story about eating chocolate --- german/Essen/Schokolade/Schokolade.md | 4 ++++ german/Smartphone/Internet/Internet.md | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 german/Essen/Schokolade/Schokolade.md diff --git a/german/Essen/Schokolade/Schokolade.md b/german/Essen/Schokolade/Schokolade.md new file mode 100644 index 0000000000..f6f4c44190 --- /dev/null +++ b/german/Essen/Schokolade/Schokolade.md @@ -0,0 +1,4 @@ +Deine nerven Zittern. Hier hilft nur Schokolade. Davon ... + +[machst du erstmal ein gut gelauntes Selfie und postest es auf Facebook.](../../Smartphone/Rettung/Facebook/Facebook.md) + diff --git a/german/Smartphone/Internet/Internet.md b/german/Smartphone/Internet/Internet.md index 7749a073b1..b1f24eb84a 100644 --- a/german/Smartphone/Internet/Internet.md +++ b/german/Smartphone/Internet/Internet.md @@ -8,4 +8,6 @@ Da du Internetempfang und einen aktzeptablen Akkustand hast, ... [schreibst deinem besten Kumpel eine WhatsApp](../Rettung/Kumpel/Kumpel.md), ob er dich an deiner aktuellen GPS Position abholen kann. -[erstmal deine Lieblings Nachrichten-Website aufrufen...](Internet.md) \ No newline at end of file +[erstmal deine Lieblings Nachrichten-Website aufrufen...](Internet.md) + +[Isst du einen Bissen Schokolade zur Beruhigung...](../../Essen/Schokolade/Schokolade.md) \ No newline at end of file From a9c0228f3c090ef7f467477ba74e92c8dc404cb8 Mon Sep 17 00:00:00 2001 From: xbane Date: Fri, 18 Nov 2016 19:31:09 +0800 Subject: [PATCH 4762/5486] Add a story - dream --- Chinese/dream/dream.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Chinese/dream/dream.md diff --git a/Chinese/dream/dream.md b/Chinese/dream/dream.md new file mode 100644 index 0000000000..c0c00c26e8 --- /dev/null +++ b/Chinese/dream/dream.md @@ -0,0 +1,5 @@ +你來到這就是在作夢~ 來吧! 以下自由選擇: + +1. [我要穿越](https://github.com/xbane123/create-your-own-adventure/blob/master/Chinese/Yifan/modernCity.md) +2. [我要當至尊寶](https://github.com/xbane123/create-your-own-adventure/blob/master/Chinese/lotus/%E5%90%83%E9%A5%BC%E5%B9%B2%E9%81%90%E6%83%B3.md) +3. [我要美女](https://github.com/xbane123/create-your-own-adventure/blob/master/Chinese/beauty/beauty.md) \ No newline at end of file From a943322aebed6a2dceeb4b76bc51c64954e79b49 Mon Sep 17 00:00:00 2001 From: xbane Date: Fri, 18 Nov 2016 19:36:56 +0800 Subject: [PATCH 4763/5486] Add spacing between choices --- Chinese/dream/dream.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Chinese/dream/dream.md b/Chinese/dream/dream.md index c0c00c26e8..dbe721cbb3 100644 --- a/Chinese/dream/dream.md +++ b/Chinese/dream/dream.md @@ -1,5 +1,7 @@ 你來到這就是在作夢~ 來吧! 以下自由選擇: 1. [我要穿越](https://github.com/xbane123/create-your-own-adventure/blob/master/Chinese/Yifan/modernCity.md) + 2. [我要當至尊寶](https://github.com/xbane123/create-your-own-adventure/blob/master/Chinese/lotus/%E5%90%83%E9%A5%BC%E5%B9%B2%E9%81%90%E6%83%B3.md) + 3. [我要美女](https://github.com/xbane123/create-your-own-adventure/blob/master/Chinese/beauty/beauty.md) \ No newline at end of file From 5a5def51491e82060b808b3af6de4cd99bc65c6f Mon Sep 17 00:00:00 2001 From: xbane Date: Fri, 18 Nov 2016 19:49:02 +0800 Subject: [PATCH 4764/5486] Transit to relative links --- Chinese/dream/dream.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Chinese/dream/dream.md b/Chinese/dream/dream.md index dbe721cbb3..101cd2cfa9 100644 --- a/Chinese/dream/dream.md +++ b/Chinese/dream/dream.md @@ -1,7 +1,7 @@ 你來到這就是在作夢~ 來吧! 以下自由選擇: -1. [我要穿越](https://github.com/xbane123/create-your-own-adventure/blob/master/Chinese/Yifan/modernCity.md) +1. [我要穿越](Chinese/Yifan/modernCity.md) -2. [我要當至尊寶](https://github.com/xbane123/create-your-own-adventure/blob/master/Chinese/lotus/%E5%90%83%E9%A5%BC%E5%B9%B2%E9%81%90%E6%83%B3.md) +2. [我要當至尊寶](Chinese/lotus/%E5%90%83%E9%A5%BC%E5%B9%B2%E9%81%90%E6%83%B3.md) -3. [我要美女](https://github.com/xbane123/create-your-own-adventure/blob/master/Chinese/beauty/beauty.md) \ No newline at end of file +3. [我要美女](Chinese/beauty/beauty.md) \ No newline at end of file From 60770c750012cc6e818587292e5c026119e4a1c7 Mon Sep 17 00:00:00 2001 From: xbane Date: Fri, 18 Nov 2016 19:55:39 +0800 Subject: [PATCH 4765/5486] =?UTF-8?q?Add=20a=20link=20of=20dream.md=20to?= =?UTF-8?q?=20=E5=A4=A7=E8=AF=9D=E8=A5=BF=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 658dcb0ae9..cc7182207e 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -149,3 +149,5 @@ [你以为可以点？] [吃饼干遐想](lotus/吃饼干遐想.md) + +[作夢](dream/dream.md) \ No newline at end of file From afc1131fa31de564f3343d82289ad83bd16427bd Mon Sep 17 00:00:00 2001 From: xbane123 Date: Fri, 18 Nov 2016 20:04:23 +0800 Subject: [PATCH 4766/5486] Update dream.md --- Chinese/dream/dream.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Chinese/dream/dream.md b/Chinese/dream/dream.md index 101cd2cfa9..ed9726695b 100644 --- a/Chinese/dream/dream.md +++ b/Chinese/dream/dream.md @@ -1,7 +1,7 @@ 你來到這就是在作夢~ 來吧! 以下自由選擇: -1. [我要穿越](Chinese/Yifan/modernCity.md) +1. [我要穿越](../Yifan/modernCity.md) 2. [我要當至尊寶](Chinese/lotus/%E5%90%83%E9%A5%BC%E5%B9%B2%E9%81%90%E6%83%B3.md) -3. [我要美女](Chinese/beauty/beauty.md) \ No newline at end of file +3. [我要美女](Chinese/beauty/beauty.md) From bcfa3df47a21d88ef6ba1e496d65effa86783963 Mon Sep 17 00:00:00 2001 From: xbane Date: Fri, 18 Nov 2016 20:05:10 +0800 Subject: [PATCH 4767/5486] Fix the invalid links --- Chinese/dream/dream.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Chinese/dream/dream.md b/Chinese/dream/dream.md index 101cd2cfa9..5f4ab385a2 100644 --- a/Chinese/dream/dream.md +++ b/Chinese/dream/dream.md @@ -1,7 +1,7 @@ 你來到這就是在作夢~ 來吧! 以下自由選擇: -1. [我要穿越](Chinese/Yifan/modernCity.md) +1. [我要穿越](../Yifan/modernCity.md) -2. [我要當至尊寶](Chinese/lotus/%E5%90%83%E9%A5%BC%E5%B9%B2%E9%81%90%E6%83%B3.md) +2. [我要當至尊寶](../lotus/%E5%90%83%E9%A5%BC%E5%B9%B2%E9%81%90%E6%83%B3.md) -3. [我要美女](Chinese/beauty/beauty.md) \ No newline at end of file +3. [我要美女](../beauty/beauty.md) \ No newline at end of file From 8cda2eb0b65ba15e7478d48c29c2d0700f3f6be5 Mon Sep 17 00:00:00 2001 From: xbane123 Date: Fri, 18 Nov 2016 20:07:32 +0800 Subject: [PATCH 4768/5486] Update dream.md --- Chinese/dream/dream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/dream/dream.md b/Chinese/dream/dream.md index ed9726695b..70db456242 100644 --- a/Chinese/dream/dream.md +++ b/Chinese/dream/dream.md @@ -1,6 +1,6 @@ 你來到這就是在作夢~ 來吧! 以下自由選擇: -1. [我要穿越](../Yifan/modernCity.md) +1. [我要穿越](Chinese/Yifan/modernCity.md) 2. [我要當至尊寶](Chinese/lotus/%E5%90%83%E9%A5%BC%E5%B9%B2%E9%81%90%E6%83%B3.md) From 565168b2cb8cd1f0d89cec2ca629e0c721930bb5 Mon Sep 17 00:00:00 2001 From: xbane Date: Fri, 18 Nov 2016 20:41:39 +0800 Subject: [PATCH 4769/5486] Fix links again --- Chinese/dream/dream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/dream/dream.md b/Chinese/dream/dream.md index dfc9b539c8..b39d220140 100644 --- a/Chinese/dream/dream.md +++ b/Chinese/dream/dream.md @@ -2,7 +2,7 @@ 1. [我要穿越](../Yifan/modernCity.md) -2. [我要當至尊寶](../lotus/%E5%90%83%E9%A5%BC%E5%B9%B2%E9%81%90%E6%83%B3.md) +2. [我要當至尊寶](..Xinyang/MyLoveStory.md) 3. [我要美女](../beauty/beauty.md) From 401351bbcabf30327b5962e49ad49f2fe1f8faf6 Mon Sep 17 00:00:00 2001 From: xbane Date: Fri, 18 Nov 2016 20:43:12 +0800 Subject: [PATCH 4770/5486] Fix links again and again.... --- Chinese/dream/dream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/dream/dream.md b/Chinese/dream/dream.md index b39d220140..29c543dbb7 100644 --- a/Chinese/dream/dream.md +++ b/Chinese/dream/dream.md @@ -2,7 +2,7 @@ 1. [我要穿越](../Yifan/modernCity.md) -2. [我要當至尊寶](..Xinyang/MyLoveStory.md) +2. [我要當至尊寶](../Xinyang/MyLoveStory.md) 3. [我要美女](../beauty/beauty.md) From 121310963b06042bdbf6adc41f33b9e86b1e5517 Mon Sep 17 00:00:00 2001 From: Nikola Krajnovic Date: Fri, 18 Nov 2016 21:44:35 +0100 Subject: [PATCH 4771/5486] Add two new choices in burekMeso. Add corresponding pages. --- serbian/burekMeso/burekMeso.md | 10 ++++++++++ serbian/burekMeso/istrcao/istrcao.md | 1 + serbian/burekMeso/okrenuo/okrenuo.md | 4 ++++ 3 files changed, 15 insertions(+) create mode 100644 serbian/burekMeso/istrcao/istrcao.md create mode 100644 serbian/burekMeso/okrenuo/okrenuo.md diff --git a/serbian/burekMeso/burekMeso.md b/serbian/burekMeso/burekMeso.md index 3aaa0d5645..1eca747dc5 100644 --- a/serbian/burekMeso/burekMeso.md +++ b/serbian/burekMeso/burekMeso.md @@ -1 +1,11 @@ "Ne, samo burek" - uzvratio je, jedva čekajući da zagrize. + +Dok je sa zadovoljstvom zvakao savrseno pecivo, lenjo je razgledao ulicu kroz izlog pekare. +Nije prošlo mnogo, kada je sa zaprepascenjem video kako iza ugla prljave ulice istrcava njegov +drug is srednje - smotani Darko - za koga niko nije znao gde je proveo poslednjih par godina. + +U trenutku nije znao kako da reaguje. + +[Bacio je burek preko ramena i istrcao na ulicu.](istrcao/istrcao.md) + +[Lagano se udaljio od izloga i okrenuo ka zidu.](okrenuo/okrenuo.md) diff --git a/serbian/burekMeso/istrcao/istrcao.md b/serbian/burekMeso/istrcao/istrcao.md new file mode 100644 index 0000000000..fc63394c69 --- /dev/null +++ b/serbian/burekMeso/istrcao/istrcao.md @@ -0,0 +1 @@ +"Pa 'de si ti covece ovih godina. Kao da si u zemlju propao!" - skoro povika na njega kada mu je prisao. diff --git a/serbian/burekMeso/okrenuo/okrenuo.md b/serbian/burekMeso/okrenuo/okrenuo.md new file mode 100644 index 0000000000..ece01f2d8a --- /dev/null +++ b/serbian/burekMeso/okrenuo/okrenuo.md @@ -0,0 +1,4 @@ +Pravio se kao da nista nije video, sve dok se vrata pekare nisu otvorila. +Tada je pogledao preko ramena i video starog druga kako panici: + +"Moramo odmah da krenemo! Za petama su mi!" From ec001d3b646e8035d9c49e0f7137bfae41d79c2c Mon Sep 17 00:00:00 2001 From: Hao Date: Sat, 19 Nov 2016 17:55:13 +0800 Subject: [PATCH 4772/5486] Add a new episode yoyo --- .DS_Store | Bin 0 -> 6148 bytes Chinese/.DS_Store | Bin 0 -> 6148 bytes Chinese/yoyo/yoyo.md | 5 +++++ ...4\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 4 files changed, 7 insertions(+) create mode 100644 .DS_Store create mode 100644 Chinese/.DS_Store create mode 100644 Chinese/yoyo/yoyo.md diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9fa2499ae51deea226f24419b6639820e0effc0a GIT binary patch literal 6148 zcmeHK%}T>S5ZU?Ci{j{T6mIgb-TpxdlQ@LWlt>FqMJf8xiY5$0Vga6c7~l z@JL8JCk{JKdn_6q|B(T4ce7-lvf~xT#f9g7nbershn}wbF^Ktqt>T=90cv5Z96sY#Z7Z*Kky@)`(F1;YNO75H;BtY z&v(N{Rqa>jZq#a;%ayKo0jU++_i8-k4sY}5G6P~{n&xW1Uo4hNIab`>9pqTQkl)G?(71{DMdSyV6_UxyYN$N(~c3``sY`sp*~ zC+=i;AY=d;_$>qCePEyhEscpn`Eu92 L8gM`c{*-|aao%6> literal 0 HcmV?d00001 diff --git a/Chinese/.DS_Store b/Chinese/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..365df1e7f7e7b26183ed34192775af2f160e978c GIT binary patch literal 6148 zcmeH~Jr2S!425mzfW*>~F$)La22lkkU}HkSScw6#=jc5DEEHx`p=V@&u~Uoo4NWZ~ zIy`SXkzPbraHDK3OiYn4<%HjGdtArM{XSaBZIQGByqC#-ZWC013Qz$mKn1A4j1r0``6=aAQrjpuaj0d;|bHl-;oQSpqCp0Bf=ZQGsc+g3+ozhFIO( z!IIb2WD7>SXbvBm|ExB}z%<%L3lf-C2LlzL0uu$6k@t4~AK>5S|49o|DnJGPOablo z$NhkZ%Cq(3@vMH%s;wIw^ve<6J_3-~QM`e>VZYb{tjQKc1;!5nmw|x_{8WJ#4c8GP literal 0 HcmV?d00001 diff --git a/Chinese/yoyo/yoyo.md b/Chinese/yoyo/yoyo.md new file mode 100644 index 0000000000..a86519f369 --- /dev/null +++ b/Chinese/yoyo/yoyo.md @@ -0,0 +1,5 @@ +一天，攻城狮哼着哟哟切克闹，哼着哼着睡着了... + +梦里，他放佛回到了[五百年前](../ZZB/zzb.md)... + +不行啊！正在加班该需求呢，怎么能犯困呢！[元神归位](../大话西游.md) \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index cc7182207e..1ea90c758d 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -2,6 +2,8 @@ 前端攻城狮一枚。这枚攻城狮做出了很多网页，比如： +[哟哟切克闹](yoyo/yoyo.md) + [好大一朵棉花糖](cloud/cloud.md) [美貌是一种表情](beauty/beauty.md) From fdde5377f8544480040e40209a6a37f7cf389a76 Mon Sep 17 00:00:00 2001 From: Hao Date: Sat, 19 Nov 2016 18:07:49 +0800 Subject: [PATCH 4773/5486] Delete empty file --- .DS_Store | Bin 6148 -> 0 bytes Chinese/.DS_Store | Bin 6148 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 Chinese/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 9fa2499ae51deea226f24419b6639820e0effc0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5ZU?Ci{j{T6mIgb-TpxdlQ@LWlt>FqMJf8xiY5$0Vga6c7~l z@JL8JCk{JKdn_6q|B(T4ce7-lvf~xT#f9g7nbershn}wbF^Ktqt>T=90cv5Z96sY#Z7Z*Kky@)`(F1;YNO75H;BtY z&v(N{Rqa>jZq#a;%ayKo0jU++_i8-k4sY}5G6P~{n&xW1Uo4hNIab`>9pqTQkl)G?(71{DMdSyV6_UxyYN$N(~c3``sY`sp*~ zC+=i;AY=d;_$>qCePEyhEscpn`Eu92 L8gM`c{*-|aao%6> diff --git a/Chinese/.DS_Store b/Chinese/.DS_Store deleted file mode 100644 index 365df1e7f7e7b26183ed34192775af2f160e978c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzfW*>~F$)La22lkkU}HkSScw6#=jc5DEEHx`p=V@&u~Uoo4NWZ~ zIy`SXkzPbraHDK3OiYn4<%HjGdtArM{XSaBZIQGByqC#-ZWC013Qz$mKn1A4j1r0``6=aAQrjpuaj0d;|bHl-;oQSpqCp0Bf=ZQGsc+g3+ozhFIO( z!IIb2WD7>SXbvBm|ExB}z%<%L3lf-C2LlzL0uu$6k@t4~AK>5S|49o|DnJGPOablo z$NhkZ%Cq(3@vMH%s;wIw^ve<6J_3-~QM`e>VZYb{tjQKc1;!5nmw|x_{8WJ#4c8GP From d81108dcf78d2f851f7dec8702a4122d9959c64d Mon Sep 17 00:00:00 2001 From: Hao Date: Sat, 19 Nov 2016 18:25:27 +0800 Subject: [PATCH 4774/5486] Add hi~ in english version --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index b409dc5522..fdcdf62548 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,5 +1,7 @@ Once upon a time many authors collaborated to make meaningless linked story. +hi~ + NGE is [here] (NGE/NGE.md) [start](mad/mad.md) your journey into world of mad From 9d9ad407216a80a7f6a4951ec4c5a0b739c74401 Mon Sep 17 00:00:00 2001 From: Muhammad Ijlal Baig Date: Sat, 19 Nov 2016 15:48:40 +0100 Subject: [PATCH 4775/5486] Add a twist to the story --- english/alchemy/alchemy.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index 57e02db639..730250954d 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -37,3 +37,6 @@ You slip the ring over your finger and ... [Congratulations!](../marshmallow.md) [Transform!](../transform/transform.md) + +and puff! you turn into a blob fish while only a few feet remain between you +and the polar bear... From 784a02bf106b86a55df84fc71ee6e629e7bbccba Mon Sep 17 00:00:00 2001 From: Matt McAnelly Date: Sat, 19 Nov 2016 14:34:11 -0500 Subject: [PATCH 4776/5486] Add teach google pictionary option --- english/pictionary/pictionary.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/pictionary/pictionary.md diff --git a/english/pictionary/pictionary.md b/english/pictionary/pictionary.md new file mode 100644 index 0000000000..4de5e841a7 --- /dev/null +++ b/english/pictionary/pictionary.md @@ -0,0 +1 @@ +You decide to teach google to be a [Pictionary](https://quickdraw.withgoogle.com/) champion. \ No newline at end of file From 4a764cb4212b25ad99e248068032f8df4b266a37 Mon Sep 17 00:00:00 2001 From: Matt McAnelly Date: Sat, 19 Nov 2016 14:42:04 -0500 Subject: [PATCH 4777/5486] Add the ability to teach google pictionary. --- english/marshmallow.md | 4 +++- english/pictionary/pictionary.md | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 english/pictionary/pictionary.md diff --git a/english/marshmallow.md b/english/marshmallow.md index fdcdf62548..733fe14285 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1179,4 +1179,6 @@ Let's do the [Front-end Web Developer Nanodegree](front_end/front_end.md) togeth How about we all [learn android](https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) ! -Let's finish a small goal, [for example](set_up_a_small_goal/setup_a_small_goal.md) \ No newline at end of file +Let's finish a small goal, [for example](set_up_a_small_goal/setup_a_small_goal.md) + +You decide to teach google to be a [Pictionary](https://quickdraw.withgoogle.com/) champion. \ No newline at end of file diff --git a/english/pictionary/pictionary.md b/english/pictionary/pictionary.md deleted file mode 100644 index 4de5e841a7..0000000000 --- a/english/pictionary/pictionary.md +++ /dev/null @@ -1 +0,0 @@ -You decide to teach google to be a [Pictionary](https://quickdraw.withgoogle.com/) champion. \ No newline at end of file From b50df03966b365058f4a1974a371c2a9b320bbf2 Mon Sep 17 00:00:00 2001 From: Kyrylo Date: Sun, 20 Nov 2016 00:40:16 +0200 Subject: [PATCH 4778/5486] added mobile tv option --- ukrainian/make-a-hole/in-the-wall.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ukrainian/make-a-hole/in-the-wall.md b/ukrainian/make-a-hole/in-the-wall.md index 4c7c698f4a..2133c82d55 100644 --- a/ukrainian/make-a-hole/in-the-wall.md +++ b/ukrainian/make-a-hole/in-the-wall.md @@ -8,3 +8,6 @@ [трошки поплакти бо нема з ким подiлитися шоколадом](../Crying/crying-in-the-corner.md) [стерти коротку память та розпочати все спочатку, наче нічого і не було](../marshmallow.md) + +[спробую розважити себе переглядом кумендого серіалу](../tv-show/tv-show.md) + From 517b5224d92daa765d7cab1e937f5b3d46c171f3 Mon Sep 17 00:00:00 2001 From: Paul Zeman Date: Sat, 19 Nov 2016 22:01:26 -0700 Subject: [PATCH 4779/5486] Add two new options to continue story --- english/madness/writhe/writhe.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/madness/writhe/writhe.md b/english/madness/writhe/writhe.md index 1e0542377d..d9a61161b6 100644 --- a/english/madness/writhe/writhe.md +++ b/english/madness/writhe/writhe.md @@ -1,4 +1,10 @@ You writhe in agony for ten thousand millenia until sweet death descends upon you. -WEEP MORTAL! \ No newline at end of file +WEEP MORTAL! + +But it was only a dream. You wake soaked with sweat with a bucket of chicken next to the bed. In the corner of the room, a camera watches silently. + +Do you: +[Eat some chicken](eat/chicken.md)? +[Cover camera with chicken thigh](camera/chicken.md)? From 100d2271f02f609394c439488b2d95fcfbb355d9 Mon Sep 17 00:00:00 2001 From: Paul Zeman Date: Sat, 19 Nov 2016 22:12:21 -0700 Subject: [PATCH 4780/5486] Extend writhe story --- english/madness/writhe/camera/chicken.md | 3 +++ english/madness/writhe/eat/chicken.md | 2 ++ english/madness/writhe/writhe.md | 2 ++ 3 files changed, 7 insertions(+) create mode 100644 english/madness/writhe/camera/chicken.md create mode 100644 english/madness/writhe/eat/chicken.md diff --git a/english/madness/writhe/camera/chicken.md b/english/madness/writhe/camera/chicken.md new file mode 100644 index 0000000000..7f6d4ba34f --- /dev/null +++ b/english/madness/writhe/camera/chicken.md @@ -0,0 +1,3 @@ +You carefully hang a fried chicken thigh over the camera obscuring the view. +Suddenly a piercing scream fills the room accompanied by the sound of gears +turning slowly in the distance. \ No newline at end of file diff --git a/english/madness/writhe/eat/chicken.md b/english/madness/writhe/eat/chicken.md new file mode 100644 index 0000000000..aebf59e213 --- /dev/null +++ b/english/madness/writhe/eat/chicken.md @@ -0,0 +1,2 @@ +The chicken is glorious, crispy breading on the outside, moist and flavorful on the inside. +You gorge yourself until all of the chicken is gone. On the bottom of the bucket is a message. \ No newline at end of file diff --git a/english/madness/writhe/writhe.md b/english/madness/writhe/writhe.md index d9a61161b6..1d60d8aa09 100644 --- a/english/madness/writhe/writhe.md +++ b/english/madness/writhe/writhe.md @@ -6,5 +6,7 @@ WEEP MORTAL! But it was only a dream. You wake soaked with sweat with a bucket of chicken next to the bed. In the corner of the room, a camera watches silently. Do you: + [Eat some chicken](eat/chicken.md)? + [Cover camera with chicken thigh](camera/chicken.md)? From 32437abbc6468daeb10a234c4ef41abed75ff871 Mon Sep 17 00:00:00 2001 From: Paul Zeman Date: Sat, 19 Nov 2016 22:24:59 -0700 Subject: [PATCH 4781/5486] Shorten the line length of addition --- english/madness/writhe/writhe.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/madness/writhe/writhe.md b/english/madness/writhe/writhe.md index 1d60d8aa09..dfb18105ee 100644 --- a/english/madness/writhe/writhe.md +++ b/english/madness/writhe/writhe.md @@ -3,7 +3,9 @@ sweet death descends upon you. WEEP MORTAL! -But it was only a dream. You wake soaked with sweat with a bucket of chicken next to the bed. In the corner of the room, a camera watches silently. +But it was only a dream. You wake soaked with sweat with a bucket of +chicken next to the bed. In the corner of the room, a camera watches +silently. Do you: From 39c7d90cab2d2d98c31a6f31f4b7f7def8b915b0 Mon Sep 17 00:00:00 2001 From: Kyrylo Date: Sun, 20 Nov 2016 13:29:34 +0200 Subject: [PATCH 4782/5486] merged with original repository changes --- ukrainian/make-a-hole/in-the-wall.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/make-a-hole/in-the-wall.md b/ukrainian/make-a-hole/in-the-wall.md index 2133c82d55..739dfb7609 100644 --- a/ukrainian/make-a-hole/in-the-wall.md +++ b/ukrainian/make-a-hole/in-the-wall.md @@ -3,7 +3,7 @@ Після двадцяти сантиметрів зефірової стіни потрапляю на шар шоколаду. В кімнаті прохолодно і шоколад доволі твердий, тож копати його значно важче ніж зефір. -Думаю, що робити... +Думаю, що робити далі... [трошки поплакти бо нема з ким подiлитися шоколадом](../Crying/crying-in-the-corner.md) From 2fda4e443675abba64f904b0dc180cf7dc577eb7 Mon Sep 17 00:00:00 2001 From: Oscar Argueta Date: Sun, 20 Nov 2016 10:31:43 -0500 Subject: [PATCH 4783/5486] Add sentence to nightmare story --- espanol/pesadilla/pesadilla.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/pesadilla/pesadilla.md b/espanol/pesadilla/pesadilla.md index 22f90a4b4d..6902a916b3 100644 --- a/espanol/pesadilla/pesadilla.md +++ b/espanol/pesadilla/pesadilla.md @@ -1 +1 @@ -¿Real o no real? \ No newline at end of file +¿Real o no real? La verdad no importa. Igual tenes que ir a trabajar hoy. \ No newline at end of file From e08933a0ac12eb94961fd07e1ca78be48ae46364 Mon Sep 17 00:00:00 2001 From: Oscar Argueta Date: Sun, 20 Nov 2016 10:37:47 -0500 Subject: [PATCH 4784/5486] Add new line in the story instead of adding to an existing line --- espanol/pesadilla/pesadilla.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/pesadilla/pesadilla.md b/espanol/pesadilla/pesadilla.md index 6902a916b3..4c4dea8bc6 100644 --- a/espanol/pesadilla/pesadilla.md +++ b/espanol/pesadilla/pesadilla.md @@ -1 +1,2 @@ -¿Real o no real? La verdad no importa. Igual tenes que ir a trabajar hoy. \ No newline at end of file +¿Real o no real? +La verdad no importa. Igual tenes que ir a trabajar hoy. \ No newline at end of file From 7f876b2359698414057ea551f760d911fd171e72 Mon Sep 17 00:00:00 2001 From: Oscar Argueta Date: Sun, 20 Nov 2016 10:42:00 -0500 Subject: [PATCH 4785/5486] Delete extra space --- espanol/pesadilla/pesadilla.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/pesadilla/pesadilla.md b/espanol/pesadilla/pesadilla.md index 4c4dea8bc6..321b050ccb 100644 --- a/espanol/pesadilla/pesadilla.md +++ b/espanol/pesadilla/pesadilla.md @@ -1,2 +1,2 @@ -¿Real o no real? +¿Real o no real? La verdad no importa. Igual tenes que ir a trabajar hoy. \ No newline at end of file From a25d82a0a66573359b33d43d3fd712a4c0ffff15 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 21 Nov 2016 03:21:04 +1000 Subject: [PATCH 4786/5486] Add 2ch --- russian/2ch/2ch.md | 1 + russian/zefir.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 russian/2ch/2ch.md diff --git a/russian/2ch/2ch.md b/russian/2ch/2ch.md new file mode 100644 index 0000000000..3274218974 --- /dev/null +++ b/russian/2ch/2ch.md @@ -0,0 +1 @@ +За скроллом /b/ вы и не заметили, как прошло 6 лет, но не все еще потеряно. diff --git a/russian/zefir.md b/russian/zefir.md index 06e4ea2688..ce06b033e2 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -26,6 +26,8 @@ Ваши действия: +[Зайти на двач](2ch/2ch.md) + [Пригласить профессора Воробьева](invite-proffesor/invite-proffesor.md) [Попросите девушку ущепнуть вас](girlfriend-pinch-you/girlfriend-pinch-you.md) From 3e648e3c2904eba18f8858974c6725d7bcc38662 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 21 Nov 2016 03:43:22 +1000 Subject: [PATCH 4787/5486] Second try to add 2ch --- russian/zefir.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/russian/zefir.md b/russian/zefir.md index ce06b033e2..f6d9258550 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -26,8 +26,6 @@ Ваши действия: -[Зайти на двач](2ch/2ch.md) - [Пригласить профессора Воробьева](invite-proffesor/invite-proffesor.md) [Попросите девушку ущепнуть вас](girlfriend-pinch-you/girlfriend-pinch-you.md) @@ -117,3 +115,5 @@ [Включите музыку](music/turn_music.md) [Наделаю селфи](selfie/make_selfie.md) + +[Зайти на двач](2ch/2ch.md) From 73ed4ccdee939fbbfef8478948ac643091de16dc Mon Sep 17 00:00:00 2001 From: Vivek Sivathanu Date: Sun, 20 Nov 2016 18:52:26 -0500 Subject: [PATCH 4788/5486] Jason Calacanis --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 733fe14285..1952e8fbec 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1181,4 +1181,6 @@ How about we all [learn android](https://www.udacity.com/course/android-develope Let's finish a small goal, [for example](set_up_a_small_goal/setup_a_small_goal.md) -You decide to teach google to be a [Pictionary](https://quickdraw.withgoogle.com/) champion. \ No newline at end of file +You decide to teach google to be a [Pictionary](https://quickdraw.withgoogle.com/) champion. + +Jason Calacanis is one of the best interviewers I've seen. You'll find them [here](https://www.youtube.com/channel/UCkkhmBWfS7pILYIk0izkc3A) From 2dacbedaf21adf7e30b52544dda958d1fc476d33 Mon Sep 17 00:00:00 2001 From: Vivek Sivathanu Date: Sun, 20 Nov 2016 18:58:39 -0500 Subject: [PATCH 4789/5486] modified line size. split in 2 --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 1952e8fbec..81ff75c001 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1183,4 +1183,5 @@ Let's finish a small goal, [for example](set_up_a_small_goal/setup_a_small_goal. You decide to teach google to be a [Pictionary](https://quickdraw.withgoogle.com/) champion. -Jason Calacanis is one of the best interviewers I've seen. You'll find them [here](https://www.youtube.com/channel/UCkkhmBWfS7pILYIk0izkc3A) +Jason Calacanis is one of the best interviewers I've seen. +[Here](https://www.youtube.com/channel/UCkkhmBWfS7pILYIk0izkc3A) they are From 742102a79081e1242411f9969421412c2106804c Mon Sep 17 00:00:00 2001 From: Kenneth LaMantia Date: Sun, 20 Nov 2016 19:16:26 -0500 Subject: [PATCH 4790/5486] Add choice to play-with-dog storyline --- english/play-with-dog/dog.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/play-with-dog/dog.md b/english/play-with-dog/dog.md index 8ef08cefeb..bb16b5d0b9 100644 --- a/english/play-with-dog/dog.md +++ b/english/play-with-dog/dog.md @@ -11,4 +11,6 @@ You [take a selfie](../selfie/selfie.md). You have actually followed the dog embodiment of Medusa, and you made eye contact. [You can no longer move.](../virtualreality/oculus.md). -You notice she is chewing on a pink sock and [check it out.](../fill-sock/fill-sock.md) \ No newline at end of file +You notice she is chewing on a pink sock and [check it out.](../fill-sock/fill-sock.md) + +Struck by whimsy, you being to [think.](../flan/flan.md) \ No newline at end of file From a5b0672eb4d93a6fa083ba1a2f27368ad076d932 Mon Sep 17 00:00:00 2001 From: Brock Carter Date: Sun, 20 Nov 2016 16:16:58 -0800 Subject: [PATCH 4791/5486] hospital bed scenario --- english/hospital_bed/hospital_bed.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 english/hospital_bed/hospital_bed.md diff --git a/english/hospital_bed/hospital_bed.md b/english/hospital_bed/hospital_bed.md new file mode 100644 index 0000000000..e69de29bb2 From 5c7017e61431e9cc3fd613b8bba43b9b26b1a2c9 Mon Sep 17 00:00:00 2001 From: Brock Carter Date: Sun, 20 Nov 2016 16:21:57 -0800 Subject: [PATCH 4792/5486] Actually THIS is the hospital bed scenario. --- english/hospital_bed/hospital_bed.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/english/hospital_bed/hospital_bed.md b/english/hospital_bed/hospital_bed.md index e69de29bb2..7662c6f701 100644 --- a/english/hospital_bed/hospital_bed.md +++ b/english/hospital_bed/hospital_bed.md @@ -0,0 +1,8 @@ +Just then, a crazed ostrich smacks into you at full-speed. Your phone flies out of your hands and you hit the pavement. + +You wake up in the hospital tied down to your bed. IV's trickle into your veins. You shout, but you're all alone. You see your phone at your side, but it's just out of reach. What do you do? + +[Wait, and hope for the best] (..existential-dread/existential-dread.md) + +[Ask the cat that just walked in for help] (..ask-a-cat/cat.md) + From 6b2bc97e11556575fd4c8876af80aba8953a461d Mon Sep 17 00:00:00 2001 From: Brock Carter Date: Sun, 20 Nov 2016 17:56:48 -0800 Subject: [PATCH 4793/5486] fixes line breaks for char limit, and fixes links --- english/hospital_bed/hospital_bed.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/english/hospital_bed/hospital_bed.md b/english/hospital_bed/hospital_bed.md index 7662c6f701..6b786b2066 100644 --- a/english/hospital_bed/hospital_bed.md +++ b/english/hospital_bed/hospital_bed.md @@ -1,8 +1,10 @@ -Just then, a crazed ostrich smacks into you at full-speed. Your phone flies out of your hands and you hit the pavement. +Just then, a crazed ostrich smacks into you at full-speed. -You wake up in the hospital tied down to your bed. IV's trickle into your veins. You shout, but you're all alone. You see your phone at your side, but it's just out of reach. What do you do? +You wake up in the hospital. You see your phone, but it's just out of reach. -[Wait, and hope for the best] (..existential-dread/existential-dread.md) +What do you do? -[Ask the cat that just walked in for help] (..ask-a-cat/cat.md) +[Wait, and hope for the best] (../existential-dread/existential-dread.md) + +[Ask the cat that just walked in for help] (../ask-a-cat/cat.md) From fa95095c6fb2bee29e4cd3b576efd89d2899ddf0 Mon Sep 17 00:00:00 2001 From: Brock Carter Date: Sun, 20 Nov 2016 18:11:06 -0800 Subject: [PATCH 4794/5486] Adds links to my page on a few other pages. --- english/lovecraftian/shoggoth.md | 4 ++++ english/pinch/pinch.md | 2 ++ english/universe-test/blaze_verse.md | 4 +++- english/vegas/fear-loathing-las-vegas.md | 4 +++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/english/lovecraftian/shoggoth.md b/english/lovecraftian/shoggoth.md index 2db9f74d53..90a68059f9 100644 --- a/english/lovecraftian/shoggoth.md +++ b/english/lovecraftian/shoggoth.md @@ -2,3 +2,7 @@ You are eaten by a horrible, eldritch Shoggoth. It's many eyes stare at you as you are consumed. This really hurts. + +But just then you: + +[See an ostrich?] (../hospital_bed/hospital_bed.md) diff --git a/english/pinch/pinch.md b/english/pinch/pinch.md index 8e62a6bcbb..253a0f453e 100644 --- a/english/pinch/pinch.md +++ b/english/pinch/pinch.md @@ -15,3 +15,5 @@ Do you: [Go outside of the marshmallow room](go-out/go-out.md) [Think about Harry Potter and the amazing world of magic?](magic/harry-potter.md) + +[See an ostrich?] (../hospital_bed/hospital_bed.md) diff --git a/english/universe-test/blaze_verse.md b/english/universe-test/blaze_verse.md index b351250617..df14fe4277 100644 --- a/english/universe-test/blaze_verse.md +++ b/english/universe-test/blaze_verse.md @@ -8,4 +8,6 @@ Or... [Is it this one?](https://www.youtube.com/watch?v=tbSo7VmU7xo) -Either way we are cool, [right?] (../marshmallow.md) \ No newline at end of file +Either way we are cool, [right?] (../marshmallow.md) + +[But what about the ostrich?] (../hospital_bed/hospital_bed.md) \ No newline at end of file diff --git a/english/vegas/fear-loathing-las-vegas.md b/english/vegas/fear-loathing-las-vegas.md index b2076ca91b..847414484f 100644 --- a/english/vegas/fear-loathing-las-vegas.md +++ b/english/vegas/fear-loathing-las-vegas.md @@ -12,4 +12,6 @@ in, freak out, get beaten. Too weird to live, too rare to die! -[Leaving Las Vegas] (../marshmallow.md) \ No newline at end of file +[Leaving Las Vegas] (../marshmallow.md) + +[See an ostrich?] (../hospital_bed/hospital_bed.md) From c8e3baa2276c622c74ed92f92e8e85182a3d8460 Mon Sep 17 00:00:00 2001 From: gabrielemeloncelli Date: Mon, 21 Nov 2016 10:17:25 +0100 Subject: [PATCH 4795/5486] Add smartphone options --- Italian/caramelle.md | 2 ++ Italian/smartphone/facebook/facebook.md | 2 ++ Italian/smartphone/instagram/instagram.md | 1 + Italian/smartphone/smartphone.md | 8 ++++++++ 4 files changed, 13 insertions(+) create mode 100644 Italian/smartphone/facebook/facebook.md create mode 100644 Italian/smartphone/instagram/instagram.md create mode 100644 Italian/smartphone/smartphone.md diff --git a/Italian/caramelle.md b/Italian/caramelle.md index c5d690890d..a65a04a1c5 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -30,3 +30,5 @@ Che fai? [Lavorare](lavorare/lavorare.md) [Accendo la luce](luce/luce.md) + +[Cerco lo smartphone] (smartphone/smartphone.md) diff --git a/Italian/smartphone/facebook/facebook.md b/Italian/smartphone/facebook/facebook.md new file mode 100644 index 0000000000..b840904f8e --- /dev/null +++ b/Italian/smartphone/facebook/facebook.md @@ -0,0 +1,2 @@ +Accidenti! +Ho un milione di amici ma non riconosco nessuno. \ No newline at end of file diff --git a/Italian/smartphone/instagram/instagram.md b/Italian/smartphone/instagram/instagram.md new file mode 100644 index 0000000000..e268fe1ddf --- /dev/null +++ b/Italian/smartphone/instagram/instagram.md @@ -0,0 +1 @@ +Provo a fotografare la stanza ma ottengo solo un selfie immerso nella nebbia. \ No newline at end of file diff --git a/Italian/smartphone/smartphone.md b/Italian/smartphone/smartphone.md new file mode 100644 index 0000000000..a54431993b --- /dev/null +++ b/Italian/smartphone/smartphone.md @@ -0,0 +1,8 @@ +Frugo nelle tasche e trovo il mio telefono. +Ma stranamente elastico e risponde stranamente al tocco. +Cerco disperatamente di accedere al GPS ma non ottengo nessuna risposta. +Allora vince il riflesso condizionato e penso a quale social mi potrebbe essere pi utile nell'occasione. + +Scelgo [Facebook](facebook/facebook.md) + +Scelgo [Instagram](instagram/instagram.md) \ No newline at end of file From 430a3bb5e3b81f51540fad56269ee6e54c323930 Mon Sep 17 00:00:00 2001 From: gabrielemeloncelli Date: Mon, 21 Nov 2016 10:22:15 +0100 Subject: [PATCH 4796/5486] Remove a repetition in my personal root file --- Italian/smartphone/smartphone.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Italian/smartphone/smartphone.md b/Italian/smartphone/smartphone.md index a54431993b..8afb35f746 100644 --- a/Italian/smartphone/smartphone.md +++ b/Italian/smartphone/smartphone.md @@ -1,5 +1,5 @@ Frugo nelle tasche e trovo il mio telefono. -Ma stranamente elastico e risponde stranamente al tocco. +Ma stranamente elastico e risponde al tocco molto a modo suo. Cerco disperatamente di accedere al GPS ma non ottengo nessuna risposta. Allora vince il riflesso condizionato e penso a quale social mi potrebbe essere pi utile nell'occasione. From aaafc5de160a415bbb9d400f60e53177ddc49c3f Mon Sep 17 00:00:00 2001 From: Stan Date: Mon, 21 Nov 2016 20:32:42 +0100 Subject: [PATCH 4797/5486] Added new storyline connected to master story --- bulgarian/burning_room.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bulgarian/burning_room.md b/bulgarian/burning_room.md index f4e18858ac..a6075c00d3 100644 --- a/bulgarian/burning_room.md +++ b/bulgarian/burning_room.md @@ -23,3 +23,5 @@ 10. [Решаваш, че си попаднал в Твърде лично и ти си Лиъм Нийсън.](./taken/taken.md) 11. [Протягаш ръка към пистолета, но установяваш че ръцете ти са вързани.](./tied_hands/tied_hands.md) + +12. [Решаваш, че ти е писнало от тази примитивна планета. Нега си гори! "Скоти телепортирай ме на Ентърпрайз!"](./Enterprise/Enterprise.md) From 9c33e8dee53e96c5ae96d3b3a0f173f6eed1e146 Mon Sep 17 00:00:00 2001 From: Stan Date: Mon, 21 Nov 2016 20:33:21 +0100 Subject: [PATCH 4798/5486] Added short story for the Enterprise branch --- bulgarian/Enterprise/Enterprise.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 bulgarian/Enterprise/Enterprise.md diff --git a/bulgarian/Enterprise/Enterprise.md b/bulgarian/Enterprise/Enterprise.md new file mode 100644 index 0000000000..82fe66dcc2 --- /dev/null +++ b/bulgarian/Enterprise/Enterprise.md @@ -0,0 +1,3 @@ + . "" , + "" . + : \ No newline at end of file From 05c9fc73fe6eda7002da0209f0bc498a5378879f Mon Sep 17 00:00:00 2001 From: Stan Date: Mon, 21 Nov 2016 20:40:09 +0100 Subject: [PATCH 4799/5486] Broke new sotryline in 2 lines --- bulgarian/burning_room.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bulgarian/burning_room.md b/bulgarian/burning_room.md index a6075c00d3..ad50c320aa 100644 --- a/bulgarian/burning_room.md +++ b/bulgarian/burning_room.md @@ -24,4 +24,5 @@ 11. [Протягаш ръка към пистолета, но установяваш че ръцете ти са вързани.](./tied_hands/tied_hands.md) -12. [Решаваш, че ти е писнало от тази примитивна планета. Нега си гори! "Скоти телепортирай ме на Ентърпрайз!"](./Enterprise/Enterprise.md) +12. [Решаваш, че ти е писнало от тази примитивна планета. Нега си гори: + -Скоти, телепортирай ме на Ентърпрайз!](./Enterprise/Enterprise.md) From 7e147e10d401b5e7ce9449026d98e12240451a4e Mon Sep 17 00:00:00 2001 From: Stan Date: Mon, 21 Nov 2016 20:48:26 +0100 Subject: [PATCH 4800/5486] Split line into 2 (hopefully) correctly this time! --- bulgarian/burning_room.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bulgarian/burning_room.md b/bulgarian/burning_room.md index ad50c320aa..e1e3c18a6b 100644 --- a/bulgarian/burning_room.md +++ b/bulgarian/burning_room.md @@ -24,5 +24,5 @@ 11. [Протягаш ръка към пистолета, но установяваш че ръцете ти са вързани.](./tied_hands/tied_hands.md) -12. [Решаваш, че ти е писнало от тази примитивна планета. Нега си гори: - -Скоти, телепортирай ме на Ентърпрайз!](./Enterprise/Enterprise.md) +12. [Решаваш, че ти е писнало от тази примитивна планета. Нега си гори:](./Enterprise/Enterprise.md) + [- Скоти, телепортирай ме на Ентърпрайз!](./Enterprise/Enterprise.md) From 9217f9d3b32e2bbaa50a901f7da6f976126a447a Mon Sep 17 00:00:00 2001 From: tzagatti Date: Mon, 21 Nov 2016 18:39:57 -0200 Subject: [PATCH 4801/5486] Add portugues/cria/melhor/muito_melhor/muito_melhor.md --- portugues/cria/melhor.md | 4 +++- portugues/cria/muito_melhor/muito_melhor.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 portugues/cria/muito_melhor/muito_melhor.md diff --git a/portugues/cria/melhor.md b/portugues/cria/melhor.md index ffab744832..efda9bbb0c 100644 --- a/portugues/cria/melhor.md +++ b/portugues/cria/melhor.md @@ -1 +1,3 @@ -Crio um melhor sem bug \ No newline at end of file +Crio um melhor sem bug + +Mas não é melhor que [esse] (muito_melhor/muito_melhor.md) diff --git a/portugues/cria/muito_melhor/muito_melhor.md b/portugues/cria/muito_melhor/muito_melhor.md new file mode 100644 index 0000000000..3d800c3fce --- /dev/null +++ b/portugues/cria/muito_melhor/muito_melhor.md @@ -0,0 +1 @@ +Olha como é melhor! From 443c5949f1c417aaceae0758e1e701eec8b48905 Mon Sep 17 00:00:00 2001 From: tzagatti Date: Mon, 21 Nov 2016 18:47:01 -0200 Subject: [PATCH 4802/5486] Add cogumelo em colaborar.md --- portugues/colabora/colaborar.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/colabora/colaborar.md b/portugues/colabora/colaborar.md index 7f3d217557..1937d96e2a 100644 --- a/portugues/colabora/colaborar.md +++ b/portugues/colabora/colaborar.md @@ -8,4 +8,6 @@ Ao encontrar o repositório do GitHub o que você faz? [Procura os contribuintes do código e começa a seguí-los.](follow/follow.md) -[Infelizmente, lê o código, não encontra erro algum e CHORA.](chora/chora.md) \ No newline at end of file +[Infelizmente, lê o código, não encontra erro algum e CHORA.](chora/chora.md) + +[Toma um cogumelo muito legal e acaba na terra do nunca](../cogumelos/cogumelos.md) From aaed154aa6a0aee1f7b71a6d82100c831faadf33 Mon Sep 17 00:00:00 2001 From: tzagatti Date: Mon, 21 Nov 2016 18:54:52 -0200 Subject: [PATCH 4803/5486] Add na pasta portugues, titanic dentro de cogumelos --- portugues/cogumelos/cogumelos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/cogumelos/cogumelos.md b/portugues/cogumelos/cogumelos.md index d9b025fc7b..fe4a6c1a77 100644 --- a/portugues/cogumelos/cogumelos.md +++ b/portugues/cogumelos/cogumelos.md @@ -1 +1,3 @@ -Você tem uma onda muito louca e lutando com o capital gancho na terra do nunca e você tem a idéia para consertar o bug. \ No newline at end of file +Você tem uma onda muito louca e lutando com o capital gancho na terra do nunca e você tem a idéia para consertar o bug. + +Porém vc se lembra que na verdade vc está no [Titanic](../titanic/iceberg.md) From 72855e9e1b8e847411d699e67ddc6deaa3a12a03 Mon Sep 17 00:00:00 2001 From: robrocop Date: Mon, 21 Nov 2016 23:28:16 -0500 Subject: [PATCH 4804/5486] add end of story --- english/disney/disney.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/disney/disney.md b/english/disney/disney.md index ba04dc30a4..9ce019cb55 100644 --- a/english/disney/disney.md +++ b/english/disney/disney.md @@ -2,4 +2,6 @@ You realize that you are looking at Sleeping Beauty's Castle. Somehow you have been transported to Disneyland. You find yourself on Main Street surrounded by people. All of a sudden you remember you have a job to do still... -Click [Job to do](https://disneyland.disney.go.com/) \ No newline at end of file +Click [Job to do](https://disneyland.disney.go.com/) + +and lived happily ever after \ No newline at end of file From 099d9f7dc1e02f01d0cb1db1d4299055e5344ca2 Mon Sep 17 00:00:00 2001 From: AndrewSalcedo Date: Tue, 22 Nov 2016 11:01:27 -0500 Subject: [PATCH 4805/5486] Add interview Luke Skywalker in a post-FOrce Awakens world. --- english/luke-skywalker/luke-skywalker.md | 8 ++++++++ english/luke-skywalker/starwars7/duh.md | 2 ++ english/luke-skywalker/starwars8/Wait-for-8.md | 2 ++ 3 files changed, 12 insertions(+) create mode 100644 english/luke-skywalker/luke-skywalker.md create mode 100644 english/luke-skywalker/starwars7/duh.md create mode 100644 english/luke-skywalker/starwars8/Wait-for-8.md diff --git a/english/luke-skywalker/luke-skywalker.md b/english/luke-skywalker/luke-skywalker.md new file mode 100644 index 0000000000..aa2892461f --- /dev/null +++ b/english/luke-skywalker/luke-skywalker.md @@ -0,0 +1,8 @@ +So you have an interview with Luke Skywalker. +What do you ask him? + +[Are you Rey's Father?](starwars8/wait-for-8.md) + +or + +[What made you want to leave the resistance?](starwars7/duh.md) diff --git a/english/luke-skywalker/starwars7/duh.md b/english/luke-skywalker/starwars7/duh.md new file mode 100644 index 0000000000..f8a454e17e --- /dev/null +++ b/english/luke-skywalker/starwars7/duh.md @@ -0,0 +1,2 @@ +"Did you not watch Star Wars: The Force Awakens? +I thought it was pretty clear." diff --git a/english/luke-skywalker/starwars8/Wait-for-8.md b/english/luke-skywalker/starwars8/Wait-for-8.md new file mode 100644 index 0000000000..2dc719e592 --- /dev/null +++ b/english/luke-skywalker/starwars8/Wait-for-8.md @@ -0,0 +1,2 @@ +"yea, you know I can't say anything. +You have to wait for Star Wars: VIII in December 2017." From 88461b9f8befce715c3dc45650b07d19bf71024d Mon Sep 17 00:00:00 2001 From: AndrewSalcedo Date: Tue, 22 Nov 2016 11:21:47 -0500 Subject: [PATCH 4806/5486] add link from this page to /luke-skywalker --- english/star-wars-spoiler/star-wars.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/star-wars-spoiler/star-wars.md b/english/star-wars-spoiler/star-wars.md index 5bca31dbc7..1ff4436034 100644 --- a/english/star-wars-spoiler/star-wars.md +++ b/english/star-wars-spoiler/star-wars.md @@ -1,3 +1,5 @@ Bad idea. The internet destroyed you for even contemplating such a thing. -[Go Back...](../marshmallow.md). \ No newline at end of file +[Go Back...](../marshmallow.md). + +[What about Luke Skywalker](english/luke-skywalker) From 609edb53af4f8ee461977f3385cdc24d396b7cac Mon Sep 17 00:00:00 2001 From: AndrewSalcedo Date: Tue, 22 Nov 2016 11:24:07 -0500 Subject: [PATCH 4807/5486] fix: link bug --- english/star-wars-spoiler/star-wars.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/star-wars-spoiler/star-wars.md b/english/star-wars-spoiler/star-wars.md index 1ff4436034..8333da5f12 100644 --- a/english/star-wars-spoiler/star-wars.md +++ b/english/star-wars-spoiler/star-wars.md @@ -2,4 +2,4 @@ Bad idea. The internet destroyed you for even contemplating such a thing. [Go Back...](../marshmallow.md). -[What about Luke Skywalker](english/luke-skywalker) +[What about Luke Skywalker](..english/luke-skywalker) From 2829d74b235fb9a0ad5169b2add1abc8ce00efa7 Mon Sep 17 00:00:00 2001 From: AndrewSalcedo Date: Tue, 22 Nov 2016 11:32:32 -0500 Subject: [PATCH 4808/5486] bug fix: Links on both pages. Style: Capitalize --- english/luke-skywalker/luke-skywalker.md | 4 ++-- english/star-wars-spoiler/star-wars.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/english/luke-skywalker/luke-skywalker.md b/english/luke-skywalker/luke-skywalker.md index aa2892461f..856672ec6f 100644 --- a/english/luke-skywalker/luke-skywalker.md +++ b/english/luke-skywalker/luke-skywalker.md @@ -1,8 +1,8 @@ So you have an interview with Luke Skywalker. What do you ask him? -[Are you Rey's Father?](starwars8/wait-for-8.md) +[Are you Rey's Father?](/starwars8/wait-for-8.md) or -[What made you want to leave the resistance?](starwars7/duh.md) +[What made you want to leave the resistance?](/starwars7/duh.md) diff --git a/english/star-wars-spoiler/star-wars.md b/english/star-wars-spoiler/star-wars.md index 8333da5f12..418047a72c 100644 --- a/english/star-wars-spoiler/star-wars.md +++ b/english/star-wars-spoiler/star-wars.md @@ -2,4 +2,4 @@ Bad idea. The internet destroyed you for even contemplating such a thing. [Go Back...](../marshmallow.md). -[What about Luke Skywalker](..english/luke-skywalker) +[What about Luke Skywalker](../luke-skywalker/luke-skywalker.md) From 6c571efab815f7faaf63a64452bbe3b6ae886ebb Mon Sep 17 00:00:00 2001 From: AndrewSalcedo Date: Tue, 22 Nov 2016 11:44:15 -0500 Subject: [PATCH 4809/5486] fix: links --- english/luke-skywalker/luke-skywalker.md | 4 ++-- english/star-wars-spoiler/star-wars.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/english/luke-skywalker/luke-skywalker.md b/english/luke-skywalker/luke-skywalker.md index 856672ec6f..fd0826eae1 100644 --- a/english/luke-skywalker/luke-skywalker.md +++ b/english/luke-skywalker/luke-skywalker.md @@ -1,8 +1,8 @@ So you have an interview with Luke Skywalker. What do you ask him? -[Are you Rey's Father?](/starwars8/wait-for-8.md) +[Are you Rey's Father?](starwars8/Wait-for-8.md) or -[What made you want to leave the resistance?](/starwars7/duh.md) +[What made you want to leave the Resistance?](starwars7/duh.md) diff --git a/english/star-wars-spoiler/star-wars.md b/english/star-wars-spoiler/star-wars.md index 418047a72c..7d88be7727 100644 --- a/english/star-wars-spoiler/star-wars.md +++ b/english/star-wars-spoiler/star-wars.md @@ -2,4 +2,4 @@ Bad idea. The internet destroyed you for even contemplating such a thing. [Go Back...](../marshmallow.md). -[What about Luke Skywalker](../luke-skywalker/luke-skywalker.md) +[What about Luke Skywalker?](../luke-skywalker/luke-skywalker.md) From e573398282ebc2efae26b106621efadbdbbfbb0e Mon Sep 17 00:00:00 2001 From: artur Date: Tue, 22 Nov 2016 19:40:29 +0100 Subject: [PATCH 4810/5486] Added a story sentence, hopefully the story makes sense. --- german/Alkohol/feuerzeug/Prost/Prost.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/Alkohol/feuerzeug/Prost/Prost.md b/german/Alkohol/feuerzeug/Prost/Prost.md index 87eef5122c..24cd5e3019 100644 --- a/german/Alkohol/feuerzeug/Prost/Prost.md +++ b/german/Alkohol/feuerzeug/Prost/Prost.md @@ -1,3 +1,4 @@ Prost! Endlich mal was gutes. Das Bier ist noch kühl obwohl es die ganze Zeit in der Sonne lag. -Den Kater auskonternd denken Sie jetzt über ihre Rettung nach. \ No newline at end of file +Den Kater auskonternd denken Sie jetzt über ihre Rettung nach. +Unter dem Sitz liegt eine Breeze - es gibt nichts besseres zum Bier! From 386d52266b29b7339ce7d03f6eb6c9199ab23224 Mon Sep 17 00:00:00 2001 From: thirdslipper Date: Tue, 22 Nov 2016 12:50:41 -0800 Subject: [PATCH 4811/5486] Update marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 81ff75c001..20610bbdca 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1185,3 +1185,5 @@ You decide to teach google to be a [Pictionary](https://quickdraw.withgoogle.com Jason Calacanis is one of the best interviewers I've seen. [Here](https://www.youtube.com/channel/UCkkhmBWfS7pILYIk0izkc3A) they are + +My best girls are Toujou Nozomi, Aragaki Ayase, and Sendouin Kaede. From e6e9068e815095d7e4b840309d3c1d88af33bdcd Mon Sep 17 00:00:00 2001 From: HongChong Gan Date: Wed, 23 Nov 2016 08:38:58 +0800 Subject: [PATCH 4812/5486] Add 'what happen to our emotion' before talking to neighbour --- english/talk_to_neighbour/talk_to_neighbour.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/english/talk_to_neighbour/talk_to_neighbour.md b/english/talk_to_neighbour/talk_to_neighbour.md index 6f07f74ffc..1528f3f891 100644 --- a/english/talk_to_neighbour/talk_to_neighbour.md +++ b/english/talk_to_neighbour/talk_to_neighbour.md @@ -4,6 +4,11 @@ I'm Listening As you speak to your neighbor, you see a dark car approach. Two figures emerge, a man and a woman. +My heart is pumping! +My lip feel dry! + +I brave myself to + [Talk to the woman](woman/scully.md) [Talk to the man](man/mulder.md) From 0716d3063dbaa95a05b9d03efa1d763d88f281e4 Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Tue, 22 Nov 2016 20:00:42 -0500 Subject: [PATCH 4813/5486] Add Harry Potter --- english/lego/lego.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/lego/lego.md b/english/lego/lego.md index 8dd7aad0f4..5da089200c 100644 --- a/english/lego/lego.md +++ b/english/lego/lego.md @@ -2,7 +2,7 @@ The mallow man seems nice so you chat to him after walking up to him. He decides he likes you too, so he gets out his Lego's. -He's got Star Wars, Lego Movie, space, technics, oh so much lego and you play with it all! +He's got Star Wars, Lego Movie, Harry Potter, space, technics, oh so much lego and you play with it all! I wish they had Pokemon lego too. From 0f09fba89dcd21b6d703f03b0da5e135dd5c5730 Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Tue, 22 Nov 2016 20:03:16 -0500 Subject: [PATCH 4814/5486] Change HP mod to new line --- english/lego/lego.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/lego/lego.md b/english/lego/lego.md index 5da089200c..0aed0aef3f 100644 --- a/english/lego/lego.md +++ b/english/lego/lego.md @@ -2,10 +2,12 @@ The mallow man seems nice so you chat to him after walking up to him. He decides he likes you too, so he gets out his Lego's. -He's got Star Wars, Lego Movie, Harry Potter, space, technics, oh so much lego and you play with it all! +He's got Star Wars, Lego Movie, space, technics, oh so much lego and you play with it all! I wish they had Pokemon lego too. +Not to mention Harry Potter! + After a while he starts to get a bit too much, he doesn't get out much, you're bored. You look around wondering what to do. From ed7411f90df5e27f0546060fce91d6f69eb07c8d Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Tue, 22 Nov 2016 20:05:08 -0500 Subject: [PATCH 4815/5486] Change HP from mod to addition --- english/lego/lego.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/lego/lego.md b/english/lego/lego.md index 5da089200c..0aed0aef3f 100644 --- a/english/lego/lego.md +++ b/english/lego/lego.md @@ -2,10 +2,12 @@ The mallow man seems nice so you chat to him after walking up to him. He decides he likes you too, so he gets out his Lego's. -He's got Star Wars, Lego Movie, Harry Potter, space, technics, oh so much lego and you play with it all! +He's got Star Wars, Lego Movie, space, technics, oh so much lego and you play with it all! I wish they had Pokemon lego too. +Not to mention Harry Potter! + After a while he starts to get a bit too much, he doesn't get out much, you're bored. You look around wondering what to do. From b83d0ab1560eb4beebff4e7f5d8effa6f1e8ae5d Mon Sep 17 00:00:00 2001 From: Khalid Sharara Date: Tue, 22 Nov 2016 20:08:05 -0500 Subject: [PATCH 4816/5486] added recela le bamer --- arabic/salamoAlikom.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 115fa5c9ce..158f21c314 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -28,4 +28,6 @@ هذه التجربة رائعة -[أحب هذا الكورس](https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) \ No newline at end of file +[أحب هذا الكورس](https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) + +[سي يسيس] (https://www.youtube.com/watch?v=EUw-zTz8cU8) \ No newline at end of file From 3cc93d9c8b2048d4b5fd7f4510a4726252ad8e0a Mon Sep 17 00:00:00 2001 From: "juanraul.padron" Date: Tue, 22 Nov 2016 22:57:01 -0430 Subject: [PATCH 4817/5486] Add sentences about mountain story (espanol) --- espanol/montanas/montanas.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/espanol/montanas/montanas.md b/espanol/montanas/montanas.md index 001dfc5d0a..5b1e417b16 100644 --- a/espanol/montanas/montanas.md +++ b/espanol/montanas/montanas.md @@ -1,3 +1,7 @@ Como todo un cobarde, las montañas fueron el hogar de benito por el resto de su vida; dejando a su pueblo ahogar en llamas. + +Uno de los lugares favoritos de benito es el [Avila](https://www.youtube.com/watch?v=EwQvRQ4IxLw), +donde puede encontrar la anhelada paz y tranquilidad tan dificil +de encontrar en la ciudad. From e6cc42b8ab27d2bf4ee3ed5949ea6c9ab345cea4 Mon Sep 17 00:00:00 2001 From: Wayne Lian Date: Wed, 23 Nov 2016 19:51:54 +0800 Subject: [PATCH 4818/5486] Add majiang play option --- Chinese/crime_school/crime_school.md | 6 ++++++ Chinese/crime_school/majiang/majiang.md | 5 +++++ 2 files changed, 11 insertions(+) create mode 100644 Chinese/crime_school/majiang/majiang.md diff --git a/Chinese/crime_school/crime_school.md b/Chinese/crime_school/crime_school.md index b1ebe14cdd..8aa22cdedf 100644 --- a/Chinese/crime_school/crime_school.md +++ b/Chinese/crime_school/crime_school.md @@ -1,2 +1,8 @@ 李杀神、王诛魔和刘斩仙三位少年做梦也没有想到会在狼牙区飞虎路私立断罪小学再度聚首，面对校园 里号称屠遍三界的“魔神”，四年级的赵日天，他们能否力挽狂澜，再度改写被上天诅咒的命运呢？！ +三人正交流着自己听说到的各种关于赵日天的传闻，忽然听到一声冷笑，只见一个校服拉链半敞开， +胳膊上贴着5根拉条的同学站在他们面前，不错，此人就是赵日天。三人一时不知所措，一向莽撞的王 +诛魔叫到： +1.“你就是赵日天？” +2.“你想打架吗？” +[3.“你是来打麻将的吗？”](majiang/majiang.md) diff --git a/Chinese/crime_school/majiang/majiang.md b/Chinese/crime_school/majiang/majiang.md new file mode 100644 index 0000000000..6b682fcbbf --- /dev/null +++ b/Chinese/crime_school/majiang/majiang.md @@ -0,0 +1,5 @@ +赵日天微微一笑，掏出一副麻将便道：“来啊，打什么牌？血战到底还是红中发财杠？” 三人先是一愣，旋即又感觉不能输了气势，赶紧掏出了桌子椅子，摆到四人中间，李杀神故作镇静的说：“哼，打什么都可以”，刘斩仙牌技最精，急忙抢答到：“那就来打……” +1.血战到底 +2.红中发财杠 +3.我知道一个新玩法 +[4.打鸡毛，干正事!](../crime_school.md) From 8805af4f318d982ba35c15ddedb14586e6f1d22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Hern=C3=A1ndez=20Rostr=C3=A1n?= Date: Wed, 23 Nov 2016 18:09:57 -0600 Subject: [PATCH 4819/5486] Add sentences about time machine (espanol) --- espanol/canudos.md | 4 +++- espanol/maquina/tiempo/maquina_del_tiempo.md | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 espanol/maquina/tiempo/maquina_del_tiempo.md diff --git a/espanol/canudos.md b/espanol/canudos.md index fd0a18ca92..afd6d61ff5 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -183,4 +183,6 @@ Y [Resines](resines/resines.md) despertó de lo quer parecía un mal sueño. Al despertar Resines te pregunta si eres [Batman](batman/Batman.md) -A lo que respondes: "Yo solo vine aquí a hablar de mi [libro](libro/libro.md)". \ No newline at end of file +A lo que respondes: "Yo solo vine aquí a hablar de mi [libro](libro/libro.md)". + +Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/tiempo/maquina_del_tiempo.md). \ No newline at end of file diff --git a/espanol/maquina/tiempo/maquina_del_tiempo.md b/espanol/maquina/tiempo/maquina_del_tiempo.md new file mode 100644 index 0000000000..4c1a55012b --- /dev/null +++ b/espanol/maquina/tiempo/maquina_del_tiempo.md @@ -0,0 +1,2 @@ +Llamada [Gobble-o-tron](https://octodex.github.com/gobbleotron) +![Gobble-o-tron](https://octodex.github.com/images/gobbleotron.gif) \ No newline at end of file From f464b5408c4f1992061ec15a63ac08c08ec06691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Hern=C3=A1ndez=20Rostr=C3=A1n?= Date: Wed, 23 Nov 2016 18:14:42 -0600 Subject: [PATCH 4820/5486] Fix absolute link. --- espanol/maquina/tiempo/maquina_del_tiempo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/maquina/tiempo/maquina_del_tiempo.md b/espanol/maquina/tiempo/maquina_del_tiempo.md index 4c1a55012b..071f67aa42 100644 --- a/espanol/maquina/tiempo/maquina_del_tiempo.md +++ b/espanol/maquina/tiempo/maquina_del_tiempo.md @@ -1,2 +1,2 @@ -Llamada [Gobble-o-tron](https://octodex.github.com/gobbleotron) +Llamada Gobble-o-tron. ![Gobble-o-tron](https://octodex.github.com/images/gobbleotron.gif) \ No newline at end of file From 8573322f0430f5ddf528b14fa7becf0b899dc875 Mon Sep 17 00:00:00 2001 From: bharat Date: Thu, 24 Nov 2016 12:37:13 +0530 Subject: [PATCH 4821/5486] New Adventure story Himalyan Odyssey added --- Himalayan_Odyssey/HO.md | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Himalayan_Odyssey/HO.md diff --git a/Himalayan_Odyssey/HO.md b/Himalayan_Odyssey/HO.md new file mode 100644 index 0000000000..65863d6802 --- /dev/null +++ b/Himalayan_Odyssey/HO.md @@ -0,0 +1,44 @@ +Dreams to Memories – Wisdom in Ladakh +A ride to ladakh requires a lot of preparation and begins with convincing folks back home and also at the office. As a popular quote says “Four Wheels move the body and two wheels move the soul” just riding 2500 Kms in 15 days was not the only objective of the dream I had for some time now. It was also to ensure that there is enough learning from the ride to be taken back home and be a better human being apart from being a better rider. The ride on a RE to ladakh was in preparation for almost 3 years and as Kabir said “Slowly slowly O mind... Everything in own pace happens, Gardner may water a hundred buckets... Fruit arrives only in its season”, and happen to participate this July on the ride with ~70 other riders. The ride included a lot of scenic beauty, the challenge of riding on various kinds of surface gravels, slush, watercrossing, sand and tarmac included, mental and physical challenge. One of the first ritual of the day was briefing which included the route, regroup point, road situation, mistakes committed by other riders and challenges. One thing every rider was keen to listen during briefing was Riding Tips. These were not just the tips for the ride of the day but for the entire journey and was expected to be taken back home and apply when you ride anytime and anywhere. Every person’s life is a journey and we come across various challenges and paths which we have to cross and move ahead. The tips do have hidden meaning which I happen to think during the ride as to how this can benefit our daily life +• Look ahead of person you are following. +This tip was the first on day one. It is common in riding that you follow a person at a comfortable speed to reduce the stress and only when you need to speed up you plan to overtake. In this process what is missed out is the visibility beyond the lead. The visibility beyond the lead ignites the thought process as to the reason for the driving behavior of the person who is being followed. This also helps in anticipating any obstacles and challenges well in advance and be prepared. This changes from reactive mode of riding to the anticipative mode of riding. +For career growth you need to apply the same principle of looking beyond your manager in anticipating the challenges. Do not end your thought process where the manager begins, try and walk the path alongside to know the challenges handled by the manager and the approach taken to resolve. As a parent the tendency is to not provide the visibility to our children on the challenges the parent is undergoing. Parents try to carry the kids on their shoulders to avoid a treacherous path. This in no way helps the younger generation to be prepared for the path when they are required to over take or take a new path which the parent does not even has thought off. +• Do not overtake at corners +Day two required us to adapt from a terrain of straight lane roads to the curves of the mountains and we were greeted with very interesting sign boards. Quotes like Be Gentle on my Curves, I am Curvaceous be slow, Mountains are Pleasure Only if you drive with Leisure, Be Mr Late Not Late Mr, Life is Short don’t make it Shorter were there around to greet us. The first riding tip for the day was not to overtake in corners, specially the one turning left. Also the one re-iterated every day through the coming days was applying restraint in overtaking while the rider ahead is looking for the best path to cross the obstacles. Let me write about the second tip first. Every rider is comfortable at his a own pace on a challenging surface. As the skill set of people differ so does the speed. The person who is at a lower speed is certainly trying to negotiate the challenges and move ahead and would like to have his share of space to maneuver. The last thing he wishes is supplementary challenge by a more skilled rider by cramping the room while overtaking. Also he may not be prepared or even aware that there is rider behind him. The discipline which was followed through the days was to ask for way and then only on confirmation, overtake. The riders ahead also adhered to this by providing the clear path as early as possible. +In Career and life Overtaking is generally viewed as egocentric. There is an urgency by people to overtake and also by some to block. It is very necessary that we know the strength and limitation of each fellow riders, respect each other and provide adequate time, path and safety to our colleagues, friends and family members. +Overtaking on blind corners is a strict no go on the road, career and life. This could cut short the journey. +• Hold your tanks hard; handlebar like eggs +The riding tip next given was the most important in terms of correction for riders and also the gains importance due to the terrain which we ride. It is very important to know that every bike balances by itself. There is no additional effort required by the rider to balance be it the smooth tarmac or the challenging gravels. Riders tend to hold the handlebar hard and take significant effort to balance the bike. This can be observed more in the riders who have upgraded from scooter or switch regularly between the two. In Motorcycle riding the rider need not balance the motorcycle, he just has to hold it hard. This can be done by holding the tanks by the thighs. The handle bar needs to be held very loose, as the lead rider aptly said hold it as if you are holding eggs. Apart from easy maneuvering, the chances of having a stiff shoulder is also reduced. To help the cause it would be good for riders to flap the elbow as if the birds are flapping the wings. +People also tend to balance life with lots of efforts and take control of things when it is obvious that what you need is just to guide. One needs to embrace Family, Friends and Faith tight and guide Career and Cash with very soft hand. This would certainly help to balance the journey comfortably and to cross all the obstacles and challenges without much effort. +• Find your own path +Robert Frost said, I took the one less traveled by, And that has made all the difference. This holds very much correct when you are riding especially in the slush. When you choose to ride on the tyre marks you are completely out of control. Similarly in the water crossings, on the gravel or sand the path chosen by the rider ahead may not be the best. On the way to Kardungla top fellow riders were taking a path and a line was formed, to the utter dismay of the riders coming from the opposite direction. No one was willing to move a couple of feet to the left and make a new path. A rider should always keep his mind open and look for new path which may or may not be less challenging. +• Use your side of the road fully. +This was a riding tip given to me by the fellow rider after observing me ride on the far left of the road. This is a habit cultivated by riding on road with dividers. When a person rides on the road where there is no separation for bi directional traffic, it is very important to ensure that you are visible to the vehicles coming from the other direction. By riding on the right side of your lane, using 1/3rd of the road, you not only increase your visibility of the road, but also get enough space for you to move to the left if need be. +People have the tendency to be invisible in office just doing their part of the work diligently. This is no way helps to know what is in the store for you in the near future both in terms of progression or opportunities available. Similar behavior is more visible at home when it comes to managing finance or parenting, where in one of the partner is in the far left with no contribution. +• Do not set targets +This is the most common error a rider commits. An obstacle be it a pot hole, rock, stones, upcoming vehicles once visible, a rider needs to look at a clear path and concentrate on the path identified. Concentrating on the obstacle is akin to setting a target and you are bound to move towards the target and not away from it. The hands move towards the direction which you are viewing, unless you are trained in a circus to do otherwise. You ride in the direction your visibility is focused. +People tend to waste their energy in getting into disputes which are nothing but target setting. There is no benefit in most of the cases but for inflation of ego. It is always better to move on in life than to set targets which could consume a lot of time and energy. EOD can mean 5.30 PM or 12.00AM, the one you choose is when you deliver. People look at Doughnut hole when you are asked to look at Doughnut as a Whole. +• Look up and set momentum +While crossing streams, you would be fortunate if the water is clear and you have some visibility of what is in store. Irrespective of the visibility, a rider cannot take any decision once he begins to cross, the direction cannot be changed nor can afford to stop in the middle, the formula here is keep your head up and ensure that the momentum takes you across the other side. Momentum alone helps you in overcoming small rocks, potholes or the current of the stream. +In office or personal life when the path is treacherous, do not try to change the path, pause or look down to see what is there beneath. One needs to ensure that proper momentum is maintained and move ahead, earlier one sets the momentum faster s/he crosses the stream. +• Be on Gas at corner +This could be termed as the best riding tip provided in the entire expedition. The vehicle is less stable when ‘off gas’ and more when ‘on gas’. This is because of the distribution of weight. When the vehicle is off gas the weight moves towards front and the vehicle is hard to maneuver, when you give gas, the weight moves to back and the handle becomes light. Also vehicle is more stable when on straight line and less when in the corner. While on the corner you already have one variable of stability to negotiate, breaking and slowing down would add to the complexity. The solution to this is, you break and change the gear before you hit the corner and as soon as you hit the corner and at optimum speed, give gas. The difference in riding comfort and stability would certainly be visible. +It is utmost important that people do not wait until end of the turbulence to start ploughing in energy to gain momentum. Find out the different variables which are the cause of instability and the relationship between those. You could find out the one’s which could be inversely proportional and adjust timing to ensure that you convert on variable otherwise detrimental into a strength. Set your eyes on the next corner. +• Tune your carb/ Check spark plug +The rest day was used to be with our loved ones (motor cycles). People love their RE because they need to spend a good amount of time with it and consequently fall in love. It is also very important to be hands on for daily checkup during long rides and minor maintenance and repairs. The day was utilized by one of the lead riders in educating us on daily physical, visible check to be carried out before riding events, cleaning of air filters, maintaining the chain, removing and fixing wheels. The most important learning however was the ignition plug analysis. +Carbureted engines are now being replaced by EFI in modern motorcyles which are auto tuned. In Carbureted engines the tuning for mix of Air and Fuel is manually carried out. It is very important that the tuning is appropriate and the engine is neither lean burning nor high in fuel consumption. It is very important that the Carb is optimally tuned. The third dimension to this is the ignition plug. It not only provides the ignition but also provides the data relating to the tuning of Carb. Looking at the ignition plug one can identify if the engine is burning lean, optimal or high. +Every individual has to balance his air (Family, Friends time) and Fuel (Career) and then check his ignition plug (Energy level) regularly and tune his life to balance between the two. It is very important that the tuning is optimal and the right result is achieved only when the air and fuel are mixed appropriately to gain the right amount of torque (energy). Riding EFI is similar to being planned by outlook calendar. +• Scenic vs endurance – decide +In the morning briefing we were told about the distance to be covered to reach our destination for the day. Some days it was higher than the other days. On the days where we had more distance to cover and the road was challenging the clear instruction provided to us was that, it is a day for endurance test, spend little time on the road enjoying scenic beauty, there are thousands of them in forthcoming days. The need of the day is to test of endurance and the best way is to be on the motorcycle most of the time unless for a break for rest or food. +Life requires you to plan your journey into one requiring endurance or enjoy the scenic beauty on regular basis. When you are required to spend your energy in office deliverable or at home give your full commitment towards the same, because you will get your time when you would get time of leisure. When you are relaxed, enjoy the time by utilizing it fully by taking up the hobby you have, reading, travelling, taking additional courses, cooking or anything which you enjoy and keeps you occupied. It certainly does not mean you can be lazing around, as you have to get back to your bike and continue riding. +• Ride your bike +In the evening the discussion during the dinner used to revolve around the time taken for ride and how it could have been different had a person used an off road bike instead of a cruiser/City bike. Every rider has chosen a bike to buy and ride on a given day/journey. Once you decide to have it you cannot change it at least on that day or journey. However the decision can be revisited for the next trip. Accordingly one would not enjoy the journey if he starts thinking of how others are better off on another set of bike. The simple solution is ride your bike and enjoy the journey. +Do not compare yourself with others in career or personal life. It entirely depends on the decision taken at appropriate time. One would not be able to change the path without impacting time and energy. Enjoy the journey you have started until you reach a point which gives you a chance to change the direction if need be. +• Farther from Home, lower the risk +One of the reason for low rate of incidents during the ride was the known fact that a minor error could result in packing the bag back home. Every rider had taken enough pain in convincing the near and dear one and at office to get to the ride. No one wanted to risk on the ride and was very cautious through. It was reiterated time and again that the risk to be taken needs as low as possible. +This holds good in any field. One may be very comfortable in doing things in their own turf. When it comes to areas where a person has to move out of their expertise, the activity becomes challenging but needs to be handled with cautious. Further you move from the strength, one has to be very cautious and ensure that the risk is worth taking. This is very evident in entrepreneurial activities where the younger generation have a high risk taking temperament which tends to get generally lower as they grow old. First plan and prepare your home turf closer to the challenge and then lower the risk. +• Stop first and then park +This is something which was not told in the briefing but learnt the hard way. When riding the tendency is to get off the tarmac to stop and park. I would say first stop on the tarmac and then park on the side. The side path is unknown and could post you a lot of challenges. +People are required to take a break in career to cater to personal requirement be it higher education or family needs. The mistake committed is to move to new job to ensure that enough time is available for personal requirement. A person could be better off to take up role in current organization which could provide some spare time or go on sabbatical and then revert back with an easy start when s/he is prepared. This way s/he slows down and start back on the strong tarmac without having to negotiate the unknown. +Every event provides one with an experience it is upto one to convert a dream into memory and a learning. +“Mountains should be climbed with as little effort as possible and without desire. The reality of your own nature should determine the speed. If you become restless, speed up. If you become winded, slow down. You climb the mountain in an equilibrium between restlessness and exhaustion.” From a35e04f2ff382f19dceab907ec15d5dc1f58478d Mon Sep 17 00:00:00 2001 From: bharat Date: Thu, 24 Nov 2016 12:42:10 +0530 Subject: [PATCH 4822/5486] Add link to read this file --- Himalayan_Odyssey/HO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Himalayan_Odyssey/HO.md b/Himalayan_Odyssey/HO.md index 65863d6802..65792517f6 100644 --- a/Himalayan_Odyssey/HO.md +++ b/Himalayan_Odyssey/HO.md @@ -1,4 +1,4 @@ -Dreams to Memories – Wisdom in Ladakh +Dreams to Memories – Wisdom in Ladakh.To read this click [here](HO.md). A ride to ladakh requires a lot of preparation and begins with convincing folks back home and also at the office. As a popular quote says “Four Wheels move the body and two wheels move the soul” just riding 2500 Kms in 15 days was not the only objective of the dream I had for some time now. It was also to ensure that there is enough learning from the ride to be taken back home and be a better human being apart from being a better rider. The ride on a RE to ladakh was in preparation for almost 3 years and as Kabir said “Slowly slowly O mind... Everything in own pace happens, Gardner may water a hundred buckets... Fruit arrives only in its season”, and happen to participate this July on the ride with ~70 other riders. The ride included a lot of scenic beauty, the challenge of riding on various kinds of surface gravels, slush, watercrossing, sand and tarmac included, mental and physical challenge. One of the first ritual of the day was briefing which included the route, regroup point, road situation, mistakes committed by other riders and challenges. One thing every rider was keen to listen during briefing was Riding Tips. These were not just the tips for the ride of the day but for the entire journey and was expected to be taken back home and apply when you ride anytime and anywhere. Every person’s life is a journey and we come across various challenges and paths which we have to cross and move ahead. The tips do have hidden meaning which I happen to think during the ride as to how this can benefit our daily life • Look ahead of person you are following. This tip was the first on day one. It is common in riding that you follow a person at a comfortable speed to reduce the stress and only when you need to speed up you plan to overtake. In this process what is missed out is the visibility beyond the lead. The visibility beyond the lead ignites the thought process as to the reason for the driving behavior of the person who is being followed. This also helps in anticipating any obstacles and challenges well in advance and be prepared. This changes from reactive mode of riding to the anticipative mode of riding. From eee4b451d675ba057e1284097145042c28d5d771 Mon Sep 17 00:00:00 2001 From: bharat Date: Thu, 24 Nov 2016 12:48:05 +0530 Subject: [PATCH 4823/5486] Updated HO file read --- Himalayan_Odyssey/HO.md | 62 +++++++++++++---------------------------- 1 file changed, 19 insertions(+), 43 deletions(-) diff --git a/Himalayan_Odyssey/HO.md b/Himalayan_Odyssey/HO.md index 65792517f6..e44213003b 100644 --- a/Himalayan_Odyssey/HO.md +++ b/Himalayan_Odyssey/HO.md @@ -1,44 +1,20 @@ -Dreams to Memories – Wisdom in Ladakh.To read this click [here](HO.md). -A ride to ladakh requires a lot of preparation and begins with convincing folks back home and also at the office. As a popular quote says “Four Wheels move the body and two wheels move the soul” just riding 2500 Kms in 15 days was not the only objective of the dream I had for some time now. It was also to ensure that there is enough learning from the ride to be taken back home and be a better human being apart from being a better rider. The ride on a RE to ladakh was in preparation for almost 3 years and as Kabir said “Slowly slowly O mind... Everything in own pace happens, Gardner may water a hundred buckets... Fruit arrives only in its season”, and happen to participate this July on the ride with ~70 other riders. The ride included a lot of scenic beauty, the challenge of riding on various kinds of surface gravels, slush, watercrossing, sand and tarmac included, mental and physical challenge. One of the first ritual of the day was briefing which included the route, regroup point, road situation, mistakes committed by other riders and challenges. One thing every rider was keen to listen during briefing was Riding Tips. These were not just the tips for the ride of the day but for the entire journey and was expected to be taken back home and apply when you ride anytime and anywhere. Every person’s life is a journey and we come across various challenges and paths which we have to cross and move ahead. The tips do have hidden meaning which I happen to think during the ride as to how this can benefit our daily life +Dreams to Memories – Wisdom in Ladakh.To read this click [here](language.md). +A ride to ladakh requires a lot of preparation and begins with convincing folks back home and also at the office. As a popular quote says “Four Wheels move the body and two wheels move the soul” just riding 2500 Kms in 15 days was not the only objective of the dream I had for some time now. +It was also to ensure that there is enough learning from the ride to be taken back home and be a better human being apart from being a better rider. The ride on a RE to ladakh was in preparation for almost 3 years and as Kabir said “Slowly slowly O mind... +Everything in own pace happens, Gardner may water a hundred buckets... +Fruit arrives only in its season”, and happen to participate this July on the ride with ~70 other riders. +The ride included a lot of scenic beauty, the challenge of riding on various kinds of surface gravels, slush, watercrossing, sand and tarmac included, mental and physical challenge. One of the first ritual of the day was briefing which included the route, regroup point, road situation, mistakes committed by other riders and challenges. One thing every rider was keen to listen during briefing was Riding Tips. +These were not just the tips for the ride of the day but for the entire journey and was expected to be taken back home and apply when you ride anytime and anywhere. +Every person’s life is a journey and we come across various challenges and paths which we have to cross and move ahead. +The tips do have hidden meaning which I happen to think during the ride as to how this can benefit our daily life • Look ahead of person you are following. -This tip was the first on day one. It is common in riding that you follow a person at a comfortable speed to reduce the stress and only when you need to speed up you plan to overtake. In this process what is missed out is the visibility beyond the lead. The visibility beyond the lead ignites the thought process as to the reason for the driving behavior of the person who is being followed. This also helps in anticipating any obstacles and challenges well in advance and be prepared. This changes from reactive mode of riding to the anticipative mode of riding. -For career growth you need to apply the same principle of looking beyond your manager in anticipating the challenges. Do not end your thought process where the manager begins, try and walk the path alongside to know the challenges handled by the manager and the approach taken to resolve. As a parent the tendency is to not provide the visibility to our children on the challenges the parent is undergoing. Parents try to carry the kids on their shoulders to avoid a treacherous path. This in no way helps the younger generation to be prepared for the path when they are required to over take or take a new path which the parent does not even has thought off. -• Do not overtake at corners -Day two required us to adapt from a terrain of straight lane roads to the curves of the mountains and we were greeted with very interesting sign boards. Quotes like Be Gentle on my Curves, I am Curvaceous be slow, Mountains are Pleasure Only if you drive with Leisure, Be Mr Late Not Late Mr, Life is Short don’t make it Shorter were there around to greet us. The first riding tip for the day was not to overtake in corners, specially the one turning left. Also the one re-iterated every day through the coming days was applying restraint in overtaking while the rider ahead is looking for the best path to cross the obstacles. Let me write about the second tip first. Every rider is comfortable at his a own pace on a challenging surface. As the skill set of people differ so does the speed. The person who is at a lower speed is certainly trying to negotiate the challenges and move ahead and would like to have his share of space to maneuver. The last thing he wishes is supplementary challenge by a more skilled rider by cramping the room while overtaking. Also he may not be prepared or even aware that there is rider behind him. The discipline which was followed through the days was to ask for way and then only on confirmation, overtake. The riders ahead also adhered to this by providing the clear path as early as possible. -In Career and life Overtaking is generally viewed as egocentric. There is an urgency by people to overtake and also by some to block. It is very necessary that we know the strength and limitation of each fellow riders, respect each other and provide adequate time, path and safety to our colleagues, friends and family members. -Overtaking on blind corners is a strict no go on the road, career and life. This could cut short the journey. -• Hold your tanks hard; handlebar like eggs -The riding tip next given was the most important in terms of correction for riders and also the gains importance due to the terrain which we ride. It is very important to know that every bike balances by itself. There is no additional effort required by the rider to balance be it the smooth tarmac or the challenging gravels. Riders tend to hold the handlebar hard and take significant effort to balance the bike. This can be observed more in the riders who have upgraded from scooter or switch regularly between the two. In Motorcycle riding the rider need not balance the motorcycle, he just has to hold it hard. This can be done by holding the tanks by the thighs. The handle bar needs to be held very loose, as the lead rider aptly said hold it as if you are holding eggs. Apart from easy maneuvering, the chances of having a stiff shoulder is also reduced. To help the cause it would be good for riders to flap the elbow as if the birds are flapping the wings. -People also tend to balance life with lots of efforts and take control of things when it is obvious that what you need is just to guide. One needs to embrace Family, Friends and Faith tight and guide Career and Cash with very soft hand. This would certainly help to balance the journey comfortably and to cross all the obstacles and challenges without much effort. -• Find your own path -Robert Frost said, I took the one less traveled by, And that has made all the difference. This holds very much correct when you are riding especially in the slush. When you choose to ride on the tyre marks you are completely out of control. Similarly in the water crossings, on the gravel or sand the path chosen by the rider ahead may not be the best. On the way to Kardungla top fellow riders were taking a path and a line was formed, to the utter dismay of the riders coming from the opposite direction. No one was willing to move a couple of feet to the left and make a new path. A rider should always keep his mind open and look for new path which may or may not be less challenging. -• Use your side of the road fully. -This was a riding tip given to me by the fellow rider after observing me ride on the far left of the road. This is a habit cultivated by riding on road with dividers. When a person rides on the road where there is no separation for bi directional traffic, it is very important to ensure that you are visible to the vehicles coming from the other direction. By riding on the right side of your lane, using 1/3rd of the road, you not only increase your visibility of the road, but also get enough space for you to move to the left if need be. -People have the tendency to be invisible in office just doing their part of the work diligently. This is no way helps to know what is in the store for you in the near future both in terms of progression or opportunities available. Similar behavior is more visible at home when it comes to managing finance or parenting, where in one of the partner is in the far left with no contribution. -• Do not set targets -This is the most common error a rider commits. An obstacle be it a pot hole, rock, stones, upcoming vehicles once visible, a rider needs to look at a clear path and concentrate on the path identified. Concentrating on the obstacle is akin to setting a target and you are bound to move towards the target and not away from it. The hands move towards the direction which you are viewing, unless you are trained in a circus to do otherwise. You ride in the direction your visibility is focused. -People tend to waste their energy in getting into disputes which are nothing but target setting. There is no benefit in most of the cases but for inflation of ego. It is always better to move on in life than to set targets which could consume a lot of time and energy. EOD can mean 5.30 PM or 12.00AM, the one you choose is when you deliver. People look at Doughnut hole when you are asked to look at Doughnut as a Whole. -• Look up and set momentum -While crossing streams, you would be fortunate if the water is clear and you have some visibility of what is in store. Irrespective of the visibility, a rider cannot take any decision once he begins to cross, the direction cannot be changed nor can afford to stop in the middle, the formula here is keep your head up and ensure that the momentum takes you across the other side. Momentum alone helps you in overcoming small rocks, potholes or the current of the stream. -In office or personal life when the path is treacherous, do not try to change the path, pause or look down to see what is there beneath. One needs to ensure that proper momentum is maintained and move ahead, earlier one sets the momentum faster s/he crosses the stream. -• Be on Gas at corner -This could be termed as the best riding tip provided in the entire expedition. The vehicle is less stable when ‘off gas’ and more when ‘on gas’. This is because of the distribution of weight. When the vehicle is off gas the weight moves towards front and the vehicle is hard to maneuver, when you give gas, the weight moves to back and the handle becomes light. Also vehicle is more stable when on straight line and less when in the corner. While on the corner you already have one variable of stability to negotiate, breaking and slowing down would add to the complexity. The solution to this is, you break and change the gear before you hit the corner and as soon as you hit the corner and at optimum speed, give gas. The difference in riding comfort and stability would certainly be visible. -It is utmost important that people do not wait until end of the turbulence to start ploughing in energy to gain momentum. Find out the different variables which are the cause of instability and the relationship between those. You could find out the one’s which could be inversely proportional and adjust timing to ensure that you convert on variable otherwise detrimental into a strength. Set your eyes on the next corner. -• Tune your carb/ Check spark plug -The rest day was used to be with our loved ones (motor cycles). People love their RE because they need to spend a good amount of time with it and consequently fall in love. It is also very important to be hands on for daily checkup during long rides and minor maintenance and repairs. The day was utilized by one of the lead riders in educating us on daily physical, visible check to be carried out before riding events, cleaning of air filters, maintaining the chain, removing and fixing wheels. The most important learning however was the ignition plug analysis. -Carbureted engines are now being replaced by EFI in modern motorcyles which are auto tuned. In Carbureted engines the tuning for mix of Air and Fuel is manually carried out. It is very important that the tuning is appropriate and the engine is neither lean burning nor high in fuel consumption. It is very important that the Carb is optimally tuned. The third dimension to this is the ignition plug. It not only provides the ignition but also provides the data relating to the tuning of Carb. Looking at the ignition plug one can identify if the engine is burning lean, optimal or high. -Every individual has to balance his air (Family, Friends time) and Fuel (Career) and then check his ignition plug (Energy level) regularly and tune his life to balance between the two. It is very important that the tuning is optimal and the right result is achieved only when the air and fuel are mixed appropriately to gain the right amount of torque (energy). Riding EFI is similar to being planned by outlook calendar. -• Scenic vs endurance – decide -In the morning briefing we were told about the distance to be covered to reach our destination for the day. Some days it was higher than the other days. On the days where we had more distance to cover and the road was challenging the clear instruction provided to us was that, it is a day for endurance test, spend little time on the road enjoying scenic beauty, there are thousands of them in forthcoming days. The need of the day is to test of endurance and the best way is to be on the motorcycle most of the time unless for a break for rest or food. -Life requires you to plan your journey into one requiring endurance or enjoy the scenic beauty on regular basis. When you are required to spend your energy in office deliverable or at home give your full commitment towards the same, because you will get your time when you would get time of leisure. When you are relaxed, enjoy the time by utilizing it fully by taking up the hobby you have, reading, travelling, taking additional courses, cooking or anything which you enjoy and keeps you occupied. It certainly does not mean you can be lazing around, as you have to get back to your bike and continue riding. -• Ride your bike -In the evening the discussion during the dinner used to revolve around the time taken for ride and how it could have been different had a person used an off road bike instead of a cruiser/City bike. Every rider has chosen a bike to buy and ride on a given day/journey. Once you decide to have it you cannot change it at least on that day or journey. However the decision can be revisited for the next trip. Accordingly one would not enjoy the journey if he starts thinking of how others are better off on another set of bike. The simple solution is ride your bike and enjoy the journey. -Do not compare yourself with others in career or personal life. It entirely depends on the decision taken at appropriate time. One would not be able to change the path without impacting time and energy. Enjoy the journey you have started until you reach a point which gives you a chance to change the direction if need be. -• Farther from Home, lower the risk -One of the reason for low rate of incidents during the ride was the known fact that a minor error could result in packing the bag back home. Every rider had taken enough pain in convincing the near and dear one and at office to get to the ride. No one wanted to risk on the ride and was very cautious through. It was reiterated time and again that the risk to be taken needs as low as possible. -This holds good in any field. One may be very comfortable in doing things in their own turf. When it comes to areas where a person has to move out of their expertise, the activity becomes challenging but needs to be handled with cautious. Further you move from the strength, one has to be very cautious and ensure that the risk is worth taking. This is very evident in entrepreneurial activities where the younger generation have a high risk taking temperament which tends to get generally lower as they grow old. First plan and prepare your home turf closer to the challenge and then lower the risk. -• Stop first and then park -This is something which was not told in the briefing but learnt the hard way. When riding the tendency is to get off the tarmac to stop and park. I would say first stop on the tarmac and then park on the side. The side path is unknown and could post you a lot of challenges. -People are required to take a break in career to cater to personal requirement be it higher education or family needs. The mistake committed is to move to new job to ensure that enough time is available for personal requirement. A person could be better off to take up role in current organization which could provide some spare time or go on sabbatical and then revert back with an easy start when s/he is prepared. This way s/he slows down and start back on the strong tarmac without having to negotiate the unknown. -Every event provides one with an experience it is upto one to convert a dream into memory and a learning. -“Mountains should be climbed with as little effort as possible and without desire. The reality of your own nature should determine the speed. If you become restless, speed up. If you become winded, slow down. You climb the mountain in an equilibrium between restlessness and exhaustion.” +This tip was the first on day one. +It is common in riding that you follow a person at a comfortable speed to reduce the stress and only when you need to speed up you plan to overtake. +In this process what is missed out is the visibility beyond the lead. The visibility beyond the lead ignites the thought process as to the reason for the driving behavior of the person who is being followed. +This also helps in anticipating any obstacles and challenges well in advance and be prepared. This changes from reactive mode of riding to the anticipative mode of riding. +For career growth you need to apply the same principle of looking beyond your manager in anticipating the challenges. +Do not end your thought process where the manager begins, try and walk the path alongside to know the challenges handled by the manager and the approach taken to resolve. +As a parent the tendency is to not provide the visibility to our children on the challenges the parent is undergoing. +Parents try to carry the kids on their shoulders to avoid a treacherous path. +This in no way helps the younger generation to be prepared for the path when they are required to over take or take a new path which the parent does not even has thought off. + From 90c774bc3000a67b7e847c7edb34f0356d198f55 Mon Sep 17 00:00:00 2001 From: bharat Date: Thu, 24 Nov 2016 12:53:52 +0530 Subject: [PATCH 4824/5486] Line shorting done --- Himalayan_Odyssey/HO.md | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/Himalayan_Odyssey/HO.md b/Himalayan_Odyssey/HO.md index e44213003b..0e35c77ba0 100644 --- a/Himalayan_Odyssey/HO.md +++ b/Himalayan_Odyssey/HO.md @@ -1,20 +1,26 @@ Dreams to Memories – Wisdom in Ladakh.To read this click [here](language.md). -A ride to ladakh requires a lot of preparation and begins with convincing folks back home and also at the office. As a popular quote says “Four Wheels move the body and two wheels move the soul” just riding 2500 Kms in 15 days was not the only objective of the dream I had for some time now. -It was also to ensure that there is enough learning from the ride to be taken back home and be a better human being apart from being a better rider. The ride on a RE to ladakh was in preparation for almost 3 years and as Kabir said “Slowly slowly O mind... +A ride to ladakh requires a lot of preparation and begins with convincing folks back home and also at the office. +As a popular quote says “Four Wheels move the body and two wheels move the soul” just riding 2500 Kms in 15 days was not the only objective +of the dream I had for some time now. +It was also to ensure that there is enough learning from the ride to be taken +back home and be a better human being apart from being a better rider. +The ride on a RE to ladakh was in preparation for almost 3 years +and as Kabir said “Slowly slowly O mind... Everything in own pace happens, Gardner may water a hundred buckets... -Fruit arrives only in its season”, and happen to participate this July on the ride with ~70 other riders. -The ride included a lot of scenic beauty, the challenge of riding on various kinds of surface gravels, slush, watercrossing, sand and tarmac included, mental and physical challenge. One of the first ritual of the day was briefing which included the route, regroup point, road situation, mistakes committed by other riders and challenges. One thing every rider was keen to listen during briefing was Riding Tips. -These were not just the tips for the ride of the day but for the entire journey and was expected to be taken back home and apply when you ride anytime and anywhere. -Every person’s life is a journey and we come across various challenges and paths which we have to cross and move ahead. -The tips do have hidden meaning which I happen to think during the ride as to how this can benefit our daily life -• Look ahead of person you are following. -This tip was the first on day one. -It is common in riding that you follow a person at a comfortable speed to reduce the stress and only when you need to speed up you plan to overtake. -In this process what is missed out is the visibility beyond the lead. The visibility beyond the lead ignites the thought process as to the reason for the driving behavior of the person who is being followed. -This also helps in anticipating any obstacles and challenges well in advance and be prepared. This changes from reactive mode of riding to the anticipative mode of riding. -For career growth you need to apply the same principle of looking beyond your manager in anticipating the challenges. -Do not end your thought process where the manager begins, try and walk the path alongside to know the challenges handled by the manager and the approach taken to resolve. -As a parent the tendency is to not provide the visibility to our children on the challenges the parent is undergoing. -Parents try to carry the kids on their shoulders to avoid a treacherous path. -This in no way helps the younger generation to be prepared for the path when they are required to over take or take a new path which the parent does not even has thought off. +Fruit arrives only in its season”, +and happen to participate this July on the ride with ~70 other riders. +The ride included a lot of scenic beauty, +the challenge of riding on various kinds of surface gravels, +slush, watercrossing, sand and tarmac included, +mental and physical challenge. +One of the first ritual of the day was briefing which included the route, +regroup point, road situation, mistakes committed by other riders and challenges. +One thing every rider was keen to listen during briefing was Riding Tips. +These were not just the tips for the ride of the day but +for the entire journey and was expected to be taken back home +and apply when you ride anytime and anywhere. +Every person’s life is a journey and we come across various challenges +and paths which we have to cross and move ahead. +The tips do have hidden meaning which I happen to think during +the ride as to how this can benefit our daily life From f7edecb8b9568de02286f092f8e6546c810cfb66 Mon Sep 17 00:00:00 2001 From: bharat Date: Thu, 24 Nov 2016 12:58:09 +0530 Subject: [PATCH 4825/5486] update location in click here --- Himalayan_Odyssey/HO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Himalayan_Odyssey/HO.md b/Himalayan_Odyssey/HO.md index 0e35c77ba0..87b610662a 100644 --- a/Himalayan_Odyssey/HO.md +++ b/Himalayan_Odyssey/HO.md @@ -1,4 +1,4 @@ -Dreams to Memories – Wisdom in Ladakh.To read this click [here](language.md). +Dreams to Memories – Wisdom in Ladakh.To read this click [here](Himalayan_Odyssey/HO.md) A ride to ladakh requires a lot of preparation and begins with convincing folks back home and also at the office. As a popular quote says “Four Wheels move the body and two wheels move the soul” just riding 2500 Kms in 15 days was not the only objective of the dream I had for some time now. From 423e0a50071fd57bb94061da283fc66831038e58 Mon Sep 17 00:00:00 2001 From: bharat Date: Thu, 24 Nov 2016 13:03:57 +0530 Subject: [PATCH 4826/5486] Updated path --- Himalayan_Odyssey/HO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Himalayan_Odyssey/HO.md b/Himalayan_Odyssey/HO.md index 87b610662a..2bdada7396 100644 --- a/Himalayan_Odyssey/HO.md +++ b/Himalayan_Odyssey/HO.md @@ -1,4 +1,4 @@ -Dreams to Memories – Wisdom in Ladakh.To read this click [here](Himalayan_Odyssey/HO.md) +Dreams to Memories – Wisdom in Ladakh.To read this click [here](language.md) A ride to ladakh requires a lot of preparation and begins with convincing folks back home and also at the office. As a popular quote says “Four Wheels move the body and two wheels move the soul” just riding 2500 Kms in 15 days was not the only objective of the dream I had for some time now. From ee17f25cd106f62e864b3eb50b3390cc082de6b0 Mon Sep 17 00:00:00 2001 From: bharat Date: Thu, 24 Nov 2016 13:04:33 +0530 Subject: [PATCH 4827/5486] Updated my Data Dir Path --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index 8b0f4489ad..04e9eadedf 100644 --- a/language.md +++ b/language.md @@ -161,3 +161,5 @@ if you understand maithli, click [here...](maithli/maithli.md) if (you.understand("C#")) here.click(); if you speak Bahasa Indonesia [klik disini](indonesia/bahasa-indonesia.md) + +Dreams to Memories – Wisdom in Ladakh.To read this click [here](Himalayan_Odyssey/HO.md) From 228dec416b15814322b9e9ece5446c6cb60ba9a8 Mon Sep 17 00:00:00 2001 From: bharat Date: Thu, 24 Nov 2016 13:53:28 +0530 Subject: [PATCH 4828/5486] Change made to ensure each line is less than 120 characters long --- Himalayan_Odyssey/HO.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Himalayan_Odyssey/HO.md b/Himalayan_Odyssey/HO.md index 2bdada7396..1f3de6f965 100644 --- a/Himalayan_Odyssey/HO.md +++ b/Himalayan_Odyssey/HO.md @@ -1,6 +1,8 @@ Dreams to Memories – Wisdom in Ladakh.To read this click [here](language.md) -A ride to ladakh requires a lot of preparation and begins with convincing folks back home and also at the office. -As a popular quote says “Four Wheels move the body and two wheels move the soul” just riding 2500 Kms in 15 days was not the only objective +A ride to ladakh requires a lot of preparation and begins +with convincing folks back home and also at the office. +As a popular quote says “Four Wheels move the body and two wheels move the soul” +just riding 2500 Kms in 15 days was not the only objective of the dream I had for some time now. It was also to ensure that there is enough learning from the ride to be taken back home and be a better human being apart from being a better rider. From 529a35f3bd8b92a6749bc161140e6f33e9edc642 Mon Sep 17 00:00:00 2001 From: bharat Date: Thu, 24 Nov 2016 14:10:21 +0530 Subject: [PATCH 4829/5486] Code added to remove link from file page --- Himalayan_Odyssey/HO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Himalayan_Odyssey/HO.md b/Himalayan_Odyssey/HO.md index 1f3de6f965..899cd82bfb 100644 --- a/Himalayan_Odyssey/HO.md +++ b/Himalayan_Odyssey/HO.md @@ -1,4 +1,4 @@ -Dreams to Memories – Wisdom in Ladakh.To read this click [here](language.md) +Dreams to Memories – Wisdom in Ladakh. A ride to ladakh requires a lot of preparation and begins with convincing folks back home and also at the office. As a popular quote says “Four Wheels move the body and two wheels move the soul” From 546e6f1424b58ac10fd7a3154ae8704430f106fd Mon Sep 17 00:00:00 2001 From: Jonny Spry Date: Thu, 24 Nov 2016 15:31:03 +0000 Subject: [PATCH 4830/5486] Ad first entry to bear story --- english/bear/bear.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/bear/bear.md b/english/bear/bear.md index 25506be5ee..625675089e 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -9,3 +9,6 @@ When she slaps you in the face... [You vomit on top of her](../vomit/vomit.md) ..., holding your hand to your red cheek [you say] (../slap-response/slap-response.md) + +all is not what it seems in this story. +you're talking about bears, but i'm talking about [bears](https://twitter.com/ChicagoBears?ref_src=twsrc%5Egoogle%7Ctwcamp%5Eserp%7Ctwgr%5Eauthor) From 1998b79d04dfac3fb3a24533ee8e9daaf979d48b Mon Sep 17 00:00:00 2001 From: Jonny Spry Date: Thu, 24 Nov 2016 15:35:16 +0000 Subject: [PATCH 4831/5486] add a line break for auto commit --- english/bear/bear.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/bear/bear.md b/english/bear/bear.md index 625675089e..a18ca5d9a7 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -11,4 +11,5 @@ When she slaps you in the face... ..., holding your hand to your red cheek [you say] (../slap-response/slap-response.md) all is not what it seems in this story. -you're talking about bears, but i'm talking about [bears](https://twitter.com/ChicagoBears?ref_src=twsrc%5Egoogle%7Ctwcamp%5Eserp%7Ctwgr%5Eauthor) +you're talking about bears, but i'm talking about +[bears](https://twitter.com/ChicagoBears?ref_src=twsrc%5Egoogle%7Ctwcamp%5Eserp%7Ctwgr%5Eauthor) From 187b3ff3ac0a35253f7fdfe8457617a6809ef069 Mon Sep 17 00:00:00 2001 From: Laura Deichmueller Date: Thu, 24 Nov 2016 20:37:14 +0100 Subject: [PATCH 4832/5486] add option to scream for help --- german/Smartphone/keinInternet/keinInternet.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Smartphone/keinInternet/keinInternet.md b/german/Smartphone/keinInternet/keinInternet.md index 29a5fce802..91a0c0ab78 100644 --- a/german/Smartphone/keinInternet/keinInternet.md +++ b/german/Smartphone/keinInternet/keinInternet.md @@ -1,4 +1,6 @@ Du echauffrierst dich zunächst 10 Minuten über deinen schlechten Netzanbieter. Dann entscheidest du dich dazu ... -[los zu schwimmen](../../schwimmen/schwimmen.md) \ No newline at end of file +[los zu schwimmen](../../schwimmen/schwimmen.md) + +[um Hilfe zu rufen] (../../Hilfeschrei/Hilfeschrei.md) \ No newline at end of file From 20cd3d691b32e64a488073b012a407fc347db03a Mon Sep 17 00:00:00 2001 From: George Walley Date: Fri, 25 Nov 2016 13:50:45 -0500 Subject: [PATCH 4833/5486] added more description to add urgency for escape --- english/run_out_the_door/run_out_the_door.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/run_out_the_door/run_out_the_door.md b/english/run_out_the_door/run_out_the_door.md index b3160e666c..4110ff1ca4 100644 --- a/english/run_out_the_door/run_out_the_door.md +++ b/english/run_out_the_door/run_out_the_door.md @@ -13,6 +13,10 @@ Everyone turns to stare at you! People begin to point fingers and laugh. +The sound of riddicule quickly becomes deafening, to the poitn of madness. + +You realize you need to do something and do it quickly. + You... [Go back inside](../marshmallow.md) and reclaim your rightful position in mediocrity. From d650cb0e31a3a4952a498c55fd30f6bda0859118 Mon Sep 17 00:00:00 2001 From: Shadab Khan Date: Sat, 26 Nov 2016 13:54:35 +0530 Subject: [PATCH 4834/5486] Add EDM track to the list of chill music --- english/chillmusic/chillmusic.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/chillmusic/chillmusic.md b/english/chillmusic/chillmusic.md index 639822a344..8d4166fcc6 100644 --- a/english/chillmusic/chillmusic.md +++ b/english/chillmusic/chillmusic.md @@ -4,4 +4,6 @@ Click here instead if you want to listen to some [relaxing rock](https://www.you Click [here](https://www.youtube.com/watch?v=c3lid40q2ew) to hear a lovely piano piece. -Click to enjoy the soothing tones of [Rick Astley, Never gonna give you up](https://www.youtube.com/watch?v=2HQaBWziYvY) \ No newline at end of file +Click to enjoy the soothing tones of [Rick Astley, Never gonna give you up](https://www.youtube.com/watch?v=2HQaBWziYvY) + +Click to listen to a nice EDM track: [Faded - Alan Walker - Lost Stories Mix](https://soundcloud.com/loststories/alan-walker-faded-lost-stories-remix) \ No newline at end of file From 23d1251c102cda9bf020ccfd8e6cade6e7d2d728 Mon Sep 17 00:00:00 2001 From: Shadab Khan Date: Sat, 26 Nov 2016 14:03:00 +0530 Subject: [PATCH 4835/5486] Update line to be less than 120 characters --- english/chillmusic/chillmusic.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/chillmusic/chillmusic.md b/english/chillmusic/chillmusic.md index 8d4166fcc6..820494e963 100644 --- a/english/chillmusic/chillmusic.md +++ b/english/chillmusic/chillmusic.md @@ -6,4 +6,5 @@ Click [here](https://www.youtube.com/watch?v=c3lid40q2ew) to hear a lovely piano Click to enjoy the soothing tones of [Rick Astley, Never gonna give you up](https://www.youtube.com/watch?v=2HQaBWziYvY) -Click to listen to a nice EDM track: [Faded - Alan Walker - Lost Stories Mix](https://soundcloud.com/loststories/alan-walker-faded-lost-stories-remix) \ No newline at end of file +Click to listen to a nice EDM track: +[Faded - Alan Walker - Lost Stories Mix](https://soundcloud.com/loststories/alan-walker-faded-lost-stories-remix) \ No newline at end of file From c4ec6fec02b9cdfb1a51495250cc64d41a94dc05 Mon Sep 17 00:00:00 2001 From: kewei Date: Sat, 26 Nov 2016 11:47:56 +0100 Subject: [PATCH 4836/5486] add one line --- english/Full Metal Alchemist/fma.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/Full Metal Alchemist/fma.md b/english/Full Metal Alchemist/fma.md index 1b16d32442..ae2fb38f6e 100644 --- a/english/Full Metal Alchemist/fma.md +++ b/english/Full Metal Alchemist/fma.md @@ -20,4 +20,6 @@ Click [here](../alchemy/alchemy.md) to learn more about alchemy. [Don't know what to do next?](../working/working.md) But this is just the beginning. To become full weeaboo trash, you must fall down -into the depths of [idol hell](../LoveLive/lovelive.md)... \ No newline at end of file +into the depths of [idol hell](../LoveLive/lovelive.md)... + +With great power, comes great responsibility. From a8f29ca1355ea102752243de4372abbd22648dbf Mon Sep 17 00:00:00 2001 From: kewei Date: Sat, 26 Nov 2016 12:08:45 +0100 Subject: [PATCH 4837/5486] add Moonlight shadow --- english/chillmusic/chillmusic.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/chillmusic/chillmusic.md b/english/chillmusic/chillmusic.md index 639822a344..02b4d3dada 100644 --- a/english/chillmusic/chillmusic.md +++ b/english/chillmusic/chillmusic.md @@ -4,4 +4,6 @@ Click here instead if you want to listen to some [relaxing rock](https://www.you Click [here](https://www.youtube.com/watch?v=c3lid40q2ew) to hear a lovely piano piece. -Click to enjoy the soothing tones of [Rick Astley, Never gonna give you up](https://www.youtube.com/watch?v=2HQaBWziYvY) \ No newline at end of file +Click to enjoy the soothing tones of [Rick Astley, Never gonna give you up](https://www.youtube.com/watch?v=2HQaBWziYvY) + +Click [here](https://www.youtube.com/watch?v=e80qhyovOnA) to listen to moonlight shadow. \ No newline at end of file From 41f806ae6bee3f5453dc2f0c01cc112871fa06f7 Mon Sep 17 00:00:00 2001 From: Kenneth Chen Date: Sat, 26 Nov 2016 13:53:13 -0800 Subject: [PATCH 4838/5486] Add ramen option --- japanese/chasitsu.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/japanese/chasitsu.md b/japanese/chasitsu.md index 9a431472b7..3c7a6a906b 100644 --- a/japanese/chasitsu.md +++ b/japanese/chasitsu.md @@ -9,4 +9,6 @@ [ここ](happy/happy.md)を踏むと幸せになれます。 -[寒い](cold/cold.md) \ No newline at end of file +[寒い](cold/cold.md) + +[なぜかいきなりラーメンを食いたくなっちまった](ramen/ramen.md) \ No newline at end of file From 08c17a13636165300ee2572842a69be0089845d4 Mon Sep 17 00:00:00 2001 From: Kenneth Chen Date: Sat, 26 Nov 2016 13:54:57 -0800 Subject: [PATCH 4839/5486] Add ramen/ directory --- japanese/ramen/ramen.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 japanese/ramen/ramen.md diff --git a/japanese/ramen/ramen.md b/japanese/ramen/ramen.md new file mode 100644 index 0000000000..303df1dbf4 --- /dev/null +++ b/japanese/ramen/ramen.md @@ -0,0 +1 @@ +とはいえ、今ベイエリアにいるし、ここらへんのラーメン屋もあんまり美味しくないし、どうしようかな…？ \ No newline at end of file From 92480f5150b8ca631364ba4052d753349949c32b Mon Sep 17 00:00:00 2001 From: Carlos EAM Date: Sun, 27 Nov 2016 00:58:58 +0000 Subject: [PATCH 4840/5486] add option to enter Incantation Forrest --- english/alchemy/alchemy.md | 2 ++ .../incantation-forrest.md | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 english/incantation-forrest/incantation-forrest.md diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index 730250954d..49d83ab4a0 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -38,5 +38,7 @@ You slip the ring over your finger and ... [Transform!](../transform/transform.md) +[You teleport to the Incantation Forrest](../incantation/incantation-forrest.md) + and puff! you turn into a blob fish while only a few feet remain between you and the polar bear... diff --git a/english/incantation-forrest/incantation-forrest.md b/english/incantation-forrest/incantation-forrest.md new file mode 100644 index 0000000000..5ac81d6442 --- /dev/null +++ b/english/incantation-forrest/incantation-forrest.md @@ -0,0 +1,20 @@ +Everything is black and you begin to hear the incantation softly in your ears: + +"Spongy and soft gets gooey when hot, +spongy and soft gets gooey when hot, +combine all the elements bring heat to cold, +tasting your sweet center will please the Gods" + +You open your eyes but its blurry all they can make out is a orange and yellow light towards the crackling sound. + +At this point you notice your hand grasping at along stick and on its end more of this misterious light. + +As your eyes gain focus you begin to look around and trees surround you. BANG! the light gets brighter. + +"Its a camp fire" you whisper. Now turning your attention to the object sitting at the end of the stick. + +"A marshmallow?! is it [magic](../magic/magic.md)?". + +For the strangest reason you remember that night the [cat needed feeding](../animal/animal.md) which is weird. + +Nothing seems to make sense so you shout out loud "[this is.. IMPOSSIBLE!](../impossible/impossible.md)" or is it?.. From 57cd3e6d99e33ac86d0abcc756b9887a43d76e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=ADcero=20Silva?= Date: Sun, 27 Nov 2016 00:02:33 -0200 Subject: [PATCH 4841/5486] Add 2 powers while sleep swimming --- english/swim/swim.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/swim/swim.md b/english/swim/swim.md index 688ed744af..772eab36eb 100644 --- a/english/swim/swim.md +++ b/english/swim/swim.md @@ -2,6 +2,8 @@ Swim while sleeping is really cool but dangerous. You swam for 10 min and decide But then you decided to try again, and jumped into the water whilst sleeping. +You realize you don't need to breath, and water cannot get into your nose. + As you swim more, you rise to the surface and find yourself flying out of the water. But you are not asleep anymore, and you now have super powers! Do you choose to [save the world](../super-powers/practice-flying.md) or just fly around forever? From 6b8adffa559464216e86fca547b6e80a30910ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=ADcero=20Silva?= Date: Sun, 27 Nov 2016 00:08:49 -0200 Subject: [PATCH 4842/5486] Fix typo --- english/swim/swim.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/swim/swim.md b/english/swim/swim.md index 772eab36eb..45acaa667f 100644 --- a/english/swim/swim.md +++ b/english/swim/swim.md @@ -2,7 +2,7 @@ Swim while sleeping is really cool but dangerous. You swam for 10 min and decide But then you decided to try again, and jumped into the water whilst sleeping. -You realize you don't need to breath, and water cannot get into your nose. +You realize you don't need to breathe, and water cannot get into your nose. As you swim more, you rise to the surface and find yourself flying out of the water. But you are not asleep anymore, and you now have super powers! Do you choose to From 2682c7cf89f89dd49211abce3ab749c1a50cc656 Mon Sep 17 00:00:00 2001 From: Brandon Brown Date: Sat, 26 Nov 2016 21:11:23 -0800 Subject: [PATCH 4843/5486] Add an answer to a question --- english/philosophy/questions.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/philosophy/questions.md b/english/philosophy/questions.md index 0e96e47e99..1c8a5061aa 100644 --- a/english/philosophy/questions.md +++ b/english/philosophy/questions.md @@ -1,3 +1,5 @@ We have the questions. Now we need to find the answers. Look to the universe. +It's turtles all the way down. + Maybe the Universe is created by [god](../cosmological_argument/cosmological_argument.md) \ No newline at end of file From 4408e78fc6276162c6b09732f650b9ad001cbb3e Mon Sep 17 00:00:00 2001 From: Carlos EAM Date: Sun, 27 Nov 2016 10:27:39 +0000 Subject: [PATCH 4844/5486] Fix broken link to incantation-forrest/incantation-forrest.md --- english/alchemy/alchemy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index 49d83ab4a0..ef989f6c47 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -38,7 +38,7 @@ You slip the ring over your finger and ... [Transform!](../transform/transform.md) -[You teleport to the Incantation Forrest](../incantation/incantation-forrest.md) +[You teleport to the Incantation Forrest](../incantation-forrest/incantation-forrest.md) and puff! you turn into a blob fish while only a few feet remain between you and the polar bear... From 9a0836b2c6ff5f5239edb05acde5af3df1b02b82 Mon Sep 17 00:00:00 2001 From: Alexey Sobolevsky Date: Sun, 27 Nov 2016 16:17:33 +0300 Subject: [PATCH 4845/5486] Add flight scenario when falling grom a window --- russian/fly/fly-where.md | 15 +++++++++++++++ russian/window/win-scream/win-scream.md | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 russian/fly/fly-where.md diff --git a/russian/fly/fly-where.md b/russian/fly/fly-where.md new file mode 100644 index 0000000000..c20197b135 --- /dev/null +++ b/russian/fly/fly-where.md @@ -0,0 +1,15 @@ +Как я мог об этом забыть? Я же птица! + +Вы с гордостью расправляете крылья и за несколько метров от земли падение останвливается +и Вы всзмываете вверх. + +Вы дышите полной грудью! Свобода! Как это прекрасно! + +Вы осматриваетесь по сторонам и решаете ... + + +[ отправиться в пустыню](../desert/desert.md) + +[ пройти через джунгли](../jungle/jungle.md) + +[ покорить гору](../mountain/mountain.md) \ No newline at end of file diff --git a/russian/window/win-scream/win-scream.md b/russian/window/win-scream/win-scream.md index 33e0fdab49..28fb6a4413 100644 --- a/russian/window/win-scream/win-scream.md +++ b/russian/window/win-scream/win-scream.md @@ -8,4 +8,6 @@ Вы понимаете что это конец. +[ Постойте! У меня же есть крылья!](../../fly/fly-wings.md) + [ Шмяк!](../../zefir.md) \ No newline at end of file From af1e15abc2323ccf2fbc2ba9df208fdc5d095219 Mon Sep 17 00:00:00 2001 From: Alexey Sobolevsky Date: Sun, 27 Nov 2016 16:22:33 +0300 Subject: [PATCH 4846/5486] Fix path. --- russian/window/win-scream/win-scream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/window/win-scream/win-scream.md b/russian/window/win-scream/win-scream.md index 28fb6a4413..420637a9b7 100644 --- a/russian/window/win-scream/win-scream.md +++ b/russian/window/win-scream/win-scream.md @@ -8,6 +8,6 @@ Вы понимаете что это конец. -[ Постойте! У меня же есть крылья!](../../fly/fly-wings.md) +[ Постойте! У меня же есть крылья!](../../fly/fly-where.md) [ Шмяк!](../../zefir.md) \ No newline at end of file From 40bf8b3e2782f20f9c94fce63dd3aa3eca973b51 Mon Sep 17 00:00:00 2001 From: Alexey Sobolevsky Date: Sun, 27 Nov 2016 16:23:29 +0300 Subject: [PATCH 4847/5486] Fix path 2. --- russian/fly/fly-where.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/russian/fly/fly-where.md b/russian/fly/fly-where.md index c20197b135..5bf6099df7 100644 --- a/russian/fly/fly-where.md +++ b/russian/fly/fly-where.md @@ -8,8 +8,8 @@ Вы осматриваетесь по сторонам и решаете ... -[ отправиться в пустыню](../desert/desert.md) +[ отправиться в пустыню](../travelling/desert/desert.md) -[ пройти через джунгли](../jungle/jungle.md) +[ пройти через джунгли](../travelling/jungle/jungle.md) -[ покорить гору](../mountain/mountain.md) \ No newline at end of file +[ покорить гору](../travelling/mountain/mountain.md) \ No newline at end of file From 839ac7b15b9823c251d3c70fc94d602df057e92f Mon Sep 17 00:00:00 2001 From: hutcho66 Date: Mon, 28 Nov 2016 19:42:40 +1100 Subject: [PATCH 4848/5486] Added line to trump.md --- english/vote-the-president/trump/trump.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/vote-the-president/trump/trump.md b/english/vote-the-president/trump/trump.md index 7515d4bcf9..534134e536 100644 --- a/english/vote-the-president/trump/trump.md +++ b/english/vote-the-president/trump/trump.md @@ -10,6 +10,8 @@ You must have a tiny.. pair of hands. Let's make America bigly again with my tiny pair of hands! +What have you done, you silly people! Commiserations from Australia :( + From 1f391bd5de8d79660dc415646981ac208356b59d Mon Sep 17 00:00:00 2001 From: Michal Date: Mon, 28 Nov 2016 12:26:08 +0100 Subject: [PATCH 4849/5486] smierc totalna --- Polish/przygoda/jedzenie/biznes/biznes.md | 4 ++++ Polish/przygoda/jedzenie/biznes/cukrzyca/cukrzyca.md | 3 +++ Polish/przygoda/jedzenie/biznes/podlakorp/podlakorp.md | 3 +++ 3 files changed, 10 insertions(+) create mode 100644 Polish/przygoda/jedzenie/biznes/cukrzyca/cukrzyca.md create mode 100644 Polish/przygoda/jedzenie/biznes/podlakorp/podlakorp.md diff --git a/Polish/przygoda/jedzenie/biznes/biznes.md b/Polish/przygoda/jedzenie/biznes/biznes.md index 91ac3b8910..c559ad873c 100644 --- a/Polish/przygoda/jedzenie/biznes/biznes.md +++ b/Polish/przygoda/jedzenie/biznes/biznes.md @@ -1 +1,5 @@ Chcesz wykorzystać potencjał ptasiego mleczka i jeszcze na tym zarobić. Zabierasz się za biznesplan! Co robisz? + +[Zaczynasz pisać i pisać...](cukrzyca/cukrzyca.md) + +[Wstrzymujesz pisanie i szukasz klientow na mleczko](podlakorp/podlakorp.md) diff --git a/Polish/przygoda/jedzenie/biznes/cukrzyca/cukrzyca.md b/Polish/przygoda/jedzenie/biznes/cukrzyca/cukrzyca.md new file mode 100644 index 0000000000..7122a825bb --- /dev/null +++ b/Polish/przygoda/jedzenie/biznes/cukrzyca/cukrzyca.md @@ -0,0 +1,3 @@ +Zaczynasz pisac biznes plan i caly czas wciagasz ogromne ilosci mleczka. +Chcesz zeby biznesplan byl dopracowany, piszesz go caly miesiac. +Umierasz na cukrzyce. \ No newline at end of file diff --git a/Polish/przygoda/jedzenie/biznes/podlakorp/podlakorp.md b/Polish/przygoda/jedzenie/biznes/podlakorp/podlakorp.md new file mode 100644 index 0000000000..1eca8f9a37 --- /dev/null +++ b/Polish/przygoda/jedzenie/biznes/podlakorp/podlakorp.md @@ -0,0 +1,3 @@ +Dzwonisz do wielkiej korporacji i mowisz ze masz miliony ton mleczka do sprzedazy. +W miedzyczasie namierzaja Twoj telefon, wysylaja ninje, ktory kroi Cie na male plasterki. +Korporacja przejmuje cale mleczko! \ No newline at end of file From 89b28c56f6ffca9008c264682b5c50ebe946cb20 Mon Sep 17 00:00:00 2001 From: dgmckenna Date: Mon, 28 Nov 2016 06:54:51 -0500 Subject: [PATCH 4850/5486] Add the ability to change vote to Iron Man from Captain America after already voting for Captain America. --- english/captain/captain.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/captain/captain.md b/english/captain/captain.md index 8c41dd8ede..042a48f3cf 100644 --- a/english/captain/captain.md +++ b/english/captain/captain.md @@ -2,4 +2,7 @@ Good Choice. A man of honour beats a genius billionaire playboy philanthropist. (But can he do it again, later?) -Let's watch the trailer of him fighting iron man [here](https://youtu.be/uVdV-lxRPFo). \ No newline at end of file +Let's watch the trailer of him fighting iron man [here](https://youtu.be/uVdV-lxRPFo). + +Or change your vote back to the cool guy, it's not too late. +[click here](../ironman/ironman.md) \ No newline at end of file From f07df144b97cfd0bef22ed0dc726ede0b74caf04 Mon Sep 17 00:00:00 2001 From: dgmckenna Date: Mon, 28 Nov 2016 06:57:34 -0500 Subject: [PATCH 4851/5486] Add ability to change vote to Iron Man, with no deletions this time. --- english/captain/captain.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/captain/captain.md b/english/captain/captain.md index 8c41dd8ede..743a999b4d 100644 --- a/english/captain/captain.md +++ b/english/captain/captain.md @@ -1,5 +1,5 @@ Good Choice. A man of honour beats a genius billionaire playboy philanthropist. -(But can he do it again, later?) +(But can he do it again, later?) or vote for the cool guy!!! [here](../(ironman/ironman.md) Let's watch the trailer of him fighting iron man [here](https://youtu.be/uVdV-lxRPFo). \ No newline at end of file From fcb1c7e653744845aa9f90dc0faac513bb4a3dcd Mon Sep 17 00:00:00 2001 From: dgmckenna Date: Mon, 28 Nov 2016 16:38:00 -0500 Subject: [PATCH 4852/5486] Add further description of the jacket. --- english/jacket/marshmallow-jacket.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/jacket/marshmallow-jacket.md b/english/jacket/marshmallow-jacket.md index c125436c25..840debc1e8 100644 --- a/english/jacket/marshmallow-jacket.md +++ b/english/jacket/marshmallow-jacket.md @@ -1,6 +1,7 @@ After getting out of the leather jacket, you decide to try your luck at creating a new jacket out of marshmallows. Your hope is to make this one less restrictive. You get started right away melting and cooling marshmallows in to the form of a jacket. +It looks like a northface himalyan jacket! Do you: Give up and have [milk and cookies](milk-and-cookies/jacket-cookie.md) From 2a9706732a07350749e06e47afb8b0c67d46c9ad Mon Sep 17 00:00:00 2001 From: Stuart Malloch Date: Tue, 29 Nov 2016 21:28:11 +1100 Subject: [PATCH 4853/5486] Add tender-defender option and create page --- english/dream/dream.md | 2 ++ .../dream/tender-defender/tender-defender.md | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 english/dream/tender-defender/tender-defender.md diff --git a/english/dream/dream.md b/english/dream/dream.md index f5a3268aa2..4db79543fb 100644 --- a/english/dream/dream.md +++ b/english/dream/dream.md @@ -23,3 +23,5 @@ Afterwards, you decide to: [Drink a nice cup of tea](../tea/tea.md) [swim](../swim/swim.md) + +[become a tender defender](/tender-defender/tender-defender.md) \ No newline at end of file diff --git a/english/dream/tender-defender/tender-defender.md b/english/dream/tender-defender/tender-defender.md new file mode 100644 index 0000000000..615d4d75b5 --- /dev/null +++ b/english/dream/tender-defender/tender-defender.md @@ -0,0 +1,28 @@ +A woman benefits from a kind, tender partner who cares for her and a strong, decisive protector who can defend her. +If you can do both - if you are a 'tender defender' - you become the whole package. + +Tender defender dos and don'ts: + +DO BE: empathetic +DON'T BE: narcissistic + +DO BE: assertive +DON'T BE: wimpy + +DO BE: protective +DON'T BE: psychopathic + +DO BE: generous leader +DON'T BE: machiavellian + +DO BE: altruistic +DON'T BE: selfish + +DO BE: confident and decisive +DON'T BE: submissive or passive + +DO BE: ready for anything +DON'T BE: completely oblivious or totally anxious + +If you can do all these things, you will be on your way to becoming +[what women want](https://www.amazon.com/Mate-Become-Man-Women-Want-ebook/dp/B00RTY0FKK/) \ No newline at end of file From cff2ac7fd8cf5da40c8179462943da9ee6e4081d Mon Sep 17 00:00:00 2001 From: Stuart Malloch Date: Tue, 29 Nov 2016 21:44:23 +1100 Subject: [PATCH 4854/5486] Fix links --- english/dream/dream.md | 2 +- english/dream/tender-defender/tender-defender.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/english/dream/dream.md b/english/dream/dream.md index 4db79543fb..4a3db0f07e 100644 --- a/english/dream/dream.md +++ b/english/dream/dream.md @@ -24,4 +24,4 @@ Afterwards, you decide to: [swim](../swim/swim.md) -[become a tender defender](/tender-defender/tender-defender.md) \ No newline at end of file +[become a tender defender](../tender-defender/tender-defender.md) \ No newline at end of file diff --git a/english/dream/tender-defender/tender-defender.md b/english/dream/tender-defender/tender-defender.md index 615d4d75b5..39f5bf0dd4 100644 --- a/english/dream/tender-defender/tender-defender.md +++ b/english/dream/tender-defender/tender-defender.md @@ -25,4 +25,4 @@ DO BE: ready for anything DON'T BE: completely oblivious or totally anxious If you can do all these things, you will be on your way to becoming -[what women want](https://www.amazon.com/Mate-Become-Man-Women-Want-ebook/dp/B00RTY0FKK/) \ No newline at end of file +[what women want](https://www.amazon.com/Mate-Become-Man-Women-Want-ebook/dp/B00RTY0FKK) \ No newline at end of file From 3a87ef51d8633b092647ffb524cd95668597e7de Mon Sep 17 00:00:00 2001 From: Stuart Malloch Date: Tue, 29 Nov 2016 22:00:52 +1100 Subject: [PATCH 4855/5486] Add dream --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 20610bbdca..e230781fc6 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1187,3 +1187,5 @@ Jason Calacanis is one of the best interviewers I've seen. [Here](https://www.youtube.com/channel/UCkkhmBWfS7pILYIk0izkc3A) they are My best girls are Toujou Nozomi, Aragaki Ayase, and Sendouin Kaede. + +Maybe this is a [dream](dream/dream.md)? \ No newline at end of file From 3b071b870ced90065aa5d804ce65d75f37458afe Mon Sep 17 00:00:00 2001 From: Stuart Malloch Date: Tue, 29 Nov 2016 22:09:08 +1100 Subject: [PATCH 4856/5486] Fix links --- english/dream/dream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/dream.md b/english/dream/dream.md index 4a3db0f07e..9912432906 100644 --- a/english/dream/dream.md +++ b/english/dream/dream.md @@ -24,4 +24,4 @@ Afterwards, you decide to: [swim](../swim/swim.md) -[become a tender defender](../tender-defender/tender-defender.md) \ No newline at end of file +[become a tender defender](../dream/tender-defender/tender-defender.md) \ No newline at end of file From 14544af03e99ac15ed9248ad74f6affceaf932d6 Mon Sep 17 00:00:00 2001 From: Stuart Malloch Date: Tue, 29 Nov 2016 22:21:50 +1100 Subject: [PATCH 4857/5486] Fix external link --- english/dream/tender-defender/tender-defender.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/tender-defender/tender-defender.md b/english/dream/tender-defender/tender-defender.md index 39f5bf0dd4..740099e7d8 100644 --- a/english/dream/tender-defender/tender-defender.md +++ b/english/dream/tender-defender/tender-defender.md @@ -25,4 +25,4 @@ DO BE: ready for anything DON'T BE: completely oblivious or totally anxious If you can do all these things, you will be on your way to becoming -[what women want](https://www.amazon.com/Mate-Become-Man-Women-Want-ebook/dp/B00RTY0FKK) \ No newline at end of file +[what women want](http://google.com) \ No newline at end of file From 4a515b29bc5ec0330d35cc8d4d2551097f72dbea Mon Sep 17 00:00:00 2001 From: Stuart Malloch Date: Tue, 29 Nov 2016 22:24:55 +1100 Subject: [PATCH 4858/5486] Fix external link again --- english/dream/tender-defender/tender-defender.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/tender-defender/tender-defender.md b/english/dream/tender-defender/tender-defender.md index 740099e7d8..40214470d3 100644 --- a/english/dream/tender-defender/tender-defender.md +++ b/english/dream/tender-defender/tender-defender.md @@ -25,4 +25,4 @@ DO BE: ready for anything DON'T BE: completely oblivious or totally anxious If you can do all these things, you will be on your way to becoming -[what women want](http://google.com) \ No newline at end of file +[what women want](https://www.amazon.com/What-Women-Want-Tucker-Max/dp/0316375330/) \ No newline at end of file From a0187f03b61da1583f1f8e4bf9cb3252d1277867 Mon Sep 17 00:00:00 2001 From: Stuart Malloch Date: Tue, 29 Nov 2016 22:27:55 +1100 Subject: [PATCH 4859/5486] Fix external link yet again --- english/dream/tender-defender/tender-defender.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/tender-defender/tender-defender.md b/english/dream/tender-defender/tender-defender.md index 40214470d3..d3665edf9b 100644 --- a/english/dream/tender-defender/tender-defender.md +++ b/english/dream/tender-defender/tender-defender.md @@ -25,4 +25,4 @@ DO BE: ready for anything DON'T BE: completely oblivious or totally anxious If you can do all these things, you will be on your way to becoming -[what women want](https://www.amazon.com/What-Women-Want-Tucker-Max/dp/0316375330/) \ No newline at end of file +[what women want](https://www.amazon.com/dp/B00RTY0FKK/ref=dp-kindle-redirect?_encoding=UTF8&btkr=1) \ No newline at end of file From 2a881a4831c3fe837bec91882e3df060b0735aca Mon Sep 17 00:00:00 2001 From: Stuart Malloch Date: Tue, 29 Nov 2016 22:29:46 +1100 Subject: [PATCH 4860/5486] Fix external link another time --- english/dream/tender-defender/tender-defender.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dream/tender-defender/tender-defender.md b/english/dream/tender-defender/tender-defender.md index d3665edf9b..dae3ab2e17 100644 --- a/english/dream/tender-defender/tender-defender.md +++ b/english/dream/tender-defender/tender-defender.md @@ -25,4 +25,4 @@ DO BE: ready for anything DON'T BE: completely oblivious or totally anxious If you can do all these things, you will be on your way to becoming -[what women want](https://www.amazon.com/dp/B00RTY0FKK/ref=dp-kindle-redirect?_encoding=UTF8&btkr=1) \ No newline at end of file +[what women want](http://www.goodreads.com/book/show/24396873-mate) \ No newline at end of file From ee1c3bdd6f84bcc2d1fac09d9e66212d693dd005 Mon Sep 17 00:00:00 2001 From: Stuart Malloch Date: Tue, 29 Nov 2016 22:39:37 +1100 Subject: [PATCH 4861/5486] Fix external link anothery --- english/dream/tender-defender/tender-defender.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/dream/tender-defender/tender-defender.md b/english/dream/tender-defender/tender-defender.md index dae3ab2e17..499a59eea5 100644 --- a/english/dream/tender-defender/tender-defender.md +++ b/english/dream/tender-defender/tender-defender.md @@ -25,4 +25,5 @@ DO BE: ready for anything DON'T BE: completely oblivious or totally anxious If you can do all these things, you will be on your way to becoming -[what women want](http://www.goodreads.com/book/show/24396873-mate) \ No newline at end of file +[what women want](http://google.com) +[this is the correct link:](http://www.goodreads.com/book/show/24396873-mate) \ No newline at end of file From c13506100b96aa08b53360f9e00cca40e9f0b59b Mon Sep 17 00:00:00 2001 From: Stuart Malloch Date: Tue, 29 Nov 2016 22:42:19 +1100 Subject: [PATCH 4862/5486] Fix external link anothery again --- english/dream/tender-defender/tender-defender.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/dream/tender-defender/tender-defender.md b/english/dream/tender-defender/tender-defender.md index 499a59eea5..ec32ccf3dc 100644 --- a/english/dream/tender-defender/tender-defender.md +++ b/english/dream/tender-defender/tender-defender.md @@ -26,4 +26,5 @@ DON'T BE: completely oblivious or totally anxious If you can do all these things, you will be on your way to becoming [what women want](http://google.com) + [this is the correct link:](http://www.goodreads.com/book/show/24396873-mate) \ No newline at end of file From 924273b578c61e33ffc1c5a8fead8531ca1d35b8 Mon Sep 17 00:00:00 2001 From: Mitch Maifeld Date: Tue, 29 Nov 2016 06:50:04 -0600 Subject: [PATCH 4863/5486] Expand story with Melancholic Man --- english/DC-Comics/Man/melancholic.md | 15 +++++++++++++++ english/DC-Comics/epic_DC_Character.md | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 english/DC-Comics/Man/melancholic.md diff --git a/english/DC-Comics/Man/melancholic.md b/english/DC-Comics/Man/melancholic.md new file mode 100644 index 0000000000..307cecee28 --- /dev/null +++ b/english/DC-Comics/Man/melancholic.md @@ -0,0 +1,15 @@ +The scene opens with an unshaven man in his bathrobe. He lounges on his couch next to a mostly-empty pizza box. The phone rings; he answers but we only hear his side of the conversation... + +"Hey." + +"Yeah, but you know I'm really kinda busy right now." + +"How many? But shouldn't kids really be in school right now?" + +"I think there are supposed to be fire extinguishers ON the bus - couldn't they use that?" + +"What if they just all move to the end of the bus that's NOT over the cliff?" + +"OK, OK, just let me call for an Uber..." +:if expand("%") == ""|browse confirm w|else|confirm w|endif + diff --git a/english/DC-Comics/epic_DC_Character.md b/english/DC-Comics/epic_DC_Character.md index 5b5639ffdc..c27164ee02 100644 --- a/english/DC-Comics/epic_DC_Character.md +++ b/english/DC-Comics/epic_DC_Character.md @@ -6,4 +6,6 @@ Give it a deep thouht and figure it out. Hint: A useless character :) -[Green Arrow](Arrow/arrow.md) \ No newline at end of file +[Green Arrow](Arrow/arrow.md) + +[Melancholic Man](Man/melancholic.md) From 77b8a4183da626bc6ab9a71e6570fbb252d85b72 Mon Sep 17 00:00:00 2001 From: maifeld Date: Tue, 29 Nov 2016 06:55:28 -0600 Subject: [PATCH 4864/5486] Oops, remove gvim line at the bottom. --- english/DC-Comics/Man/melancholic.md | 1 - 1 file changed, 1 deletion(-) diff --git a/english/DC-Comics/Man/melancholic.md b/english/DC-Comics/Man/melancholic.md index 307cecee28..cc93c8d1cf 100644 --- a/english/DC-Comics/Man/melancholic.md +++ b/english/DC-Comics/Man/melancholic.md @@ -11,5 +11,4 @@ The scene opens with an unshaven man in his bathrobe. He lounges on his couch n "What if they just all move to the end of the bus that's NOT over the cliff?" "OK, OK, just let me call for an Uber..." -:if expand("%") == ""|browse confirm w|else|confirm w|endif From 848bb3ab61c7a9f82274d95fab4705ec2e5b9a84 Mon Sep 17 00:00:00 2001 From: maifeld Date: Tue, 29 Nov 2016 06:58:51 -0600 Subject: [PATCH 4865/5486] Make lines <120 chars --- english/DC-Comics/Man/melancholic.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/DC-Comics/Man/melancholic.md b/english/DC-Comics/Man/melancholic.md index cc93c8d1cf..368480a2d5 100644 --- a/english/DC-Comics/Man/melancholic.md +++ b/english/DC-Comics/Man/melancholic.md @@ -1,4 +1,6 @@ -The scene opens with an unshaven man in his bathrobe. He lounges on his couch next to a mostly-empty pizza box. The phone rings; he answers but we only hear his side of the conversation... +The scene opens with an unshaven man in his bathrobe. +He lounges on his couch next to a mostly-empty pizza box. +The phone rings; he answers but we only hear his side of the conversation... "Hey." From 565d288d5d78adb8e720c9c5b78438c5fc80b8e2 Mon Sep 17 00:00:00 2001 From: Philippe Weingertner Date: Wed, 30 Nov 2016 00:15:08 +0100 Subject: [PATCH 4866/5486] Add maths riddle --- french/feu-de-camp.md | 4 +++- french/telephone/prof_maths.md | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 french/telephone/prof_maths.md diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 747d993c1f..d514510992 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -18,6 +18,8 @@ Que faites-vous ? [J'appelle mon prof de musique](telephone/prof_musique.md) +[J'appelle mon prof de maths](telephone/prof_maths.md) + [Je dessine une porte avec un syphon de crème chantilly qui traine](dessine/porte.md) [Je ne parle pas francais](../english/marshmallow.md) @@ -32,4 +34,4 @@ Que faites-vous ? [Je me lève et me dirige vers la sortie](sortie/pousser-porte/pousser-porte.md) -[Je ne fais rien](rien/rien.md) \ No newline at end of file +[Je ne fais rien](rien/rien.md) diff --git a/french/telephone/prof_maths.md b/french/telephone/prof_maths.md new file mode 100644 index 0000000000..6e04946672 --- /dev/null +++ b/french/telephone/prof_maths.md @@ -0,0 +1,3 @@ +Il me demande que est le plus grand facteur premier de 806515533049393 ??? + +[Retourner](../feu-de-camp.md) From 5e954ac50238d20977b2d8706b35a8d153b93db6 Mon Sep 17 00:00:00 2001 From: Philippe Weingertner Date: Wed, 30 Nov 2016 00:28:54 +0100 Subject: [PATCH 4867/5486] Fix riddle maths --- french/feu-de-camp.md | 2 +- french/riddle/prof_maths.md | 3 +++ french/telephone/prof_maths.md | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 french/riddle/prof_maths.md delete mode 100644 french/telephone/prof_maths.md diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index d514510992..e4d839c3b1 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -18,7 +18,7 @@ Que faites-vous ? [J'appelle mon prof de musique](telephone/prof_musique.md) -[J'appelle mon prof de maths](telephone/prof_maths.md) +[J'appelle mon prof de maths](riddle/prof_maths.md) [Je dessine une porte avec un syphon de crème chantilly qui traine](dessine/porte.md) diff --git a/french/riddle/prof_maths.md b/french/riddle/prof_maths.md new file mode 100644 index 0000000000..1aaeb0304c --- /dev/null +++ b/french/riddle/prof_maths.md @@ -0,0 +1,3 @@ +Quel est le plus grand facteur premier de 806515533049393 ??? + +[Retourner](../feu-de-camp.md) diff --git a/french/telephone/prof_maths.md b/french/telephone/prof_maths.md deleted file mode 100644 index 6e04946672..0000000000 --- a/french/telephone/prof_maths.md +++ /dev/null @@ -1,3 +0,0 @@ -Il me demande que est le plus grand facteur premier de 806515533049393 ??? - -[Retourner](../feu-de-camp.md) From 5eb97851d8c0b5388c0db645211a70d4e13af620 Mon Sep 17 00:00:00 2001 From: Philippe Weingertner Date: Wed, 30 Nov 2016 00:43:57 +0100 Subject: [PATCH 4868/5486] Fix newline for riddle maths --- french/feu-de-camp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index e4d839c3b1..51accd1660 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -34,4 +34,4 @@ Que faites-vous ? [Je me lève et me dirige vers la sortie](sortie/pousser-porte/pousser-porte.md) -[Je ne fais rien](rien/rien.md) +[Je ne fais rien](rien/rien.md) \ No newline at end of file From e18bba1764f5f4403666e94e929e06ba5be78090 Mon Sep 17 00:00:00 2001 From: Brock Carter Date: Tue, 29 Nov 2016 18:17:56 -0800 Subject: [PATCH 4869/5486] changed existential link description --- english/hospital_bed/hospital_bed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/hospital_bed/hospital_bed.md b/english/hospital_bed/hospital_bed.md index 6b786b2066..29e9fb4b1d 100644 --- a/english/hospital_bed/hospital_bed.md +++ b/english/hospital_bed/hospital_bed.md @@ -4,7 +4,7 @@ You wake up in the hospital. You see your phone, but it's just out of reach. What do you do? -[Wait, and hope for the best] (../existential-dread/existential-dread.md) +[Realize it was all for nothing...] (../existential-dread/existential-dread.md) [Ask the cat that just walked in for help] (../ask-a-cat/cat.md) From de7c3fbaf003f8b95678011161363ce88378c7a8 Mon Sep 17 00:00:00 2001 From: Brock Carter Date: Tue, 29 Nov 2016 21:35:59 -0800 Subject: [PATCH 4870/5486] adds a line --- english/hospital_bed/hospital_bed.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/hospital_bed/hospital_bed.md b/english/hospital_bed/hospital_bed.md index 29e9fb4b1d..9abd814af5 100644 --- a/english/hospital_bed/hospital_bed.md +++ b/english/hospital_bed/hospital_bed.md @@ -8,3 +8,5 @@ What do you do? [Ask the cat that just walked in for help] (../ask-a-cat/cat.md) +[Find a fork and start trying knots on it. (I have no idea…)] (../fork-knots/melt-with-fork.md) + From 38763a415769a2311f52857fbac53ff9f5912c64 Mon Sep 17 00:00:00 2001 From: Brock Carter Date: Tue, 29 Nov 2016 21:41:06 -0800 Subject: [PATCH 4871/5486] corrects prev commit to restore orig line --- english/hospital_bed/hospital_bed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/hospital_bed/hospital_bed.md b/english/hospital_bed/hospital_bed.md index 9abd814af5..c1eb507382 100644 --- a/english/hospital_bed/hospital_bed.md +++ b/english/hospital_bed/hospital_bed.md @@ -4,7 +4,7 @@ You wake up in the hospital. You see your phone, but it's just out of reach. What do you do? -[Realize it was all for nothing...] (../existential-dread/existential-dread.md) +[Wait, and hope for the best] (../existential-dread/existential-dread.md) [Ask the cat that just walked in for help] (../ask-a-cat/cat.md) From 52f79b009ac6b0a12539a13bb1632e7448c408aa Mon Sep 17 00:00:00 2001 From: StephenHorton Date: Wed, 30 Nov 2016 15:11:47 -0800 Subject: [PATCH 4872/5486] Added story about the vacuum of the Universe --- english/vacuum/vacuum.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/vacuum/vacuum.md b/english/vacuum/vacuum.md index 7b16306574..50bd71ff5b 100644 --- a/english/vacuum/vacuum.md +++ b/english/vacuum/vacuum.md @@ -1 +1,4 @@ -What should I do with this vacuum? \ No newline at end of file +What should I do with this vacuum? +I think I should create the vacuum of space. +Then I could travel to anywhere in the Universe to my liking, +because I decided what to vacuum. \ No newline at end of file From e5438550ae867142098953a10240f2fdf554a096 Mon Sep 17 00:00:00 2001 From: MujunZ Date: Wed, 30 Nov 2016 22:25:49 -0500 Subject: [PATCH 4873/5486] =?UTF-8?q?add=20stop/stop.md=20changed=20?= =?UTF-8?q?=E5=A4=A7=E8=AF=9D=E8=A5=BF=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/stop/stop.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Chinese/stop/stop.md diff --git a/Chinese/stop/stop.md b/Chinese/stop/stop.md new file mode 100644 index 0000000000..c4e2236402 --- /dev/null +++ b/Chinese/stop/stop.md @@ -0,0 +1 @@ +你给我站住！[回去](../大话西游.md) \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 1ea90c758d..79eb5c4c68 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -152,4 +152,6 @@ [吃饼干遐想](lotus/吃饼干遐想.md) -[作夢](dream/dream.md) \ No newline at end of file +[作夢](dream/dream.md) + +[你给我站住](stop/stop.md) \ No newline at end of file From bd04f780ea83619e7de074668bfb417a4290580f Mon Sep 17 00:00:00 2001 From: Jacques-Francois Loots Date: Thu, 1 Dec 2016 16:50:21 +0200 Subject: [PATCH 4874/5486] biltong and koeksisters added to the afrikaans food list --- afrikaans/biltong/biltong.md | 3 +++ afrikaans/koeksisters/koeksisters.md | 1 + afrikaans/kos.md | 4 ++++ 3 files changed, 8 insertions(+) create mode 100644 afrikaans/biltong/biltong.md create mode 100644 afrikaans/koeksisters/koeksisters.md diff --git a/afrikaans/biltong/biltong.md b/afrikaans/biltong/biltong.md new file mode 100644 index 0000000000..fde847bbea --- /dev/null +++ b/afrikaans/biltong/biltong.md @@ -0,0 +1,3 @@ +Tensy jy meer van 'n soet tand het, het jy die beste opsie gekies. + +In jou hart is jy 'n ware Suid Afrikaner. \ No newline at end of file diff --git a/afrikaans/koeksisters/koeksisters.md b/afrikaans/koeksisters/koeksisters.md new file mode 100644 index 0000000000..5265bcffa9 --- /dev/null +++ b/afrikaans/koeksisters/koeksisters.md @@ -0,0 +1 @@ +As jy in Pretoria bly behoort jy te weet dat jy die beste koeksisters by [Springbok Koeksisters] (https://www.facebook.com/pages/Springbok-Koeksisters/799716243494753) kan koop. diff --git a/afrikaans/kos.md b/afrikaans/kos.md index 7944298d4d..d066fabca5 100644 --- a/afrikaans/kos.md +++ b/afrikaans/kos.md @@ -3,3 +3,7 @@ Jy voel honger. Jy besluit om iets eg Afrikaans te eet. Jy besluit om een van di - [Beskuit] (./beskuit/beskuit.md) - [braaivleis] (./braaivleis/braaivleis.md) + +- [Biltong] (./biltong/biltong.md) + +- [Koeksisters] (./koeksisters/koeksisters.md) From 6d87160408d7d2605ad4ce22ce085687fd2bd958 Mon Sep 17 00:00:00 2001 From: Exuma Vark Date: Thu, 1 Dec 2016 16:57:22 +0200 Subject: [PATCH 4875/5486] Update koeksisters.md --- afrikaans/koeksisters/koeksisters.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/afrikaans/koeksisters/koeksisters.md b/afrikaans/koeksisters/koeksisters.md index 5265bcffa9..4bf11abea3 100644 --- a/afrikaans/koeksisters/koeksisters.md +++ b/afrikaans/koeksisters/koeksisters.md @@ -1 +1,2 @@ -As jy in Pretoria bly behoort jy te weet dat jy die beste koeksisters by [Springbok Koeksisters] (https://www.facebook.com/pages/Springbok-Koeksisters/799716243494753) kan koop. +As jy in Pretoria bly behoort jy te weet dat jy die beste koeksisters by +[Springbok Koeksisters] (https://www.facebook.com/pages/Springbok-Koeksisters/799716243494753) kan koop. From 43ba3b152a2df6ef7d80c0847904ee9c57b4c544 Mon Sep 17 00:00:00 2001 From: JheisonRodriguez Date: Thu, 1 Dec 2016 10:21:26 -0500 Subject: [PATCH 4876/5486] the music from the rock until the vallenato --- english/play-music/colombianMusic/colombianMusic.md | 3 +++ english/play-music/playmusic.md | 2 ++ english/play-music/theStrokes/theStrokes.md | 3 +++ 3 files changed, 8 insertions(+) create mode 100644 english/play-music/colombianMusic/colombianMusic.md create mode 100644 english/play-music/theStrokes/theStrokes.md diff --git a/english/play-music/colombianMusic/colombianMusic.md b/english/play-music/colombianMusic/colombianMusic.md new file mode 100644 index 0000000000..1d52d2cdc9 --- /dev/null +++ b/english/play-music/colombianMusic/colombianMusic.md @@ -0,0 +1,3 @@ +This is a list of popular colombian music. + +the next song is a classic for the (parties of christmas)[https://www.youtube.com/watch?v=LmeuR6G8Ud4] \ No newline at end of file diff --git a/english/play-music/playmusic.md b/english/play-music/playmusic.md index c62ac20b25..431bf9b9dd 100644 --- a/english/play-music/playmusic.md +++ b/english/play-music/playmusic.md @@ -1 +1,3 @@ You decide to just [Play some music](https://youtu.be/IcrbM1l_BoI) + +But some time after, you get tired of hearing the same song, that's why you decide to listen to ("The strokes")[/theStrokes/theStrokes.md] or something more popular as the music for Colombian people. diff --git a/english/play-music/theStrokes/theStrokes.md b/english/play-music/theStrokes/theStrokes.md new file mode 100644 index 0000000000..e80ad04f0a --- /dev/null +++ b/english/play-music/theStrokes/theStrokes.md @@ -0,0 +1,3 @@ +The strokes are an american rock band, and i love this song ("Undercover of darkness")[https://www.youtube.com/watch?v=_l09H-3zzgA] + +I can also share my (spotify playlist)[https://open.spotify.com/user/1281495462/playlist/2yED9nlkmUFthtfweNJgQV] \ No newline at end of file From 8ad0385d5da17deb4700468130bcd22c09125437 Mon Sep 17 00:00:00 2001 From: JheisonRodriguez Date: Thu, 1 Dec 2016 10:29:08 -0500 Subject: [PATCH 4877/5486] Add link and correct relative link --- english/play-music/playmusic.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/play-music/playmusic.md b/english/play-music/playmusic.md index 431bf9b9dd..c8b4ef129a 100644 --- a/english/play-music/playmusic.md +++ b/english/play-music/playmusic.md @@ -1,3 +1,3 @@ You decide to just [Play some music](https://youtu.be/IcrbM1l_BoI) -But some time after, you get tired of hearing the same song, that's why you decide to listen to ("The strokes")[/theStrokes/theStrokes.md] or something more popular as the music for Colombian people. +But some time after, you get tired of hearing the same song, that's why you decide to listen to ("The strokes")[theStrokes/theStrokes.md] or something more popular as the music for (Colombian people)[colombianMusic/colombianMusic.md]. From 417d2cfd97eee4c8b977aa5fb1c6007466202271 Mon Sep 17 00:00:00 2001 From: JheisonRodriguez Date: Thu, 1 Dec 2016 10:33:01 -0500 Subject: [PATCH 4878/5486] [fix] links --- english/play-music/colombianMusic/colombianMusic.md | 2 +- english/play-music/playmusic.md | 2 +- english/play-music/theStrokes/theStrokes.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/english/play-music/colombianMusic/colombianMusic.md b/english/play-music/colombianMusic/colombianMusic.md index 1d52d2cdc9..8ef6280a0a 100644 --- a/english/play-music/colombianMusic/colombianMusic.md +++ b/english/play-music/colombianMusic/colombianMusic.md @@ -1,3 +1,3 @@ This is a list of popular colombian music. -the next song is a classic for the (parties of christmas)[https://www.youtube.com/watch?v=LmeuR6G8Ud4] \ No newline at end of file +the next song is a classic for the [parrandas vallenatas](https://www.youtube.com/watch?v=LmeuR6G8Ud4) \ No newline at end of file diff --git a/english/play-music/playmusic.md b/english/play-music/playmusic.md index c8b4ef129a..fecd18cb34 100644 --- a/english/play-music/playmusic.md +++ b/english/play-music/playmusic.md @@ -1,3 +1,3 @@ You decide to just [Play some music](https://youtu.be/IcrbM1l_BoI) -But some time after, you get tired of hearing the same song, that's why you decide to listen to ("The strokes")[theStrokes/theStrokes.md] or something more popular as the music for (Colombian people)[colombianMusic/colombianMusic.md]. +But some time after, you get tired of hearing the same song, that's why you decide to listen to ["The strokes"](theStrokes/theStrokes.md) or something more popular as the music for [Colombian people](colombianMusic/colombianMusic.md). diff --git a/english/play-music/theStrokes/theStrokes.md b/english/play-music/theStrokes/theStrokes.md index e80ad04f0a..6193abcadf 100644 --- a/english/play-music/theStrokes/theStrokes.md +++ b/english/play-music/theStrokes/theStrokes.md @@ -1,3 +1,3 @@ -The strokes are an american rock band, and i love this song ("Undercover of darkness")[https://www.youtube.com/watch?v=_l09H-3zzgA] +The strokes are an american rock band, and i love this song ["Undercover of darkness"](https://www.youtube.com/watch?v=_l09H-3zzgA) -I can also share my (spotify playlist)[https://open.spotify.com/user/1281495462/playlist/2yED9nlkmUFthtfweNJgQV] \ No newline at end of file +I can also share my [spotify playlist](https://open.spotify.com/user/1281495462/playlist/2yED9nlkmUFthtfweNJgQV) \ No newline at end of file From a998f54c0265921385ff6647e28d15bf054d679d Mon Sep 17 00:00:00 2001 From: JheisonRodriguez Date: Thu, 1 Dec 2016 10:42:04 -0500 Subject: [PATCH 4879/5486] correct mistakes thank casey-collab --- english/play-music/playmusic.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/play-music/playmusic.md b/english/play-music/playmusic.md index fecd18cb34..8ea7b418df 100644 --- a/english/play-music/playmusic.md +++ b/english/play-music/playmusic.md @@ -1,3 +1,7 @@ You decide to just [Play some music](https://youtu.be/IcrbM1l_BoI) -But some time after, you get tired of hearing the same song, that's why you decide to listen to ["The strokes"](theStrokes/theStrokes.md) or something more popular as the music for [Colombian people](colombianMusic/colombianMusic.md). +But some time after, you get tired of hearing the same song, + +That's why you decide to listen to ["The strokes"](theStrokes/theStrokes.md) + +or something more popular as the music for [Colombian people](colombianMusic/colombianMusic.md). From 233a0633147b13d78c5e998fc7a6bb67829887e9 Mon Sep 17 00:00:00 2001 From: JheisonRodriguez Date: Thu, 1 Dec 2016 10:44:03 -0500 Subject: [PATCH 4880/5486] correct mistakes thank casey-collab --- english/play-music/theStrokes/theStrokes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/play-music/theStrokes/theStrokes.md b/english/play-music/theStrokes/theStrokes.md index 6193abcadf..fcef526795 100644 --- a/english/play-music/theStrokes/theStrokes.md +++ b/english/play-music/theStrokes/theStrokes.md @@ -1,3 +1,4 @@ -The strokes are an american rock band, and i love this song ["Undercover of darkness"](https://www.youtube.com/watch?v=_l09H-3zzgA) +The strokes are an american rock band, +and i love this song ["Undercover of darkness"](https://www.youtube.com/watch?v=_l09H-3zzgA) I can also share my [spotify playlist](https://open.spotify.com/user/1281495462/playlist/2yED9nlkmUFthtfweNJgQV) \ No newline at end of file From 63ab052ad22c5c1d1158a74b71c83ceb83e664da Mon Sep 17 00:00:00 2001 From: "TEN\\U0162958" Date: Thu, 1 Dec 2016 09:38:15 -0700 Subject: [PATCH 4881/5486] add option to ask-a-cat/cat.md for rewrite symphony --- english/ask-a-cat/cat.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/ask-a-cat/cat.md b/english/ask-a-cat/cat.md index 6a26debd23..8a29d3d8c2 100644 --- a/english/ask-a-cat/cat.md +++ b/english/ask-a-cat/cat.md @@ -19,3 +19,7 @@ Your cat doesn't care. [Give the cat to your sister and become a dog person.](../dog-person/dog.md) [Eh, it wasn't that great a symphony anyway. Settle in for kitty cuddles](../cuddle-the-cat/cuddle-cat.md) + +[Say "Oh, kitty. I love you, but you do cause trouble.](../cat-symphony-trouble/rewrite-symphony.md) + + From 03f83b7434cd1ce5281920bf67b388d68375e090 Mon Sep 17 00:00:00 2001 From: "TEN\\U0162958" Date: Thu, 1 Dec 2016 09:42:20 -0700 Subject: [PATCH 4882/5486] add folder for option to ask-a-cat/cat.md for rewrite symphony --- english/cat-symphony-trouble/rewrite-symphony.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/cat-symphony-trouble/rewrite-symphony.md diff --git a/english/cat-symphony-trouble/rewrite-symphony.md b/english/cat-symphony-trouble/rewrite-symphony.md new file mode 100644 index 0000000000..358ddea235 --- /dev/null +++ b/english/cat-symphony-trouble/rewrite-symphony.md @@ -0,0 +1,7 @@ +#Rewrite your symphony + +You pick up your cat. Scratch the head until it purrs. + +You are motivated again. + +You set the cat down and begin to re-write your symphony with better ink and no liquids in sight. From 088b43615ac7ceb7edc9c5a85714f1c58c48a53d Mon Sep 17 00:00:00 2001 From: JheisonRodriguez Date: Thu, 1 Dec 2016 14:43:48 -0500 Subject: [PATCH 4883/5486] trying to merge my fork to the master --- english/play-music/colombianMusic/colombianMusic.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/play-music/colombianMusic/colombianMusic.md b/english/play-music/colombianMusic/colombianMusic.md index 8ef6280a0a..0adcad9178 100644 --- a/english/play-music/colombianMusic/colombianMusic.md +++ b/english/play-music/colombianMusic/colombianMusic.md @@ -1,3 +1,5 @@ This is a list of popular colombian music. -the next song is a classic for the [parrandas vallenatas](https://www.youtube.com/watch?v=LmeuR6G8Ud4) \ No newline at end of file +the next song is a classic for the [parrandas vallenatas](https://www.youtube.com/watch?v=LmeuR6G8Ud4) + +the next one in the new of shakira [Chantaje](https://www.youtube.com/watch?v=6Mgqbai3fKo) \ No newline at end of file From e0952be123c934fe75d9e8e41daf41f6fe56c937 Mon Sep 17 00:00:00 2001 From: "Mike Zinni (Google)" Date: Thu, 1 Dec 2016 14:38:23 -0600 Subject: [PATCH 4884/5486] add pug person type to marshmallow story --- english/marshmallow.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index e230781fc6..013083b154 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -20,6 +20,10 @@ or a [dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? +or a + +[pug person](https://www.youtube.com/watch?v=3pPR7vk-e3Y) ? + Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. @@ -1188,4 +1192,4 @@ Jason Calacanis is one of the best interviewers I've seen. My best girls are Toujou Nozomi, Aragaki Ayase, and Sendouin Kaede. -Maybe this is a [dream](dream/dream.md)? \ No newline at end of file +Maybe this is a [dream](dream/dream.md)? From 0ef865759e02b6c0009e493b6abe55ef368fa868 Mon Sep 17 00:00:00 2001 From: "Mike Zinni (Google)" Date: Thu, 1 Dec 2016 14:48:28 -0600 Subject: [PATCH 4885/5486] move pug ref to end of file --- english/marshmallow.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 013083b154..f945a5e000 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -20,10 +20,6 @@ or a [dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? -or a - -[pug person](https://www.youtube.com/watch?v=3pPR7vk-e3Y) ? - Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. @@ -1193,3 +1189,6 @@ Jason Calacanis is one of the best interviewers I've seen. My best girls are Toujou Nozomi, Aragaki Ayase, and Sendouin Kaede. Maybe this is a [dream](dream/dream.md)? + +Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? + From d7715deb6908f3a0ba856b43bb99c6f2928ac840 Mon Sep 17 00:00:00 2001 From: Pierre Alberto Delgado Quijandria Date: Thu, 1 Dec 2016 19:10:50 -0500 Subject: [PATCH 4886/5486] docs: Agrega a Pegaso a la historia sin fin. --- espanol/canudos.md | 4 +++- espanol/pegaso/pegaso.md | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 espanol/pegaso/pegaso.md diff --git a/espanol/canudos.md b/espanol/canudos.md index afd6d61ff5..63b73e7551 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -185,4 +185,6 @@ Al despertar Resines te pregunta si eres [Batman](batman/Batman.md) A lo que respondes: "Yo solo vine aquí a hablar de mi [libro](libro/libro.md)". -Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/tiempo/maquina_del_tiempo.md). \ No newline at end of file +Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/tiempo/maquina_del_tiempo.md). + +[En su viaje al pasado pudo comocer el poder de los dioses, quienes le enseñaron como invocar a Pegaso](pegaso/pegaso.md) \ No newline at end of file diff --git a/espanol/pegaso/pegaso.md b/espanol/pegaso/pegaso.md new file mode 100644 index 0000000000..749518ce67 --- /dev/null +++ b/espanol/pegaso/pegaso.md @@ -0,0 +1,33 @@ + +Pegaso: + + . . . . + ,`,`,`,`, + . . . . `\`\`\`\; + `\`\`\`\`, ~|;!;!;\! + ~\;\;\;\|\ (--,!!!~`! . + (--,\\\===~\ (--,|||~`! ./ + (--,\\\===~\ `,-,~,=,:. _,// + (--,\\\==~`\ ~-=~-.---|\;/J, + (--,\\\((```==. ~'`~/ a | + (-,.\\('('(`\\. ~'=~| \_. \ + (,--(,(,(,'\\. ~'=| \\_;> + (,-( ,(,(,;\\ ~=/ \ + (,-/ (.(.(,;\\,/ ) + (,--/,;,;,;,\\ ./------. + (==,-;-'`;' /_,----`. \ + ,.--_,__.-' `--. ` \ + (='~-_,--/ , ,!,___--. \ \_) + (-/~( | \ ,_- | ) /_| + (~/((\ )\._, |-' _,/ / + \\)))) / ./~. | \_\; padeq + ,__///// / / ) / + '===~' | | (, <. + / / \. \ + _/ / \_\ + /_!/ >_\ + +EL gran Caballo Alado de la Mitologia podia venir a ayudarlos contra el ejercito invasor. +Su fuerza y su envergadura harian que el enemigo usen sus poderes de ultratumba para poder enfrentarnos.. susurro. + +Es entonces que el enemigo: \ No newline at end of file From edf67b2f08a80942f7f2d5c126f204d7e8e2acb5 Mon Sep 17 00:00:00 2001 From: Pierre Alberto Delgado Quijandria Date: Thu, 1 Dec 2016 19:22:22 -0500 Subject: [PATCH 4887/5486] docs: Cambia a los dioses por Aquiles y reduce la linea a menos de 120 caracteres. --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 63b73e7551..d122aa5732 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -187,4 +187,4 @@ A lo que respondes: "Yo solo vine aquí a hablar de mi [libro](libro/libro.md)". Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/tiempo/maquina_del_tiempo.md). -[En su viaje al pasado pudo comocer el poder de los dioses, quienes le enseñaron como invocar a Pegaso](pegaso/pegaso.md) \ No newline at end of file +[En su viaje al pasado pudo conoció a Aquiles, quien le enseñó como invocar a Pegaso](pegaso/pegaso.md) \ No newline at end of file From 34a71034fe93f031551751184b5e99e8c0d7ccb2 Mon Sep 17 00:00:00 2001 From: Drithin Date: Thu, 1 Dec 2016 20:32:32 -0800 Subject: [PATCH 4888/5486] feat: Black and White, a short story in English Black and White is a short story idea about a young woman who finds it hard to sleep due to the tiny creepy sounds that she hears in the night. Sounds of Breeze, insects and someone's breathe scares her the most. With this idea in mind, I wrote a really basic scene to kick start the story. Anyone who likes the pitch, feel free to add to it. --- english/blackAndwhite/blackAndWhiteShortStory.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 english/blackAndwhite/blackAndWhiteShortStory.md diff --git a/english/blackAndwhite/blackAndWhiteShortStory.md b/english/blackAndwhite/blackAndWhiteShortStory.md new file mode 100644 index 0000000000..6a2b0019f8 --- /dev/null +++ b/english/blackAndwhite/blackAndWhiteShortStory.md @@ -0,0 +1,4 @@ +Christy wakes up to a creepy noise of footsteps circling around her bed and +She shuts her eyes hard and holds the quilt tight. The volume of footsteps descends and +Christy opens her eyes and slides the quilt off her face. She looks around and finds no one +around. She's drenched in sweat and breathing heavy. \ No newline at end of file From 454eba82d12b46f59c461e066e523db62a355f2d Mon Sep 17 00:00:00 2001 From: Julu Ahamed Date: Fri, 2 Dec 2016 15:17:19 +0530 Subject: [PATCH 4889/5486] Add new file 'hr_discussion.md' --- english/hr-discussion/hr_discussion.md | 1 + english/quit-your-job/quit-your-job.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 english/hr-discussion/hr_discussion.md diff --git a/english/hr-discussion/hr_discussion.md b/english/hr-discussion/hr_discussion.md new file mode 100644 index 0000000000..939e2792af --- /dev/null +++ b/english/hr-discussion/hr_discussion.md @@ -0,0 +1 @@ +Your Employer offers you a promotion, an On-site Visa and Salary hike to stay on the Job diff --git a/english/quit-your-job/quit-your-job.md b/english/quit-your-job/quit-your-job.md index a6ffa585b3..d8d635bb77 100644 --- a/english/quit-your-job/quit-your-job.md +++ b/english/quit-your-job/quit-your-job.md @@ -1,3 +1,4 @@ You suddenly decide that coding and enjoying your life are far mor important than saving money. You decide that you are going to take the leap and quit your job in December 2015. You write your letter giving 4 weeks notice and hand it to your employer. +Employer calls you for a [HR discussion](../hr-discussion/hr_discussion.md) \ No newline at end of file From 20a26585f85abc03acfa690a09cd4e3fe5fd2906 Mon Sep 17 00:00:00 2001 From: AlexTheSunbeam Date: Fri, 2 Dec 2016 14:58:46 +0300 Subject: [PATCH 4890/5486] add a phrase --- russian/awaken/stand-up/coffee/pinkie/Life/LifeIsGood.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/awaken/stand-up/coffee/pinkie/Life/LifeIsGood.md b/russian/awaken/stand-up/coffee/pinkie/Life/LifeIsGood.md index 73eac21ede..de5a031024 100644 --- a/russian/awaken/stand-up/coffee/pinkie/Life/LifeIsGood.md +++ b/russian/awaken/stand-up/coffee/pinkie/Life/LifeIsGood.md @@ -1 +1,2 @@ -Life is definitely good! \ No newline at end of file +Life is definitely good! +Это ощущение поглотило вас целиком, поднимая огромную волну любви ко всему миру! \ No newline at end of file From b2bb7ba710d3ff46d92c2ecc8e8d1ecef5f0c582 Mon Sep 17 00:00:00 2001 From: Drithin Date: Fri, 2 Dec 2016 09:24:07 -0800 Subject: [PATCH 4891/5486] feat: Introduction of Antagonist Black and White is a story idea comprising a young woman, in her early 20s, who suffers from insomnia fearing evil omens happening to her. Anyone who likes the story idea, feel free to add more to it. I introduced an antagonist in this iteration that can expand the horizons of drama in the story --- english/blackAndwhite/blackAndWhiteShortStory.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/english/blackAndwhite/blackAndWhiteShortStory.md b/english/blackAndwhite/blackAndWhiteShortStory.md index 6a2b0019f8..b0421a821a 100644 --- a/english/blackAndwhite/blackAndWhiteShortStory.md +++ b/english/blackAndwhite/blackAndWhiteShortStory.md @@ -1,4 +1,11 @@ Christy wakes up to a creepy noise of footsteps circling around her bed and -She shuts her eyes hard and holds the quilt tight. The volume of footsteps descends and +She shuts her eyes hard and holds her quilt tight. The volume of footsteps descends and Christy opens her eyes and slides the quilt off her face. She looks around and finds no one -around. She's drenched in sweat and breathing heavy. \ No newline at end of file +around. She's drenched in sweat and breathing heavy. + +Christy steps off the bed and scans her surrounding in her dorm room. She's alone but she feels +that someone is watching her, someone is recording her and she strong believes that someone wants to kill her. +Christy walks back to her bed and slide into her quilt. + +Along the direction of the wind, through the window next to the bed, A tall and toned young man, +wearing a leather hood and jeans, smirks seeing Christy tremble in fear. \ No newline at end of file From 0c885e590688d51fcc0adc42e2330ed3ac0fd5da Mon Sep 17 00:00:00 2001 From: Shreyas Dhole Date: Fri, 2 Dec 2016 22:56:35 +0530 Subject: [PATCH 4892/5486] Enlightened some guy about love --- english/love/love.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/love/love.md b/english/love/love.md index 4561e5a09e..333cc246b8 100644 --- a/english/love/love.md +++ b/english/love/love.md @@ -48,3 +48,6 @@ Our hearts, always as one. God is love. Love. + +PS: it's bullshit + From e4b9c41fe54636a3ae7b5ae5c482fc56a671513e Mon Sep 17 00:00:00 2001 From: Drithin Date: Fri, 2 Dec 2016 09:33:23 -0800 Subject: [PATCH 4893/5486] chore : Updated file directory structure Black and White is a story idea comprising a young woman, in her early 20s, who suffers from insomnia fearing evil omens happening to her. > > Anyone who likes the story idea, feel free to add more to it. I updated the story idea as well. I'll polish it further as the with the progress of the story --- english/blackAndwhite/{ => Chapter 1}/blackAndWhiteShortStory.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/blackAndwhite/{ => Chapter 1}/blackAndWhiteShortStory.md (100%) diff --git a/english/blackAndwhite/blackAndWhiteShortStory.md b/english/blackAndwhite/Chapter 1/blackAndWhiteShortStory.md similarity index 100% rename from english/blackAndwhite/blackAndWhiteShortStory.md rename to english/blackAndwhite/Chapter 1/blackAndWhiteShortStory.md From a9415b4ad9d798301b056cb4ae7633b2222b6116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Rodr=C3=ADguez=20Bartolom=C3=A9?= Date: Sat, 3 Dec 2016 14:39:26 +0100 Subject: [PATCH 4894/5486] Added magic device in the prison cell. --- english/magic-device/magic-device.md | 3 +++ english/prison/prison.md | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 english/magic-device/magic-device.md diff --git a/english/magic-device/magic-device.md b/english/magic-device/magic-device.md new file mode 100644 index 0000000000..b31b63da5d --- /dev/null +++ b/english/magic-device/magic-device.md @@ -0,0 +1,3 @@ +It is then you realise that such thing has to contain some magic, so you grab it. + +All at the sudden diff --git a/english/prison/prison.md b/english/prison/prison.md index 0e11cc72af..5f81e5a52a 100644 --- a/english/prison/prison.md +++ b/english/prison/prison.md @@ -1 +1,4 @@ -You awake in a damp, medieval prison. A guard stands in front of your cell, facing away from you. \ No newline at end of file +You awake in a damp, medieval prison. A guard stands in front of your cell, facing away from you. + +It is cold and you start to think that everything is lost, when you realise that there is subtle but still bright reflection comming from the corner of the cell. +Hoping for the guard to carry on facing away from you, you sneak up towards the strange reflection to find out the light looks to be emited by a [../magic-device/magic-device.md](strange device) different from anything you had seen before. From 79a45c5b9deca0f1c067fca2f2835ee781ebb9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Rodr=C3=ADguez=20Bartolom=C3=A9?= Date: Sat, 3 Dec 2016 14:44:11 +0100 Subject: [PATCH 4895/5486] Fixed link --- english/prison/prison.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/prison/prison.md b/english/prison/prison.md index 5f81e5a52a..8e283a2089 100644 --- a/english/prison/prison.md +++ b/english/prison/prison.md @@ -1,4 +1,4 @@ You awake in a damp, medieval prison. A guard stands in front of your cell, facing away from you. It is cold and you start to think that everything is lost, when you realise that there is subtle but still bright reflection comming from the corner of the cell. -Hoping for the guard to carry on facing away from you, you sneak up towards the strange reflection to find out the light looks to be emited by a [../magic-device/magic-device.md](strange device) different from anything you had seen before. +Hoping for the guard to carry on facing away from you, you sneak up towards the strange reflection to find out the light looks to be emited by a [strange object](../magic-device/magic-device.md) different from anything you had seen before. From 7ca92198accd8720a5f28d77c68415a78edd1534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Rodr=C3=ADguez=20Bartolom=C3=A9?= Date: Sat, 3 Dec 2016 14:46:42 +0100 Subject: [PATCH 4896/5486] Improved magic-device wording. --- english/magic-device/magic-device.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/magic-device/magic-device.md b/english/magic-device/magic-device.md index b31b63da5d..6b57c13e70 100644 --- a/english/magic-device/magic-device.md +++ b/english/magic-device/magic-device.md @@ -1,3 +1 @@ -It is then you realise that such thing has to contain some magic, so you grab it. - -All at the sudden +It is then when you realise that such thing has to contain some magic, so you don't think it twice and grab it. Then, all at the sudden From d13033c032f88219a092eab0c89dca6f40ce792a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Rodr=C3=ADguez=20Bartolom=C3=A9?= Date: Sat, 3 Dec 2016 14:52:44 +0100 Subject: [PATCH 4897/5486] Reduced length of the sentence. --- english/magic-device/magic-device.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/magic-device/magic-device.md b/english/magic-device/magic-device.md index 6b57c13e70..7bef4715ae 100644 --- a/english/magic-device/magic-device.md +++ b/english/magic-device/magic-device.md @@ -1 +1,4 @@ -It is then when you realise that such thing has to contain some magic, so you don't think it twice and grab it. Then, all at the sudden +It is then when you realise that such thing has to contain some magic, +so you don't think it twice and grab it inmediatelly. + +Then, all at the sudden From c6b00935a49be754e1cb4888fc203050043b7232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Rodr=C3=ADguez=20Bartolom=C3=A9?= Date: Sat, 3 Dec 2016 14:54:28 +0100 Subject: [PATCH 4898/5486] Reduced length of the rest of the long sentences. --- english/prison/prison.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/english/prison/prison.md b/english/prison/prison.md index 8e283a2089..c39e5a32d6 100644 --- a/english/prison/prison.md +++ b/english/prison/prison.md @@ -1,4 +1,8 @@ You awake in a damp, medieval prison. A guard stands in front of your cell, facing away from you. -It is cold and you start to think that everything is lost, when you realise that there is subtle but still bright reflection comming from the corner of the cell. -Hoping for the guard to carry on facing away from you, you sneak up towards the strange reflection to find out the light looks to be emited by a [strange object](../magic-device/magic-device.md) different from anything you had seen before. +It is cold and you start to think that everything is lost, when you realise +that there is subtle but still bright reflection comming from the corner of +the cell. +Hoping for the guard to carry on facing away from you, you sneak up towards +the strange reflection to find out the light looks to be emited by a [strange object](../magic-device/magic-device.md) +different from anything you had seen before. From 40056be0b3848d748995c2dd6089c04f7aafc301 Mon Sep 17 00:00:00 2001 From: Meet Kumar Sukhwani Date: Sun, 4 Dec 2016 19:20:24 +0530 Subject: [PATCH 4899/5486] change by Mkds622 --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index f945a5e000..141365df34 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -Once upon a time many authors collaborated to make meaningless linked story. +Once upon a time many authors collaborated to make meaningless linked story. hi~ @@ -1192,3 +1192,5 @@ Maybe this is a [dream](dream/dream.md)? Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? +Like football or soccer(as many others call it)? Must Watch [The_Greatest_Battle_Ever] (https://www.youtube.com/watch?v=KyHDZqp2ThU) + From 808afe89995d87d7bed9bfbbfcf7f0307984b9f8 Mon Sep 17 00:00:00 2001 From: Meet Kumar Sukhwani Date: Sun, 4 Dec 2016 19:48:56 +0530 Subject: [PATCH 4900/5486] Changes in line length --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 141365df34..7a2fd1e082 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1192,5 +1192,6 @@ Maybe this is a [dream](dream/dream.md)? Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? -Like football or soccer(as many others call it)? Must Watch [The_Greatest_Battle_Ever] (https://www.youtube.com/watch?v=KyHDZqp2ThU) +Like football or soccer(as many others call it)? Must Watch +[The_Greatest_Battle_Ever] (https://www.youtube.com/watch?v=KyHDZqp2ThU) From 4934ac0c1c95500c8f717c5d6675515c0aa36465 Mon Sep 17 00:00:00 2001 From: mkds622 Date: Sun, 4 Dec 2016 20:03:24 +0530 Subject: [PATCH 4901/5486] Removal of BOM character --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 7a2fd1e082..80a69c1599 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,4 @@ -Once upon a time many authors collaborated to make meaningless linked story. +Once upon a time many authors collaborated to make meaningless linked story. hi~ From bc1254c74f3d1a9a9331ee7f3e98943494dc847a Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Sun, 4 Dec 2016 10:32:44 -0800 Subject: [PATCH 4902/5486] Add yans story --- Chinese/gaoshenme/gaoshenme.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Chinese/gaoshenme/gaoshenme.md diff --git a/Chinese/gaoshenme/gaoshenme.md b/Chinese/gaoshenme/gaoshenme.md new file mode 100644 index 0000000000..d95db716f0 --- /dev/null +++ b/Chinese/gaoshenme/gaoshenme.md @@ -0,0 +1 @@ +shi zai gao bu dong zhe shi zai gan ma. Hao Dou Bi. From c0bdf2f605b90eee66ef30e7540e23bc6dce17a3 Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Sun, 4 Dec 2016 10:33:46 -0800 Subject: [PATCH 4903/5486] Add yanstory link --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 79eb5c4c68..f449837533 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -154,4 +154,6 @@ [作夢](dream/dream.md) -[你给我站住](stop/stop.md) \ No newline at end of file +[你给我站住](stop/stop.md) + +[Gao Shen Me](Gaoshenme/gaoshenme.md) From 168f519e9ece05c43de6b8376fa66be40becfdce Mon Sep 17 00:00:00 2001 From: Yan Zhao Date: Sun, 4 Dec 2016 10:59:20 -0800 Subject: [PATCH 4904/5486] modify link --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index f449837533..b8f427d433 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -156,4 +156,4 @@ [你给我站住](stop/stop.md) -[Gao Shen Me](Gaoshenme/gaoshenme.md) +[Gao Shen Me](gaoshenme/gaoshenme.md) From 24b67c057b0891bb8e0cabc09aab318e72a268d2 Mon Sep 17 00:00:00 2001 From: Oleh Aloshkin Date: Mon, 5 Dec 2016 02:00:04 +0200 Subject: [PATCH 4905/5486] Translate into ukrainian --- ukrainian/look-around/look-around.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/look-around/look-around.md b/ukrainian/look-around/look-around.md index eeb3225920..930369d5d4 100644 --- a/ukrainian/look-around/look-around.md +++ b/ukrainian/look-around/look-around.md @@ -1 +1 @@ -When you look around you can see a lot of interesting people who you do not know. +Коли ви дивитесь навколо, ви можете побачити багато цікавих людей, яких ви не знаєте. From 4806e2b81e3de889089cfc0e83f7acdd60b4299a Mon Sep 17 00:00:00 2001 From: Oleh Aloshkin Date: Mon, 5 Dec 2016 02:07:18 +0200 Subject: [PATCH 4906/5486] Revert changes and add translation --- ukrainian/look-around/look-around.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ukrainian/look-around/look-around.md b/ukrainian/look-around/look-around.md index 930369d5d4..7803fe7ada 100644 --- a/ukrainian/look-around/look-around.md +++ b/ukrainian/look-around/look-around.md @@ -1 +1,2 @@ +When you look around you can see a lot of interesting people who you do not know. Коли ви дивитесь навколо, ви можете побачити багато цікавих людей, яких ви не знаєте. From 7b767f1373f4dcc801bb39f6ac81386a8c2de6cb Mon Sep 17 00:00:00 2001 From: Shuyib Date: Mon, 5 Dec 2016 09:30:48 +0300 Subject: [PATCH 4907/5486] Add a sentence to the swahili story --- swahili/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/swahili/marshmallow.md b/swahili/marshmallow.md index 24bb39d1c4..3c02cc59c9 100644 --- a/swahili/marshmallow.md +++ b/swahili/marshmallow.md @@ -1,3 +1,5 @@ Asubuhi moja, nimeamka ndani ya chumba cha ajabu kikiwa na marshmallow kwenye kuta zake. -(lazima ilikuwa Jumanne.) \ No newline at end of file +(lazima ilikuwa Jumanne.) + +Nilijichuna ili kudhibitisha kwa si ndoto. Kisha nilikaribia kuta. From 4aad6969dd3475541d8aee0e29670391353dc976 Mon Sep 17 00:00:00 2001 From: Christian Villere Date: Mon, 5 Dec 2016 07:37:36 -0800 Subject: [PATCH 4908/5486] Add personal trainer story to adventure --- english/work-out/personal-trainer/personal_trainer.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/work-out/personal-trainer/personal_trainer.md diff --git a/english/work-out/personal-trainer/personal_trainer.md b/english/work-out/personal-trainer/personal_trainer.md new file mode 100644 index 0000000000..7208fe4942 --- /dev/null +++ b/english/work-out/personal-trainer/personal_trainer.md @@ -0,0 +1,6 @@ +This personal_trainer is the best looking +person you have ever seen. They tell you +something you were never expecting: they +eat whatever they want and never workout, yet +still look like an adonis. The reason: +he/she/they is/are an alien!!! \ No newline at end of file From 429438ae8ec09a84d0f7b0c08ef7b994c127061a Mon Sep 17 00:00:00 2001 From: Wayne <3154816042@qq.com> Date: Tue, 6 Dec 2016 01:07:07 +0800 Subject: [PATCH 4909/5486] Add dialogue between seller and ZZB --- Chinese/Yifan/modernCity.md | 2 ++ Chinese/Yifan/sell_film/sell_film.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 Chinese/Yifan/sell_film/sell_film.md diff --git a/Chinese/Yifan/modernCity.md b/Chinese/Yifan/modernCity.md index 838236fa75..a0aed0b179 100644 --- a/Chinese/Yifan/modernCity.md +++ b/Chinese/Yifan/modernCity.md @@ -6,3 +6,5 @@ 请问大哥： + +[盘丝洞怎么走？](../sell_film/sell_film.md) \ No newline at end of file diff --git a/Chinese/Yifan/sell_film/sell_film.md b/Chinese/Yifan/sell_film/sell_film.md new file mode 100644 index 0000000000..cecd5d253c --- /dev/null +++ b/Chinese/Yifan/sell_film/sell_film.md @@ -0,0 +1 @@ +大哥：你们这是在拍穿越剧么？你们剧组团购贴膜我给你们八折优惠！ \ No newline at end of file From 2b9a1d20ac692c33f39c703fc145388a1184fd53 Mon Sep 17 00:00:00 2001 From: Wayne <3154816042@qq.com> Date: Tue, 6 Dec 2016 01:26:33 +0800 Subject: [PATCH 4910/5486] Fix the path --- Chinese/Yifan/modernCity.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chinese/Yifan/modernCity.md b/Chinese/Yifan/modernCity.md index a0aed0b179..8cf594c808 100644 --- a/Chinese/Yifan/modernCity.md +++ b/Chinese/Yifan/modernCity.md @@ -7,4 +7,4 @@ -[盘丝洞怎么走？](../sell_film/sell_film.md) \ No newline at end of file +[盘丝洞怎么走？](sell_film/sell_film.md) \ No newline at end of file From bae6e2ea35fd419b7e97ed38b0518259e2e3e0f3 Mon Sep 17 00:00:00 2001 From: Christian Villere Date: Mon, 5 Dec 2016 20:34:00 -0800 Subject: [PATCH 4911/5486] Change to Weights.MD Connecting Personal Trainer Story --- english/work-out/weights/weights.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/work-out/weights/weights.md b/english/work-out/weights/weights.md index a73039d5f0..16109f131a 100644 --- a/english/work-out/weights/weights.md +++ b/english/work-out/weights/weights.md @@ -3,4 +3,6 @@ thinking "I remember how easy this was in high-school...". After getting under the bar, you quickly realize you are no longer as strong as you were in highschool. Struggling to press the bar back up, you concede to gravity -and sheepishly roll the bar down off yourself. \ No newline at end of file +and sheepishly roll the bar down off yourself. + +or you go with the [personal trainer](https://github.com/cvillere/create-your-own-adventure/blob/local-user/english/work-out/personal-trainer/personal_trainer.md) \ No newline at end of file From a0a85362a2be3f5e92e86f9a066bf746d1d54a0e Mon Sep 17 00:00:00 2001 From: Christian Villere Date: Mon, 5 Dec 2016 20:42:23 -0800 Subject: [PATCH 4912/5486] Correct Line to Less Than 120 Characters --- english/work-out/weights/weights.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/work-out/weights/weights.md b/english/work-out/weights/weights.md index 16109f131a..245a911f54 100644 --- a/english/work-out/weights/weights.md +++ b/english/work-out/weights/weights.md @@ -5,4 +5,7 @@ After getting under the bar, you quickly realize you are no longer as strong as you were in highschool. Struggling to press the bar back up, you concede to gravity and sheepishly roll the bar down off yourself. -or you go with the [personal trainer](https://github.com/cvillere/create-your-own-adventure/blob/local-user/english/work-out/personal-trainer/personal_trainer.md) \ No newline at end of file +or you go with the [personal trainer] +(https://github.com/cvillere/create-you +r-own-adventure/blob/local-user/english/ +work-out/personal-trainer/personal_trainer.md) \ No newline at end of file From e7af64d5d55596a89486f74a42d862f6b5ee19a4 Mon Sep 17 00:00:00 2001 From: Christian Villere Date: Mon, 5 Dec 2016 20:52:29 -0800 Subject: [PATCH 4913/5486] Fixing Link --- english/work-out/weights/weights.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/english/work-out/weights/weights.md b/english/work-out/weights/weights.md index 245a911f54..50523bab22 100644 --- a/english/work-out/weights/weights.md +++ b/english/work-out/weights/weights.md @@ -6,6 +6,5 @@ you were in highschool. Struggling to press the bar back up, you concede to grav and sheepishly roll the bar down off yourself. or you go with the [personal trainer] -(https://github.com/cvillere/create-you -r-own-adventure/blob/local-user/english/ +(https://github.com/cvillere/create-your-own-adventure/blob/local-user/english/ work-out/personal-trainer/personal_trainer.md) \ No newline at end of file From faef4c30c209949e85c1065796f5bfd88030df82 Mon Sep 17 00:00:00 2001 From: Christian Villere Date: Mon, 5 Dec 2016 21:18:38 -0800 Subject: [PATCH 4914/5486] Adjust Files To Change Story --- english/work-out/personal-trainer/personal_trainer.md | 2 +- english/work-out/work-out.md | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/english/work-out/personal-trainer/personal_trainer.md b/english/work-out/personal-trainer/personal_trainer.md index 7208fe4942..c985c9ea36 100644 --- a/english/work-out/personal-trainer/personal_trainer.md +++ b/english/work-out/personal-trainer/personal_trainer.md @@ -1,4 +1,4 @@ -This personal_trainer is the best looking +that is the best looking person you have ever seen. They tell you something you were never expecting: they eat whatever they want and never workout, yet diff --git a/english/work-out/work-out.md b/english/work-out/work-out.md index 129e3e0c31..090937e180 100644 --- a/english/work-out/work-out.md +++ b/english/work-out/work-out.md @@ -5,4 +5,9 @@ Work that cardiovascular system by going for a [run](run/run.md)? Or... -Attempt to get super swole by lifting some [weights](weights/weights.md)? \ No newline at end of file +Attempt to get super swole by lifting some [weights](weights/weights.md)? + +Or...... + +maybe a [personal trainer](personal-trainer/ +personal_trainer.md) \ No newline at end of file From a50b2a6998d62976627c8edff868ed5c722a537e Mon Sep 17 00:00:00 2001 From: Christian Villere Date: Mon, 5 Dec 2016 21:27:46 -0800 Subject: [PATCH 4915/5486] Change Work-Out Directory So It Works --- english/work-out/work-out.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/work-out/work-out.md b/english/work-out/work-out.md index 090937e180..36b52b99ab 100644 --- a/english/work-out/work-out.md +++ b/english/work-out/work-out.md @@ -9,5 +9,5 @@ Attempt to get super swole by lifting some [weights](weights/weights.md)? Or...... -maybe a [personal trainer](personal-trainer/ -personal_trainer.md) \ No newline at end of file +maybe a [personal trainer](create-your-own-adventure/ +english/work-out/personal-trainer/personal_trainer.md) \ No newline at end of file From 559a25369e8b5c23f028051a3fb0bdb7f0f75c03 Mon Sep 17 00:00:00 2001 From: Christian Villere Date: Mon, 5 Dec 2016 21:44:41 -0800 Subject: [PATCH 4916/5486] Update Directory To Make Relative --- english/work-out/work-out.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/work-out/work-out.md b/english/work-out/work-out.md index 36b52b99ab..090937e180 100644 --- a/english/work-out/work-out.md +++ b/english/work-out/work-out.md @@ -9,5 +9,5 @@ Attempt to get super swole by lifting some [weights](weights/weights.md)? Or...... -maybe a [personal trainer](create-your-own-adventure/ -english/work-out/personal-trainer/personal_trainer.md) \ No newline at end of file +maybe a [personal trainer](personal-trainer/ +personal_trainer.md) \ No newline at end of file From b3f1ef672d14dccbe2ef1d53b415969edf4bc664 Mon Sep 17 00:00:00 2001 From: Christian Villere Date: Mon, 5 Dec 2016 21:49:06 -0800 Subject: [PATCH 4917/5486] Change Spacing to Make Link Work --- english/work-out/work-out.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/english/work-out/work-out.md b/english/work-out/work-out.md index 090937e180..9cb3a1ce7f 100644 --- a/english/work-out/work-out.md +++ b/english/work-out/work-out.md @@ -9,5 +9,4 @@ Attempt to get super swole by lifting some [weights](weights/weights.md)? Or...... -maybe a [personal trainer](personal-trainer/ -personal_trainer.md) \ No newline at end of file +maybe a [personal trainer](personal-trainer/personal_trainer.md) \ No newline at end of file From 3334090cc034c3aef4cde221e5f5d3c74b2f71cb Mon Sep 17 00:00:00 2001 From: Christian Villere Date: Mon, 5 Dec 2016 21:53:05 -0800 Subject: [PATCH 4918/5486] Correct Relative Directory in File For Personal Trainer --- english/work-out/weights/weights.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/work-out/weights/weights.md b/english/work-out/weights/weights.md index 50523bab22..6111fb7667 100644 --- a/english/work-out/weights/weights.md +++ b/english/work-out/weights/weights.md @@ -5,6 +5,4 @@ After getting under the bar, you quickly realize you are no longer as strong as you were in highschool. Struggling to press the bar back up, you concede to gravity and sheepishly roll the bar down off yourself. -or you go with the [personal trainer] -(https://github.com/cvillere/create-your-own-adventure/blob/local-user/english/ -work-out/personal-trainer/personal_trainer.md) \ No newline at end of file +or you go with the [personal trainer](personal-trainer/personal_trainer.md) \ No newline at end of file From b8119e470114721ef19023f4f03718001ea23cd8 Mon Sep 17 00:00:00 2001 From: Brock Carter Date: Mon, 5 Dec 2016 22:10:27 -0800 Subject: [PATCH 4919/5486] new line to lucid dream --- english/lucidream/luciddream.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/lucidream/luciddream.md b/english/lucidream/luciddream.md index 39a644b51e..88763fa79a 100644 --- a/english/lucidream/luciddream.md +++ b/english/lucidream/luciddream.md @@ -16,4 +16,6 @@ Flys to the moon [Turn into a potato](potato/potato.md) -Spin like a Whirling Dervish \ No newline at end of file +Spin like a Whirling Dervish + +[Sent to the hospital](../hospital_bed/hospital_bed.md) \ No newline at end of file From 8549d4a1f0f288b98f080902deffefd026c1a15f Mon Sep 17 00:00:00 2001 From: Christian Villere Date: Tue, 6 Dec 2016 07:30:26 -0800 Subject: [PATCH 4920/5486] Add a Level to Weights.MD personal trainer link --- english/work-out/weights/weights.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/work-out/weights/weights.md b/english/work-out/weights/weights.md index 6111fb7667..339052065f 100644 --- a/english/work-out/weights/weights.md +++ b/english/work-out/weights/weights.md @@ -5,4 +5,4 @@ After getting under the bar, you quickly realize you are no longer as strong as you were in highschool. Struggling to press the bar back up, you concede to gravity and sheepishly roll the bar down off yourself. -or you go with the [personal trainer](personal-trainer/personal_trainer.md) \ No newline at end of file +or you go with the [personal trainer](../personal-trainer/personal_trainer.md) \ No newline at end of file From 39415c72c753f06fcb8eb6e0b61d306321801a18 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Tue, 6 Dec 2016 18:22:40 +0000 Subject: [PATCH 4921/5486] Chase the squirrel --- english/forest/eat/eat.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/english/forest/eat/eat.md b/english/forest/eat/eat.md index ee19bc1ca1..5dc98ac334 100644 --- a/english/forest/eat/eat.md +++ b/english/forest/eat/eat.md @@ -6,4 +6,22 @@ of a week or so, one pretzel and two peanuts per day. But it is too late, and you're still hungry. You see a squirrel on a tree branch and wonder how much meat -is on it... \ No newline at end of file +is on it... + +"Mmmm... Squirrel" you mutter uncontrolably as your mouth +starts to foam at the thought of it. + +Startled, the squirrel scurries off into the distance, but not +to be beaten you give chase. After a few hundred yards you lose +sight of him in the fading light. As your eyes start to adjust +to the light you see the squirrel staring back at you. And another +just beyond him. + +"You're in luck" you think to yourself. But you sense that they +are not alone. + +Then you notice another. All of a sudden you realise that they're +eveywhere. Hundreds of squirrels! You're surrounded. You've walked +straight into their trap. + +The hunter has become the hunted... From fb92e43a53ac5cf55cf179fc0d10ab5e7f1df647 Mon Sep 17 00:00:00 2001 From: Paula Fernandez Date: Tue, 6 Dec 2016 22:25:22 +0000 Subject: [PATCH 4922/5486] Add options after finding Hernandez --- espanol/barracas/llave/corre/consejero.md | 1 + espanol/barracas/llave/duda/renunciar.md | 1 + espanol/barracas/llave/hernandez.md | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 espanol/barracas/llave/corre/consejero.md create mode 100644 espanol/barracas/llave/duda/renunciar.md diff --git a/espanol/barracas/llave/corre/consejero.md b/espanol/barracas/llave/corre/consejero.md new file mode 100644 index 0000000000..9bade0871e --- /dev/null +++ b/espanol/barracas/llave/corre/consejero.md @@ -0,0 +1 @@ +Sin perder un segundo y agarrando fuertemente la llave con sus manos Beatito fue en busca del consejero. \ No newline at end of file diff --git a/espanol/barracas/llave/duda/renunciar.md b/espanol/barracas/llave/duda/renunciar.md new file mode 100644 index 0000000000..d3a8732aeb --- /dev/null +++ b/espanol/barracas/llave/duda/renunciar.md @@ -0,0 +1 @@ +Beatito sabe que entregar la llave significa renunciar al mayor tesoro de la ciudad. \ No newline at end of file diff --git a/espanol/barracas/llave/hernandez.md b/espanol/barracas/llave/hernandez.md index 216db32edb..3f1ad1b11a 100644 --- a/espanol/barracas/llave/hernandez.md +++ b/espanol/barracas/llave/hernandez.md @@ -1,3 +1,7 @@ El capitán Hernández sin hacer un mínimo gesto de alteración, sacó una llave de su bolsillo y se la pasó a Beatito. --Vé y entregasela al Consejero- le ordenó. \ No newline at end of file +-Vé y entregasela al Consejero- le ordenó. + +[Beatito pensativo, toda urgencia olvidada, salió de la habitación y se apoyó contra la puerta cerrada, dudando.](duda/renunciar.md) + +[Beatito salió corriendo en busca del consejero.](corre/consejero.md) \ No newline at end of file From fd2dbc1d1d79e9abfd0f85abc52c3db4b7af2a7d Mon Sep 17 00:00:00 2001 From: Paula Fernandez Date: Tue, 6 Dec 2016 22:34:54 +0000 Subject: [PATCH 4923/5486] Break line into two to make it easier to read --- espanol/barracas/llave/hernandez.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/barracas/llave/hernandez.md b/espanol/barracas/llave/hernandez.md index 3f1ad1b11a..1c95f66031 100644 --- a/espanol/barracas/llave/hernandez.md +++ b/espanol/barracas/llave/hernandez.md @@ -2,6 +2,7 @@ El capitán Hernández sin hacer un mínimo gesto de alteración, sacó una llav -Vé y entregasela al Consejero- le ordenó. -[Beatito pensativo, toda urgencia olvidada, salió de la habitación y se apoyó contra la puerta cerrada, dudando.](duda/renunciar.md) +[Beatito pensativo, toda urgencia olvidada, salió de la habitación y se apoyó contra la puerta cerrada, dudando.] +(duda/renunciar.md) [Beatito salió corriendo en busca del consejero.](corre/consejero.md) \ No newline at end of file From e0290f8dbb229db5f30316a63b99a3d6037e5ad8 Mon Sep 17 00:00:00 2001 From: Paula Fernandez Date: Tue, 6 Dec 2016 22:47:56 +0000 Subject: [PATCH 4924/5486] Fix the link I broke by adding the new line! --- espanol/barracas/llave/hernandez.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/espanol/barracas/llave/hernandez.md b/espanol/barracas/llave/hernandez.md index 1c95f66031..4b4d429356 100644 --- a/espanol/barracas/llave/hernandez.md +++ b/espanol/barracas/llave/hernandez.md @@ -2,7 +2,7 @@ El capitán Hernández sin hacer un mínimo gesto de alteración, sacó una llav -Vé y entregasela al Consejero- le ordenó. -[Beatito pensativo, toda urgencia olvidada, salió de la habitación y se apoyó contra la puerta cerrada, dudando.] -(duda/renunciar.md) +Beatito pensativo, toda urgencia olvidada, +salió de la habitación y se apoyó contra la puerta cerrada, [dudando.](duda/renunciar.md) [Beatito salió corriendo en busca del consejero.](corre/consejero.md) \ No newline at end of file From 2c7dbf59f249c7af29cb93ed95b986a638a2e315 Mon Sep 17 00:00:00 2001 From: Rafael Norman Morales Date: Wed, 7 Dec 2016 12:50:16 +0800 Subject: [PATCH 4925/5486] add tagalog joke to story --- Philippines/joke/joke.md | 4 ++++ Philippines/salamat.md | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Philippines/joke/joke.md diff --git a/Philippines/joke/joke.md b/Philippines/joke/joke.md new file mode 100644 index 0000000000..d4d7992073 --- /dev/null +++ b/Philippines/joke/joke.md @@ -0,0 +1,4 @@ +Pare 1: anong hayop ang walang gilagid? +Pare 2: ano? +Pare 1: eh di langgam (lang-gums) +-acheche- \ No newline at end of file diff --git a/Philippines/salamat.md b/Philippines/salamat.md index a65992331f..e3687ddb35 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -11,7 +11,7 @@ Buksan ang [pinto] (bagong simula/bagong_simula.md). Pahinga muna sa pag-aaral. Manood ng [movie] (movie/movie.md) Nakapag pahinga na. Salamat sa mga [pelikula] (movie/movie.md). -Ngayon ay ating sundan ang mga kaganapan sa Pilipinas. +Ngayon ay ating sundan ang mga kaganapan sa Pilipinas. Kamakailan ay nanalong Presidente si [Duterte] (duterte/duterte.md). O kung gusto mo namang kumain, tara [kain] (kain/kain.md) tayo ! @@ -20,6 +20,8 @@ Kinsay balo mag binisaya dinhi? meow meow meow? [meow!](meow/meow.md) +Pwede rin pumindot dito kung gusto mo ng maikling [joke] (joke/joke.md) + Sumali sa usapan ng mga fan ni Bob Ong [Bob Ong] (bob-ong/bob-ong.md). Alamin kung gaano mo kakilala ang iyong idolo. Petsa: Nobyembre 17, 2016 From 94a14896e3f7e1f11335838c005c0cda0c4bf09d Mon Sep 17 00:00:00 2001 From: rafaelnorman Date: Wed, 7 Dec 2016 13:07:52 +0800 Subject: [PATCH 4926/5486] add white space to solve merge issue --- Philippines/salamat.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index e3687ddb35..29d1e3faa9 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -11,7 +11,7 @@ Buksan ang [pinto] (bagong simula/bagong_simula.md). Pahinga muna sa pag-aaral. Manood ng [movie] (movie/movie.md) Nakapag pahinga na. Salamat sa mga [pelikula] (movie/movie.md). -Ngayon ay ating sundan ang mga kaganapan sa Pilipinas. +Ngayon ay ating sundan ang mga kaganapan sa Pilipinas. Kamakailan ay nanalong Presidente si [Duterte] (duterte/duterte.md). O kung gusto mo namang kumain, tara [kain] (kain/kain.md) tayo ! From 8850da3183ea1105a835b3ef467a426abedb207c Mon Sep 17 00:00:00 2001 From: pauldcastillo Date: Tue, 6 Dec 2016 21:56:58 -0800 Subject: [PATCH 4927/5486] Feat: Add immanentizing the eschaton. --- english/schrodinger-cat/dead-or-alive/dead-or-alive.md | 4 +++- .../immanentize-the-eschaton/immanentize-the-eschaton.md | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/schrodinger-cat/dead-or-alive/immanentize-the-eschaton/immanentize-the-eschaton.md diff --git a/english/schrodinger-cat/dead-or-alive/dead-or-alive.md b/english/schrodinger-cat/dead-or-alive/dead-or-alive.md index 7fd39c120e..54a884a6d6 100644 --- a/english/schrodinger-cat/dead-or-alive/dead-or-alive.md +++ b/english/schrodinger-cat/dead-or-alive/dead-or-alive.md @@ -6,4 +6,6 @@ He wasn't quite so lucky. Or maybe he's very lucky? -[Click here] (luck/what-is-luck.md) to find out why. \ No newline at end of file +[Click here] (luck/what-is-luck.md) to find out why. + +Or you can [immanentize the eschaton](immanentize-the-eschaton/immanentize-the-eschaton.md). diff --git a/english/schrodinger-cat/dead-or-alive/immanentize-the-eschaton/immanentize-the-eschaton.md b/english/schrodinger-cat/dead-or-alive/immanentize-the-eschaton/immanentize-the-eschaton.md new file mode 100644 index 0000000000..63f480631f --- /dev/null +++ b/english/schrodinger-cat/dead-or-alive/immanentize-the-eschaton/immanentize-the-eschaton.md @@ -0,0 +1,3 @@ +After years of work manipulating worlds governments from the shadows you manage to bring about the apocalypse. + +Nothing much changes. \ No newline at end of file From b01a5255e689b9df413a369d98753078abf0d86a Mon Sep 17 00:00:00 2001 From: Driss Date: Wed, 7 Dec 2016 16:02:33 +0800 Subject: [PATCH 4928/5486] Contributing to the french story by adding one option into the md file traverser-hautes-herbes.md --- .../traverser-hautes-herbes/traverser-hautes-herbes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md b/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md index 575c9e1edf..67627ffa9a 100644 --- a/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md +++ b/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md @@ -4,4 +4,6 @@ quelque chose saisit votre cheville… [Frapper](frapper-la-chose/frapper-la-chose.md) cette chose qui vous tracasse. +[Revenir en courant a la chambre en murs de pain d'epices](../../../feu-de-camp.md) + [Demander à Google](../../../google/google.md) quelle est cette chose étrange ! \ No newline at end of file From 068d6cabeae4df42966b1b26337227fb9e023897 Mon Sep 17 00:00:00 2001 From: manolodantonio Date: Wed, 7 Dec 2016 11:08:09 +0100 Subject: [PATCH 4929/5486] Add after-bear events --- english/forest/shelter/play-dead/get-out/get-out.md | 7 +++++++ english/forest/shelter/play-dead/play-dead.md | 2 ++ 2 files changed, 9 insertions(+) create mode 100644 english/forest/shelter/play-dead/get-out/get-out.md diff --git a/english/forest/shelter/play-dead/get-out/get-out.md b/english/forest/shelter/play-dead/get-out/get-out.md new file mode 100644 index 0000000000..a853e0dd47 --- /dev/null +++ b/english/forest/shelter/play-dead/get-out/get-out.md @@ -0,0 +1,7 @@ +After leaving the improvised tent, you realize that it's been raining for a while now. The footprints of the bear are clearly visible in the wet terrain. +You make a few steps further, when suddently a lightining strikes your little shelter! +Shreds of wood and plants are blasted away and your parachute blazes in flames. You would have surely died if you had stayed in there. +Still dazzled and half deafned by the lighting, you see a figure dancing wildly under the storm rains. You think it could be a shawman. +When the figure notices you, it stops dancing and starts walking away. It beckons you to follow. + +[Follow the shawman.](../../../fire/woods/follow/follow.md) diff --git a/english/forest/shelter/play-dead/play-dead.md b/english/forest/shelter/play-dead/play-dead.md index a9d5fcea1e..a08b6924cd 100644 --- a/english/forest/shelter/play-dead/play-dead.md +++ b/english/forest/shelter/play-dead/play-dead.md @@ -4,3 +4,5 @@ tent. You hear the sound of wrappers being torn. The bear is eating your food! Many minutes seem to pass while you listen to it eating your food. Finally, you hear it leave the tent. You continue to play dead for a while, and then you open your eyes. + +[Get out of the shelter.](get-out/get-out.md) \ No newline at end of file From 7bee3a42ef6c0528de480e03ec0bd8fe976c6e5a Mon Sep 17 00:00:00 2001 From: manolodantonio Date: Wed, 7 Dec 2016 11:18:00 +0100 Subject: [PATCH 4930/5486] Add more links to aferbear --- english/forest/shelter/pet-bear/pet-bear.md | 3 +++ english/forest/shelter/play-dead/get-out/get-out.md | 2 ++ 2 files changed, 5 insertions(+) diff --git a/english/forest/shelter/pet-bear/pet-bear.md b/english/forest/shelter/pet-bear/pet-bear.md index 2a08e1f581..d1432a38d7 100644 --- a/english/forest/shelter/pet-bear/pet-bear.md +++ b/english/forest/shelter/pet-bear/pet-bear.md @@ -1,2 +1,5 @@ You reach towards the bear's head with your right hand. This startles the bear. It scurries backwards out of the tent and runs away. + + +[Get out of the shelter.](get-out/get-out.md) \ No newline at end of file diff --git a/english/forest/shelter/play-dead/get-out/get-out.md b/english/forest/shelter/play-dead/get-out/get-out.md index a853e0dd47..4add8d5640 100644 --- a/english/forest/shelter/play-dead/get-out/get-out.md +++ b/english/forest/shelter/play-dead/get-out/get-out.md @@ -1,6 +1,8 @@ After leaving the improvised tent, you realize that it's been raining for a while now. The footprints of the bear are clearly visible in the wet terrain. + You make a few steps further, when suddently a lightining strikes your little shelter! Shreds of wood and plants are blasted away and your parachute blazes in flames. You would have surely died if you had stayed in there. + Still dazzled and half deafned by the lighting, you see a figure dancing wildly under the storm rains. You think it could be a shawman. When the figure notices you, it stops dancing and starts walking away. It beckons you to follow. From 1afd9a7ff3db14335f155cf25770e0a6a8ee188f Mon Sep 17 00:00:00 2001 From: manolodantonio Date: Wed, 7 Dec 2016 11:21:11 +0100 Subject: [PATCH 4931/5486] fix pet bear bug --- english/forest/shelter/pet-bear/pet-bear.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/forest/shelter/pet-bear/pet-bear.md b/english/forest/shelter/pet-bear/pet-bear.md index d1432a38d7..82dbd57ae8 100644 --- a/english/forest/shelter/pet-bear/pet-bear.md +++ b/english/forest/shelter/pet-bear/pet-bear.md @@ -2,4 +2,4 @@ You reach towards the bear's head with your right hand. This startles the bear. It scurries backwards out of the tent and runs away. -[Get out of the shelter.](get-out/get-out.md) \ No newline at end of file +[Get out of the shelter.](../play-dead/get-out/get-out.md) \ No newline at end of file From 0b5d51b1c0dbea474aee3e43cf950ccf12fe0133 Mon Sep 17 00:00:00 2001 From: manolodantonio Date: Wed, 7 Dec 2016 11:30:29 +0100 Subject: [PATCH 4932/5486] change from shaman to woods --- .../forest/shelter/play-dead/get-out/get-out.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/english/forest/shelter/play-dead/get-out/get-out.md b/english/forest/shelter/play-dead/get-out/get-out.md index 4add8d5640..3848dae803 100644 --- a/english/forest/shelter/play-dead/get-out/get-out.md +++ b/english/forest/shelter/play-dead/get-out/get-out.md @@ -1,9 +1,14 @@ -After leaving the improvised tent, you realize that it's been raining for a while now. The footprints of the bear are clearly visible in the wet terrain. +After leaving the improvised tent, you realize that it's been raining for a while now. The footprints of the bear are clearly visible in the wet terrain. -You make a few steps further, when suddently a lightining strikes your little shelter! + +You make a few steps further, when suddenly a lightning strikes your little shelter! Shreds of wood and plants are blasted away and your parachute blazes in flames. You would have surely died if you had stayed in there. -Still dazzled and half deafned by the lighting, you see a figure dancing wildly under the storm rains. You think it could be a shawman. -When the figure notices you, it stops dancing and starts walking away. It beckons you to follow. -[Follow the shawman.](../../../fire/woods/follow/follow.md) +You feel an unexpected pain: a piece of wood pierced your left leg, causing a deep wound that keeps bleeding. Still dazzled and half deafened by the lighting, you see a figure on a distant hill dancing wildly under the storm rains. You think it could be a shawman. + + +With your shelter destroyed, you have no reasons to stay here anymore. You need help, or you will die soon. + + +[Drag yourself into the woods.](../../../fire/woods/woods.md) \ No newline at end of file From 83cb2511a80a67debfb0713a2bb82d7c97899b00 Mon Sep 17 00:00:00 2001 From: manolodantonio Date: Wed, 7 Dec 2016 11:37:02 +0100 Subject: [PATCH 4933/5486] fix 120char for Casey --- .../forest/shelter/play-dead/get-out/get-out.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/english/forest/shelter/play-dead/get-out/get-out.md b/english/forest/shelter/play-dead/get-out/get-out.md index 3848dae803..861d360461 100644 --- a/english/forest/shelter/play-dead/get-out/get-out.md +++ b/english/forest/shelter/play-dead/get-out/get-out.md @@ -1,14 +1,20 @@ -After leaving the improvised tent, you realize that it's been raining for a while now. The footprints of the bear are clearly visible in the wet terrain. +After leaving the improvised tent, you realize that it's been raining for a while + now. The footprints of the bear are clearly visible in the wet terrain. You make a few steps further, when suddenly a lightning strikes your little shelter! -Shreds of wood and plants are blasted away and your parachute blazes in flames. You would have surely died if you had stayed in there. +Shreds of wood and plants are blasted away and your parachute blazes in flames. +You would have surely died if you had stayed in there. -You feel an unexpected pain: a piece of wood pierced your left leg, causing a deep wound that keeps bleeding. Still dazzled and half deafened by the lighting, you see a figure on a distant hill dancing wildly under the storm rains. You think it could be a shawman. +You feel an unexpected pain: a piece of wood pierced your left leg, causing a deep wound that keeps bleeding. +Still dazzled and half deafened by the lighting, you see a figure on a distant hill dancing wildly under the storm rains. +You think it could be a shawman. -With your shelter destroyed, you have no reasons to stay here anymore. You need help, or you will die soon. + +With your shelter destroyed, you have no reasons to stay here anymore. +You need help, or you will die soon. [Drag yourself into the woods.](../../../fire/woods/woods.md) \ No newline at end of file From 5a63f24a346939024eb676d921e6cf1fd8e00e97 Mon Sep 17 00:00:00 2001 From: manolodantonio Date: Wed, 7 Dec 2016 11:39:29 +0100 Subject: [PATCH 4934/5486] Other line fix --- english/forest/shelter/play-dead/get-out/get-out.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/english/forest/shelter/play-dead/get-out/get-out.md b/english/forest/shelter/play-dead/get-out/get-out.md index 861d360461..a14a017e77 100644 --- a/english/forest/shelter/play-dead/get-out/get-out.md +++ b/english/forest/shelter/play-dead/get-out/get-out.md @@ -6,8 +6,6 @@ You make a few steps further, when suddenly a lightning strikes your little shel Shreds of wood and plants are blasted away and your parachute blazes in flames. You would have surely died if you had stayed in there. - - You feel an unexpected pain: a piece of wood pierced your left leg, causing a deep wound that keeps bleeding. Still dazzled and half deafened by the lighting, you see a figure on a distant hill dancing wildly under the storm rains. You think it could be a shawman. From 0438acdf10272e10359137e1099fdd2826c6fc6d Mon Sep 17 00:00:00 2001 From: manolodantonio Date: Wed, 7 Dec 2016 11:44:02 +0100 Subject: [PATCH 4935/5486] Casey is starting to be annoying. --- english/forest/shelter/play-dead/get-out/get-out.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/english/forest/shelter/play-dead/get-out/get-out.md b/english/forest/shelter/play-dead/get-out/get-out.md index a14a017e77..a26361a610 100644 --- a/english/forest/shelter/play-dead/get-out/get-out.md +++ b/english/forest/shelter/play-dead/get-out/get-out.md @@ -6,8 +6,9 @@ You make a few steps further, when suddenly a lightning strikes your little shel Shreds of wood and plants are blasted away and your parachute blazes in flames. You would have surely died if you had stayed in there. -You feel an unexpected pain: a piece of wood pierced your left leg, causing a deep wound that keeps bleeding. -Still dazzled and half deafened by the lighting, you see a figure on a distant hill dancing wildly under the storm rains. +You feel an unexpected pain: a piece of wood pierced your left leg, causing a deep wound that keeps bleeding. +Still dazzled and half deafened by the lighting, +you see a figure on a distant hill dancing wildly under the storm rains. You think it could be a shawman. From dcf40925859b4eac676566294d996e3af7746537 Mon Sep 17 00:00:00 2001 From: manolodantonio Date: Wed, 7 Dec 2016 11:54:07 +0100 Subject: [PATCH 4936/5486] Edit primary link --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 80a69c1599..085398381f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,5 @@ Once upon a time many authors collaborated to make meaningless linked story. +Enter [The Forest!] (forest/forest.md) hi~ From efef2389deabd9e186c808ac1c90f01b2dd06e3e Mon Sep 17 00:00:00 2001 From: manolodantonio Date: Wed, 7 Dec 2016 11:59:51 +0100 Subject: [PATCH 4937/5486] Adjustments to the wound --- english/forest/shelter/play-dead/get-out/get-out.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/english/forest/shelter/play-dead/get-out/get-out.md b/english/forest/shelter/play-dead/get-out/get-out.md index a26361a610..1b319a9bd2 100644 --- a/english/forest/shelter/play-dead/get-out/get-out.md +++ b/english/forest/shelter/play-dead/get-out/get-out.md @@ -6,13 +6,12 @@ You make a few steps further, when suddenly a lightning strikes your little shel Shreds of wood and plants are blasted away and your parachute blazes in flames. You would have surely died if you had stayed in there. -You feel an unexpected pain: a piece of wood pierced your left leg, causing a deep wound that keeps bleeding. Still dazzled and half deafened by the lighting, you see a figure on a distant hill dancing wildly under the storm rains. You think it could be a shawman. - With your shelter destroyed, you have no reasons to stay here anymore. +The wound on your right leg is getting worse. You need help, or you will die soon. From d8c49fe064b7ff65863a6156e0ac894244b4d380 Mon Sep 17 00:00:00 2001 From: manolodantonio Date: Wed, 7 Dec 2016 12:03:35 +0100 Subject: [PATCH 4938/5486] Casey. I hate you. --- english/forest/shelter/play-dead/get-out/get-out.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/forest/shelter/play-dead/get-out/get-out.md b/english/forest/shelter/play-dead/get-out/get-out.md index 1b319a9bd2..06c6296b04 100644 --- a/english/forest/shelter/play-dead/get-out/get-out.md +++ b/english/forest/shelter/play-dead/get-out/get-out.md @@ -6,12 +6,13 @@ You make a few steps further, when suddenly a lightning strikes your little shel Shreds of wood and plants are blasted away and your parachute blazes in flames. You would have surely died if you had stayed in there. +You feel an unexpected pain: a piece of wood pierced your left leg, causing a deep wound that keeps bleeding. Still dazzled and half deafened by the lighting, you see a figure on a distant hill dancing wildly under the storm rains. You think it could be a shawman. With your shelter destroyed, you have no reasons to stay here anymore. -The wound on your right leg is getting worse. +The wounds on your legs are getting worse. You need help, or you will die soon. From 29462ccf94b2bfa4d9a55bb7d87f69a795198681 Mon Sep 17 00:00:00 2001 From: manolodantonio Date: Wed, 7 Dec 2016 12:04:39 +0100 Subject: [PATCH 4939/5486] Add space for Casey --- english/forest/shelter/play-dead/get-out/get-out.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/forest/shelter/play-dead/get-out/get-out.md b/english/forest/shelter/play-dead/get-out/get-out.md index 06c6296b04..f8229b2ae6 100644 --- a/english/forest/shelter/play-dead/get-out/get-out.md +++ b/english/forest/shelter/play-dead/get-out/get-out.md @@ -11,6 +11,7 @@ Still dazzled and half deafened by the lighting, you see a figure on a distant hill dancing wildly under the storm rains. You think it could be a shawman. + With your shelter destroyed, you have no reasons to stay here anymore. The wounds on your legs are getting worse. You need help, or you will die soon. From d71a12aecd459c231f441f1b2878b6149ad0acff Mon Sep 17 00:00:00 2001 From: Drithin Date: Wed, 7 Dec 2016 21:23:01 -0800 Subject: [PATCH 4940/5486] chore: added climax to the Chapter 1 and changed namingconvention for makr down file --- ...teShortStory.md => blackAndWhiteShortStoryChapter1.md} | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) rename english/blackAndwhite/Chapter 1/{blackAndWhiteShortStory.md => blackAndWhiteShortStoryChapter1.md} (78%) diff --git a/english/blackAndwhite/Chapter 1/blackAndWhiteShortStory.md b/english/blackAndwhite/Chapter 1/blackAndWhiteShortStoryChapter1.md similarity index 78% rename from english/blackAndwhite/Chapter 1/blackAndWhiteShortStory.md rename to english/blackAndwhite/Chapter 1/blackAndWhiteShortStoryChapter1.md index b0421a821a..28b1c1cd99 100644 --- a/english/blackAndwhite/Chapter 1/blackAndWhiteShortStory.md +++ b/english/blackAndwhite/Chapter 1/blackAndWhiteShortStoryChapter1.md @@ -1,3 +1,6 @@ +Black and White, Chapter 1: + + Christy wakes up to a creepy noise of footsteps circling around her bed and She shuts her eyes hard and holds her quilt tight. The volume of footsteps descends and Christy opens her eyes and slides the quilt off her face. She looks around and finds no one @@ -8,4 +11,7 @@ that someone is watching her, someone is recording her and she strong believes t Christy walks back to her bed and slide into her quilt. Along the direction of the wind, through the window next to the bed, A tall and toned young man, -wearing a leather hood and jeans, smirks seeing Christy tremble in fear. \ No newline at end of file +wearing a leather hood and jeans, smirks seeing Christy tremble in fear. + +Christy sprints to the window to check if someone is hiding there and sees no one. Stranger drifts into the eternal dark +and leaves a puzzle behind for her. \ No newline at end of file From 6e41f4167f30fef2e3443cf8973c2a29be608446 Mon Sep 17 00:00:00 2001 From: penny-wise Date: Thu, 8 Dec 2016 00:42:23 -0800 Subject: [PATCH 4941/5486] More junk added --- english/marshmallow.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 085398381f..e5ea0ed7b0 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1196,3 +1196,4 @@ Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Like football or soccer(as many others call it)? Must Watch [The_Greatest_Battle_Ever] (https://www.youtube.com/watch?v=KyHDZqp2ThU) +Some other guy beat me to it. Too lazy [here](lazy/lazy.md) From a138543625e805ee877e9d56a207a05698f6c51e Mon Sep 17 00:00:00 2001 From: Snir Kohai Date: Thu, 8 Dec 2016 11:24:11 +0200 Subject: [PATCH 4942/5486] Add a house to the Minecraft storyline. --- english/you-are-in-minecraft/house/house.md | 16 ++++++++++++++++ english/you-are-in-minecraft/minecraft.md | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 english/you-are-in-minecraft/house/house.md diff --git a/english/you-are-in-minecraft/house/house.md b/english/you-are-in-minecraft/house/house.md new file mode 100644 index 0000000000..dae7ef8d4e --- /dev/null +++ b/english/you-are-in-minecraft/house/house.md @@ -0,0 +1,16 @@ + +You start contemplating on the thought of building your first Minecraft house, an important landmark no doubt. +What sort of house will it be? Will it be well hidden? Will it be fancy? + +More important, what part of the house should I build first? + +The roof? + +The walls? + +Should I prepare the terrain first? + +Maybe start with doors and windows? + +You have a lot of decision making ahead of you... + diff --git a/english/you-are-in-minecraft/minecraft.md b/english/you-are-in-minecraft/minecraft.md index 86c6be4db9..d585bb5d3d 100644 --- a/english/you-are-in-minecraft/minecraft.md +++ b/english/you-are-in-minecraft/minecraft.md @@ -23,6 +23,8 @@ HxM7nBml4E4_W9eLNTDyp4X9nZX7IcNuDO3a7KC7p_A) [Sing a song?](../sing-song/sing.md) +[Build a House?](house/house.md) + [Eat ALL the marshmallows!](../count-the-marshmellows/eat-all-the-marshmellows/eat-all-the-marshmellows.md) [Dig down?](dig_down/dig_down.md) From 2f57e3341d9903225c31646bb85e4c120f3a82d0 Mon Sep 17 00:00:00 2001 From: Mateus Queiroz Correia Date: Thu, 8 Dec 2016 18:02:32 -0200 Subject: [PATCH 4943/5486] adding a path to study English using Duolingo --- .../colabora/fork/comdiferencas/diff/pull/descobre/descobrir.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 portugues/colabora/fork/comdiferencas/diff/pull/descobre/descobrir.md diff --git a/portugues/colabora/fork/comdiferencas/diff/pull/descobre/descobrir.md b/portugues/colabora/fork/comdiferencas/diff/pull/descobre/descobrir.md new file mode 100644 index 0000000000..8ab7c80c70 --- /dev/null +++ b/portugues/colabora/fork/comdiferencas/diff/pull/descobre/descobrir.md @@ -0,0 +1,2 @@ +Você começa a estudar no duolingo inglês e lembra que não aprofundou na época de escola pois teve dificuldade em +responder uma importante questão em uma prova "TO BE OR NOT TO BE, THAT IS THE QUESTION" \ No newline at end of file From 5ab6296deee44efa1f79d409ee24ae6b5a97537e Mon Sep 17 00:00:00 2001 From: Mateus Queiroz Correia Date: Thu, 8 Dec 2016 18:06:22 -0200 Subject: [PATCH 4944/5486] adding a path to study English using Duolingo --- portugues/colabora/fork/comdiferencas/diff/pull/pull.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues/colabora/fork/comdiferencas/diff/pull/pull.md b/portugues/colabora/fork/comdiferencas/diff/pull/pull.md index 048958a203..afe45d4df7 100644 --- a/portugues/colabora/fork/comdiferencas/diff/pull/pull.md +++ b/portugues/colabora/fork/comdiferencas/diff/pull/pull.md @@ -4,4 +4,6 @@ O pull request não foi aceito pois havia um erro ortográfico em um comentário [Desisto. Essa vida de Github não é pra mim.](desisto/desistir.md) -[Corrijo os erros ortográficos com a ajuda de um amigo que manja de inglês e reenvio.](reenvio/reenviar.md) \ No newline at end of file +[Corrijo os erros ortográficos com a ajuda de um amigo que manja de inglês e reenvio.](reenvio/reenviar.md) + +[Descobre, logo agora que aprendeu o bash, vai ter que retomar os estudos de inglês no duolingo] (descobre/descobrir.md) From 9d597f7d05510a8e4b3b79ead1f0c6934dedc4d9 Mon Sep 17 00:00:00 2001 From: twiw49 Date: Sat, 10 Dec 2016 00:37:44 +0900 Subject: [PATCH 4945/5486] ADD mashmellow to instagram --- korean/instagram/insta.md | 1 + 1 file changed, 1 insertion(+) diff --git a/korean/instagram/insta.md b/korean/instagram/insta.md index c17b1f4e16..a8ab3d49ac 100644 --- a/korean/instagram/insta.md +++ b/korean/instagram/insta.md @@ -12,3 +12,4 @@ [카페 성수에 간다](../cafe-sungsu/cafe-sungsu.md) +[마시멜로를 먹는다](../eating-walls/eating-marshmallows.md) From 14ed4681f1f81470addd81320ef12deb9b5c8164 Mon Sep 17 00:00:00 2001 From: Csaba Nemeth Date: Fri, 9 Dec 2016 14:43:33 -0500 Subject: [PATCH 4946/5486] Add gyogyszer link --- hungarian/boszorkany/mezeskalacs-haz.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hungarian/boszorkany/mezeskalacs-haz.md b/hungarian/boszorkany/mezeskalacs-haz.md index b7fe2da0f3..4491f5c021 100644 --- a/hungarian/boszorkany/mezeskalacs-haz.md +++ b/hungarian/boszorkany/mezeskalacs-haz.md @@ -1,3 +1,6 @@ Korbenezek es minden jel arra utal, hogy a boszorkany mezeskalacs hazaban vagyok: Minden edessegbol van, Jancsi es Juliska ott vannak egy ketrecben... hirtelen elfog a szorongas: lehet, hogy amnezias boszorkany vagyok? +Mit teszel? + +[Megnezem bevettem-e a tengapi gyogyszert](gyogyszer/gyogyszer.md) From 7186a782b1dadff1de1f9f485c3600966fb15d35 Mon Sep 17 00:00:00 2001 From: Csaba Nemeth Date: Fri, 9 Dec 2016 14:48:32 -0500 Subject: [PATCH 4947/5486] Add pills check page --- hungarian/boszorkany/gyogyszer/gyogyszer.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 hungarian/boszorkany/gyogyszer/gyogyszer.md diff --git a/hungarian/boszorkany/gyogyszer/gyogyszer.md b/hungarian/boszorkany/gyogyszer/gyogyszer.md new file mode 100644 index 0000000000..a72b20828a --- /dev/null +++ b/hungarian/boszorkany/gyogyszer/gyogyszer.md @@ -0,0 +1,3 @@ +Megnezem, hogy az ejjeli szekrenyen ott van-e a gyogyszeres uveg. +Igen, ott van, de a gyogyszer helyett malyvacukor darabok vannak benne. + From a55ed7dc8bf720efae701e107bd0b0f92cc4dd08 Mon Sep 17 00:00:00 2001 From: Siva Praneeth Date: Fri, 9 Dec 2016 18:50:51 -0600 Subject: [PATCH 4948/5486] QuickDraw-AI Pictionary --- english/quick_draw/AI_Pictionary.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/quick_draw/AI_Pictionary.txt diff --git a/english/quick_draw/AI_Pictionary.txt b/english/quick_draw/AI_Pictionary.txt new file mode 100644 index 0000000000..c5c69bd0e9 --- /dev/null +++ b/english/quick_draw/AI_Pictionary.txt @@ -0,0 +1,5 @@ +It is a lot of fun playing pictionary with a bunch of friends. + +But have you ever played pictionary with a computer, where you draw sketches and computer predicts your sketch within 20 seconds? + +If not, play with this awesome [AI](www.quickdraw.google.com) built by guys at Google. \ No newline at end of file From 3dc435ff3f2129f20d47dbfa3c4d1a050f8947de Mon Sep 17 00:00:00 2001 From: Siva Praneeth Date: Fri, 9 Dec 2016 18:57:18 -0600 Subject: [PATCH 4949/5486] Change file extension to .md --- english/quick_draw/AI_Pictionary.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 english/quick_draw/AI_Pictionary.md diff --git a/english/quick_draw/AI_Pictionary.md b/english/quick_draw/AI_Pictionary.md new file mode 100644 index 0000000000..c5c69bd0e9 --- /dev/null +++ b/english/quick_draw/AI_Pictionary.md @@ -0,0 +1,5 @@ +It is a lot of fun playing pictionary with a bunch of friends. + +But have you ever played pictionary with a computer, where you draw sketches and computer predicts your sketch within 20 seconds? + +If not, play with this awesome [AI](www.quickdraw.google.com) built by guys at Google. \ No newline at end of file From a11ffda0fd18665f31d38ea7158dccb4a4225f2e Mon Sep 17 00:00:00 2001 From: Siva Praneeth Date: Fri, 9 Dec 2016 18:59:01 -0600 Subject: [PATCH 4950/5486] Delete .txt file --- english/quick_draw/AI_Pictionary.txt | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 english/quick_draw/AI_Pictionary.txt diff --git a/english/quick_draw/AI_Pictionary.txt b/english/quick_draw/AI_Pictionary.txt deleted file mode 100644 index c5c69bd0e9..0000000000 --- a/english/quick_draw/AI_Pictionary.txt +++ /dev/null @@ -1,5 +0,0 @@ -It is a lot of fun playing pictionary with a bunch of friends. - -But have you ever played pictionary with a computer, where you draw sketches and computer predicts your sketch within 20 seconds? - -If not, play with this awesome [AI](www.quickdraw.google.com) built by guys at Google. \ No newline at end of file From 2d1062094511608f93803aa96280499d5a516f6c Mon Sep 17 00:00:00 2001 From: Siva Praneeth Date: Fri, 9 Dec 2016 19:03:11 -0600 Subject: [PATCH 4951/5486] Reduce line length to less than 120 characters and remove spaces between the lines --- english/quick_draw/AI_Pictionary.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/english/quick_draw/AI_Pictionary.md b/english/quick_draw/AI_Pictionary.md index c5c69bd0e9..c010460be4 100644 --- a/english/quick_draw/AI_Pictionary.md +++ b/english/quick_draw/AI_Pictionary.md @@ -1,5 +1,3 @@ It is a lot of fun playing pictionary with a bunch of friends. - -But have you ever played pictionary with a computer, where you draw sketches and computer predicts your sketch within 20 seconds? - +But have you ever played pictionary with a computer, where you draw sketches and computer predicts your sketch? If not, play with this awesome [AI](www.quickdraw.google.com) built by guys at Google. \ No newline at end of file From 7f29e954dcfedb25ac3750367635ecc8b13180d0 Mon Sep 17 00:00:00 2001 From: Siva Praneeth Date: Fri, 9 Dec 2016 19:08:55 -0600 Subject: [PATCH 4952/5486] Reach AI Pictionary through Happy Robot --- english/happy-robot/happy-robot.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/happy-robot/happy-robot.md b/english/happy-robot/happy-robot.md index fcb01d8ce9..fa1b8833a0 100644 --- a/english/happy-robot/happy-robot.md +++ b/english/happy-robot/happy-robot.md @@ -9,3 +9,5 @@ He jumps up, but before he rushes out the door he... a) Grabs a [weapon](./robot-help/robot-weapon.md), or b) Enjoys some [refreshments](./robot-refresh/refreshments.md). + +c) Plays some [pictionary](./english/quick_draw/AI_Pictionary.md) with an AI. \ No newline at end of file From 28ad067204535793d34ddb5df72b8847a3b7c044 Mon Sep 17 00:00:00 2001 From: Siva Praneeth Date: Fri, 9 Dec 2016 19:11:24 -0600 Subject: [PATCH 4953/5486] Correct the web link to pictionary --- english/quick_draw/AI_Pictionary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/quick_draw/AI_Pictionary.md b/english/quick_draw/AI_Pictionary.md index c010460be4..56f4dffc8c 100644 --- a/english/quick_draw/AI_Pictionary.md +++ b/english/quick_draw/AI_Pictionary.md @@ -1,3 +1,3 @@ It is a lot of fun playing pictionary with a bunch of friends. But have you ever played pictionary with a computer, where you draw sketches and computer predicts your sketch? -If not, play with this awesome [AI](www.quickdraw.google.com) built by guys at Google. \ No newline at end of file +If not, play with this awesome [AI](https://quickdraw.withgoogle.com/) built by guys at Google. \ No newline at end of file From d1b18e8b9977a06356be2dfda60f6a08d8120ae9 Mon Sep 17 00:00:00 2001 From: Siva Praneeth Date: Fri, 9 Dec 2016 19:18:40 -0600 Subject: [PATCH 4954/5486] Change the syntax of relative link --- english/happy-robot/happy-robot.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/happy-robot/happy-robot.md b/english/happy-robot/happy-robot.md index fa1b8833a0..9a0b470ca4 100644 --- a/english/happy-robot/happy-robot.md +++ b/english/happy-robot/happy-robot.md @@ -10,4 +10,4 @@ a) Grabs a [weapon](./robot-help/robot-weapon.md), or b) Enjoys some [refreshments](./robot-refresh/refreshments.md). -c) Plays some [pictionary](./english/quick_draw/AI_Pictionary.md) with an AI. \ No newline at end of file +c) Plays some [pictionary](../quick_draw/AI_Pictionary.md) with an AI. \ No newline at end of file From 3f6ee3be30c1ee06ce93c92fbf0105714688c9ef Mon Sep 17 00:00:00 2001 From: Aaa Bbb Date: Sat, 10 Dec 2016 12:42:13 +0200 Subject: [PATCH 4955/5486] Add files story --- english/marshmallow.md | 2 + english/see-files/files.md | 561 +++++++++++++++++++++++++++++++++++++ 2 files changed, 563 insertions(+) create mode 100644 english/see-files/files.md diff --git a/english/marshmallow.md b/english/marshmallow.md index e5ea0ed7b0..fb257e349b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1197,3 +1197,5 @@ Like football or soccer(as many others call it)? Must Watch [The_Greatest_Battle_Ever] (https://www.youtube.com/watch?v=KyHDZqp2ThU) Some other guy beat me to it. Too lazy [here](lazy/lazy.md) + +What if I told that all this is just a bunch of [files](see-files/files.md) diff --git a/english/see-files/files.md b/english/see-files/files.md new file mode 100644 index 0000000000..059e968856 --- /dev/null +++ b/english/see-files/files.md @@ -0,0 +1,561 @@ +Look below! + +Ok, let's go [back](../marshmallow.md) + +-------------------- +00_8_Agent +00-Life-of-this-world +132-days-ago +2spooky +33hours +adipose +advice_from_mother +alchemy +amnesia +analyze +android +android-v6 +angry_prince +animal +apj +appear-on-falkors-back +art +ask-a-cat +ask-on-quora +ask-to-alice +avatar +backinstraitjacket +bake-cookies +bamboo +batman +batmetal +BayesTheorem +bear +bear-story +becomemarshmallow +beer-brewer +be-octodog +better-call-saul +birdistheword +bird-salvation +bite-the-marshmallow +blackout +blah-balh +bob-barker +Booyah +bored +boston +bounce +breakfast +breaking-bad +build-a-car +burn-down-the-house +buy-gameboy +call-a-doctor +call-a-random-number +call-spirit +call-these-guys +camelot +Canada +candyland +can-i-get-you-a-ladder +captain +Carl +cat-symphony-trouble +cave +chai +challenge-marshmellow-to-rock-off +change-of-career +characters +check-phone +check-your-phone +chess +chief-history +chillmusic +chocolateOrSleep +chocopool +choose-pill +cliff +climbing +code +code-my-life +coffee +combatration +commit-suicide +Computer-Man +computer-window +concert +continueded +copper-plate-man +cosmological_argument +count-the-marshmellows +cowardice +cowboy +craving +crazy +cricket +cricket-rules +crochet +crouch-dragon +cry-out-for-daddy +cry-out-for-mommy +cuddle-the-cat +cycling-backwards +cycling-forwards +dance +dance-randomly +day-dream +DC-Comics +dentist +destiny +devastated_greatness +dig +dimensions +discover-new-genres +disney +divergence +DKER +dog_finger +dog-person +dog-sled +door +doug-adams +dragons +dream +dream_in_dream +drink +drink-beer +drool +duck +dysentry +eat-farts +eating-walls +eatmarshmallow +eat-panipuri +eat-rainbows +elves-and-shoemaker +end +enjoy-DreamRide +enjoysoda +Enter-a-dim-reality +escape-to-the-wilderness +ethical-reason +exercise +existential-dread +experience +explore-outside +few-good-men +fight-out +fill-sock +find-bird +find-exit +fizzbin +flan +flann-o-brien +flight +fly-falcon +forest +forest-canopy +fork-jam +fork-knots +fortune +free-lunch +friendly-person +froboznia +front_end +Full Metal Alchemist +fus-roh-dah +gameofthrones +garden +get-away +get-better-at-english +get-out-of-system +getsLost +ghost-buster +ghostbusters +git +git_disadvantage +glimmering-portal +glowing-pants +go-back-to-sleep +goosebumps +goto +great-tasmanian-adventure +grue +gtd +Guangwu +guitar +hallway +hammertime +hands +Happy +happy-robot +health +heffalump +hermione +hide +hit-song +hogsmeade +hold_the_door +hope +hospital_bed +hot-chocolate-time +hr-discussion +hulk +humbleservant +hungry +hungry_prince +hurdles +hypnotized-to-forget +ice-cream +ice_monster +I'm-batman +impossible +impossible-adventure +impossible-girl +incantation-forrest +inception +indigestion +in-matrix +interact +interrogate-pixie +interstellar_quote +investigate-glowing-pants +invite-friends +iot +ironman +ismail-quora-profile +is-this-a-dream +it-was-me +jacket +jazz-guitar +joke +joshua_24_15 +jump +jumpsuit +justice-league +karaoke +keep_looking_for_chocolate +khudi +kicktheman +kill-rats +kindness +kitchen +knit +knock +kumar +lamping +lasso-hand +lawn-mower +lazy +learn_japanese +learn-mandarin +lego +lego-world +licked-cat +LifePuzzle +lighter +light-fire +light-hand +lightsaber +lightsoff +light-up +light-up2 +liquid +lisp +listen_white_stripes +little-me +london +love +lovecraftian +LoveLive +love-udacity +lucidream +luke-skywalker +lunge-for-the-lighter +macgyver +mad +madness +magic +magic2 +magicaladventure +magic-device +make_changes_GitHub +make-friends +malaria +ManU +marshmallow-attack +marshmallow-jello-o-salad +marshmallow.md +marshmallow-taffy +marshmallow-wizard +master +math +matrix +meaning +meaning-of-life +mean-stack +meditate +meditation +meltmarshmallows +memories +mermaid +mermaid2 +millenium-falcon +mirror +Monty-Python +more_cowbell +Motivate +motor_oil +move-on +movie-ripoffs +moving +mspa +mushroom +music +my-adventure +mysterious-pool +mysterydoor +my-story +myStory +naruto +nature-of-identity +necklace +nepal +netflix +never_ended +new-exit +new-movie +new_warriors_record +new-years +new-york +nfl-chiefs +NGE +night-night +ninja +north +nothing +no-worries +oil-field +olaf +ominous-voice +onepiece +open-door +order-pizza +or-do-you +other-castle +outta-here +paint-a-picture +painting +paint-it-black +papa-louie +persistent +philosophy +pick-up-blowtorch +pikachu +pinch +pipboy +pizza +play-dota2 +play-geometrydash +play-gta5 +play-music +play-some-cricket +play-with-dog +plow +plugh +plummet +pokemon +pokemon-go +poke-the-wall +polar-bear +polar-bear-attack +ponder +pork +powerball +present-tense +prison +private-party-island +procrastinate +prostate +punch +punch-snape +quick_draw +quit +quit-your-job +quote-of-the-day +raccoon-corner +Raiders +read-a-book +real-life +real-marsh-mallow +reddit +red-pill +references +remember-you-are-superman +remenisce +resurrect +revolution +rib-eye +rickson-armbar +robofriend +robot-army +robot-rap-battle +roof-top +rubik-cube +rug +run +run_out_the_door +Rupinderpal +sandwich +sanfran +say-my-name +scarab +schrodinger-cat +scream +search_for_chocolate +search-for-gluten +see-files +see-smore-options +self-control +selfie +set_up_a_small_goal +shiny-device +shotgun +showerthoughts +shrooms +shrunk +sing +singapore +singing +sing-song +skydiving +slapa-da-bass +slap-it-hard +slap-response +sleep +sleep-and-wake +smores +snowman +snuffbox +soar +Soccer +soccerfan +social-media +sonic-screwdriver +sounds-familiar +stairs +stan +stapler +starcraft2 +starfish +stargate +stargazing +start-dancing +star-wars-spoiler +staypuft +stay-with-animate-marshmallow +steelers +stopbernie +strange-room +sturgis2015 +submarine +super-man +super-powers +surprise! +swami-vivekananda +sweat +swim +take-a-nap +take-malt +take-more-nap +take-nap +take_tums +talk-to-finn +talk_to_neighbour +tea +tell-mother +test-driven-development-rules +texas +TheEpicSax +the-nights +thesituation +the-slayer +TheSpider +think +this-story-is-about-you +thunder-carrots +tickle +time-machine +time-travel +timeTunnel +tintumon-mallu +toasted +to-be-a-snowman +torch +tos +total-war +train-ride +transform +trapezoid +travel-destinations +triathlon +trip-to-Taiwan +Trip-Yourself-Hue +tunnel +turing-test +tweet-it +tying +udacity +underwater +unending-story +unicorn +universe-test +unnatural_door +untrustworthy +use-powers +use-the-fork-luke +utilize-wand +vacuum +valarmorghulis +vaporization +vegas +virtualreality +visit-hagrid +voldemort +vomit +vote-the-president +wake-up +walrus +wand +warm-up +warning-heed +warning-ignore +warriors-game +watch-alien +watch-barca +watched +watch-honey-badger +watch-movie +watch-star-wars +water-dreams +weed +wikipedia +wine +working +work-out +world-war-marshmallows +write-a-hiku +write-a-symphony +yearg +yell-at-snape +yellow-baby-buggy-bumpers +yoga +you-are-in-minecraft +young +your-dog +youre-fine +yuha +zoo +zork +zuluquest From 201c868039effa6907d3b67b1cf7c2cd458e6036 Mon Sep 17 00:00:00 2001 From: Aaa Bbb Date: Sat, 10 Dec 2016 12:51:38 +0200 Subject: [PATCH 4956/5486] Reduce filelist to be less than 100 lines --- english/see-files/files.md | 533 +------------------------------------ 1 file changed, 2 insertions(+), 531 deletions(-) diff --git a/english/see-files/files.md b/english/see-files/files.md index 059e968856..e74fcf3785 100644 --- a/english/see-files/files.md +++ b/english/see-files/files.md @@ -28,534 +28,5 @@ backinstraitjacket bake-cookies bamboo batman -batmetal -BayesTheorem -bear -bear-story -becomemarshmallow -beer-brewer -be-octodog -better-call-saul -birdistheword -bird-salvation -bite-the-marshmallow -blackout -blah-balh -bob-barker -Booyah -bored -boston -bounce -breakfast -breaking-bad -build-a-car -burn-down-the-house -buy-gameboy -call-a-doctor -call-a-random-number -call-spirit -call-these-guys -camelot -Canada -candyland -can-i-get-you-a-ladder -captain -Carl -cat-symphony-trouble -cave -chai -challenge-marshmellow-to-rock-off -change-of-career -characters -check-phone -check-your-phone -chess -chief-history -chillmusic -chocolateOrSleep -chocopool -choose-pill -cliff -climbing -code -code-my-life -coffee -combatration -commit-suicide -Computer-Man -computer-window -concert -continueded -copper-plate-man -cosmological_argument -count-the-marshmellows -cowardice -cowboy -craving -crazy -cricket -cricket-rules -crochet -crouch-dragon -cry-out-for-daddy -cry-out-for-mommy -cuddle-the-cat -cycling-backwards -cycling-forwards -dance -dance-randomly -day-dream -DC-Comics -dentist -destiny -devastated_greatness -dig -dimensions -discover-new-genres -disney -divergence -DKER -dog_finger -dog-person -dog-sled -door -doug-adams -dragons -dream -dream_in_dream -drink -drink-beer -drool -duck -dysentry -eat-farts -eating-walls -eatmarshmallow -eat-panipuri -eat-rainbows -elves-and-shoemaker -end -enjoy-DreamRide -enjoysoda -Enter-a-dim-reality -escape-to-the-wilderness -ethical-reason -exercise -existential-dread -experience -explore-outside -few-good-men -fight-out -fill-sock -find-bird -find-exit -fizzbin -flan -flann-o-brien -flight -fly-falcon -forest -forest-canopy -fork-jam -fork-knots -fortune -free-lunch -friendly-person -froboznia -front_end -Full Metal Alchemist -fus-roh-dah -gameofthrones -garden -get-away -get-better-at-english -get-out-of-system -getsLost -ghost-buster -ghostbusters -git -git_disadvantage -glimmering-portal -glowing-pants -go-back-to-sleep -goosebumps -goto -great-tasmanian-adventure -grue -gtd -Guangwu -guitar -hallway -hammertime -hands -Happy -happy-robot -health -heffalump -hermione -hide -hit-song -hogsmeade -hold_the_door -hope -hospital_bed -hot-chocolate-time -hr-discussion -hulk -humbleservant -hungry -hungry_prince -hurdles -hypnotized-to-forget -ice-cream -ice_monster -I'm-batman -impossible -impossible-adventure -impossible-girl -incantation-forrest -inception -indigestion -in-matrix -interact -interrogate-pixie -interstellar_quote -investigate-glowing-pants -invite-friends -iot -ironman -ismail-quora-profile -is-this-a-dream -it-was-me -jacket -jazz-guitar -joke -joshua_24_15 -jump -jumpsuit -justice-league -karaoke -keep_looking_for_chocolate -khudi -kicktheman -kill-rats -kindness -kitchen -knit -knock -kumar -lamping -lasso-hand -lawn-mower -lazy -learn_japanese -learn-mandarin -lego -lego-world -licked-cat -LifePuzzle -lighter -light-fire -light-hand -lightsaber -lightsoff -light-up -light-up2 -liquid -lisp -listen_white_stripes -little-me -london -love -lovecraftian -LoveLive -love-udacity -lucidream -luke-skywalker -lunge-for-the-lighter -macgyver -mad -madness -magic -magic2 -magicaladventure -magic-device -make_changes_GitHub -make-friends -malaria -ManU -marshmallow-attack -marshmallow-jello-o-salad -marshmallow.md -marshmallow-taffy -marshmallow-wizard -master -math -matrix -meaning -meaning-of-life -mean-stack -meditate -meditation -meltmarshmallows -memories -mermaid -mermaid2 -millenium-falcon -mirror -Monty-Python -more_cowbell -Motivate -motor_oil -move-on -movie-ripoffs -moving -mspa -mushroom -music -my-adventure -mysterious-pool -mysterydoor -my-story -myStory -naruto -nature-of-identity -necklace -nepal -netflix -never_ended -new-exit -new-movie -new_warriors_record -new-years -new-york -nfl-chiefs -NGE -night-night -ninja -north -nothing -no-worries -oil-field -olaf -ominous-voice -onepiece -open-door -order-pizza -or-do-you -other-castle -outta-here -paint-a-picture -painting -paint-it-black -papa-louie -persistent -philosophy -pick-up-blowtorch -pikachu -pinch -pipboy -pizza -play-dota2 -play-geometrydash -play-gta5 -play-music -play-some-cricket -play-with-dog -plow -plugh -plummet -pokemon -pokemon-go -poke-the-wall -polar-bear -polar-bear-attack -ponder -pork -powerball -present-tense -prison -private-party-island -procrastinate -prostate -punch -punch-snape -quick_draw -quit -quit-your-job -quote-of-the-day -raccoon-corner -Raiders -read-a-book -real-life -real-marsh-mallow -reddit -red-pill -references -remember-you-are-superman -remenisce -resurrect -revolution -rib-eye -rickson-armbar -robofriend -robot-army -robot-rap-battle -roof-top -rubik-cube -rug -run -run_out_the_door -Rupinderpal -sandwich -sanfran -say-my-name -scarab -schrodinger-cat -scream -search_for_chocolate -search-for-gluten -see-files -see-smore-options -self-control -selfie -set_up_a_small_goal -shiny-device -shotgun -showerthoughts -shrooms -shrunk -sing -singapore -singing -sing-song -skydiving -slapa-da-bass -slap-it-hard -slap-response -sleep -sleep-and-wake -smores -snowman -snuffbox -soar -Soccer -soccerfan -social-media -sonic-screwdriver -sounds-familiar -stairs -stan -stapler -starcraft2 -starfish -stargate -stargazing -start-dancing -star-wars-spoiler -staypuft -stay-with-animate-marshmallow -steelers -stopbernie -strange-room -sturgis2015 -submarine -super-man -super-powers -surprise! -swami-vivekananda -sweat -swim -take-a-nap -take-malt -take-more-nap -take-nap -take_tums -talk-to-finn -talk_to_neighbour -tea -tell-mother -test-driven-development-rules -texas -TheEpicSax -the-nights -thesituation -the-slayer -TheSpider -think -this-story-is-about-you -thunder-carrots -tickle -time-machine -time-travel -timeTunnel -tintumon-mallu -toasted -to-be-a-snowman -torch -tos -total-war -train-ride -transform -trapezoid -travel-destinations -triathlon -trip-to-Taiwan -Trip-Yourself-Hue -tunnel -turing-test -tweet-it -tying -udacity -underwater -unending-story -unicorn -universe-test -unnatural_door -untrustworthy -use-powers -use-the-fork-luke -utilize-wand -vacuum -valarmorghulis -vaporization -vegas -virtualreality -visit-hagrid -voldemort -vomit -vote-the-president -wake-up -walrus -wand -warm-up -warning-heed -warning-ignore -warriors-game -watch-alien -watch-barca -watched -watch-honey-badger -watch-movie -watch-star-wars -water-dreams -weed -wikipedia -wine -working -work-out -world-war-marshmallows -write-a-hiku -write-a-symphony -yearg -yell-at-snape -yellow-baby-buggy-bumpers -yoga -you-are-in-minecraft -young -your-dog -youre-fine -yuha -zoo -zork -zuluquest + +And many many more... From 98d890974aa7f31bb27d36facd340ac3a84de085 Mon Sep 17 00:00:00 2001 From: Siva Praneeth Date: Sat, 10 Dec 2016 19:37:36 -0600 Subject: [PATCH 4957/5486] Add a line to the story --- english/quick_draw/AI_Pictionary.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/quick_draw/AI_Pictionary.md b/english/quick_draw/AI_Pictionary.md index 56f4dffc8c..ed3894f3ab 100644 --- a/english/quick_draw/AI_Pictionary.md +++ b/english/quick_draw/AI_Pictionary.md @@ -1,3 +1,5 @@ It is a lot of fun playing pictionary with a bunch of friends. But have you ever played pictionary with a computer, where you draw sketches and computer predicts your sketch? -If not, play with this awesome [AI](https://quickdraw.withgoogle.com/) built by guys at Google. \ No newline at end of file +If not, play with this awesome [AI](https://quickdraw.withgoogle.com/) built by guys at Google. + +Warning! This will make you a fan of AI. \ No newline at end of file From c7b43ef2e3c965096a26ae9b751742bf0d341389 Mon Sep 17 00:00:00 2001 From: Kelli Davis Date: Sun, 11 Dec 2016 00:58:11 -0500 Subject: [PATCH 4958/5486] Add option to morph into Snake Guy --- english/forest/drag/drag.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/forest/drag/drag.md b/english/forest/drag/drag.md index 9fe17aa050..f0da132081 100644 --- a/english/forest/drag/drag.md +++ b/english/forest/drag/drag.md @@ -5,3 +5,5 @@ their venom. You die in even more pain than you were before. [Move toward the light](light/light.md) [Stay, don't move](stay/stay.md) + +[Morph into a hero named Snake Guy](snake/snake-guy.md) From 15ca144ccf2fa73dfaabb0b8501d424af7cc2881 Mon Sep 17 00:00:00 2001 From: Kelli Davis Date: Sun, 11 Dec 2016 01:03:00 -0500 Subject: [PATCH 4959/5486] Create Snake story --- english/forest/drag/snake/snake-guy.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 english/forest/drag/snake/snake-guy.md diff --git a/english/forest/drag/snake/snake-guy.md b/english/forest/drag/snake/snake-guy.md new file mode 100644 index 0000000000..4317544d10 --- /dev/null +++ b/english/forest/drag/snake/snake-guy.md @@ -0,0 +1,6 @@ +The snake bites have given you super powers and now you can harness the powers +of rattlesnakes. You feel more alive than ever. Now you can leave the forest for +good. Uh - oh!! You look down and realize that you have no legs. Where are your arms?? +For some reason you can't stop shaking your tail. Now your body is full of scales. You hear +someone coming. You try to yell for help, but all you can do is make a hissing sound. The person +is yelling. You can tell they are scared. Here they come! Quick! What do you do? \ No newline at end of file From c4b738850f309b2430abf63cd2c6f92750499554 Mon Sep 17 00:00:00 2001 From: Kelli Davis Date: Sun, 11 Dec 2016 01:05:14 -0500 Subject: [PATCH 4960/5486] Add story options to snake --- english/forest/drag/snake/snake-guy.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/forest/drag/snake/snake-guy.md b/english/forest/drag/snake/snake-guy.md index 4317544d10..6a2005f833 100644 --- a/english/forest/drag/snake/snake-guy.md +++ b/english/forest/drag/snake/snake-guy.md @@ -3,4 +3,10 @@ of rattlesnakes. You feel more alive than ever. Now you can leave the forest for good. Uh - oh!! You look down and realize that you have no legs. Where are your arms?? For some reason you can't stop shaking your tail. Now your body is full of scales. You hear someone coming. You try to yell for help, but all you can do is make a hissing sound. The person -is yelling. You can tell they are scared. Here they come! Quick! What do you do? \ No newline at end of file +is yelling. You can tell they are scared. Here they come! Quick! What do you do? + +[Slither in their direction, hoping they will help] + +[Slither down a hole to safety] + +[Eat them to keep them quiet] \ No newline at end of file From 2862319454ec83028e2cdf4a94cd5843b9b6bcad Mon Sep 17 00:00:00 2001 From: Kelli Davis Date: Sun, 11 Dec 2016 01:09:49 -0500 Subject: [PATCH 4961/5486] Add option to slither for help and create help story --- english/forest/drag/snake/slither/help.md | 6 ++++++ english/forest/drag/snake/snake-guy.md | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 english/forest/drag/snake/slither/help.md diff --git a/english/forest/drag/snake/slither/help.md b/english/forest/drag/snake/slither/help.md new file mode 100644 index 0000000000..9e868ceaaa --- /dev/null +++ b/english/forest/drag/snake/slither/help.md @@ -0,0 +1,6 @@ +You slither towards towards the person, hissing for help. Turns out it +was a young snake charmer looking for a friend. He plays his music and +hynotizes you into doing a little dance for him. While in the trance, you +slowly grow your limbs back and your scales fall off. The charmer is pleasantly +surprised because he just finished online charm school and didn't know that he +could turn snakes into people. \ No newline at end of file diff --git a/english/forest/drag/snake/snake-guy.md b/english/forest/drag/snake/snake-guy.md index 6a2005f833..e2c66c361c 100644 --- a/english/forest/drag/snake/snake-guy.md +++ b/english/forest/drag/snake/snake-guy.md @@ -5,7 +5,7 @@ For some reason you can't stop shaking your tail. Now your body is full of scale someone coming. You try to yell for help, but all you can do is make a hissing sound. The person is yelling. You can tell they are scared. Here they come! Quick! What do you do? -[Slither in their direction, hoping they will help] +[Slither in their direction, hoping they will help](slither/help.md) [Slither down a hole to safety] From 426442a1d57810208c93642f17066d80933e6ca6 Mon Sep 17 00:00:00 2001 From: Kelli Davis Date: Sun, 11 Dec 2016 01:24:19 -0500 Subject: [PATCH 4962/5486] Add option to slither to safety and create safety story --- english/forest/drag/snake/slither/safety.md | 4 ++++ english/forest/drag/snake/snake-guy.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 english/forest/drag/snake/slither/safety.md diff --git a/english/forest/drag/snake/slither/safety.md b/english/forest/drag/snake/slither/safety.md new file mode 100644 index 0000000000..162fa206af --- /dev/null +++ b/english/forest/drag/snake/slither/safety.md @@ -0,0 +1,4 @@ +You slither down a nice, warm, tight, wet hole. You feel very safe here. +As you get deeper down the hole, a small light gets bigger and bigger. +You slither faster to get to the other side so you can see where this +wondrous light is coming from. \ No newline at end of file diff --git a/english/forest/drag/snake/snake-guy.md b/english/forest/drag/snake/snake-guy.md index e2c66c361c..a479e27cad 100644 --- a/english/forest/drag/snake/snake-guy.md +++ b/english/forest/drag/snake/snake-guy.md @@ -7,6 +7,6 @@ is yelling. You can tell they are scared. Here they come! Quick! What do you do? [Slither in their direction, hoping they will help](slither/help.md) -[Slither down a hole to safety] +[Slither down a hole to safety](slither/safety.md) [Eat them to keep them quiet] \ No newline at end of file From 6bb1db05aa4f5d78b9a89e38d81581f63fd98eb3 Mon Sep 17 00:00:00 2001 From: Kelli Davis Date: Sun, 11 Dec 2016 01:33:23 -0500 Subject: [PATCH 4963/5486] Add option to eat someone and create eat story --- english/forest/drag/snake/eat/eat.md | 2 ++ english/forest/drag/snake/snake-guy.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 english/forest/drag/snake/eat/eat.md diff --git a/english/forest/drag/snake/eat/eat.md b/english/forest/drag/snake/eat/eat.md new file mode 100644 index 0000000000..ec34a46ecb --- /dev/null +++ b/english/forest/drag/snake/eat/eat.md @@ -0,0 +1,2 @@ +You lunge at the man wrapping your body around his torso. Then +you swallow him whole, realizing he tastes better than you thought. \ No newline at end of file diff --git a/english/forest/drag/snake/snake-guy.md b/english/forest/drag/snake/snake-guy.md index a479e27cad..8b1e057c22 100644 --- a/english/forest/drag/snake/snake-guy.md +++ b/english/forest/drag/snake/snake-guy.md @@ -9,4 +9,4 @@ is yelling. You can tell they are scared. Here they come! Quick! What do you do? [Slither down a hole to safety](slither/safety.md) -[Eat them to keep them quiet] \ No newline at end of file +[Eat them to keep them quiet](eat/eat.md) \ No newline at end of file From ed493d03184e1995780afdb9449dbcc66308e18c Mon Sep 17 00:00:00 2001 From: Kelli Davis Date: Sun, 11 Dec 2016 02:26:09 -0500 Subject: [PATCH 4964/5486] Make changes to directory so safety story can have its own "page" --- english/forest/drag/snake/{slither => safety}/safety.md | 0 english/forest/drag/snake/snake-guy.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename english/forest/drag/snake/{slither => safety}/safety.md (100%) diff --git a/english/forest/drag/snake/slither/safety.md b/english/forest/drag/snake/safety/safety.md similarity index 100% rename from english/forest/drag/snake/slither/safety.md rename to english/forest/drag/snake/safety/safety.md diff --git a/english/forest/drag/snake/snake-guy.md b/english/forest/drag/snake/snake-guy.md index 8b1e057c22..71296ca2b3 100644 --- a/english/forest/drag/snake/snake-guy.md +++ b/english/forest/drag/snake/snake-guy.md @@ -7,6 +7,6 @@ is yelling. You can tell they are scared. Here they come! Quick! What do you do? [Slither in their direction, hoping they will help](slither/help.md) -[Slither down a hole to safety](slither/safety.md) +[Slither down a hole to safety](safety/safety.md) [Eat them to keep them quiet](eat/eat.md) \ No newline at end of file From 59258deb7b7d820743264ebd22d027e46165f86b Mon Sep 17 00:00:00 2001 From: Matteo Date: Sun, 11 Dec 2016 12:19:27 +0100 Subject: [PATCH 4965/5486] feat: added node "apri-cassetto" in italian story --- .../esamina-stanza/esamina-fogli/apri-cassetto/apri-cassetto.md | 1 + .../esamina-stanza/esamina-fogli/esamina-fogli.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/apri-cassetto/apri-cassetto.md diff --git a/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/apri-cassetto/apri-cassetto.md b/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/apri-cassetto/apri-cassetto.md new file mode 100644 index 0000000000..84b29a1786 --- /dev/null +++ b/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/apri-cassetto/apri-cassetto.md @@ -0,0 +1 @@ +Inserisci l'oggetto triangolare nella fessura del cassetto, che si apre. diff --git a/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md b/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md index 5538ca6749..c23674c96a 100644 --- a/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md +++ b/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md @@ -1,3 +1,5 @@ I fogli sono tutti bianchi. Mentre osservi la scrivania noti un cassetto. Curiosamente, al posto della maniglia è presente solo un intaglio di forma triangolare. + +[Inserisci l'oggetto triangolare nella fessura del cassetto](apri-cassetti/apri-cassetto.md) \ No newline at end of file From f5737e3b650f32bd72bc8d66af463e3e68323829 Mon Sep 17 00:00:00 2001 From: Matteo Date: Sun, 11 Dec 2016 12:21:53 +0100 Subject: [PATCH 4966/5486] fix: typo in link path --- .../esamina-stanza/esamina-fogli/esamina-fogli.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md b/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md index c23674c96a..77be997a9d 100644 --- a/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md +++ b/Italian/scappare/scopri-oggetto/esamina-stanza/esamina-fogli/esamina-fogli.md @@ -2,4 +2,4 @@ I fogli sono tutti bianchi. Mentre osservi la scrivania noti un cassetto. Curiosamente, al posto della maniglia è presente solo un intaglio di forma triangolare. -[Inserisci l'oggetto triangolare nella fessura del cassetto](apri-cassetti/apri-cassetto.md) \ No newline at end of file +[Inserisci l'oggetto triangolare nella fessura del cassetto](apri-cassetto/apri-cassetto.md) \ No newline at end of file From 95f8bc43791c995074b9f8facc71900bb4227c32 Mon Sep 17 00:00:00 2001 From: evandersar Date: Sun, 11 Dec 2016 15:11:41 +0200 Subject: [PATCH 4967/5486] dr who part --- ukrainian/dr-who/dr-who.md | 5 +++++ ukrainian/marshmallow.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 ukrainian/dr-who/dr-who.md diff --git a/ukrainian/dr-who/dr-who.md b/ukrainian/dr-who/dr-who.md new file mode 100644 index 0000000000..bdfede3696 --- /dev/null +++ b/ukrainian/dr-who/dr-who.md @@ -0,0 +1,5 @@ +Це інша планета або інопланетний літальний апарат, отже з мобілочки однозначно можна викликати доктора Хто - саме це я і зроблю. + +Доктор обов'язково знайде зв*язок між цими предметами, визволить мене з кімнати і врятує планету... + +Але після повернення додому хтось сторонній зайшов у кабінку доктора і намагаючись просто подзвонити перемістився у [кімнату](../marshmallow.md) \ No newline at end of file diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index d6a7db590e..38a2b7bfc8 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -6,6 +6,8 @@ Що будете робити? +[Зателефоную доктору Хто](dr-who/dr-who.md) + [Розженуся та спробую прорватися крізь одну з стін](break-through-wall/break-through-wall.md) [Спробую стіну на смак](eat-wall/eat-wall.md) From 6f857c279b0472fb8da5fb68047c7a57ec997972 Mon Sep 17 00:00:00 2001 From: evandersar Date: Sun, 11 Dec 2016 15:18:16 +0200 Subject: [PATCH 4968/5486] break text in more lines --- ukrainian/dr-who/dr-who.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ukrainian/dr-who/dr-who.md b/ukrainian/dr-who/dr-who.md index bdfede3696..ab24ce3b7b 100644 --- a/ukrainian/dr-who/dr-who.md +++ b/ukrainian/dr-who/dr-who.md @@ -1,5 +1,7 @@ -Це інша планета або інопланетний літальний апарат, отже з мобілочки однозначно можна викликати доктора Хто - саме це я і зроблю. +Це інша планета або інопланетний літальний апарат, +отже з мобілочки однозначно можна викликати доктора Хто - саме це я і зроблю. -Доктор обов'язково знайде зв*язок між цими предметами, визволить мене з кімнати і врятує планету... +Доктор обов'язково знайде зв*язок між цими предметами, визволить мене з кімнати і врятує планету. -Але після повернення додому хтось сторонній зайшов у кабінку доктора і намагаючись просто подзвонити перемістився у [кімнату](../marshmallow.md) \ No newline at end of file +Але після повернення додому хтось сторонній зайшов у кабінку доктора +і намагаючись просто подзвонити перемістився у [кімнату](../marshmallow.md) \ No newline at end of file From b83482c19e6fd6500da693bc82bf13de876791ac Mon Sep 17 00:00:00 2001 From: Egor Khober Date: Sun, 11 Dec 2016 21:29:46 +0300 Subject: [PATCH 4969/5486] add continuation to girl cry story --- russian/garden-horror/garden-horror.md | 2 ++ russian/girlfriend-pinch-you/call_girlfriend/call.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 russian/garden-horror/garden-horror.md diff --git a/russian/garden-horror/garden-horror.md b/russian/garden-horror/garden-horror.md new file mode 100644 index 0000000000..a2a3c7e615 --- /dev/null +++ b/russian/garden-horror/garden-horror.md @@ -0,0 +1,2 @@ +Вы бежите в сад и видите, как к девушке приближается толпа зомби в экипировки для американского футбола... +И только одинокий куст орешника не дает им до нее добраться. Но долго он не протянет diff --git a/russian/girlfriend-pinch-you/call_girlfriend/call.md b/russian/girlfriend-pinch-you/call_girlfriend/call.md index 6357fea0a7..3decae0148 100644 --- a/russian/girlfriend-pinch-you/call_girlfriend/call.md +++ b/russian/girlfriend-pinch-you/call_girlfriend/call.md @@ -1 +1,2 @@ Вы зовете вашу девушку, но никто не отвечает. Внезапно из сада раздается сдавленный крик ... +[побежать в сад](../../garden-horror/garden-horror.md) From e1ba305a97677b420b34af4f76bdbfcc4ee8ea7c Mon Sep 17 00:00:00 2001 From: Egor Khober Date: Sun, 11 Dec 2016 21:33:16 +0300 Subject: [PATCH 4970/5486] fix a typo --- russian/garden-horror/garden-horror.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/russian/garden-horror/garden-horror.md b/russian/garden-horror/garden-horror.md index a2a3c7e615..421555eddb 100644 --- a/russian/garden-horror/garden-horror.md +++ b/russian/garden-horror/garden-horror.md @@ -1,2 +1,2 @@ -Вы бежите в сад и видите, как к девушке приближается толпа зомби в экипировки для американского футбола... -И только одинокий куст орешника не дает им до нее добраться. Но долго он не протянет +Вы бежите в сад и видите, как к девушке приближается толпа зомби в экипировке для американского футбола. +И только одинокий куст орешника не дает им до нее добраться. Но долго он не протянет... From 7f32c4c8fc9e4dd31b920fdfcbf293464e0c798a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E6=96=87=E4=BD=B3?= Date: Mon, 12 Dec 2016 05:35:13 +0800 Subject: [PATCH 4971/5486] New story by Ywj --- Chinese/Javascript/js.mdown | 3 +++ "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 1 + 2 files changed, 4 insertions(+) create mode 100644 Chinese/Javascript/js.mdown diff --git a/Chinese/Javascript/js.mdown b/Chinese/Javascript/js.mdown new file mode 100644 index 0000000000..544a8b84f4 --- /dev/null +++ b/Chinese/Javascript/js.mdown @@ -0,0 +1,3 @@ +在Js开发的路上漫游。 + +突然看到了 [至尊宝](../ZZB/zzb.md) ? \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index b8f427d433..c133b23a5f 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -157,3 +157,4 @@ [你给我站住](stop/stop.md) [Gao Shen Me](gaoshenme/gaoshenme.md) +[Js不可告人的秘密](Javascript/js.md) From 08db28b20f886f70a58e90c11a90f5751b7daa44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E6=96=87=E4=BD=B3?= Date: Mon, 12 Dec 2016 05:42:27 +0800 Subject: [PATCH 4972/5486] New story from Ywj. --- Chinese/Javascript/{js.mdown => js.md} | 0 "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 1 + 2 files changed, 1 insertion(+) rename Chinese/Javascript/{js.mdown => js.md} (100%) diff --git a/Chinese/Javascript/js.mdown b/Chinese/Javascript/js.md similarity index 100% rename from Chinese/Javascript/js.mdown rename to Chinese/Javascript/js.md diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index c133b23a5f..e95152f99d 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -157,4 +157,5 @@ [你给我站住](stop/stop.md) [Gao Shen Me](gaoshenme/gaoshenme.md) + [Js不可告人的秘密](Javascript/js.md) From 9df9e15efc6326a9f1abee41573305ab602d2168 Mon Sep 17 00:00:00 2001 From: Zachary R Smithson Date: Sun, 11 Dec 2016 16:13:05 -0600 Subject: [PATCH 4973/5486] Add spanish link to love-udacity --- english/love-udacity/love-udacity.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/love-udacity/love-udacity.md b/english/love-udacity/love-udacity.md index 7b4b6f4880..cd5e4b1c45 100644 --- a/english/love-udacity/love-udacity.md +++ b/english/love-udacity/love-udacity.md @@ -15,3 +15,5 @@ But when things are getting really difficult, are you going to [quit](../quit/qu No you aren't going to quit. There are a ton of other resouces, just please keep trying!' Thanks alot Udacity for teaching me git and github + +[Udacity taught me Spanish](../../espanol/canudos.md) From e0937f444837380460beb3a24a95a590b2191d31 Mon Sep 17 00:00:00 2001 From: May Wong Date: Sun, 11 Dec 2016 17:18:32 -0500 Subject: [PATCH 4974/5486] Added jasmine to garden directory --- english/garden/choose.md | 4 ++++ english/garden/jasmine/jasmine.md | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 english/garden/jasmine/jasmine.md diff --git a/english/garden/choose.md b/english/garden/choose.md index 4aaa79c92d..7d2a54d3ab 100644 --- a/english/garden/choose.md +++ b/english/garden/choose.md @@ -14,3 +14,7 @@ You decide to choose: [Onions](onions/onions.md) +[Jasmine](jasmine/jasmine.md) + + + diff --git a/english/garden/jasmine/jasmine.md b/english/garden/jasmine/jasmine.md new file mode 100644 index 0000000000..0f071500f8 --- /dev/null +++ b/english/garden/jasmine/jasmine.md @@ -0,0 +1,4 @@ +Jasmine flowers are beautiful. + +I love the fragrance of jasmine. + From e2d9b199a55492c5d0dd39ae0ce2651e5b6398ba Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 17:06:55 -0800 Subject: [PATCH 4975/5486] chore: Updated marshmallow and furnished a hyperlink to my story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index f945a5e000..964b21607e 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1192,3 +1192,5 @@ Maybe this is a [dream](dream/dream.md)? Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? +Have you ever heard any unusual sounds when you're alone? They're not what you think. Get to know them [here](https://github.com/Drithin/create-your-own-adventure/tree/master/english/blackAndwhite/Chapter%201) + From 2995d91b9c2fd40941f94be08495d02af20ddbc1 Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 17:17:11 -0800 Subject: [PATCH 4976/5486] chore: edited the link from absolute to relative and made shorter lines as suggested --- english/marshmallow.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 964b21607e..df60440364 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1192,5 +1192,8 @@ Maybe this is a [dream](dream/dream.md)? Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? -Have you ever heard any unusual sounds when you're alone? They're not what you think. Get to know them [here](https://github.com/Drithin/create-your-own-adventure/tree/master/english/blackAndwhite/Chapter%201) +Have you ever heard any unusual sounds +when you're alone? +They're not what you think. +Get to know them [here](blackandWhiteShortStory.md) From 53530f5dc9f1a2b041258c8f79fe250f6515c01a Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 17:17:54 -0800 Subject: [PATCH 4977/5486] chore: Updated the relative link --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index df60440364..64ff2a3bfc 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1195,5 +1195,5 @@ Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Have you ever heard any unusual sounds when you're alone? They're not what you think. -Get to know them [here](blackandWhiteShortStory.md) +Get to know them [here](Chapter 1/blackandWhiteShortStory.md) From b0ea6095617f1b9b4456fc440721fb34036a9e80 Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 17:34:41 -0800 Subject: [PATCH 4978/5486] chore: modified the relative link --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 64ff2a3bfc..ee5b63cbb3 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1195,5 +1195,5 @@ Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Have you ever heard any unusual sounds when you're alone? They're not what you think. -Get to know them [here](Chapter 1/blackandWhiteShortStory.md) +Get to know them [here](blackAndwhite/Chapter 1/blackandWhiteShortStory.md) From 715558d2015700156b68c3c17d3e5dc424dc28c7 Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 17:35:26 -0800 Subject: [PATCH 4979/5486] chore: Correcting the relative link --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index ee5b63cbb3..df60440364 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1195,5 +1195,5 @@ Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Have you ever heard any unusual sounds when you're alone? They're not what you think. -Get to know them [here](blackAndwhite/Chapter 1/blackandWhiteShortStory.md) +Get to know them [here](blackandWhiteShortStory.md) From 6010d8112eca64a7e08f5cfc7faf238adacc12aa Mon Sep 17 00:00:00 2001 From: Drithin Date: Mon, 12 Dec 2016 17:41:05 -0800 Subject: [PATCH 4980/5486] chore: updated file directory structure --- .../{Chapter 1 => }/blackAndWhiteShortStoryChapter1.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/blackAndwhite/{Chapter 1 => }/blackAndWhiteShortStoryChapter1.md (100%) diff --git a/english/blackAndwhite/Chapter 1/blackAndWhiteShortStoryChapter1.md b/english/blackAndwhite/blackAndWhiteShortStoryChapter1.md similarity index 100% rename from english/blackAndwhite/Chapter 1/blackAndWhiteShortStoryChapter1.md rename to english/blackAndwhite/blackAndWhiteShortStoryChapter1.md From e71916c33a2eacbbf00068bf60e4e3bc59fc0a79 Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 17:42:52 -0800 Subject: [PATCH 4981/5486] chore: Corrected relative link as suggested by casey collab --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index df60440364..55f70f52e1 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1195,5 +1195,5 @@ Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Have you ever heard any unusual sounds when you're alone? They're not what you think. -Get to know them [here](blackandWhiteShortStory.md) +Get to know them [here](blackAndwhite/blackandWhiteShortStory.md) From dfbe94b799a6acd5358df2c99d5554bfc83f7827 Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 17:43:56 -0800 Subject: [PATCH 4982/5486] chore: another attempt to get the relative link right --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 55f70f52e1..d30307d537 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1195,5 +1195,5 @@ Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Have you ever heard any unusual sounds when you're alone? They're not what you think. -Get to know them [here](blackAndwhite/blackandWhiteShortStory.md) +Get to know them [here](./blackAndwhite/blackandWhiteShortStory.md) From 2711ac5b929e8b9c6bd4eef1b1061a4110e528d1 Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 17:47:29 -0800 Subject: [PATCH 4983/5486] chore: changed file directory structure, another try to get relative link right --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index d30307d537..e0463205e4 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1195,5 +1195,5 @@ Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Have you ever heard any unusual sounds when you're alone? They're not what you think. -Get to know them [here](./blackAndwhite/blackandWhiteShortStory.md) +Get to know them [here](/blackAndwhite/blackandwhite.md) From b23156a1b19b84bec43e89dec930010d12fcf35c Mon Sep 17 00:00:00 2001 From: Drithin Date: Mon, 12 Dec 2016 17:50:44 -0800 Subject: [PATCH 4984/5486] chore: updated file directory structure --- .../{blackAndWhiteShortStoryChapter1.md => blackAndwhite.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename english/blackAndwhite/{blackAndWhiteShortStoryChapter1.md => blackAndwhite.md} (100%) diff --git a/english/blackAndwhite/blackAndWhiteShortStoryChapter1.md b/english/blackAndwhite/blackAndwhite.md similarity index 100% rename from english/blackAndwhite/blackAndWhiteShortStoryChapter1.md rename to english/blackAndwhite/blackAndwhite.md From bdf473be71feb2f3915c7127476ec8798b8aba9d Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 17:51:53 -0800 Subject: [PATCH 4985/5486] chore: pushed the local changes to GitHub, another try to get relative link right --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index e0463205e4..905f08074d 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1195,5 +1195,5 @@ Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Have you ever heard any unusual sounds when you're alone? They're not what you think. -Get to know them [here](/blackAndwhite/blackandwhite.md) +Get to know them [here](blackAndwhite/blackandwhite.md) From eabc05142ac6568a4fc2c5475db79fc5cec97904 Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 17:52:23 -0800 Subject: [PATCH 4986/5486] chore: added . to relative path --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 905f08074d..4eee21663b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1195,5 +1195,5 @@ Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Have you ever heard any unusual sounds when you're alone? They're not what you think. -Get to know them [here](blackAndwhite/blackandwhite.md) +Get to know them [here](./blackAndwhite/blackandwhite.md) From 061fed5a6cb67ae94905158ef3e8593fefd53eef Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 18:37:03 -0800 Subject: [PATCH 4987/5486] chore: Read the repo readme and updated the file --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 4eee21663b..d1fe869cfc 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1195,5 +1195,5 @@ Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Have you ever heard any unusual sounds when you're alone? They're not what you think. -Get to know them [here](./blackAndwhite/blackandwhite.md) +Get to know them [here](english/blackAndwhite/blackandwhite.md) From 305869c9f62d0046e9e3868c028fabd069efe816 Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 18:39:19 -0800 Subject: [PATCH 4988/5486] chore: Updated a Typo --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index d1fe869cfc..f71bb580dc 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1195,5 +1195,5 @@ Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Have you ever heard any unusual sounds when you're alone? They're not what you think. -Get to know them [here](english/blackAndwhite/blackandwhite.md) +Get to know them [here](english/blackAndwhite/blackAndwhite.md) From 9c4670ffc5b10696b8e18ce592311f876e95dab3 Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Mon, 12 Dec 2016 18:40:28 -0800 Subject: [PATCH 4989/5486] chore: Another Update --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index f71bb580dc..54a680eba1 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1195,5 +1195,5 @@ Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Have you ever heard any unusual sounds when you're alone? They're not what you think. -Get to know them [here](english/blackAndwhite/blackAndwhite.md) +Get to know them [here](blackAndwhite/blackAndwhite.md) From 4f20b59499bfee03fcb4d81475dcd32e545eb9f0 Mon Sep 17 00:00:00 2001 From: Drithin Date: Tue, 13 Dec 2016 09:24:38 -0800 Subject: [PATCH 4990/5486] chore: added new element of fear to the protagonist --- english/blackAndwhite/blackAndwhite.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/blackAndwhite/blackAndwhite.md b/english/blackAndwhite/blackAndwhite.md index 28b1c1cd99..0a46fdf250 100644 --- a/english/blackAndwhite/blackAndwhite.md +++ b/english/blackAndwhite/blackAndwhite.md @@ -14,4 +14,6 @@ Along the direction of the wind, through the window next to the bed, A tall and wearing a leather hood and jeans, smirks seeing Christy tremble in fear. Christy sprints to the window to check if someone is hiding there and sees no one. Stranger drifts into the eternal dark -and leaves a puzzle behind for her. \ No newline at end of file +and leaves a puzzle behind for her. + +Christy's phone vibrates and drops off the table and Christy screams in dismay waking up the entire dorm. \ No newline at end of file From be6d9f69307dc913aad2eefcd421a2100032902c Mon Sep 17 00:00:00 2001 From: Michael Greenblatt Date: Tue, 13 Dec 2016 16:40:06 -0500 Subject: [PATCH 4991/5486] time travel to see Hamilton --- english/time-machine/time-machine.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/time-machine/time-machine.md b/english/time-machine/time-machine.md index 348d5b6464..b91cc8f0fd 100644 --- a/english/time-machine/time-machine.md +++ b/english/time-machine/time-machine.md @@ -9,5 +9,7 @@ Which part of the world, and what time you want to travel? And why? [You travel to 2017 and meet with an Apple Engineer](https://www.youtube.com/watch?v=-XSC_UG5_kU) +[You decide to travel back in time to visit a founding father of America](https://www.youtube.com/watch?v=t0aX8Jy1tME) + [You turn back](../marshmallow.md) From 5d0ffe11da1f551d59d8cae976bb47c85edb7d55 Mon Sep 17 00:00:00 2001 From: Anna Stein Date: Tue, 13 Dec 2016 17:11:24 -0500 Subject: [PATCH 4992/5486] Update advice_from_mother.md --- english/advice_from_mother/advice_from_mother.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/advice_from_mother/advice_from_mother.md b/english/advice_from_mother/advice_from_mother.md index 0dba37df24..861dfa7ea8 100644 --- a/english/advice_from_mother/advice_from_mother.md +++ b/english/advice_from_mother/advice_from_mother.md @@ -7,6 +7,8 @@ into the bar. just a random test -My mother also told me that I should eat my vegetables. Something about them being good for me. But at that time, I was at the age that I thought "If it doesn't taste good, it just can't be good for me". +My mother also told me that I should eat my vegetables. +Something about them being good for me. +But at that time, I was at the age that I thought "If it doesn't taste good, it just can't be good for me". "[She answers.](../bear-story/bear-story.md)" From 8ed43dbd074b9dc8dd13976e6a2520536994a92d Mon Sep 17 00:00:00 2001 From: Nilsberg Date: Wed, 14 Dec 2016 18:07:40 +0400 Subject: [PATCH 4993/5486] Add new story page --- russian/speak_to_neighbor/roof/roof.md | 1 + russian/speak_to_neighbor/speak_to_neighbor.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 russian/speak_to_neighbor/roof/roof.md diff --git a/russian/speak_to_neighbor/roof/roof.md b/russian/speak_to_neighbor/roof/roof.md new file mode 100644 index 0000000000..383d1fb13f --- /dev/null +++ b/russian/speak_to_neighbor/roof/roof.md @@ -0,0 +1 @@ +Надеюсь Карлсон дома, и он одолжит мне банку варенья, чтобы испечь торт. \ No newline at end of file diff --git a/russian/speak_to_neighbor/speak_to_neighbor.md b/russian/speak_to_neighbor/speak_to_neighbor.md index 5d0338d831..deb3a1471b 100644 --- a/russian/speak_to_neighbor/speak_to_neighbor.md +++ b/russian/speak_to_neighbor/speak_to_neighbor.md @@ -6,3 +6,4 @@ [бобро ведров](bobro/bobro.md) +Если я живу на последнем этаже, то я [всё равно поднимусь этажом выше](roof/roof.md) \ No newline at end of file From 8b1b1ab5c25f9aaa03165083f88067f525a644a4 Mon Sep 17 00:00:00 2001 From: Kev Comedia Date: Thu, 15 Dec 2016 21:58:09 +0800 Subject: [PATCH 4994/5486] Write story intro --- Philippines/salamat.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index 29d1e3faa9..78d43193ee 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -25,3 +25,5 @@ Pwede rin pumindot dito kung gusto mo ng maikling [joke] (joke/joke.md) Sumali sa usapan ng mga fan ni Bob Ong [Bob Ong] (bob-ong/bob-ong.md). Alamin kung gaano mo kakilala ang iyong idolo. Petsa: Nobyembre 17, 2016 + +Samahan si Benj sa kanyang paglalakbay! [Tara!](tara/tara.md) From 0111581d5040635844d642028cb9f82f0f4a8b79 Mon Sep 17 00:00:00 2001 From: Kev Comedia Date: Thu, 15 Dec 2016 22:05:47 +0800 Subject: [PATCH 4995/5486] Write beginning of story --- Philippines/tara/tara.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Philippines/tara/tara.md diff --git a/Philippines/tara/tara.md b/Philippines/tara/tara.md new file mode 100644 index 0000000000..10c5431734 --- /dev/null +++ b/Philippines/tara/tara.md @@ -0,0 +1,9 @@ +Nagising si Benj sa isang kwarto. Nagmasid siya. Tanaw ang isang saradong pinto +sa kanyang harapan. Sa likod niya'y may isang bintanang salamin. May mga +nakakalat din na gamit sa loob ng kwarto. + +[Buksan ang pinto.](pinto/pinto.md) + +[Sumilip sa bintana.](bintana/bintana.md) + +[Suriin ang mga gamit.](gamit/gamit.md) From 8aae1b31b5ebec7198eb067c632757d8575e8b8f Mon Sep 17 00:00:00 2001 From: Kev Comedia Date: Thu, 15 Dec 2016 22:11:36 +0800 Subject: [PATCH 4996/5486] Write door route story --- Philippines/tara/pinto/pinto.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Philippines/tara/pinto/pinto.md diff --git a/Philippines/tara/pinto/pinto.md b/Philippines/tara/pinto/pinto.md new file mode 100644 index 0000000000..931b9c7c5d --- /dev/null +++ b/Philippines/tara/pinto/pinto.md @@ -0,0 +1,3 @@ +Binuksan ni Benj ang pinto. Binati siya ng makapal na hamog, at sinapak siya +nito. Sumigaw si Benj, "ang kapal mo, batang hamog!" Tumakbo papalayo ang batang +hamog dahil sa takot. From 77c55ae30c8cfe27034f1c41294c1715b96afccd Mon Sep 17 00:00:00 2001 From: Kev Comedia Date: Thu, 15 Dec 2016 22:16:09 +0800 Subject: [PATCH 4997/5486] Write window route story --- Philippines/tara/bintana/bintana.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Philippines/tara/bintana/bintana.md diff --git a/Philippines/tara/bintana/bintana.md b/Philippines/tara/bintana/bintana.md new file mode 100644 index 0000000000..463c7f75ee --- /dev/null +++ b/Philippines/tara/bintana/bintana.md @@ -0,0 +1,4 @@ +Sumilip si Benj sa bintana, subalit wala siyang makita dahil makapal ang hamog +sa labas. Binuksan niya ang bintana't sumigaw, "ang kapal mong batang hamog ka! +Hindi ko makita yung labas! Umalis ka riyan!" Sa takot ng batang hamog, tumakbo +siya papalayo. From 0921d689c94d70f331aa643a7433d8665141eb55 Mon Sep 17 00:00:00 2001 From: Kev Comedia Date: Thu, 15 Dec 2016 22:18:09 +0800 Subject: [PATCH 4998/5486] Write item route story --- Philippines/tara/gamit/gamit.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Philippines/tara/gamit/gamit.md diff --git a/Philippines/tara/gamit/gamit.md b/Philippines/tara/gamit/gamit.md new file mode 100644 index 0000000000..2801bb7b92 --- /dev/null +++ b/Philippines/tara/gamit/gamit.md @@ -0,0 +1,2 @@ +Sinuri ni Benj ang mga nakakalat na gamit. Para saan kaya ang mga gamit na ito? +Alamin sa susunod na kabanata. From b08ec5bd84934c799c45aa23d910f6da3beed9f2 Mon Sep 17 00:00:00 2001 From: Arjaan Buijk Date: Thu, 15 Dec 2016 13:34:31 -0500 Subject: [PATCH 4999/5486] Add desire for dropjes besides stroopwafels --- dutch/watnu/watnu.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dutch/watnu/watnu.md b/dutch/watnu/watnu.md index 43cb8647b7..eaee36d713 100644 --- a/dutch/watnu/watnu.md +++ b/dutch/watnu/watnu.md @@ -1 +1,3 @@ -Wat een probleem! Hoe kan ik nu aan nieuwe stroopwafels komen? \ No newline at end of file +Wat een probleem! Hoe kan ik nu aan nieuwe stroopwafels komen? + +Stroopwafels.. Ja, ik will stroopwafels. En ook dropjes !!! \ No newline at end of file From b75b2173d2e63317d3c7d6bfe6e74994af428540 Mon Sep 17 00:00:00 2001 From: geomcmaster Date: Thu, 15 Dec 2016 19:58:34 -0600 Subject: [PATCH 5000/5486] Add option to get tiny and shoot through gap in soldier's shield --- .../crackers/cracker-soldiers-fight/cracker-soldiers-fight.md | 1 + .../crackers/cracker-soldiers-fight/get-tiny/get-tiny.md | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 english/sleep/crackers/cracker-soldiers-fight/get-tiny/get-tiny.md diff --git a/english/sleep/crackers/cracker-soldiers-fight/cracker-soldiers-fight.md b/english/sleep/crackers/cracker-soldiers-fight/cracker-soldiers-fight.md index 2023e001bb..b2c15d6c58 100644 --- a/english/sleep/crackers/cracker-soldiers-fight/cracker-soldiers-fight.md +++ b/english/sleep/crackers/cracker-soldiers-fight/cracker-soldiers-fight.md @@ -11,5 +11,6 @@ but in doing so, creates a gap in the shield. Do you... +[wish yourself really small to try and shoot through the gap in the shield](get-tiny/get-tiny.md) diff --git a/english/sleep/crackers/cracker-soldiers-fight/get-tiny/get-tiny.md b/english/sleep/crackers/cracker-soldiers-fight/get-tiny/get-tiny.md new file mode 100644 index 0000000000..71c9cc3a04 --- /dev/null +++ b/english/sleep/crackers/cracker-soldiers-fight/get-tiny/get-tiny.md @@ -0,0 +1,4 @@ +You find yourself shrinking more and more by the +second! At this rate, you may disappear altogether!! + +Do you... \ No newline at end of file From 18c61ef0c12704ebd7fcdffcf5c45b805ea85f31 Mon Sep 17 00:00:00 2001 From: brianrodriguez Date: Fri, 16 Dec 2016 16:45:35 -0800 Subject: [PATCH 5001/5486] Add realstic fan reaction to John Cena --- english/batman/batman.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index 8e8a091f66..f51eccefbf 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -42,4 +42,6 @@ Over my dead body!! Says Robin. John Cena comes busting through the wall and screams: -"I'm batman!" \ No newline at end of file +"I'm batman!" + +And in typical smark fashion, the crowd boos and chants "John Cena Sucks" \ No newline at end of file From 2a8c333f1021ecbe347ac019ae9aa6df29b900a6 Mon Sep 17 00:00:00 2001 From: jarickc Date: Fri, 16 Dec 2016 21:40:21 -0500 Subject: [PATCH 5002/5486] doc: Added a line to animals.md --- english/animal/animal.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/animal/animal.md b/english/animal/animal.md index b1b92d13df..cd4bfa2d4d 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -37,3 +37,5 @@ together, just because you chose to get a hedgehog, rather than a mouse!! My mother was a butterfly. Is that true? No it is not. +I love animals, they are delicious. + From c5391020d817422a36742266ebe8485bd34a0783 Mon Sep 17 00:00:00 2001 From: ririgriff Date: Sun, 18 Dec 2016 23:19:38 +0800 Subject: [PATCH 5003/5486] Update trump file --- english/vote-the-president/trump/trump.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/vote-the-president/trump/trump.md b/english/vote-the-president/trump/trump.md index 534134e536..bfc35a35b4 100644 --- a/english/vote-the-president/trump/trump.md +++ b/english/vote-the-president/trump/trump.md @@ -12,6 +12,8 @@ Let's make America bigly again with my tiny pair of hands! What have you done, you silly people! Commiserations from Australia :( +So now Russia runs America? + From 88f43e427d955044227a7e10974fbd35b645bc21 Mon Sep 17 00:00:00 2001 From: Olga Kochepasova Date: Sun, 18 Dec 2016 21:29:55 -0500 Subject: [PATCH 5004/5486] add: Add the end of the tunnel --- english/tunnel/continue/continue.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/tunnel/continue/continue.md b/english/tunnel/continue/continue.md index 42e623dba1..21df5277fd 100644 --- a/english/tunnel/continue/continue.md +++ b/english/tunnel/continue/continue.md @@ -1 +1,3 @@ As you keep pushing on through the dark tunnel you eventually start to see a soft glow begin to appear. + +[Run towards the light](tunel-end/tunel-end.md) From fee46d533e2b2a318870285aa3f907392474e5b1 Mon Sep 17 00:00:00 2001 From: Olga Kochepasova Date: Sun, 18 Dec 2016 21:34:30 -0500 Subject: [PATCH 5005/5486] docs: Upload the end of the tunnel choices --- english/tunnel/continue/tunnel-end/tunnel-end.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 english/tunnel/continue/tunnel-end/tunnel-end.md diff --git a/english/tunnel/continue/tunnel-end/tunnel-end.md b/english/tunnel/continue/tunnel-end/tunnel-end.md new file mode 100644 index 0000000000..e8048d5cbe --- /dev/null +++ b/english/tunnel/continue/tunnel-end/tunnel-end.md @@ -0,0 +1,3 @@ +As you run towards the soft glow you come to the tunnel's end. +You see before you train tracks and a softly glowing light on the wall facing you. +The train tracks extend to your left and right. Which way should you go? From 9a2da6ee861114a3512f2ffb905c794362214e89 Mon Sep 17 00:00:00 2001 From: Olga Kochepasova Date: Sun, 18 Dec 2016 21:42:33 -0500 Subject: [PATCH 5006/5486] change: Fix link on 'continue.md' --- english/tunnel/continue/continue.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/tunnel/continue/continue.md b/english/tunnel/continue/continue.md index 21df5277fd..0e71d799b0 100644 --- a/english/tunnel/continue/continue.md +++ b/english/tunnel/continue/continue.md @@ -1,3 +1,3 @@ As you keep pushing on through the dark tunnel you eventually start to see a soft glow begin to appear. -[Run towards the light](tunel-end/tunel-end.md) +[Run towards the light](tunel-end) From d5b5267065eefb5fcec4c63c8d1fb843265b00a8 Mon Sep 17 00:00:00 2001 From: Olga Kochepasova Date: Sun, 18 Dec 2016 21:43:59 -0500 Subject: [PATCH 5007/5486] change: Correct link in 'continue.md' --- english/tunnel/continue/continue.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/tunnel/continue/continue.md b/english/tunnel/continue/continue.md index 0e71d799b0..8b58395b5e 100644 --- a/english/tunnel/continue/continue.md +++ b/english/tunnel/continue/continue.md @@ -1,3 +1,3 @@ As you keep pushing on through the dark tunnel you eventually start to see a soft glow begin to appear. -[Run towards the light](tunel-end) +[Run towards the light](../tunnel-end/tunnel-end.md) From cd2af44fa0af55069a7621ee84f2e713012f9ef7 Mon Sep 17 00:00:00 2001 From: Olga Kochepasova Date: Sun, 18 Dec 2016 21:47:46 -0500 Subject: [PATCH 5008/5486] change: Fix a spelling mistake in 'continue.md' --- english/tunnel/continue/continue.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/tunnel/continue/continue.md b/english/tunnel/continue/continue.md index 8b58395b5e..1da4ffe6ae 100644 --- a/english/tunnel/continue/continue.md +++ b/english/tunnel/continue/continue.md @@ -1,3 +1,3 @@ As you keep pushing on through the dark tunnel you eventually start to see a soft glow begin to appear. -[Run towards the light](../tunnel-end/tunnel-end.md) +[Run towards the light](tunnel-end/tunnel-end.md) From 34c8f24b722a75408cffea31e4208fc1422f24a1 Mon Sep 17 00:00:00 2001 From: Olga Kochepasova Date: Sun, 18 Dec 2016 21:49:19 -0500 Subject: [PATCH 5009/5486] Update tunnel-end.md --- english/tunnel/continue/tunnel-end/tunnel-end.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/tunnel/continue/tunnel-end/tunnel-end.md b/english/tunnel/continue/tunnel-end/tunnel-end.md index e8048d5cbe..03ae39b72a 100644 --- a/english/tunnel/continue/tunnel-end/tunnel-end.md +++ b/english/tunnel/continue/tunnel-end/tunnel-end.md @@ -1,3 +1,4 @@ As you run towards the soft glow you come to the tunnel's end. You see before you train tracks and a softly glowing light on the wall facing you. + The train tracks extend to your left and right. Which way should you go? From 204b253b01d4080080e68024c55798b034ce3f1b Mon Sep 17 00:00:00 2001 From: Olga Kochepasova Date: Sun, 18 Dec 2016 21:50:15 -0500 Subject: [PATCH 5010/5486] Update tunnel-end.md --- english/tunnel/continue/tunnel-end/tunnel-end.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/tunnel/continue/tunnel-end/tunnel-end.md b/english/tunnel/continue/tunnel-end/tunnel-end.md index 03ae39b72a..4aaacb1c0d 100644 --- a/english/tunnel/continue/tunnel-end/tunnel-end.md +++ b/english/tunnel/continue/tunnel-end/tunnel-end.md @@ -1,4 +1,5 @@ As you run towards the soft glow you come to the tunnel's end. You see before you train tracks and a softly glowing light on the wall facing you. +The train tracks extend to your left and right. -The train tracks extend to your left and right. Which way should you go? +Which way should you go? From 960ec439da7ae43d476d3c0c8f7eaabdcd623a13 Mon Sep 17 00:00:00 2001 From: Olga Kochepasova Date: Mon, 19 Dec 2016 20:59:17 -0500 Subject: [PATCH 5011/5486] docs: Add options to turn left and right --- english/tunnel/continue/tunnel-end/turn-left/turn-left.md | 4 ++++ english/tunnel/continue/tunnel-end/turn-right/turn-right.md | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 english/tunnel/continue/tunnel-end/turn-left/turn-left.md create mode 100644 english/tunnel/continue/tunnel-end/turn-right/turn-right.md diff --git a/english/tunnel/continue/tunnel-end/turn-left/turn-left.md b/english/tunnel/continue/tunnel-end/turn-left/turn-left.md new file mode 100644 index 0000000000..ce2c75b264 --- /dev/null +++ b/english/tunnel/continue/tunnel-end/turn-left/turn-left.md @@ -0,0 +1,4 @@ +You turn left and follow the tracks. +After some time, you come across an empty subway station. +The only light comes from the sparsely placed lights in the tunnel with the +tracks. diff --git a/english/tunnel/continue/tunnel-end/turn-right/turn-right.md b/english/tunnel/continue/tunnel-end/turn-right/turn-right.md new file mode 100644 index 0000000000..8bd6317344 --- /dev/null +++ b/english/tunnel/continue/tunnel-end/turn-right/turn-right.md @@ -0,0 +1,4 @@ +You turn right and follow the tracks. +The soft light ebbs and grows, as you walk past the infreaquent lights placed +on the walls around you. +You keep walking, with no apparent end to this tunnel in sight. From 31db1039e9520184d3cd09111a4f19a4b3d8a6b8 Mon Sep 17 00:00:00 2001 From: Olga Kochepasova Date: Mon, 19 Dec 2016 21:00:35 -0500 Subject: [PATCH 5012/5486] add: Include options to turn left and right --- english/tunnel/continue/tunnel-end/tunnel-end.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/tunnel/continue/tunnel-end/tunnel-end.md b/english/tunnel/continue/tunnel-end/tunnel-end.md index 4aaacb1c0d..bf2af93275 100644 --- a/english/tunnel/continue/tunnel-end/tunnel-end.md +++ b/english/tunnel/continue/tunnel-end/tunnel-end.md @@ -3,3 +3,7 @@ You see before you train tracks and a softly glowing light on the wall facing yo The train tracks extend to your left and right. Which way should you go? + +[Left](turn-left/turn-left.md) + +[Right](turn-right/turn-right.md) From 3ddd53909d1309f25afa2cab31d10bea160fd2ad Mon Sep 17 00:00:00 2001 From: Gurvineet Date: Tue, 20 Dec 2016 10:08:02 -0500 Subject: [PATCH 5013/5486] Add another way of finding devices --- english/iot/intro.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/iot/intro.md b/english/iot/intro.md index 9f5ce2557e..9537b3d0ca 100644 --- a/english/iot/intro.md +++ b/english/iot/intro.md @@ -24,3 +24,4 @@ Hours rolled by and the plight didn't seem to change. Terror soon took over him. What will he do? [Will he scan the network for other devices?](../iot/scan-network/scan-network.md) +Yes that is one of the option what if he can sense the devices. One way of doing it can be using NFC! From a07ca6f421fbaf84970a6894c631a37b5d9c4d47 Mon Sep 17 00:00:00 2001 From: Filip Polsakiewicz Date: Tue, 20 Dec 2016 18:05:39 +0100 Subject: [PATCH 5014/5486] Im Raum befindet sich eine Tuer --- german/Korallen/Hoehle/Unterwasserstation/Tuer/Tuer.md | 5 +++++ .../Korallen/Hoehle/Unterwasserstation/unterwasserstation.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 german/Korallen/Hoehle/Unterwasserstation/Tuer/Tuer.md diff --git a/german/Korallen/Hoehle/Unterwasserstation/Tuer/Tuer.md b/german/Korallen/Hoehle/Unterwasserstation/Tuer/Tuer.md new file mode 100644 index 0000000000..6aafa87871 --- /dev/null +++ b/german/Korallen/Hoehle/Unterwasserstation/Tuer/Tuer.md @@ -0,0 +1,5 @@ +Der Raum ist groß und beleuchtet. Es scheint nur einen Ausgang zu geben und der ist mit einer großen Metalltür verschlossen. + +Was machen Sie? + +[Ihnen ist das alles nicht mehr Geheuer in dieser Hoehle, Sie schwimmen aus der Höhle](../../../Korallen.md) \ No newline at end of file diff --git a/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md b/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md index 3a7167617b..8e56587a11 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md +++ b/german/Korallen/Hoehle/Unterwasserstation/unterwasserstation.md @@ -3,3 +3,5 @@ Da Sie immer noch nicht geatmet haben und der Weg aus der Höle zu weit ist, sin zu tauchen. Als Sie aufgetaucht sind und nach Luft ringen sehen Sie vor sich auf einmal... [Eine Person](./Person/Person.md) + +[Einen großen Raum mit einer Tür](./Tuer/Tuer.md) From 50edfc17049ff37819268cc93f0f9e5acb294c3a Mon Sep 17 00:00:00 2001 From: Filip Polsakiewicz Date: Tue, 20 Dec 2016 18:08:53 +0100 Subject: [PATCH 5015/5486] Fix line length more than 120 characters --- german/Korallen/Hoehle/Unterwasserstation/Tuer/Tuer.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/Korallen/Hoehle/Unterwasserstation/Tuer/Tuer.md b/german/Korallen/Hoehle/Unterwasserstation/Tuer/Tuer.md index 6aafa87871..2d9deb0ece 100644 --- a/german/Korallen/Hoehle/Unterwasserstation/Tuer/Tuer.md +++ b/german/Korallen/Hoehle/Unterwasserstation/Tuer/Tuer.md @@ -1,4 +1,5 @@ -Der Raum ist groß und beleuchtet. Es scheint nur einen Ausgang zu geben und der ist mit einer großen Metalltür verschlossen. +Der Raum ist groß und beleuchtet. Es scheint nur einen Ausgang zu geben +und der ist mit einer großen Metalltür verschlossen. Was machen Sie? From 7d355bb9590cd0840085752ea3f33c44bf4ac597 Mon Sep 17 00:00:00 2001 From: Drithin Date: Tue, 20 Dec 2016 14:28:17 -0800 Subject: [PATCH 5016/5486] feat: Alone => it's a story of young woman who's alone --- english/alone/alone.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 english/alone/alone.md diff --git a/english/alone/alone.md b/english/alone/alone.md new file mode 100644 index 0000000000..a235fc3079 --- /dev/null +++ b/english/alone/alone.md @@ -0,0 +1,7 @@ +Alone + +Chapter 1: + +Kristy wakes up to the strange sounds from the walls of her dorm. + +She gets off the bed and carefully look around for anything suspicious. \ No newline at end of file From 5f95f394dc6986c7de501af7b1c305eecf854323 Mon Sep 17 00:00:00 2001 From: Mariusz Brzostek Date: Tue, 20 Dec 2016 23:30:22 +0100 Subject: [PATCH 5017/5486] add - za sklepem --- Polish/kadarka/kadarka.md | 4 +++- Polish/kadarka/zaSklepem/zaSklepem.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Polish/kadarka/zaSklepem/zaSklepem.md diff --git a/Polish/kadarka/kadarka.md b/Polish/kadarka/kadarka.md index 5a469a27d3..0ee6e80d71 100644 --- a/Polish/kadarka/kadarka.md +++ b/Polish/kadarka/kadarka.md @@ -5,7 +5,7 @@ dobre wino i przy okazji jest jego tyle, skrzatami i dobrymi duszkami, ktre zamieszkuj poblisk k, tam gdzie jest ujcie wody miejskiej. W pobliskiej Biedronce kupujesz Kadark. -Moe masz ochot przej si na poblisk k? +Moe masz ochot przej si na poblisk k? A moze lepiej za sklep? Co robisz? @@ -16,3 +16,5 @@ Co robisz? [Idziesz na k](laka/laka.md) +[Idziesz za sklep](zaSklepem/zaSklepem.md) + diff --git a/Polish/kadarka/zaSklepem/zaSklepem.md b/Polish/kadarka/zaSklepem/zaSklepem.md new file mode 100644 index 0000000000..eebdc3e578 --- /dev/null +++ b/Polish/kadarka/zaSklepem/zaSklepem.md @@ -0,0 +1 @@ +Tak jak myślałemś, impreza za sklepem to lepszy pomysł. Od teraz Ziutek i Mietek określają Cię mianem "BOSS". ;) \ No newline at end of file From 2c34f529e2a292358a7e77f7ce3b0a7dffea061a Mon Sep 17 00:00:00 2001 From: Drithin Chakravarthy Nellore Date: Tue, 20 Dec 2016 14:32:22 -0800 Subject: [PATCH 5018/5486] feat: Hyperlinked to my story --- english/marshmallow.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 1b859680ba..373ad3dc4b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1207,3 +1207,6 @@ Some other guy beat me to it. Too lazy [here](lazy/lazy.md) What if I told that all this is just a bunch of [files](see-files/files.md) >>>>>>> upstream/master + +A Story of Being Alone +Read it [here](alone/alone.md) From 1240a9670125c21d392285d3108a0907774a2fe1 Mon Sep 17 00:00:00 2001 From: Mariusz Brzostek Date: Tue, 20 Dec 2016 23:49:14 +0100 Subject: [PATCH 5019/5486] add zaSklepem --- Polish/kadarka/kadarka.md | 2 +- Polish/kadarka/zaSklepem/zaSklepem.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Polish/kadarka/kadarka.md b/Polish/kadarka/kadarka.md index 0ee6e80d71..fc99404083 100644 --- a/Polish/kadarka/kadarka.md +++ b/Polish/kadarka/kadarka.md @@ -5,7 +5,7 @@ dobre wino i przy okazji jest jego tyle, skrzatami i dobrymi duszkami, ktre zamieszkuj poblisk k, tam gdzie jest ujcie wody miejskiej. W pobliskiej Biedronce kupujesz Kadark. -Moe masz ochot przej si na poblisk k? A moze lepiej za sklep? +Moe masz ochot przej si na poblisk k? A moze lepiej impreza za sklep? Co robisz? diff --git a/Polish/kadarka/zaSklepem/zaSklepem.md b/Polish/kadarka/zaSklepem/zaSklepem.md index eebdc3e578..b5af4ade93 100644 --- a/Polish/kadarka/zaSklepem/zaSklepem.md +++ b/Polish/kadarka/zaSklepem/zaSklepem.md @@ -1 +1,2 @@ -Tak jak myślałemś, impreza za sklepem to lepszy pomysł. Od teraz Ziutek i Mietek określają Cię mianem "BOSS". ;) \ No newline at end of file +Tak jak myślałemś, impreza za sklepem to lepszy pomysł. +Od teraz Ziutek i Mietek określają Cię mianem "BOSS". ;)) \ No newline at end of file From 06c239f5cc9407922550dcb70e86b9c60170819f Mon Sep 17 00:00:00 2001 From: Mariusz Brzostek Date: Wed, 21 Dec 2016 00:00:00 +0100 Subject: [PATCH 5020/5486] mod za sklepem --- Polish/kadarka/kadarka.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polish/kadarka/kadarka.md b/Polish/kadarka/kadarka.md index fc99404083..4844737179 100644 --- a/Polish/kadarka/kadarka.md +++ b/Polish/kadarka/kadarka.md @@ -5,7 +5,7 @@ dobre wino i przy okazji jest jego tyle, skrzatami i dobrymi duszkami, ktre zamieszkuj poblisk k, tam gdzie jest ujcie wody miejskiej. W pobliskiej Biedronce kupujesz Kadark. -Moe masz ochot przej si na poblisk k? A moze lepiej impreza za sklep? +Moe masz ochot przej si na poblisk k? Co robisz? From 8c1fb09fb80ba1b888ec44b2d2394c35f841ccb3 Mon Sep 17 00:00:00 2001 From: Tanweer anwar Date: Wed, 21 Dec 2016 09:38:20 +0530 Subject: [PATCH 5021/5486] Add a few line --- english/android/marshmallow6.0.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/android/marshmallow6.0.md b/english/android/marshmallow6.0.md index 027a75d966..5050ed44a8 100644 --- a/english/android/marshmallow6.0.md +++ b/english/android/marshmallow6.0.md @@ -1,7 +1,10 @@ You are on the right way, son! +Just try the new android version marshmallow version 6.0 . + Check the updates for your smartphone now! + There are two options here: 1. You have an update, and won't read this further; From a2547e65a925b0e07c7d9357e529079c369c8637 Mon Sep 17 00:00:00 2001 From: Drithin Date: Wed, 21 Dec 2016 10:03:07 -0800 Subject: [PATCH 5022/5486] chore: Added new line to the story --- english/alone/alone.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index a235fc3079..9715b39688 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -4,4 +4,6 @@ Chapter 1: Kristy wakes up to the strange sounds from the walls of her dorm. -She gets off the bed and carefully look around for anything suspicious. \ No newline at end of file +She gets off the bed and carefully look around for anything suspicious. + +She senses a movement along the wall on the other side of the dorm room. \ No newline at end of file From 1625edf7f18792dfc5e9022fa128a95739404ab7 Mon Sep 17 00:00:00 2001 From: Drithin Date: Wed, 21 Dec 2016 10:23:09 -0800 Subject: [PATCH 5023/5486] chore: altering deletions in the story --- english/alone/alone.md | 1 - 1 file changed, 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 9715b39688..7cc0d7d468 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -5,5 +5,4 @@ Chapter 1: Kristy wakes up to the strange sounds from the walls of her dorm. She gets off the bed and carefully look around for anything suspicious. - She senses a movement along the wall on the other side of the dorm room. \ No newline at end of file From 9442dc9f4d4de50f5d3e72fd4d645d47d567f33f Mon Sep 17 00:00:00 2001 From: pham0030 Date: Thu, 22 Dec 2016 08:45:51 +0800 Subject: [PATCH 5024/5486] docs: continute story batman by pham0030 --- english/batman/batman.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/batman/batman.md b/english/batman/batman.md index f51eccefbf..cfc713a2f8 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -44,4 +44,6 @@ John Cena comes busting through the wall and screams: "I'm batman!" -And in typical smark fashion, the crowd boos and chants "John Cena Sucks" \ No newline at end of file +And in typical smark fashion, the crowd boos and chants "John Cena Sucks" + +Another shouts "Who is John Cena" From 1e7ff035dd48e0031fd0e05aa31eb325b89f321e Mon Sep 17 00:00:00 2001 From: Mike Alexandersen Date: Thu, 22 Dec 2016 09:00:23 +0800 Subject: [PATCH 5025/5486] =?UTF-8?q?Tilf=C3=B8j=20tre=20reactioner=20til?= =?UTF-8?q?=20bob.md=20=09modified:=20=20=20bob.md=20=09new=20file:=20=20?= =?UTF-8?q?=20stop/stop=5Fi=5Fvejkanten.md=20=09new=20file:=20=20=20vaekke?= =?UTF-8?q?/vaekke=5Fmanden.md=20=09new=20file:=20=20=20videre/koer=5Fog?= =?UTF-8?q?=5Flad=5Fsove.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- danish/haervejen/bobbob/bob.md | 9 +++++++++ danish/haervejen/bobbob/stop/stop_i_vejkanten.md | 1 + danish/haervejen/bobbob/vaekke/vaekke_manden.md | 1 + danish/haervejen/bobbob/videre/koer_og_lad_sove.md | 2 ++ 4 files changed, 13 insertions(+) create mode 100644 danish/haervejen/bobbob/stop/stop_i_vejkanten.md create mode 100644 danish/haervejen/bobbob/vaekke/vaekke_manden.md create mode 100644 danish/haervejen/bobbob/videre/koer_og_lad_sove.md diff --git a/danish/haervejen/bobbob/bob.md b/danish/haervejen/bobbob/bob.md index e502e81805..a5e13ac8b6 100644 --- a/danish/haervejen/bobbob/bob.md +++ b/danish/haervejen/bobbob/bob.md @@ -1,2 +1,11 @@ Nøglen sidder i tændingen, så du kører tilfreds afsted. Efter et stykke tid hører du en mumlen fra bagsædet. Du opdager bestyrtet at der ligger en høj, tynd og bleg mand og taler i søvne. Han siger "Bob bob bob". + +Hvad gør du? + +[Vækker manden](vaekke/vaekke_manden.md) + +[Stopper stille og roligt i vejkanten](stop/stop_i_vejkanten.md) + +[Kører videre og lader manden sove](videre/koer_og_lad_sove.md) + diff --git a/danish/haervejen/bobbob/stop/stop_i_vejkanten.md b/danish/haervejen/bobbob/stop/stop_i_vejkanten.md new file mode 100644 index 0000000000..f2f5ae48ce --- /dev/null +++ b/danish/haervejen/bobbob/stop/stop_i_vejkanten.md @@ -0,0 +1 @@ +Du stopper stille og roligt bilen i vejkanten. diff --git a/danish/haervejen/bobbob/vaekke/vaekke_manden.md b/danish/haervejen/bobbob/vaekke/vaekke_manden.md new file mode 100644 index 0000000000..4cb1daad75 --- /dev/null +++ b/danish/haervejen/bobbob/vaekke/vaekke_manden.md @@ -0,0 +1 @@ +Du siger, fast og højt, "Hallo, Her! Kan du høre mig?" diff --git a/danish/haervejen/bobbob/videre/koer_og_lad_sove.md b/danish/haervejen/bobbob/videre/koer_og_lad_sove.md new file mode 100644 index 0000000000..c9dc5d0b06 --- /dev/null +++ b/danish/haervejen/bobbob/videre/koer_og_lad_sove.md @@ -0,0 +1,2 @@ +Du vælger at køre videre, men kører forsigtigt så du ikke kommer til at vække manden på bagsædet. +Han siger fortsat "bob bob bob" af og til. From d911b070244cfbb70b01d7c9f4f209609b768df5 Mon Sep 17 00:00:00 2001 From: pham0030 Date: Thu, 22 Dec 2016 09:15:29 +0800 Subject: [PATCH 5026/5486] docs: continue story #2 pham0030 --- english/batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index cfc713a2f8..3e46bf956c 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -47,3 +47,5 @@ John Cena comes busting through the wall and screams: And in typical smark fashion, the crowd boos and chants "John Cena Sucks" Another shouts "Who is John Cena" + +"John Cena is batman ? Who is John Cena" From 089702d74f513220a69d4d40f8b1c97be1c8b8c0 Mon Sep 17 00:00:00 2001 From: pham0030 Date: Thu, 22 Dec 2016 09:18:14 +0800 Subject: [PATCH 5027/5486] docs: continue story line of batman pham0030 --- english/batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index cfc713a2f8..2f8a0538a1 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -47,3 +47,5 @@ John Cena comes busting through the wall and screams: And in typical smark fashion, the crowd boos and chants "John Cena Sucks" Another shouts "Who is John Cena" + +"Goodluck talking to John Cena" From e7fb4a5c1156745b4a49f594011cf1efdb01dd6b Mon Sep 17 00:00:00 2001 From: pham0030 Date: Thu, 22 Dec 2016 09:31:36 +0800 Subject: [PATCH 5028/5486] docs: final talking about batman and John Cena --- english/batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index 2f8a0538a1..5d1c5dc94f 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -49,3 +49,5 @@ And in typical smark fashion, the crowd boos and chants "John Cena Sucks" Another shouts "Who is John Cena" "Goodluck talking to John Cena" + +"This is the last time i am talking to John Cena" From 78932952e21775bc824036b302a68c6c42cfe502 Mon Sep 17 00:00:00 2001 From: Saurabh Raj Date: Thu, 22 Dec 2016 19:43:59 +0530 Subject: [PATCH 5029/5486] Get information on famous tv-series --- .../Game-of-thrones/Game-of-thrones.md | 11 +++++++++++ .../characters/cersei-lannister/cersei-lannister.md | 1 + .../Game-of-thrones/characters/characters.md | 9 +++++++++ .../daenerys-targaryen/daenerys-targaryen.md | 1 + .../Game-of-thrones/characters/jon-snow/jon-snow.md | 1 + .../characters/tyrion-lannister/tyrion-lannister.md | 1 + english/famous-tv-series/Game-of-thrones/imdb/imdb.md | 1 + .../Game-of-thrones/wikipedia/wikipedia.md | 1 + .../Sherlock-Holmes/Sherlock-Holmes.md | 7 +++++++ .../Sherlock-Holmes/characters/characters.md | 5 +++++ .../doctor-john-watson/doctor-john-watson.md | 1 + .../characters/sherlock-holmes/sherlock-holmes.md | 1 + english/famous-tv-series/Sherlock-Holmes/imdb/imdb.md | 1 + .../Sherlock-Holmes/wikipedia/wikipedia.md | 1 + english/famous-tv-series/famous-tv-series.md | 4 ++++ 15 files changed, 46 insertions(+) create mode 100644 english/famous-tv-series/Game-of-thrones/Game-of-thrones.md create mode 100644 english/famous-tv-series/Game-of-thrones/characters/cersei-lannister/cersei-lannister.md create mode 100644 english/famous-tv-series/Game-of-thrones/characters/characters.md create mode 100644 english/famous-tv-series/Game-of-thrones/characters/daenerys-targaryen/daenerys-targaryen.md create mode 100644 english/famous-tv-series/Game-of-thrones/characters/jon-snow/jon-snow.md create mode 100644 english/famous-tv-series/Game-of-thrones/characters/tyrion-lannister/tyrion-lannister.md create mode 100644 english/famous-tv-series/Game-of-thrones/imdb/imdb.md create mode 100644 english/famous-tv-series/Game-of-thrones/wikipedia/wikipedia.md create mode 100644 english/famous-tv-series/Sherlock-Holmes/Sherlock-Holmes.md create mode 100644 english/famous-tv-series/Sherlock-Holmes/characters/characters.md create mode 100644 english/famous-tv-series/Sherlock-Holmes/characters/doctor-john-watson/doctor-john-watson.md create mode 100644 english/famous-tv-series/Sherlock-Holmes/characters/sherlock-holmes/sherlock-holmes.md create mode 100644 english/famous-tv-series/Sherlock-Holmes/imdb/imdb.md create mode 100644 english/famous-tv-series/Sherlock-Holmes/wikipedia/wikipedia.md create mode 100644 english/famous-tv-series/famous-tv-series.md diff --git a/english/famous-tv-series/Game-of-thrones/Game-of-thrones.md b/english/famous-tv-series/Game-of-thrones/Game-of-thrones.md new file mode 100644 index 0000000000..de012261ab --- /dev/null +++ b/english/famous-tv-series/Game-of-thrones/Game-of-thrones.md @@ -0,0 +1,11 @@ +~A very popular TV-series based on the famouse book/novel title "A Song of ice and fire" + +~Mainly broadcasted on HBO-tv channel + +~Till year 2016, six seasons have been aired(each season has 10 episodes) + +~[checkout IMDB-page](imdb/imdb.md) + +~[click for info on main-chatacters](characters/characters.md) + +~[checkout Wikipedia-page](wikipedia/wikipedia.md) diff --git a/english/famous-tv-series/Game-of-thrones/characters/cersei-lannister/cersei-lannister.md b/english/famous-tv-series/Game-of-thrones/characters/cersei-lannister/cersei-lannister.md new file mode 100644 index 0000000000..6ed86432ec --- /dev/null +++ b/english/famous-tv-series/Game-of-thrones/characters/cersei-lannister/cersei-lannister.md @@ -0,0 +1 @@ +[click for more-info](https://en.wikipedia.org/wiki/Cersei_Lannister) diff --git a/english/famous-tv-series/Game-of-thrones/characters/characters.md b/english/famous-tv-series/Game-of-thrones/characters/characters.md new file mode 100644 index 0000000000..c2ddfa9384 --- /dev/null +++ b/english/famous-tv-series/Game-of-thrones/characters/characters.md @@ -0,0 +1,9 @@ +Main Characters + +1)Cersei Lannister [More Info](cersei-lannister/cersei-lannister.md) + +2)Daenerys Targaryen [More Info](daenerys-targaryen/daenerys-targaryen.md) + +3)Jon Snow [More Info](jon-snow/jon-snow.md) + +4)Tyrion Lannister [More Info](tyrion-lannister/tyrion-lannister.md) diff --git a/english/famous-tv-series/Game-of-thrones/characters/daenerys-targaryen/daenerys-targaryen.md b/english/famous-tv-series/Game-of-thrones/characters/daenerys-targaryen/daenerys-targaryen.md new file mode 100644 index 0000000000..554434e156 --- /dev/null +++ b/english/famous-tv-series/Game-of-thrones/characters/daenerys-targaryen/daenerys-targaryen.md @@ -0,0 +1 @@ +[click for more-info](https://en.wikipedia.org/wiki/Daenerys_Targaryen) diff --git a/english/famous-tv-series/Game-of-thrones/characters/jon-snow/jon-snow.md b/english/famous-tv-series/Game-of-thrones/characters/jon-snow/jon-snow.md new file mode 100644 index 0000000000..129e77304f --- /dev/null +++ b/english/famous-tv-series/Game-of-thrones/characters/jon-snow/jon-snow.md @@ -0,0 +1 @@ +[click for more info](https://en.wikipedia.org/wiki/Jon_Snow_(character)) diff --git a/english/famous-tv-series/Game-of-thrones/characters/tyrion-lannister/tyrion-lannister.md b/english/famous-tv-series/Game-of-thrones/characters/tyrion-lannister/tyrion-lannister.md new file mode 100644 index 0000000000..2cc5e3d2ee --- /dev/null +++ b/english/famous-tv-series/Game-of-thrones/characters/tyrion-lannister/tyrion-lannister.md @@ -0,0 +1 @@ +[click for more info](https://en.wikipedia.org/wiki/Tyrion_Lannister) diff --git a/english/famous-tv-series/Game-of-thrones/imdb/imdb.md b/english/famous-tv-series/Game-of-thrones/imdb/imdb.md new file mode 100644 index 0000000000..b3567466ef --- /dev/null +++ b/english/famous-tv-series/Game-of-thrones/imdb/imdb.md @@ -0,0 +1 @@ +[click for imdb-rating](http://www.imdb.com/title/tt0944947/) diff --git a/english/famous-tv-series/Game-of-thrones/wikipedia/wikipedia.md b/english/famous-tv-series/Game-of-thrones/wikipedia/wikipedia.md new file mode 100644 index 0000000000..c2b5fd2220 --- /dev/null +++ b/english/famous-tv-series/Game-of-thrones/wikipedia/wikipedia.md @@ -0,0 +1 @@ +[click here](https://en.wikipedia.org/wiki/Game_of_Thrones) diff --git a/english/famous-tv-series/Sherlock-Holmes/Sherlock-Holmes.md b/english/famous-tv-series/Sherlock-Holmes/Sherlock-Holmes.md new file mode 100644 index 0000000000..3d042ff745 --- /dev/null +++ b/english/famous-tv-series/Sherlock-Holmes/Sherlock-Holmes.md @@ -0,0 +1,7 @@ +A famous tv-series based on Sir Arthur Conan Doyle's Sherlock Holmes detective stories + +[Click for imdb-page](http://www.imdb.com/title/tt1475582/) + +[Click for info on characters](characters/characters.md) + +[Click for wikipedia-page](wikipedia/wikipedia.md) diff --git a/english/famous-tv-series/Sherlock-Holmes/characters/characters.md b/english/famous-tv-series/Sherlock-Holmes/characters/characters.md new file mode 100644 index 0000000000..00dd27732c --- /dev/null +++ b/english/famous-tv-series/Sherlock-Holmes/characters/characters.md @@ -0,0 +1,5 @@ +Main Characters: + +1)Sherlock Holmes [more info](sherlock-holmes/sherlock-holmes.md) + +2)Doctor John Watson [more info](doctor-john-watson/doctor-john-watson.md) diff --git a/english/famous-tv-series/Sherlock-Holmes/characters/doctor-john-watson/doctor-john-watson.md b/english/famous-tv-series/Sherlock-Holmes/characters/doctor-john-watson/doctor-john-watson.md new file mode 100644 index 0000000000..c56c87c46a --- /dev/null +++ b/english/famous-tv-series/Sherlock-Holmes/characters/doctor-john-watson/doctor-john-watson.md @@ -0,0 +1 @@ +[click for more-info](https://en.wikipedia.org/wiki/Doctor_Watson) diff --git a/english/famous-tv-series/Sherlock-Holmes/characters/sherlock-holmes/sherlock-holmes.md b/english/famous-tv-series/Sherlock-Holmes/characters/sherlock-holmes/sherlock-holmes.md new file mode 100644 index 0000000000..f449676a1b --- /dev/null +++ b/english/famous-tv-series/Sherlock-Holmes/characters/sherlock-holmes/sherlock-holmes.md @@ -0,0 +1 @@ +[click for more info](https://en.wikipedia.org/wiki/Benedict_Cumberbatch) diff --git a/english/famous-tv-series/Sherlock-Holmes/imdb/imdb.md b/english/famous-tv-series/Sherlock-Holmes/imdb/imdb.md new file mode 100644 index 0000000000..818d3a9c04 --- /dev/null +++ b/english/famous-tv-series/Sherlock-Holmes/imdb/imdb.md @@ -0,0 +1 @@ +[Click here](http://www.imdb.com/title/tt1475582/) diff --git a/english/famous-tv-series/Sherlock-Holmes/wikipedia/wikipedia.md b/english/famous-tv-series/Sherlock-Holmes/wikipedia/wikipedia.md new file mode 100644 index 0000000000..cda182fc50 --- /dev/null +++ b/english/famous-tv-series/Sherlock-Holmes/wikipedia/wikipedia.md @@ -0,0 +1 @@ +[click here](https://en.wikipedia.org/wiki/Sherlock_(TV_series)) diff --git a/english/famous-tv-series/famous-tv-series.md b/english/famous-tv-series/famous-tv-series.md new file mode 100644 index 0000000000..4abc962624 --- /dev/null +++ b/english/famous-tv-series/famous-tv-series.md @@ -0,0 +1,4 @@ +List of famous TV series: + 1) Game-of-thrones [click for more-info](Game-of-thrones/Game-of-thrones.md) + + 2) Sherlock Holmes [click for more-info](Sherlock-Holmes/Sherlock-Holmes.md) From 46c5c5409674770c378f06e5b26ee9c53e11ca6d Mon Sep 17 00:00:00 2001 From: saurabh raj Date: Thu, 22 Dec 2016 22:11:30 +0530 Subject: [PATCH 5030/5486] update sherlock-homes.md --- english/famous-tv-series/Sherlock-Holmes/Sherlock-Holmes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/famous-tv-series/Sherlock-Holmes/Sherlock-Holmes.md b/english/famous-tv-series/Sherlock-Holmes/Sherlock-Holmes.md index 3d042ff745..7c55b7ef01 100644 --- a/english/famous-tv-series/Sherlock-Holmes/Sherlock-Holmes.md +++ b/english/famous-tv-series/Sherlock-Holmes/Sherlock-Holmes.md @@ -1,6 +1,6 @@ A famous tv-series based on Sir Arthur Conan Doyle's Sherlock Holmes detective stories -[Click for imdb-page](http://www.imdb.com/title/tt1475582/) +[Click for imdb-page](imdb/imdb.md) [Click for info on characters](characters/characters.md) From 83fb5bff5ade7b690199c921cfdabb79d35b0969 Mon Sep 17 00:00:00 2001 From: saurabh raj Date: Thu, 22 Dec 2016 22:13:07 +0530 Subject: [PATCH 5031/5486] update famous-tv-series.md --- english/famous-tv-series/famous-tv-series.md | 1 - 1 file changed, 1 deletion(-) diff --git a/english/famous-tv-series/famous-tv-series.md b/english/famous-tv-series/famous-tv-series.md index 4abc962624..8b09b76f2c 100644 --- a/english/famous-tv-series/famous-tv-series.md +++ b/english/famous-tv-series/famous-tv-series.md @@ -1,4 +1,3 @@ -List of famous TV series: 1) Game-of-thrones [click for more-info](Game-of-thrones/Game-of-thrones.md) 2) Sherlock Holmes [click for more-info](Sherlock-Holmes/Sherlock-Holmes.md) From 4541f0ee7cfa685991d8c10fe2e46f7050b2844c Mon Sep 17 00:00:00 2001 From: saurabh raj Date: Thu, 22 Dec 2016 22:21:54 +0530 Subject: [PATCH 5032/5486] update famous-tv-series.md --- english/famous-tv-series/famous-tv-series.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/famous-tv-series/famous-tv-series.md b/english/famous-tv-series/famous-tv-series.md index 8b09b76f2c..f688c8f66c 100644 --- a/english/famous-tv-series/famous-tv-series.md +++ b/english/famous-tv-series/famous-tv-series.md @@ -1,3 +1,3 @@ - 1) Game-of-thrones [click for more-info](Game-of-thrones/Game-of-thrones.md) + 1) Game of thrones [click for more-info](Game-of-thrones/Game-of-thrones.md) 2) Sherlock Holmes [click for more-info](Sherlock-Holmes/Sherlock-Holmes.md) From c2d3163d8620d7661dd1cbfc51f61f736dea98ce Mon Sep 17 00:00:00 2001 From: saurabh raj Date: Thu, 22 Dec 2016 22:47:40 +0530 Subject: [PATCH 5033/5486] update mashmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 373ad3dc4b..ced369b16f 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1210,3 +1210,5 @@ What if I told that all this is just a bunch of [files](see-files/files.md) A Story of Being Alone Read it [here](alone/alone.md) +Information on some famous tv series +[read it here](famous-tv-series/famous-tv-series.md) From 9b842ac14fba3692ee05e98908562c9044a5be18 Mon Sep 17 00:00:00 2001 From: Drithin Date: Thu, 22 Dec 2016 09:26:14 -0800 Subject: [PATCH 5034/5486] chore: Added new action to the story --- english/alone/alone.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 7cc0d7d468..7824d8e381 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -5,4 +5,7 @@ Chapter 1: Kristy wakes up to the strange sounds from the walls of her dorm. She gets off the bed and carefully look around for anything suspicious. -She senses a movement along the wall on the other side of the dorm room. \ No newline at end of file + +She senses a movement along the wall on the other side of the dorm room. + +She sneaks next to the wall and tries to hear anyone on the other side of the wall. \ No newline at end of file From 3f5807f24b8eb84c1472103eb00997f1ed086a0d Mon Sep 17 00:00:00 2001 From: saurabh raj Date: Thu, 22 Dec 2016 23:03:50 +0530 Subject: [PATCH 5035/5486] update marshmallow.md --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index ced369b16f..b34762964b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1210,5 +1210,6 @@ What if I told that all this is just a bunch of [files](see-files/files.md) A Story of Being Alone Read it [here](alone/alone.md) + Information on some famous tv series -[read it here](famous-tv-series/famous-tv-series.md) +[click here](famous-tv-series/famous-tv-series.md) From 6cc918a83fdbb537c5fcd8dd3a364c955edfecba Mon Sep 17 00:00:00 2001 From: Sun Date: Fri, 23 Dec 2016 14:20:20 +0800 Subject: [PATCH 5036/5486] Add a stroy to my own adventure. --- Chinese/theforce/theforce.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Chinese/theforce/theforce.md diff --git a/Chinese/theforce/theforce.md b/Chinese/theforce/theforce.md new file mode 100644 index 0000000000..c554638765 --- /dev/null +++ b/Chinese/theforce/theforce.md @@ -0,0 +1 @@ +I am one with the force, \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index e95152f99d..b2c5b4d73e 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -2,6 +2,8 @@ 前端攻城狮一枚。这枚攻城狮做出了很多网页，比如： +[星際丹哥接龍](theforce/theforce.md) + [哟哟切克闹](yoyo/yoyo.md) [好大一朵棉花糖](cloud/cloud.md) From 00ee5abf6f0ab81b5e13b6fa195728d07ae82c3b Mon Sep 17 00:00:00 2001 From: Sun Date: Fri, 23 Dec 2016 14:44:48 +0800 Subject: [PATCH 5037/5486] Change placement in md file --- Chinese/theforce/theforce.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Chinese/theforce/theforce.md b/Chinese/theforce/theforce.md index c554638765..04a5909978 100644 --- a/Chinese/theforce/theforce.md +++ b/Chinese/theforce/theforce.md @@ -1 +1,2 @@ + I am one with the force, \ No newline at end of file From 5006e27d5a13010a411f5ca58349daeb0e831996 Mon Sep 17 00:00:00 2001 From: Drithin Date: Fri, 23 Dec 2016 08:08:15 -0800 Subject: [PATCH 5038/5486] chore: New Addition to the story --- english/alone/alone.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 7824d8e381..fbc6d9fd7d 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -8,4 +8,7 @@ She gets off the bed and carefully look around for anything suspicious. She senses a movement along the wall on the other side of the dorm room. -She sneaks next to the wall and tries to hear anyone on the other side of the wall. \ No newline at end of file +She sneaks next to the wall and tries to hear anyone on the other side of the wall. + +She hears someone gasping heavily and trembles in fear. + From 26781538fda53796ff12186500fe0371e3d87564 Mon Sep 17 00:00:00 2001 From: pushya Date: Fri, 23 Dec 2016 22:59:27 +0530 Subject: [PATCH 5039/5486] Add pray option --- english/forest/pray/pray.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 english/forest/pray/pray.md diff --git a/english/forest/pray/pray.md b/english/forest/pray/pray.md new file mode 100644 index 0000000000..a1c0c236e5 --- /dev/null +++ b/english/forest/pray/pray.md @@ -0,0 +1,16 @@ +You decide to pray to God. + +You wisper out loud, "God, please save me!If you save me now I will go to church +everyday...or at least every Sunday, whenever I am not too busy.Please God save +me!!". + +Then you suddenly a sound, Ssss....Sssss....Ssssss.....King Cobra about +5 feet away from you.You quickly jump and start running in a zigzag way.You look +back while running trying to spot if it is chasing you.Suddenly you trip on a rock +and hit your head and lose consciousness. + +You wake up to white curtains all around you.You try to figure out where you are +and how did you there.Then you notice a silhouette of someone in a corner.You call +out to him and ask, "Who are you? Where am I? How did I get here?" + +He replies, "I am GOD.You are in safe heaven.You are Dead." \ No newline at end of file From 8477dbfcb458c24e2ce43cadb0f3f34466ecf279 Mon Sep 17 00:00:00 2001 From: pushya Date: Fri, 23 Dec 2016 23:01:21 +0530 Subject: [PATCH 5040/5486] Add Pray to Forest --- english/forest/forest.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/forest/forest.md b/english/forest/forest.md index f4b64a98bc..e574d41155 100644 --- a/english/forest/forest.md +++ b/english/forest/forest.md @@ -36,3 +36,5 @@ Google can't help you right now. You are on your own. [Succumb to amnesia](./forest.md) [Go back whence you came](../marshmallow.md) + +[Pray to God](pray/pray.md) From 3c577300fd8f5821c61695294890dc6a681e2cee Mon Sep 17 00:00:00 2001 From: ronak4kalyani Date: Sat, 24 Dec 2016 19:22:58 +0530 Subject: [PATCH 5041/5486] udacity --- hindi/bollywood.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index a5e89ec555..cd5adfcf9d 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -33,4 +33,6 @@ To know about real india hero click [Bhagat Singh](Bhagat_Singh/bhagat_singh.md) Check out [Alia Bhatt](https://www.instagram.com/aliaabhatt/?hl=en) +Check out similar courses at [udacity](http://www.udacity.com/) + Check out [Tiger Shroff](https://www.instagram.com/tigerjackieshroff/?hl=en) \ No newline at end of file From ad9c31a8787ae376e35e5fd27ce6554069079066 Mon Sep 17 00:00:00 2001 From: aku97 Date: Sun, 25 Dec 2016 02:50:31 +0530 Subject: [PATCH 5042/5486] Make directory for dothraki and add start flie --- dothraki/dothraki_evoli.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dothraki/dothraki_evoli.md diff --git a/dothraki/dothraki_evoli.md b/dothraki/dothraki_evoli.md new file mode 100644 index 0000000000..e69de29bb2 From eec0a5bd2dd929af01bb25eaf56e2bfdaf047e58 Mon Sep 17 00:00:00 2001 From: aku97 Date: Sun, 25 Dec 2016 03:08:50 +0530 Subject: [PATCH 5043/5486] Add some links to start page --- dothraki/dothraki_evoli.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dothraki/dothraki_evoli.md b/dothraki/dothraki_evoli.md index e69de29bb2..07e39910f5 100644 --- a/dothraki/dothraki_evoli.md +++ b/dothraki/dothraki_evoli.md @@ -0,0 +1,5 @@ +[Learn Dothraki](dothraki.org) + +Zali hilelat [Drogo](drogo/drogo.md) che [Daenerys](daenerys/daenerys.md) ? + +[Valar Morghulis](valyrian.md) \ No newline at end of file From 9049ba23577269aaf7f4b36fa62748872b56707f Mon Sep 17 00:00:00 2001 From: "Glenn M. Davis" Date: Sat, 24 Dec 2016 16:46:55 -0500 Subject: [PATCH 5044/5486] Add to run choice --- english/coffee/Run/run.md | 8 +++++++- english/coffee/listen-to-music/listen-to-music.md | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 english/coffee/listen-to-music/listen-to-music.md diff --git a/english/coffee/Run/run.md b/english/coffee/Run/run.md index 174ae7aa8d..e218612504 100644 --- a/english/coffee/Run/run.md +++ b/english/coffee/Run/run.md @@ -6,4 +6,10 @@ You choose to run in the Green Park. In fact, a great place to breath a bit of fresh air.¶ After a few minutes you collapse to the ground, exhausted. -How could you forget? You hate running! \ No newline at end of file +How could you forget? You hate running! + +You need to get pumped up in order to run. Do you: + +[Listen to some music.](../listen-to-music/listen-to-music.md) + +[Not listen to any music.](https://www.youtube.com/watch?v=dQw4w9WgXcQ) \ No newline at end of file diff --git a/english/coffee/listen-to-music/listen-to-music.md b/english/coffee/listen-to-music/listen-to-music.md new file mode 100644 index 0000000000..ddcaeddcb9 --- /dev/null +++ b/english/coffee/listen-to-music/listen-to-music.md @@ -0,0 +1 @@ +You listen to music and get REALLY PUMPED UP!!!!! \ No newline at end of file From d4f039e7948fdd9d041c2c25504fdd7e3605d4d2 Mon Sep 17 00:00:00 2001 From: aku97 Date: Sun, 25 Dec 2016 03:45:30 +0530 Subject: [PATCH 5045/5486] Add directory and file for drogo --- dothraki/drogo/drogo.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 dothraki/drogo/drogo.md diff --git a/dothraki/drogo/drogo.md b/dothraki/drogo/drogo.md new file mode 100644 index 0000000000..29f0363038 --- /dev/null +++ b/dothraki/drogo/drogo.md @@ -0,0 +1 @@ +Me Drivol :( [Essali](../dothraki_evoli.md) \ No newline at end of file From 7e51a84b6dcfbf9b2f68dc868d8dfa7db9b4369f Mon Sep 17 00:00:00 2001 From: aku97 Date: Sun, 25 Dec 2016 03:46:48 +0530 Subject: [PATCH 5046/5486] Add directory and file for daenerys --- dothraki/daenerys/daenerys.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 dothraki/daenerys/daenerys.md diff --git a/dothraki/daenerys/daenerys.md b/dothraki/daenerys/daenerys.md new file mode 100644 index 0000000000..f20218e643 --- /dev/null +++ b/dothraki/daenerys/daenerys.md @@ -0,0 +1 @@ +Akka vojjor zala hilelat Daenerys, vosma laz vo. [Essali](../dothraki_evoli.md) \ No newline at end of file From f2ab79efd8dd978b8beb002349dd483885ef9f8b Mon Sep 17 00:00:00 2001 From: aku97 Date: Sun, 25 Dec 2016 03:47:46 +0530 Subject: [PATCH 5047/5486] Add directory and file for valyrian --- dothraki/valyrian/valyrian.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 dothraki/valyrian/valyrian.md diff --git a/dothraki/valyrian/valyrian.md b/dothraki/valyrian/valyrian.md new file mode 100644 index 0000000000..55d053b93c --- /dev/null +++ b/dothraki/valyrian/valyrian.md @@ -0,0 +1 @@ +Hazi [Valyrian](https://en.wikipedia.org/wiki/Valar_Morghulis), yer yofi!! \ No newline at end of file From 1e996a71a3a7d0a6aa61e848ec17bc7e151493ce Mon Sep 17 00:00:00 2001 From: aku97 Date: Sun, 25 Dec 2016 03:50:32 +0530 Subject: [PATCH 5048/5486] Make corrections to start file --- dothraki/dothraki_evoli.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dothraki/dothraki_evoli.md b/dothraki/dothraki_evoli.md index 07e39910f5..b8ec199837 100644 --- a/dothraki/dothraki_evoli.md +++ b/dothraki/dothraki_evoli.md @@ -1,5 +1,5 @@ -[Learn Dothraki](dothraki.org) +[Learn Dothraki](http://dothraki.org) Zali hilelat [Drogo](drogo/drogo.md) che [Daenerys](daenerys/daenerys.md) ? -[Valar Morghulis](valyrian.md) \ No newline at end of file +[Valar Morghulis](valyrian/valyrian.md) \ No newline at end of file From 8bbd536a6ae460200770567840754225c18f90d5 Mon Sep 17 00:00:00 2001 From: aku97 Date: Sun, 25 Dec 2016 04:09:20 +0530 Subject: [PATCH 5049/5486] Update language.md Had to use 'echo -e "text">>language.md' to avoid deletions --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index 04e9eadedf..821fd11a45 100644 --- a/language.md +++ b/language.md @@ -163,3 +163,5 @@ if (you.understand("C#")) here.click(); if you speak Bahasa Indonesia [klik disini](indonesia/bahasa-indonesia.md) Dreams to Memories – Wisdom in Ladakh.To read this click [here](Himalayan_Odyssey/HO.md) + +Astoli Dothraki ? [Dothrae jinne](dothraki/dothraki_evoli.md) From 0ac97132cd768288921aeb63fd04b2ddee90b467 Mon Sep 17 00:00:00 2001 From: Drithin Date: Sat, 24 Dec 2016 19:43:10 -0800 Subject: [PATCH 5050/5486] chore:added new story --- english/alone/alone.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/alone/alone.md b/english/alone/alone.md index fbc6d9fd7d..310c3d62ed 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -12,3 +12,6 @@ She sneaks next to the wall and tries to hear anyone on the other side of the wa She hears someone gasping heavily and trembles in fear. +Kristy gets drenched in sweat and sits on the edge +of her bed gulping a bottle of water. + From 056b5f6e9dbd8f5c6ee5e9222f9450dac864ddce Mon Sep 17 00:00:00 2001 From: Drithin Date: Sun, 25 Dec 2016 19:20:39 -0800 Subject: [PATCH 5051/5486] chore: added new lines to the story --- english/alone/alone.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/alone/alone.md b/english/alone/alone.md index 310c3d62ed..62370991cd 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -15,3 +15,7 @@ She hears someone gasping heavily and trembles in fear. Kristy gets drenched in sweat and sits on the edge of her bed gulping a bottle of water. +Kristy hears someone approaching her room. She sneaks +beneath the bed and shuts her mouth to mute her +anxiety. + From 518097a09635fc3590b9d997d51c2ce52fdae8dc Mon Sep 17 00:00:00 2001 From: Drithin Date: Mon, 26 Dec 2016 09:48:54 -0800 Subject: [PATCH 5052/5486] feat: introduced protagonist in the story --- english/alone/alone.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/alone/alone.md b/english/alone/alone.md index 62370991cd..8d45b704dc 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -19,3 +19,6 @@ Kristy hears someone approaching her room. She sneaks beneath the bed and shuts her mouth to mute her anxiety. +A stranger in jeans and hoodie, covering larger portion of his +face with his hood walks into the room and looks around. + From 334b87c75e2916676230e5ea6ff55bfc022f1ada Mon Sep 17 00:00:00 2001 From: Jasper Vergeer Date: Mon, 26 Dec 2016 23:52:14 +0100 Subject: [PATCH 5053/5486] Add or in the Netherlands to the weed story --- english/weed/weed.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/weed/weed.md b/english/weed/weed.md index ebefb168b0..3d7abdf2d4 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -1,4 +1,5 @@ THESE ARE THE INSTRUCTIONS FOR MAKING WEED OK!!!!!!!!! DONT TRY THIS AT HOME!! UNLESS YOUR IN CALIFORNIA!! +OR IN THE NETHERLANDS!!! well weed contains THC which will make you high. To get it out and add to your cookies, use a fat to extract it. Butter, Milk, cream can be used. From 4425c69558a4ba9857c8ce7d33eaac7d03ff94ed Mon Sep 17 00:00:00 2001 From: ritam006 Date: Tue, 27 Dec 2016 12:51:20 +0530 Subject: [PATCH 5054/5486] My journey to Port Blair --- .../PortBlair's Emerald blue/PortBlairVoyage.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 english/PortBlair's Emerald blue/PortBlairVoyage.md diff --git a/english/PortBlair's Emerald blue/PortBlairVoyage.md b/english/PortBlair's Emerald blue/PortBlairVoyage.md new file mode 100644 index 0000000000..869a41f217 --- /dev/null +++ b/english/PortBlair's Emerald blue/PortBlairVoyage.md @@ -0,0 +1,15 @@ +# I landed on Port Blair on **26th Jan** 2008 + +#### Why this day is special ?? +###### [Republic day of India](https://en.wikipedia.org/wiki/Republic_Day_(India)) + +##### I was on the ship named MV Nicobar. See [here](https://en.wikipedia.org/wiki/Republic_Day_(India)) for more details about ship. + +>I was greeted with a pictersque view of the Rajiv Gandhi Marine National Park. +>The Lush Green scenary surrounding me was so overwhelming. + + + + + + From 940b56beb32a5617b235403ad4ab8ec248477328 Mon Sep 17 00:00:00 2001 From: Drithin Date: Tue, 27 Dec 2016 06:20:38 -0800 Subject: [PATCH 5055/5486] chore: Added new action to the protagonist --- english/alone/alone.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/alone/alone.md b/english/alone/alone.md index 8d45b704dc..d055a9699f 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -22,3 +22,6 @@ anxiety. A stranger in jeans and hoodie, covering larger portion of his face with his hood walks into the room and looks around. +He walks across the room and scans the surroundings and +hide in the walk-in closet. + From c8a9f88fab5f1042c3c688ee4a27ae8dd1f6f4a5 Mon Sep 17 00:00:00 2001 From: Aakash Date: Tue, 27 Dec 2016 20:02:22 +0530 Subject: [PATCH 5056/5486] added famous punjabi people list --- punjabi/punjabi.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/punjabi/punjabi.md b/punjabi/punjabi.md index 902bcd4789..51460ee250 100644 --- a/punjabi/punjabi.md +++ b/punjabi/punjabi.md @@ -4,4 +4,6 @@ Click [here](pollywood/movies.md) for Punjabi movies Click [here](movies/movies.md) for Punjabi movies -Click [here](https://en.wikipedia.org/wiki/Milkha_Singh) to know about Milkha Singh, "the flying sikh". \ No newline at end of file +Click [here](https://en.wikipedia.org/wiki/Milkha_Singh) to know about Milkha Singh, "the flying sikh". + +Click [here](https://en.wikipedia.org/wiki/List_of_Punjabi_people) to know about famous Punjabi people. From e2aa2f74404d2d001f9b54a31f1443c2d2840f6c Mon Sep 17 00:00:00 2001 From: Aakash Date: Tue, 27 Dec 2016 20:52:12 +0530 Subject: [PATCH 5057/5486] new punjabi file --- punjabi/punjabi.md | 2 -- punjabi/punjabi2.md | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 punjabi/punjabi2.md diff --git a/punjabi/punjabi.md b/punjabi/punjabi.md index 51460ee250..4b8e38d6ae 100644 --- a/punjabi/punjabi.md +++ b/punjabi/punjabi.md @@ -5,5 +5,3 @@ Click [here](pollywood/movies.md) for Punjabi movies Click [here](movies/movies.md) for Punjabi movies Click [here](https://en.wikipedia.org/wiki/Milkha_Singh) to know about Milkha Singh, "the flying sikh". - -Click [here](https://en.wikipedia.org/wiki/List_of_Punjabi_people) to know about famous Punjabi people. diff --git a/punjabi/punjabi2.md b/punjabi/punjabi2.md new file mode 100644 index 0000000000..3a70760159 --- /dev/null +++ b/punjabi/punjabi2.md @@ -0,0 +1 @@ +Click [here](https://en.wikipedia.org/wiki/List_of_Punjabi_people) to know about famous Punjabi people. From 692682bc1d6435e5245a3c7c8f686eee2c959955 Mon Sep 17 00:00:00 2001 From: Aakash Date: Tue, 27 Dec 2016 20:59:54 +0530 Subject: [PATCH 5058/5486] last --- punjabi/punjabi.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/punjabi/punjabi.md b/punjabi/punjabi.md index 4b8e38d6ae..902bcd4789 100644 --- a/punjabi/punjabi.md +++ b/punjabi/punjabi.md @@ -4,4 +4,4 @@ Click [here](pollywood/movies.md) for Punjabi movies Click [here](movies/movies.md) for Punjabi movies -Click [here](https://en.wikipedia.org/wiki/Milkha_Singh) to know about Milkha Singh, "the flying sikh". +Click [here](https://en.wikipedia.org/wiki/Milkha_Singh) to know about Milkha Singh, "the flying sikh". \ No newline at end of file From b49ac71a1132dc445216efb2c8c17a8e62afa508 Mon Sep 17 00:00:00 2001 From: Aakash Date: Tue, 27 Dec 2016 21:09:50 +0530 Subject: [PATCH 5059/5486] casey where are you ? --- punjabi/punjabi3.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 punjabi/punjabi3.md diff --git a/punjabi/punjabi3.md b/punjabi/punjabi3.md new file mode 100644 index 0000000000..3a70760159 --- /dev/null +++ b/punjabi/punjabi3.md @@ -0,0 +1 @@ +Click [here](https://en.wikipedia.org/wiki/List_of_Punjabi_people) to know about famous Punjabi people. From bbcba446c799d066eb9f56f9ca2f175856f2c92a Mon Sep 17 00:00:00 2001 From: Aakash Date: Tue, 27 Dec 2016 21:31:41 +0530 Subject: [PATCH 5060/5486] casey ?? --- Chinese/wow/wow.md | 1 + punjabi/punjabi2.md | 1 - punjabi/punjabi3.md | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 Chinese/wow/wow.md delete mode 100644 punjabi/punjabi2.md delete mode 100644 punjabi/punjabi3.md diff --git a/Chinese/wow/wow.md b/Chinese/wow/wow.md new file mode 100644 index 0000000000..2f7df773f2 --- /dev/null +++ b/Chinese/wow/wow.md @@ -0,0 +1 @@ +this is cool diff --git a/punjabi/punjabi2.md b/punjabi/punjabi2.md deleted file mode 100644 index 3a70760159..0000000000 --- a/punjabi/punjabi2.md +++ /dev/null @@ -1 +0,0 @@ -Click [here](https://en.wikipedia.org/wiki/List_of_Punjabi_people) to know about famous Punjabi people. diff --git a/punjabi/punjabi3.md b/punjabi/punjabi3.md deleted file mode 100644 index 3a70760159..0000000000 --- a/punjabi/punjabi3.md +++ /dev/null @@ -1 +0,0 @@ -Click [here](https://en.wikipedia.org/wiki/List_of_Punjabi_people) to know about famous Punjabi people. From cb6cbd35dcd4de5b2e4a8ae497f50a6bd6309edd Mon Sep 17 00:00:00 2001 From: Djessi Jorge Date: Tue, 27 Dec 2016 17:36:15 +0000 Subject: [PATCH 5061/5486] add a new sentence to story 'new_friend' --- .../roaming_spirit/beer_sandwich/new_friend/new_friend.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md b/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md index 8e47708174..15d9b52be9 100644 --- a/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md +++ b/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md @@ -1 +1,4 @@ -You tell him that you know about an old tale that says that spirits can interact with living creatures +You tell him that you know about an old tale that says that spirits can interact with living creatures. Having said that, you try to +interact with a tree by throwing a punch at it and something more unexpected than your punch going through the tree happens. + +[The tree responds to you](living_creature/living_creature.md) From eb375ac7f17d3d2e194bc6132fc14a0200c3b524 Mon Sep 17 00:00:00 2001 From: Djessi Jorge Date: Tue, 27 Dec 2016 17:40:40 +0000 Subject: [PATCH 5062/5486] add a new option/page to the story 'new_friend' --- .../beer_sandwich/new_friend/living_creature/living_creature.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/forest/drag/roaming_spirit/beer_sandwich/new_friend/living_creature/living_creature.md diff --git a/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/living_creature/living_creature.md b/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/living_creature/living_creature.md new file mode 100644 index 0000000000..0ff49c9c71 --- /dev/null +++ b/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/living_creature/living_creature.md @@ -0,0 +1 @@ +The tree starts speaking to you. \ No newline at end of file From 2c145bf28e1cc7fb14f49d821f7b7a33a6ee35dc Mon Sep 17 00:00:00 2001 From: Aakash Date: Tue, 27 Dec 2016 23:31:37 +0530 Subject: [PATCH 5063/5486] please casey --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index b2c5b4d73e..5b332348c6 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -161,3 +161,5 @@ [Gao Shen Me](gaoshenme/gaoshenme.md) [Js不可告人的秘密](Javascript/js.md) + +[wow](wow/wow.md) From 6b96d957371588235d4ae3831780ff2c10560474 Mon Sep 17 00:00:00 2001 From: Djessi Jorge Date: Tue, 27 Dec 2016 20:49:28 +0000 Subject: [PATCH 5064/5486] Revert "add a new sentence to story 'new_friend'" This reverts commit cb6cbd35dcd4de5b2e4a8ae497f50a6bd6309edd. --- .../roaming_spirit/beer_sandwich/new_friend/new_friend.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md b/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md index 15d9b52be9..8e47708174 100644 --- a/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md +++ b/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md @@ -1,4 +1 @@ -You tell him that you know about an old tale that says that spirits can interact with living creatures. Having said that, you try to -interact with a tree by throwing a punch at it and something more unexpected than your punch going through the tree happens. - -[The tree responds to you](living_creature/living_creature.md) +You tell him that you know about an old tale that says that spirits can interact with living creatures From d2c585e27b04d4a61e3904e555232c082e00be85 Mon Sep 17 00:00:00 2001 From: Djessi Jorge Date: Tue, 27 Dec 2016 21:08:35 +0000 Subject: [PATCH 5065/5486] fix auto merging issues in pull request --- .../roaming_spirit/beer_sandwich/new_friend/new_friend.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md b/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md index 8e47708174..b799136da1 100644 --- a/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md +++ b/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md @@ -1 +1,7 @@ -You tell him that you know about an old tale that says that spirits can interact with living creatures +You tell him that you know about an old tale that says that spirits can interact with living creatures. + +Having said that, you try to interact with a tree by throwing a punch at it, then something more unexpected +than your punch going through the tree happens. + +[The tree responds to you](living_creature/living_creature.md) + From 52f3298f318ca11f35312d606c4a2a2022705a5f Mon Sep 17 00:00:00 2001 From: Djessi Jorge Date: Tue, 27 Dec 2016 21:20:33 +0000 Subject: [PATCH 5066/5486] reverted first line, removing full stop mark --- .../drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md b/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md index b799136da1..a129457c06 100644 --- a/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md +++ b/english/forest/drag/roaming_spirit/beer_sandwich/new_friend/new_friend.md @@ -1,4 +1,4 @@ -You tell him that you know about an old tale that says that spirits can interact with living creatures. +You tell him that you know about an old tale that says that spirits can interact with living creatures Having said that, you try to interact with a tree by throwing a punch at it, then something more unexpected than your punch going through the tree happens. From 50a838730da9f2bc8095ecb0693ce94855a119c6 Mon Sep 17 00:00:00 2001 From: S S Date: Tue, 27 Dec 2016 22:41:26 +0100 Subject: [PATCH 5067/5486] Add two options to german - Wurstwasser former dead end --- german/Wurstwasser/luftanhalten/luftanhalten.md | 1 + german/Wurstwasser/schnaeutzen/schnaeutzen.md | 1 + german/Wurstwasser/wurstwasser.md | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 german/Wurstwasser/luftanhalten/luftanhalten.md create mode 100644 german/Wurstwasser/schnaeutzen/schnaeutzen.md diff --git a/german/Wurstwasser/luftanhalten/luftanhalten.md b/german/Wurstwasser/luftanhalten/luftanhalten.md new file mode 100644 index 0000000000..39327505c2 --- /dev/null +++ b/german/Wurstwasser/luftanhalten/luftanhalten.md @@ -0,0 +1 @@ +Ewig können Sie die Luft nicht anhalten. \ No newline at end of file diff --git a/german/Wurstwasser/schnaeutzen/schnaeutzen.md b/german/Wurstwasser/schnaeutzen/schnaeutzen.md new file mode 100644 index 0000000000..88e6f2a30b --- /dev/null +++ b/german/Wurstwasser/schnaeutzen/schnaeutzen.md @@ -0,0 +1 @@ +Gesundheit! \ No newline at end of file diff --git a/german/Wurstwasser/wurstwasser.md b/german/Wurstwasser/wurstwasser.md index 2051d99fa2..60c6e75d4e 100644 --- a/german/Wurstwasser/wurstwasser.md +++ b/german/Wurstwasser/wurstwasser.md @@ -1 +1,6 @@ Das salzige Wurstwasser bahnt seinen Weg hinauf in Ihre Nasennebenhöhlen. +Sie können nun... + +[Die Luft anhalten](luftanhalten/luftanhalten.md) + +[Sich schnäutzen](schnaeutzen/schnaeutzen.md) \ No newline at end of file From 5b3bc26324c101c82384787199efa440504fd738 Mon Sep 17 00:00:00 2001 From: Carsten Spies Date: Tue, 27 Dec 2016 23:59:57 +0100 Subject: [PATCH 5068/5486] add MacGyver --- german/MacGyver/uboot.md | 1 + german/ruderboot.md | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 german/MacGyver/uboot.md diff --git a/german/MacGyver/uboot.md b/german/MacGyver/uboot.md new file mode 100644 index 0000000000..28c718cbc5 --- /dev/null +++ b/german/MacGyver/uboot.md @@ -0,0 +1 @@ +Beim Griff nach dem Messer finden Sie in Ihrer Hosentasche auch noch Draht, Sprengstoff und Kaugummi. diff --git a/german/ruderboot.md b/german/ruderboot.md index 4c2b117525..a1003768fd 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -1,6 +1,6 @@ Sie wachen von der Sonne geblendet auf und stellen ziemlich benommen fest, dass Sie -in einem Ruderboot auf einem grossen See treiben. Ihre Hose ist vollkommen durchnsst, und +in einem Ruderboot auf einem grossen See treiben. Ihre Hose ist vollkommen durchn�sst, und Sie bemerken, dass durch ein Loch in der Bootswand Wasser ins Boot dringt. @@ -8,9 +8,9 @@ Werden Sie: [Festellen, dass Sie doch kein Deutsch sprechen](../language.md) -[Erschrocken prfen, ob das Smartphone noch in der Hosentasche ist...](Smartphone/smartphone.md) +[Erschrocken pr�fen, ob das Smartphone noch in der Hosentasche ist...](Smartphone/smartphone.md) -[Zunchst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) +[Zun�chst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) [Laut um Hilfe schreien?](Hilfeschrei/Hilfeschrei.md) @@ -26,18 +26,20 @@ Werden Sie: [Versuchen, mit Ihrer Kleidung das Loch zu stopfen](Stopfen/stopfen.md) -[Durchlcherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) +[Durchl�cherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) [Handeln ist anstrengend. Warum nicht einfach abwarten was passiert?](abwarten/abwarten.md) -[Sie spren einen hllischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) +[Sie sp�ren einen h�llischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) -[Kopfber ins Wasser springen](Kopfsprung/Kopfsprung.md) +[Kopf�ber ins Wasser springen](Kopfsprung/Kopfsprung.md) [Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) [Nase zuhalten und ins Wurstwasser springen](Wurstwasser/wurstwasser.md) -[Strecken Ihre Rcken auf dem Wasser und beginnen zu singen](Singen/singen.md) +[Strecken Ihre R�cken auf dem Wasser und beginnen zu singen](Singen/singen.md) -[Zum fliegenden Spaghettimonster beten, damit sie ueberleben?](beten/beten.md) \ No newline at end of file +[Zum fliegenden Spaghettimonster beten, damit sie ueberleben?](beten/beten.md) + +[Das MacGyver-Messer aus der Hosentasche zu holen und das Ruderboot zu einem U-Boot umbauen.] (MacGyver/uboot.md) From a1d8806fe94e24f7dca330d83a06dbfa7ccac5da Mon Sep 17 00:00:00 2001 From: typebrook Date: Wed, 28 Dec 2016 11:03:54 +0800 Subject: [PATCH 5069/5486] Add some option in ally-squirrels.md --- english/forest/fire/ally-squirrels/ally-squirrels.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/forest/fire/ally-squirrels/ally-squirrels.md b/english/forest/fire/ally-squirrels/ally-squirrels.md index aa472ff66b..28ea9abf6b 100644 --- a/english/forest/fire/ally-squirrels/ally-squirrels.md +++ b/english/forest/fire/ally-squirrels/ally-squirrels.md @@ -1,2 +1,6 @@ You ally yourself with the squirrels -They show you the ways of nut-storage and skin-winged flight \ No newline at end of file +They show you the ways of nut-storage and skin-winged flight + +[go to get the nut-storage.]() +[go to the wreckage of the plane.]() + From 1d9eb54535071af2041f9002a5d8f3947d758df1 Mon Sep 17 00:00:00 2001 From: typebrook Date: Wed, 28 Dec 2016 11:28:17 +0800 Subject: [PATCH 5070/5486] Add contents of options in ally-squirrels.md --- .../fire/ally-squirrels/go-to-find-plane/go-to-find-plane | 5 +++++ .../fire/ally-squirrels/go-to-get-nut/go-to-get-nut.md | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 english/forest/fire/ally-squirrels/go-to-find-plane/go-to-find-plane create mode 100644 english/forest/fire/ally-squirrels/go-to-get-nut/go-to-get-nut.md diff --git a/english/forest/fire/ally-squirrels/go-to-find-plane/go-to-find-plane b/english/forest/fire/ally-squirrels/go-to-find-plane/go-to-find-plane new file mode 100644 index 0000000000..3c9446e68c --- /dev/null +++ b/english/forest/fire/ally-squirrels/go-to-find-plane/go-to-find-plane @@ -0,0 +1,5 @@ +Leading by those adorable squirrels, you find the wreckage +of the airplane. Suddenly, you realize you are not the +only one who survived in that crash. Three people lit a +fire and sharing meal under a wing-or sth previously called +wing... diff --git a/english/forest/fire/ally-squirrels/go-to-get-nut/go-to-get-nut.md b/english/forest/fire/ally-squirrels/go-to-get-nut/go-to-get-nut.md new file mode 100644 index 0000000000..d04af5a9a8 --- /dev/null +++ b/english/forest/fire/ally-squirrels/go-to-get-nut/go-to-get-nut.md @@ -0,0 +1,5 @@ +Right in a tree hole, you find a huge amount of nuts which +can afford you a whole year to eat. But a tiny body standing +between you and those precious food - it is squarel king! +It said "Die or get our property. Let's duel !" + From 75adab808186ab8251dfa11e3a8ea410d2c5ae84 Mon Sep 17 00:00:00 2001 From: typebrook Date: Wed, 28 Dec 2016 11:33:31 +0800 Subject: [PATCH 5071/5486] Fix a typo. --- .../forest/fire/ally-squirrels/go-to-get-nut/go-to-get-nut.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/forest/fire/ally-squirrels/go-to-get-nut/go-to-get-nut.md b/english/forest/fire/ally-squirrels/go-to-get-nut/go-to-get-nut.md index d04af5a9a8..d765f6f640 100644 --- a/english/forest/fire/ally-squirrels/go-to-get-nut/go-to-get-nut.md +++ b/english/forest/fire/ally-squirrels/go-to-get-nut/go-to-get-nut.md @@ -1,5 +1,5 @@ Right in a tree hole, you find a huge amount of nuts which can afford you a whole year to eat. But a tiny body standing -between you and those precious food - it is squarel king! +between you and those precious food - it is squirrel king! It said "Die or get our property. Let's duel !" From 677a503b5e7d12e50efd1730c07ab7836e1a454c Mon Sep 17 00:00:00 2001 From: typebrook Date: Wed, 28 Dec 2016 11:47:47 +0800 Subject: [PATCH 5072/5486] Point option to valid filenames --- english/forest/fire/ally-squirrels/ally-squirrels.md | 5 ++--- .../{go-to-find-plane => go-to-find-plane.md} | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename english/forest/fire/ally-squirrels/go-to-find-plane/{go-to-find-plane => go-to-find-plane.md} (100%) diff --git a/english/forest/fire/ally-squirrels/ally-squirrels.md b/english/forest/fire/ally-squirrels/ally-squirrels.md index 28ea9abf6b..9646fded0b 100644 --- a/english/forest/fire/ally-squirrels/ally-squirrels.md +++ b/english/forest/fire/ally-squirrels/ally-squirrels.md @@ -1,6 +1,5 @@ You ally yourself with the squirrels They show you the ways of nut-storage and skin-winged flight -[go to get the nut-storage.]() -[go to the wreckage of the plane.]() - +[go to get the nut-storage.](./go-to-get-nut/go-to-get-nut.md) +[go to the wreckage of the plane.](./go-to-find-plane/go-to-find-plane.md) diff --git a/english/forest/fire/ally-squirrels/go-to-find-plane/go-to-find-plane b/english/forest/fire/ally-squirrels/go-to-find-plane/go-to-find-plane.md similarity index 100% rename from english/forest/fire/ally-squirrels/go-to-find-plane/go-to-find-plane rename to english/forest/fire/ally-squirrels/go-to-find-plane/go-to-find-plane.md From 3e3a3e8ac769926592dca7584c5b6f9ce720b0a5 Mon Sep 17 00:00:00 2001 From: typebrook Date: Wed, 28 Dec 2016 11:51:18 +0800 Subject: [PATCH 5073/5486] Add a blank line between options --- english/forest/fire/ally-squirrels/ally-squirrels.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/forest/fire/ally-squirrels/ally-squirrels.md b/english/forest/fire/ally-squirrels/ally-squirrels.md index 9646fded0b..500496b720 100644 --- a/english/forest/fire/ally-squirrels/ally-squirrels.md +++ b/english/forest/fire/ally-squirrels/ally-squirrels.md @@ -2,4 +2,5 @@ You ally yourself with the squirrels They show you the ways of nut-storage and skin-winged flight [go to get the nut-storage.](./go-to-get-nut/go-to-get-nut.md) + [go to the wreckage of the plane.](./go-to-find-plane/go-to-find-plane.md) From c879104ffb1a7e780ed387dd0e3ce72424607d19 Mon Sep 17 00:00:00 2001 From: ritam006 Date: Wed, 28 Dec 2016 12:56:14 +0530 Subject: [PATCH 5074/5486] renamed a file --- .../PortBlairVoyage.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 english/00_PortBlair's Emerald blue/PortBlairVoyage.md diff --git a/english/00_PortBlair's Emerald blue/PortBlairVoyage.md b/english/00_PortBlair's Emerald blue/PortBlairVoyage.md new file mode 100644 index 0000000000..869a41f217 --- /dev/null +++ b/english/00_PortBlair's Emerald blue/PortBlairVoyage.md @@ -0,0 +1,15 @@ +# I landed on Port Blair on **26th Jan** 2008 + +#### Why this day is special ?? +###### [Republic day of India](https://en.wikipedia.org/wiki/Republic_Day_(India)) + +##### I was on the ship named MV Nicobar. See [here](https://en.wikipedia.org/wiki/Republic_Day_(India)) for more details about ship. + +>I was greeted with a pictersque view of the Rajiv Gandhi Marine National Park. +>The Lush Green scenary surrounding me was so overwhelming. + + + + + + From 686b3472f33cce54e076642517b26dbd89a8723d Mon Sep 17 00:00:00 2001 From: ritam006 Date: Wed, 28 Dec 2016 12:59:46 +0530 Subject: [PATCH 5075/5486] Shortened a line --- .../PortBlairVoyage.md | 4 +++- .../PortBlair's Emerald blue/PortBlairVoyage.md | 15 --------------- 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 english/PortBlair's Emerald blue/PortBlairVoyage.md diff --git a/english/00_PortBlair's Emerald blue/PortBlairVoyage.md b/english/00_PortBlair's Emerald blue/PortBlairVoyage.md index 869a41f217..127ab49c53 100644 --- a/english/00_PortBlair's Emerald blue/PortBlairVoyage.md +++ b/english/00_PortBlair's Emerald blue/PortBlairVoyage.md @@ -3,7 +3,9 @@ #### Why this day is special ?? ###### [Republic day of India](https://en.wikipedia.org/wiki/Republic_Day_(India)) -##### I was on the ship named MV Nicobar. See [here](https://en.wikipedia.org/wiki/Republic_Day_(India)) for more details about ship. +##### I was on the ship named MV Nicobar. +See [here](https://en.wikipedia.org/wiki/Republic_Day_(India)) +for more details about ship. >I was greeted with a pictersque view of the Rajiv Gandhi Marine National Park. >The Lush Green scenary surrounding me was so overwhelming. diff --git a/english/PortBlair's Emerald blue/PortBlairVoyage.md b/english/PortBlair's Emerald blue/PortBlairVoyage.md deleted file mode 100644 index 869a41f217..0000000000 --- a/english/PortBlair's Emerald blue/PortBlairVoyage.md +++ /dev/null @@ -1,15 +0,0 @@ -# I landed on Port Blair on **26th Jan** 2008 - -#### Why this day is special ?? -###### [Republic day of India](https://en.wikipedia.org/wiki/Republic_Day_(India)) - -##### I was on the ship named MV Nicobar. See [here](https://en.wikipedia.org/wiki/Republic_Day_(India)) for more details about ship. - ->I was greeted with a pictersque view of the Rajiv Gandhi Marine National Park. ->The Lush Green scenary surrounding me was so overwhelming. - - - - - - From eea39287c536378731976926ef925cec297af60c Mon Sep 17 00:00:00 2001 From: walkjivefly Date: Wed, 28 Dec 2016 16:28:25 +0700 Subject: [PATCH 5076/5486] Add something new --- english/dance/dance.md | 2 ++ english/marshmallow.md | 4 ++++ english/tango/hug.md | 1 + english/tango/tango.md | 10 ++++++++++ english/tango/walk.md | 5 +++++ 5 files changed, 22 insertions(+) create mode 100644 english/tango/hug.md create mode 100644 english/tango/tango.md create mode 100644 english/tango/walk.md diff --git a/english/dance/dance.md b/english/dance/dance.md index e92eb7ba92..bef300de60 100644 --- a/english/dance/dance.md +++ b/english/dance/dance.md @@ -1,4 +1,6 @@ +[Argentine tango](tango/tango.md) + ballet: You dance frantically until the ground begins to shake and diff --git a/english/marshmallow.md b/english/marshmallow.md index b34762964b..b62b3f45f1 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,4 +1,8 @@ Once upon a time many authors collaborated to make meaningless linked story. + +A few learned to [tango](tango/tango.md) + +Some preferred to Enter [The Forest!] (forest/forest.md) hi~ diff --git a/english/tango/hug.md b/english/tango/hug.md new file mode 100644 index 0000000000..8e86c14dba --- /dev/null +++ b/english/tango/hug.md @@ -0,0 +1 @@ +Hug your partner. Yes, really. Hug them like you love them. diff --git a/english/tango/tango.md b/english/tango/tango.md new file mode 100644 index 0000000000..df2b775709 --- /dev/null +++ b/english/tango/tango.md @@ -0,0 +1,10 @@ +Hey, good choice! OK, here's how to tango: + +1. Find a partner. + +2. Play some music. Golden Age tango would be best, but it's your choice. + +3. [Hug](hug.md) your partner. + +4. [Walk](walk.md) in time with the music. + diff --git a/english/tango/walk.md b/english/tango/walk.md new file mode 100644 index 0000000000..edec4292a3 --- /dev/null +++ b/english/tango/walk.md @@ -0,0 +1,5 @@ +Walk. One foot in front of the other, preferably in time with the music. + +You'll be walking forwards, your partner will be walking backwards. + +Keep your eyes open and watch out for collisions. From a81e4d31c9cc4047274fdb98370e4afc5c9a27d6 Mon Sep 17 00:00:00 2001 From: walkjivefly Date: Wed, 28 Dec 2016 16:40:43 +0700 Subject: [PATCH 5077/5486] Fix structure of my additions --- english/tango/hug/hug.md | 1 + english/tango/walk/walk.md | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 english/tango/hug/hug.md create mode 100644 english/tango/walk/walk.md diff --git a/english/tango/hug/hug.md b/english/tango/hug/hug.md new file mode 100644 index 0000000000..8e86c14dba --- /dev/null +++ b/english/tango/hug/hug.md @@ -0,0 +1 @@ +Hug your partner. Yes, really. Hug them like you love them. diff --git a/english/tango/walk/walk.md b/english/tango/walk/walk.md new file mode 100644 index 0000000000..edec4292a3 --- /dev/null +++ b/english/tango/walk/walk.md @@ -0,0 +1,5 @@ +Walk. One foot in front of the other, preferably in time with the music. + +You'll be walking forwards, your partner will be walking backwards. + +Keep your eyes open and watch out for collisions. From 8860c21aae5a1ebe07081115a4ceda848877029e Mon Sep 17 00:00:00 2001 From: walkjivefly Date: Wed, 28 Dec 2016 16:43:49 +0700 Subject: [PATCH 5078/5486] Fix more structure --- english/dance/dance.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/dance/dance.md b/english/dance/dance.md index bef300de60..d25c6d34e5 100644 --- a/english/dance/dance.md +++ b/english/dance/dance.md @@ -1,5 +1,5 @@ -[Argentine tango](tango/tango.md) +[Argentine tango](../tango/tango.md) ballet: From eb22c9193975762f67962eafc9b6819b8c069690 Mon Sep 17 00:00:00 2001 From: ritam006 Date: Wed, 28 Dec 2016 15:33:50 +0530 Subject: [PATCH 5079/5486] Changed marshmallow.md --- english/marshmallow.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index b34762964b..1708860f7a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1213,3 +1213,7 @@ Read it [here](alone/alone.md) Information on some famous tv series [click here](famous-tv-series/famous-tv-series.md) + +I have atlast found a way to heaven...Want to go [there](00_PortBlair's Emerald blue/PortBlairVoyage.md) + + From 46560a6ae83d27e76d4bac381d854a2a638dc05c Mon Sep 17 00:00:00 2001 From: walkjivefly Date: Wed, 28 Dec 2016 17:09:35 +0700 Subject: [PATCH 5080/5486] Yet more structure fixing --- english/tango/hug.md | 1 - english/tango/walk.md | 5 ----- 2 files changed, 6 deletions(-) delete mode 100644 english/tango/hug.md delete mode 100644 english/tango/walk.md diff --git a/english/tango/hug.md b/english/tango/hug.md deleted file mode 100644 index 8e86c14dba..0000000000 --- a/english/tango/hug.md +++ /dev/null @@ -1 +0,0 @@ -Hug your partner. Yes, really. Hug them like you love them. diff --git a/english/tango/walk.md b/english/tango/walk.md deleted file mode 100644 index edec4292a3..0000000000 --- a/english/tango/walk.md +++ /dev/null @@ -1,5 +0,0 @@ -Walk. One foot in front of the other, preferably in time with the music. - -You'll be walking forwards, your partner will be walking backwards. - -Keep your eyes open and watch out for collisions. From ab03907a94f263187e395e01da7ca4504d0c7953 Mon Sep 17 00:00:00 2001 From: walkjivefly Date: Wed, 28 Dec 2016 17:18:47 +0700 Subject: [PATCH 5081/5486] Again --- english/tango/tango.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/tango/tango.md b/english/tango/tango.md index df2b775709..77ea1c8845 100644 --- a/english/tango/tango.md +++ b/english/tango/tango.md @@ -4,7 +4,7 @@ Hey, good choice! OK, here's how to tango: 2. Play some music. Golden Age tango would be best, but it's your choice. -3. [Hug](hug.md) your partner. +3. [Hug](hug/hug.md) your partner. -4. [Walk](walk.md) in time with the music. +4. [Walk](walk/walk.md) in time with the music. From cb6911ab1297f1eca956280c2517dea6efb4c4bd Mon Sep 17 00:00:00 2001 From: publicb Date: Wed, 28 Dec 2016 17:34:47 +0100 Subject: [PATCH 5082/5486] add more stagedives --- english/batmetal/batmetal.md | 16 ++++++++++++++++ english/batmetal/stagedive/stagedive.md | 5 +++++ 2 files changed, 21 insertions(+) create mode 100644 english/batmetal/stagedive/stagedive.md diff --git a/english/batmetal/batmetal.md b/english/batmetal/batmetal.md index 00f16046fd..2f5f784255 100644 --- a/english/batmetal/batmetal.md +++ b/english/batmetal/batmetal.md @@ -1,3 +1,19 @@ WARNING: Entering heavy metal zone! [I AM BE DANGEROUS NOW](https://www.youtube.com/watch?v=qatmJtIJAPw). + +After shoving around pimply longhaired teenagers in the pit for a bit and +knocking out that one obnoxious, sweaty (and of course, topless) baldhead, +you hear the singer shout: I... NEED... MORE.... STAGEDIVES! + +You growl, which is what you always do when pondering important life decisions. +After all, you are the batman. The kids surrounding you take a cautious step back. + +WDYD? + +...pull out your grappling hook and prepare to [enter the stage](stagedive/stagedive.md) + +...start doing your signature [bat-mower](https://www.youtube.com/watch?v=6RkyxNa2W9o) +(c) move, much to the dismay of punters left and right, who unlike you, are not wearing +any bullet-proof armour. So what, you think. I AM THE BATMAN! + diff --git a/english/batmetal/stagedive/stagedive.md b/english/batmetal/stagedive/stagedive.md new file mode 100644 index 0000000000..054893e44e --- /dev/null +++ b/english/batmetal/stagedive/stagedive.md @@ -0,0 +1,5 @@ +... you aim your grappling hook at the ceiling stage lights and fire. You ascend +towards the stage, knocking over that guy in cargo shorts with the nose piercing +in the process. So what! You are the batman! The singer and the rest of the band +look a bit scared after you gracefully descend on stage next to them. No need to +ask for the mic, you just grab it and in your deepest, meanest growl, you scream.. From c16a84ae057e85c890cd68346a99fb1faa33ef72 Mon Sep 17 00:00:00 2001 From: Nathan Lile Date: Wed, 28 Dec 2016 09:57:58 -0700 Subject: [PATCH 5083/5486] Added a contribution to this story --- english/thunder-carrots/thunder-carrots.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/thunder-carrots/thunder-carrots.md b/english/thunder-carrots/thunder-carrots.md index ed95d3f6e4..53dad6fc39 100644 --- a/english/thunder-carrots/thunder-carrots.md +++ b/english/thunder-carrots/thunder-carrots.md @@ -10,3 +10,6 @@ That's how to [clone](https://goo.gl/IqYvlE) a remote! So you get to cloning. And get [back to your journey](../marshmallow.md). +"That was strange" you think. Perhaps the shock from the thunder carrots fried something in my brain because I +could have sworn that I just literally traveled THROUGH cyberspace...like, my whole body went there and back again. + From e249b391c1c437ee12b8b89100d12c3f09fc433f Mon Sep 17 00:00:00 2001 From: Sandhya Bairi Date: Wed, 28 Dec 2016 22:59:11 +0530 Subject: [PATCH 5084/5486] Add opinion about Bayes Theorem --- english/BayesTheorem/BayesTheorem.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/BayesTheorem/BayesTheorem.md b/english/BayesTheorem/BayesTheorem.md index 3737674721..f33f6fa880 100644 --- a/english/BayesTheorem/BayesTheorem.md +++ b/english/BayesTheorem/BayesTheorem.md @@ -1,5 +1,7 @@ Bayes' Theorem: P(A|B) = P(B|A)P(A)/P(B) +I learnt Bayes Theorem long back but i forgot + [Daddy, but where do priors come from](priors/priors.md)? [Daddy, can I have a glass of water](../coffee/drink-water/drink.md)? From 4e947ce6b95e89b783e15bc0355a39e2f622e403 Mon Sep 17 00:00:00 2001 From: Drithin Date: Wed, 28 Dec 2016 10:03:38 -0800 Subject: [PATCH 5085/5486] feat: plot twist in the story --- english/alone/alone.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/alone/alone.md b/english/alone/alone.md index d055a9699f..7aab2abfb6 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -25,3 +25,4 @@ face with his hood walks into the room and looks around. He walks across the room and scans the surroundings and hide in the walk-in closet. +Kristy locks the closet from outside and screams on top of her voice. \ No newline at end of file From c96ccfe240822db431e0a1fafe8574d34d14f176 Mon Sep 17 00:00:00 2001 From: MITCHELL Date: Wed, 28 Dec 2016 12:15:28 -0600 Subject: [PATCH 5086/5486] Add a couple lines to the ice cream adventure --- english/ice-cream/ice-cream.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/ice-cream/ice-cream.md b/english/ice-cream/ice-cream.md index c6777185d9..7521b9f826 100644 --- a/english/ice-cream/ice-cream.md +++ b/english/ice-cream/ice-cream.md @@ -2,4 +2,8 @@ Yes, ice cream makes everything better. Now it's just a matter of what flavor t There are so many delicious possibilities.... french vanilla just melts in your mouth -brown sugar oatmeal is surprisingly scumptious \ No newline at end of file +brown sugar oatmeal is surprisingly scumptious + +I was here, read a few lines, ate some cookies and cream ice-cream, and read a few more lines. + +All this reading about delicious adventures made me hungry so I ate some more ice-cream. \ No newline at end of file From 370a3232bac1a2834fd1380f3da374ff7e0931a4 Mon Sep 17 00:00:00 2001 From: MITCHELL Date: Wed, 28 Dec 2016 12:39:56 -0600 Subject: [PATCH 5087/5486] Add blank line at the end of ice-cream.md --- english/ice-cream/ice-cream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/ice-cream/ice-cream.md b/english/ice-cream/ice-cream.md index 7521b9f826..ae2963af9d 100644 --- a/english/ice-cream/ice-cream.md +++ b/english/ice-cream/ice-cream.md @@ -6,4 +6,4 @@ brown sugar oatmeal is surprisingly scumptious I was here, read a few lines, ate some cookies and cream ice-cream, and read a few more lines. -All this reading about delicious adventures made me hungry so I ate some more ice-cream. \ No newline at end of file +All this reading about delicious adventures made me hungry so I ate some more ice-cream. From cf5836cc42d75a766b9fddc26f742178aecea562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Mel=C3=A9ndez?= Date: Wed, 28 Dec 2016 13:11:31 -0600 Subject: [PATCH 5088/5486] Add my history ejercito-invasor --- espanol/canudos.md | 4 +++- espanol/ejercito-invasor/ejercito-invasor.md | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 espanol/ejercito-invasor/ejercito-invasor.md diff --git a/espanol/canudos.md b/espanol/canudos.md index d122aa5732..414b144c26 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -187,4 +187,6 @@ A lo que respondes: "Yo solo vine aquí a hablar de mi [libro](libro/libro.md)". Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/tiempo/maquina_del_tiempo.md). -[En su viaje al pasado pudo conoció a Aquiles, quien le enseñó como invocar a Pegaso](pegaso/pegaso.md) \ No newline at end of file +[En su viaje al pasado pudo conoció a Aquiles, quien le enseñó como invocar a Pegaso](pegaso/pegaso.md) + +[El ejército invasor avanza](ejercito-invasor/ejercito-invasor.md) \ No newline at end of file diff --git a/espanol/ejercito-invasor/ejercito-invasor.md b/espanol/ejercito-invasor/ejercito-invasor.md new file mode 100644 index 0000000000..26126f2be6 --- /dev/null +++ b/espanol/ejercito-invasor/ejercito-invasor.md @@ -0,0 +1,4 @@ +Ignorante del nuevo aliado de sus contrarios, deciden avanzar y atacar con +todos sus ejércitos la fortaleza en donde está el Pegaso. Confiados en que +existe una ventaja de 3 a 1, se saborean la victoria, pero al llegar a las +murallas de la fortaleza... \ No newline at end of file From f1792f604450a73b5ed1a3a879f8e785380e1fce Mon Sep 17 00:00:00 2001 From: kravelin Date: Wed, 28 Dec 2016 23:06:16 -0800 Subject: [PATCH 5089/5486] Added new page and option on previous page Added a page to swim to the boat if you went down river after meeting the shawman in the forest --- english/forest/fire/woods/follow/shoreline/river/boat/boat.md | 3 +++ english/forest/fire/woods/follow/shoreline/river/river.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/forest/fire/woods/follow/shoreline/river/boat/boat.md diff --git a/english/forest/fire/woods/follow/shoreline/river/boat/boat.md b/english/forest/fire/woods/follow/shoreline/river/boat/boat.md new file mode 100644 index 0000000000..37ad233b2a --- /dev/null +++ b/english/forest/fire/woods/follow/shoreline/river/boat/boat.md @@ -0,0 +1,3 @@ +You swim over to the boat and a couple of the people on the boat lean over to help you onto the boat. + +After a quick greeting you are handed a towel to dry off with. \ No newline at end of file diff --git a/english/forest/fire/woods/follow/shoreline/river/river.md b/english/forest/fire/woods/follow/shoreline/river/river.md index abfd1b70fa..8f696a69f0 100644 --- a/english/forest/fire/woods/follow/shoreline/river/river.md +++ b/english/forest/fire/woods/follow/shoreline/river/river.md @@ -1,3 +1,5 @@ You throw yourself back into the river and flow downstream. In the distance, you see a boat. You start swimming to the possibility of safety. -The people in the boat see you. \ No newline at end of file +The people in the boat see you. + +[Swim over to the boat](boat/boat.md) \ No newline at end of file From 064c40459797f2ae57d3466fad74322451edffff Mon Sep 17 00:00:00 2001 From: Mark Stringer Date: Thu, 29 Dec 2016 09:05:26 +0000 Subject: [PATCH 5090/5486] Add one line - which is a link to the Monty Python file --- english/Monty-Python/search.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/Monty-Python/search.md b/english/Monty-Python/search.md index 19745a4d17..e90666ebad 100644 --- a/english/Monty-Python/search.md +++ b/english/Monty-Python/search.md @@ -1,5 +1,7 @@ You set out on a search for the holy grail. +[Look for Gold](../grue/grue.md) + Ride to the nearest castle. Meet the black knight From 5d5dd5dff295319e7e8bc5a8eec72bbed3f58719 Mon Sep 17 00:00:00 2001 From: Mark Stringer Date: Thu, 29 Dec 2016 09:07:23 +0000 Subject: [PATCH 5091/5486] Change the word Gold to Grue --- english/Monty-Python/search.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/Monty-Python/search.md b/english/Monty-Python/search.md index e90666ebad..02bbea6b3f 100644 --- a/english/Monty-Python/search.md +++ b/english/Monty-Python/search.md @@ -1,6 +1,6 @@ You set out on a search for the holy grail. -[Look for Gold](../grue/grue.md) +[Look for Grue](../grue/grue.md) Ride to the nearest castle. From a6eb0d03e7a5d9b2eff495efd28c9eda57dab635 Mon Sep 17 00:00:00 2001 From: Drithin Date: Thu, 29 Dec 2016 09:39:44 -0800 Subject: [PATCH 5092/5486] chore: updated the plot twist --- english/alone/alone.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 7aab2abfb6..47af2ec704 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -25,4 +25,8 @@ face with his hood walks into the room and looks around. He walks across the room and scans the surroundings and hide in the walk-in closet. -Kristy locks the closet from outside and screams on top of her voice. \ No newline at end of file +Kristy locks the closet from outside and screams on top of her voice. + +Everyone in the dorm rushes to Kristy's room and her friends alert +the security. Security storms into the room and carefully opens the +closet door. \ No newline at end of file From fd59b7183118f2af42b608ec816c7a3670d4b3c0 Mon Sep 17 00:00:00 2001 From: Mark Stringer Date: Thu, 29 Dec 2016 17:48:31 +0000 Subject: [PATCH 5093/5486] Add a line of gibberish --- Gibberish/Gibberish.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Gibberish/Gibberish.md b/Gibberish/Gibberish.md index 821dd407e9..fd18248021 100644 --- a/Gibberish/Gibberish.md +++ b/Gibberish/Gibberish.md @@ -4,6 +4,7 @@ dckjbkbdckjbskjdbckbf ww djlsdbkjbsvdkjbkrjv ekrjberkjdber rekbvekjbre kbe kdjsbvkjsbdvjks dweskbqwobqwdlkasnlsanb +Wubble wubble boo boo kalsjdlfj aklsdf From 2324b189f0daeaa6ce56441a587edb058164d4da Mon Sep 17 00:00:00 2001 From: Matthew Horsman Date: Thu, 29 Dec 2016 17:33:49 -0400 Subject: [PATCH 5094/5486] Add choice to dog-person page linking to golden-lab option --- english/dog-person/dog.md | 2 ++ english/golden-lab/golden-lab.md | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 english/golden-lab/golden-lab.md diff --git a/english/dog-person/dog.md b/english/dog-person/dog.md index c258bd9272..c070a5b0d0 100644 --- a/english/dog-person/dog.md +++ b/english/dog-person/dog.md @@ -4,3 +4,5 @@ You take your cat straight to your sister's house and drive yourself to the nearest animal shelter. You tell the attendant you want a dog, and he shows you to the back to take a look. There's so many to choose from! HOW WILL YOU CHOOSE?? + +[That golden lab looks nice](../golden-lab/golden-lab.md) diff --git a/english/golden-lab/golden-lab.md b/english/golden-lab/golden-lab.md new file mode 100644 index 0000000000..df155d1792 --- /dev/null +++ b/english/golden-lab/golden-lab.md @@ -0,0 +1,5 @@ +#Golden Lab + +You walk past a few dogs; one was sleeping, one was a little too aggressive, and one was just plain ugly. However, shortly you notice a beautiful Golden Lab. You immediately fall in love with him because you notice he's giving you a "can you believe this guy?" look while nodding his head towards a poodle in the corner. The poodle is wearing an umbrella hat. + +There's only one problem. The girl at the counter says that the Golden Lab has recently been claimed, and is awaiting his new owner. You really have your heart set on this dog, and it seems like he likes you too. \ No newline at end of file From 3af11afda967c1c3c8cf8c7611a91b2ec5492c4d Mon Sep 17 00:00:00 2001 From: Matthew Horsman Date: Thu, 29 Dec 2016 17:39:45 -0400 Subject: [PATCH 5095/5486] Fix line length --- english/golden-lab/golden-lab.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/english/golden-lab/golden-lab.md b/english/golden-lab/golden-lab.md index df155d1792..1aeb2c1f77 100644 --- a/english/golden-lab/golden-lab.md +++ b/english/golden-lab/golden-lab.md @@ -1,5 +1,13 @@ #Golden Lab -You walk past a few dogs; one was sleeping, one was a little too aggressive, and one was just plain ugly. However, shortly you notice a beautiful Golden Lab. You immediately fall in love with him because you notice he's giving you a "can you believe this guy?" look while nodding his head towards a poodle in the corner. The poodle is wearing an umbrella hat. +You walk past a few dogs; one was sleeping, one was a little too +aggressive, and one was just plain ugly. However, shortly you notice a +beautiful Golden Lab. You immediately fall in love with him because you +notice he's giving you a "can you believe this guy?" look while nodding +his head towards a poodle in the corner. The poodle is wearing an +umbrella hat. -There's only one problem. The girl at the counter says that the Golden Lab has recently been claimed, and is awaiting his new owner. You really have your heart set on this dog, and it seems like he likes you too. \ No newline at end of file +There's only one problem. The girl at the counter says that the Golden +Lab has recently been claimed, and is awaiting his new owner. You +really have your heart set on this dog, and it seems like he likes you +too. \ No newline at end of file From 420224a07598dea8865767b3fd8e25d48c7fac54 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Lohra Date: Fri, 30 Dec 2016 10:37:11 +0530 Subject: [PATCH 5096/5486] Add Babita Phogat link --- hindi/bollywood.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index a5e89ec555..b6d293ad41 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -33,4 +33,6 @@ To know about real india hero click [Bhagat Singh](Bhagat_Singh/bhagat_singh.md) Check out [Alia Bhatt](https://www.instagram.com/aliaabhatt/?hl=en) -Check out [Tiger Shroff](https://www.instagram.com/tigerjackieshroff/?hl=en) \ No newline at end of file +Check out [Tiger Shroff](https://www.instagram.com/tigerjackieshroff/?hl=en) + +Checkout [Babita Phogat](https://www.instagram.com/explore/tags/babitaphogat/) \ No newline at end of file From bebc8035fcb7a1cc5ab55afaba804867926f8fd6 Mon Sep 17 00:00:00 2001 From: aku97 Date: Fri, 30 Dec 2016 19:32:49 +0530 Subject: [PATCH 5097/5486] Edit start page to separate links on single line --- dothraki/dothraki_evoli.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dothraki/dothraki_evoli.md b/dothraki/dothraki_evoli.md index b8ec199837..39897416a9 100644 --- a/dothraki/dothraki_evoli.md +++ b/dothraki/dothraki_evoli.md @@ -1,5 +1,7 @@ [Learn Dothraki](http://dothraki.org) -Zali hilelat [Drogo](drogo/drogo.md) che [Daenerys](daenerys/daenerys.md) ? +Zali hilelat [Drogo](drogo/drogo.md) ? -[Valar Morghulis](valyrian/valyrian.md) \ No newline at end of file +Zali hilelat [Daenerys](daenerys/daenerys.md) ? + +[Valar Morghulis](valyrian/valyrian.md) From d78d433c2e0622eb44cd17ea7ad32a7a3517b3a4 Mon Sep 17 00:00:00 2001 From: Drithin Date: Fri, 30 Dec 2016 10:33:30 -0800 Subject: [PATCH 5098/5486] chore: Added new lines to the story --- english/alone/alone.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 47af2ec704..df20160d8a 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -29,4 +29,7 @@ Kristy locks the closet from outside and screams on top of her voice. Everyone in the dorm rushes to Kristy's room and her friends alert the security. Security storms into the room and carefully opens the -closet door. \ No newline at end of file +closet door. + +Security checks inside and finds no one. Kristy scatters everything in the closet +and finds nothing. Everyones leaves cursing Kristy and they think that it's a prank. \ No newline at end of file From 86fdccd6ca5389ccfcb7e18020e5658f2d7998f9 Mon Sep 17 00:00:00 2001 From: Carsten Spies Date: Fri, 30 Dec 2016 21:45:34 +0100 Subject: [PATCH 5099/5486] correct special character --- german/ruderboot.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/german/ruderboot.md b/german/ruderboot.md index a1003768fd..a8af4663f2 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -1,6 +1,6 @@ Sie wachen von der Sonne geblendet auf und stellen ziemlich benommen fest, dass Sie -in einem Ruderboot auf einem grossen See treiben. Ihre Hose ist vollkommen durchn�sst, und +in einem Ruderboot auf einem grossen See treiben. Ihre Hose ist vollkommen durchnsst, und Sie bemerken, dass durch ein Loch in der Bootswand Wasser ins Boot dringt. @@ -8,9 +8,9 @@ Werden Sie: [Festellen, dass Sie doch kein Deutsch sprechen](../language.md) -[Erschrocken pr�fen, ob das Smartphone noch in der Hosentasche ist...](Smartphone/smartphone.md) +[Erschrocken prfen, ob das Smartphone noch in der Hosentasche ist...](Smartphone/smartphone.md) -[Zun�chst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) +[Zunchst einmal die zwei Leichen aus dem Boot werfen?](Leichen/Leichen.md) [Laut um Hilfe schreien?](Hilfeschrei/Hilfeschrei.md) @@ -26,19 +26,19 @@ Werden Sie: [Versuchen, mit Ihrer Kleidung das Loch zu stopfen](Stopfen/stopfen.md) -[Durchl�cherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) +[Durchlcherte Bootwand einfach wegschneiden](wegschneiden/wegschneiden.md) [Handeln ist anstrengend. Warum nicht einfach abwarten was passiert?](abwarten/abwarten.md) -[Sie sp�ren einen h�llischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) +[Sie spren einen hllischen Schmerz im Gesicht](Sonnenbrand/vor-sonne-schutzen.md) -[Kopf�ber ins Wasser springen](Kopfsprung/Kopfsprung.md) +[Kopfber ins Wasser springen](Kopfsprung/Kopfsprung.md) [Ein Dorf aufsuchen um das Boot reparieren zu lassen. Eventuell gibt es dort einen Bootsbauer](Dorf/dorf.md) [Nase zuhalten und ins Wurstwasser springen](Wurstwasser/wurstwasser.md) -[Strecken Ihre R�cken auf dem Wasser und beginnen zu singen](Singen/singen.md) +[Strecken Ihre Rcken auf dem Wasser und beginnen zu singen](Singen/singen.md) [Zum fliegenden Spaghettimonster beten, damit sie ueberleben?](beten/beten.md) From f69ba97ceb31e1b2aee75a52c0e560ad002760df Mon Sep 17 00:00:00 2001 From: Carsten Spies Date: Fri, 30 Dec 2016 22:00:14 +0100 Subject: [PATCH 5100/5486] add MacGyver --- german/MacGyver/uboot.md | 2 +- german/ruderboot.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/german/MacGyver/uboot.md b/german/MacGyver/uboot.md index 28c718cbc5..0222f651b2 100644 --- a/german/MacGyver/uboot.md +++ b/german/MacGyver/uboot.md @@ -1 +1 @@ -Beim Griff nach dem Messer finden Sie in Ihrer Hosentasche auch noch Draht, Sprengstoff und Kaugummi. +Beim Griff nach dem Messer finden Sie in Ihrer Hosentasche auch noch einen Draht, Sprengstoff und nen Kaugummi. diff --git a/german/ruderboot.md b/german/ruderboot.md index a8af4663f2..f32b3e8af7 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -42,4 +42,4 @@ Werden Sie: [Zum fliegenden Spaghettimonster beten, damit sie ueberleben?](beten/beten.md) -[Das MacGyver-Messer aus der Hosentasche zu holen und das Ruderboot zu einem U-Boot umbauen.] (MacGyver/uboot.md) +[Das MacGyver-Messer aus der Hosentasche zu holen und das Ruderboot zu einem U-Boot umbauen] (MacGyver/uboot.md) From 49d7f88fb5c27ecf3431c2da63806504e77f7c61 Mon Sep 17 00:00:00 2001 From: Drithin Date: Sat, 31 Dec 2016 10:24:24 -0800 Subject: [PATCH 5101/5486] chore: added new story --- english/alone/alone.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index df20160d8a..22ca45741c 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -32,4 +32,6 @@ the security. Security storms into the room and carefully opens the closet door. Security checks inside and finds no one. Kristy scatters everything in the closet -and finds nothing. Everyones leaves cursing Kristy and they think that it's a prank. \ No newline at end of file +and finds nothing. Everyones leaves cursing Kristy and they think that it's a prank. + +Kristy collapses and weeps uncontrollably. \ No newline at end of file From 2175df922c9fdc49a25d9086a604cca1d5d0c2bd Mon Sep 17 00:00:00 2001 From: Drithin Date: Sun, 1 Jan 2017 16:14:59 -0800 Subject: [PATCH 5102/5486] chore: updated story --- english/alone/alone.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 22ca45741c..74394a2483 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -34,4 +34,6 @@ closet door. Security checks inside and finds no one. Kristy scatters everything in the closet and finds nothing. Everyones leaves cursing Kristy and they think that it's a prank. -Kristy collapses and weeps uncontrollably. \ No newline at end of file +Kristy collapses and weeps uncontrollably. + +Kristy's friends Bella and Ana console her and checks her surroundings. \ No newline at end of file From 6db2dbd26009e4b97ad7f564a2e14b6a3a0d3e32 Mon Sep 17 00:00:00 2001 From: Drithin Date: Mon, 2 Jan 2017 10:26:43 -0800 Subject: [PATCH 5103/5486] chore: Update to the story --- english/alone/alone.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 74394a2483..8c7448af14 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -36,4 +36,7 @@ and finds nothing. Everyones leaves cursing Kristy and they think that it's a pr Kristy collapses and weeps uncontrollably. -Kristy's friends Bella and Ana console her and checks her surroundings. \ No newline at end of file +Kristy's friends Bella and Ana console her and checks her surroundings. + +They find no one around, everything in Kristy's room is untouched. Stranger +sneaks behind the window and watch her weep. \ No newline at end of file From 4168974c7870201d8261106e31dc2d4d6a5246b0 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 3 Jan 2017 16:39:44 +0200 Subject: [PATCH 5104/5486] Add - Afirkaans - Bobotie --- afrikaans/bobotie/bobotie.md | 1 + afrikaans/kos.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 afrikaans/bobotie/bobotie.md diff --git a/afrikaans/bobotie/bobotie.md b/afrikaans/bobotie/bobotie.md new file mode 100644 index 0000000000..24886ea197 --- /dev/null +++ b/afrikaans/bobotie/bobotie.md @@ -0,0 +1 @@ +Net soos jou ma dit maak. Beter saam met daai ander Suid-Afikaanse staatmaker, Mrs Balls.... diff --git a/afrikaans/kos.md b/afrikaans/kos.md index d066fabca5..fd726aef20 100644 --- a/afrikaans/kos.md +++ b/afrikaans/kos.md @@ -7,3 +7,5 @@ Jy voel honger. Jy besluit om iets eg Afrikaans te eet. Jy besluit om een van di - [Biltong] (./biltong/biltong.md) - [Koeksisters] (./koeksisters/koeksisters.md) + +- [Bobotie] (./bobotie/bobotie.md) From 2702d3642bb21916b3b24062271baf3d1c147088 Mon Sep 17 00:00:00 2001 From: Drithin Date: Tue, 3 Jan 2017 10:35:56 -0800 Subject: [PATCH 5105/5486] chore: Added new lines to the story --- english/alone/alone.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 8c7448af14..eea6218175 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -39,4 +39,7 @@ Kristy collapses and weeps uncontrollably. Kristy's friends Bella and Ana console her and checks her surroundings. They find no one around, everything in Kristy's room is untouched. Stranger -sneaks behind the window and watch her weep. \ No newline at end of file +sneaks behind the window and watch her weep. + +Kristy sees him at the window and runs into it. Her nose bleeds with the impact and +stranger fades into the dark leaving no clue. \ No newline at end of file From 98c58f116bda9405cd5d299d2a15194f7d591bdf Mon Sep 17 00:00:00 2001 From: FrenchUdacityStudent Date: Tue, 3 Jan 2017 22:40:43 -0500 Subject: [PATCH 5106/5486] Ajout action porte en miel --- french/dessine/porte.md | 4 +++- french/dessine/porte/ouvrir-porte.md | 6 ++++++ french/dessine/porte/repos/sieste.md | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 french/dessine/porte/ouvrir-porte.md create mode 100644 french/dessine/porte/repos/sieste.md diff --git a/french/dessine/porte.md b/french/dessine/porte.md index 1feca30183..3700adda98 100644 --- a/french/dessine/porte.md +++ b/french/dessine/porte.md @@ -7,4 +7,6 @@ Donc je decide de [Essayer d'ouvrir la porte faite de chocolat](chocolat/essayer-ouvrir-chocolat.md) -[Essayer mange la porte faite de caramel](caramel/mangez-caramel.md) \ No newline at end of file +[Essayer mange la porte faite de caramel](caramel/mangez-caramel.md) + +[Ouvrir la porte faite de miel](porte/ouvrir-porte.md) diff --git a/french/dessine/porte/ouvrir-porte.md b/french/dessine/porte/ouvrir-porte.md new file mode 100644 index 0000000000..f57027092d --- /dev/null +++ b/french/dessine/porte/ouvrir-porte.md @@ -0,0 +1,6 @@ +Vous ouvrez la porte en miel mais, telle une mouche sur du papier tue-mouche, votre main reste collée à la poignée... +Vous décidez de vous aider de votre seconde main pour vous libérer, cependant, celle-ci se retrouve aussi engluée dans ce miel. + +Exténué par tant d'efforts, vous décidez alors de... + +[Faire une sieste pour reprendre des forces](repos/sieste.md) diff --git a/french/dessine/porte/repos/sieste.md b/french/dessine/porte/repos/sieste.md new file mode 100644 index 0000000000..6b74539ea5 --- /dev/null +++ b/french/dessine/porte/repos/sieste.md @@ -0,0 +1,5 @@ +Vous vous assoupissez, votre tête se fait lourde, très lourde, trop lourde... + +Il est trop tard, votre visage se retrouve lui aussi englué dans le miel. + +Vous mourrez étouffé. From 74666136f41c021ccdb518244363b83d732f9e3f Mon Sep 17 00:00:00 2001 From: FrenchUdacityStudent Date: Tue, 3 Jan 2017 22:44:23 -0500 Subject: [PATCH 5107/5486] Fix action porte en miel --- french/dessine/porte/ouvrir-porte.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/french/dessine/porte/ouvrir-porte.md b/french/dessine/porte/ouvrir-porte.md index f57027092d..e16f67affb 100644 --- a/french/dessine/porte/ouvrir-porte.md +++ b/french/dessine/porte/ouvrir-porte.md @@ -1,5 +1,7 @@ -Vous ouvrez la porte en miel mais, telle une mouche sur du papier tue-mouche, votre main reste collée à la poignée... -Vous décidez de vous aider de votre seconde main pour vous libérer, cependant, celle-ci se retrouve aussi engluée dans ce miel. +Vous ouvrez la porte en miel mais, telle une mouche sur du papier tue-mouche, +votre main reste collée à la poignée... Vous décidez de vous aider de votre +seconde main pour vous libérer, cependant, celle-ci se retrouve aussi engluée +dans ce miel. Exténué par tant d'efforts, vous décidez alors de... From 01bde540c0ece07e6ab59f46c1f04a51bedf8728 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 4 Jan 2017 12:16:32 +0200 Subject: [PATCH 5108/5486] Change value of the bobotie file --- afrikaans/bobotie/bobotie.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afrikaans/bobotie/bobotie.md b/afrikaans/bobotie/bobotie.md index 24886ea197..287058254d 100644 --- a/afrikaans/bobotie/bobotie.md +++ b/afrikaans/bobotie/bobotie.md @@ -1 +1 @@ -Net soos jou ma dit maak. Beter saam met daai ander Suid-Afikaanse staatmaker, Mrs Balls.... +Net soos jou ma dit maak. From 8534fe0bb30af3cfbcdbb1ac09190b0c46253a3a Mon Sep 17 00:00:00 2001 From: vipin kumar Date: Wed, 4 Jan 2017 15:24:39 +0000 Subject: [PATCH 5109/5486] Add lines into english and hindi md --- english/marshmallow.md | 15 ++++++--------- hindi/bollywood.md | 4 +++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 5a96adf5aa..0e2e9ca379 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1197,20 +1197,17 @@ Maybe this is a [dream](dream/dream.md)? Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? -<<<<<<< HEAD -Have you ever heard any unusual sounds -when you're alone? -They're not what you think. -Get to know them [here](blackAndwhite/blackAndwhite.md) - -======= Like football or soccer(as many others call it)? Must Watch [The_Greatest_Battle_Ever] (https://www.youtube.com/watch?v=KyHDZqp2ThU) Some other guy beat me to it. Too lazy [here](lazy/lazy.md) What if I told that all this is just a bunch of [files](see-files/files.md) ->>>>>>> upstream/master +Have you ever heard any unusual sounds +when you're alone? +They're not what you think. +Get to know them [here](blackAndwhite/blackAndwhite.md) + A Story of Being Alone Read it [here](alone/alone.md) @@ -1220,4 +1217,4 @@ Information on some famous tv series I have atlast found a way to heaven...Want to go [there](00_PortBlair's Emerald blue/PortBlairVoyage.md) - +Why are you reading this line? just smile and move on. diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 29e3d5601b..4fb172673e 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -1,4 +1,4 @@ -चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) +चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) बॉलीवुड में आपका स्वागत है ! @@ -38,3 +38,5 @@ Check out similar courses at [udacity](http://www.udacity.com/) Check out [Tiger Shroff](https://www.instagram.com/tigerjackieshroff/?hl=en) Checkout [Babita Phogat](https://www.instagram.com/explore/tags/babitaphogat/) + +Why are you reading this line? From 2f860e35e9fac2699f9228f535b8d2943c7319ff Mon Sep 17 00:00:00 2001 From: vipin kumar Date: Wed, 4 Jan 2017 15:30:34 +0000 Subject: [PATCH 5110/5486] Added back the deleted lines, which were indicating merge conflict. --- english/marshmallow.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 0e2e9ca379..2a643c9dbe 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1197,17 +1197,20 @@ Maybe this is a [dream](dream/dream.md)? Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? +<<<<<<< HEAD +Have you ever heard any unusual sounds +when you're alone? +They're not what you think. +Get to know them [here](blackAndwhite/blackAndwhite.md) + +======= Like football or soccer(as many others call it)? Must Watch [The_Greatest_Battle_Ever] (https://www.youtube.com/watch?v=KyHDZqp2ThU) Some other guy beat me to it. Too lazy [here](lazy/lazy.md) What if I told that all this is just a bunch of [files](see-files/files.md) -Have you ever heard any unusual sounds -when you're alone? -They're not what you think. -Get to know them [here](blackAndwhite/blackAndwhite.md) - +>>>>>>> upstream/master A Story of Being Alone Read it [here](alone/alone.md) From e17e7394524073c4bd30d8c1d9a6350f758248a7 Mon Sep 17 00:00:00 2001 From: vipin kumar Date: Wed, 4 Jan 2017 15:37:22 +0000 Subject: [PATCH 5111/5486] Some more lines that it says I deleted. --- english/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 2a643c9dbe..3e77ac24dd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1220,4 +1220,6 @@ Information on some famous tv series I have atlast found a way to heaven...Want to go [there](00_PortBlair's Emerald blue/PortBlairVoyage.md) -Why are you reading this line? just smile and move on. +Why are you reading this line? smile and move on. + +- From 3841b26bd8a65d9378342c98ed5b1eb9a943a585 Mon Sep 17 00:00:00 2001 From: "BBU\\eursu" Date: Wed, 4 Jan 2017 17:38:51 +0200 Subject: [PATCH 5112/5486] modificari la capitolul foc --- romanian/foc/faci-foc.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/romanian/foc/faci-foc.md b/romanian/foc/faci-foc.md index a239f4eae7..8a47fd3333 100644 --- a/romanian/foc/faci-foc.md +++ b/romanian/foc/faci-foc.md @@ -1,2 +1,2 @@ -Faci focul si te pui sa manci nalebele. -Dupa care: \ No newline at end of file +Faci focul si te pui sa mananci nalbele rumenite. +Dupa [care...] (../nalba.md) \ No newline at end of file From 26f49bdd290b467865fed10f7503904ebeec8218 Mon Sep 17 00:00:00 2001 From: vipin kumar Date: Wed, 4 Jan 2017 15:39:15 +0000 Subject: [PATCH 5113/5486] One more hyphen that I didn't touched. --- hindi/bollywood.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 4fb172673e..d30ea4a936 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -1,4 +1,4 @@ -चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) +-चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) बॉलीवुड में आपका स्वागत है ! From 6bf551a08c0ca8190d0a78c09f65194abff9c25e Mon Sep 17 00:00:00 2001 From: Hossein Date: Wed, 4 Jan 2017 10:39:43 -0500 Subject: [PATCH 5114/5486] Add a link from 'lego' story to 'lego' story --- english/lisp/lisp.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/lisp/lisp.md b/english/lisp/lisp.md index 21c4c2a8e1..fd2bd2c098 100644 --- a/english/lisp/lisp.md +++ b/english/lisp/lisp.md @@ -8,3 +8,4 @@ The prompt pops up. +Want a cool lego story? [Go here](../lego/lego.md) From 66a24e36dd1eb5e4f02fdcae0adaf34323e61c72 Mon Sep 17 00:00:00 2001 From: vipin kumar Date: Wed, 4 Jan 2017 15:48:04 +0000 Subject: [PATCH 5115/5486] Add some symbol that I don't know how changed or got deleted. --- hindi/bollywood.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index d30ea4a936..9d8eb513e7 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -1,4 +1,4 @@ --चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) +चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) बॉलीवुड में आपका स्वागत है ! From ad4104154dab6b5810146489ecbfa89b26306466 Mon Sep 17 00:00:00 2001 From: "BBU\\eursu" Date: Wed, 4 Jan 2017 17:53:41 +0200 Subject: [PATCH 5116/5486] redid changes to comply with casey's criteria --- romanian/foc/faci-foc.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/romanian/foc/faci-foc.md b/romanian/foc/faci-foc.md index 8a47fd3333..75555595f3 100644 --- a/romanian/foc/faci-foc.md +++ b/romanian/foc/faci-foc.md @@ -1,2 +1,3 @@ -Faci focul si te pui sa mananci nalbele rumenite. -Dupa [care...] (../nalba.md) \ No newline at end of file +Faci focul si te pui sa manci nalebele. +Dupa care: +Te intorci la firul principal al [povestii] (../nalba.md) \ No newline at end of file From 19db44b1e2a4a6a3ef550fae0f50b15d86b119e5 Mon Sep 17 00:00:00 2001 From: thumbelinya Date: Thu, 5 Jan 2017 02:03:03 +0900 Subject: [PATCH 5117/5486] added new pages 20170105 --- japanese/cold/cold.md | 4 +++- japanese/hello/hello.md | 4 +++- japanese/hiyashi_chuka/hiyashi_chuka.md | 2 ++ japanese/kakejiku/kakejiku.md | 2 ++ japanese/ramen/ramen.md | 6 +++++- 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 japanese/hiyashi_chuka/hiyashi_chuka.md diff --git a/japanese/cold/cold.md b/japanese/cold/cold.md index 3fc4235cc3..99d790480d 100644 --- a/japanese/cold/cold.md +++ b/japanese/cold/cold.md @@ -1,3 +1,5 @@ なんか急に寒くなってきた。窓際から「助けて～」らしき女性の声を聞こえ振り向くと、白衣の女性が座っている。 -気になったので[声をかける](../hello/hello.md) \ No newline at end of file +気になったので[声をかける](../hello/hello.md) + +とっさに彼女が持っていたiPhoneは自分のものだと[嘘をつく](../smartphone/iphone-plastic.md) \ No newline at end of file diff --git a/japanese/hello/hello.md b/japanese/hello/hello.md index 3bbda56616..6ad2077cbe 100644 --- a/japanese/hello/hello.md +++ b/japanese/hello/hello.md @@ -1 +1,3 @@ -女性はゆっくりと顔をあげる。街頭に照らされた彼女の顔は... \ No newline at end of file +女性はゆっくりと顔をあげる。街頭に照らされた彼女の顔は... +どこかで見覚えのある顔だった。 +数年ぶりだが間違いない。幼馴染の「えりこ」だ。 \ No newline at end of file diff --git a/japanese/hiyashi_chuka/hiyashi_chuka.md b/japanese/hiyashi_chuka/hiyashi_chuka.md new file mode 100644 index 0000000000..a01aadf40d --- /dev/null +++ b/japanese/hiyashi_chuka/hiyashi_chuka.md @@ -0,0 +1,2 @@ +「すみません。冷やし中華は夏しかやってなくて....」 +奥から現れた30代くらいの女性店員が申し訳なさそうに頭をさげた。 diff --git a/japanese/kakejiku/kakejiku.md b/japanese/kakejiku/kakejiku.md index 776910a192..2890ca14d8 100644 --- a/japanese/kakejiku/kakejiku.md +++ b/japanese/kakejiku/kakejiku.md @@ -3,3 +3,5 @@ あなたは: [松茸を注文する](../mattake/mattake.md) + +高そうだな...[松茸はやめて冷やし中華を注文する](../hiyashi_chuka/hiyashi_chuka.md) \ No newline at end of file diff --git a/japanese/ramen/ramen.md b/japanese/ramen/ramen.md index 303df1dbf4..9bef8c18b3 100644 --- a/japanese/ramen/ramen.md +++ b/japanese/ramen/ramen.md @@ -1 +1,5 @@ -とはいえ、今ベイエリアにいるし、ここらへんのラーメン屋もあんまり美味しくないし、どうしようかな…？ \ No newline at end of file +とはいえ、今ベイエリアにいるし、ここらへんのラーメン屋もあんまり美味しくないし、どうしようかな…？ + +そうだ。羽田が近いから[タイに行こう](../katsudon/katsudon.md) + +ラーメン屋を検索していると[突然、爆発音が....!](../garden/garden.md) From 037df857341e93a9fad466a0d897d66e0525bf17 Mon Sep 17 00:00:00 2001 From: Drithin Date: Wed, 4 Jan 2017 09:04:08 -0800 Subject: [PATCH 5118/5486] chore: Added new story --- english/alone/alone.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index eea6218175..3d2b73e77a 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -42,4 +42,7 @@ They find no one around, everything in Kristy's room is untouched. Stranger sneaks behind the window and watch her weep. Kristy sees him at the window and runs into it. Her nose bleeds with the impact and -stranger fades into the dark leaving no clue. \ No newline at end of file +stranger fades into the dark leaving no clue. + +Bella holds Kristy from behind and usher her to the bed and Ana locks the window. +Bella grabs the first aid kit and treats Kristy. \ No newline at end of file From aa68cc59c5545eb6dbb16dcccf40b0e1a62eee93 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 5 Jan 2017 20:09:54 +0100 Subject: [PATCH 5119/5486] Add new page and options --- english/cold_outside/cold_outside.md | 5 +++++ english/marshmallow.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 english/cold_outside/cold_outside.md diff --git a/english/cold_outside/cold_outside.md b/english/cold_outside/cold_outside.md new file mode 100644 index 0000000000..5a708fe2f5 --- /dev/null +++ b/english/cold_outside/cold_outside.md @@ -0,0 +1,5 @@ +It is winter, close to the parallel 55ºN so, understandably you either + +stay inside and light a [fire](../fire/fire.md) + +or buy a plane ticket and go on a [vacation](licked-cat/vacation.md) \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index 3e77ac24dd..531d3310f2 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1197,6 +1197,8 @@ Maybe this is a [dream](dream/dream.md)? Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? +Or maybe you're trying to avoid the cold [outside](cold_outside/cold_outside.md) + <<<<<<< HEAD Have you ever heard any unusual sounds when you're alone? From b461d98b2bb95402022c1142cb07185d3bf1a71b Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 5 Jan 2017 20:15:21 +0100 Subject: [PATCH 5120/5486] Fix link bugs --- english/cold_outside/cold_outside.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/cold_outside/cold_outside.md b/english/cold_outside/cold_outside.md index 5a708fe2f5..b42bbdbc7a 100644 --- a/english/cold_outside/cold_outside.md +++ b/english/cold_outside/cold_outside.md @@ -1,5 +1,5 @@ It is winter, close to the parallel 55ºN so, understandably you either -stay inside and light a [fire](../fire/fire.md) +stay inside and light a [fire](../light-fire/fire.md) -or buy a plane ticket and go on a [vacation](licked-cat/vacation.md) \ No newline at end of file +or buy a plane ticket and go on a [vacation](../licked-cat/vacation.md) \ No newline at end of file From d1f5bf5fbed15b70729bc17d51546cc2638a8f30 Mon Sep 17 00:00:00 2001 From: Yuyu Zeng Date: Thu, 5 Jan 2017 11:19:44 +0100 Subject: [PATCH 5121/5486] ask which TV series in recommended TV directory --- .../stranger.things.md" | 1 + 1 file changed, 1 insertion(+) diff --git "a/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/stranger.things.md" "b/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/stranger.things.md" index c26e7d4587..32d4c1e61d 100644 --- "a/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/stranger.things.md" +++ "b/Chinese/\346\216\250\350\215\220\347\276\216\345\211\247/stranger.things.md" @@ -5,3 +5,4 @@ which begins to tear at thefabric of an otherwise peaceful community. Dark government agencies and seemingly malevolent supernatural forces converge on the town, while a few locals begin to understand that, there's more going on than meets the eye. +Question: which TV series are they? \ No newline at end of file From 4a0f9bc52642020635beea91d750622ad388f870 Mon Sep 17 00:00:00 2001 From: irbekrm Date: Thu, 5 Jan 2017 14:33:37 +0000 Subject: [PATCH 5122/5486] add a walk-out option --- latvian/grab-lighter/es_aizeju/es_aizeju.md | 3 +++ latvian/grab-lighter/grab-lighter.md | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 latvian/grab-lighter/es_aizeju/es_aizeju.md diff --git a/latvian/grab-lighter/es_aizeju/es_aizeju.md b/latvian/grab-lighter/es_aizeju/es_aizeju.md new file mode 100644 index 0000000000..c74f6b19ca --- /dev/null +++ b/latvian/grab-lighter/es_aizeju/es_aizeju.md @@ -0,0 +1,3 @@ +Piecelos un neizlemigi izstebereju lauka spoza sestdienas +rita. Zefiru istaba, kas vel nebus? Nu, vismaz skiltavas +noderes. Nez kam ta virve bija domata? diff --git a/latvian/grab-lighter/grab-lighter.md b/latvian/grab-lighter/grab-lighter.md index 70c61c1577..985590e91f 100644 --- a/latvian/grab-lighter/grab-lighter.md +++ b/latvian/grab-lighter/grab-lighter.md @@ -2,4 +2,7 @@ Tu ar trīcošām rokām paķer šķiltavas no zemes. Tu drudžaini tās mēģini noslēpt savā bikšū kabatā. -Tu izvelc telefonu no otras kabatas un Googlei jautā: ko tagad darīt? \ No newline at end of file +Tu izvelc telefonu no otras kabatas un Googlei jautā: ko tagad darīt? + +Tacu pirms paradas atbilde, telefons izladejas. Shis fakts tevi +ashi atgriezh [realitate](es_aizeju.md) From 6ee5dd81e84033ca7c9b5e1a6f6814bedecd80e1 Mon Sep 17 00:00:00 2001 From: irbekrm Date: Thu, 5 Jan 2017 14:54:57 +0000 Subject: [PATCH 5123/5486] fix a broken link --- latvian/grab-lighter/grab-lighter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latvian/grab-lighter/grab-lighter.md b/latvian/grab-lighter/grab-lighter.md index 985590e91f..8362ca83b5 100644 --- a/latvian/grab-lighter/grab-lighter.md +++ b/latvian/grab-lighter/grab-lighter.md @@ -5,4 +5,4 @@ Tu drudžaini tās mēģini noslēpt savā bikšū kabatā. Tu izvelc telefonu no otras kabatas un Googlei jautā: ko tagad darīt? Tacu pirms paradas atbilde, telefons izladejas. Shis fakts tevi -ashi atgriezh [realitate](es_aizeju.md) +ashi atgriezh [realitate](./es_aizeju/es_aizeju.md) From 1743bc618d883ac0f1d2e16400ffa2093fc2ec78 Mon Sep 17 00:00:00 2001 From: Drithin Date: Thu, 5 Jan 2017 09:59:42 -0800 Subject: [PATCH 5124/5486] chore: added new lines to the story --- english/alone/alone.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 3d2b73e77a..4e69f511d8 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -45,4 +45,7 @@ Kristy sees him at the window and runs into it. Her nose bleeds with the impact stranger fades into the dark leaving no clue. Bella holds Kristy from behind and usher her to the bed and Ana locks the window. -Bella grabs the first aid kit and treats Kristy. \ No newline at end of file +Bella grabs the first aid kit and treats Kristy. + +Bella stops the blood flow and plasters Kristy's nose and Ana scans surroundings +to check for anything suspicious. \ No newline at end of file From 05950bc982a755402773303131fb93fdc63be951 Mon Sep 17 00:00:00 2001 From: Apoorva Asgekar Date: Thu, 5 Jan 2017 14:01:56 -0800 Subject: [PATCH 5125/5486] Added some lines to the dance-randomly page. --- english/dance-randomly/dance-randomly.md | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/english/dance-randomly/dance-randomly.md b/english/dance-randomly/dance-randomly.md index 59156115a2..f5f43bebb0 100644 --- a/english/dance-randomly/dance-randomly.md +++ b/english/dance-randomly/dance-randomly.md @@ -10,4 +10,24 @@ You catch yourself smiling, ever so brightly. And oh yeah... how could you have forgotten?... life... it's beautiful! -It only makes sense that next, you... \ No newline at end of file +It only makes sense that next, you... + +Get inspired to finally do all those things you have been long contemplating... + +Get that crazy haircut...change your look. + +Quit that boring, unchallenging safe job and learn something new... +...don't feel ashamed to start at the bottom. + +Learn that new language.... + +Take a 6 month break to just travel...meet new people...try new things. + +Tell those who value - why they are such an important part of your life. + +Thank those you take for granted... + +Live the new life you just found with the wonder, enthusiasm and zeal of a 2 yr old... + +Exactly like its supposed to be lived!!! + From 07ebd83b11df209bad99082afba973a52e5d5897 Mon Sep 17 00:00:00 2001 From: MaxCCT Date: Thu, 5 Jan 2017 17:40:00 -0600 Subject: [PATCH 5126/5486] Add new choice to 'use-the-fork.md' and corresponding story continuation, 'grateful-man-bear-pig.md' --- english/use-the-fork-luke/use-the-fork.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/use-the-fork-luke/use-the-fork.md b/english/use-the-fork-luke/use-the-fork.md index 908ce62e65..df33d469af 100644 --- a/english/use-the-fork-luke/use-the-fork.md +++ b/english/use-the-fork-luke/use-the-fork.md @@ -71,4 +71,6 @@ You scream out of fright, and notice the reflection of the hippy holding a large blue fork in the mirror next to you, even though there is no one else in the room! He gestures for you to reach towards the mirror! -[Reach towards the mirror...](../virtualreality/oculus.md) \ No newline at end of file +[Reach towards the mirror...](../virtualreality/oculus.md) + +[Smash the mirror...](../luck/grateful-man-bear-pig.md) From 35f9cc6ded42d54f0d88a24bfd40d25f874a6e07 Mon Sep 17 00:00:00 2001 From: MaxCCT Date: Thu, 5 Jan 2017 17:41:08 -0600 Subject: [PATCH 5127/5486] Add 'grateful-man-bear-pig' continuation to 'use-the-fork' --- english/luck/grateful-man-bear-pig.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 english/luck/grateful-man-bear-pig.md diff --git a/english/luck/grateful-man-bear-pig.md b/english/luck/grateful-man-bear-pig.md new file mode 100644 index 0000000000..b128a832f1 --- /dev/null +++ b/english/luck/grateful-man-bear-pig.md @@ -0,0 +1,21 @@ +As the shards of shattered mirror cascade to the ground, the Man-Bear-Pig's void-like +eyes appear to dance with an inner light, while the grotesque folds of its snout seem +to contort into a configuration that could charitably be described as a smile. + +"Finally, you have banished the fork from my domain!" exults the Man-Bear-Pig. "Come! +Let me embrace you and adore you to the full measure of your merit." + +The bulk of the Man-Bear-Pig looms over you, and it's colossal, hair, trottered arms +enfold you ineluctably. + +You remain in this hug of horrors until you forget you ever had any other existence. +The Man-Bear-Pig croons continually over you, periodically breaking and re-breaking +each of your ribs as it squeezes you tighter and tighter over the months and years. +You are compelled to sustain yourself by suckling the rancid, faintly mayonnaise- +tasting milk of the Man-Bear-Pig's anatomically inexplicable teats. + +Though you lose all track of time -- of even the concept of time, and indeed of space +and hope and beauty and pretty much all concepts other than that of the Man-Bear-Pig's +abominable embrace -- eventually seven years have passed. The Man-Bear-Pig releases +you, smiles -- if it is a smile -- down upon you affectionately, and lumbers away. You +collapse onto a scattering of mirror fragments. From 1889eb91725b647e8b7d0bfd336ea312fd5c90cb Mon Sep 17 00:00:00 2001 From: piyush-bhatti Date: Fri, 6 Jan 2017 03:07:09 +0300 Subject: [PATCH 5128/5486] Add iot wiki page link --- english/iot/intro.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/iot/intro.md b/english/iot/intro.md index 9537b3d0ca..6578aedc58 100644 --- a/english/iot/intro.md +++ b/english/iot/intro.md @@ -4,6 +4,7 @@ Internet of Things(IoT) is a network of synchronised physical 'things' - gadgets automobiles, buildings - embedded with sensors and powerful electronic circuits powered by intelligent code that enable them to talk to each other without human interference. +Click [here](https://en.wikipedia.org/wiki/Internet_of_things) for iot wiki. The story begins here ... From 939f709ce85e03a5cdfc45f2fe4b88cb70b1accb Mon Sep 17 00:00:00 2001 From: Nate Date: Thu, 5 Jan 2017 16:34:40 -0800 Subject: [PATCH 5129/5486] add tiger attach story to extend zoo story --- english/tiger-attack/tiger-attack.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/tiger-attack/tiger-attack.md diff --git a/english/tiger-attack/tiger-attack.md b/english/tiger-attack/tiger-attack.md new file mode 100644 index 0000000000..2966c39277 --- /dev/null +++ b/english/tiger-attack/tiger-attack.md @@ -0,0 +1 @@ +The tigers come charging at me full speed. They are after the lemonade, I just know it. \ No newline at end of file From ff535329633d38d22efff5d7dd7a9f66c8febb58 Mon Sep 17 00:00:00 2001 From: piyush-bhatti Date: Fri, 6 Jan 2017 03:36:43 +0300 Subject: [PATCH 5130/5486] Add an empty line --- english/iot/intro.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/iot/intro.md b/english/iot/intro.md index 6578aedc58..d36d7f6569 100644 --- a/english/iot/intro.md +++ b/english/iot/intro.md @@ -4,6 +4,7 @@ Internet of Things(IoT) is a network of synchronised physical 'things' - gadgets automobiles, buildings - embedded with sensors and powerful electronic circuits powered by intelligent code that enable them to talk to each other without human interference. + Click [here](https://en.wikipedia.org/wiki/Internet_of_things) for iot wiki. The story begins here ... From 095a62a02d17e3bb5a2fc785d40c06000b3984b5 Mon Sep 17 00:00:00 2001 From: jlarios Date: Thu, 5 Jan 2017 16:40:07 -0800 Subject: [PATCH 5131/5486] Add blue pill/red pill choices to weed.md --- english/weed/weed.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/weed/weed.md b/english/weed/weed.md index 3d7abdf2d4..46ec15a054 100644 --- a/english/weed/weed.md +++ b/english/weed/weed.md @@ -22,4 +22,10 @@ Decide to go to [sleep] instead?(../sleep/marshmallow.md) Opt for a [chemical-free nirvana]?(../sleep/sit-down-to-meditate.md) +Choose [Blue Pill](https://www.youtube.com/watch?v=1GFkN4deuZU) + +Or + +Choose [Red Pill](https://www.youtube.com/watch?v=1EdUjlawLJM) + Go [back to the room]?(../marshmallow.md) From a43f96384099b3c9208449cd9efd6eae3b8a0516 Mon Sep 17 00:00:00 2001 From: Nate Date: Thu, 5 Jan 2017 16:41:12 -0800 Subject: [PATCH 5132/5486] add link --- english/zoo/zoo.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/zoo/zoo.md b/english/zoo/zoo.md index c984079beb..1d5e50afd6 100644 --- a/english/zoo/zoo.md +++ b/english/zoo/zoo.md @@ -4,4 +4,7 @@ nature. I saw a lot of tigers, elephants, deer and a whole lot of other [animals I was pretty thirsty. There is a lemonade stand over there. I head over and buy some [lemonade](../drink/lemonade/lemonade.md) -I choose to get better at [English](../get-better-at-english/english.md) \ No newline at end of file + +I choose to get better at [English](../get-better-at-english/english.md) + +After my self trolling is complete, I decide to drink the lemonade. As I lift the lemonade to my mouth I see the tigers have broken loose. [tiger-attack](../tiger-attack/tiger-attack.md) \ No newline at end of file From 007e03e86efb764e156c1e882a27edcfb872b282 Mon Sep 17 00:00:00 2001 From: Nate Date: Thu, 5 Jan 2017 16:47:16 -0800 Subject: [PATCH 5133/5486] Brake up the lines on story --- english/zoo/zoo.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/zoo/zoo.md b/english/zoo/zoo.md index 1d5e50afd6..5641a42198 100644 --- a/english/zoo/zoo.md +++ b/english/zoo/zoo.md @@ -7,4 +7,6 @@ I head over and buy some [lemonade](../drink/lemonade/lemonade.md) I choose to get better at [English](../get-better-at-english/english.md) -After my self trolling is complete, I decide to drink the lemonade. As I lift the lemonade to my mouth I see the tigers have broken loose. [tiger-attack](../tiger-attack/tiger-attack.md) \ No newline at end of file +After my self trolling is complete, I decide to drink the lemonade. +As I lift the lemonade to my mouth I see the tigers have broken loose. +[tiger-attack](../tiger-attack/tiger-attack.md) \ No newline at end of file From 54cc7c84b554773e43ce930213da9dbaf43d65b8 Mon Sep 17 00:00:00 2001 From: Nate Date: Thu, 5 Jan 2017 16:50:42 -0800 Subject: [PATCH 5134/5486] fix white space error --- english/zoo/zoo.md | 1 - 1 file changed, 1 deletion(-) diff --git a/english/zoo/zoo.md b/english/zoo/zoo.md index 5641a42198..30fc6572e5 100644 --- a/english/zoo/zoo.md +++ b/english/zoo/zoo.md @@ -4,7 +4,6 @@ nature. I saw a lot of tigers, elephants, deer and a whole lot of other [animals I was pretty thirsty. There is a lemonade stand over there. I head over and buy some [lemonade](../drink/lemonade/lemonade.md) - I choose to get better at [English](../get-better-at-english/english.md) After my self trolling is complete, I decide to drink the lemonade. From 062615aaead7c06643cbf57a0d058907a2caff1b Mon Sep 17 00:00:00 2001 From: Denis Date: Fri, 6 Jan 2017 14:15:38 +0300 Subject: [PATCH 5135/5486] Add "be a vegetarian" choice to russian story --- russian/vegetarian/vegetarian.md | 5 +++++ russian/zefir.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 russian/vegetarian/vegetarian.md diff --git a/russian/vegetarian/vegetarian.md b/russian/vegetarian/vegetarian.md new file mode 100644 index 0000000000..9b8122a6be --- /dev/null +++ b/russian/vegetarian/vegetarian.md @@ -0,0 +1,5 @@ +Вы понимаете что Вы немного устали от всего этого хипстерского антуража и решаете стать вегетарианцем. +Тем более что сегодня дома нет ни грамма мяса. "Ладно, я слишком стар для похода в магазин и побуду +вегетарианцем недельку" - думаете Вы. Неделя проходит и Вам начинает нравиться новое состояние. +Спасаешь человечество опять же. Так уж и быть, Вы сдаетесь и начинаете называть себя вегетарианцем +прилюдно. diff --git a/russian/zefir.md b/russian/zefir.md index f6d9258550..9572bad84e 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -117,3 +117,5 @@ [Наделаю селфи](selfie/make_selfie.md) [Зайти на двач](2ch/2ch.md) + +[Стану вегетарианцем](vegetarian/vegetarian.md) From 6f8dc8f174601cb3e3fcd20027f926d8cc328a40 Mon Sep 17 00:00:00 2001 From: Elijah Braam Date: Fri, 6 Jan 2017 09:44:54 -0500 Subject: [PATCH 5136/5486] Add go to malo concert option and make a link to directory --- .../get-breakfast/get-breakfast.md | 2 ++ .../get-breakfast/go-to-malo/go-to-malo.md | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 english/count-the-marshmellows/eat-all-the-marshmellows/get-breakfast/go-to-malo/go-to-malo.md diff --git a/english/count-the-marshmellows/eat-all-the-marshmellows/get-breakfast/get-breakfast.md b/english/count-the-marshmellows/eat-all-the-marshmellows/get-breakfast/get-breakfast.md index 302cb6486d..4c5b200e3d 100644 --- a/english/count-the-marshmellows/eat-all-the-marshmellows/get-breakfast/get-breakfast.md +++ b/english/count-the-marshmellows/eat-all-the-marshmellows/get-breakfast/get-breakfast.md @@ -15,3 +15,5 @@ Her hand moves to reveal a tiny marshmallow. "Think about it," she urges before Do you ... [Hightail it to the marsh?](go-to-marsh/go-to-marsh.md) + +[Rush to a Malo concert?] (go-to-malo/go-to-malo.md) diff --git a/english/count-the-marshmellows/eat-all-the-marshmellows/get-breakfast/go-to-malo/go-to-malo.md b/english/count-the-marshmellows/eat-all-the-marshmellows/get-breakfast/go-to-malo/go-to-malo.md new file mode 100644 index 0000000000..0338af49e1 --- /dev/null +++ b/english/count-the-marshmellows/eat-all-the-marshmellows/get-breakfast/go-to-malo/go-to-malo.md @@ -0,0 +1,10 @@ +You arrive at the Malo concert, certain that a bad pun was what the waitress meant by her cryptic clue. +You search the room for something, anything, that will give meaning to this story... + +The music is horrible, and you die. + +... + +You wake up in your bed. It's sunday morning, and you mom has made you blueberry pancakes. +You eat them and get ready for church. +Man, dreams are weird! \ No newline at end of file From 5c89306d6f2b6d9e486c4773f96472cb948d3756 Mon Sep 17 00:00:00 2001 From: Drithin Date: Fri, 6 Jan 2017 10:34:56 -0800 Subject: [PATCH 5137/5486] chore: Updated Story --- english/alone/alone.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 4e69f511d8..a7c62028ed 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -48,4 +48,7 @@ Bella holds Kristy from behind and usher her to the bed and Ana locks the window Bella grabs the first aid kit and treats Kristy. Bella stops the blood flow and plasters Kristy's nose and Ana scans surroundings -to check for anything suspicious. \ No newline at end of file +to check for anything suspicious. + +Kristy eventually crashes on her bed but the stranger come back to strangle her +with pillow. \ No newline at end of file From 12eb96f3f22d450707bae2c51ab7e133c6f440b0 Mon Sep 17 00:00:00 2001 From: Darren Lee Date: Sat, 7 Jan 2017 00:46:48 -0800 Subject: [PATCH 5138/5486] Adding start and error --- english/hawkstrider/error/error.md | 6 ++++++ english/hawkstrider/start.md | 7 +++++++ 2 files changed, 13 insertions(+) create mode 100644 english/hawkstrider/error/error.md create mode 100644 english/hawkstrider/start.md diff --git a/english/hawkstrider/error/error.md b/english/hawkstrider/error/error.md new file mode 100644 index 0000000000..c96fe7f566 --- /dev/null +++ b/english/hawkstrider/error/error.md @@ -0,0 +1,6 @@ +"Oh, traveler! You seem to be unfamiliar with these birds. They are quite friendly to strangers if you +Know how to speak Thalassian. Some bird whisperer also gave me a long lecture of speaking "hawkstrider". +She said "Hawkstriders always sing in harmony, each taking turns to fill in their two note melody. If a +Sound is missed, the next will fill in the missed note." I hope this is of some use to you." + +[Return to the start.](../start.md) \ No newline at end of file diff --git a/english/hawkstrider/start.md b/english/hawkstrider/start.md new file mode 100644 index 0000000000..041b3e8c46 --- /dev/null +++ b/english/hawkstrider/start.md @@ -0,0 +1,7 @@ +You find a swift pink hawkstrider staring inquisitively at you. + +A. [Greetings, noble bird!](/error/error.md) +B. Tweet, tweet +C. Anu belore dela'na +D. REARRRRR +E. URRRRRRR \ No newline at end of file From 040564de7142977e78bc3282ec728cef828f073a Mon Sep 17 00:00:00 2001 From: Darren Lee Date: Sat, 7 Jan 2017 00:48:34 -0800 Subject: [PATCH 5139/5486] Fix testing bug with start --- english/hawkstrider/start.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/hawkstrider/start.md b/english/hawkstrider/start.md index 041b3e8c46..73cc638a81 100644 --- a/english/hawkstrider/start.md +++ b/english/hawkstrider/start.md @@ -1,6 +1,6 @@ You find a swift pink hawkstrider staring inquisitively at you. -A. [Greetings, noble bird!](/error/error.md) +A. [Greetings, noble bird!](./error/error.md) B. Tweet, tweet C. Anu belore dela'na D. REARRRRR From 8fbbca095c21841b25ce188a1d74a4d1950e1704 Mon Sep 17 00:00:00 2001 From: Darren Lee Date: Sat, 7 Jan 2017 00:50:23 -0800 Subject: [PATCH 5140/5486] Fix links in start.md --- english/hawkstrider/start.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/hawkstrider/start.md b/english/hawkstrider/start.md index 73cc638a81..e340157500 100644 --- a/english/hawkstrider/start.md +++ b/english/hawkstrider/start.md @@ -1,7 +1,9 @@ You find a swift pink hawkstrider staring inquisitively at you. A. [Greetings, noble bird!](./error/error.md) -B. Tweet, tweet + +B. [Tweet, tweet](./error/error.md) + C. Anu belore dela'na D. REARRRRR E. URRRRRRR \ No newline at end of file From 3cd0b3f0990ee39aecf451556d339333467bd45a Mon Sep 17 00:00:00 2001 From: Darren Lee Date: Sat, 7 Jan 2017 01:03:33 -0800 Subject: [PATCH 5141/5486] Add base files + updates --- english/hawkstrider/rude/rude.md | 6 ++++++ english/hawkstrider/start.md | 6 ++++-- english/hawkstrider/startr/startr.md | 8 ++++++++ english/hawkstrider/startu/startu.md | 8 ++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 english/hawkstrider/rude/rude.md create mode 100644 english/hawkstrider/startr/startr.md create mode 100644 english/hawkstrider/startu/startu.md diff --git a/english/hawkstrider/rude/rude.md b/english/hawkstrider/rude/rude.md new file mode 100644 index 0000000000..13f1e23b30 --- /dev/null +++ b/english/hawkstrider/rude/rude.md @@ -0,0 +1,6 @@ +The hawkstrider leaps back, evidently startled. It glares angrily at you for a moment, +then quickly dashes off into the forest. + +That was extremely rude to say! Your adventure ends here. + +[Click here to return to english section](../../marshmallow.md) \ No newline at end of file diff --git a/english/hawkstrider/start.md b/english/hawkstrider/start.md index e340157500..871e2627f4 100644 --- a/english/hawkstrider/start.md +++ b/english/hawkstrider/start.md @@ -5,5 +5,7 @@ A. [Greetings, noble bird!](./error/error.md) B. [Tweet, tweet](./error/error.md) C. Anu belore dela'na -D. REARRRRR -E. URRRRRRR \ No newline at end of file + +D. [Rearrrrr](./startu/startu.md) + +E. [Urrrrrrr](./startr/startr.md) \ No newline at end of file diff --git a/english/hawkstrider/startr/startr.md b/english/hawkstrider/startr/startr.md new file mode 100644 index 0000000000..314175065b --- /dev/null +++ b/english/hawkstrider/startr/startr.md @@ -0,0 +1,8 @@ +The hawkstrider pauses for a moment then says: + +"Reaarrr. Urrrrr." + +A. [How ya doin fam?](../error/error.md) +B. Doral ana-diel? +C. Rearrrrr +D. [Urrrrrrr](../error/error.md) \ No newline at end of file diff --git a/english/hawkstrider/startu/startu.md b/english/hawkstrider/startu/startu.md new file mode 100644 index 0000000000..1b5271680d --- /dev/null +++ b/english/hawkstrider/startu/startu.md @@ -0,0 +1,8 @@ +The hawkstrider pauses for a moment then says: + +"Urrrrrrrrr." + +A. [How ya doin fam?](../error/error.md) +B. Doral ana-diel? +C. Rearrrrr +D. [Urrrrrrr](../error/error.md) \ No newline at end of file From bcc4cf6c149e34955d602328a5b11af337d913ac Mon Sep 17 00:00:00 2001 From: Darren Lee Date: Sat, 7 Jan 2017 01:22:09 -0800 Subject: [PATCH 5142/5486] Update startr and startu, almost release --- english/hawkstrider/startr/startr.md | 7 +++++-- english/hawkstrider/startu/startu.md | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/english/hawkstrider/startr/startr.md b/english/hawkstrider/startr/startr.md index 314175065b..ea0ae50074 100644 --- a/english/hawkstrider/startr/startr.md +++ b/english/hawkstrider/startr/startr.md @@ -3,6 +3,9 @@ The hawkstrider pauses for a moment then says: "Reaarrr. Urrrrr." A. [How ya doin fam?](../error/error.md) -B. Doral ana-diel? -C. Rearrrrr + +B. [Doral ana-diel?](../tier1/tier2/tier2.md) + +C. [Rearrrrr](../tier1/tier1.md) + D. [Urrrrrrr](../error/error.md) \ No newline at end of file diff --git a/english/hawkstrider/startu/startu.md b/english/hawkstrider/startu/startu.md index 1b5271680d..c52b09f85e 100644 --- a/english/hawkstrider/startu/startu.md +++ b/english/hawkstrider/startu/startu.md @@ -3,6 +3,9 @@ The hawkstrider pauses for a moment then says: "Urrrrrrrrr." A. [How ya doin fam?](../error/error.md) -B. Doral ana-diel? -C. Rearrrrr + +B. [Doral ana-diel?](../tier1/tier2/tier2.md) + +C. [Rearrrrr](../tier1/tier1.md) + D. [Urrrrrrr](../error/error.md) \ No newline at end of file From 671fe2116f52c9aee3a9b2684ac854a97936e901 Mon Sep 17 00:00:00 2001 From: 3ter <3ter@users.noreply.github.com> Date: Sat, 7 Jan 2017 22:08:23 +0100 Subject: [PATCH 5143/5486] feat: Update stopfen.md Added a sentence too build up just a little more tension. --- german/Stopfen/stopfen.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/german/Stopfen/stopfen.md b/german/Stopfen/stopfen.md index 8601f2d760..5c9e0f1d6a 100644 --- a/german/Stopfen/stopfen.md +++ b/german/Stopfen/stopfen.md @@ -1,4 +1,7 @@ Sie ziehen Ihre nasse Kleidung aus und versuchen mit dieser das Loch im Boot zu stopfen. +Nachdem Sie zunächst ungeschickterweise das Loch mit der Gürtelschnalle Ihrer Hose nur +noch größer gemacht haben, versuchen Sie verzweifelt ihre Socken in die letzten Ritzen +zu drücken mit dem Resultat, dass... Was für ein Glück! Es scheint zu funktionieren. Nun aber schnell ab ans Ufer! Doch wo sind die Ruder?! Sie stellen fest, dass die Paddel nicht im Boot sind. From ae53531bdfb22e26b64e439cd225d8e8c4820ad5 Mon Sep 17 00:00:00 2001 From: Drithin Date: Sat, 7 Jan 2017 13:49:04 -0800 Subject: [PATCH 5144/5486] chore: update to the story --- english/alone/alone.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index a7c62028ed..a9801572f9 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -51,4 +51,7 @@ Bella stops the blood flow and plasters Kristy's nose and Ana scans surroundings to check for anything suspicious. Kristy eventually crashes on her bed but the stranger come back to strangle her -with pillow. \ No newline at end of file +with pillow. + +Kristy protests and grabs the lamp next to her bed and hit him on his head. +Stranger's head starts bleeding and he run away from her room. \ No newline at end of file From 41ac2b25ee4bb4d6631c932ea76ee83ac5823e29 Mon Sep 17 00:00:00 2001 From: Martin Porwoll Date: Sat, 7 Jan 2017 23:53:28 +0100 Subject: [PATCH 5145/5486] Eine kleine Erweiterung --- german/Leichen/Leichen.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 45d1d54f24..427070cc58 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -23,3 +23,5 @@ Meine Kleidung hindert mich absolut am Schwimmen. Die Kälte des Wassers macht meine Bewegungen steif, die vollgesogene [Kleidung](Kleidung/Kleidung.md) macht sie träge. Irgendwie muss ich versuchen sie los zu werden! + +Die Situation scheint meinen Verstand vernebelt zu haben. Die Kälte und das Wasser scheint ihr übriges zu tun. Aber in einem lichten Moment erinnere ich mich an meine [Superkraefte](Superkraefte/Superkraefte.md). \ No newline at end of file From 9a7655c13cb92ddb5ab24c8d0c589e40498e2caa Mon Sep 17 00:00:00 2001 From: Martin Porwoll Date: Sat, 7 Jan 2017 23:54:16 +0100 Subject: [PATCH 5146/5486] =?UTF-8?q?Etwas=20neues=20hinzugef=C3=BCgt=20-?= =?UTF-8?q?=20Superkraefte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Leichen/Superkraefte/Superkraefte.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 german/Leichen/Superkraefte/Superkraefte.md diff --git a/german/Leichen/Superkraefte/Superkraefte.md b/german/Leichen/Superkraefte/Superkraefte.md new file mode 100644 index 0000000000..3311ad02b0 --- /dev/null +++ b/german/Leichen/Superkraefte/Superkraefte.md @@ -0,0 +1,4 @@ +Kaum ist der lichte Moment vorbei, setze ich meine Superkraft ein. Ich kann mich in einen Feuerball verwandeln. Super! Das mache ich auch sofort, muss aber auch direkt feststellen, dass ich ja im Wasser bin. Also Feuerball sofort gelöscht... + +Da bin ich also, Superheld, mit vollkommen nutzloser Superkraft. Als bleibt nur weiter +[schwimmen](../../schwimmen/schwimmen.md). \ No newline at end of file From 0facf3cffd513d071b8f21b7df286226d54b6f8f Mon Sep 17 00:00:00 2001 From: Martin Porwoll Date: Sat, 7 Jan 2017 23:57:23 +0100 Subject: [PATCH 5147/5486] =?UTF-8?q?Zeilenl=C3=A4nge=20angepasst.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Leichen/Leichen.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/german/Leichen/Leichen.md b/german/Leichen/Leichen.md index 427070cc58..a83f1d07c3 100644 --- a/german/Leichen/Leichen.md +++ b/german/Leichen/Leichen.md @@ -24,4 +24,6 @@ Die Kälte des Wassers macht meine Bewegungen steif, die vollgesogene [Kleidung](Kleidung/Kleidung.md) macht sie träge. Irgendwie muss ich versuchen sie los zu werden! -Die Situation scheint meinen Verstand vernebelt zu haben. Die Kälte und das Wasser scheint ihr übriges zu tun. Aber in einem lichten Moment erinnere ich mich an meine [Superkraefte](Superkraefte/Superkraefte.md). \ No newline at end of file +Die Situation scheint meinen Verstand vernebelt zu haben. +Die Kälte und das Wasser scheint ihr übriges zu tun. +Aber in einem lichten Moment erinnere ich mich an meine [Superkraefte](Superkraefte/Superkraefte.md). \ No newline at end of file From ec7b301d8bd1de166e3df352fec62b746839d1ea Mon Sep 17 00:00:00 2001 From: Martin Porwoll Date: Sun, 8 Jan 2017 00:00:05 +0100 Subject: [PATCH 5148/5486] =?UTF-8?q?Zeilenl=C3=A4nge=20angepasst.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- german/Leichen/Superkraefte/Superkraefte.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/german/Leichen/Superkraefte/Superkraefte.md b/german/Leichen/Superkraefte/Superkraefte.md index 3311ad02b0..ec3254f526 100644 --- a/german/Leichen/Superkraefte/Superkraefte.md +++ b/german/Leichen/Superkraefte/Superkraefte.md @@ -1,4 +1,7 @@ -Kaum ist der lichte Moment vorbei, setze ich meine Superkraft ein. Ich kann mich in einen Feuerball verwandeln. Super! Das mache ich auch sofort, muss aber auch direkt feststellen, dass ich ja im Wasser bin. Also Feuerball sofort gelöscht... +Kaum ist der lichte Moment vorbei, setze ich meine Superkraft ein. +Ich kann mich in einen Feuerball verwandeln. Super! +Das mache ich auch sofort, muss aber auch direkt feststellen, dass ich ja im Wasser bin. +Also Feuerball sofort gelöscht... -Da bin ich also, Superheld, mit vollkommen nutzloser Superkraft. Als bleibt nur weiter +Da bin ich also, Superheld, mit vollkommen nutzloser Superkraft. Also bleibt nur weiter [schwimmen](../../schwimmen/schwimmen.md). \ No newline at end of file From 179c387e95f3c48fcb6058cc25fd608be99de527 Mon Sep 17 00:00:00 2001 From: Darren Lee Date: Sat, 7 Jan 2017 19:36:41 -0800 Subject: [PATCH 5149/5486] Intentionally break links --- english/hawkstrider/startr/startr.md | 4 ++-- english/hawkstrider/startu/startu.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/english/hawkstrider/startr/startr.md b/english/hawkstrider/startr/startr.md index ea0ae50074..6346a363d4 100644 --- a/english/hawkstrider/startr/startr.md +++ b/english/hawkstrider/startr/startr.md @@ -4,8 +4,8 @@ The hawkstrider pauses for a moment then says: A. [How ya doin fam?](../error/error.md) -B. [Doral ana-diel?](../tier1/tier2/tier2.md) +B. BREAK -C. [Rearrrrr](../tier1/tier1.md) +C. BREAK [Rude](../rude/rude.md) D. [Urrrrrrr](../error/error.md) \ No newline at end of file diff --git a/english/hawkstrider/startu/startu.md b/english/hawkstrider/startu/startu.md index c52b09f85e..7205730ab4 100644 --- a/english/hawkstrider/startu/startu.md +++ b/english/hawkstrider/startu/startu.md @@ -4,8 +4,8 @@ The hawkstrider pauses for a moment then says: A. [How ya doin fam?](../error/error.md) -B. [Doral ana-diel?](../tier1/tier2/tier2.md) +B. BREAK -C. [Rearrrrr](../tier1/tier1.md) +C. BREAK D. [Urrrrrrr](../error/error.md) \ No newline at end of file From de1fdac21c09c64aac9fd9c78c38d135fe0abfea Mon Sep 17 00:00:00 2001 From: Christopher Van Der Westhuizen Date: Sun, 8 Jan 2017 15:52:39 +0900 Subject: [PATCH 5150/5486] Add initial story options for Dungeons & Dragons --- english/dungeons-and-dragons/dungeons-and-dragons.md | 3 +++ english/marshmallow.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 english/dungeons-and-dragons/dungeons-and-dragons.md diff --git a/english/dungeons-and-dragons/dungeons-and-dragons.md b/english/dungeons-and-dragons/dungeons-and-dragons.md new file mode 100644 index 0000000000..f2c71fb86b --- /dev/null +++ b/english/dungeons-and-dragons/dungeons-and-dragons.md @@ -0,0 +1,3 @@ +You roll... 3...15...12...11...8...19! Ooh, so close, almost a critical. +Nevertheless it's good enough to hit the Cacode..err...Beholder. +You deal 2d6+3 damage! diff --git a/english/marshmallow.md b/english/marshmallow.md index 531d3310f2..44d95742c8 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -36,6 +36,8 @@ You decide to drop everything you're doing and [run out the door](run_out_the_do Take some [time](meditation/meditation.md) off! +[Roll a D20](dungeons-and-dragons/dungeons-and-dragons.md) and see what luck brings. + Life is full of twists and turns like but try to cheer yourself and people around you. [Click Here](Happy/happie.md) Who is better? From 7727c45a8f1c31a08bde4c25cda98b8c4de18f67 Mon Sep 17 00:00:00 2001 From: 3ter Date: Sun, 8 Jan 2017 13:02:47 +0100 Subject: [PATCH 5151/5486] feat: Add latin to the language folder --- language.md | 2 ++ latin/arena.md | 7 +++++++ latin/carmen/carmen.md | 5 +++++ 3 files changed, 14 insertions(+) create mode 100644 latin/arena.md create mode 100644 latin/carmen/carmen.md diff --git a/language.md b/language.md index 821fd11a45..955ed400c9 100644 --- a/language.md +++ b/language.md @@ -165,3 +165,5 @@ if you speak Bahasa Indonesia [klik disini](indonesia/bahasa-indonesia.md) Dreams to Memories – Wisdom in Ladakh.To read this click [here](Himalayan_Odyssey/HO.md) Astoli Dothraki ? [Dothrae jinne](dothraki/dothraki_evoli.md) + +Si Latine legere vis, [hic preme](latin/arena.md) diff --git a/latin/arena.md b/latin/arena.md new file mode 100644 index 0000000000..388466ffa5 --- /dev/null +++ b/latin/arena.md @@ -0,0 +1,7 @@ +Eheu! In Collosseo stas. In manu gladium habes. Gladium re rubente +limatum!!! Oh di immortales! Homines clamant atque furor Collosseum +pervadit. +Te adversum in arena sunt - non intueri volo - tres +armiferae Amazones te ferociter intuentem! + +[Solum quod in tibi mentem venit est Ovidii carmen!](carmen/carmen.md) diff --git a/latin/carmen/carmen.md b/latin/carmen/carmen.md new file mode 100644 index 0000000000..2d6748b81e --- /dev/null +++ b/latin/carmen/carmen.md @@ -0,0 +1,5 @@ +Tremens tibi persuades esse in luco Arcadio et recitas: + stant calices; minor inde fabas, holus alter habebat, + et spumat testo pressus uterque suo. +Inopinatissime unusquisque in Colloseo in imo pectore permotus est et +tuus tremor decrescit. From 775f7e2d7f087d36a6d3620282b9bcdbe8e7d3e0 Mon Sep 17 00:00:00 2001 From: 3ter <3ter@users.noreply.github.com> Date: Sun, 8 Jan 2017 13:04:51 +0100 Subject: [PATCH 5152/5486] fix: Fix Typo in arena.md --- latin/arena.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latin/arena.md b/latin/arena.md index 388466ffa5..1ab4d7d59c 100644 --- a/latin/arena.md +++ b/latin/arena.md @@ -2,6 +2,6 @@ Eheu! In Collosseo stas. In manu gladium habes. Gladium re rubente limatum!!! Oh di immortales! Homines clamant atque furor Collosseum pervadit. Te adversum in arena sunt - non intueri volo - tres -armiferae Amazones te ferociter intuentem! +armiferae Amazones te ferociter intuentes! [Solum quod in tibi mentem venit est Ovidii carmen!](carmen/carmen.md) From 21a5ac4454828431866d239886dddbc665f98732 Mon Sep 17 00:00:00 2001 From: Jaume Puig Date: Sun, 8 Jan 2017 13:28:19 +0100 Subject: [PATCH 5153/5486] Added some congratulatory messages to the london.md file --- english/london/london.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/london/london.md b/english/london/london.md index 8a6256134b..8e1007bc1a 100644 --- a/english/london/london.md +++ b/english/london/london.md @@ -4,3 +4,5 @@ I cloned it I created a branch I created a new folder and file within it (this one) I'm now going to try commit these changes and send a pull request - hopefully +Hey! You got this! You are now ready to help people build open-source software! +AWESOME! From 75a599e704c38a52c759f4d5fa4b32522f136655 Mon Sep 17 00:00:00 2001 From: karthik1811 Date: Sun, 8 Jan 2017 19:50:57 +0530 Subject: [PATCH 5154/5486] My changes for zoozoo --- english/marshmallow.md | 2 ++ english/zoozoo/zoozoo.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/zoozoo/zoozoo.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 44d95742c8..60a87fc08b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -5,6 +5,8 @@ A few learned to [tango](tango/tango.md) Some preferred to Enter [The Forest!] (forest/forest.md) +If you are a fan of ZooZoo go [here](zoozoo/zoozoo.md) + hi~ NGE is [here] (NGE/NGE.md) diff --git a/english/zoozoo/zoozoo.md b/english/zoozoo/zoozoo.md new file mode 100644 index 0000000000..69de1ec63a --- /dev/null +++ b/english/zoozoo/zoozoo.md @@ -0,0 +1 @@ +This is the zoozoo fan page From 3c989df815e3ce1bbb661828123044281ccce036 Mon Sep 17 00:00:00 2001 From: Rounge Date: Sun, 8 Jan 2017 09:26:55 -0500 Subject: [PATCH 5155/5486] add Daniel's line from Amnesia: The Dark Descent --- english/amnesia/amnesia.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/amnesia/amnesia.md b/english/amnesia/amnesia.md index f2938e4854..40b0dae7e7 100644 --- a/english/amnesia/amnesia.md +++ b/english/amnesia/amnesia.md @@ -25,4 +25,6 @@ Or, it can be highly... oh, I forgot what I was going to say. Who am I? Where am I? What am I doing? +My name is...I am Daniel. + All your quesions can be answered by going [here](https://www.amnesiagame.com/#main). \ No newline at end of file From 4121543605bc5fdb4552c53c771082df98d56d9a Mon Sep 17 00:00:00 2001 From: Pedro Paradella Date: Sun, 8 Jan 2017 22:05:46 -0200 Subject: [PATCH 5156/5486] My part of the adventure --- portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md | 2 ++ .../revisa/tenta-nao-consegue/amigavel/tentativa/tentativa.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 portugues/revisa/tenta-nao-consegue/amigavel/tentativa/tentativa.md diff --git a/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md b/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md index 6ee7356f1f..515c828812 100644 --- a/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md +++ b/portugues/revisa/tenta-nao-consegue/amigavel/amigavel.md @@ -1,2 +1,4 @@ O desenvolvedor te envia um e-mail dizendo que seria muito importante se você conseguisse reproduzir o bug novamente. E ele até mesmo te oferece uma recompensa para te motivar. + +[Você resolve tentar achar o bug pela recompensa.](tentativa/tentativa.md) \ No newline at end of file diff --git a/portugues/revisa/tenta-nao-consegue/amigavel/tentativa/tentativa.md b/portugues/revisa/tenta-nao-consegue/amigavel/tentativa/tentativa.md new file mode 100644 index 0000000000..d489ce9d6a --- /dev/null +++ b/portugues/revisa/tenta-nao-consegue/amigavel/tentativa/tentativa.md @@ -0,0 +1,3 @@ +Depois de 3 dias trabalhando para achar o bug, você finalmente consegue. + +Você: \ No newline at end of file From c1f01336a3a8f01c2d9ee11a544d87e362092d5d Mon Sep 17 00:00:00 2001 From: Drithin Date: Sun, 8 Jan 2017 16:53:18 -0800 Subject: [PATCH 5157/5486] chore: New Update to the Story --- english/alone/alone.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index a9801572f9..2b767e0e78 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -54,4 +54,6 @@ Kristy eventually crashes on her bed but the stranger come back to strangle her with pillow. Kristy protests and grabs the lamp next to her bed and hit him on his head. -Stranger's head starts bleeding and he run away from her room. \ No newline at end of file +Stranger's head starts bleeding and he run away from her room. + +Kristy screams again but no one bothers to check on her. \ No newline at end of file From 7431a458ee953d8f65ce61677d18b18fada09280 Mon Sep 17 00:00:00 2001 From: Jacob Moen Date: Mon, 9 Jan 2017 09:20:34 +0100 Subject: [PATCH 5158/5486] gingerly --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 60a87fc08b..c80bbc3396 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1228,4 +1228,6 @@ I have atlast found a way to heaven...Want to go [there](00_PortBlair's Emerald Why are you reading this line? smile and move on. +Smile and move on gingerly. + - From 2db92568023d267f699ec76fd36751e3c62f6677 Mon Sep 17 00:00:00 2001 From: HimanshuKumar111 Date: Mon, 9 Jan 2017 22:41:44 +0530 Subject: [PATCH 5159/5486] Add a line to alone --- english/alone/alone.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 2b767e0e78..7fae8ccb64 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -56,4 +56,5 @@ with pillow. Kristy protests and grabs the lamp next to her bed and hit him on his head. Stranger's head starts bleeding and he run away from her room. -Kristy screams again but no one bothers to check on her. \ No newline at end of file +Kristy screams again but no one bothers to check on her. +And the screams continues to come again and again \ No newline at end of file From 99f73acede35aada5cc084a0630580d91cef7147 Mon Sep 17 00:00:00 2001 From: HimanshuKumar111 Date: Mon, 9 Jan 2017 22:53:17 +0530 Subject: [PATCH 5160/5486] Add a another line to alone --- english/alone/alone.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/alone/alone.md b/english/alone/alone.md index 7fae8ccb64..dd6f779c5a 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -57,4 +57,5 @@ Kristy protests and grabs the lamp next to her bed and hit him on his head. Stranger's head starts bleeding and he run away from her room. Kristy screams again but no one bothers to check on her. + And the screams continues to come again and again \ No newline at end of file From e1549134956750a8e44674e0eda39dff966d5e2a Mon Sep 17 00:00:00 2001 From: Drithin Date: Mon, 9 Jan 2017 09:38:21 -0800 Subject: [PATCH 5161/5486] chore: new plot twist --- english/alone/alone.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 2b767e0e78..10e5e9f630 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -56,4 +56,7 @@ with pillow. Kristy protests and grabs the lamp next to her bed and hit him on his head. Stranger's head starts bleeding and he run away from her room. -Kristy screams again but no one bothers to check on her. \ No newline at end of file +Kristy screams again but no one bothers to check on her. + +Kristy sobs in despair but gets a nasty idea to smoke him out. She sets her room on +fire. \ No newline at end of file From 8772a5b699a85301573f9a679e32b78c82f47045 Mon Sep 17 00:00:00 2001 From: filip5114 Date: Mon, 9 Jan 2017 20:19:03 +0100 Subject: [PATCH 5162/5486] New part of story Polish/zaSklepem/zaSklepem.md --- Polish/kadarka/zaSklepem/zaSklepem.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Polish/kadarka/zaSklepem/zaSklepem.md b/Polish/kadarka/zaSklepem/zaSklepem.md index b5af4ade93..83524b13a0 100644 --- a/Polish/kadarka/zaSklepem/zaSklepem.md +++ b/Polish/kadarka/zaSklepem/zaSklepem.md @@ -1,2 +1,16 @@ Tak jak myślałemś, impreza za sklepem to lepszy pomysł. -Od teraz Ziutek i Mietek określają Cię mianem "BOSS". ;)) \ No newline at end of file +Od teraz Ziutek i Mietek określają Cię mianem "BOSS". ;)) + +Po wielkiej imprezie Ziutek, Mietek i Ty macie wilekiego kaca. +Całe szczęście Ty wiesz co trzeba zrobić. +Z wielkim wysiłkiem podnosisz się z ziemi i przeszukujesz kieszenie. +Jest. Tak. Masz to! +Wiesz, że to co teraz nastąpi będzie trudne. Dla nich musisz się poświęcić. +Najpierw lewa potem prawa, lewa, prawa, lewa, prawa. +Całe szczęście to nie jedna z tych imprez gdzie przypominasz sobie jak się chodzi po trzech dniach. +Cztery potknięcia, jedna gleba i 3 ulice dalej jest ona. Biedronka. +Wchodzisz i z zamkniętymi oczami, niemal mechanicznie trafiasz pod odpowiedni regał, a ręka sama zaciska się na szyjce. +W kasie rzucasz ledwo spoglądając na kasjerkę odliczoną kwotę, którą znalazłeś w kieszeni. +Z większym powodzniem wracasz do kompanów. Ziutek już siedzi, a Mietek nawet wstał oddać mocz. +Kiedy widzą, że w ręku trzymasz lekarstwo na tę straszną dolegliwość, która was z rana dopadła oczy zachodzą im łzami. +W geście triumfu podnosisz Amarenę! \ No newline at end of file From cc6633a723d8ed26ed36b6696828399cfdf04637 Mon Sep 17 00:00:00 2001 From: Drithin Date: Mon, 9 Jan 2017 11:24:29 -0800 Subject: [PATCH 5163/5486] chore: corrected the conflict --- english/alone/alone.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 131a150b52..41a1a1af02 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -60,4 +60,6 @@ Kristy screams again but no one bothers to check on her. Kristy sobs in despair but gets a nasty idea to smoke him out. She sets her room on -fire. \ No newline at end of file +fire. + +And the screams continues to come again and again. \ No newline at end of file From 922b87178c6787424f2c4f61640913d148c4dbf3 Mon Sep 17 00:00:00 2001 From: Drithin Date: Mon, 9 Jan 2017 11:44:36 -0800 Subject: [PATCH 5164/5486] chore: resolving conflicts --- english/alone/alone.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 41a1a1af02..64c7fe8a11 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -62,4 +62,4 @@ Kristy screams again but no one bothers to check on her. Kristy sobs in despair but gets a nasty idea to smoke him out. She sets her room on fire. -And the screams continues to come again and again. \ No newline at end of file +And the screams continues to come again and again \ No newline at end of file From dd79699ce8c46c4a8e5d518abf03c0922f1e75c6 Mon Sep 17 00:00:00 2001 From: Mediyum Date: Mon, 9 Jan 2017 19:14:44 -0700 Subject: [PATCH 5165/5486] Add paragraph and link to Superman story --- english/super-man/save-the-word.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/super-man/save-the-word.md b/english/super-man/save-the-word.md index 2341fbc012..bd87e299dc 100644 --- a/english/super-man/save-the-word.md +++ b/english/super-man/save-the-word.md @@ -15,3 +15,7 @@ They are all making a unique voice: calling for a Man like you! Do you: [Find the evil mastermind Lex Luther?](./lex-luther/find-lex-luther.md) [Find the bird?](../find-bird/bird.md) + +Or do you rid those decisions from your mind and decide that you want to be a new "Super" character all together! You're not a one role kinda guy, you don't even fit into the DC universe!! You decide you must become... + +[Naruto!](../naruto/seventh-hokage.md) \ No newline at end of file From dca2dcc8c1bfb570dd8a2261e136d43288f72d13 Mon Sep 17 00:00:00 2001 From: Mediyum Date: Mon, 9 Jan 2017 19:23:47 -0700 Subject: [PATCH 5166/5486] Break up paragraphs so their smaller than 120 characters. --- english/super-man/save-the-word.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/english/super-man/save-the-word.md b/english/super-man/save-the-word.md index bd87e299dc..755693d14b 100644 --- a/english/super-man/save-the-word.md +++ b/english/super-man/save-the-word.md @@ -16,6 +16,11 @@ They are all making a unique voice: calling for a Man like you! Do you: [Find the bird?](../find-bird/bird.md) -Or do you rid those decisions from your mind and decide that you want to be a new "Super" character all together! You're not a one role kinda guy, you don't even fit into the DC universe!! You decide you must become... +Or do you rid those decisions from your + mind and decide that you want to be a new + "Super" character all together! You're not + a one role kinda guy, you don't even fit + into the DC universe!! You decide you + must become... [Naruto!](../naruto/seventh-hokage.md) \ No newline at end of file From 5c67155a53ae63f36c571d6bddcf92bff8c8001c Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 12:07:46 +0100 Subject: [PATCH 5167/5486] Try to contact a Facebook friend --- Italian/smartphone/facebook/facebook.md | 9 +++++++-- Italian/smartphone/facebook/primo/primo.md | 6 ++++++ Italian/smartphone/facebook/qualsiasi/qualsiasi.md | 7 +++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 Italian/smartphone/facebook/primo/primo.md create mode 100644 Italian/smartphone/facebook/qualsiasi/qualsiasi.md diff --git a/Italian/smartphone/facebook/facebook.md b/Italian/smartphone/facebook/facebook.md index b840904f8e..2db22ac887 100644 --- a/Italian/smartphone/facebook/facebook.md +++ b/Italian/smartphone/facebook/facebook.md @@ -1,2 +1,7 @@ -Accidenti! -Ho un milione di amici ma non riconosco nessuno. \ No newline at end of file +Accidenti! +Ho un milione di amici ma non riconosco nessuno. + +La situazione non è delle più rosee, ma devi pur far qualcosa, quindi decidi di contattare + +[un amico a caso](qualsiasi/qualsiasi.md) +[il primo amico nella lista](primo/primo.md) \ No newline at end of file diff --git a/Italian/smartphone/facebook/primo/primo.md b/Italian/smartphone/facebook/primo/primo.md new file mode 100644 index 0000000000..e163177508 --- /dev/null +++ b/Italian/smartphone/facebook/primo/primo.md @@ -0,0 +1,6 @@ +Ciao, scusa se ti disturbo, ma ti ricordi di me? + +Caspita, ma tutti a me mi dovete capitare? Soltanto perché il mio nome comincia per A ed è il primo della lista vi sentite autorizzati a rompermi le scatole? +Si può sapere chi sei, e soprattutto che vuoi da me? + +Chi sono? Bella domanda... in realtà io mi stavo chiedendo dove sono, ma ora che mi ci fai pensare, non mi ricordo nemmeno chi sono!!! \ No newline at end of file diff --git a/Italian/smartphone/facebook/qualsiasi/qualsiasi.md b/Italian/smartphone/facebook/qualsiasi/qualsiasi.md new file mode 100644 index 0000000000..6d6bceebbb --- /dev/null +++ b/Italian/smartphone/facebook/qualsiasi/qualsiasi.md @@ -0,0 +1,7 @@ +Ciao, scusami se ti disturbo, ma ti ricordi di me? + +Certo che sì, e l'ultima volta che ci siamo parlati, mi pare di averti detto di non volerti più +vedere nemmeno in fotografia! +Si può sapere che vuoi ancora? + +Ehm, scusami, devo aver perduto la memoria... nemmeno mi ricordo di te... comunque sono nei guai e avrei bisogno d'aiuto... \ No newline at end of file From ba89ac32c13875f89bad3cd0fbdef69175855351 Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 12:41:03 +0100 Subject: [PATCH 5168/5486] Ask something to Siri --- english/sleep/make-another-wish/siri/marshmallow-walls.md | 7 +++++++ english/sleep/make-another-wish/wish.md | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 english/sleep/make-another-wish/siri/marshmallow-walls.md diff --git a/english/sleep/make-another-wish/siri/marshmallow-walls.md b/english/sleep/make-another-wish/siri/marshmallow-walls.md new file mode 100644 index 0000000000..a27d06094b --- /dev/null +++ b/english/sleep/make-another-wish/siri/marshmallow-walls.md @@ -0,0 +1,7 @@ +Sure! I have a few choices available for your search. + +[YouTube](https://www.youtube.com/watch?v=NSkycYIUnLg) +This song reminded me of something... perhaps, I should [sing a song](sing/sing.md) and try to remember how it all started... + +[Android](https://material.uplabs.com/posts/android-marshmallow) +Oh gosh, am I really trapped in an Android app? diff --git a/english/sleep/make-another-wish/wish.md b/english/sleep/make-another-wish/wish.md index a0de3d3ee2..1256d21b59 100644 --- a/english/sleep/make-another-wish/wish.md +++ b/english/sleep/make-another-wish/wish.md @@ -4,4 +4,8 @@ You wish you had your laptop with you. After five seconds, the laptop appears in your hands. -It's a MacBook Pro! \ No newline at end of file +It's a MacBook Pro! + +Fortunately, you had already updated it to macOS, so you can ask something to Siri! + +You ask about [marshmallow walls](siri/marshmallow-walls.md) \ No newline at end of file From c30ba112c621a0e8af03673078649cea8487dfc3 Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 12:43:43 +0100 Subject: [PATCH 5169/5486] Fix link --- english/sleep/make-another-wish/siri/marshmallow-walls.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sleep/make-another-wish/siri/marshmallow-walls.md b/english/sleep/make-another-wish/siri/marshmallow-walls.md index a27d06094b..ccc9345f1b 100644 --- a/english/sleep/make-another-wish/siri/marshmallow-walls.md +++ b/english/sleep/make-another-wish/siri/marshmallow-walls.md @@ -1,7 +1,7 @@ Sure! I have a few choices available for your search. [YouTube](https://www.youtube.com/watch?v=NSkycYIUnLg) -This song reminded me of something... perhaps, I should [sing a song](sing/sing.md) and try to remember how it all started... +This song reminded me of something... perhaps, I should [sing a song](../../sing/sing.md) and try to remember how it all started... [Android](https://material.uplabs.com/posts/android-marshmallow) Oh gosh, am I really trapped in an Android app? From 196c4e42271218074e79cc25461dbd3fc938b700 Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 12:46:03 +0100 Subject: [PATCH 5170/5486] fix link again --- english/sleep/make-another-wish/siri/marshmallow-walls.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sleep/make-another-wish/siri/marshmallow-walls.md b/english/sleep/make-another-wish/siri/marshmallow-walls.md index ccc9345f1b..01a0d9c3a6 100644 --- a/english/sleep/make-another-wish/siri/marshmallow-walls.md +++ b/english/sleep/make-another-wish/siri/marshmallow-walls.md @@ -1,7 +1,7 @@ Sure! I have a few choices available for your search. [YouTube](https://www.youtube.com/watch?v=NSkycYIUnLg) -This song reminded me of something... perhaps, I should [sing a song](../../sing/sing.md) and try to remember how it all started... +This song reminded me of something... perhaps, I should [sing a song](../../../sing/sing.md) and try to remember how it all started... [Android](https://material.uplabs.com/posts/android-marshmallow) Oh gosh, am I really trapped in an Android app? From ef1f8c1e975853e9ac7e7e25c6c0915276c53e0d Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 12:48:37 +0100 Subject: [PATCH 5171/5486] Enhance formatting --- english/sleep/make-another-wish/siri/marshmallow-walls.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/sleep/make-another-wish/siri/marshmallow-walls.md b/english/sleep/make-another-wish/siri/marshmallow-walls.md index 01a0d9c3a6..cb82ea168e 100644 --- a/english/sleep/make-another-wish/siri/marshmallow-walls.md +++ b/english/sleep/make-another-wish/siri/marshmallow-walls.md @@ -1,7 +1,7 @@ Sure! I have a few choices available for your search. -[YouTube](https://www.youtube.com/watch?v=NSkycYIUnLg) +You choose [YouTube](https://www.youtube.com/watch?v=NSkycYIUnLg) This song reminded me of something... perhaps, I should [sing a song](../../../sing/sing.md) and try to remember how it all started... -[Android](https://material.uplabs.com/posts/android-marshmallow) +You choose [Android](https://material.uplabs.com/posts/android-marshmallow) Oh gosh, am I really trapped in an Android app? From 165a71ef65304885d7bd62e4f5362d54974dbf02 Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 12:54:19 +0100 Subject: [PATCH 5172/5486] fix formatting --- Italian/smartphone/facebook/facebook.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Italian/smartphone/facebook/facebook.md b/Italian/smartphone/facebook/facebook.md index 2db22ac887..aa77725ac9 100644 --- a/Italian/smartphone/facebook/facebook.md +++ b/Italian/smartphone/facebook/facebook.md @@ -1,7 +1,7 @@ Accidenti! Ho un milione di amici ma non riconosco nessuno. -La situazione non è delle più rosee, ma devi pur far qualcosa, quindi decidi di contattare +La situazione non è delle più rosee, ma devi pur far qualcosa, quindi decidi di -[un amico a caso](qualsiasi/qualsiasi.md) -[il primo amico nella lista](primo/primo.md) \ No newline at end of file +contattare [un amico a caso](qualsiasi/qualsiasi.md) +contattare [il primo amico nella lista](primo/primo.md) \ No newline at end of file From 6413a01bfa6553b542b61f94e9f6f2267800b15b Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 13:05:23 +0100 Subject: [PATCH 5173/5486] Update facebook.md --- Italian/smartphone/facebook/facebook.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Italian/smartphone/facebook/facebook.md b/Italian/smartphone/facebook/facebook.md index aa77725ac9..6761b3f323 100644 --- a/Italian/smartphone/facebook/facebook.md +++ b/Italian/smartphone/facebook/facebook.md @@ -1,7 +1,7 @@ -Accidenti! +Accidenti! Ho un milione di amici ma non riconosco nessuno. La situazione non è delle più rosee, ma devi pur far qualcosa, quindi decidi di contattare [un amico a caso](qualsiasi/qualsiasi.md) -contattare [il primo amico nella lista](primo/primo.md) \ No newline at end of file +contattare [il primo amico nella lista](primo/primo.md) From 540123d1202f0404a20a6559fe77d8ae345c1c1f Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 13:06:11 +0100 Subject: [PATCH 5174/5486] Update facebook.md --- Italian/smartphone/facebook/facebook.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Italian/smartphone/facebook/facebook.md b/Italian/smartphone/facebook/facebook.md index 6761b3f323..7b4eb56d42 100644 --- a/Italian/smartphone/facebook/facebook.md +++ b/Italian/smartphone/facebook/facebook.md @@ -3,5 +3,6 @@ Ho un milione di amici ma non riconosco nessuno. La situazione non è delle più rosee, ma devi pur far qualcosa, quindi decidi di -contattare [un amico a caso](qualsiasi/qualsiasi.md) +contattare [un amico a caso](qualsiasi/qualsiasi.md) + contattare [il primo amico nella lista](primo/primo.md) From d496c9fd1006324733ebb61c48985ed6c1e6eda5 Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 13:07:08 +0100 Subject: [PATCH 5175/5486] Update primo.md --- Italian/smartphone/facebook/primo/primo.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Italian/smartphone/facebook/primo/primo.md b/Italian/smartphone/facebook/primo/primo.md index e163177508..a9c0038671 100644 --- a/Italian/smartphone/facebook/primo/primo.md +++ b/Italian/smartphone/facebook/primo/primo.md @@ -1,6 +1,7 @@ Ciao, scusa se ti disturbo, ma ti ricordi di me? -Caspita, ma tutti a me mi dovete capitare? Soltanto perché il mio nome comincia per A ed è il primo della lista vi sentite autorizzati a rompermi le scatole? +Caspita, ma tutti a me mi dovete capitare? Soltanto perché il mio nome comincia per A ed è il primo della lista vi sentite +autorizzati a rompermi le scatole? Si può sapere chi sei, e soprattutto che vuoi da me? -Chi sono? Bella domanda... in realtà io mi stavo chiedendo dove sono, ma ora che mi ci fai pensare, non mi ricordo nemmeno chi sono!!! \ No newline at end of file +Chi sono? Bella domanda... in realtà io mi stavo chiedendo dove sono, ma ora che mi ci fai pensare, non mi ricordo nemmeno chi sono!!! From 20bbf27bedc4e23afa5e83d084b1f35ae5e1beff Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 13:07:52 +0100 Subject: [PATCH 5176/5486] Update qualsiasi.md --- Italian/smartphone/facebook/qualsiasi/qualsiasi.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Italian/smartphone/facebook/qualsiasi/qualsiasi.md b/Italian/smartphone/facebook/qualsiasi/qualsiasi.md index 6d6bceebbb..ec7f64f105 100644 --- a/Italian/smartphone/facebook/qualsiasi/qualsiasi.md +++ b/Italian/smartphone/facebook/qualsiasi/qualsiasi.md @@ -4,4 +4,5 @@ Certo che sì, e l'ultima volta che ci siamo parlati, mi pare di averti detto di vedere nemmeno in fotografia! Si può sapere che vuoi ancora? -Ehm, scusami, devo aver perduto la memoria... nemmeno mi ricordo di te... comunque sono nei guai e avrei bisogno d'aiuto... \ No newline at end of file +Ehm, scusami, devo aver perduto la memoria... nemmeno mi ricordo di te... comunque sono nei guai +e avrei bisogno d'aiuto... From 4b9e2d10e846bacaa3cee5bd4570e44f910943e9 Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 13:08:27 +0100 Subject: [PATCH 5177/5486] Update facebook.md --- Italian/smartphone/facebook/facebook.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Italian/smartphone/facebook/facebook.md b/Italian/smartphone/facebook/facebook.md index 7b4eb56d42..f00589d371 100644 --- a/Italian/smartphone/facebook/facebook.md +++ b/Italian/smartphone/facebook/facebook.md @@ -1,5 +1,5 @@ Accidenti! -Ho un milione di amici ma non riconosco nessuno. +Ho un milione di amici ma non riconosco nessuno. La situazione non è delle più rosee, ma devi pur far qualcosa, quindi decidi di From 480ce748c8523f915fe4e4d9579625de4a707205 Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 13:12:33 +0100 Subject: [PATCH 5178/5486] Update primo.md --- Italian/smartphone/facebook/primo/primo.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Italian/smartphone/facebook/primo/primo.md b/Italian/smartphone/facebook/primo/primo.md index a9c0038671..4e12f58557 100644 --- a/Italian/smartphone/facebook/primo/primo.md +++ b/Italian/smartphone/facebook/primo/primo.md @@ -1,7 +1,8 @@ Ciao, scusa se ti disturbo, ma ti ricordi di me? -Caspita, ma tutti a me mi dovete capitare? Soltanto perché il mio nome comincia per A ed è il primo della lista vi sentite -autorizzati a rompermi le scatole? +Caspita, ma tutti a me mi dovete capitare? Soltanto perché il mio nome comincia per A ed è il primo della lista +vi sentite autorizzati a rompermi le scatole? Si può sapere chi sei, e soprattutto che vuoi da me? -Chi sono? Bella domanda... in realtà io mi stavo chiedendo dove sono, ma ora che mi ci fai pensare, non mi ricordo nemmeno chi sono!!! +Chi sono? Bella domanda... in realtà io mi stavo chiedendo dove sono, ma ora che mi ci fai pensare, non mi ricordo +nemmeno chi sono!!! From a4cbe11b95be28691c9fa2b162322e0e1dc1bb2b Mon Sep 17 00:00:00 2001 From: Antonella Bernobich Dean Date: Tue, 10 Jan 2017 13:18:04 +0100 Subject: [PATCH 5179/5486] Update marshmallow-walls.md --- english/sleep/make-another-wish/siri/marshmallow-walls.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/sleep/make-another-wish/siri/marshmallow-walls.md b/english/sleep/make-another-wish/siri/marshmallow-walls.md index cb82ea168e..161963c961 100644 --- a/english/sleep/make-another-wish/siri/marshmallow-walls.md +++ b/english/sleep/make-another-wish/siri/marshmallow-walls.md @@ -1,7 +1,8 @@ Sure! I have a few choices available for your search. You choose [YouTube](https://www.youtube.com/watch?v=NSkycYIUnLg) -This song reminded me of something... perhaps, I should [sing a song](../../../sing/sing.md) and try to remember how it all started... +This song reminded me of something... +perhaps, I should [sing a song](../../../sing/sing.md) and try to remember how it all started... You choose [Android](https://material.uplabs.com/posts/android-marshmallow) Oh gosh, am I really trapped in an Android app? From ab329388cdca323496a437df4395fd94e8d19133 Mon Sep 17 00:00:00 2001 From: JackyDocky Date: Tue, 10 Jan 2017 20:50:16 +0800 Subject: [PATCH 5180/5486] =?UTF-8?q?Add=20a=20line=20"=E7=AD=94=E6=A1=88?= =?UTF-8?q?=E5=85=B6=E5=AE=9E=E6=98=AF=E2=80=9C=E5=93=87=E2=80=9D=E3=80=82?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chinese/carans/carans.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Chinese/carans/carans.md b/Chinese/carans/carans.md index cfd3744a15..0872907f8c 100644 --- a/Chinese/carans/carans.md +++ b/Chinese/carans/carans.md @@ -1 +1,2 @@ -答案就是“如果”。 \ No newline at end of file +答案就是“如果”。 +答案其实是“哇”。 \ No newline at end of file From ebd5503488295cd9f304602d22057e8115dad9e9 Mon Sep 17 00:00:00 2001 From: Drithin Date: Tue, 10 Jan 2017 09:57:20 -0800 Subject: [PATCH 5181/5486] chore: New Update to the story --- english/alone/alone.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 64c7fe8a11..feae118618 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -62,4 +62,7 @@ Kristy screams again but no one bothers to check on her. Kristy sobs in despair but gets a nasty idea to smoke him out. She sets her room on fire. -And the screams continues to come again and again \ No newline at end of file +And the screams continues to come again and again + +Bella sprint to Kristy's room and finds her getting terrified seeing herself +in the mirror. \ No newline at end of file From 4af340380fd5377ce6a31ee3ce4197e901450465 Mon Sep 17 00:00:00 2001 From: fair7 Date: Wed, 11 Jan 2017 01:02:58 +0530 Subject: [PATCH 5182/5486] Added hyderabadi style hindi joke --- hindi/joke/joke.md | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/hindi/joke/joke.md b/hindi/joke/joke.md index a7a2e43b2c..83d489743f 100644 --- a/hindi/joke/joke.md +++ b/hindi/joke/joke.md @@ -31,4 +31,31 @@ पहलवान: पास बनवा रखा है, इसीलिए नहीं लेता। -कुछ बातें दिल पे नही लेनी चाहिए!! 😀 😛 \ No newline at end of file +कुछ बातें दिल पे नही लेनी चाहिए!! 😀 😛 + +****************************************** + +Ek Hyderabadi banda apne mohalle key logann se bolta hain +"Muzhe char logan ki talash hain +Bachpanmain main jab school nahin jata tha +toh ammi bolti thi ki beta school nako gayo toh +char logan kya bolangey! +fir thoda jab bada huan +toh ammi boli ki betay acche marks lao varna +char logan kya bolangey! +fir thoda aur bada hone par abba bole ki +baba acchi naukri karo +varna char logan kya bolangey! +fir uske baad jab shaadi ki umaar ho gayee +toh bole bete pasand ki shaadi nahin karo +varna char logan kya bolangey! +fir uske baad jab bole bete biwi key saath akele raat main nakko jau +varna char logan kya bolangey! + +please muzhe en char logann ki talash hain +please enka pata bata do... yeah char loganne meri +zindagi bachpan se ab tak baingan main mila de rehe +varna enkay bolney ka khauff hamesha bana rahega!" + + + From ce9dbf713192abef9b07c28b109abd0fda89b9dd Mon Sep 17 00:00:00 2001 From: Nawaf Felemban Date: Tue, 10 Jan 2017 23:22:24 +0300 Subject: [PATCH 5183/5486] Add 2 sentences to the marshmallow story --- english/marshmallow.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index c80bbc3396..8620e17475 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -32,6 +32,9 @@ Which way should you go? Only you can decide. Oh so many decisions - what will you do?? +In the end you will realize that it [doesn't really matter](http://www.smithsonianmag.com/smithsonian-institution/what-gives-robert-frosts-road-not-taken-its-power-180956200/). +The path you choose is as good as any. + You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! [Build time machine](time-machine/time-machine.md) From dca19cc3ed0e915ef116a8ad9fdcd95ac082fa96 Mon Sep 17 00:00:00 2001 From: codeallstar Date: Tue, 10 Jan 2017 15:23:16 -0500 Subject: [PATCH 5184/5486] add locking eyes --- english/bear-story/bear-story.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/bear-story/bear-story.md b/english/bear-story/bear-story.md index cbf06ee0e2..702afe8b7d 100644 --- a/english/bear-story/bear-story.md +++ b/english/bear-story/bear-story.md @@ -7,3 +7,6 @@ another fantasy world as her bear slave. You end up in the body of a 10-year-old and are forced to participate in the bear takeover of the world! +This is the price you pay when you lock eyes with a +dancing bear. + From 0041e32582ae6a9ec43cf386e8be7ebfe35481b4 Mon Sep 17 00:00:00 2001 From: Nawaf Felemban Date: Tue, 10 Jan 2017 23:29:00 +0300 Subject: [PATCH 5185/5486] Shorten URL to keep lines under 120 characters --- english/marshmallow.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 8620e17475..66ab05e29b 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -32,7 +32,8 @@ Which way should you go? Only you can decide. Oh so many decisions - what will you do?? -In the end you will realize that it [doesn't really matter](http://www.smithsonianmag.com/smithsonian-institution/what-gives-robert-frosts-road-not-taken-its-power-180956200/). +In the end you will realize that it [doesn't really matter] +(https://goo.gl/1fd4wU). The path you choose is as good as any. You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! From fa957446ac823b498ad41083386fd4c27456f32c Mon Sep 17 00:00:00 2001 From: Kaplan Date: Tue, 10 Jan 2017 15:03:46 -0600 Subject: [PATCH 5186/5486] Add ifyoulovecricket.md --- english/cricket/if-you-love-cricket/ifyoulovecricket.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/cricket/if-you-love-cricket/ifyoulovecricket.md diff --git a/english/cricket/if-you-love-cricket/ifyoulovecricket.md b/english/cricket/if-you-love-cricket/ifyoulovecricket.md new file mode 100644 index 0000000000..cb10751f11 --- /dev/null +++ b/english/cricket/if-you-love-cricket/ifyoulovecricket.md @@ -0,0 +1 @@ +Love cricket? [Go Here!!](../cricket.md). \ No newline at end of file From 8dd61518445e6147e44ebcd1446ea081e203ae26 Mon Sep 17 00:00:00 2001 From: Kaplan Date: Tue, 10 Jan 2017 15:20:47 -0600 Subject: [PATCH 5187/5486] Update marshmallow.md to add cricket to the story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index c80bbc3396..cd0f3e1b24 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,5 +1,7 @@ Once upon a time many authors collaborated to make meaningless linked story. +And that story was about [cricket](cricket/if-you-love-cricket/ifyoulovecricket.md) + A few learned to [tango](tango/tango.md) Some preferred to From ba9c1f80a40d6b3553c9cf63215b49c11bef3940 Mon Sep 17 00:00:00 2001 From: Arnaud Miguet Date: Tue, 10 Jan 2017 23:41:13 +0100 Subject: [PATCH 5188/5486] Add loop when smelling flowers --- french/panique/frapper-le-mur.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/french/panique/frapper-le-mur.md b/french/panique/frapper-le-mur.md index 5cf462ea3c..06f224b7fc 100644 --- a/french/panique/frapper-le-mur.md +++ b/french/panique/frapper-le-mur.md @@ -6,4 +6,6 @@ Maintenat que vous etes dehors, quoi faire? [Je sens des fleurs](sentir/fleurs.md) -[Il fait froid. Je rentre](../feu-de-camp.md) \ No newline at end of file +[Il fait froid. Je rentre](../feu-de-camp.md) + +[Je reste là, on est bien là](.) \ No newline at end of file From ea3b0d36b7a7b2f4ca03d7a6f3380a292e254ce6 Mon Sep 17 00:00:00 2001 From: Arnaud Miguet Date: Tue, 10 Jan 2017 23:43:02 +0100 Subject: [PATCH 5189/5486] Fix a bug of a link leading to a dir --- french/panique/frapper-le-mur.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/french/panique/frapper-le-mur.md b/french/panique/frapper-le-mur.md index 06f224b7fc..178e6d3ef0 100644 --- a/french/panique/frapper-le-mur.md +++ b/french/panique/frapper-le-mur.md @@ -8,4 +8,4 @@ Maintenat que vous etes dehors, quoi faire? [Il fait froid. Je rentre](../feu-de-camp.md) -[Je reste là, on est bien là](.) \ No newline at end of file +[Je reste là, on est bien là](./frapper-le-mur.md) \ No newline at end of file From 80a848036ec3d236e3de9f395a169a1cbd08562c Mon Sep 17 00:00:00 2001 From: Arnaud Miguet Date: Tue, 10 Jan 2017 23:47:15 +0100 Subject: [PATCH 5190/5486] Fix a bug that removes a line because of a LN --- french/panique/frapper-le-mur.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/french/panique/frapper-le-mur.md b/french/panique/frapper-le-mur.md index 178e6d3ef0..7db7ec0fa7 100644 --- a/french/panique/frapper-le-mur.md +++ b/french/panique/frapper-le-mur.md @@ -6,6 +6,6 @@ Maintenat que vous etes dehors, quoi faire? [Je sens des fleurs](sentir/fleurs.md) -[Il fait froid. Je rentre](../feu-de-camp.md) +[Je reste là, on est bien là](./frapper-le-mur.md) -[Je reste là, on est bien là](./frapper-le-mur.md) \ No newline at end of file +[Il fait froid. Je rentre](../feu-de-camp.md) \ No newline at end of file From 177356ff5c9c90f9fa52a92cf8d3158fe93883a9 Mon Sep 17 00:00:00 2001 From: Cody Cusic Date: Tue, 10 Jan 2017 15:45:15 -0800 Subject: [PATCH 5191/5486] docs: Added a line to the Soccer story Added a line in the soccer story to say that if you want to score goals, you might be a striker. --- english/Soccer/soccer.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/Soccer/soccer.md b/english/Soccer/soccer.md index d826f675c4..fd6d437f70 100644 --- a/english/Soccer/soccer.md +++ b/english/Soccer/soccer.md @@ -1 +1,3 @@ The very first question you should ask yourself is about the position you want to play. + +If you want to score goals, you would probably be a Striker. \ No newline at end of file From 68579f0b79c1fa522a2e2539b8639040396442a1 Mon Sep 17 00:00:00 2001 From: Joaquin Escalante Date: Tue, 10 Jan 2017 18:00:02 -0600 Subject: [PATCH 5192/5486] Add passion option in English --- english/passion/passion.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 english/passion/passion.md diff --git a/english/passion/passion.md b/english/passion/passion.md new file mode 100644 index 0000000000..01e8dfc9a3 --- /dev/null +++ b/english/passion/passion.md @@ -0,0 +1,9 @@ +Passion makes the old medicine new: +Passion lops off the bough of weariness. +Passion is the elixir that renews: +how can there be weariness +when passion is present? +Oh, don't sigh heavily from fatigue: +seek passion, seek passion, seek passion! + +Rumi \ No newline at end of file From b4f86d3d0ae16077a5b21d86295acdc6d77e0854 Mon Sep 17 00:00:00 2001 From: Joaqesc Date: Tue, 10 Jan 2017 18:06:29 -0600 Subject: [PATCH 5193/5486] Add passion to story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index afa3a3dac1..24193af682 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1236,4 +1236,6 @@ Why are you reading this line? smile and move on. Smile and move on gingerly. +What is your [passion?](passion/passion.md) + - From 667ada6b4fac7ce360d9b5ec543ac6140480b41a Mon Sep 17 00:00:00 2001 From: Guru P Date: Wed, 11 Jan 2017 18:14:30 +0530 Subject: [PATCH 5194/5486] Chat with a spirit option added modified: english/chocolateOrSleep/chocolateOrSleep.md --- english/chocolateOrSleep/chocolateOrSleep.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/chocolateOrSleep/chocolateOrSleep.md b/english/chocolateOrSleep/chocolateOrSleep.md index bae7abbf28..062f50caeb 100644 --- a/english/chocolateOrSleep/chocolateOrSleep.md +++ b/english/chocolateOrSleep/chocolateOrSleep.md @@ -6,3 +6,5 @@ would you like to [sing](../sing/sing.md)? would you like to [play](../play-music/playmusic.md)? Or maybe you'd like to [drive the cat to your sisters house](../dog-person/dog.md)? + +How about talking to someone from beyond the [grave](../call-spirit/call-spirit.md)? From b0afed707d8079ec57aaa802b78f9c1b844da397 Mon Sep 17 00:00:00 2001 From: Mehdi AOUADI Date: Wed, 11 Jan 2017 16:37:57 +0100 Subject: [PATCH 5195/5486] Add foie gras to french story --- french/feu-de-camp.md | 4 +++- french/foie-gras/foie-gras.md | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 french/foie-gras/foie-gras.md diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 51accd1660..10872609cd 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -34,4 +34,6 @@ Que faites-vous ? [Je me lève et me dirige vers la sortie](sortie/pousser-porte/pousser-porte.md) -[Je ne fais rien](rien/rien.md) \ No newline at end of file +[Je ne fais rien](rien/rien.md) + +[Je commande du foie-gras](foie-gras/foie-gras.md) \ No newline at end of file diff --git a/french/foie-gras/foie-gras.md b/french/foie-gras/foie-gras.md new file mode 100644 index 0000000000..de1446be84 --- /dev/null +++ b/french/foie-gras/foie-gras.md @@ -0,0 +1,3 @@ +Quoi de mieux pour accompagner le pain d'épice que le foie gras ? + +Cherchez un livreur de foie gras et comandez un kilogramme pour chaque mur. N'oubliez pas d'inviter vos amis ! \ No newline at end of file From 7c8fcce4e93de20380d9b8e006804335f40c42b2 Mon Sep 17 00:00:00 2001 From: Mehdi AOUADI Date: Wed, 11 Jan 2017 16:40:28 +0100 Subject: [PATCH 5196/5486] Add foie gras to the french story --- french/feu-de-camp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 10872609cd..d69c8da532 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -36,4 +36,4 @@ Que faites-vous ? [Je ne fais rien](rien/rien.md) -[Je commande du foie-gras](foie-gras/foie-gras.md) \ No newline at end of file +[Je commande du foie gras](foie-gras/foie-gras.md) From a68d1d9b19aaa5a7becdaf2058b45b31eac4de3b Mon Sep 17 00:00:00 2001 From: Mehdi AOUADI Date: Wed, 11 Jan 2017 17:56:58 +0100 Subject: [PATCH 5197/5486] Add soiree to the french story --- french/feu-de-camp.md | 2 ++ french/soiree/soiree.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 french/soiree/soiree.md diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index d69c8da532..7d350748fd 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -37,3 +37,5 @@ Que faites-vous ? [Je ne fais rien](rien/rien.md) [Je commande du foie gras](foie-gras/foie-gras.md) + +[J'organise une soirée pain d'épices](soiree/soiree.md) \ No newline at end of file diff --git a/french/soiree/soiree.md b/french/soiree/soiree.md new file mode 100644 index 0000000000..1e56aed022 --- /dev/null +++ b/french/soiree/soiree.md @@ -0,0 +1,3 @@ +Il y assez de pain d'pice pour tous vos amis ! Invitez les tous pour une soire gourmande pain d'pices. Avec du foie gras, a sera encore mieux :) + +[Je commande du foie gras](../foie-gras/foie-gras.md) From 2eeb862c6318d0cbd0d5801ddc75ec58ff6621d4 Mon Sep 17 00:00:00 2001 From: Drithin Date: Wed, 11 Jan 2017 10:07:34 -0800 Subject: [PATCH 5198/5486] chore: New Update to the Story --- english/alone/alone.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index feae118618..76cb47f2d4 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -65,4 +65,6 @@ fire. And the screams continues to come again and again Bella sprint to Kristy's room and finds her getting terrified seeing herself -in the mirror. \ No newline at end of file +in the mirror. + +Bella records it with her phone and shivers seeing Kristy. \ No newline at end of file From aa7d4921d40306c51993ad660f9de91b6e05f543 Mon Sep 17 00:00:00 2001 From: Mehdi AOUADI Date: Wed, 11 Jan 2017 20:34:26 +0100 Subject: [PATCH 5199/5486] Break soiree file line into two. --- french/soiree/soiree.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/french/soiree/soiree.md b/french/soiree/soiree.md index 1e56aed022..cc8fc8c8ea 100644 --- a/french/soiree/soiree.md +++ b/french/soiree/soiree.md @@ -1,3 +1,4 @@ -Il y assez de pain d'pice pour tous vos amis ! Invitez les tous pour une soire gourmande pain d'pices. Avec du foie gras, a sera encore mieux :) +Il y assez de pain d'pice pour tous vos amis ! Invitez les tous pour une soire gourmande pain d'pices. +Avec du foie gras, a sera encore mieux :) [Je commande du foie gras](../foie-gras/foie-gras.md) From adda79b0170ecf671e7f15c3ef3f4991eca94be7 Mon Sep 17 00:00:00 2001 From: fafansin Date: Thu, 12 Jan 2017 10:31:29 +0300 Subject: [PATCH 5200/5486] Add song minsan by eraserheads --- Philippines/kanta/minsan.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Philippines/kanta/minsan.md diff --git a/Philippines/kanta/minsan.md b/Philippines/kanta/minsan.md new file mode 100644 index 0000000000..bb2ba2de04 --- /dev/null +++ b/Philippines/kanta/minsan.md @@ -0,0 +1,2 @@ +minsan sa may kalayaan tayo'y nagkatagpuan +may mga sariling gimik at kanya-kanyang hangad sa buhay \ No newline at end of file From 8d19a05577d3c6e2ba6305047ee2db2fdcabfcee Mon Sep 17 00:00:00 2001 From: fafansin Date: Thu, 12 Jan 2017 10:42:35 +0300 Subject: [PATCH 5201/5486] Add link to new file --- Philippines/salamat.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index 78d43193ee..9b63256e74 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -27,3 +27,6 @@ Alamin kung gaano mo kakilala ang iyong idolo. Petsa: Nobyembre 17, 2016 Samahan si Benj sa kanyang paglalakbay! [Tara!](tara/tara.md) + +Para sa mga gusto kumanta [kanta] (kanta/minsan.md) +Januart 12, 2017 From 0ca523dda2c86f3a5766e61ae3734e49675a4e48 Mon Sep 17 00:00:00 2001 From: albigrucci Date: Thu, 12 Jan 2017 20:47:51 +0100 Subject: [PATCH 5202/5486] add canto option --- Italian/canto/canto.md | 3 +++ Italian/caramelle.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 Italian/canto/canto.md diff --git a/Italian/canto/canto.md b/Italian/canto/canto.md new file mode 100644 index 0000000000..018b1cf738 --- /dev/null +++ b/Italian/canto/canto.md @@ -0,0 +1,3 @@ +Sento improvvisamente una irrefrenabile voglia di cantare toto cutugno. +"Voglio andare a vivere in campagna, +sotto la rugiada che mi bagnaaaa" diff --git a/Italian/caramelle.md b/Italian/caramelle.md index a65a04a1c5..19dfad3499 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -32,3 +32,5 @@ Che fai? [Accendo la luce](luce/luce.md) [Cerco lo smartphone] (smartphone/smartphone.md) + +[Canto](canto/canto.md) From 121991e6bb942d9a8b117d5701f5dbff948b6145 Mon Sep 17 00:00:00 2001 From: Mehdi AOUADI Date: Thu, 12 Jan 2017 21:50:05 +0100 Subject: [PATCH 5203/5486] Add new option to sortie in the french story --- french/sortie/chercher-la-sortie.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/french/sortie/chercher-la-sortie.md b/french/sortie/chercher-la-sortie.md index 2169665b2a..451ea60ebb 100644 --- a/french/sortie/chercher-la-sortie.md +++ b/french/sortie/chercher-la-sortie.md @@ -8,4 +8,6 @@ issue soit une porte en caramel avec une poignée de réglisse. [Vous vous rendormez](../feu-de-camp.md) -[Vous découvrez une trappe](trappe/trappe.md) \ No newline at end of file +[Vous découvrez une trappe](trappe/trappe.md) + +[Je dessine une porte avec un syphon de crème chantilly qui traine](../dessine/porte.md) \ No newline at end of file From efc6ec0e847592927e2651f7721a92554616db12 Mon Sep 17 00:00:00 2001 From: Drithin Date: Fri, 13 Jan 2017 10:05:03 -0800 Subject: [PATCH 5204/5486] chore: New update --- english/alone/alone.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 76cb47f2d4..243c6f0567 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -67,4 +67,6 @@ And the screams continues to come again and again Bella sprint to Kristy's room and finds her getting terrified seeing herself in the mirror. -Bella records it with her phone and shivers seeing Kristy. \ No newline at end of file +Bella records it with her phone and shivers seeing Kristy. + +Bella sees Kristy seeing herself in the mirror and tremble. \ No newline at end of file From b0b3b10ed604683d2143b5e514103a52c8e0270e Mon Sep 17 00:00:00 2001 From: lucas Date: Fri, 13 Jan 2017 19:56:23 -0300 Subject: [PATCH 5205/5486] Add new option to /english/forest/drag/drag.md --- english/forest/drag/drag.md | 2 ++ english/forest/drag/skull/skull.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/forest/drag/skull/skull.md diff --git a/english/forest/drag/drag.md b/english/forest/drag/drag.md index f0da132081..33b1be9640 100644 --- a/english/forest/drag/drag.md +++ b/english/forest/drag/drag.md @@ -7,3 +7,5 @@ their venom. You die in even more pain than you were before. [Stay, don't move](stay/stay.md) [Morph into a hero named Snake Guy](snake/snake-guy.md) + +[You grab the skull laying beside](skull/skull.md) \ No newline at end of file diff --git a/english/forest/drag/skull/skull.md b/english/forest/drag/skull/skull.md new file mode 100644 index 0000000000..c9ee5d050d --- /dev/null +++ b/english/forest/drag/skull/skull.md @@ -0,0 +1,3 @@ +As u pick up the skull a string detaches from it and suddenly everything turns black. + +As u regain vision u see youself in an empty white place with two paths. \ No newline at end of file From 86f26e6ba15852281ab9431014f75214636b7555 Mon Sep 17 00:00:00 2001 From: mkfrst Date: Fri, 13 Jan 2017 23:19:12 -0500 Subject: [PATCH 5206/5486] add feeling lucky option and consequence --- english/friendly-person/friendly-person.md | 9 +++++++ english/friendly-person/lucky/lucky.md | 31 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 english/friendly-person/lucky/lucky.md diff --git a/english/friendly-person/friendly-person.md b/english/friendly-person/friendly-person.md index 13970f0245..6e524b7282 100644 --- a/english/friendly-person/friendly-person.md +++ b/english/friendly-person/friendly-person.md @@ -13,6 +13,15 @@ But being this is a .44 Magnum, the most powerful handgun in the world, and would blow your head clean off, you've got to ask yourself one question: 'Do I feel lucky?' Well, do ya, punk? +You think to your self... + +"you know... I DO [feel LUCKY](lucky/lucky.md)" + +OR + +"I've never been lucky... nothing ever goes right for me... now I've got a gun +pointed in my face put there by me! This goes down as a pretty bad day." + You're about to start talking to them, when you realize you can't actually open your mouth. It's kind of sealed. "What shall I do to communicate then?", you think: diff --git a/english/friendly-person/lucky/lucky.md b/english/friendly-person/lucky/lucky.md new file mode 100644 index 0000000000..541f3cceab --- /dev/null +++ b/english/friendly-person/lucky/lucky.md @@ -0,0 +1,31 @@ +... you know it's one of those days. +The sun is shining, +birds chirping in the trees, +slight fresh sented breeze +... you know a bit like one of those Frebeeze commercials +You knotice how the breeze feels good on your skin +warmed by the late afternoon sun. +Ahhhhh... nice to just be alive. + +Pretty lucky afterall. + +Well, except for this guy who looks like me with a gun in my face. + +But then again... your realize... this IS your lucky day. + +You smile. +He smiles. + +You give a little chuckle +He gives a little chuckle + +And in tha tinstant of mystical connection +togehter you come to the simultaneous conclusion that +you know what's really lucky? + +It's that you BOTH saved 15% on your car insurance by switching to GEICO. + +Ahhhhh +so lucky. + + \ No newline at end of file From ba782650831f7f175f4dca1f56a84b570fe8921f Mon Sep 17 00:00:00 2001 From: EJTang Date: Fri, 13 Jan 2017 22:18:12 -0700 Subject: [PATCH 5207/5486] Add my two cents about what I think about love. --- english/love/love.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/english/love/love.md b/english/love/love.md index 333cc246b8..503d0574f5 100644 --- a/english/love/love.md +++ b/english/love/love.md @@ -51,3 +51,9 @@ Love. PS: it's bullshit +Love is dependent on the person. +Each person can experience love in different ways. +It does not always have to be with a person. +Love can be a passion. +But depending on the person. +Love can be anything. From 6b33c362422e381cd04ef20756a27ece6b2900f9 Mon Sep 17 00:00:00 2001 From: Mitch Jackson Date: Sat, 14 Jan 2017 00:08:16 -0600 Subject: [PATCH 5208/5486] added music festivals --- english/music-festival/lollapalooza-1997.md | 18 ++++++++++++++++++ english/music-festival/music-festival.md | 7 +++++++ english/music-festival/woodstock-1994.md | 10 ++++++++++ 3 files changed, 35 insertions(+) create mode 100644 english/music-festival/lollapalooza-1997.md create mode 100644 english/music-festival/music-festival.md create mode 100644 english/music-festival/woodstock-1994.md diff --git a/english/music-festival/lollapalooza-1997.md b/english/music-festival/lollapalooza-1997.md new file mode 100644 index 0000000000..50ea741ab8 --- /dev/null +++ b/english/music-festival/lollapalooza-1997.md @@ -0,0 +1,18 @@ +You leave work at Bell's Amusement Park in Tulsa OK and +immediately drive non-stop to St. Louis. The custom cherry +red Datson 510 has no problem with the drive. +You crash on your sister's pull-out couch but can't sleep. +You're too excited. + +Your day is a hazy blur of sight and sound. The people are as +deep as the sea. In your fog you +witness performances by: + +Orbital, +Devo, +The Prodigy, +The Orb, +Snoop Dog with Tupac, +and the closing act, Tool + +Afterwards, you find yourself [holding the door](../hold_the_door/hodor.md) \ No newline at end of file diff --git a/english/music-festival/music-festival.md b/english/music-festival/music-festival.md new file mode 100644 index 0000000000..247dbc4635 --- /dev/null +++ b/english/music-festival/music-festival.md @@ -0,0 +1,7 @@ +Welcome to the heart of your most fondly remembered music festival. +You don't need a ticket. You've been here before. + +Where are you? + +[Woodstock 1994](woodstock-1994.md) +[Lollapalooza 1997](lollapalooza-1997.md) \ No newline at end of file diff --git a/english/music-festival/woodstock-1994.md b/english/music-festival/woodstock-1994.md new file mode 100644 index 0000000000..9091b8f234 --- /dev/null +++ b/english/music-festival/woodstock-1994.md @@ -0,0 +1,10 @@ +You're trapped in a memory of Woodstock '94. Were these your experiences, +or do they belong to someone else... perhaps [many others](https://www.youtube.com/watch?v=Cz227EU_1mU)? + +You slide in the mud while being entertained by: +[Blind Melon](https://www.youtube.com/watch?v=3xph8pPJMB8) +[Primus](https://www.youtube.com/watch?v=v-HUK8qR9QA) +[Nine Inch Nails](https://www.youtube.com/watch?v=3lbFfiLAj_A) + +Before your favorite band can play, you are +back in [the forest](../forest/forest.md) again. \ No newline at end of file From 2c858b0742b6f219497e1746a7d370aa85c8ad24 Mon Sep 17 00:00:00 2001 From: Mitch Jackson Date: Sat, 14 Jan 2017 00:14:51 -0600 Subject: [PATCH 5209/5486] link concert to music festival --- english/concert/concert.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/concert/concert.md b/english/concert/concert.md index a42cf723ea..5d23552726 100644 --- a/english/concert/concert.md +++ b/english/concert/concert.md @@ -1,3 +1,7 @@ At the David Gray [concert](https://www.youtube.com/watch?v=uGm5z8sJAFM) you join the crowd in a sick live mobile light-show and find a wizard to sell you that voodoo you needed -to find yourself with the [Neonic Lion](http://www.neonic-live.com/). \ No newline at end of file +to find yourself with the [Neonic Lion](http://www.neonic-live.com/). + +The laser-fueled haze in the distance catches your eyes. +Spirit wild, trek in the general direction of your +favorite [Music Festival](../music-festival/music-festival.md). \ No newline at end of file From 09f97591cbb775ca33d9ad0df96ebb8c31e098c7 Mon Sep 17 00:00:00 2001 From: Mitch Jackson Date: Sat, 14 Jan 2017 00:23:20 -0600 Subject: [PATCH 5210/5486] formating compliance --- .../music-festival/{ => lollapalooza-1997}/lollapalooza-1997.md | 0 english/music-festival/music-festival.md | 1 + english/music-festival/{ => woodstock-1994}/woodstock-1994.md | 0 3 files changed, 1 insertion(+) rename english/music-festival/{ => lollapalooza-1997}/lollapalooza-1997.md (100%) rename english/music-festival/{ => woodstock-1994}/woodstock-1994.md (100%) diff --git a/english/music-festival/lollapalooza-1997.md b/english/music-festival/lollapalooza-1997/lollapalooza-1997.md similarity index 100% rename from english/music-festival/lollapalooza-1997.md rename to english/music-festival/lollapalooza-1997/lollapalooza-1997.md diff --git a/english/music-festival/music-festival.md b/english/music-festival/music-festival.md index 247dbc4635..63799c69e4 100644 --- a/english/music-festival/music-festival.md +++ b/english/music-festival/music-festival.md @@ -4,4 +4,5 @@ You don't need a ticket. You've been here before. Where are you? [Woodstock 1994](woodstock-1994.md) + [Lollapalooza 1997](lollapalooza-1997.md) \ No newline at end of file diff --git a/english/music-festival/woodstock-1994.md b/english/music-festival/woodstock-1994/woodstock-1994.md similarity index 100% rename from english/music-festival/woodstock-1994.md rename to english/music-festival/woodstock-1994/woodstock-1994.md From ea3b78be8809f59b7c83819999f32b259c433240 Mon Sep 17 00:00:00 2001 From: Mitch Jackson Date: Sat, 14 Jan 2017 00:33:48 -0600 Subject: [PATCH 5211/5486] fix broken links and formatting --- .../music-festival/lollapalooza-1997/lollapalooza-1997.md | 2 +- english/music-festival/music-festival.md | 4 ++-- english/music-festival/woodstock-1994/woodstock-1994.md | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/english/music-festival/lollapalooza-1997/lollapalooza-1997.md b/english/music-festival/lollapalooza-1997/lollapalooza-1997.md index 50ea741ab8..d123349d15 100644 --- a/english/music-festival/lollapalooza-1997/lollapalooza-1997.md +++ b/english/music-festival/lollapalooza-1997/lollapalooza-1997.md @@ -15,4 +15,4 @@ The Orb, Snoop Dog with Tupac, and the closing act, Tool -Afterwards, you find yourself [holding the door](../hold_the_door/hodor.md) \ No newline at end of file +Afterwards, you find yourself [holding the door](../../hold_the_door/hodor.md) diff --git a/english/music-festival/music-festival.md b/english/music-festival/music-festival.md index 63799c69e4..a4e8278d8a 100644 --- a/english/music-festival/music-festival.md +++ b/english/music-festival/music-festival.md @@ -3,6 +3,6 @@ You don't need a ticket. You've been here before. Where are you? -[Woodstock 1994](woodstock-1994.md) +[Woodstock 1994](woodstock-1994/woodstock-1994.md) -[Lollapalooza 1997](lollapalooza-1997.md) \ No newline at end of file +[Lollapalooza 1997](lollapalooza-1997/lollapalooza-1997.md) diff --git a/english/music-festival/woodstock-1994/woodstock-1994.md b/english/music-festival/woodstock-1994/woodstock-1994.md index 9091b8f234..9675651a6d 100644 --- a/english/music-festival/woodstock-1994/woodstock-1994.md +++ b/english/music-festival/woodstock-1994/woodstock-1994.md @@ -2,9 +2,12 @@ You're trapped in a memory of Woodstock '94. Were these your experiences, or do they belong to someone else... perhaps [many others](https://www.youtube.com/watch?v=Cz227EU_1mU)? You slide in the mud while being entertained by: + [Blind Melon](https://www.youtube.com/watch?v=3xph8pPJMB8) + [Primus](https://www.youtube.com/watch?v=v-HUK8qR9QA) + [Nine Inch Nails](https://www.youtube.com/watch?v=3lbFfiLAj_A) Before your favorite band can play, you are -back in [the forest](../forest/forest.md) again. \ No newline at end of file +back in [the forest](../../forest/forest.md) again. From 0ac7130153e058a33527e1c56d24b6fa5422ab64 Mon Sep 17 00:00:00 2001 From: John Park Date: Sat, 14 Jan 2017 20:10:05 +0900 Subject: [PATCH 5212/5486] edited filibuster.md for johnpark82 own story --- korean/filibuster/filibuster.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/korean/filibuster/filibuster.md b/korean/filibuster/filibuster.md index 9cc4ddbab1..3ef18da58e 100644 --- a/korean/filibuster/filibuster.md +++ b/korean/filibuster/filibuster.md @@ -1 +1,3 @@ -필리버스터 중인 국회의원을 응원하다가, 배가 고파 [마시멜로를 먹으러 돌아간다.](../eating-walls/eating-marshmallows.md) \ No newline at end of file +필리버스터 중인 국회의원을 응원하다가, +[배가 고파 마시멜로를 먹으러 돌아간다.](../eating-walls/eating-marshmallows.md) +[자랑하고 싶어서 인스타그램에 인증샷을 올린다.](../instagram/insta.md) From ca6d5e611fca99a75e98a72262cec450c39d5d82 Mon Sep 17 00:00:00 2001 From: John Park Date: Sat, 14 Jan 2017 20:25:09 +0900 Subject: [PATCH 5213/5486] add some line --- korean/filibuster/filibuster.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/korean/filibuster/filibuster.md b/korean/filibuster/filibuster.md index 3ef18da58e..4552cb27dc 100644 --- a/korean/filibuster/filibuster.md +++ b/korean/filibuster/filibuster.md @@ -1,3 +1,2 @@ -필리버스터 중인 국회의원을 응원하다가, -[배가 고파 마시멜로를 먹으러 돌아간다.](../eating-walls/eating-marshmallows.md) +필리버스터 중인 국회의원을 응원하다가, 배가 고파 [마시멜로를 먹으러 돌아간다.](../eating-walls/eating-marshmallows.md) [자랑하고 싶어서 인스타그램에 인증샷을 올린다.](../instagram/insta.md) From d05f0329994303d4cc447857ab33af40cac07da1 Mon Sep 17 00:00:00 2001 From: John Park Date: Sat, 14 Jan 2017 20:31:04 +0900 Subject: [PATCH 5214/5486] fixed for merging --- korean/filibuster/filibuster.md | 1 + 1 file changed, 1 insertion(+) diff --git a/korean/filibuster/filibuster.md b/korean/filibuster/filibuster.md index 4552cb27dc..2348c86392 100644 --- a/korean/filibuster/filibuster.md +++ b/korean/filibuster/filibuster.md @@ -1,2 +1,3 @@ 필리버스터 중인 국회의원을 응원하다가, 배가 고파 [마시멜로를 먹으러 돌아간다.](../eating-walls/eating-marshmallows.md) + [자랑하고 싶어서 인스타그램에 인증샷을 올린다.](../instagram/insta.md) From 081e13541f6ff4c71c360fc240d29447cff2db95 Mon Sep 17 00:00:00 2001 From: woges Date: Sat, 14 Jan 2017 15:01:02 +0100 Subject: [PATCH 5215/5486] docs: Add Schmiede --- german/Dorf/Schmiede/schmiede.md | 1 + german/Dorf/dorf.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 german/Dorf/Schmiede/schmiede.md diff --git a/german/Dorf/Schmiede/schmiede.md b/german/Dorf/Schmiede/schmiede.md new file mode 100644 index 0000000000..5e07eaaed6 --- /dev/null +++ b/german/Dorf/Schmiede/schmiede.md @@ -0,0 +1 @@ +Vorsichtig pirschen Sie sich an das uralte Schmiedgebäude heran, aus dessen Schornstein dichte Rauchwolken hervorquellen. \ No newline at end of file diff --git a/german/Dorf/dorf.md b/german/Dorf/dorf.md index 4819675932..a468a0cad9 100644 --- a/german/Dorf/dorf.md +++ b/german/Dorf/dorf.md @@ -24,4 +24,6 @@ Nach dem Festmachen gehen sie zu/zum/zur: [Tempel: Ein mystisch aussehendes Grundstück](Tempel/tempel.md) +[Schmiede: Ein düsteres Handwerksgebäude am Rande des Dorfes](Schmiede/schmiede.md) + [Werft: Ein Handwerksgebäude am Wasser mit einer Art Ablaufbahn](Werft/werft.md) \ No newline at end of file From 2f56e3b84b05aaf407b838d3be16e4e8c22926ce Mon Sep 17 00:00:00 2001 From: woges Date: Sat, 14 Jan 2017 15:06:53 +0100 Subject: [PATCH 5216/5486] docs: Add Enter --- german/Dorf/Schmiede/schmiede.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/german/Dorf/Schmiede/schmiede.md b/german/Dorf/Schmiede/schmiede.md index 5e07eaaed6..9d40d0c97c 100644 --- a/german/Dorf/Schmiede/schmiede.md +++ b/german/Dorf/Schmiede/schmiede.md @@ -1 +1,2 @@ -Vorsichtig pirschen Sie sich an das uralte Schmiedgebäude heran, aus dessen Schornstein dichte Rauchwolken hervorquellen. \ No newline at end of file +Vorsichtig pirschen Sie sich an das uralte Schmiedgebäude heran, aus dessen +Schornstein dichte Rauchwolken hervorquellen. From 9dc81c8283afc5ac8a67bc6a9a96e2acb441a473 Mon Sep 17 00:00:00 2001 From: Robert Sperry Date: Sat, 14 Jan 2017 11:17:58 -0800 Subject: [PATCH 5217/5486] Add partner dance option --- english/dance/dance.md | 4 ++++ english/start-dancing/startDancing.md | 2 ++ 2 files changed, 6 insertions(+) diff --git a/english/dance/dance.md b/english/dance/dance.md index d25c6d34e5..a252715d18 100644 --- a/english/dance/dance.md +++ b/english/dance/dance.md @@ -17,6 +17,8 @@ But there are too many cooks! Or so you think. You're not sure because you are self-aware of your tendency to be easily swayed by catchy rock songs of the 80s and Foreigner - Double Vision was just on the radio. +You become other aware that a potential dance partner is making eye contact with you... + Just get to sleep Dance Like MJ , live you life fully, @@ -42,6 +44,8 @@ it is a dancing cat [Want to read a story](../myStory/mayank.md) +[Look for a dance partner!](https://www.youtube.com/watch?v=3O3NCfiLvqs) + [Dance like it's 1999](https://www.youtube.com/watch?v=xWiUvn2KBu4) diff --git a/english/start-dancing/startDancing.md b/english/start-dancing/startDancing.md index 0b0d4fa5f3..4c05fb065a 100644 --- a/english/start-dancing/startDancing.md +++ b/english/start-dancing/startDancing.md @@ -2,4 +2,6 @@ When the song finishes, you think it is a great idea to start a party for all th What do you serve to your guests at this party to end all parties? +[smores](../smores/smores.md) (Yummy dance food!) + [Hot fruit](../madness/cthulhu.md) (Hey, isn't the the bowl you mixed the glint in?) \ No newline at end of file From 10533b346c2228ccea5d8df0b0aece6666016dd6 Mon Sep 17 00:00:00 2001 From: PedroAraujo92 Date: Sat, 14 Jan 2017 17:35:14 -0200 Subject: [PATCH 5218/5486] Add cockroach path --- portugues/barata/Pedro/pedro.md | 3 +++ portugues/barata/baratadavizinha.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 portugues/barata/Pedro/pedro.md diff --git a/portugues/barata/Pedro/pedro.md b/portugues/barata/Pedro/pedro.md new file mode 100644 index 0000000000..918eedd46f --- /dev/null +++ b/portugues/barata/Pedro/pedro.md @@ -0,0 +1,3 @@ +Diz aí Pedro o que "cê" vai fazer. Eu vou comprar um vassoura pra me vassoura. Diz aí Pedro o que "cê" vai fazer. Eu vou comprar um vassoura pra me defender. + +Ele vai dar uma vassourada na barata dela. ( x4 ) diff --git a/portugues/barata/baratadavizinha.md b/portugues/barata/baratadavizinha.md index 7acb03f8c3..6095000747 100644 --- a/portugues/barata/baratadavizinha.md +++ b/portugues/barata/baratadavizinha.md @@ -17,4 +17,6 @@ a barata da vizinha está na minha cama. [Diz aí Biluguinha o que "cê" vai fazer:](Biluga/biluga.md) +[Diz aí Biluguinha o que "cê" vai fazer:](Pedro/pedro.md) + E vc? O que "cê" vai fazer? \ No newline at end of file From 9314e8ea3814f2ec4e6b2054af35e1098a5b9487 Mon Sep 17 00:00:00 2001 From: Pedro Araujo Date: Sat, 14 Jan 2017 17:51:52 -0200 Subject: [PATCH 5219/5486] Correcting a word and breaking lines --- portugues/barata/Pedro/pedro.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/portugues/barata/Pedro/pedro.md b/portugues/barata/Pedro/pedro.md index 918eedd46f..5f22f21ec5 100644 --- a/portugues/barata/Pedro/pedro.md +++ b/portugues/barata/Pedro/pedro.md @@ -1,3 +1,4 @@ -Diz aí Pedro o que "cê" vai fazer. Eu vou comprar um vassoura pra me vassoura. Diz aí Pedro o que "cê" vai fazer. Eu vou comprar um vassoura pra me defender. +Diz aí Pedro o que "cê" vai fazer. Eu vou comprar um vassoura pra me defender. +Diz aí Pedro o que "cê" vai fazer. Eu vou comprar um vassoura pra me defender. Ele vai dar uma vassourada na barata dela. ( x4 ) From 9784ef3bc8b4b4adcaee5fbe2cee5b78e58b7093 Mon Sep 17 00:00:00 2001 From: siyuanseever <354560462@qq.com> Date: Sun, 15 Jan 2017 17:14:40 +0800 Subject: [PATCH 5220/5486] =?UTF-8?q?Create=20=E5=A4=A9=E6=B2=B3=E4=BB=96?= =?UTF-8?q?=E5=A8=98.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seever/\345\244\251\346\262\263\344\273\226\345\250\230.md" | 1 + 1 file changed, 1 insertion(+) create mode 100644 "Chinese/seever/\345\244\251\346\262\263\344\273\226\345\250\230.md" diff --git "a/Chinese/seever/\345\244\251\346\262\263\344\273\226\345\250\230.md" "b/Chinese/seever/\345\244\251\346\262\263\344\273\226\345\250\230.md" new file mode 100644 index 0000000000..bbe472a872 --- /dev/null +++ "b/Chinese/seever/\345\244\251\346\262\263\344\273\226\345\250\230.md" @@ -0,0 +1 @@ +容貌美丑不过是表象,内里是没什么分别的,都是皮下白骨,生命如朝露,如此短暂,没必要在意这些表面的东西 From da0679d11b9055e7950c0d3f4c36442125647c19 Mon Sep 17 00:00:00 2001 From: siyuanseever <354560462@qq.com> Date: Sun, 15 Jan 2017 17:18:12 +0800 Subject: [PATCH 5221/5486] =?UTF-8?q?Update=20=E5=A4=A7=E8=AF=9D=E8=A5=BF?= =?UTF-8?q?=E6=B8=B8.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 5b332348c6..5447ebfb8f 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -163,3 +163,5 @@ [Js不可告人的秘密](Javascript/js.md) [wow](wow/wow.md) + +[天河他娘](seever/天河他娘.md) From 80ebcaf41b81e75928d9fa90c700cdc583c27660 Mon Sep 17 00:00:00 2001 From: Ian Date: Mon, 16 Jan 2017 00:20:25 +0900 Subject: [PATCH 5222/5486] Add playgame choice in korean --- korean/marshmallow.md | 4 +++- korean/playgame/playfm/playfm.md | 13 +++++++++++++ korean/playgame/playgame.md | 7 +++++++ korean/playgame/watchkakaotv/kakao.md | 15 +++++++++++++++ 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 korean/playgame/playfm/playfm.md create mode 100644 korean/playgame/playgame.md create mode 100644 korean/playgame/watchkakaotv/kakao.md diff --git a/korean/marshmallow.md b/korean/marshmallow.md index f6d3ab1740..d67216d0d1 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -1,4 +1,4 @@ -어느날 잠에서 깨어보니 당신은 벽이 마시멜로로 되어있는 이상한 방 안에서 잠이 깬 것을 발견했어요. +어느날 잠에서 깨어보니 당신은 벽이 마시멜로로 되어있는 이상한 방 안에서 잠이 깬 것을 발견했어요. 어떻게 할까요? @@ -49,3 +49,5 @@ [화장실에 간다] (restroom/restroom.md) [인스타그램에 인증샷을 올린다] (instagram/insta.md) + +[게임을 시작한다] (playgame/playgame.md) diff --git a/korean/playgame/playfm/playfm.md b/korean/playgame/playfm/playfm.md new file mode 100644 index 0000000000..d9651ea98a --- /dev/null +++ b/korean/playgame/playfm/playfm.md @@ -0,0 +1,13 @@ +당신은 fm을 시작했습니다. + +이제 당신은 6부리그 감독입니다. 1부리그로 승격하기 전 까지 게임에서 나올 수 없습니다. + +엄청난 노력끝에 당신은 팀을 1부리그까지 승격 시켰고 결국 우승컵을 들어올렸습니다. + +축하합니다. + +우승후 정신을 차려보니 1년이 지났습니다. 이제 어떻게 할까요? + +[다른 게임을 찾아본다] (../playgame.md) + +[처음으로 돌아가서 다른것을 한다.] (../../marshmallow.md) \ No newline at end of file diff --git a/korean/playgame/playgame.md b/korean/playgame/playgame.md new file mode 100644 index 0000000000..b503a841a5 --- /dev/null +++ b/korean/playgame/playgame.md @@ -0,0 +1,7 @@ +컴퓨터 앞에 앉았습니다. 무슨게임을 시작할까요? + +[아니야 그냥 게임말고 다른거 할래] (../marshmallow.md) + +[FM을 시작한다] (playfm/playfm.md) + +[그냥 카카오TV를 본다] (watchkakaotv/kakao.md) \ No newline at end of file diff --git a/korean/playgame/watchkakaotv/kakao.md b/korean/playgame/watchkakaotv/kakao.md new file mode 100644 index 0000000000..c8f53cc12c --- /dev/null +++ b/korean/playgame/watchkakaotv/kakao.md @@ -0,0 +1,15 @@ +게임이 지겨웠던 당신 + +직접 플레이보다는 게임 하는것을 보기로 결정했습니다. + +베스트PD와 추천PD를 돌아 가면서 즐겁게 방송을 보았습니다. + +잠깐 정신을 차려보니 1개월이 지나있었고 당신은 팟수가 되었습니다. + +당신은 이선생방의 네임드이고 멍구누나방의 전문 어그로꾼이 되었습니다. + +더 이상 이렇게 살 수 없다고 생각한 당신 이제 어떻게 할까요? + +[다른 게임을 찾아본다] (../playgame.md) + +[처음으로 돌아가서 다른것을 한다.] (../../marshmallow.md) \ No newline at end of file From 42d48c0044ccf9d389172be682cfe818d8a3caf1 Mon Sep 17 00:00:00 2001 From: IL KWON KIM Date: Mon, 16 Jan 2017 00:31:26 +0900 Subject: [PATCH 5223/5486] fix first line --- korean/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/korean/marshmallow.md b/korean/marshmallow.md index d67216d0d1..219d567482 100644 --- a/korean/marshmallow.md +++ b/korean/marshmallow.md @@ -1,4 +1,4 @@ -어느날 잠에서 깨어보니 당신은 벽이 마시멜로로 되어있는 이상한 방 안에서 잠이 깬 것을 발견했어요. +어느날 잠에서 깨어보니 당신은 벽이 마시멜로로 되어있는 이상한 방 안에서 잠이 깬 것을 발견했어요. 어떻게 할까요? From c44c683911b6c1ba18fa19b3be175a3a25a3cd4a Mon Sep 17 00:00:00 2001 From: Mariona DSR Date: Sun, 15 Jan 2017 20:02:48 +0100 Subject: [PATCH 5224/5486] Busco formigues --- catala/correr/correr.md | 4 ++++ catala/correr/formigues.md | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 catala/correr/formigues.md diff --git a/catala/correr/correr.md b/catala/correr/correr.md index 82200543f0..f48c2a1ac7 100644 --- a/catala/correr/correr.md +++ b/catala/correr/correr.md @@ -3,3 +3,7 @@ La ostia que et fots és de campionat! Que no saps que les parets no poden ser de núvol de sucre? És clar que no, si no les formigues t'entrarien a casa ;-P + +Què fas? + +[Et poses a buscar formigues](formigues/formigues.md) \ No newline at end of file diff --git a/catala/correr/formigues.md b/catala/correr/formigues.md new file mode 100644 index 0000000000..ed1cbf42a9 --- /dev/null +++ b/catala/correr/formigues.md @@ -0,0 +1,5 @@ +Les petites formiguetes a l'estiu, +quan el blat ja està segat, ben lligat i apilotat, +surten arrengleredetes del seu niu, fent xiu-xiu, fent xiu-xiu... + +I et poses a fer-li pessigolles a la teva parella! \ No newline at end of file From 8879bf0551041d3e051ff1fbf3ff15965d7fc2dc Mon Sep 17 00:00:00 2001 From: Mariona DSR Date: Sun, 15 Jan 2017 20:08:43 +0100 Subject: [PATCH 5225/5486] Moving formigues.md to the right place --- catala/correr/{ => formigues}/formigues.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename catala/correr/{ => formigues}/formigues.md (100%) diff --git a/catala/correr/formigues.md b/catala/correr/formigues/formigues.md similarity index 100% rename from catala/correr/formigues.md rename to catala/correr/formigues/formigues.md From c08ce8484341207dd9034d150162ef0748788be5 Mon Sep 17 00:00:00 2001 From: Drithin Date: Sun, 15 Jan 2017 11:42:33 -0800 Subject: [PATCH 5226/5486] chore: New Line Added --- english/alone/alone.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 243c6f0567..99024528c8 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -69,4 +69,6 @@ in the mirror. Bella records it with her phone and shivers seeing Kristy. -Bella sees Kristy seeing herself in the mirror and tremble. \ No newline at end of file +Bella sees Kristy seeing herself in the mirror and tremble. + +Bella ushers Kristy on to her bed and calm her down. \ No newline at end of file From f187705c94bedfcf17b54e4e10b72d6d2d86a837 Mon Sep 17 00:00:00 2001 From: BrechtLoos Date: Sun, 15 Jan 2017 22:07:32 +0100 Subject: [PATCH 5227/5486] changes made to adventure story --- dutch/verlaten-weg/verlaten-weg.md | 4 ++++ dutch/welkom.md | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 dutch/verlaten-weg/verlaten-weg.md diff --git a/dutch/verlaten-weg/verlaten-weg.md b/dutch/verlaten-weg/verlaten-weg.md new file mode 100644 index 0000000000..3561417131 --- /dev/null +++ b/dutch/verlaten-weg/verlaten-weg.md @@ -0,0 +1,4 @@ +Er is niemand op de weg te zien, je blijft een tijdje wachten en in het rond kijken, +in de hoop dat je iemand tegenkomt. + +Uiteindelijk besluit je dan maar in een bepaalde richting te wandelen ... \ No newline at end of file diff --git a/dutch/welkom.md b/dutch/welkom.md index ab06d21712..d712caed49 100644 --- a/dutch/welkom.md +++ b/dutch/welkom.md @@ -19,6 +19,8 @@ U denkt ... maar de Iphone heeft weer geen batterij want deze gaat snel op. Dus pak je maar je android die wel drie dagen lang meegaat! +... u wandelt nog even door en komt op een [verlaten weg](verlaten-weg/verlaten-weg.md) terecht. + [Google translate NL](https://translate.google.com/#nl/en/) From 68a9c1f27379cde01899ba776b5e6fcc4f7b8da2 Mon Sep 17 00:00:00 2001 From: BrechtLoos Date: Sun, 15 Jan 2017 22:15:19 +0100 Subject: [PATCH 5228/5486] changes made to the story in another place --- dutch/bos/donker-bos.md | 4 +++- dutch/{ => bos}/verlaten-weg/verlaten-weg.md | 0 dutch/welkom.md | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) rename dutch/{ => bos}/verlaten-weg/verlaten-weg.md (100%) diff --git a/dutch/bos/donker-bos.md b/dutch/bos/donker-bos.md index e4ed1cd3c2..bb3bed5dba 100644 --- a/dutch/bos/donker-bos.md +++ b/dutch/bos/donker-bos.md @@ -8,4 +8,6 @@ Je gaat snel [terug naar de hei](../welkom.md) Je blijft stiekem [meekijken](ontvoering/ontvoering.md) -Je kijkt rond in de [struiken](struiken/in_de_struiken.md) \ No newline at end of file +Je kijkt rond in de [struiken](struiken/in_de_struiken.md) + +Je wandelt nog even door en komt op een [verlaten weg](verlaten-weg/verlaten-weg.md) terecht. \ No newline at end of file diff --git a/dutch/verlaten-weg/verlaten-weg.md b/dutch/bos/verlaten-weg/verlaten-weg.md similarity index 100% rename from dutch/verlaten-weg/verlaten-weg.md rename to dutch/bos/verlaten-weg/verlaten-weg.md diff --git a/dutch/welkom.md b/dutch/welkom.md index d712caed49..ab06d21712 100644 --- a/dutch/welkom.md +++ b/dutch/welkom.md @@ -19,8 +19,6 @@ U denkt ... maar de Iphone heeft weer geen batterij want deze gaat snel op. Dus pak je maar je android die wel drie dagen lang meegaat! -... u wandelt nog even door en komt op een [verlaten weg](verlaten-weg/verlaten-weg.md) terecht. - [Google translate NL](https://translate.google.com/#nl/en/) From 1e977a5c628a6c1c0a0d6418033237e2e1a9f103 Mon Sep 17 00:00:00 2001 From: BrechtLoos Date: Sun, 15 Jan 2017 22:18:27 +0100 Subject: [PATCH 5229/5486] add new choice to the 'bos' storyline --- dutch/bos/verlaten-weg/verlaten-weg.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dutch/bos/verlaten-weg/verlaten-weg.md b/dutch/bos/verlaten-weg/verlaten-weg.md index 3561417131..e5e82a679d 100644 --- a/dutch/bos/verlaten-weg/verlaten-weg.md +++ b/dutch/bos/verlaten-weg/verlaten-weg.md @@ -1,4 +1,4 @@ -Er is niemand op de weg te zien, je blijft een tijdje wachten en in het rond kijken, -in de hoop dat je iemand tegenkomt. +Er is niemand op de weg te zien, je blijft een tijdje wachten, +in de hoop dat je iemand tegenkomt. Uiteindelijk besluit je dan maar in een bepaalde richting te wandelen ... \ No newline at end of file From ebd9e26982e0e1c8fe7a446d506da9d010e1e5cd Mon Sep 17 00:00:00 2001 From: Ted Getschman Date: Mon, 16 Jan 2017 09:10:16 +0100 Subject: [PATCH 5230/5486] added one branch to fight.md the branch will be called sound have one passage and link to two higher branches --- english/forest/fire/fight/fight.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/forest/fire/fight/fight.md b/english/forest/fire/fight/fight.md index 2556327e26..e1d44fe64b 100644 --- a/english/forest/fire/fight/fight.md +++ b/english/forest/fire/fight/fight.md @@ -17,4 +17,6 @@ Do you think [this was enough hard work for today and take a nap under a tree](nap/nap.md) -[or do you go for another hunt into the forest?](forest/forest.md) \ No newline at end of file +[or do you go for another hunt into the forest?](forest/forest.md) + +[or do you hear a sound](sound/sound.md) \ No newline at end of file From 82f4b297db3fe303c2030a5b1087b791fedd87f7 Mon Sep 17 00:00:00 2001 From: Ted Getschman Date: Mon, 16 Jan 2017 09:15:32 +0100 Subject: [PATCH 5231/5486] name change from fight to sound --- english/forest/fire/fight/sound/sound.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 english/forest/fire/fight/sound/sound.md diff --git a/english/forest/fire/fight/sound/sound.md b/english/forest/fire/fight/sound/sound.md new file mode 100644 index 0000000000..949895985a --- /dev/null +++ b/english/forest/fire/fight/sound/sound.md @@ -0,0 +1,22 @@ +You grab a long sharp branch off the ground next to your fire. Bloodlust pulses +through your veins as you stalk the bear. You find him sitting next to a tree +stump digging honey out of a poor bees nest. Running at the bear, spear in hand, +you sink the sharp end into his back and the bear cries out in pain. + +Victory achieved, you march triumphntly back to your camp. + +But not so fast! The bees are fast approaching. Rather than get stung you jump +into a nearby lake until they fly away. + +You climb out of the water dripping wet. The bees have gone. The sweet honey +beckons to you. You saunter forward, remembering your first sip of mead. You +quickly scoop a jar of honey from the thrashed beehive, stash it in your +waterskin, and scamper back to camp unscathed. + +Do you think + +[this was enough hard work for today and take a nap under a tree](nap/nap.md) + +[or do you go for another hunt into the forest?](forest/forest.md) + +[or do you hear a sound](forest/sound.md) \ No newline at end of file From e05e1c2dc3b15dd946c154d36885b5e343fc6589 Mon Sep 17 00:00:00 2001 From: Ted Getschman Date: Mon, 16 Jan 2017 09:23:28 +0100 Subject: [PATCH 5232/5486] added two links. one link goes to watch-alien, the other to lawn-mower --- english/forest/fire/fight/sound/sound.md | 25 +++++++----------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/english/forest/fire/fight/sound/sound.md b/english/forest/fire/fight/sound/sound.md index 949895985a..658b02d5ff 100644 --- a/english/forest/fire/fight/sound/sound.md +++ b/english/forest/fire/fight/sound/sound.md @@ -1,22 +1,11 @@ -You grab a long sharp branch off the ground next to your fire. Bloodlust pulses -through your veins as you stalk the bear. You find him sitting next to a tree -stump digging honey out of a poor bees nest. Running at the bear, spear in hand, -you sink the sharp end into his back and the bear cries out in pain. +Your ears prick up to the sound of breaking branches. -Victory achieved, you march triumphntly back to your camp. +Your thoughts race back to Gabriel and how he tried to kill you over the chocolate +milk that one Sunday in November. Man, can that guy hold a grudge! I mean it wasn't +even that good of chocolate milk. And there was still some strawberry milk left. -But not so fast! The bees are fast approaching. Rather than get stung you jump -into a nearby lake until they fly away. +Taking no chances you decide to -You climb out of the water dripping wet. The bees have gone. The sweet honey -beckons to you. You saunter forward, remembering your first sip of mead. You -quickly scoop a jar of honey from the thrashed beehive, stash it in your -waterskin, and scamper back to camp unscathed. +[escape to the zoo,](../../../../watch-alien/watch-alien.md) -Do you think - -[this was enough hard work for today and take a nap under a tree](nap/nap.md) - -[or do you go for another hunt into the forest?](forest/forest.md) - -[or do you hear a sound](forest/sound.md) \ No newline at end of file +[or go look for a shed to hide in?](../../../../lawn-mower/lawn-mower.md) From db87c13400b4a3f9e78d695707675100d0d14ce1 Mon Sep 17 00:00:00 2001 From: trthhrtz Date: Mon, 16 Jan 2017 13:50:57 +0300 Subject: [PATCH 5233/5486] Add to the password story option when user decides not to enter the maze --- english/plugh/outside/outside1.md | 10 ++++++++++ english/plugh/outside/outside1/outside.md | 1 + english/plugh/outside/outside2/outside.md | 1 + english/plugh/plugh.md | 2 ++ 4 files changed, 14 insertions(+) create mode 100644 english/plugh/outside/outside1.md create mode 100644 english/plugh/outside/outside1/outside.md create mode 100644 english/plugh/outside/outside2/outside.md diff --git a/english/plugh/outside/outside1.md b/english/plugh/outside/outside1.md new file mode 100644 index 0000000000..c880c7db5b --- /dev/null +++ b/english/plugh/outside/outside1.md @@ -0,0 +1,10 @@ +You decided to rest a little bit. + +Password is still in your pocket. Weather is nice, birds are tweeting. + +*Pstst*. Can of soda is opened. You drink slowly and enjoy it. + +However your inner voice stars raising up. You think you noticed some movement. + +[Look around](outside/outside1/outside.md) +[Keep drinking](outside/outside2/outside.md) \ No newline at end of file diff --git a/english/plugh/outside/outside1/outside.md b/english/plugh/outside/outside1/outside.md new file mode 100644 index 0000000000..8f104d219a --- /dev/null +++ b/english/plugh/outside/outside1/outside.md @@ -0,0 +1 @@ +And .... \ No newline at end of file diff --git a/english/plugh/outside/outside2/outside.md b/english/plugh/outside/outside2/outside.md new file mode 100644 index 0000000000..5b30325be4 --- /dev/null +++ b/english/plugh/outside/outside2/outside.md @@ -0,0 +1 @@ +And.... \ No newline at end of file diff --git a/english/plugh/plugh.md b/english/plugh/plugh.md index 265cb967e3..31d835e6cf 100644 --- a/english/plugh/plugh.md +++ b/english/plugh/plugh.md @@ -3,3 +3,5 @@ Suddenly, you find yourself on a hill looking at a small building. What a relie But the only way back is through the maze, are you up to the challenge? [Enter the maze](maze1/maze1.md) +Or would you like to spend more time outside and enjoy refreshing soda? +[Chill outside](outside/outside1.md) \ No newline at end of file From 471d298cd1ba6479697d11ac944a41dfeda77fcd Mon Sep 17 00:00:00 2001 From: trthhrtz Date: Mon, 16 Jan 2017 13:58:57 +0300 Subject: [PATCH 5234/5486] Fix paths --- english/plugh/outside/outside1.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/plugh/outside/outside1.md b/english/plugh/outside/outside1.md index c880c7db5b..fef2e007df 100644 --- a/english/plugh/outside/outside1.md +++ b/english/plugh/outside/outside1.md @@ -6,5 +6,5 @@ Password is still in your pocket. Weather is nice, birds are tweeting. However your inner voice stars raising up. You think you noticed some movement. -[Look around](outside/outside1/outside.md) -[Keep drinking](outside/outside2/outside.md) \ No newline at end of file +[Look around](outside1/outside.md) +[Keep drinking](outside2/outside.md) \ No newline at end of file From d14a3bbf9be3731e59dbed7c3621bf7234d1ecb7 Mon Sep 17 00:00:00 2001 From: trthhrtz Date: Mon, 16 Jan 2017 14:00:58 +0300 Subject: [PATCH 5235/5486] Fix space line between links --- english/plugh/outside/outside1.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/plugh/outside/outside1.md b/english/plugh/outside/outside1.md index fef2e007df..9a471e182f 100644 --- a/english/plugh/outside/outside1.md +++ b/english/plugh/outside/outside1.md @@ -7,4 +7,5 @@ Password is still in your pocket. Weather is nice, birds are tweeting. However your inner voice stars raising up. You think you noticed some movement. [Look around](outside1/outside.md) + [Keep drinking](outside2/outside.md) \ No newline at end of file From 8e583e23e22643c6f3f6be89a2626a27425d7dc0 Mon Sep 17 00:00:00 2001 From: Cristiano Erbacci Date: Mon, 16 Jan 2017 17:28:23 +0100 Subject: [PATCH 5236/5486] add my poor story --- Italian/orologio/orologio.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Italian/orologio/orologio.md diff --git a/Italian/orologio/orologio.md b/Italian/orologio/orologio.md new file mode 100644 index 0000000000..36069560d5 --- /dev/null +++ b/Italian/orologio/orologio.md @@ -0,0 +1,2 @@ +Guardo l'orologio per capire se +è giorno o notte. From 1da3a7d5615d10e7f41f5240f3f0430aa5a89a67 Mon Sep 17 00:00:00 2001 From: Cristiano Erbacci Date: Mon, 16 Jan 2017 17:39:13 +0100 Subject: [PATCH 5237/5486] add link to page orologio.md --- Italian/caramelle.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Italian/caramelle.md b/Italian/caramelle.md index 19dfad3499..b79b46a702 100644 --- a/Italian/caramelle.md +++ b/Italian/caramelle.md @@ -34,3 +34,5 @@ Che fai? [Cerco lo smartphone] (smartphone/smartphone.md) [Canto](canto/canto.md) + +[Guardo l'orologio](orologio/orologio.md) From 37fd7cf0fe371117165fff4add3c3233a5c1b4b0 Mon Sep 17 00:00:00 2001 From: Drithin Date: Mon, 16 Jan 2017 16:55:38 -0800 Subject: [PATCH 5238/5486] chore: New Update --- english/alone/alone.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 99024528c8..5cd522fc7d 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -71,4 +71,6 @@ Bella records it with her phone and shivers seeing Kristy. Bella sees Kristy seeing herself in the mirror and tremble. -Bella ushers Kristy on to her bed and calm her down. \ No newline at end of file +Bella ushers Kristy on to her bed and calm her down. + +Bella palms her head while Kristy gets normalized. \ No newline at end of file From 32fc1e1e399d55e9a7420bd627cb1588a10fccb2 Mon Sep 17 00:00:00 2001 From: Enrique Alonso Vendrell Date: Tue, 17 Jan 2017 11:00:45 +0100 Subject: [PATCH 5239/5486] Modifica Canudos: Blanco --- espanol/canudos.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 414b144c26..0788723f43 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -2,6 +2,8 @@ En el pueblo de Canudos, el Consejero y Beatito estaban conversando acerca del i república cuando empezaron a sonar trompetas que indicaban la llegada del ejercito. En ese momento el Consejero: +Se quedo en [blanco](blanco/blanco.md) + Hizo llamar a [Zipi y Zape](zipizape/zipizape.md) para recibir al ejército. (Zipi es el rubio) @@ -189,4 +191,4 @@ Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/ [En su viaje al pasado pudo conoció a Aquiles, quien le enseñó como invocar a Pegaso](pegaso/pegaso.md) -[El ejército invasor avanza](ejercito-invasor/ejercito-invasor.md) \ No newline at end of file +[El ejército invasor avanza](ejercito-invasor/ejercito-invasor.md) From 22b2b97e1d3d026aad112060809ac0526faeee60 Mon Sep 17 00:00:00 2001 From: Enrique Alonso Vendrell Date: Tue, 17 Jan 2017 11:06:24 +0100 Subject: [PATCH 5240/5486] Add blanco/blanco.md --- espanol/blanco/blanco.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 espanol/blanco/blanco.md diff --git a/espanol/blanco/blanco.md b/espanol/blanco/blanco.md new file mode 100644 index 0000000000..0694b7ecd4 --- /dev/null +++ b/espanol/blanco/blanco.md @@ -0,0 +1,3 @@ +Y aunque parecia estar en blanco, todos sabian lo que pasaba por la cabeza: + +- Que pasara con mis tarjetas black? \ No newline at end of file From d0ec671f57c86edb4983ed8efa3ba332a95f5fbd Mon Sep 17 00:00:00 2001 From: sheikh Date: Tue, 17 Jan 2017 19:00:48 +0530 Subject: [PATCH 5241/5486] added tvf-play --- english/marshmallow.md | 2 ++ english/tvf-play/watch.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 english/tvf-play/watch.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 24193af682..a4753343f9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1239,3 +1239,5 @@ Smile and move on gingerly. What is your [passion?](passion/passion.md) - + +searching for [good](tvf-play/watch.md) content. \ No newline at end of file diff --git a/english/tvf-play/watch.md b/english/tvf-play/watch.md new file mode 100644 index 0000000000..2247ea3f09 --- /dev/null +++ b/english/tvf-play/watch.md @@ -0,0 +1 @@ +They have [good](https://tvfplay.com/) content. \ No newline at end of file From 071b937d7d22f584ffb5cb262f77acde87220ceb Mon Sep 17 00:00:00 2001 From: miguelusque Date: Tue, 17 Jan 2017 17:15:55 +0100 Subject: [PATCH 5242/5486] Add 'the end' in Spanish --- espanol/canudos.md | 2 ++ espanol/fin/fin.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 espanol/fin/fin.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 0788723f43..442891c026 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -192,3 +192,5 @@ Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/ [En su viaje al pasado pudo conoció a Aquiles, quien le enseñó como invocar a Pegaso](pegaso/pegaso.md) [El ejército invasor avanza](ejercito-invasor/ejercito-invasor.md) + +[Y de repente, sintió la necesidad de que la historia llegase a su fin](fin/fin.md) \ No newline at end of file diff --git a/espanol/fin/fin.md b/espanol/fin/fin.md new file mode 100644 index 0000000000..fd53fbac97 --- /dev/null +++ b/espanol/fin/fin.md @@ -0,0 +1 @@ +Y colorín colorado este cuento se ha acabado! \ No newline at end of file From 5fa327c450c400ebdd0250da384dde82816d6e1b Mon Sep 17 00:00:00 2001 From: Drithin Date: Tue, 17 Jan 2017 09:18:51 -0800 Subject: [PATCH 5243/5486] chore: new line to the story --- english/alone/alone.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 5cd522fc7d..901fd5f4bb 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -73,4 +73,6 @@ Bella sees Kristy seeing herself in the mirror and tremble. Bella ushers Kristy on to her bed and calm her down. -Bella palms her head while Kristy gets normalized. \ No newline at end of file +Bella palms her head while Kristy gets normalized. + +Stranger smirks seeing Kristy and escape into the dark. \ No newline at end of file From 55b5cbda6998fc722631800ab3f7247baaac6b9d Mon Sep 17 00:00:00 2001 From: "Bob Reis (breis)" Date: Tue, 17 Jan 2017 14:07:10 -0600 Subject: [PATCH 5244/5486] Add Germany to travel destinations. --- english/travel-destinations/travel-destinations.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/english/travel-destinations/travel-destinations.md b/english/travel-destinations/travel-destinations.md index 4cdf7007f4..fc8c91433f 100644 --- a/english/travel-destinations/travel-destinations.md +++ b/english/travel-destinations/travel-destinations.md @@ -6,6 +6,9 @@ It's Summer! Time to explore these places: [Sweden](https://youtu.be/5KYm1UpXiq0?t=53s) +Visit the Rhine and Rothenburg +[Germany](https://www.youtube.com/watch?v=uD9b7mP6whk) + Fall is a great season to take a vacation in any of these spots: [fall destinations](fall/fall.md) From b110f9707c56e507b7392613ce70a13fe87aaa4c Mon Sep 17 00:00:00 2001 From: dandgerson Date: Thu, 28 Sep 2017 17:20:07 +0300 Subject: [PATCH 5245/5486] begin quest: call of cthulhu --- russian/cthulhu/cthulhu.md | 8 ++++++++ russian/zefir.md | 2 ++ 2 files changed, 10 insertions(+) create mode 100644 russian/cthulhu/cthulhu.md diff --git a/russian/cthulhu/cthulhu.md b/russian/cthulhu/cthulhu.md new file mode 100644 index 0000000000..b03b9cf1db --- /dev/null +++ b/russian/cthulhu/cthulhu.md @@ -0,0 +1,8 @@ +Вылетев через широко распахнутое окно вы движетесь в сторону моря, набирая скорость и высоту. Вы знаете, что самой судьбой вам предначертано опуститься в морскую бездну. Вы уже видели это в своих болезненных снах столько раз. Но только лишь теперь, вы можете исполнить это предназначение. Вы чувствуете, как вас влечёт чёрная, холодная бездна... и ваш господин, не выразимому громоподобному зову, которого вы не в силах сопротивляться. + +Погрузившись в солёную морскую воду вы начинаете стремительно опускаться в глубь. Вам не страшно. Вы замечаете, что можете дышать. На вашей шее вы нащупываете жабры, а на ваших кистях вы замечаете удобные перепонки. Загревая могучими крыльями, как плавниками, вы плывёте настолько стремительно, что ни одна рыба не может угнаться за вами. Вы не удивлены. + +Наконец, после вечности стремительного спуска, вам удаётся различить во тьме толщи воды смутный силует вашего величественного храма. И ваши ротовые щупальца начинают нетерпеливо дрожать и колыхаться. + +Приблизившись к циклопическому древнему строению вы подплыли к главным вратам. Врата надёжно заперты, но вы чувствуете, что зов исходит изнутри. Вы растерялись, что же вы предпримите? + diff --git a/russian/zefir.md b/russian/zefir.md index 9572bad84e..bc7fac0ca4 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -26,6 +26,8 @@ Ваши действия: +[Вы летите на Зов Ктулху](cthulhu/cthulhu.md) + [Пригласить профессора Воробьева](invite-proffesor/invite-proffesor.md) [Попросите девушку ущепнуть вас](girlfriend-pinch-you/girlfriend-pinch-you.md) From 22e45b7e6a38bb6f674bd8aefe65bf7f3d216b08 Mon Sep 17 00:00:00 2001 From: dandgerson Date: Thu, 28 Sep 2017 17:27:17 +0300 Subject: [PATCH 5246/5486] fix line length --- russian/cthulhu/cthulhu.md | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/russian/cthulhu/cthulhu.md b/russian/cthulhu/cthulhu.md index b03b9cf1db..3aa1b8b303 100644 --- a/russian/cthulhu/cthulhu.md +++ b/russian/cthulhu/cthulhu.md @@ -1,8 +1,21 @@ -Вылетев через широко распахнутое окно вы движетесь в сторону моря, набирая скорость и высоту. Вы знаете, что самой судьбой вам предначертано опуститься в морскую бездну. Вы уже видели это в своих болезненных снах столько раз. Но только лишь теперь, вы можете исполнить это предназначение. Вы чувствуете, как вас влечёт чёрная, холодная бездна... и ваш господин, не выразимому громоподобному зову, которого вы не в силах сопротивляться. +Вылетев через широко распахнутое окно вы движетесь в сторону моря, набирая +скорость и высоту. Вы знаете, что самой судьбой вам предначертано опуститься в +морскую бездну. Вы уже видели это в своих болезненных снах столько раз. Но +только лишь теперь, вы можете исполнить это предназначение. Вы чувствуете, как +вас влечёт чёрная, холодная бездна... и ваш господин, не выразимому +громоподобному зову, которого вы не в силах сопротивляться. -Погрузившись в солёную морскую воду вы начинаете стремительно опускаться в глубь. Вам не страшно. Вы замечаете, что можете дышать. На вашей шее вы нащупываете жабры, а на ваших кистях вы замечаете удобные перепонки. Загревая могучими крыльями, как плавниками, вы плывёте настолько стремительно, что ни одна рыба не может угнаться за вами. Вы не удивлены. +Погрузившись в солёную морскую воду вы начинаете стремительно опускаться в +глубь. Вам не страшно. Вы замечаете, что можете дышать. На вашей шее вы +нащупываете жабры, а на ваших кистях вы замечаете удобные перепонки. Загревая +могучими крыльями, как плавниками, вы плывёте настолько стремительно, что ни +одна рыба не может угнаться за вами. Вы не удивлены. -Наконец, после вечности стремительного спуска, вам удаётся различить во тьме толщи воды смутный силует вашего величественного храма. И ваши ротовые щупальца начинают нетерпеливо дрожать и колыхаться. +Наконец, после вечности стремительного спуска, вам удаётся различить во тьме +толщи воды смутный силует вашего величественного храма. И ваши ротовые +щупальца начинают нетерпеливо дрожать и колыхаться. -Приблизившись к циклопическому древнему строению вы подплыли к главным вратам. Врата надёжно заперты, но вы чувствуете, что зов исходит изнутри. Вы растерялись, что же вы предпримите? +Приблизившись к циклопическому древнему строению вы подплыли к главным вратам. +Врата надёжно заперты, но вы чувствуете, что зов исходит изнутри. Вы +растерялись, что же вы предпримите? From 9c5560d012350f5b7df5837b85a09c95310affe0 Mon Sep 17 00:00:00 2001 From: Dmitry Anderson Date: Thu, 28 Sep 2017 18:35:01 +0300 Subject: [PATCH 5247/5486] edit text cthulhu.md --- russian/cthulhu/cthulhu.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/russian/cthulhu/cthulhu.md b/russian/cthulhu/cthulhu.md index 3aa1b8b303..8f03714b54 100644 --- a/russian/cthulhu/cthulhu.md +++ b/russian/cthulhu/cthulhu.md @@ -2,8 +2,8 @@ скорость и высоту. Вы знаете, что самой судьбой вам предначертано опуститься в морскую бездну. Вы уже видели это в своих болезненных снах столько раз. Но только лишь теперь, вы можете исполнить это предназначение. Вы чувствуете, как -вас влечёт чёрная, холодная бездна... и ваш господин, не выразимому -громоподобному зову, которого вы не в силах сопротивляться. +вас влечёт чёрная, холодная бездна... и ваш Господин. Вы не в силах +сопротивляться невыразимому громоподобному зову, который звучит у вас в голове. Погрузившись в солёную морскую воду вы начинаете стремительно опускаться в глубь. Вам не страшно. Вы замечаете, что можете дышать. На вашей шее вы From b71a9cfe3dabb8a382d2e79ccb43b0e2430883b6 Mon Sep 17 00:00:00 2001 From: Saurabh Suman Date: Thu, 13 Dec 2018 16:22:14 +0530 Subject: [PATCH 5248/5486] Covert operation with Milton. --- english/00_8_Agent/The_name_is_Bond_Milton_Bond.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md index 23912bb7ab..236dc74f9e 100644 --- a/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md +++ b/english/00_8_Agent/The_name_is_Bond_Milton_Bond.md @@ -15,4 +15,5 @@ Ask Milton! Special ordering a bespoke tuxedo for a fancy dinner and with a side of fisticuffs? Milton's your man. Need someone to send in your end of mission expense report, complete with TPS cover letter. -Milton's already one step ahead of you. \ No newline at end of file +Milton's already one step ahead of you. +It's a gret to part of operation with Milton. \ No newline at end of file From ff00779fb18d92f5fe3092702eb9ccb853e2d41d Mon Sep 17 00:00:00 2001 From: Thibaut Miquel Date: Fri, 14 Dec 2018 11:52:13 +0100 Subject: [PATCH 5249/5486] Feat: add a line to the story - 'wear a jacket' --- french/telephone/prof_musique.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/french/telephone/prof_musique.md b/french/telephone/prof_musique.md index 11a7c4d757..70ac34ca89 100644 --- a/french/telephone/prof_musique.md +++ b/french/telephone/prof_musique.md @@ -1,3 +1,5 @@ Comme c'est le weekend, sa mère repond et me demande d'aller lui acheter du pain. +Il met son manteau. + [Retourner](../feu-de-camp.md) From 9cfeaf078f77b1c1d54e4ee20a0f7dba494169fb Mon Sep 17 00:00:00 2001 From: Abdullah Al-Sabbagh <35447181+CleverEngage@users.noreply.github.com> Date: Fri, 14 Dec 2018 17:01:13 +0300 Subject: [PATCH 5250/5486] Add success link & page --- arabic/salamoAlikom.md | 4 +++- arabic/success/paths-to-success.md | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 arabic/success/paths-to-success.md diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 158f21c314..0451680f20 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -30,4 +30,6 @@ [أحب هذا الكورس](https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) -[سي يسيس] (https://www.youtube.com/watch?v=EUw-zTz8cU8) \ No newline at end of file +[سي يسيس] (https://www.youtube.com/watch?v=EUw-zTz8cU8) + +[أريد أن أكون ناجح](success/something.md) \ No newline at end of file diff --git a/arabic/success/paths-to-success.md b/arabic/success/paths-to-success.md new file mode 100644 index 0000000000..75ded1dddc --- /dev/null +++ b/arabic/success/paths-to-success.md @@ -0,0 +1,2 @@ +حتى تنجح عليك أن تتعرف على طرق النجاح، وتتعلم وتطبق ما يناسبك. +هناك طرق كثيرة وعديدة، وقد تطبق أي طريقة من هذه الطرق مرة أو عدة مرات إلى أن تصل للنتيجة المرغوبة. \ No newline at end of file From 43c76e24e883e17bc84ec6cf9d7e61151d90f4fb Mon Sep 17 00:00:00 2001 From: Abdullah Al-Sabbagh <35447181+CleverEngage@users.noreply.github.com> Date: Fri, 14 Dec 2018 17:09:45 +0300 Subject: [PATCH 5251/5486] Fix the link --- arabic/salamoAlikom.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arabic/salamoAlikom.md b/arabic/salamoAlikom.md index 0451680f20..9b1c7e525a 100644 --- a/arabic/salamoAlikom.md +++ b/arabic/salamoAlikom.md @@ -32,4 +32,4 @@ [سي يسيس] (https://www.youtube.com/watch?v=EUw-zTz8cU8) -[أريد أن أكون ناجح](success/something.md) \ No newline at end of file +[أريد أن أكون ناجح](success/paths-to-success.md) \ No newline at end of file From 5f972c5579286d2146b2aa98842f9a7f274d0cac Mon Sep 17 00:00:00 2001 From: fornaciali Date: Sat, 15 Dec 2018 18:30:47 -0200 Subject: [PATCH 5252/5486] include my adventure --- portugues_pt/colaborar.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portugues_pt/colaborar.md b/portugues_pt/colaborar.md index 70443b8d46..0ef816ef51 100644 --- a/portugues_pt/colaborar.md +++ b/portugues_pt/colaborar.md @@ -35,4 +35,6 @@ Pensava numa forma de criar [emprego](emprego/criar_emprego.md) na minha terra n Iria passear na [Itália](italia/italia.md) -Investiria no [saturnov](http://www.saturnov.com/) \ No newline at end of file +Investiria no [saturnov](http://www.saturnov.com/) + +Daria a volta ao mundo \ No newline at end of file From 97ffe8627a6ce5feb0e8a52c2586efb07e7ecd29 Mon Sep 17 00:00:00 2001 From: Atharva Date: Wed, 19 Dec 2018 03:14:33 +0530 Subject: [PATCH 5253/5486] Add new line to air.md --- english/avatar/air.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/avatar/air.md b/english/avatar/air.md index bb08c86928..3db6d3bf16 100644 --- a/english/avatar/air.md +++ b/english/avatar/air.md @@ -11,4 +11,5 @@ The next step is other planets. You feel stranded. How can I get off of this planet? You are desperate and scream, "Oh God!" +You are surrounded by a horde of creatures that look like sharks with legs. Suddenly - [you wake up!](../wake-up/wake-up.md) From 6003b44946e72b86fc6c4cb6efb811907007d38f Mon Sep 17 00:00:00 2001 From: Carlos Moyano Date: Tue, 18 Dec 2018 21:11:22 -0300 Subject: [PATCH 5254/5486] El rey comienza una republica. --- espanol/bruja/bruja.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/espanol/bruja/bruja.md b/espanol/bruja/bruja.md index 99cdc8ccdd..f181fbbab3 100644 --- a/espanol/bruja/bruja.md +++ b/espanol/bruja/bruja.md @@ -1,3 +1,6 @@ La bruja les ofreció su ayuda para derrotar al ejército invasor a cambio del primer hijo del rey. A lo que el rey accedió gustoso + +El siempre había soñado con terminar esta guerra y convertir el reino en una republica. +Ya no necesitaba un descendiente. \ No newline at end of file From 061ecedb000d8e4c760bac009718cab3d7b52207 Mon Sep 17 00:00:00 2001 From: Hunter Strathman Date: Wed, 19 Dec 2018 17:21:18 -0700 Subject: [PATCH 5255/5486] Add to bear.md --- english/bear/bear.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/bear/bear.md b/english/bear/bear.md index a18ca5d9a7..7f1c8fee68 100644 --- a/english/bear/bear.md +++ b/english/bear/bear.md @@ -4,6 +4,8 @@ Ice cold. If warm, the results could be unbearable. Bear in mind, the grizzly taste. You are now drunk. You stumble over to the nearest cutie and ask, "Hey baby, what's ursine?" +She turns red and starts buzzing like a bee in honey. + When she slaps you in the face... [You vomit on top of her](../vomit/vomit.md) From 01773cd7fdefc9943b3980f83613edf8ee864e2c Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 23 Dec 2018 21:07:17 +0100 Subject: [PATCH 5256/5486] Add one sentence in the beginning in czech story. --- czech/marsmelouny.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/czech/marsmelouny.md b/czech/marsmelouny.md index ee21b495c3..2929414867 100644 --- a/czech/marsmelouny.md +++ b/czech/marsmelouny.md @@ -1,4 +1,4 @@ -Jednoho rána se vzbudíš v divné místnosti se zdmi z maršmelounů. +Jednoho rána se vzbudíš v divné místnosti se zdmi z maršmelounů. Dokonce i podlaha a strop je z maršmelounů. Co uděláš: From 783572fdd4a0b5bfa2b6a78d9593a88fe234c1ef Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 24 Dec 2018 09:15:13 +0100 Subject: [PATCH 5257/5486] Change for bot pull request --- czech/marsmelouny.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/czech/marsmelouny.md b/czech/marsmelouny.md index 2929414867..1fffbfab2c 100644 --- a/czech/marsmelouny.md +++ b/czech/marsmelouny.md @@ -1,4 +1,5 @@ -Jednoho rána se vzbudíš v divné místnosti se zdmi z maršmelounů. Dokonce i podlaha a strop je z maršmelounů. +Jednoho rána se vzbudíš v divné místnosti se zdmi z maršmelounů. +Dokonce i podlaha a strop je z maršmelounů. Co uděláš: From d9f70629f0606c8bc487449d6bcab47bd49034ad Mon Sep 17 00:00:00 2001 From: aayushkhemka89 Date: Tue, 25 Dec 2018 15:53:36 +0530 Subject: [PATCH 5258/5486] added a line in english and alchemy --- english/alchemy/alchemy.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/alchemy/alchemy.md b/english/alchemy/alchemy.md index ef989f6c47..0ae881cba8 100644 --- a/english/alchemy/alchemy.md +++ b/english/alchemy/alchemy.md @@ -42,3 +42,4 @@ You slip the ring over your finger and ... and puff! you turn into a blob fish while only a few feet remain between you and the polar bear... +and the rein deer...... From 01e582605d4c6cd44aef3e1f28b531848cbce092 Mon Sep 17 00:00:00 2001 From: Manas Uniyal Date: Wed, 2 Jan 2019 12:46:45 +0530 Subject: [PATCH 5259/5486] Docs: Added a link to the official ManUtd pge --- english/ManU/ManU.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/ManU/ManU.md b/english/ManU/ManU.md index 4325bee78c..4d3e144094 100644 --- a/english/ManU/ManU.md +++ b/english/ManU/ManU.md @@ -1 +1,2 @@ -I really like Man U. Though the 2016 team is not so great, I still support my team. \ No newline at end of file +I really like Man U. Though the 2016 team is not so great, I still support my team. +Here's a link to the team [Manchester United!](https://www.manutd.com) From 1ba66771298d9ab16544aef6d16629fe7db0f477 Mon Sep 17 00:00:00 2001 From: Sasa Pejcic Date: Fri, 4 Jan 2019 13:47:01 +0100 Subject: [PATCH 5260/5486] New files added dragoljub.md and zivkica.md --- serbian/burekMeso/istrcao/dragoljub/dragoljub.md | 1 + serbian/burekMeso/istrcao/zivkica/zivkica.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 serbian/burekMeso/istrcao/dragoljub/dragoljub.md create mode 100644 serbian/burekMeso/istrcao/zivkica/zivkica.md diff --git a/serbian/burekMeso/istrcao/dragoljub/dragoljub.md b/serbian/burekMeso/istrcao/dragoljub/dragoljub.md new file mode 100644 index 0000000000..f05a22328d --- /dev/null +++ b/serbian/burekMeso/istrcao/dragoljub/dragoljub.md @@ -0,0 +1 @@ +"Dragoljub iz srednje skole! Tajni projekat! Pa pricaj covece!" - nestrpljivo je navalivao Darko. diff --git a/serbian/burekMeso/istrcao/zivkica/zivkica.md b/serbian/burekMeso/istrcao/zivkica/zivkica.md new file mode 100644 index 0000000000..6afbf28649 --- /dev/null +++ b/serbian/burekMeso/istrcao/zivkica/zivkica.md @@ -0,0 +1 @@ +"Uff, pa to je bas bezveze!" - nepristojno reče Darko. From feb90639229f0ef82472c51447d2455dbb9b61b1 Mon Sep 17 00:00:00 2001 From: Sasa Pejcic Date: Fri, 4 Jan 2019 14:14:12 +0100 Subject: [PATCH 5261/5486] Changes in istrcao.md --- serbian/burekMeso/istrcao/dragoljub/dragoljub.md | 2 +- serbian/burekMeso/istrcao/istrcao.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/serbian/burekMeso/istrcao/dragoljub/dragoljub.md b/serbian/burekMeso/istrcao/dragoljub/dragoljub.md index f05a22328d..78e27b364b 100644 --- a/serbian/burekMeso/istrcao/dragoljub/dragoljub.md +++ b/serbian/burekMeso/istrcao/dragoljub/dragoljub.md @@ -1 +1 @@ -"Dragoljub iz srednje skole! Tajni projekat! Pa pricaj covece!" - nestrpljivo je navalivao Darko. +"Dragoljub iz srednje škole! Tajni projekat! Pa pričaj čovece!" - nestrpljivo je navalivao Darko. diff --git a/serbian/burekMeso/istrcao/istrcao.md b/serbian/burekMeso/istrcao/istrcao.md index fc63394c69..ac882f6ff7 100644 --- a/serbian/burekMeso/istrcao/istrcao.md +++ b/serbian/burekMeso/istrcao/istrcao.md @@ -1 +1,7 @@ "Pa 'de si ti covece ovih godina. Kao da si u zemlju propao!" - skoro povika na njega kada mu je prisao. + +Darko je spremno dočekao pitanje, kao da se čitavog života pripremao za ovaj susret: + +[Bio sam kod Dragoljuba. Radili smo na tajnom projektu](dragoljub/dragoljub.md) + +[Oženio sam se sa Živkicom. A onda smo se razveli. Pa smo se ponovo uzeli. Sada se razvodimo.](zivkica/zivkica.md) From f701d74d43d4920efb82c418c609b7c3a480e688 Mon Sep 17 00:00:00 2001 From: Bennet Muellem Date: Tue, 8 Jan 2019 15:14:56 +0100 Subject: [PATCH 5262/5486] Add "monja"! --- Gibberish/HorkPorkDork/horky.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gibberish/HorkPorkDork/horky.md b/Gibberish/HorkPorkDork/horky.md index a10c23d01a..45879defd0 100644 --- a/Gibberish/HorkPorkDork/horky.md +++ b/Gibberish/HorkPorkDork/horky.md @@ -1,2 +1,3 @@ Horky Porky Dorky Senor Morky Dorky Porky McJorky Forty porty. -Gesundtite. \ No newline at end of file +Gesundtite. +Monjamonjamonjamon! \ No newline at end of file From 7dc0ca1ae37baf46b18775a7d59e4e4055dd9b0b Mon Sep 17 00:00:00 2001 From: dylan Date: Wed, 9 Jan 2019 12:11:59 -0500 Subject: [PATCH 5263/5486] I had to do this for a class --- english/iot/scan-network/scan-network.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/iot/scan-network/scan-network.md b/english/iot/scan-network/scan-network.md index 95eb421f44..c0562b5eaa 100644 --- a/english/iot/scan-network/scan-network.md +++ b/english/iot/scan-network/scan-network.md @@ -20,3 +20,4 @@ said in an irritated tone. "Of course it wasn't. It was you, just another home assistance gadget configured as if he's the only RFC1918 address in the IoT" + From 5984b40322d7c5381a587bf6c56e605c03f51eb1 Mon Sep 17 00:00:00 2001 From: atharvavyas139 Date: Thu, 10 Jan 2019 21:53:01 +0530 Subject: [PATCH 5264/5486] simple change --- english/pokemon/pikachu_wins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/pokemon/pikachu_wins.md b/english/pokemon/pikachu_wins.md index 7fac84e64b..44d295d96d 100644 --- a/english/pokemon/pikachu_wins.md +++ b/english/pokemon/pikachu_wins.md @@ -2,6 +2,7 @@ You bring out your Pikachu and Pikachu uses thunderbolt on the marshmallow! You To celebrate, you take a moment to pull out some graham crackers and chocolate and make smores. You feel refreshed and everything is ok. +The best feeling! However, you don't get to enjoy your victory for long. You awake from your dream and realize that Pikachu isn't real but the marshmallow nightmare is still a problem. What will you do next? From 8e8ba36f1287dfd0d622d5cc7ed513e3785464d8 Mon Sep 17 00:00:00 2001 From: Jill Yeh Date: Fri, 11 Jan 2019 16:47:43 +0800 Subject: [PATCH 5265/5486] Add next line of the lyrics --- Chinese/Eason_Chan/Eason_Chan.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Chinese/Eason_Chan/Eason_Chan.md b/Chinese/Eason_Chan/Eason_Chan.md index db6dec6cd7..0b45753b81 100644 --- a/Chinese/Eason_Chan/Eason_Chan.md +++ b/Chinese/Eason_Chan/Eason_Chan.md @@ -1 +1,2 @@ 誰人又相信，一世一生這膚淺對白？ +來吧送給你，叫幾百萬人流淚過的歌 From cbfd166cd9898535f15bae51539f438ce6626a72 Mon Sep 17 00:00:00 2001 From: bishnu Date: Fri, 11 Jan 2019 15:29:27 +0600 Subject: [PATCH 5266/5486] New portal added. --- bangla/bangla-portals.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bangla/bangla-portals.md b/bangla/bangla-portals.md index c89dde0267..6e24d7a354 100644 --- a/bangla/bangla-portals.md +++ b/bangla/bangla-portals.md @@ -4,4 +4,6 @@ http://www.somewhereinblog.net/ http://www.priyo.com/ -http://www.google.co.in/ \ No newline at end of file +http://www.google.co.in/ + +বাংলায় পড়ুন [এখানে](https://roar.media/bangla/) \ No newline at end of file From 119eeab5aafa7f633a4ce4cc2c9d70b254e820ea Mon Sep 17 00:00:00 2001 From: 019a <019a@mail.ru> Date: Sat, 12 Jan 2019 23:30:35 +0300 Subject: [PATCH 5267/5486] change mirror story --- .../looking-at-the-mirror/looking-at-the-mirror.md | 1 + 1 file changed, 1 insertion(+) diff --git a/russian/buildings-dep/tv/change-channel/looking-at-the-mirror/looking-at-the-mirror.md b/russian/buildings-dep/tv/change-channel/looking-at-the-mirror/looking-at-the-mirror.md index 8a2475345e..a48f27b6c6 100644 --- a/russian/buildings-dep/tv/change-channel/looking-at-the-mirror/looking-at-the-mirror.md +++ b/russian/buildings-dep/tv/change-channel/looking-at-the-mirror/looking-at-the-mirror.md @@ -2,3 +2,4 @@ обратно в человека. +Может быть под песочной кроватью найдется что-то, что может помочь From 51e0b3a6b8740b2e4cc1ac64926a16820ccb12dd Mon Sep 17 00:00:00 2001 From: Jhonatan Date: Mon, 14 Jan 2019 10:41:14 -0500 Subject: [PATCH 5268/5486] Angels are messengers --- espanol/angeles/angeles.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/angeles/angeles.md b/espanol/angeles/angeles.md index 82ffbb69ad..2f16dcf937 100644 --- a/espanol/angeles/angeles.md +++ b/espanol/angeles/angeles.md @@ -9,3 +9,5 @@ La voz de un ángel te llama, pero estas distraído con la tecnología! La tecnología es un mal de la sociedad si se emplea mal. El progreso no mide tiempo. + +Los ángeles son mensajeros y voceros de la humanidad. \ No newline at end of file From e5ae990463b86f1ce33ab05d61748625889f1b13 Mon Sep 17 00:00:00 2001 From: solpetr Date: Wed, 16 Jan 2019 11:57:47 +0200 Subject: [PATCH 5269/5486] custom option sapnuoti added to story --- lithuanian/sapnuoti/sapnuoti.md | 32 ++++++++++++++++++++++++++++++++ lithuanian/startas.md | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 lithuanian/sapnuoti/sapnuoti.md diff --git a/lithuanian/sapnuoti/sapnuoti.md b/lithuanian/sapnuoti/sapnuoti.md new file mode 100644 index 0000000000..82a2a2d7c5 --- /dev/null +++ b/lithuanian/sapnuoti/sapnuoti.md @@ -0,0 +1,32 @@ +Sapnas +Dienų žaliųjų ilgesį surinksiu +Ir išsklaidysiu tėviškės laukuos. +Ramiai vingiuos ten vieškelis sulinkęs, +Kaip raitelis laukais nujos. + +Dažnai sapnuoju aš, kad pilyse gyvenom, +Ten šypsos ežerai lyg mėlynu dangum. +Išeina iš pilies bajoras senas +Ir žada pasaką pasekti mum. + +Lyg obelis balti plaukai ant kaklo driekias +Ir bėga rūpesčiai išvarginta kakta. +Šalia jo tarnas stovi senas ir paliegęs, +Nubraukdamas vis ašaras slapta. + +Bajorą grįžt pilin vadina +Duktė kaip nuotaka daili. +Palinksta ji prie jo krūtinės +Vis jo raminama: “Kodėl verki?” + +Kažkur suskamba balsas virpantis ir storo, +Ir, rods, tyla laukus aplies!.. +Sudunda vartai ties pilim bajoro, +Ir nyksta žingsniai glūdumoj nakties. + +Viskas vėl lieka kaip ant ežero krūtinės +Ir neįžvelgiama, tamsiai gilu… +Bajorą seną, pilis linksmas atminęs, +Dienų žaliųjų ilgesį renku. + +1936 \ No newline at end of file diff --git a/lithuanian/startas.md b/lithuanian/startas.md index 83d14491ab..71512dbad8 100644 --- a/lithuanian/startas.md +++ b/lithuanian/startas.md @@ -11,3 +11,5 @@ Visiškoje tamsoje jis turėjo pasirinkti [Apsisukti](apsisukti/apsisukti.md) [Apsičiupinėti](apsiciupineti/apsiciupineti.md) + +[Sapnuoti](sapnuoti/sapnuoti.md) From 3774b5521edc82fd6697cb1652b0b9f2b8cbb6f7 Mon Sep 17 00:00:00 2001 From: Connor Date: Wed, 16 Jan 2019 20:01:08 -0500 Subject: [PATCH 5270/5486] Add Hand to deadend Snake directory --- english/dream/swim/Snake/Hand/hand.md | 1 + english/dream/swim/Snake/snake.md | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 english/dream/swim/Snake/Hand/hand.md diff --git a/english/dream/swim/Snake/Hand/hand.md b/english/dream/swim/Snake/Hand/hand.md new file mode 100644 index 0000000000..d50345e671 --- /dev/null +++ b/english/dream/swim/Snake/Hand/hand.md @@ -0,0 +1 @@ +A disembodied hand pulls you away from the snake. \ No newline at end of file diff --git a/english/dream/swim/Snake/snake.md b/english/dream/swim/Snake/snake.md index 03411a9d80..2bb10744a8 100644 --- a/english/dream/swim/Snake/snake.md +++ b/english/dream/swim/Snake/snake.md @@ -1 +1,4 @@ -You have been ensnared by a snake. You have been tied up by the snake's body. \ No newline at end of file +You have been ensnared by a snake. You have been tied up by the snake's body. +You see something through the folds of the snake. It is a: + +[Hand](../Snake/Hand/hand.md) \ No newline at end of file From 481c33b6a4e530ef5d9e70703429f4448f4c9760 Mon Sep 17 00:00:00 2001 From: Iresh Dissanayaka Date: Fri, 18 Jan 2019 11:23:21 +0530 Subject: [PATCH 5271/5486] Add new adventure --- english/time-machine/time-machine.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/time-machine/time-machine.md b/english/time-machine/time-machine.md index b91cc8f0fd..e094ad2886 100644 --- a/english/time-machine/time-machine.md +++ b/english/time-machine/time-machine.md @@ -13,3 +13,5 @@ Which part of the world, and what time you want to travel? And why? [You turn back](../marshmallow.md) +You decide to go for a [ride](../marshmallow.md) in a +time loop \ No newline at end of file From 8e47d1c3588f411777c35a1402f7e95850f45956 Mon Sep 17 00:00:00 2001 From: Iresh Dissanayaka Date: Fri, 18 Jan 2019 11:24:47 +0530 Subject: [PATCH 5272/5486] Correct link to a loop --- english/time-machine/time-machine.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/time-machine/time-machine.md b/english/time-machine/time-machine.md index e094ad2886..a9d1766f77 100644 --- a/english/time-machine/time-machine.md +++ b/english/time-machine/time-machine.md @@ -13,5 +13,5 @@ Which part of the world, and what time you want to travel? And why? [You turn back](../marshmallow.md) -You decide to go for a [ride](../marshmallow.md) in a +You decide to go for a [ride](.) in a time loop \ No newline at end of file From 50c37a8f7e2e5c83d5efe57c47310a58dcca3fba Mon Sep 17 00:00:00 2001 From: Iresh Dissanayaka Date: Fri, 18 Jan 2019 11:26:28 +0530 Subject: [PATCH 5273/5486] Correct the link of the loop to point to itself --- english/time-machine/time-machine.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/time-machine/time-machine.md b/english/time-machine/time-machine.md index a9d1766f77..7c6f555aba 100644 --- a/english/time-machine/time-machine.md +++ b/english/time-machine/time-machine.md @@ -13,5 +13,5 @@ Which part of the world, and what time you want to travel? And why? [You turn back](../marshmallow.md) -You decide to go for a [ride](.) in a +You decide to go for a [ride](./time-machine.md) in a time loop \ No newline at end of file From d84bf8f4ccb61f70c4d7c47da84fcfcfa6786124 Mon Sep 17 00:00:00 2001 From: "Alex.Z" Date: Fri, 18 Jan 2019 12:03:29 +0200 Subject: [PATCH 5274/5486] Add new spirit adv --- ukrainian/marshmallow.md | 2 ++ ukrainian/spirit/spirit.md | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 ukrainian/spirit/spirit.md diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 38a2b7bfc8..2138d2be7d 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -38,6 +38,8 @@ [Спробую прорізати вікнo ножем](knife/knife.md) +[Проведу спіритичний сеанс](spirit/spirit.md) + [Зав'яжу на кінці мотузки здоровенний вузел і кину в стіну](lace/lace.md) [Візьму мобілочку і почну переглядати серіали](tv-show/tv-show.md) diff --git a/ukrainian/spirit/spirit.md b/ukrainian/spirit/spirit.md new file mode 100644 index 0000000000..260dffc09b --- /dev/null +++ b/ukrainian/spirit/spirit.md @@ -0,0 +1,14 @@ +Зявився досить здивований привід невеличкої істоти з великими вухами та палицею. + +Зрозумівши що він опинився в кімнаті зі мною, привид прискіпливо оглянувши мене з ніг до голови промовив: + +- Тоді з'являється шлях наш, коли готові до нього стаємо. + +Після цього він посміхнувся та повільно розчинився в повітрі. Така подія надихнула вас на нові звершення, +тож ви вирішили: + +- Мабуть я спробую прориватися через ту стіну заплющивши очі, +та [приймаєте зручну позу для розгону](../break-through-wall/break-through-wall.md) + +- [Прилягти до долу та подумати що я робив не так](../dream/dream.md) + From e45ed9aa30cc4f4393cba0b102ab54bb90cca922 Mon Sep 17 00:00:00 2001 From: Stephen Booth Date: Fri, 18 Jan 2019 12:44:47 -0500 Subject: [PATCH 5275/5486] Add a line to bored.md --- english/bored/bored.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/bored/bored.md b/english/bored/bored.md index a54c5584a1..6f52cbd53c 100644 --- a/english/bored/bored.md +++ b/english/bored/bored.md @@ -1,5 +1,7 @@ "I'm bored." +"So very very bored" + "Imma go to [sleep](../dream/dream.md)." "Or should I just go over [there](../forest/forest.md)?" From 423d45f853bbc5da014166b8394eecdb909f0674 Mon Sep 17 00:00:00 2001 From: manish Date: Sat, 19 Jan 2019 00:31:36 +0530 Subject: [PATCH 5276/5486] char log kaha hai --- hindi/joke/joke.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hindi/joke/joke.md b/hindi/joke/joke.md index 83d489743f..f94b401eed 100644 --- a/hindi/joke/joke.md +++ b/hindi/joke/joke.md @@ -56,6 +56,8 @@ please muzhe en char logann ki talash hain please enka pata bata do... yeah char loganne meri zindagi bachpan se ab tak baingan main mila de rehe varna enkay bolney ka khauff hamesha bana rahega!" + +Wo char log jahnnum me hai bhai. From dfb291c6daf12f49c83e5dcf1a5a70c26d4db9ae Mon Sep 17 00:00:00 2001 From: WaqasKhan Date: Sat, 19 Jan 2019 15:40:18 +0500 Subject: [PATCH 5277/5486] Adding a sentence --- english/better-call-saul/saul.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/better-call-saul/saul.md b/english/better-call-saul/saul.md index a98461a5e3..fd035157d9 100644 --- a/english/better-call-saul/saul.md +++ b/english/better-call-saul/saul.md @@ -12,3 +12,5 @@ You dial Sauls number... Clearly you are not good and you think you are being pranked so you [go back to thinking about what you should do](../marshmallow.md) + +Its is such a nice show From 79907707163487f7ad0070b392f523d1d3dacd27 Mon Sep 17 00:00:00 2001 From: Harry O'Malley Date: Mon, 21 Jan 2019 21:12:39 -0500 Subject: [PATCH 5278/5486] Added a quit option to knit strand --- english/knit/knit.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/knit/knit.md b/english/knit/knit.md index acc86b779c..89f384139c 100644 --- a/english/knit/knit.md +++ b/english/knit/knit.md @@ -1,4 +1,6 @@ There, that's more like it. Nothing like rutning a sock heel to make one feel much better. And by rutning, I meant turning. -Now to [return to reality](../marshmallow.md) \ No newline at end of file +Now to [return to reality](../marshmallow.md) + +Or you could just stop now. From 3b01149e314328736905182168431cd49d7690a5 Mon Sep 17 00:00:00 2001 From: Jae Date: Tue, 22 Jan 2019 18:51:08 +0900 Subject: [PATCH 5279/5486] I added the state of Panda running towards me --- english/bamboo/bamboo-shoots.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/bamboo/bamboo-shoots.md b/english/bamboo/bamboo-shoots.md index c24627a7ed..5416819e37 100644 --- a/english/bamboo/bamboo-shoots.md +++ b/english/bamboo/bamboo-shoots.md @@ -9,4 +9,6 @@ You don't know what to do.The pandas continue to walk towards you. You begin retreating slowly.Suddenly,one of the pandas speed up. +You saw Panda coming more closer to you! + How strong is scaffolding made of bamboo you ask? From 168074813dbe11d4ca6d6e73f9560dd7bf579fc6 Mon Sep 17 00:00:00 2001 From: Jae Date: Tue, 22 Jan 2019 19:00:57 +0900 Subject: [PATCH 5280/5486] Added one more statement --- english/bamboo/bamboo-shoots.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/bamboo/bamboo-shoots.md b/english/bamboo/bamboo-shoots.md index 5416819e37..227bd22864 100644 --- a/english/bamboo/bamboo-shoots.md +++ b/english/bamboo/bamboo-shoots.md @@ -11,4 +11,6 @@ You begin retreating slowly.Suddenly,one of the pandas speed up. You saw Panda coming more closer to you! +You saw Panda and it is really big! + How strong is scaffolding made of bamboo you ask? From 8e6bef254d76843555fef489af594656acb178d8 Mon Sep 17 00:00:00 2001 From: Joao Gabriel Schapke Date: Tue, 22 Jan 2019 22:37:11 -0200 Subject: [PATCH 5281/5486] muda falha.md --- portugues/titanic/arrumar/imitar/falha.md | 1 + 1 file changed, 1 insertion(+) diff --git a/portugues/titanic/arrumar/imitar/falha.md b/portugues/titanic/arrumar/imitar/falha.md index 88815150f0..31c11e9b3c 100644 --- a/portugues/titanic/arrumar/imitar/falha.md +++ b/portugues/titanic/arrumar/imitar/falha.md @@ -1,3 +1,4 @@ Você falhou ao tentar imitar Di Caprio. No momento que voce abre os bracos, o navio range e faz um movimento brusco. Você cai na água e percebe que ser um cubo de gelo é o seu novo eu. +Voce aceita seu destino, e com o passar dos anos é usado como plataforma para focas \ No newline at end of file From 5e1b07a84d22b81635816fba73937ebadf6ce32a Mon Sep 17 00:00:00 2001 From: Lydia Rennert Date: Wed, 23 Jan 2019 23:11:51 +0100 Subject: [PATCH 5282/5486] Fix MacGyver link in ruderboot.md --- german/ruderboot.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/german/ruderboot.md b/german/ruderboot.md index f32b3e8af7..0ac49b7feb 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -42,4 +42,4 @@ Werden Sie: [Zum fliegenden Spaghettimonster beten, damit sie ueberleben?](beten/beten.md) -[Das MacGyver-Messer aus der Hosentasche zu holen und das Ruderboot zu einem U-Boot umbauen] (MacGyver/uboot.md) +[Das MacGyver-Messer aus der Hosentasche zu holen und das Ruderboot zu einem U-Boot umbauen](MacGyver/uboot.md) From a5a484e137170f316d0cb5f8f2cf7b77f1e960ff Mon Sep 17 00:00:00 2001 From: Kaitlin Salzke Date: Mon, 28 Jan 2019 13:48:29 +0100 Subject: [PATCH 5283/5486] Add scream after falling off the cliff --- .../woman/hop-into-car/big-bump/scream/scream.md | 3 +++ .../woman/hop-into-car/big-bump/strange-thing.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 english/talk_to_neighbour/woman/hop-into-car/big-bump/scream/scream.md diff --git a/english/talk_to_neighbour/woman/hop-into-car/big-bump/scream/scream.md b/english/talk_to_neighbour/woman/hop-into-car/big-bump/scream/scream.md new file mode 100644 index 0000000000..b7662b0f24 --- /dev/null +++ b/english/talk_to_neighbour/woman/hop-into-car/big-bump/scream/scream.md @@ -0,0 +1,3 @@ +You scream and scream but nobody can hear you. + +Then you hit the ground and die instantly. \ No newline at end of file diff --git a/english/talk_to_neighbour/woman/hop-into-car/big-bump/strange-thing.md b/english/talk_to_neighbour/woman/hop-into-car/big-bump/strange-thing.md index 7f4087b3aa..6e120449db 100644 --- a/english/talk_to_neighbour/woman/hop-into-car/big-bump/strange-thing.md +++ b/english/talk_to_neighbour/woman/hop-into-car/big-bump/strange-thing.md @@ -1,3 +1,5 @@ In the rear-view mirrow you see an oddly shaped thing laying in the middel of the road... -Without paying attention to the road, you drive off of a cliff! \ No newline at end of file +Without paying attention to the road, you drive off of a cliff! + +All you can do is [scream](scream/scream.md). \ No newline at end of file From 292fe262f193d46eb17c47cb2082558e7ebd0b68 Mon Sep 17 00:00:00 2001 From: Peter Townsley Date: Mon, 28 Jan 2019 20:16:13 +0000 Subject: [PATCH 5284/5486] Added path colours --- english/forest/drag/skull/skull.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/forest/drag/skull/skull.md b/english/forest/drag/skull/skull.md index c9ee5d050d..7c0d223189 100644 --- a/english/forest/drag/skull/skull.md +++ b/english/forest/drag/skull/skull.md @@ -1,3 +1,5 @@ As u pick up the skull a string detaches from it and suddenly everything turns black. -As u regain vision u see youself in an empty white place with two paths. \ No newline at end of file +As u regain vision u see youself in an empty white place with two paths. + +One path has a blue hue, the other red. \ No newline at end of file From 657190f0f85400b2d1ffec736f4de7c7d010f5e8 Mon Sep 17 00:00:00 2001 From: Judit Chang Date: Wed, 30 Jan 2019 20:20:46 -0500 Subject: [PATCH 5285/5486] add tv story --- hungarian/malyvacukor.md | 1 + hungarian/tv/tv.md | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 hungarian/tv/tv.md diff --git a/hungarian/malyvacukor.md b/hungarian/malyvacukor.md index 3bbf0bf868..3f68d7c279 100644 --- a/hungarian/malyvacukor.md +++ b/hungarian/malyvacukor.md @@ -13,3 +13,4 @@ Mit csinálsz? Jól belerúgsz az [oxigén generátorba](oxygen/oxygen.md) [megnezem, hogy a boszorkany mezeskalacs hazaban vagyok-e](boszorkany/mezeskalacs-haz.md) +[bekapcsolod a tv-t](tv/tv.md) \ No newline at end of file diff --git a/hungarian/tv/tv.md b/hungarian/tv/tv.md new file mode 100644 index 0000000000..8bbb173af7 --- /dev/null +++ b/hungarian/tv/tv.md @@ -0,0 +1,5 @@ +Bekapcsoltad a tv-t, szörfölsz a csatornákon, de mindenütt csak rémhíreket adnak. +Terrortámadás, cunami, földrengés és még a benzinárak is emelkednek. +Rájössz, hogy micsoda jó helyen vagy, meztelenül a mályvacukor ágyadban. + +[visszaalszol](alvas/alom.md) \ No newline at end of file From 37dc3a24c4549d7ea84080781de68d3c5f6fd90a Mon Sep 17 00:00:00 2001 From: Judit Chang Date: Wed, 30 Jan 2019 20:33:09 -0500 Subject: [PATCH 5286/5486] add fixes tv --- hungarian/malyvacukor.md | 2 ++ hungarian/tv/tv.md | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hungarian/malyvacukor.md b/hungarian/malyvacukor.md index 3f68d7c279..52e9e01c2e 100644 --- a/hungarian/malyvacukor.md +++ b/hungarian/malyvacukor.md @@ -13,4 +13,6 @@ Mit csinálsz? Jól belerúgsz az [oxigén generátorba](oxygen/oxygen.md) [megnezem, hogy a boszorkany mezeskalacs hazaban vagyok-e](boszorkany/mezeskalacs-haz.md) + + [bekapcsolod a tv-t](tv/tv.md) \ No newline at end of file diff --git a/hungarian/tv/tv.md b/hungarian/tv/tv.md index 8bbb173af7..2f0ead5428 100644 --- a/hungarian/tv/tv.md +++ b/hungarian/tv/tv.md @@ -2,4 +2,5 @@ Bekapcsoltad a tv-t, szörfölsz a csatornákon, de mindenütt csak rémhíreket Terrortámadás, cunami, földrengés és még a benzinárak is emelkednek. Rájössz, hogy micsoda jó helyen vagy, meztelenül a mályvacukor ágyadban. -[visszaalszol](alvas/alom.md) \ No newline at end of file + +[visszaalszol](../alvas/alom.md) \ No newline at end of file From 492c8cc5414910c06b7740158ebde6c5aef313a5 Mon Sep 17 00:00:00 2001 From: Erez Date: Wed, 30 Jan 2019 21:43:28 -0500 Subject: [PATCH 5287/5486] Say who the real Batman is!! --- english/batman/batman.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/batman/batman.md b/english/batman/batman.md index 5d1c5dc94f..70c691163b 100644 --- a/english/batman/batman.md +++ b/english/batman/batman.md @@ -51,3 +51,5 @@ Another shouts "Who is John Cena" "Goodluck talking to John Cena" "This is the last time i am talking to John Cena" + +Bruce Wayne is not the Batman...I am!! From 7c9be3de17f6e1bc6304666fce61ded0197dc225 Mon Sep 17 00:00:00 2001 From: sakshi Date: Fri, 1 Feb 2019 12:16:36 -0500 Subject: [PATCH 5288/5486] add art of living changes --- hindi/art-of-living/art-of-living.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hindi/art-of-living/art-of-living.md b/hindi/art-of-living/art-of-living.md index 72a4405f5d..27accb2e2e 100644 --- a/hindi/art-of-living/art-of-living.md +++ b/hindi/art-of-living/art-of-living.md @@ -10,4 +10,8 @@ It is also considered to be the world's largest volunteer-based NGO by India tod It has its headquarter in Bangalore, India, a city in Southern India. They conduct many musical and meditation programs across India and in other countries. +Peace, Stress Relieving,etc + + + From 2366d4221f6faff71b9e18b6355269279fbddd0f Mon Sep 17 00:00:00 2001 From: tochange Date: Mon, 4 Feb 2019 01:33:42 +0100 Subject: [PATCH 5289/5486] verifie la chose --- .../verifier-la-chose/verifier-la-chose.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 french/sortie/tirer-porte/traverser-hautes-herbes/verifier-la-chose/verifier-la-chose.md diff --git a/french/sortie/tirer-porte/traverser-hautes-herbes/verifier-la-chose/verifier-la-chose.md b/french/sortie/tirer-porte/traverser-hautes-herbes/verifier-la-chose/verifier-la-chose.md new file mode 100644 index 0000000000..2794cd7515 --- /dev/null +++ b/french/sortie/tirer-porte/traverser-hautes-herbes/verifier-la-chose/verifier-la-chose.md @@ -0,0 +1,2 @@ + +saisi de terreur, vous vous retournez aussi tôt ! tout en sautillant... From cd250f71a8f9323e43821c4a4c924c2f4c3c7cbe Mon Sep 17 00:00:00 2001 From: tochange Date: Mon, 4 Feb 2019 02:32:28 +0100 Subject: [PATCH 5290/5486] ajout de verifier-la-chose --- .../traverser-hautes-herbes/traverser-hautes-herbes.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md b/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md index 67627ffa9a..58daecc324 100644 --- a/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md +++ b/french/sortie/tirer-porte/traverser-hautes-herbes/traverser-hautes-herbes.md @@ -4,6 +4,8 @@ quelque chose saisit votre cheville… [Frapper](frapper-la-chose/frapper-la-chose.md) cette chose qui vous tracasse. +[Verifier ce que c'est](verifier-la-chose/verifier-la-chose.md) cette chose qui vous tracasse!. + [Revenir en courant a la chambre en murs de pain d'epices](../../../feu-de-camp.md) -[Demander à Google](../../../google/google.md) quelle est cette chose étrange ! \ No newline at end of file +[Demander à Google](../../../google/google.md) quelle est cette chose étrange ! From 68f02653076ff60112e80b6ab6d7ccddf3e2a710 Mon Sep 17 00:00:00 2001 From: tochange Date: Mon, 4 Feb 2019 03:09:12 +0100 Subject: [PATCH 5291/5486] =?UTF-8?q?ajoute=20de=20l'option=20"=20retourne?= =?UTF-8?q?r=20=C3=A0=20l=20interieur=20"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../verifier-la-chose/verifier-la-chose.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/french/sortie/tirer-porte/traverser-hautes-herbes/verifier-la-chose/verifier-la-chose.md b/french/sortie/tirer-porte/traverser-hautes-herbes/verifier-la-chose/verifier-la-chose.md index 2794cd7515..cdf52ec6ba 100644 --- a/french/sortie/tirer-porte/traverser-hautes-herbes/verifier-la-chose/verifier-la-chose.md +++ b/french/sortie/tirer-porte/traverser-hautes-herbes/verifier-la-chose/verifier-la-chose.md @@ -1,2 +1,4 @@ -saisi de terreur, vous vous retournez aussi tôt ! tout en sautillant... +saisi de terreur, vous vous retournez aussi tôt ! tout en sautillant... + +[Revenir en courant a la chambre en murs de pain d'epices](../../../../feu-de-camp.md) From 2f4d7e92d7bc7d9bb8f20e37d7ea3d93f0c9df83 Mon Sep 17 00:00:00 2001 From: Wiktor Wajszczuk Date: Mon, 4 Feb 2019 20:26:05 +0100 Subject: [PATCH 5292/5486] Fix the polish characters in file "/Polish/ptasieMleczko.md" (they were unreadable) --- Polish/ptasieMleczko.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Polish/ptasieMleczko.md b/Polish/ptasieMleczko.md index a60a526298..67e500d995 100644 --- a/Polish/ptasieMleczko.md +++ b/Polish/ptasieMleczko.md @@ -1,8 +1,8 @@ -Pewnego ranka obudziłeś się w dziwnym pokoju ze ścianami z ptaskiego mleczka. +Pewnego ranka obudziłaś/eś się w dziwnym pokoju ze ścianami z ptaskiego mleczka. Okazało się również, że masz na sobie niewygodną kurtkę i nie masz na sobie spodni... -Czujesz, e wzmaga si w tobie pragnienie, czy to nie jest dobry pomys, eby napi si Kadarki? +Czujesz, że wzmaga się w tobie pragnienie, czy to nie jest dobry pomysł, żeby napić się Kadarki? Co robisz? @@ -12,5 +12,5 @@ Co robisz? [Chcesz się przebrać](ubranie/ubranie.md) -[Idziesz kupi Kadark](kadarka/kadarka.md) -i +[Idziesz kupić Kadarkę](kadarka/kadarka.md) + From ac5d1c0b02a3c004c9c028d71ce7685498e58620 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 6 Feb 2019 11:24:54 -0200 Subject: [PATCH 5293/5486] Adicionar mais lugares para visita --- portugues_pt/italia/italia.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/portugues_pt/italia/italia.md b/portugues_pt/italia/italia.md index c384f69801..f40eb8ee57 100644 --- a/portugues_pt/italia/italia.md +++ b/portugues_pt/italia/italia.md @@ -1,4 +1,10 @@ Visitaria vários locais turísticos além de parentes e amigos... -Visitar o Coliseu \ No newline at end of file +Visitar o Coliseu + +Visitar a Torre de Pisa + +Visitar o Vaticano + +Visitar o estádio olímpico de Roma \ No newline at end of file From 056ab9bfa4449c45d5ec84cdca853183193b8bc4 Mon Sep 17 00:00:00 2001 From: R O D R i Date: Thu, 7 Feb 2019 10:22:18 -1000 Subject: [PATCH 5294/5486] Gnomos a vista --- portugues/cogumelos/cogumelos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portugues/cogumelos/cogumelos.md b/portugues/cogumelos/cogumelos.md index fe4a6c1a77..256035e717 100644 --- a/portugues/cogumelos/cogumelos.md +++ b/portugues/cogumelos/cogumelos.md @@ -1,3 +1,5 @@ Você tem uma onda muito louca e lutando com o capital gancho na terra do nunca e você tem a idéia para consertar o bug. Porém vc se lembra que na verdade vc está no [Titanic](../titanic/iceberg.md) + +Eu vi Gnomos. From fd55e8e26de9bf5ce3581fc9c87b86d64661b4cd Mon Sep 17 00:00:00 2001 From: DaisukeDD Date: Sun, 10 Feb 2019 17:52:19 +0100 Subject: [PATCH 5295/5486] add one line of text in zefir.md --- russian/zefir.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/zefir.md b/russian/zefir.md index 9572bad84e..ce5e824ac7 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -17,7 +17,7 @@ И тут вы вспоминаете своего знакомого, с которым пресеклись две недели назад. Именно он порекомендовал вам компанию, которая может превратить вашу квартиру в шоколадный торт. Толстый слой зефира на стенах. Слой шоколада на полу и заварного крема на потолке. Кровать из песочного теста. Подушки из свежего бисквита. -Да, служащие компании постарались на славу! +Да, служащие компании постарались на славу! Будет не стыдно перед знакомыми за такой дом! Вчера вы хотели только прилечь на кровать, но накопившаяся усталость дала о себе знать и вы проспали 9 часов. Наступил день и теперь вы, полностью отдохнувший, готовы осуществить то, ради чего вы все это затеяли. From 814edd6dac39313db91f7ed9d45803561b50af98 Mon Sep 17 00:00:00 2001 From: DaisukeDD Date: Sun, 10 Feb 2019 17:59:22 +0100 Subject: [PATCH 5296/5486] changes with only add line --- russian/zefir.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/russian/zefir.md b/russian/zefir.md index ce5e824ac7..0e0c5864b5 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -17,7 +17,8 @@ И тут вы вспоминаете своего знакомого, с которым пресеклись две недели назад. Именно он порекомендовал вам компанию, которая может превратить вашу квартиру в шоколадный торт. Толстый слой зефира на стенах. Слой шоколада на полу и заварного крема на потолке. Кровать из песочного теста. Подушки из свежего бисквита. -Да, служащие компании постарались на славу! Будет не стыдно перед знакомыми за такой дом! +Да, служащие компании постарались на славу! +Будет не стыдно перед знакомыми за такой дом! Вчера вы хотели только прилечь на кровать, но накопившаяся усталость дала о себе знать и вы проспали 9 часов. Наступил день и теперь вы, полностью отдохнувший, готовы осуществить то, ради чего вы все это затеяли. From 9326d1711ff2d69eb489c04834e2f01d489591c7 Mon Sep 17 00:00:00 2001 From: Ahmad Hesham Date: Mon, 11 Feb 2019 00:43:38 +0200 Subject: [PATCH 5297/5486] Added my own dimension --- english/dimensions/dimension.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/dimensions/dimension.md b/english/dimensions/dimension.md index 9c50349281..f56ab205c4 100644 --- a/english/dimensions/dimension.md +++ b/english/dimensions/dimension.md @@ -1,5 +1,7 @@ And here you enter a new [dimension](https://www.youtube.com/watch?v=sea8yNCDqWo.) +Or, You could have a taste of my own [Dimension] (https://www.youtube.com/watch?v=E5PXYehriYY) + Or decide to play a game of chess [chess](../chess/chess.md). Or decide to learn about the world of bears [bears](../bear-story/bear-story.md) From 0a6a0f65f9c9212a1dbeb2a3a467ace24548bd4d Mon Sep 17 00:00:00 2001 From: charityvanessa Date: Mon, 11 Feb 2019 11:11:47 +0300 Subject: [PATCH 5298/5486] Add a sentence to the swahili story --- swahili/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swahili/marshmallow.md b/swahili/marshmallow.md index 3c02cc59c9..2e59455126 100644 --- a/swahili/marshmallow.md +++ b/swahili/marshmallow.md @@ -3,3 +3,5 @@ Asubuhi moja, nimeamka ndani ya chumba cha ajabu kikiwa na marshmallow kwenye ku (lazima ilikuwa Jumanne.) Nilijichuna ili kudhibitisha kwa si ndoto. Kisha nilikaribia kuta. + +Nikaguza kuta, lakini Lo!! \ No newline at end of file From 1d79efdca47931e34716f0e7f2d29671cdd575df Mon Sep 17 00:00:00 2001 From: charityvanessa Date: Mon, 11 Feb 2019 11:19:17 +0300 Subject: [PATCH 5299/5486] Add Sayari topic --- swahili/swahili.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swahili/swahili.md b/swahili/swahili.md index 2216b4543a..f32423e23a 100644 --- a/swahili/swahili.md +++ b/swahili/swahili.md @@ -1,3 +1,5 @@ Mambo ndiyo hayo basi. Swahili lipo wavutini. Jiskia huru kuongezea stori... Na basi ndipo ukakata shauri [kutembelea jw nukta org](tembelea-jw-nukta-org/tembelea-jw-nukta-org.md). + +Jua mengi juu ya [sayari](sayari/sayari.md) From b1d9072c636882d3957f5cbd0c436a5ac83a74f8 Mon Sep 17 00:00:00 2001 From: charityvanessa Date: Mon, 11 Feb 2019 11:20:11 +0300 Subject: [PATCH 5300/5486] Update sayari links --- swahili/sayari/sayari.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 swahili/sayari/sayari.md diff --git a/swahili/sayari/sayari.md b/swahili/sayari/sayari.md new file mode 100644 index 0000000000..2627397f8d --- /dev/null +++ b/swahili/sayari/sayari.md @@ -0,0 +1,17 @@ +Jua kuhusu sayari [hapa](https://sw.wikipedia.org/wiki/Sayari) + +1 [Jina](https://sw.wikipedia.org/wiki/Sayari#Jina) + +2 [Ufafanuzi wa sayari](https://sw.wikipedia.org/wiki/Sayari#Ufafanuzi_wa_sayari) + +3 [Majina ya sayari](https://sw.wikipedia.org/wiki/Sayari#Majina_ya_sayari) + +4 [Sayari za jua letu](https://sw.wikipedia.org/wiki/Sayari#Sayari_za_jua_letu) + +5 [Aina za sayari](https://sw.wikipedia.org/wiki/Sayari#Aina_za_sayari) + +6 [Sayari nje ya mfumo wa jua letu](https://sw.wikipedia.org/wiki/Sayari#Sayari_nje_ya_mfumo_wa_jua_letu) + +7 [Marejeo](https://sw.wikipedia.org/wiki/Sayari#Marejeo) + +8 [Viungo vya nje](https://sw.wikipedia.org/wiki/Sayari#Viungo_vya_nje) From f5efd7432f1f3d519aac7ecf3ac49a9d96a1d736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=A3=AB=E5=BC=98?= Date: Tue, 12 Feb 2019 13:43:22 +0800 Subject: [PATCH 5301/5486] defense yourself --- english/bamboo/bamboo-shoots.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/bamboo/bamboo-shoots.md b/english/bamboo/bamboo-shoots.md index c24627a7ed..899ea434a1 100644 --- a/english/bamboo/bamboo-shoots.md +++ b/english/bamboo/bamboo-shoots.md @@ -10,3 +10,5 @@ You don't know what to do.The pandas continue to walk towards you. You begin retreating slowly.Suddenly,one of the pandas speed up. How strong is scaffolding made of bamboo you ask? + +Well, not so sure. But you have no other choice to take a bamboo as a weapon against the evil pandas. \ No newline at end of file From f4d50bc35b816ee0fe074cb3cc0a7f4aed90d1d5 Mon Sep 17 00:00:00 2001 From: Sabine Date: Fri, 15 Feb 2019 12:15:35 +0100 Subject: [PATCH 5302/5486] Optie noorden toegevoegd --- dutch/bos/verlaten-weg/noorden/noorden.md | 5 +++++ dutch/bos/verlaten-weg/verlaten-weg.md | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 dutch/bos/verlaten-weg/noorden/noorden.md diff --git a/dutch/bos/verlaten-weg/noorden/noorden.md b/dutch/bos/verlaten-weg/noorden/noorden.md new file mode 100644 index 0000000000..649b681105 --- /dev/null +++ b/dutch/bos/verlaten-weg/noorden/noorden.md @@ -0,0 +1,5 @@ +Je volgt de verlaten weg ongeveer een uur richting het noorden. +Je ziet een dorp in de verte opdoemen. +Even later blijkt dat je terug bent bij de laatste kroeg van de kroegentocht. + +Dorstig van de wandeling besluit je daar maar een biertje te nemen. diff --git a/dutch/bos/verlaten-weg/verlaten-weg.md b/dutch/bos/verlaten-weg/verlaten-weg.md index e5e82a679d..12dc1ef91a 100644 --- a/dutch/bos/verlaten-weg/verlaten-weg.md +++ b/dutch/bos/verlaten-weg/verlaten-weg.md @@ -1,4 +1,6 @@ Er is niemand op de weg te zien, je blijft een tijdje wachten, in de hoop dat je iemand tegenkomt. -Uiteindelijk besluit je dan maar in een bepaalde richting te wandelen ... \ No newline at end of file +Uiteindelijk besluit je dan maar in een bepaalde richting te wandelen ... + +Je loopt naar het [noorden](noorden/noorden.md). From d13bdf6f40d2821c829e0fb7c476e9f9331b5a96 Mon Sep 17 00:00:00 2001 From: Junwoo Cheon Date: Sat, 16 Feb 2019 16:55:08 +0900 Subject: [PATCH 5303/5486] Add option to song.md --- korean/sing-a-song/song.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/korean/sing-a-song/song.md b/korean/sing-a-song/song.md index c8a22c95aa..a3d876ac83 100644 --- a/korean/sing-a-song/song.md +++ b/korean/sing-a-song/song.md @@ -9,3 +9,5 @@ [밖에 나가본다](../explore-outside/explore-outside.md)? [마시멜로를 먹는다](../eating-walls/eating-marshmallows.md)? + +[아이유의 좋은 날 노래를 부른다](./good-day/good-day.md)? From 6b379918d506e599ebc4f723efd07664a3d3aacf Mon Sep 17 00:00:00 2001 From: Junwoo Cheon Date: Sat, 16 Feb 2019 16:57:23 +0900 Subject: [PATCH 5304/5486] Create good-day.md --- korean/sing-a-song/good-day/good-day.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 korean/sing-a-song/good-day/good-day.md diff --git a/korean/sing-a-song/good-day/good-day.md b/korean/sing-a-song/good-day/good-day.md new file mode 100644 index 0000000000..9b645cb7ef --- /dev/null +++ b/korean/sing-a-song/good-day/good-day.md @@ -0,0 +1,11 @@ +암인마이드림~~~ + +예상치 못한 삑사리에 당황한 나머지 얼굴을 붉히고 말았어요. + +방금 내지른 고음 때문인지 마시멜로 벽이 무너져 내리기 시작했어요! + +어떻게 할까요? + +[밖으로 나간다](../../explore-outside/explore-outside.md) + +[인스타그램에 인증샷을 올린다](../../instagram/insta.md) \ No newline at end of file From c26723e993389c97a567064873a127bc2e2e4f5a Mon Sep 17 00:00:00 2001 From: Junwoo Cheon Date: Sat, 16 Feb 2019 17:15:35 +0900 Subject: [PATCH 5305/5486] Add option to chasitsu.md --- japanese/chasitsu.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/japanese/chasitsu.md b/japanese/chasitsu.md index 3c7a6a906b..683626366d 100644 --- a/japanese/chasitsu.md +++ b/japanese/chasitsu.md @@ -11,4 +11,6 @@ [寒い](cold/cold.md) -[なぜかいきなりラーメンを食いたくなっちまった](ramen/ramen.md) \ No newline at end of file +[なぜかいきなりラーメンを食いたくなっちまった](ramen/ramen.md) + +水墨画に描かれた風景になぜか既視感を覚える。[水墨画のほうに近づく。](./suibokuga/suibokuga.md) \ No newline at end of file From 8f5412b2776fee9bab626a92b948316a62b68d99 Mon Sep 17 00:00:00 2001 From: Junwoo Cheon Date: Sat, 16 Feb 2019 17:21:31 +0900 Subject: [PATCH 5306/5486] Create suibokuga.md --- japanese/suibokuga/suibokuga.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 japanese/suibokuga/suibokuga.md diff --git a/japanese/suibokuga/suibokuga.md b/japanese/suibokuga/suibokuga.md new file mode 100644 index 0000000000..cbba525d13 --- /dev/null +++ b/japanese/suibokuga/suibokuga.md @@ -0,0 +1,3 @@ +水墨画のほうに近づき、モノクロの風景を見つめる。 + +しかし、それがどこなのかさっぱりわからない。 \ No newline at end of file From aa36cdaa476ece759ea5aa62d79e4c8835e491c0 Mon Sep 17 00:00:00 2001 From: Kunal Mudgal <7996Kunal@gmail.com> Date: Sun, 17 Feb 2019 22:50:18 +0530 Subject: [PATCH 5307/5486] fix: format of markdown link in marshmallow.md --- english/marshmallow.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index a4753343f9..4159929d14 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -5,13 +5,13 @@ And that story was about [cricket](cricket/if-you-love-cricket/ifyoulovecricket. A few learned to [tango](tango/tango.md) Some preferred to -Enter [The Forest!] (forest/forest.md) +Enter [The Forest!](forest/forest.md) If you are a fan of ZooZoo go [here](zoozoo/zoozoo.md) hi~ -NGE is [here] (NGE/NGE.md) +NGE is [here](NGE/NGE.md) [start](mad/mad.md) your journey into world of mad @@ -52,10 +52,10 @@ Who is better? [Click Here](captain/captain.md) to vote for Captain America -[Click Here] (ironman/ironman.md) to vote for Iron Man +[Click Here](ironman/ironman.md) to vote for Iron Man -[Click here] (00_8_Agent/The_name_is_Bond_Milton_Bond.md) to vote for a Special Agent -[click here] (london/london.md) to vote for london +[Click here](00_8_Agent/The_name_is_Bond_Milton_Bond.md) to vote for a Special Agent +[click here](london/london.md) to vote for london January 2017 approaches. You have two presidential candidates to vote for. @@ -747,7 +747,7 @@ Take out your [crochet project](crochet/crochet.md) instead and finish that tedd [Screaming goat is screaming](https://youtu.be/kh6c0SOfkH4) -[Play on miniclip!] (papa-louie/papa-louie.md) +[Play on miniclip!](papa-louie/papa-louie.md) [Visit Sturgis 2015!](sturgis2015/sturgis.md) @@ -775,7 +775,7 @@ Click [here](young/young.md) to listen to music. [Decide to browse Reddit instead](https://www.reddit.com/) -[It's time to take a vacation] (licked-cat/vacation.md) +[It's time to take a vacation](licked-cat/vacation.md) And then you realize that Burning Man is over, so no real vacations :( @@ -803,7 +803,7 @@ whilst wandering through the vastness of this universe. Either way we are cool, right? -This [miracle man] (copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. +This [miracle man](copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. You decide that you do not want to visit the miracle man. [You check your phone to find something else to do](check-phone/check-phone.md). @@ -885,7 +885,7 @@ to you when you speak to it. So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... >>>>>>> deb66146d3bd0481a4c19d27b8ef289b939d4156 -["Train Ride!"] (train-ride/train-ride.md) +["Train Ride!"](train-ride/train-ride.md) I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/star-wars.md) @@ -912,7 +912,7 @@ You may either do [this](gtd/gtd.md), Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you [serve] (joshua_24_15/joshua_24_15.md)?" +"Who will you [serve](joshua_24_15/joshua_24_15.md)?" Yourself? @@ -964,11 +964,11 @@ The 3 Rules of Test Driven Development [Read the Rules](test-driven-development- The understanding of git [go here](Booyah/booyah.md) -[Link to Git Official Website] (git/git.md) +[Link to Git Official Website](git/git.md) -[link to google website] (kumar/kumar.md) +[link to google website](kumar/kumar.md) -Do you want to know [Git disadvantage?] (git_disadvantage/git_disadvantage.md) +Do you want to know [Git disadvantage?](git_disadvantage/git_disadvantage.md) Hi i got this one for udacity team. @@ -983,7 +983,7 @@ Let it go, let it gooo... CANT HOLD IT BACK ANY MORE -Do you want to build a [snowman?] (snowman/snowman.md) +Do you want to build a [snowman?](snowman/snowman.md) It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) @@ -1041,7 +1041,7 @@ And then you look up and see it, you can't bealive is him but there he is [stari [Do nothing.](nothing/do-nothing.md) -[Rent a hydroplaning dog sled to get you to the other side of the world] (dog-sled/dogsled.md) +[Rent a hydroplaning dog sled to get you to the other side of the world](dog-sled/dogsled.md) Toasted [marshmallow](toasted/smores_pie.md) @@ -1083,9 +1083,9 @@ You're reincarnated as a green starfish but wish you were [blue instead.](starfi You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) -My tea's gone cold I'm wondering [why] (stan/stan.md) I got out of bed at all... +My tea's gone cold I'm wondering [why](stan/stan.md) I got out of bed at all... -[Click] (vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. +[Click](vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. You decide you want to be a pirate and remember a show called [onepiece](onepiece/op.md) @@ -1205,7 +1205,7 @@ My best girls are Toujou Nozomi, Aragaki Ayase, and Sendouin Kaede. Maybe this is a [dream](dream/dream.md)? -Or maybe you love [pugs] (https://www.youtube.com/watch?v=3pPR7vk-e3Y)? +Or maybe you love [pugs](https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Or maybe you're trying to avoid the cold [outside](cold_outside/cold_outside.md) @@ -1217,7 +1217,7 @@ Get to know them [here](blackAndwhite/blackAndwhite.md) ======= Like football or soccer(as many others call it)? Must Watch -[The_Greatest_Battle_Ever] (https://www.youtube.com/watch?v=KyHDZqp2ThU) +[The_Greatest_Battle_Ever](https://www.youtube.com/watch?v=KyHDZqp2ThU) Some other guy beat me to it. Too lazy [here](lazy/lazy.md) From 404808a1304218c6d97c357c911bfcd183b17e82 Mon Sep 17 00:00:00 2001 From: wenqs Date: Mon, 18 Feb 2019 12:14:05 +0800 Subject: [PATCH 5308/5486] Add one story by wqs 2019 --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 5447ebfb8f..e86cedaff2 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -165,3 +165,5 @@ [wow](wow/wow.md) [天河他娘](seever/天河他娘.md) + +[3月3号去香港](hongkong/go2HK.md) From 8f2304c5398922b422a54c681fb6606191577c60 Mon Sep 17 00:00:00 2001 From: wenqs Date: Mon, 18 Feb 2019 12:18:12 +0800 Subject: [PATCH 5309/5486] Fix one error and add story by wqs 2019 --- Chinese/hongkong/ans/ans.md | 2 ++ Chinese/hongkong/go2HK.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 Chinese/hongkong/ans/ans.md create mode 100644 Chinese/hongkong/go2HK.md diff --git a/Chinese/hongkong/ans/ans.md b/Chinese/hongkong/ans/ans.md new file mode 100644 index 0000000000..8dd6a90716 --- /dev/null +++ b/Chinese/hongkong/ans/ans.md @@ -0,0 +1,2 @@ +他和好基友们一起去香港看fate HF线的第二部， +因为大陆不知道猴年马月才上线。。。。 \ No newline at end of file diff --git a/Chinese/hongkong/go2HK.md b/Chinese/hongkong/go2HK.md new file mode 100644 index 0000000000..d724687407 --- /dev/null +++ b/Chinese/hongkong/go2HK.md @@ -0,0 +1,3 @@ +他去香港干什么呢？ + +[答案](./ans/ans.md) From 19f16907cda05e9f4e68e1f6818c3b1bbe23344a Mon Sep 17 00:00:00 2001 From: Ravi Ranjan Date: Tue, 19 Feb 2019 23:40:17 +0530 Subject: [PATCH 5310/5486] My story --- english/love/love.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/love/love.md b/english/love/love.md index 503d0574f5..0fe9a909d7 100644 --- a/english/love/love.md +++ b/english/love/love.md @@ -57,3 +57,5 @@ It does not always have to be with a person. Love can be a passion. But depending on the person. Love can be anything. + +I didn't believed in love until i met you - A <3 \ No newline at end of file From 2e074296a11a28419dd1908fab82a8fc33846f39 Mon Sep 17 00:00:00 2001 From: Kinjoh Komei Date: Wed, 20 Feb 2019 16:29:14 +0900 Subject: [PATCH 5311/5486] Add a line --- japanese/hello/hello.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/japanese/hello/hello.md b/japanese/hello/hello.md index 6ad2077cbe..958417a8d9 100644 --- a/japanese/hello/hello.md +++ b/japanese/hello/hello.md @@ -1,3 +1,4 @@ 女性はゆっくりと顔をあげる。街頭に照らされた彼女の顔は... どこかで見覚えのある顔だった。 -数年ぶりだが間違いない。幼馴染の「えりこ」だ。 \ No newline at end of file +数年ぶりだが間違いない。幼馴染の「えりこ」だ。 +僕はそっと近づいて声をかけた。 \ No newline at end of file From 5dc85ffb7d33edad4c04309dc7bdf5f674ce8ef8 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 22 Feb 2019 21:08:43 -0700 Subject: [PATCH 5312/5486] Make yourself trip when running towards Scully --- english/talk_to_neighbour/man/mulder.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/talk_to_neighbour/man/mulder.md b/english/talk_to_neighbour/man/mulder.md index f71ba5d2ed..ef76c8f7dd 100644 --- a/english/talk_to_neighbour/man/mulder.md +++ b/english/talk_to_neighbour/man/mulder.md @@ -2,4 +2,8 @@ The man looked very stange. I was scared and looked frantically for the woman I saw the woman and ran toward her. +As I ran I failed to notice a hose running along the ground. +I tripped over it and went sprawling headlong. +I picked myself up and continued running toward the woman. + [Talk to the woman](../woman/scully.md) From 475a4a78bafe981371160ef38c14429f3f836043 Mon Sep 17 00:00:00 2001 From: Christopher Burns Date: Sat, 23 Feb 2019 16:35:09 -0700 Subject: [PATCH 5313/5486] squirrel chatter --- english/forest/eat/eat.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/forest/eat/eat.md b/english/forest/eat/eat.md index 5dc98ac334..94e11619e2 100644 --- a/english/forest/eat/eat.md +++ b/english/forest/eat/eat.md @@ -25,3 +25,5 @@ eveywhere. Hundreds of squirrels! You're surrounded. You've walked straight into their trap. The hunter has become the hunted... + +The chatter of the squirrels is getting louder and louder. From b98c5e369cc4f50f2c96acf3d3d0234a29fba4ed Mon Sep 17 00:00:00 2001 From: Yunsik Date: Mon, 25 Feb 2019 08:41:42 +0900 Subject: [PATCH 5314/5486] add three files : blindfold, steal, talktowomen --- korean/cafe-sungsu/blindfold/blindfold.md | 5 +++++ korean/cafe-sungsu/cafe-sungsu.md | 12 ++++++++++++ korean/cafe-sungsu/steal/steal.md | 7 +++++++ korean/cafe-sungsu/talktowomen/talktowomen.md | 9 +++++++++ 4 files changed, 33 insertions(+) create mode 100644 korean/cafe-sungsu/blindfold/blindfold.md create mode 100644 korean/cafe-sungsu/steal/steal.md create mode 100644 korean/cafe-sungsu/talktowomen/talktowomen.md diff --git a/korean/cafe-sungsu/blindfold/blindfold.md b/korean/cafe-sungsu/blindfold/blindfold.md new file mode 100644 index 0000000000..7309dc03f1 --- /dev/null +++ b/korean/cafe-sungsu/blindfold/blindfold.md @@ -0,0 +1,5 @@ +빈 테이블에 앉아서 자리에 놓여있는 눈가리개를 쓰자 점원이 다가온다. + +당신은 + +아이고 집 밖에 나오니 개고생이다. 다시 [방으로 돌아간다.](../../marshmallow.md) \ No newline at end of file diff --git a/korean/cafe-sungsu/cafe-sungsu.md b/korean/cafe-sungsu/cafe-sungsu.md index 5b1083409b..94715fcf3b 100644 --- a/korean/cafe-sungsu/cafe-sungsu.md +++ b/korean/cafe-sungsu/cafe-sungsu.md @@ -1 +1,13 @@ +카페 성수에 왔더니 마침 마시멜로를 팔고 있네요. 그런데 당신 주머니엔 돈이 없습니다. + +자세히 보니 몇몇 테이블에 사람들이 있는데 모두 눈가리개를 쓰고 앉아있습니다. + +당신은 + +그 중 한 여자의 눈가리개를 벗기고 [말을 건다](talktowomen/talktowomen.md) + +그 중 한 남자아이의 자리에 앉아서 그 아이의 마시멜로를 [뺏어먹는다.](steal/steal.md) + +함께 [눈을 가리고](blindfold/blindfold.md) 테이블에 앉는다. + 아이고 집 밖에 나오니 개고생이다. 다시 [방으로 돌아간다.](../marshmallow.md) \ No newline at end of file diff --git a/korean/cafe-sungsu/steal/steal.md b/korean/cafe-sungsu/steal/steal.md new file mode 100644 index 0000000000..b1248fe675 --- /dev/null +++ b/korean/cafe-sungsu/steal/steal.md @@ -0,0 +1,7 @@ +그 아이의 앞에 앉아 마시멜로를 먹고 있는데, 점원이 다가온다. + +당신은 + +아무일 없다는 듯 일어서서 카페를 다시 [둘러본다.](../cafe-sungsu.md) + +아이고 집 밖에 나오니 개고생이다. 다시 [방으로 돌아간다.](../../marshmallow.md) \ No newline at end of file diff --git a/korean/cafe-sungsu/talktowomen/talktowomen.md b/korean/cafe-sungsu/talktowomen/talktowomen.md new file mode 100644 index 0000000000..b7ad8f1033 --- /dev/null +++ b/korean/cafe-sungsu/talktowomen/talktowomen.md @@ -0,0 +1,9 @@ +여자의 앞에 앉아 말을 걸려고 했더니 갑자기 여자가 입 앞에 손가락을 갖다대며 + +조용히 하라고 신호를 보낸다. + +당신은 + +다시 일어서서 카페를 [둘러본다.](../cafe-sungsu.md) + +아이고 집 밖에 나오니 개고생이다. 다시 [방으로 돌아간다.](../../marshmallow.md) \ No newline at end of file From 079115dae6ff8188c66e355b595b1edda2005254 Mon Sep 17 00:00:00 2001 From: Yunsik Date: Mon, 25 Feb 2019 08:51:28 +0900 Subject: [PATCH 5315/5486] cancel modification and turn to addition : cafe-sungsu.md --- korean/cafe-sungsu/cafe-sungsu.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/korean/cafe-sungsu/cafe-sungsu.md b/korean/cafe-sungsu/cafe-sungsu.md index 94715fcf3b..c1b47e4df9 100644 --- a/korean/cafe-sungsu/cafe-sungsu.md +++ b/korean/cafe-sungsu/cafe-sungsu.md @@ -1,4 +1,6 @@ -카페 성수에 왔더니 마침 마시멜로를 팔고 있네요. 그런데 당신 주머니엔 돈이 없습니다. +아이고 집 밖에 나오니 개고생이다. 다시 방으로 돌아간다. + +그런데 카페를 자세히 보니 마침 마시멜로를 팔고 있네요. 하지만 당신 주머니엔 돈이 없습니다. 자세히 보니 몇몇 테이블에 사람들이 있는데 모두 눈가리개를 쓰고 앉아있습니다. @@ -10,4 +12,3 @@ 함께 [눈을 가리고](blindfold/blindfold.md) 테이블에 앉는다. -아이고 집 밖에 나오니 개고생이다. 다시 [방으로 돌아간다.](../marshmallow.md) \ No newline at end of file From ad7619d11a1181f563a10e4130686621d1c3b1be Mon Sep 17 00:00:00 2001 From: Yunsik Date: Mon, 25 Feb 2019 08:54:13 +0900 Subject: [PATCH 5316/5486] link correction cafe-sungsu.md --- korean/cafe-sungsu/cafe-sungsu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/korean/cafe-sungsu/cafe-sungsu.md b/korean/cafe-sungsu/cafe-sungsu.md index c1b47e4df9..2afb6ea0cc 100644 --- a/korean/cafe-sungsu/cafe-sungsu.md +++ b/korean/cafe-sungsu/cafe-sungsu.md @@ -1,4 +1,4 @@ -아이고 집 밖에 나오니 개고생이다. 다시 방으로 돌아간다. +아이고 집 밖에 나오니 개고생이다. 다시 [방으로 돌아간다.](../marshmallow.md) 그런데 카페를 자세히 보니 마침 마시멜로를 팔고 있네요. 하지만 당신 주머니엔 돈이 없습니다. From 68b30e8dd5f051e66c3fcff88ac8e2d555fd6830 Mon Sep 17 00:00:00 2001 From: Nelson Date: Tue, 26 Feb 2019 18:31:58 +0100 Subject: [PATCH 5317/5486] Add nelsola's story --- english/marshmallow.md | 2 ++ english/programmer/better/you_get_position.md | 1 + english/programmer/lead_programmer.md | 8 ++++++++ english/programmer/not_better/no_position.md | 3 +++ 4 files changed, 14 insertions(+) create mode 100644 english/programmer/better/you_get_position.md create mode 100644 english/programmer/lead_programmer.md create mode 100644 english/programmer/not_better/no_position.md diff --git a/english/marshmallow.md b/english/marshmallow.md index a4753343f9..6f9bf788fc 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,5 @@ +There's a spot open for the role of [Lead Programmer](programmer/lead_programmer.md) + Once upon a time many authors collaborated to make meaningless linked story. And that story was about [cricket](cricket/if-you-love-cricket/ifyoulovecricket.md) diff --git a/english/programmer/better/you_get_position.md b/english/programmer/better/you_get_position.md new file mode 100644 index 0000000000..bb42fe8561 --- /dev/null +++ b/english/programmer/better/you_get_position.md @@ -0,0 +1 @@ +Congratulations on getting to this point. I wish you an amazing programming career!. \ No newline at end of file diff --git a/english/programmer/lead_programmer.md b/english/programmer/lead_programmer.md new file mode 100644 index 0000000000..9950150ce2 --- /dev/null +++ b/english/programmer/lead_programmer.md @@ -0,0 +1,8 @@ +You raise your hand slowly, but just as you did you notice in your peripheral vision that someone else has raised his hand. +You quickly turn to see who it is. +It is the guy that has been working from the shadows. +The director knows everyone's abilities, and glances at both of you calmly. + +[You know Git better than him](better/you_get_position.md) + +[He knows Git better than you](not_better/no_position.md) \ No newline at end of file diff --git a/english/programmer/not_better/no_position.md b/english/programmer/not_better/no_position.md new file mode 100644 index 0000000000..08b4a82eef --- /dev/null +++ b/english/programmer/not_better/no_position.md @@ -0,0 +1,3 @@ +You didn't pay enough attention while the tutorials were going on + +See what happens here https://www.youtube.com/watch?v=Ma81lHmaQkM \ No newline at end of file From a81491ade0aff1de640eb5625117f58958987b7e Mon Sep 17 00:00:00 2001 From: Elaine Holtz Date: Tue, 26 Feb 2019 16:34:07 -0600 Subject: [PATCH 5318/5486] Add new lines to the story in english/universe-test/blaze_verse.md file --- english/universe-test/blaze_verse.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/english/universe-test/blaze_verse.md b/english/universe-test/blaze_verse.md index df14fe4277..aab4433a81 100644 --- a/english/universe-test/blaze_verse.md +++ b/english/universe-test/blaze_verse.md @@ -2,6 +2,10 @@ Whilst wandering through the vastness of this universe. But what universe is this? +Who knows the answer to such a question? + +I suggest you ask the moon before you make your choice. + [This one?](https://www.youtube.com/watch?v=U5LVb3UtD3Q) Or... From e9d087aa6da2fb3be299b955e02b8ec9873e9970 Mon Sep 17 00:00:00 2001 From: C Miller Date: Wed, 27 Feb 2019 11:02:52 -0500 Subject: [PATCH 5319/5486] Add company to misery --- english/lazy/lazy.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/lazy/lazy.md b/english/lazy/lazy.md index c50d3d801c..679eb1e31e 100644 --- a/english/lazy/lazy.md +++ b/english/lazy/lazy.md @@ -1 +1,3 @@ -i really don't know what to say and im so lazy to write a story \ No newline at end of file +i really don't know what to say and im so lazy to write a story + +I hear you friend. Here for the laziness! \ No newline at end of file From 440a054bd2c603d08cff1d18ca39f0df8b57c7aa Mon Sep 17 00:00:00 2001 From: smmoffat96 Date: Wed, 27 Feb 2019 11:31:57 -0500 Subject: [PATCH 5320/5486] Add sleepover option to invite friends, along with some options for sleepover activities --- english/invite-friends/friends.md | 4 +++- .../sleepover/bake-cookies/bake-cookies.md | 1 + .../invite-friends/sleepover/catch-up/catch-up.md | 2 ++ .../sleepover/dance-party/dance-party.md | 1 + .../invite-friends/sleepover/play-game/play-game.md | 1 + english/invite-friends/sleepover/sleepover.md | 12 ++++++++++++ .../sleepover/watch-movie/watch-movie.md | 1 + 7 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 english/invite-friends/sleepover/bake-cookies/bake-cookies.md create mode 100644 english/invite-friends/sleepover/catch-up/catch-up.md create mode 100644 english/invite-friends/sleepover/dance-party/dance-party.md create mode 100644 english/invite-friends/sleepover/play-game/play-game.md create mode 100644 english/invite-friends/sleepover/sleepover.md create mode 100644 english/invite-friends/sleepover/watch-movie/watch-movie.md diff --git a/english/invite-friends/friends.md b/english/invite-friends/friends.md index f5c785dcc2..d1e858326b 100644 --- a/english/invite-friends/friends.md +++ b/english/invite-friends/friends.md @@ -9,6 +9,8 @@ Do you: [Eat marshmallow and start a discussion of how such a strange thing could happen?](start_discussion/discuss.md) +[Have a sleepover party?](sleepover/sleepover.md) + [Start a party?](kick_out_the_jams/jamming.md) [Bring some chocolate and graham crackers to make s'mores?](smores/with_friends.md) @@ -21,4 +23,4 @@ Do you: [do a flip](flip/flip.md) -[eat breakfast?](../breakfast/breakfast.md) \ No newline at end of file +[eat breakfast?](../breakfast/breakfast.md) diff --git a/english/invite-friends/sleepover/bake-cookies/bake-cookies.md b/english/invite-friends/sleepover/bake-cookies/bake-cookies.md new file mode 100644 index 0000000000..72fb3390a7 --- /dev/null +++ b/english/invite-friends/sleepover/bake-cookies/bake-cookies.md @@ -0,0 +1 @@ +You decide to bake some delicious cookies to enjoy with your friends. Yum! diff --git a/english/invite-friends/sleepover/catch-up/catch-up.md b/english/invite-friends/sleepover/catch-up/catch-up.md new file mode 100644 index 0000000000..d79795cf53 --- /dev/null +++ b/english/invite-friends/sleepover/catch-up/catch-up.md @@ -0,0 +1,2 @@ +Your friends take some time to catch up, since you haven't seen each other +for a while! It's good to hear about what's going on with everyone. diff --git a/english/invite-friends/sleepover/dance-party/dance-party.md b/english/invite-friends/sleepover/dance-party/dance-party.md new file mode 100644 index 0000000000..ad01427858 --- /dev/null +++ b/english/invite-friends/sleepover/dance-party/dance-party.md @@ -0,0 +1 @@ +You break out some tunes to dance to with your friends! diff --git a/english/invite-friends/sleepover/play-game/play-game.md b/english/invite-friends/sleepover/play-game/play-game.md new file mode 100644 index 0000000000..3d3fc81f03 --- /dev/null +++ b/english/invite-friends/sleepover/play-game/play-game.md @@ -0,0 +1 @@ +You pull out a board game to enjoy with your friends! diff --git a/english/invite-friends/sleepover/sleepover.md b/english/invite-friends/sleepover/sleepover.md new file mode 100644 index 0000000000..6e7ae6808e --- /dev/null +++ b/english/invite-friends/sleepover/sleepover.md @@ -0,0 +1,12 @@ +You decide to have a sleepover with your friends, so you have to decide +what activities you will do together... + +[Bake cookies](bake-cookies/bake-cookies.md) + +[Watch a movie](watch-movie/watch-movie.md) + +[Play a board game](play-game/play-game.md) + +[Have a dance party](dance-party/dance-party.md) + +[Just catch up!](catch-up/catch-up.md) diff --git a/english/invite-friends/sleepover/watch-movie/watch-movie.md b/english/invite-friends/sleepover/watch-movie/watch-movie.md new file mode 100644 index 0000000000..ec38e7535e --- /dev/null +++ b/english/invite-friends/sleepover/watch-movie/watch-movie.md @@ -0,0 +1 @@ +You watch a movie with your friends and have a great time! From e7388cd291062702eeab71bdfcaf10704664bc94 Mon Sep 17 00:00:00 2001 From: MisiM Date: Thu, 28 Feb 2019 21:32:00 +0200 Subject: [PATCH 5321/5486] add a breakfast choise in a zuhanyzas.md file --- hungarian/zuhanyzas/zuhanyzas.md | 1 + 1 file changed, 1 insertion(+) diff --git a/hungarian/zuhanyzas/zuhanyzas.md b/hungarian/zuhanyzas/zuhanyzas.md index 8f26b87a47..ea00072d33 100644 --- a/hungarian/zuhanyzas/zuhanyzas.md +++ b/hungarian/zuhanyzas/zuhanyzas.md @@ -10,3 +10,4 @@ Mihez kezdesz? [elkezdesz enni](eves/eves.md) +[a reggelire gondolsz](../reggeli/reggeli.md) From 141fb84fee5964ba2f4da0f742731b33f7400554 Mon Sep 17 00:00:00 2001 From: Evan Killeen Date: Thu, 28 Feb 2019 18:43:30 -0700 Subject: [PATCH 5322/5486] added a line to chess.md --- english/chess/chess.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/chess/chess.md b/english/chess/chess.md index d0357c901d..b89e8bfe3e 100644 --- a/english/chess/chess.md +++ b/english/chess/chess.md @@ -2,10 +2,12 @@ You decide to conquer up a chess puzzle. An image appears in your mind. White to move. +What would Carlsen do? + ![alt chess](http://www.dailychesspuzzles.com/images/00102.jpg) You decide the best response is Qf8+, then Ra8 with mate to follow And you go back to reality. -This game is getting [boring](../bored/bored.md). \ No newline at end of file +This game is getting [boring](../bored/bored.md). From 484274b9c68b9f50c7ff5054bc650ddea0000c42 Mon Sep 17 00:00:00 2001 From: Rahul Sawhney Date: Fri, 1 Mar 2019 06:26:45 -0500 Subject: [PATCH 5323/5486] added to english story.. --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index a4753343f9..75674f62cd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -2,6 +2,8 @@ Once upon a time many authors collaborated to make meaningless linked story. And that story was about [cricket](cricket/if-you-love-cricket/ifyoulovecricket.md) +Now what? + A few learned to [tango](tango/tango.md) Some preferred to From 6a7c04ba7f8b181a794d0f38493fb5573148ac5e Mon Sep 17 00:00:00 2001 From: Mattias Edling <47564889+mEdling@users.noreply.github.com> Date: Fri, 1 Mar 2019 16:42:04 +0100 Subject: [PATCH 5324/5486] feat: Add paragraph about hunger. --- swedish/titta-ut/titta-ut.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swedish/titta-ut/titta-ut.md b/swedish/titta-ut/titta-ut.md index 53b0c93ec7..517bcc32c0 100644 --- a/swedish/titta-ut/titta-ut.md +++ b/swedish/titta-ut/titta-ut.md @@ -3,6 +3,8 @@ När du tittar ut genom fönstret ser du att det regnar. Det är fortfarande ganska mörkt ute och du känner dig helt utmattad efter nattens mardrömmar. varför är det alltdi så mörkt i dtta landet? +Magen kurrar. Det är egentligen dags för frukost. + Efter att ha övervägt din situation väljer du att [lägga dig och sova igen](../start.md) From e5d24a96ad05886a4aaf9afe79553e5b90416bcb Mon Sep 17 00:00:00 2001 From: Moaz Mansour <31941060+MoazMansour@users.noreply.github.com> Date: Sat, 2 Mar 2019 18:57:36 -0500 Subject: [PATCH 5325/5486] Add new option for Boston.md --- english/boston/boston.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/boston/boston.md b/english/boston/boston.md index 34817e9598..69ab7de09f 100644 --- a/english/boston/boston.md +++ b/english/boston/boston.md @@ -4,8 +4,10 @@ ...or on the second thought, I'll put on a coat, stop being a sissy, and get to work! +...or maybe I can just go back the heavens of my sleep and things would be better when I wakeup + [Go on vacation](../licked-cat/vacation.md) [Get to work](../gtd/gtd.md) -[Go back to sleep](../go-back-to-sleep/go-back-to-sleep.md) \ No newline at end of file +[Go back to sleep](../go-back-to-sleep/go-back-to-sleep.md) From a4b3190c6c587883ffd842270a1daaf8fb4e11e1 Mon Sep 17 00:00:00 2001 From: KevinT Date: Sun, 3 Mar 2019 17:59:06 +0800 Subject: [PATCH 5326/5486] Add message to my fellowmen --- Philippines/mulat/mulat.md | 17 +++++++++++++++++ Philippines/salamat.md | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 Philippines/mulat/mulat.md diff --git a/Philippines/mulat/mulat.md b/Philippines/mulat/mulat.md new file mode 100644 index 0000000000..cdb025f480 --- /dev/null +++ b/Philippines/mulat/mulat.md @@ -0,0 +1,17 @@ +Para sa mga pagbabagong nagaganap sa ating bayan, + +Na minsa'y hindi na namamalayan + +Kapwa Pilipino na ang mga naglalaban-laban + +Nakalimutan na ba natin ang ating bayan? + +Tandaan, itatak sa ating ulo + +Ang tanging kakampi ng Pilipino ay kapwa Pilipino + +Anumang desisyon natin para sa bayang ito + +Ang makikinabang at maghihirap ay walang iba kundi tayo + +[Salamat.](../salamat.md) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index 9b63256e74..d25c2f2e26 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -11,7 +11,7 @@ Buksan ang [pinto] (bagong simula/bagong_simula.md). Pahinga muna sa pag-aaral. Manood ng [movie] (movie/movie.md) Nakapag pahinga na. Salamat sa mga [pelikula] (movie/movie.md). -Ngayon ay ating sundan ang mga kaganapan sa Pilipinas. +Ngayon ay ating sundan ang mga kaganapan sa Pilipinas. Kamakailan ay nanalong Presidente si [Duterte] (duterte/duterte.md). O kung gusto mo namang kumain, tara [kain] (kain/kain.md) tayo ! @@ -30,3 +30,5 @@ Samahan si Benj sa kanyang paglalakbay! [Tara!](tara/tara.md) Para sa mga gusto kumanta [kanta] (kanta/minsan.md) Januart 12, 2017 + +Para sa hindi pa namumulat sa katotohanan, pumunta [rito](mulat/mulat.md). From c2f5394b7885d573903b8009dab77bdd0b7c7d21 Mon Sep 17 00:00:00 2001 From: KevinT Date: Sun, 3 Mar 2019 18:02:48 +0800 Subject: [PATCH 5327/5486] Fix typos --- Philippines/salamat.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Philippines/salamat.md b/Philippines/salamat.md index d25c2f2e26..db53f89f5a 100644 --- a/Philippines/salamat.md +++ b/Philippines/salamat.md @@ -11,7 +11,7 @@ Buksan ang [pinto] (bagong simula/bagong_simula.md). Pahinga muna sa pag-aaral. Manood ng [movie] (movie/movie.md) Nakapag pahinga na. Salamat sa mga [pelikula] (movie/movie.md). -Ngayon ay ating sundan ang mga kaganapan sa Pilipinas. +Ngayon ay ating sundan ang mga kaganapan sa Pilipinas. Kamakailan ay nanalong Presidente si [Duterte] (duterte/duterte.md). O kung gusto mo namang kumain, tara [kain] (kain/kain.md) tayo ! From 3b83d9b9691bbfad7aad4ba9eac59620a14cc628 Mon Sep 17 00:00:00 2001 From: philippe ventrillon Date: Sun, 3 Mar 2019 18:38:47 +0100 Subject: [PATCH 5328/5486] Add television million option --- french/feu-de-camp.md | 5 ++++- french/millions/joker50/joker50.md | 1 + french/millions/jokeravis/jokeravis.md | 1 + french/millions/jokercoupdefil/jokercoupdefil.md | 1 + french/millions/millions.md | 9 +++++++++ 5 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 french/millions/joker50/joker50.md create mode 100644 french/millions/jokeravis/jokeravis.md create mode 100644 french/millions/jokercoupdefil/jokercoupdefil.md create mode 100644 french/millions/millions.md diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 7d350748fd..a397a0ac5b 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -38,4 +38,7 @@ Que faites-vous ? [Je commande du foie gras](foie-gras/foie-gras.md) -[J'organise une soirée pain d'épices](soiree/soiree.md) \ No newline at end of file +[J'organise une soirée pain d'épices](soiree/soiree.md) + +[Je pense à ce que j'ai vu à la télévision.](millions/millions.md) + diff --git a/french/millions/joker50/joker50.md b/french/millions/joker50/joker50.md new file mode 100644 index 0000000000..6d6f50ab2a --- /dev/null +++ b/french/millions/joker50/joker50.md @@ -0,0 +1 @@ +[Je réfléchie encore un peu.](../millions.md) diff --git a/french/millions/jokeravis/jokeravis.md b/french/millions/jokeravis/jokeravis.md new file mode 100644 index 0000000000..6d6f50ab2a --- /dev/null +++ b/french/millions/jokeravis/jokeravis.md @@ -0,0 +1 @@ +[Je réfléchie encore un peu.](../millions.md) diff --git a/french/millions/jokercoupdefil/jokercoupdefil.md b/french/millions/jokercoupdefil/jokercoupdefil.md new file mode 100644 index 0000000000..6d6f50ab2a --- /dev/null +++ b/french/millions/jokercoupdefil/jokercoupdefil.md @@ -0,0 +1 @@ +[Je réfléchie encore un peu.](../millions.md) diff --git a/french/millions/millions.md b/french/millions/millions.md new file mode 100644 index 0000000000..347e7c23c6 --- /dev/null +++ b/french/millions/millions.md @@ -0,0 +1,9 @@ +Quand il ya une question difficile à "Qui veut gagner des millions?" Jean-Pierre propose d'utiliser un joker. + +[J'utilise le 50/50.](joker50/joker50.md) + +[J'utilise l'avis du public.](jokeravis/jokeravis.md) + +[J'utilise le coupe de fil a un ami.](jokercoupdefil/jokercoupdefil.md) + +[J'essaye de trouver un autre plan.](../feu-de-camp.md) From 2a73843bb82fa605728d1b0be72ac9b2466b7fab Mon Sep 17 00:00:00 2001 From: Felipe Anderson Date: Fri, 8 Mar 2019 09:50:38 -0300 Subject: [PATCH 5329/5486] Add my change --- portugues/futebol/futebol.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/portugues/futebol/futebol.md b/portugues/futebol/futebol.md index 3aec88c52b..afe942171a 100644 --- a/portugues/futebol/futebol.md +++ b/portugues/futebol/futebol.md @@ -1,3 +1,9 @@ Você joga futebol com a cabeça de seus amigos que não conseguem consertar o bug. -Gol da Alemanha \ No newline at end of file +Gol da Alemanha +Gol da Alemanha +Gol da Alemanha +Gol da Alemanha +Gol da Alemanha +Gol da Alemanha +Gol da Alemanha From 1dd43676af0e66c6d77b838f00ec6bf6a57fb246 Mon Sep 17 00:00:00 2001 From: KMENDEL001 Date: Sat, 9 Mar 2019 15:21:46 -0600 Subject: [PATCH 5330/5486] Add storylines to dothraki --- dothraki/dosh-khaleen/dosh-khaleen.md | 1 + dothraki/dothraki_evoli.md | 4 ++++ dothraki/sir-jorah/sir-jorah.md | 1 + 3 files changed, 6 insertions(+) create mode 100644 dothraki/dosh-khaleen/dosh-khaleen.md create mode 100644 dothraki/sir-jorah/sir-jorah.md diff --git a/dothraki/dosh-khaleen/dosh-khaleen.md b/dothraki/dosh-khaleen/dosh-khaleen.md new file mode 100644 index 0000000000..398ecfb290 --- /dev/null +++ b/dothraki/dosh-khaleen/dosh-khaleen.md @@ -0,0 +1 @@ +Sekke zichome, toki tokik. [Esemrasali] (https://media.giphy.com/media/BZVuzQA6ehO2A/giphy.gif) diff --git a/dothraki/dothraki_evoli.md b/dothraki/dothraki_evoli.md index 39897416a9..40a1ada658 100644 --- a/dothraki/dothraki_evoli.md +++ b/dothraki/dothraki_evoli.md @@ -4,4 +4,8 @@ Zali hilelat [Drogo](drogo/drogo.md) ? Zali hilelat [Daenerys](daenerys/daenerys.md) ? +Zali hilelat [Dosh Khaleen] (dosh-khaleen/dosh-khaleen.md) ? + +Zali hilelat [Sir Jorah] (sir-jorah/sir-jorah.md) ? + [Valar Morghulis](valyrian/valyrian.md) diff --git a/dothraki/sir-jorah/sir-jorah.md b/dothraki/sir-jorah/sir-jorah.md new file mode 100644 index 0000000000..1af7b0f3b4 --- /dev/null +++ b/dothraki/sir-jorah/sir-jorah.md @@ -0,0 +1 @@ +Mae athzhili Daenerys evoon. Vosma yer laz [athfiezi] (https://media.giphy.com/media/3o6EhO0Q1RYyWYMLUQ/giphy.gif) . From 37461a48bfbaa2e189476c64e36e507e6254d11d Mon Sep 17 00:00:00 2001 From: Ting-Sheng Date: Mon, 11 Mar 2019 09:50:26 +0800 Subject: [PATCH 5331/5486] Add content to Wikipedia story --- english/wikipedia/wiki.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/english/wikipedia/wiki.md b/english/wikipedia/wiki.md index be54c9ffc9..977ea8c399 100644 --- a/english/wikipedia/wiki.md +++ b/english/wikipedia/wiki.md @@ -20,10 +20,10 @@ And you don't have to go to the library. [Behold!](http://en.wikipedia.org) -You may also like it's sister site, wikiyoyage (https://www.wikivoyage.org) +You may also like it's sister site, wikiyoyage (https://www.wikivoyage.org) with more detailed information on travel destinations. -You are so impressed with Wikipedia, you decide that you might even like to +You are so impressed with Wikipedia, you decide that you might even like to [donate](http://wikimediafoundation.org/wiki/Support_Wikipedia/en) some money to help keep Wikipedia running. Jimmy Wales would really appreciate the donation, since not everyone donates, @@ -31,12 +31,14 @@ but seemingly everyone makes use of Wikipedia! Until you get bored and go explore [here](https://www.urbandictionary.com) instead. -Then after you explore the website, you learn a few neat tricks. +Then after you explore the website, you learn a few neat tricks. -Then you want to show the world your new tricks by creating your own channel on [YouTube](https://www.youtube.com/). +Then you want to show the world your new tricks by creating your own channel on [YouTube](https://www.youtube.com/). [Play minecraft](../you-are-in-minecraft/minecraft.md) [Play Skyrim](../fus-roh-dah/fus-roh-dah.md) [Learn Calculus](https://en.wikipedia.org/wiki/Calculus) + +After learning so much from Wikipedia, you become the Wikiperson. From 799d72190aa37783427de519b4c0bd01075267a9 Mon Sep 17 00:00:00 2001 From: Ting-Sheng Date: Mon, 11 Mar 2019 09:58:10 +0800 Subject: [PATCH 5332/5486] Fix typo in Wikipedia story --- english/wikipedia/wiki.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/english/wikipedia/wiki.md b/english/wikipedia/wiki.md index 977ea8c399..622b4e0e21 100644 --- a/english/wikipedia/wiki.md +++ b/english/wikipedia/wiki.md @@ -20,10 +20,10 @@ And you don't have to go to the library. [Behold!](http://en.wikipedia.org) -You may also like it's sister site, wikiyoyage (https://www.wikivoyage.org) +You may also like it's sister site, wikiyoyage (https://www.wikivoyage.org) with more detailed information on travel destinations. -You are so impressed with Wikipedia, you decide that you might even like to +You are so impressed with Wikipedia, you decide that you might even like to [donate](http://wikimediafoundation.org/wiki/Support_Wikipedia/en) some money to help keep Wikipedia running. Jimmy Wales would really appreciate the donation, since not everyone donates, @@ -31,9 +31,9 @@ but seemingly everyone makes use of Wikipedia! Until you get bored and go explore [here](https://www.urbandictionary.com) instead. -Then after you explore the website, you learn a few neat tricks. +Then after you explore the website, you learn a few neat tricks. -Then you want to show the world your new tricks by creating your own channel on [YouTube](https://www.youtube.com/). +Then you want to show the world your new tricks by creating your own channel on [YouTube](https://www.youtube.com/). [Play minecraft](../you-are-in-minecraft/minecraft.md) From b46f5a8c7f4ba171510709de40af7d229cb70ca1 Mon Sep 17 00:00:00 2001 From: HCSKUL Date: Thu, 14 Mar 2019 21:50:37 +0100 Subject: [PATCH 5333/5486] Feat: Add new lines on this page Adding to a german page with a great white shark. --- german/Stopfen/ueberlegen/ueberlegen.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/german/Stopfen/ueberlegen/ueberlegen.md b/german/Stopfen/ueberlegen/ueberlegen.md index 69cf913e92..1fcad46d3c 100644 --- a/german/Stopfen/ueberlegen/ueberlegen.md +++ b/german/Stopfen/ueberlegen/ueberlegen.md @@ -4,3 +4,6 @@ im Boot genau um. Hier befinden sich keine Ruder oder sonstige Gegenst Sie schauen ber den See. Das nchstliegende Ufer ist weit entfernt. Sie knnen keine Menschen am Ufer erkennen. Sie sehen auch keine anderen Boote auf dem See. Ans Ufer zu schwimmen scheint aussichtslos und zudem gefhrlich aufgrund mglicher Strudel. Also mssen Sie eine andere Mglichkeit finden, ans Ufer zu kommen. + +Sie schauen sich um... und siehe da, ein großer weißer Ha kommt auf Sie zu geschwommen. +Sie denken, vielleicht kann der mich ja mitnehmen und strecken Ihren Daumen nach oben... From d4cbfef7af1cf96af2ef2d2e9d928325b0b30ec2 Mon Sep 17 00:00:00 2001 From: Ivan Hristov Hristov Date: Sun, 17 Mar 2019 12:06:03 +0200 Subject: [PATCH 5334/5486] Add Pesho the pooch to the fire police story --- bulgarian/fire-police/fire-police.md | 1 + 1 file changed, 1 insertion(+) diff --git a/bulgarian/fire-police/fire-police.md b/bulgarian/fire-police/fire-police.md index 9e2f0be527..3c3775cd2a 100644 --- a/bulgarian/fire-police/fire-police.md +++ b/bulgarian/fire-police/fire-police.md @@ -1 +1,2 @@ Оказва се, че си в България и на пожарникарите им отнема четири часа да дойдат. +Това каза кучето Пешо преди да изгори преди го приберат в местната дюнерджийница. \ No newline at end of file From a0285a6fdfdfd332c68efeed6563cd300ad18c7d Mon Sep 17 00:00:00 2001 From: PavelD Date: Wed, 20 Mar 2019 12:45:37 -0400 Subject: [PATCH 5335/5486] add to get powers --- english/use-powers/use-powers.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/use-powers/use-powers.md b/english/use-powers/use-powers.md index 39e97d03e2..da94eb2916 100644 --- a/english/use-powers/use-powers.md +++ b/english/use-powers/use-powers.md @@ -1,3 +1,5 @@ You are not the hero the world needed right now. Malt balls, while delicious, are not particularly effective against global hunger, racism, or religious intolerance. -You sigh, resignedly. \ No newline at end of file +You sigh, resignedly. + +But are you Batman? [here](https://www.youtube.com/watch?v=sPCIB7OGLjg) \ No newline at end of file From 55ee9fc2b6e6162f338801998af2474e179bbf94 Mon Sep 17 00:00:00 2001 From: amrsamii Date: Thu, 21 Mar 2019 13:43:19 +0200 Subject: [PATCH 5336/5486] add lion story --- english/zoo/lion/lion.md | 1 + english/zoo/zoo.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 english/zoo/lion/lion.md diff --git a/english/zoo/lion/lion.md b/english/zoo/lion/lion.md new file mode 100644 index 0000000000..c2a539649f --- /dev/null +++ b/english/zoo/lion/lion.md @@ -0,0 +1 @@ +it was horrible but i got back to [zoo](../zoo.md) diff --git a/english/zoo/zoo.md b/english/zoo/zoo.md index 30fc6572e5..70aa872711 100644 --- a/english/zoo/zoo.md +++ b/english/zoo/zoo.md @@ -8,4 +8,6 @@ I choose to get better at [English](../get-better-at-english/english.md) After my self trolling is complete, I decide to drink the lemonade. As I lift the lemonade to my mouth I see the tigers have broken loose. -[tiger-attack](../tiger-attack/tiger-attack.md) \ No newline at end of file +[tiger-attack](../tiger-attack/tiger-attack.md) + +then a lion attacked me [lion](./lion/lion.md) From 37fc485ff51d85cfa818d5926312eb875de9161c Mon Sep 17 00:00:00 2001 From: Oliver Pecha <“oliverpecha@gmail.com git config --global user.name “Oliver Pecha”git config --global user.email “oliverpecha@gmail.com> Date: Fri, 22 Mar 2019 15:45:13 +0100 Subject: [PATCH 5337/5486] Add new options to Catalan language, including adding a story and other related events --- catala/catala.md | 4 +++- catala/stories/app_camera/app_camera.md | 11 +++++++++++ catala/stories/app_camera/pujar_foto/pujar_foto.md | 6 ++++++ catala/stories/menjar_movil/menjar_movil.md | 6 ++++++ catala/stories/stories.md | 10 ++++++++++ 5 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 catala/stories/app_camera/app_camera.md create mode 100644 catala/stories/app_camera/pujar_foto/pujar_foto.md create mode 100644 catala/stories/menjar_movil/menjar_movil.md create mode 100644 catala/stories/stories.md diff --git a/catala/catala.md b/catala/catala.md index 4deef62540..d629145516 100644 --- a/catala/catala.md +++ b/catala/catala.md @@ -24,4 +24,6 @@ Què fas? [Entres en pànic absolut](panic/panic.md) -[Corres cap a la paret més propera](correr/correr.md) \ No newline at end of file +[Corres cap a la paret més propera](correr/correr.md) + +[Fas un stories] (stories/stories.md) \ No newline at end of file diff --git a/catala/stories/app_camera/app_camera.md b/catala/stories/app_camera/app_camera.md new file mode 100644 index 0000000000..6a7dcfd220 --- /dev/null +++ b/catala/stories/app_camera/app_camera.md @@ -0,0 +1,11 @@ +El móvil de núvols de sucre és incríble... te uns efectes psicodélics que +ensenyen criatures virtuals en realitat augmentada sobre la aplicació de camera. +Quan toques sobre les criatures a la pantalla es converteixen en reals, +es la millor foto que has fet en anys, segur que consegueixes un millió de nous +seguidors despres de pujar la foto. + +I ara... què vols fer? + +[Pujar la foto](pujar_foto/pujar_foto.md) + +[Em poso a dormir](../../dormir/dormir.md) \ No newline at end of file diff --git a/catala/stories/app_camera/pujar_foto/pujar_foto.md b/catala/stories/app_camera/pujar_foto/pujar_foto.md new file mode 100644 index 0000000000..c520514335 --- /dev/null +++ b/catala/stories/app_camera/pujar_foto/pujar_foto.md @@ -0,0 +1,6 @@ +Li dones al botó de compartir i veus els teus seguidors +aumentar molt ràpidament, a cada nou seguidor cau un núvol +de sucre del sostre i en pocs instants et trobes a sota d'una muntanya +de núvols de sucre que t'impedeix moure't. + +Ara, feliç de ser la persona més popular del moment, tornes a dormir. \ No newline at end of file diff --git a/catala/stories/menjar_movil/menjar_movil.md b/catala/stories/menjar_movil/menjar_movil.md new file mode 100644 index 0000000000..2de20a23e2 --- /dev/null +++ b/catala/stories/menjar_movil/menjar_movil.md @@ -0,0 +1,6 @@ +El móvil de núvols de sucre té un sabor espectacular i t'ompla la panxa ràpidament. + +I ara... et vols menjar les parets? + +[Comences a menjar sucre desesperadament](../../menjar/menjar.md) +[Et poses a dormir](../../dormir/dormir.md) \ No newline at end of file diff --git a/catala/stories/stories.md b/catala/stories/stories.md new file mode 100644 index 0000000000..0f15ee7f42 --- /dev/null +++ b/catala/stories/stories.md @@ -0,0 +1,10 @@ +Busques a la tauleta de nit el teu móvil. Et costa trobar-ho pero per fi, +mig dormit encara et dones conta que el móvil també esta fet de núvols de sucre... + +I ara... què vols fer? + +[Menjar el móvil](menjar_movil/menjar_movil.md) + +[Activo el móvil i obro la app de camera](app_camera/app_camera.md) + +[Em poso a dormir](../dormir/dormir.md) \ No newline at end of file From 9cf6e2882bfc2023db12d9bbc2719bbe06184d1a Mon Sep 17 00:00:00 2001 From: Oliver Pecha <“oliverpecha@gmail.com git config --global user.name “Oliver Pecha”git config --global user.email “oliverpecha@gmail.com> Date: Fri, 22 Mar 2019 15:50:41 +0100 Subject: [PATCH 5338/5486] corrected some format typos --- catala/catala.md | 2 +- catala/stories/menjar_movil/menjar_movil.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/catala/catala.md b/catala/catala.md index d629145516..ae90693dab 100644 --- a/catala/catala.md +++ b/catala/catala.md @@ -26,4 +26,4 @@ Què fas? [Corres cap a la paret més propera](correr/correr.md) -[Fas un stories] (stories/stories.md) \ No newline at end of file +[Fas un stories](stories/stories.md) \ No newline at end of file diff --git a/catala/stories/menjar_movil/menjar_movil.md b/catala/stories/menjar_movil/menjar_movil.md index 2de20a23e2..947b568d55 100644 --- a/catala/stories/menjar_movil/menjar_movil.md +++ b/catala/stories/menjar_movil/menjar_movil.md @@ -3,4 +3,5 @@ El móvil de núvols de sucre té un sabor espectacular i t'ompla la panxa ràpi I ara... et vols menjar les parets? [Comences a menjar sucre desesperadament](../../menjar/menjar.md) + [Et poses a dormir](../../dormir/dormir.md) \ No newline at end of file From a7c12c7f3eb4bd8bea108d201235d13ea4e5490a Mon Sep 17 00:00:00 2001 From: Omar Qaisi Date: Sat, 23 Mar 2019 15:55:47 +0200 Subject: [PATCH 5339/5486] Add a choice to chillmusic --- english/chillmusic/chillmusic.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/chillmusic/chillmusic.md b/english/chillmusic/chillmusic.md index bd1eaabe75..535ac34c89 100644 --- a/english/chillmusic/chillmusic.md +++ b/english/chillmusic/chillmusic.md @@ -10,3 +10,5 @@ Click to listen to a nice EDM track: [Faded - Alan Walker - Lost Stories Mix](https://soundcloud.com/loststories/alan-walker-faded-lost-stories-remix) Click [here](https://www.youtube.com/watch?v=e80qhyovOnA) to listen to moonlight shadow. + +Click [here](https://www.youtube.com/watch?v=L3wKzyIN1yk) to listen to Human by Rag'n'Bone Man. \ No newline at end of file From 0d2ab5303a27a9f28c14033687ee5ec599715cbe Mon Sep 17 00:00:00 2001 From: ictilkka <48713610+ictilkka@users.noreply.github.com> Date: Wed, 27 Mar 2019 12:59:35 +0200 Subject: [PATCH 5340/5486] Add option to go to heaven. --- english/zuluquest/the/end.md | 2 ++ english/zuluquest/the/heaven/heaven.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 english/zuluquest/the/heaven/heaven.md diff --git a/english/zuluquest/the/end.md b/english/zuluquest/the/end.md index 27224daffc..f57a21826e 100644 --- a/english/zuluquest/the/end.md +++ b/english/zuluquest/the/end.md @@ -1,3 +1,5 @@ OK! So let's face it... Lots of people will do no big thing from their life but... Could we make something better maybe? Just for the fun, hit the back button and choose another path. + +OR, continue working in the same job for 50 years, die and go to [heaven](heaven/heaven.md). \ No newline at end of file diff --git a/english/zuluquest/the/heaven/heaven.md b/english/zuluquest/the/heaven/heaven.md new file mode 100644 index 0000000000..c0e7bcb7e6 --- /dev/null +++ b/english/zuluquest/the/heaven/heaven.md @@ -0,0 +1,3 @@ +#404 heaven not found. + +Press F5 to try again, or just give up hope... \ No newline at end of file From c21faf60a507bcfaa640481a1fd2b6f0e53cb75e Mon Sep 17 00:00:00 2001 From: Pengfei Cheng Date: Wed, 27 Mar 2019 22:35:49 -0400 Subject: [PATCH 5341/5486] add stories to Jay Zhou --- Chinese/Jay_Chou/Jay_Chou.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Chinese/Jay_Chou/Jay_Chou.md b/Chinese/Jay_Chou/Jay_Chou.md index 64ab254328..36e70237d0 100644 --- a/Chinese/Jay_Chou/Jay_Chou.md +++ b/Chinese/Jay_Chou/Jay_Chou.md @@ -2,3 +2,4 @@ 也许是生了女儿的原因，杰伦现在变得更有亲和力了 五年之后，周杰伦就带着闺女来参加爸爸去哪儿了。 +[爸爸去哪儿](https://www.weibo.com/babaqunaer) 收视率迅速下降。 From afe125d889b6f800adfdbe7305484365f4dac036 Mon Sep 17 00:00:00 2001 From: Brandon Chen Date: Thu, 28 Mar 2019 13:52:22 -0600 Subject: [PATCH 5342/5486] Add new line to english/animal --- english/animal/animal.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/animal/animal.md b/english/animal/animal.md index cd4bfa2d4d..f940eaf82f 100644 --- a/english/animal/animal.md +++ b/english/animal/animal.md @@ -39,3 +39,4 @@ My mother was a butterfly. Is that true? No it is not. I love animals, they are delicious. +I think I am more of a cat person than a dog person. \ No newline at end of file From 7ef0e50fe60ce067476835a88b0a3c2eb41eb2b6 Mon Sep 17 00:00:00 2001 From: Brian Kirk Date: Fri, 29 Mar 2019 16:53:54 -0600 Subject: [PATCH 5343/5486] Docs: Add the final touch. --- english/magicaladventure/expelliarmus/expelliarmus.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/magicaladventure/expelliarmus/expelliarmus.md b/english/magicaladventure/expelliarmus/expelliarmus.md index 020137711f..303e722287 100644 --- a/english/magicaladventure/expelliarmus/expelliarmus.md +++ b/english/magicaladventure/expelliarmus/expelliarmus.md @@ -4,4 +4,6 @@ Once you hear those words, you know it's over. There's no blocking that. But magically, the spell rebounds and kills Voldemort - victory! -Now you and Ginny can live happily ever after. \ No newline at end of file +Now you and Ginny can live happily ever after. + +The end. From a6305eb01982a0634ad62a7962ab6a86ddd1c03a Mon Sep 17 00:00:00 2001 From: Paulo Dinis Date: Mon, 1 Apr 2019 15:22:44 -0300 Subject: [PATCH 5344/5486] =?UTF-8?q?Nova=20op=C3=A7=C3=A3o=20para=20"tele?= =?UTF-8?q?fonica"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portugues/telefonica/ocupado.md | 4 +++- portugues/telefonica/outra/mesma.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 portugues/telefonica/outra/mesma.md diff --git a/portugues/telefonica/ocupado.md b/portugues/telefonica/ocupado.md index 174b5275f3..84e4768f22 100644 --- a/portugues/telefonica/ocupado.md +++ b/portugues/telefonica/ocupado.md @@ -2,4 +2,6 @@ Só dá ocupado. [Você pega um ônibus até o centro para visitar o camelódromo, mas você só tem Cr$ 5,00 na carteira.](centro/camelo.md) -[Como você não consegue ligar, você resolve ir a praia e gastar seus 5 Cruzeiros num mate Leão.](praia/mate.md) \ No newline at end of file +[Como você não consegue ligar, você resolve ir a praia e gastar seus 5 Cruzeiros num mate Leão.](praia/mate.md) + +[Você resolve trocar de empresa.](outra/mesma.md) \ No newline at end of file diff --git a/portugues/telefonica/outra/mesma.md b/portugues/telefonica/outra/mesma.md new file mode 100644 index 0000000000..d9f611a8d4 --- /dev/null +++ b/portugues/telefonica/outra/mesma.md @@ -0,0 +1 @@ +A outra operadora é a mesma porcaria! \ No newline at end of file From f5b1360887f5498254fc59d4dfd15d5a51f9ac4f Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 4 Apr 2019 17:53:57 -0300 Subject: [PATCH 5345/5486] Detalle de gracia. --- espanol/escapo/escapo.md | 1 + 1 file changed, 1 insertion(+) diff --git a/espanol/escapo/escapo.md b/espanol/escapo/escapo.md index 4a544998f8..28057a043c 100644 --- a/espanol/escapo/escapo.md +++ b/espanol/escapo/escapo.md @@ -3,3 +3,4 @@ un pequeña casa a las afueras de la villa, entró y corrió a la ultima habitacion cerro la puerta, se sentó en la rincón más alejado de la puerta y se cubrió con la capa que llevaba puesta pero no pudo escapar del miedo que en él habitaba. +Muy sensato todo. From a1acca06c397589740df53877f1b0b4ac65ee6ae Mon Sep 17 00:00:00 2001 From: Nastia Date: Tue, 9 Apr 2019 04:32:39 +0000 Subject: [PATCH 5346/5486] Add a new sentence --- ukrainian/marshmallow.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 38a2b7bfc8..e2bcbbd4b0 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -44,4 +44,6 @@ [Викличу потусторонні сили](daemon/daemon.md) -[В телефоні ж є музічний плеєр](the-wall/the-wall.md) \ No newline at end of file +[В телефоні ж є музічний плеєр](the-wall/the-wall.md) + +Перед вами вікно. Ви його [відкиваєте](window/open-the-window.md)... \ No newline at end of file From 00e0252e9bb1829a824b31417c9bd97afa94f61a Mon Sep 17 00:00:00 2001 From: Nastia Date: Tue, 9 Apr 2019 05:05:47 +0000 Subject: [PATCH 5347/5486] Add two files of my own stoty --- ukrainian/window/balloon/end-the-story.md | 1 + ukrainian/window/open-the-window.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 ukrainian/window/balloon/end-the-story.md create mode 100644 ukrainian/window/open-the-window.md diff --git a/ukrainian/window/balloon/end-the-story.md b/ukrainian/window/balloon/end-the-story.md new file mode 100644 index 0000000000..120e497472 --- /dev/null +++ b/ukrainian/window/balloon/end-the-story.md @@ -0,0 +1 @@ +Привітний чоловік посміхається тобі та маше рукою. \ No newline at end of file diff --git a/ukrainian/window/open-the-window.md b/ukrainian/window/open-the-window.md new file mode 100644 index 0000000000..d06a87f3fb --- /dev/null +++ b/ukrainian/window/open-the-window.md @@ -0,0 +1 @@ +Летить повітряна куля. А в [ній] (baloon/) \ No newline at end of file From 1f3a2fe934002a6288d0372da85e254fe5462e17 Mon Sep 17 00:00:00 2001 From: MikeWick Date: Tue, 9 Apr 2019 14:40:27 -0400 Subject: [PATCH 5348/5486] Y2K time-machine prep --- english/time-machine/time-machine.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/time-machine/time-machine.md b/english/time-machine/time-machine.md index b91cc8f0fd..1b67528bc0 100644 --- a/english/time-machine/time-machine.md +++ b/english/time-machine/time-machine.md @@ -11,5 +11,7 @@ Which part of the world, and what time you want to travel? And why? [You decide to travel back in time to visit a founding father of America](https://www.youtube.com/watch?v=t0aX8Jy1tME) +You travel to [1999](https://www.youtube.com/watch?v=ddzbxJasID4)to prepare for Y2k. + [You turn back](../marshmallow.md) From bb0fb3660bec4e26df59e3fe7af2a61f00d00778 Mon Sep 17 00:00:00 2001 From: Kosernik Date: Thu, 11 Apr 2019 18:22:18 +0300 Subject: [PATCH 5349/5486] Added russian story "sputnik" --- russian/sputnik/sputnik.md | 1 + russian/zefir.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 russian/sputnik/sputnik.md diff --git a/russian/sputnik/sputnik.md b/russian/sputnik/sputnik.md new file mode 100644 index 0000000000..be80116998 --- /dev/null +++ b/russian/sputnik/sputnik.md @@ -0,0 +1 @@ +Вы открываете сайт спутник.ру и пытаетесь узнать не оскорбляет ли зефир других людей. diff --git a/russian/zefir.md b/russian/zefir.md index 9572bad84e..48f6111bfa 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -6,7 +6,7 @@ Тихая музыка в джазовом стиле слышна, наверно она знакомая? -Да, это Small Mouse Big Band притаился в Вашей подмышечной впадине и наигрывает "Караван". +Да, это Small Mouse Big Band притаился в Вашей подмышечной впадине и наигрывает "Караван". От звука тромбона Вам становится щекотно. @@ -119,3 +119,5 @@ [Зайти на двач](2ch/2ch.md) [Стану вегетарианцем](vegetarian/vegetarian.md) + +[Открою сайт спутник.ру](sputnik/sputnik.md) From 1d9875a9ffe90f69990914bbf150ad4bfeab136a Mon Sep 17 00:00:00 2001 From: Kosernik Date: Thu, 11 Apr 2019 18:25:41 +0300 Subject: [PATCH 5350/5486] Fixed missing spase. --- russian/zefir.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/russian/zefir.md b/russian/zefir.md index 48f6111bfa..b81f418910 100644 --- a/russian/zefir.md +++ b/russian/zefir.md @@ -6,7 +6,7 @@ Тихая музыка в джазовом стиле слышна, наверно она знакомая? -Да, это Small Mouse Big Band притаился в Вашей подмышечной впадине и наигрывает "Караван". +Да, это Small Mouse Big Band притаился в Вашей подмышечной впадине и наигрывает "Караван". От звука тромбона Вам становится щекотно. From 0ebed8ff26a69361ee19e1b80cc6a7d04f6add65 Mon Sep 17 00:00:00 2001 From: samu Date: Sat, 13 Apr 2019 19:15:57 -0500 Subject: [PATCH 5351/5486] add space travel story --- english/space-travel/astronaut/astronaut.md | 11 +++++++++++ english/space-travel/astronaut/voice/voice.md | 6 ++++++ english/space-travel/earthborn/earthborn.md | 4 ++++ english/space-travel/space-travel.md | 12 ++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 english/space-travel/astronaut/astronaut.md create mode 100644 english/space-travel/astronaut/voice/voice.md create mode 100644 english/space-travel/earthborn/earthborn.md create mode 100644 english/space-travel/space-travel.md diff --git a/english/space-travel/astronaut/astronaut.md b/english/space-travel/astronaut/astronaut.md new file mode 100644 index 0000000000..327deb155e --- /dev/null +++ b/english/space-travel/astronaut/astronaut.md @@ -0,0 +1,11 @@ +I am ready! There is a lot of competition but through our perserverance, +passion, knowledge, and wits, we passed the test and was accepted to +be one of the astronauts. First we will take the space elevator up to the +space station that has the new space craft docked. + +You enter the space elevator. + +Do you: + +[use the voice recognition feature](voice/voice.md) + diff --git a/english/space-travel/astronaut/voice/voice.md b/english/space-travel/astronaut/voice/voice.md new file mode 100644 index 0000000000..551085b4fc --- /dev/null +++ b/english/space-travel/astronaut/voice/voice.md @@ -0,0 +1,6 @@ +AI has grown trememdously. With the help of this new technology we will +be able to travel much more comfortably in space. we can go up to the +space station easily now. + +AI: "How can I help you?" + diff --git a/english/space-travel/earthborn/earthborn.md b/english/space-travel/earthborn/earthborn.md new file mode 100644 index 0000000000..850c8a4ce5 --- /dev/null +++ b/english/space-travel/earthborn/earthborn.md @@ -0,0 +1,4 @@ +Live a life separated from my loved ones? I think not. I am fearless, +but not heartless. So I will spent what time I have left here even +if the earth can not sustain the human population for much longer. + diff --git a/english/space-travel/space-travel.md b/english/space-travel/space-travel.md new file mode 100644 index 0000000000..50c7485966 --- /dev/null +++ b/english/space-travel/space-travel.md @@ -0,0 +1,12 @@ +Our planet has been ravaged. We are running low on resources therefore, +the top scientists and engineers have created the most advanced +space craft ready to travel amongst the stars. But capacity is limited. +The journey will take many years and you will not have the chance to return. +Are you brave enough to seek new worlds and venture beyond our solar +system? + +Do you: + +[Sign up to be an astronaut?](astronaut/astronaut.md) + +[I think I will spend time with my loved ones](earthborn/earthborn.md) \ No newline at end of file From 2eef42931bb78194d78599b613d8b2373ef3375f Mon Sep 17 00:00:00 2001 From: JasminaPr Date: Sun, 14 Apr 2019 12:13:00 +0200 Subject: [PATCH 5352/5486] Kisa rastapa sljez, trcis van. --- croatian/sljez.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/croatian/sljez.md b/croatian/sljez.md index ddddbcf50c..2b44426c77 100644 --- a/croatian/sljez.md +++ b/croatian/sljez.md @@ -15,3 +15,5 @@ Napokon shvatis da je sljez samosvjestan! Brzo zgrabiš upaljač, prestravljeno trčeći prema najbližim vratima. Vani pada kisa. + +Istrcis van, sljez se rastopi. From 4d780cbc078d138d905bfcbc1195e65a30883fd3 Mon Sep 17 00:00:00 2001 From: Nastia Date: Mon, 22 Apr 2019 04:03:49 +0000 Subject: [PATCH 5353/5486] Delete one space --- ukrainian/window/open-the-window.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/window/open-the-window.md b/ukrainian/window/open-the-window.md index d06a87f3fb..48c834d56c 100644 --- a/ukrainian/window/open-the-window.md +++ b/ukrainian/window/open-the-window.md @@ -1 +1 @@ -Летить повітряна куля. А в [ній] (baloon/) \ No newline at end of file +Летить повітряна куля. А в [ній](baloon/end-the-story.md) \ No newline at end of file From 691c6ab611263e2152347ac033acf99dca1a86cb Mon Sep 17 00:00:00 2001 From: Nastia Date: Mon, 22 Apr 2019 04:10:16 +0000 Subject: [PATCH 5354/5486] Fix a typo --- ukrainian/window/open-the-window.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/window/open-the-window.md b/ukrainian/window/open-the-window.md index 48c834d56c..6b29cd5fdd 100644 --- a/ukrainian/window/open-the-window.md +++ b/ukrainian/window/open-the-window.md @@ -1 +1 @@ -Летить повітряна куля. А в [ній](baloon/end-the-story.md) \ No newline at end of file +Летить повітряна куля. А в [ній](balloon/end-the-story.md) \ No newline at end of file From a0ffc7c0b3f3e1b71798d1bbffa7df7176fbf1e0 Mon Sep 17 00:00:00 2001 From: Nastia Date: Mon, 22 Apr 2019 04:13:28 +0000 Subject: [PATCH 5355/5486] Fix second typo --- ukrainian/window/balloon/end-the-story.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukrainian/window/balloon/end-the-story.md b/ukrainian/window/balloon/end-the-story.md index 120e497472..72ff7616e1 100644 --- a/ukrainian/window/balloon/end-the-story.md +++ b/ukrainian/window/balloon/end-the-story.md @@ -1 +1 @@ -Привітний чоловік посміхається тобі та маше рукою. \ No newline at end of file +Привітний чоловік посміхається тобі та махає рукою. \ No newline at end of file From 22483f6b2f41c68f9dfbb94b8c8d3fdb539718b6 Mon Sep 17 00:00:00 2001 From: Pufff Date: Mon, 22 Apr 2019 22:06:28 +0500 Subject: [PATCH 5356/5486] Add pulling and fighting options to switch.md --- russian/sleep/brushing/redbrush/switch/switch.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/russian/sleep/brushing/redbrush/switch/switch.md b/russian/sleep/brushing/redbrush/switch/switch.md index 7253bccd64..ff3d1b6370 100644 --- a/russian/sleep/brushing/redbrush/switch/switch.md +++ b/russian/sleep/brushing/redbrush/switch/switch.md @@ -1 +1,7 @@ Вы попытались нащупать выключатель. + +Неожиданно ваша рука провалилась в стену и вы почувствовали, что ее затягивает. +Что вы сделаете? + +[Попробую вытащить руку](fighting/fighting.md) +[Рискну и дам себя затянуть](pulling/pulling.md) \ No newline at end of file From 12f2d32bc79b30406baec50132c232028cb2b59e Mon Sep 17 00:00:00 2001 From: Pufff Date: Mon, 22 Apr 2019 22:07:26 +0500 Subject: [PATCH 5357/5486] Add fighting.md file --- russian/sleep/brushing/redbrush/switch/fighting/fighting.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 russian/sleep/brushing/redbrush/switch/fighting/fighting.md diff --git a/russian/sleep/brushing/redbrush/switch/fighting/fighting.md b/russian/sleep/brushing/redbrush/switch/fighting/fighting.md new file mode 100644 index 0000000000..5fcfdb7f6b --- /dev/null +++ b/russian/sleep/brushing/redbrush/switch/fighting/fighting.md @@ -0,0 +1,5 @@ +В неравной борьбе за свободу вашей руки вы выходите победителем! + +Наградой вам становится большой кусок зефира. + +"Если подтопить мебель, можно сэкономить на завтраке", - думаете вы, отправлясь к холодильнику. \ No newline at end of file From 3e1aad97c4d1b7a649ce9006d2d3b9751ec25a09 Mon Sep 17 00:00:00 2001 From: Pufff Date: Mon, 22 Apr 2019 22:08:07 +0500 Subject: [PATCH 5358/5486] Add pulling.md file --- russian/sleep/brushing/redbrush/switch/pulling/pulling.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 russian/sleep/brushing/redbrush/switch/pulling/pulling.md diff --git a/russian/sleep/brushing/redbrush/switch/pulling/pulling.md b/russian/sleep/brushing/redbrush/switch/pulling/pulling.md new file mode 100644 index 0000000000..5285868e37 --- /dev/null +++ b/russian/sleep/brushing/redbrush/switch/pulling/pulling.md @@ -0,0 +1,5 @@ +Бац и становится холодно! + +Вы смотрите вокруг и видите сугробы. +Пытаетесь сдвинуться с места, но не можете: вас облепила гора зефира! +Теперь вы зефировик! \ No newline at end of file From 1fc88ee3ad030861cd3a651e0498d40a5aded311 Mon Sep 17 00:00:00 2001 From: Pufff Date: Mon, 22 Apr 2019 22:13:03 +0500 Subject: [PATCH 5359/5486] Change the formattings and links --- russian/sleep/brushing/redbrush/switch/switch.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/russian/sleep/brushing/redbrush/switch/switch.md b/russian/sleep/brushing/redbrush/switch/switch.md index ff3d1b6370..19d2674ac9 100644 --- a/russian/sleep/brushing/redbrush/switch/switch.md +++ b/russian/sleep/brushing/redbrush/switch/switch.md @@ -1,7 +1,9 @@ Вы попытались нащупать выключатель. Неожиданно ваша рука провалилась в стену и вы почувствовали, что ее затягивает. + Что вы сделаете? -[Попробую вытащить руку](fighting/fighting.md) -[Рискну и дам себя затянуть](pulling/pulling.md) \ No newline at end of file +[Попробую вытащить руку](switch/fighting/fighting.md) + +[Рискну и дам себя затянуть](switch/pulling/pulling.md) \ No newline at end of file From 01ceb2e1a5c6cbc681900d3355b85a00b05ffe3d Mon Sep 17 00:00:00 2001 From: Pufff Date: Tue, 23 Apr 2019 20:25:34 +0500 Subject: [PATCH 5360/5486] Fix links --- russian/sleep/brushing/redbrush/switch/switch.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/russian/sleep/brushing/redbrush/switch/switch.md b/russian/sleep/brushing/redbrush/switch/switch.md index 19d2674ac9..8247dd255b 100644 --- a/russian/sleep/brushing/redbrush/switch/switch.md +++ b/russian/sleep/brushing/redbrush/switch/switch.md @@ -4,6 +4,6 @@ Что вы сделаете? -[Попробую вытащить руку](switch/fighting/fighting.md) +[Попробую вытащить руку](fighting/fighting.md) -[Рискну и дам себя затянуть](switch/pulling/pulling.md) \ No newline at end of file +[Рискну и дам себя затянуть](pulling/pulling.md) \ No newline at end of file From 3216f21dbb1293ae4f9e39c39950421c39178116 Mon Sep 17 00:00:00 2001 From: FlavioMarcilio Date: Thu, 25 Apr 2019 12:36:35 -0300 Subject: [PATCH 5361/5486] Add my workflow --- portugues/colabora/fork/comdiferencas/diff/pull/pull.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/portugues/colabora/fork/comdiferencas/diff/pull/pull.md b/portugues/colabora/fork/comdiferencas/diff/pull/pull.md index afe45d4df7..de0c68e5c6 100644 --- a/portugues/colabora/fork/comdiferencas/diff/pull/pull.md +++ b/portugues/colabora/fork/comdiferencas/diff/pull/pull.md @@ -7,3 +7,6 @@ O pull request não foi aceito pois havia um erro ortográfico em um comentário [Corrijo os erros ortográficos com a ajuda de um amigo que manja de inglês e reenvio.](reenvio/reenviar.md) [Descobre, logo agora que aprendeu o bash, vai ter que retomar os estudos de inglês no duolingo] (descobre/descobrir.md) + +Abro o [Google Tradutor](https://translate.google.com.br/) e verifico a tradução do meu comentário. +Não é o que eu queria escrever: [corrijo meu erro e reenvio](reenvio/reenviar.md) \ No newline at end of file From e7c89b7bdd9608e050a27e97d893a2641c8bdb9a Mon Sep 17 00:00:00 2001 From: joynithin12 Date: Wed, 1 May 2019 10:14:10 +1000 Subject: [PATCH 5362/5486] added iot story to space --- english/dream/fly/space/space.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/dream/fly/space/space.md b/english/dream/fly/space/space.md index 23043bdffd..3999de3865 100644 --- a/english/dream/fly/space/space.md +++ b/english/dream/fly/space/space.md @@ -22,3 +22,5 @@ Do you: [Remember that you're Batman](../../../I'm-batman/batman.md) [Tell your mother](../../../tell-mother/tell-mother.md) + +[Will he search new automatic devices ?](../../../iot/intro.md) From 0c60b6a1f84ba31027852bbc5e9c9d501177197b Mon Sep 17 00:00:00 2001 From: Drew Sommer Date: Thu, 2 May 2019 16:12:00 -0700 Subject: [PATCH 5363/5486] feat: Add tiger to english story --- english/marshmallow.md | 84 +++++++++++++++++++++--------------------- english/tiger/tiger.md | 1 + 2 files changed, 44 insertions(+), 41 deletions(-) create mode 100644 english/tiger/tiger.md diff --git a/english/marshmallow.md b/english/marshmallow.md index 4159929d14..fff282f78a 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -13,7 +13,7 @@ hi~ NGE is [here](NGE/NGE.md) -[start](mad/mad.md) your journey into world of mad +[start](mad/mad.md) your journey into world of mad or @@ -23,14 +23,14 @@ spend your time [wisely](http://www.pythonchallenge.com/) Are you a: -[cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) +[cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) -or a +or a [dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? -Your adventure begins. You realize there are hundreds of paths for you to choose from. -Which way should you go? Only you can decide. +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. Oh so many decisions - what will you do?? @@ -93,9 +93,9 @@ DOING will definitely keep your sharpened with latest skills (which you can get [Know about the life of this world](00-Life-of-this-world/Life of this world.md) -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) Vist the master [liquid](liquid/liquid.md). @@ -209,23 +209,23 @@ Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. The man is not large but not small, but not average either. -He is reciting poetry in a language you assume to be Egyptian, +He is reciting poetry in a language you assume to be Egyptian, though you are not familiar with Egyptian. You only assume this -because of the small pictograms that seem to rise into the +because of the small pictograms that seem to rise into the air above his head when he speaks. One looks like a small bird. -Another a small insect. A third is for all appearances the +Another a small insect. A third is for all appearances the third car your father ever bought you, a small Fiat 500, which -though in the picture above the man's head is purple, was +though in the picture above the man's head is purple, was in reality more of a mauve. It had a tendency to bark whenever -you drove it over hills, not like the proud great dane from +you drove it over hills, not like the proud great dane from Nova Scotia that most smaller cars tend to imitate when taking -on tasks greater than their strengths, but rather more like +on tasks greater than their strengths, but rather more like the small pomerainian who is now barking at the blue music notes -hovering over the man's large-ish head, now peeing on the +hovering over the man's large-ish head, now peeing on the back of the sofa, making it difficult for you to remember the -name of that dude you totally scored with in the back of your +name of that dude you totally scored with in the back of your Fiat 500. You're finding it difficult to think. You sit down on -the sofa to gather your thoughts. You think of all the men +the sofa to gather your thoughts. You think of all the men you slept with on your hitch hiking journeys across the southern american continent. @@ -308,7 +308,7 @@ I see that you may be from the North. [How's it going?](./north/north.md) "Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" -In a brief moment of clarity, you decide it's time for a change and start to +In a brief moment of clarity, you decide it's time for a change and start to [cycle forwards](./cycling-forwards/cycling-forwards.md). You hear a small bird sound in the distance. @@ -871,14 +871,14 @@ When I code over my weekend, I feel that this becomes my [whole life](code-my-li Suddenly you feel a strong craving for [something.](craving/craving.md) -Despite the little conundrum that you resolved, you realize that it's now -Friday, December 4th. +Despite the little conundrum that you resolved, you realize that it's now +Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" With that new revelation in mind, you quickly make like David Hasselhoff and wiggle your wrist to show off a nice particular watch that even listens -to you when you speak to it. +to you when you speak to it. ["Ahem!"](my-adventure/my-adventure.md) @@ -893,9 +893,9 @@ I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/s "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines +When faced with a lot of work and impending deadlines in the (not so near) future, -there are two options you must choose from. +there are two options you must choose from. You may either do [this](gtd/gtd.md), @@ -907,12 +907,12 @@ You may either do [this](gtd/gtd.md), [Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim [move to Boston](boston/boston.md)." Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you [serve](joshua_24_15/joshua_24_15.md)?" +"Who will you [serve](joshua_24_15/joshua_24_15.md)?" Yourself? @@ -928,7 +928,7 @@ You decide that $1.5 billion is too much to pass up, so you buy a [Powerball tic What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, [survive](divergence/divergence.md) or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? [Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) @@ -968,7 +968,7 @@ The understanding of git [go here](Booyah/booyah.md) [link to google website](kumar/kumar.md) -Do you want to know [Git disadvantage?](git_disadvantage/git_disadvantage.md) +Do you want to know [Git disadvantage?](git_disadvantage/git_disadvantage.md) Hi i got this one for udacity team. @@ -987,7 +987,7 @@ Do you want to build a [snowman?](snowman/snowman.md) It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) -I think I'll try defying gravity. +I think I'll try defying gravity. Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) @@ -1015,7 +1015,7 @@ Explore the unknown. Most people die without ever visiting this [place.](underwa As you attempt this, a voice booms!! -The [boom](day-dream/day-dream.md) +The [boom](day-dream/day-dream.md) Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) @@ -1027,7 +1027,7 @@ You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). -So what to do next? Three doors appear and all other ways out disappear. +So what to do next? Three doors appear and all other ways out disappear. So you pick the [right door](mysterydoor/mysterydoor.md) You put your [cowboy hat](cowboy/cowboy.md) back on your head. @@ -1058,7 +1058,7 @@ A light appears all around you and something comes into focus in the distance. [ Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) -If you have read this far, then you must be in pain. +If you have read this far, then you must be in pain. Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. @@ -1069,7 +1069,7 @@ The lannisters always pays thier debts, says tyrion lannister. Interesting [char Time to [move to Canada](Canada/Canada.md), eh? -You struggle to find a line break to add your own adventure. +You struggle to find a line break to add your own adventure. You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) @@ -1080,7 +1080,7 @@ You're reincarnated as a green starfish but wish you were [blue instead.](starfi [Motivate yourself](Motivate/Motivate.md) -You wake up as Harry Potter ... and are facing Voldemort in a duel? +You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you [do](magicaladventure/decision_time/decision_time.md) My tea's gone cold I'm wondering [why](stan/stan.md) I got out of bed at all... @@ -1114,7 +1114,7 @@ The password is [xyzzy](plugh/plugh.md) [Say "Hi" to Guangwu](Guangwu/Guangwu.md) -Perishing in an avalanche of words, in a mundane collection of sentences called "stories". +Perishing in an avalanche of words, in a mundane collection of sentences called "stories". [Devastated?](devastated_greatness/devastated_greatness.md) Ever the fan of [Doug Adams](doug-adams/doug-adams.md). @@ -1144,7 +1144,7 @@ You realise that the philosphy of life in general boils down to that one central question... will you? or will you not? [So Will you?](philosophy/questions.md) -You recited [cosmological argument](cosmological_argument/cosmological_argument.md) in the morning in hub. +You recited [cosmological argument](cosmological_argument/cosmological_argument.md) in the morning in hub. You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). @@ -1184,7 +1184,7 @@ I am also a soccer fan, I am a Man U fan from EPL. To see Man U click [here](Man Wow, you made it to the end! You are determined, [see](persistent/persistent.md) what awaits. -Wait! This is not the end! OMG [click me](never_ended/never_ended.md) +Wait! This is not the end! OMG [click me](never_ended/never_ended.md) have you already heard the story of the Choking Doberman? [click me](dog_finger/dog_finger.md) @@ -1198,7 +1198,7 @@ Let's finish a small goal, [for example](set_up_a_small_goal/setup_a_small_goal. You decide to teach google to be a [Pictionary](https://quickdraw.withgoogle.com/) champion. -Jason Calacanis is one of the best interviewers I've seen. +Jason Calacanis is one of the best interviewers I've seen. [Here](https://www.youtube.com/channel/UCkkhmBWfS7pILYIk0izkc3A) they are My best girls are Toujou Nozomi, Aragaki Ayase, and Sendouin Kaede. @@ -1210,13 +1210,13 @@ Or maybe you love [pugs](https://www.youtube.com/watch?v=3pPR7vk-e3Y)? Or maybe you're trying to avoid the cold [outside](cold_outside/cold_outside.md) <<<<<<< HEAD -Have you ever heard any unusual sounds -when you're alone? -They're not what you think. +Have you ever heard any unusual sounds +when you're alone? +They're not what you think. Get to know them [here](blackAndwhite/blackAndwhite.md) ======= -Like football or soccer(as many others call it)? Must Watch +Like football or soccer(as many others call it)? Must Watch [The_Greatest_Battle_Ever](https://www.youtube.com/watch?v=KyHDZqp2ThU) Some other guy beat me to it. Too lazy [here](lazy/lazy.md) @@ -1240,4 +1240,6 @@ What is your [passion?](passion/passion.md) - -searching for [good](tvf-play/watch.md) content. \ No newline at end of file +searching for [good](tvf-play/watch.md) content. + +Do you like [tigers](tiger/tiger.md)? diff --git a/english/tiger/tiger.md b/english/tiger/tiger.md new file mode 100644 index 0000000000..e8ee65825e --- /dev/null +++ b/english/tiger/tiger.md @@ -0,0 +1 @@ +There is a tiger in the grass, do you run or [bake cookies](../bake-cookies/cookies.md)? From 8cbe2f9db28abfe13ab101298a54808c1895a7cf Mon Sep 17 00:00:00 2001 From: Drew Sommer Date: Thu, 2 May 2019 16:17:03 -0700 Subject: [PATCH 5364/5486] docs: Update README file with course link --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5c687de2f6..f2b25d6cbf 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ # Collaborative Create-Your-Own-Adventure -This is a create-your-own-adventure story where at each step, the reader chooses -what action to take and turns to an appropriate page of the story based on their -choice. It is collaborative because it is written one small piece at a time by -many authors. To start reading the story, click [here](language.md). +This is an example repo that illustrates the concept of a "Pull Request", created +as part of the Udacity course [How to Use Git and GitHub](https://www.udacity.com/course/how-to-use-git-and-github--ud775). +In the create-your-own-adventure story the reader chooses what action to take and +turns to an appropriate page of the story based on their choice. It is collaborative +because it is written one small piece at a time by many authors. To start reading +the story, click [here](language.md). ## Format of the Story From 1548173ce0095d29d0e440cf3d57caefec86f776 Mon Sep 17 00:00:00 2001 From: samu Date: Thu, 2 May 2019 19:17:45 -0500 Subject: [PATCH 5365/5486] add space travel link to main story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index a4753343f9..c7f60b3d80 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,5 +1,7 @@ Once upon a time many authors collaborated to make meaningless linked story. +[Escape earth and journey through space](space-travel/space-travel.md) + And that story was about [cricket](cricket/if-you-love-cricket/ifyoulovecricket.md) A few learned to [tango](tango/tango.md) From a2ed09534b6052bcf4a6da7d02c26e91ffe18758 Mon Sep 17 00:00:00 2001 From: Carlie Thomas Date: Fri, 3 May 2019 11:25:39 +0100 Subject: [PATCH 5366/5486] Make suggested changes to line length --- english/visit-hagrid/visit-hagrid.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/english/visit-hagrid/visit-hagrid.md b/english/visit-hagrid/visit-hagrid.md index a9efabbb4b..d6f62b204b 100644 --- a/english/visit-hagrid/visit-hagrid.md +++ b/english/visit-hagrid/visit-hagrid.md @@ -8,4 +8,20 @@ Hermione responds by: [Yelling](../yell-at-snape/yell-at-snape.md) -[Punching Snape](../punch-snape/punch-snape.md) \ No newline at end of file +[Punching Snape](../punch-snape/punch-snape.md) + +Snape fails to hide his shock at Herminoe's behaviour, +and assumes she must be pre menstural, because he had heard women +tend to act crazy at certains times of the month. + + +"Snape, what can I do for you?" asks Hagrid cautiously. + + Harry and Ron glance at eachother warily. Hermione slumps down onto the sofa, + breathing heavily. The tension in the air was palpable. + + "I am here to give Harry this..." Snape slurs, thrusting a rolled up + piece of parchment into Harry's chest. + + Harry unfurls the parchment, with Ron peering over his shoulder and + Hagrid looking perplexed, probably because he can't read. \ No newline at end of file From 97b674aca51b06fb6f50878d380335bca3eeb78d Mon Sep 17 00:00:00 2001 From: vanessa Date: Fri, 3 May 2019 17:26:55 +0200 Subject: [PATCH 5367/5486] Add option 'traduire' to ecouter.md --- french/manger/trou/reveille/voix-humaines/mystere.md | 4 +++- .../manger/trou/reveille/voix-humaines/traduire/traduire.md | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 french/manger/trou/reveille/voix-humaines/traduire/traduire.md diff --git a/french/manger/trou/reveille/voix-humaines/mystere.md b/french/manger/trou/reveille/voix-humaines/mystere.md index f88e5ffcdc..341d12f442 100644 --- a/french/manger/trou/reveille/voix-humaines/mystere.md +++ b/french/manger/trou/reveille/voix-humaines/mystere.md @@ -1,4 +1,6 @@ Vous décidez de traquer les voix humaines. Mais d'oú viennent-elles? Vous vous faites discret, et vous rapprochez à pas de loup. -[Vous vous arrêtez pour écouter sans être vu](ecouter/ecouter.md) \ No newline at end of file +[Vous vous arrêtez pour écouter sans être vu](ecouter/ecouter.md) + +[Vous enclenchez l'application de traduction que vous avez dévelopée](traduire/traduire.md) diff --git a/french/manger/trou/reveille/voix-humaines/traduire/traduire.md b/french/manger/trou/reveille/voix-humaines/traduire/traduire.md new file mode 100644 index 0000000000..63353a2976 --- /dev/null +++ b/french/manger/trou/reveille/voix-humaines/traduire/traduire.md @@ -0,0 +1,6 @@ +Vous comprenez qu'il s'agit d'une sorte de tribunal. Deux femmes se disputent la maternité du bébé qui pleure. +- C'est le mien! crie l'une. +- Non, il est à moi ! répond l'autre. + +Une prêtresse interroge à tour de rôle chaque femme, pour parvenir à identifier la vraie mère du bébé. + From 0c0dccb1a5de4640da4511f14d9cb2a1f8a0480a Mon Sep 17 00:00:00 2001 From: FlavioMarcilio Date: Fri, 3 May 2019 13:20:54 -0300 Subject: [PATCH 5368/5486] Add a blank line between links --- portugues/colabora/fork/comdiferencas/diff/pull/pull.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/portugues/colabora/fork/comdiferencas/diff/pull/pull.md b/portugues/colabora/fork/comdiferencas/diff/pull/pull.md index de0c68e5c6..8311785e4c 100644 --- a/portugues/colabora/fork/comdiferencas/diff/pull/pull.md +++ b/portugues/colabora/fork/comdiferencas/diff/pull/pull.md @@ -8,5 +8,6 @@ O pull request não foi aceito pois havia um erro ortográfico em um comentário [Descobre, logo agora que aprendeu o bash, vai ter que retomar os estudos de inglês no duolingo] (descobre/descobrir.md) -Abro o [Google Tradutor](https://translate.google.com.br/) e verifico a tradução do meu comentário. -Não é o que eu queria escrever: [corrijo meu erro e reenvio](reenvio/reenviar.md) \ No newline at end of file +Abro o [Google Tradutor](https://translate.google.com.br/) e verifico a tradução do meu comentário. + +Descubro que não era o que eu queria escrever: [corrijo meu erro e reenvio](reenvio/reenviar.md) \ No newline at end of file From 485a6458153789afb22e2c8f98b4323055f4a3d2 Mon Sep 17 00:00:00 2001 From: Brad Erickson <195061+13rac1@users.noreply.github.com> Date: Fri, 3 May 2019 15:48:06 -0700 Subject: [PATCH 5369/5486] fix: line endings CRLF->LF for all files --- .gitattributes | 3 + .../zagwizdaj/zmarkerem/bazgroly/bazgroly.md | 12 +- .../zagwizdaj/zmarkerem/spodnie/spodnie.md | 6 +- .../zagwizdaj/zmarkerem/zamek/zamek.md | 4 +- Tamil/Thirukural.md | 20 +- catala/correr/correr.md | 16 +- english/Carl/carl-johnson.md | 2 +- .../eat-rainbows/right/hand-wash/hand-wash.md | 2 +- english/eat-rainbows/right/soap/soap.md | 4 +- .../find-a-toilet/door/pushed/pushed.md | 38 +-- english/flight/flight.md | 16 +- english/knock/answer.md | 40 +-- .../run-away/find-parents/find-parents.md | 30 +- .../light-fire/sprinkler/eating-chocolate.md | 46 +-- english/math/math.md | 20 +- english/rickson-armbar/ricksonbyarmbar.md | 4 +- english/sleep/marshmallow.md | 8 +- .../teachings-of-swami-vivekananda/quotes.md | 158 +++++----- .../AccordingToUncleBob.md | 22 +- .../tunnel/continue/tunnel-end/tunnel-end.md | 18 +- .../tunnel-end/turn-left/turn-left.md | 8 +- .../tunnel-end/turn-right/turn-right.md | 8 +- .../dig_down/goright/goright.md | 22 +- french/feu-de-camp.md | 72 ++--- french/panique/frapper-le-mur.md | 20 +- german/Oktoberfest/oktoberfest.md | 14 +- .../teachings-of-swami-vivekananda/quotes.md | 34 +-- language.md | 280 +++++++++--------- portugues/toalha/nave.md | 10 +- .../bluebrush/ask-for-help/ask-for-help.md | 10 +- .../sleep/brushing/bluebrush/panic/panic.md | 2 +- ukrainian/photo/photo.md | 2 +- 32 files changed, 477 insertions(+), 474 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..c9582de2d6 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +* text=auto + +*.md text diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md index 5501ba76db..6a4fd5f015 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/bazgroly/bazgroly.md @@ -1,7 +1,7 @@ -Cała tablica pokryta jest Twoimi bazgrołami i szczerze mowiąc, nie przyniosło to żadnego efektu. Co dalej? - -[Narysuj spodnie](../spodnie/spodnie.md) - -[Narysuj zamek od kurtki](../zamek/zamek.md) - +Cała tablica pokryta jest Twoimi bazgrołami i szczerze mowiąc, nie przyniosło to żadnego efektu. Co dalej? + +[Narysuj spodnie](../spodnie/spodnie.md) + +[Narysuj zamek od kurtki](../zamek/zamek.md) + [Znowu nabazgraj byle co](../bazgroly/bazgroly.md) \ No newline at end of file diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md index 80ea75646a..43d58c5667 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/spodnie/spodnie.md @@ -1,6 +1,6 @@ -Niczym Picasso, zabierasz się do rysowania. Nie wiedzieć czemu, narysował-eś/aś -spodnie Alladyna zrobione z tysiąca złotych cekinów! Co robisz ze spodniami? - +Niczym Picasso, zabierasz się do rysowania. Nie wiedzieć czemu, narysował-eś/aś +spodnie Alladyna zrobione z tysiąca złotych cekinów! Co robisz ze spodniami? + [Spróbuj założyć](zalozyc/zalozyc.md) [Przyjrzyj się spodniom](przyjrzyj/przyjrzyj.md) diff --git a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md index 8d33a4180c..fc06e46104 100644 --- a/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md +++ b/Polish/ubranie/kieszen/gwizdek/zbadajgwizdek/zagwizdaj/zmarkerem/zamek/zamek.md @@ -1,2 +1,2 @@ -Próbujesz narysować zamek błyskawiczny ale absolutnie Ci nie wychodzi. Tak jak -by ktoś lub coś chciało żeby Ci nie udało... +Próbujesz narysować zamek błyskawiczny ale absolutnie Ci nie wychodzi. Tak jak +by ktoś lub coś chciało żeby Ci nie udało... diff --git a/Tamil/Thirukural.md b/Tamil/Thirukural.md index eef5badf9b..9cadd071cc 100644 --- a/Tamil/Thirukural.md +++ b/Tamil/Thirukural.md @@ -1,11 +1,11 @@ -முகநக நட்பது நட்பன்று நெஞ்சத்து அகநக நட்பது நட்பு -Face's smile doesn't shows the friendship, but the heart's rejoice does. - -உடுக்கை இழந்தவன் கைபோல ஆங்கே -இடுக்கண் களைவதாம் நட்பு -Friendship hastens to rescue as fast as hand’s reflex to catch slipping cloth - -தெய்வத்தான் ஆகா தெனினும் முயற்சிதன் -மெய்வருத்தக் கூலி தரும் -Though fate-divine should make your labour vain; +முகநக நட்பது நட்பன்று நெஞ்சத்து அகநக நட்பது நட்பு +Face's smile doesn't shows the friendship, but the heart's rejoice does. + +உடுக்கை இழந்தவன் கைபோல ஆங்கே +இடுக்கண் களைவதாம் நட்பு +Friendship hastens to rescue as fast as hand’s reflex to catch slipping cloth + +தெய்வத்தான் ஆகா தெனினும் முயற்சிதன் +மெய்வருத்தக் கூலி தரும் +Though fate-divine should make your labour vain; Effort its labour's sure reward will gain \ No newline at end of file diff --git a/catala/correr/correr.md b/catala/correr/correr.md index f48c2a1ac7..86b3acda9a 100644 --- a/catala/correr/correr.md +++ b/catala/correr/correr.md @@ -1,9 +1,9 @@ -La ostia que et fots és de campionat! - -Que no saps que les parets no poden ser de núvol de sucre? - -És clar que no, si no les formigues t'entrarien a casa ;-P - -Què fas? - +La ostia que et fots és de campionat! + +Que no saps que les parets no poden ser de núvol de sucre? + +És clar que no, si no les formigues t'entrarien a casa ;-P + +Què fas? + [Et poses a buscar formigues](formigues/formigues.md) \ No newline at end of file diff --git a/english/Carl/carl-johnson.md b/english/Carl/carl-johnson.md index 52e67971c9..e33ab46067 100644 --- a/english/Carl/carl-johnson.md +++ b/english/Carl/carl-johnson.md @@ -1,2 +1,2 @@ -Did CJ died ? It's a mistery just Rockstar will be able to answer. But... +Did CJ died ? It's a mistery just Rockstar will be able to answer. But... Do they even know it ? I bet he's somewhere in San Fierro working in tech. \ No newline at end of file diff --git a/english/eat-rainbows/right/hand-wash/hand-wash.md b/english/eat-rainbows/right/hand-wash/hand-wash.md index 4e763c159a..00184246db 100644 --- a/english/eat-rainbows/right/hand-wash/hand-wash.md +++ b/english/eat-rainbows/right/hand-wash/hand-wash.md @@ -1 +1 @@ -OMG. Your hands started to hurt, but most of the stains were still on your cloth. +OMG. Your hands started to hurt, but most of the stains were still on your cloth. diff --git a/english/eat-rainbows/right/soap/soap.md b/english/eat-rainbows/right/soap/soap.md index 2895496c50..94d560e4c2 100644 --- a/english/eat-rainbows/right/soap/soap.md +++ b/english/eat-rainbows/right/soap/soap.md @@ -1,2 +1,2 @@ -oops! After used the soap, most of the stains have been washed. Only small parts -of stains remained. +oops! After used the soap, most of the stains have been washed. Only small parts +of stains remained. diff --git a/english/eating-walls/find-a-toilet/door/pushed/pushed.md b/english/eating-walls/find-a-toilet/door/pushed/pushed.md index a153882b88..8591e8f56d 100644 --- a/english/eating-walls/find-a-toilet/door/pushed/pushed.md +++ b/english/eating-walls/find-a-toilet/door/pushed/pushed.md @@ -1,20 +1,20 @@ -A tall thin man in jester's motley stands before you. -He sighs and lights a cigarette. - -You look down and realize you have just wet your -britches. - -The man looks at you and riggles his fingers in the air -like he's really spooky. - -"HAH! Skiddish are ya? Well, too late to show you to -the restrooms..." - -You are slightly embarrassed but happy to not be -holding it in anymore. - -The man takes a long drag from his cigarette, -promptly turns you to face the open door, and -shoves you through the door. - +A tall thin man in jester's motley stands before you. +He sighs and lights a cigarette. + +You look down and realize you have just wet your +britches. + +The man looks at you and riggles his fingers in the air +like he's really spooky. + +"HAH! Skiddish are ya? Well, too late to show you to +the restrooms..." + +You are slightly embarrassed but happy to not be +holding it in anymore. + +The man takes a long drag from his cigarette, +promptly turns you to face the open door, and +shoves you through the door. + You wake up in bed having wet yourself. \ No newline at end of file diff --git a/english/flight/flight.md b/english/flight/flight.md index e118ffcc40..af59abada8 100644 --- a/english/flight/flight.md +++ b/english/flight/flight.md @@ -1,8 +1,8 @@ -The chococopter sees you and lowers down near your position. As you get on and look -around you see a gas mask and a fireman suit. - -What do you do? - -Upon further inspection you have discovered a laser. However, you may only carry two items. - -Which will you take? +The chococopter sees you and lowers down near your position. As you get on and look +around you see a gas mask and a fireman suit. + +What do you do? + +Upon further inspection you have discovered a laser. However, you may only carry two items. + +Which will you take? diff --git a/english/knock/answer.md b/english/knock/answer.md index 779af6cd62..7e248ab0b4 100644 --- a/english/knock/answer.md +++ b/english/knock/answer.md @@ -1,20 +1,20 @@ -THUD... THUD... THUD... - -Whatever, or whomever it is, they are certainly insistent. You hold your head high, sniffing... Chocolate. Or is it -fudge? You pat your pockets, in search of... - -And then you see it. A door. Not the quaint six panel door of a cottage, nor the ornate door of a mansion, not even -the plain door of a lavatory in a low-rent flat on the East side, it is just a door. You try to describe it -mentally, try to keep the image in your mind to give it words, to give it shape, to give it substance, but you can't. -It is just a door, without shape or size or... Well, without anything. It just is, and you know that it is without -being able to qualify it in the least. - -THUD... THUD... THUD... - -You jump, not realizing your ear was pressed against it. It felt like... It felt like... It felt like moonlight. -It felt like rain. It felt like the smell of a fresh-cut lawn. It felt like forever. It felt like just a moment ago. -It felt like... It felt like... It felt like nothing, and something, and everything. - -You know this thing! You have seen this thing! When was it? What was it? What was it?! Oh yes... It was... - -THUD... THUD... THUD... +THUD... THUD... THUD... + +Whatever, or whomever it is, they are certainly insistent. You hold your head high, sniffing... Chocolate. Or is it +fudge? You pat your pockets, in search of... + +And then you see it. A door. Not the quaint six panel door of a cottage, nor the ornate door of a mansion, not even +the plain door of a lavatory in a low-rent flat on the East side, it is just a door. You try to describe it +mentally, try to keep the image in your mind to give it words, to give it shape, to give it substance, but you can't. +It is just a door, without shape or size or... Well, without anything. It just is, and you know that it is without +being able to qualify it in the least. + +THUD... THUD... THUD... + +You jump, not realizing your ear was pressed against it. It felt like... It felt like... It felt like moonlight. +It felt like rain. It felt like the smell of a fresh-cut lawn. It felt like forever. It felt like just a moment ago. +It felt like... It felt like... It felt like nothing, and something, and everything. + +You know this thing! You have seen this thing! When was it? What was it? What was it?! Oh yes... It was... + +THUD... THUD... THUD... diff --git a/english/light-fire/run-away/find-parents/find-parents.md b/english/light-fire/run-away/find-parents/find-parents.md index f4456af973..c0f47d3d14 100644 --- a/english/light-fire/run-away/find-parents/find-parents.md +++ b/english/light-fire/run-away/find-parents/find-parents.md @@ -1,15 +1,15 @@ -Noticing that the child is alone, you surmise that it's parents must be nearby. A quick look around -reveals that the parents are nearby, setting out a picnic, and have not noticed their child wandering -off. - -You also notice a big dog is chasing after the child. - -What do you do? - -[Follow the child and the dog, this may be interesting.](../follow/follow.md) - -[Shout "Hey you!" at the child](../shout/child-wave.md)? - -[Shout "Hey you!" at the dog](shout-at-dog/shout-at-dog.md)? - -[Try to remember how this all started](../../../marshmallow.md) +Noticing that the child is alone, you surmise that it's parents must be nearby. A quick look around +reveals that the parents are nearby, setting out a picnic, and have not noticed their child wandering +off. + +You also notice a big dog is chasing after the child. + +What do you do? + +[Follow the child and the dog, this may be interesting.](../follow/follow.md) + +[Shout "Hey you!" at the child](../shout/child-wave.md)? + +[Shout "Hey you!" at the dog](shout-at-dog/shout-at-dog.md)? + +[Try to remember how this all started](../../../marshmallow.md) diff --git a/english/light-fire/sprinkler/eating-chocolate.md b/english/light-fire/sprinkler/eating-chocolate.md index ac9860b911..ddcb71f739 100644 --- a/english/light-fire/sprinkler/eating-chocolate.md +++ b/english/light-fire/sprinkler/eating-chocolate.md @@ -1,23 +1,23 @@ -The chocolate sprinkler extinguishes the burning marshmallow walls. - -You start eating caramelized, chocolate-covered marshmallows. - -As your binge subsides, you slow your gorging and spot a giant graham -cracker leaning in the corner. - -After you're finished eating, you notice the sprinkler flooded the -basement, making a pool of chocolate. Do you: - -[Head to the basement with graham cracker in tow](graham-cracker/graham-cracker.md)? - -[Go back to sleep](../../sleep/more-sleep/more-sleep.md)? - -[Go exploring outside](../../explore-outside/explore-outside.md)? - -[Swim in the chocolate pool](basement-swim/basement-swim.md)? - -[Call Wonka Construction](wonka-construction/wonka-construction.md)? - -[Wait for the chocolate to solidify](solid-chocolate/solid-chocolate.md)? - -[Go to market to buy some fruits to dip in the chocolate](going-to-market/going-to-market.md)? +The chocolate sprinkler extinguishes the burning marshmallow walls. + +You start eating caramelized, chocolate-covered marshmallows. + +As your binge subsides, you slow your gorging and spot a giant graham +cracker leaning in the corner. + +After you're finished eating, you notice the sprinkler flooded the +basement, making a pool of chocolate. Do you: + +[Head to the basement with graham cracker in tow](graham-cracker/graham-cracker.md)? + +[Go back to sleep](../../sleep/more-sleep/more-sleep.md)? + +[Go exploring outside](../../explore-outside/explore-outside.md)? + +[Swim in the chocolate pool](basement-swim/basement-swim.md)? + +[Call Wonka Construction](wonka-construction/wonka-construction.md)? + +[Wait for the chocolate to solidify](solid-chocolate/solid-chocolate.md)? + +[Go to market to buy some fruits to dip in the chocolate](going-to-market/going-to-market.md)? diff --git a/english/math/math.md b/english/math/math.md index 962ac9da2a..c65213a7ba 100644 --- a/english/math/math.md +++ b/english/math/math.md @@ -1,11 +1,11 @@ -I'm thinking of an order of infinity between 12 and infinity. - -What order of infinity am I thinking of? - --Georg Cantor - -Do you: - -[Call your mother.](../tell-mother/tell-mother.md) - +I'm thinking of an order of infinity between 12 and infinity. + +What order of infinity am I thinking of? + +-Georg Cantor + +Do you: + +[Call your mother.](../tell-mother/tell-mother.md) + [Wiki it.](../wikipedia/wiki.md) \ No newline at end of file diff --git a/english/rickson-armbar/ricksonbyarmbar.md b/english/rickson-armbar/ricksonbyarmbar.md index c4af2088ec..8981c9464c 100644 --- a/english/rickson-armbar/ricksonbyarmbar.md +++ b/english/rickson-armbar/ricksonbyarmbar.md @@ -1,3 +1,3 @@ -You just got armbarred. - +You just got armbarred. + Oh well, it's just a joint dislocation. You will survive. \ No newline at end of file diff --git a/english/sleep/marshmallow.md b/english/sleep/marshmallow.md index 691b63b493..d43aa5181f 100644 --- a/english/sleep/marshmallow.md +++ b/english/sleep/marshmallow.md @@ -1,9 +1,9 @@ When you wake up, you're still in the strange room with marshmallows for walls. The walls smell really good, but are they tasty? - -It would be nice to find out, but not all by themselves. -You need something to go with them. -Maybe some chocolate. + +It would be nice to find out, but not all by themselves. +You need something to go with them. +Maybe some chocolate. You wish there were some chocolate furniture too. diff --git a/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md b/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md index eb3f5f29ef..47097c73d5 100644 --- a/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md +++ b/english/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md @@ -1,79 +1,79 @@ -Shri Swami Vivekananda says: - - -1. Education is not the amount of information that we put into your - -brain and runs riot there, undigested, all your life. - -We must have life building, man making, character making assimilation of ideas. - -If you have assimilated five ideas and made them your life and character - -you have more education than any man who has got by heart a whole library.. - - - - -2. Bear in mind, my children, that only cowards and those who are weak commit sin and tell lies. - -The brave are always moral. - -Try to be moral, try to be brave, try to be sympathising. - - - - -3. Have faith that you are all, my brave lads, born to do great things! -Let not the barks of puppies frighten you -- no, -not even the thunderbolts of heaven -- but stand up and work! - - - - -4. Know that every time you feel weak, you not only hurt yourself but also the Cause. - Infinite faith and strength are the only conditions of success. - - - - -5. Who is Helping You, Don’t Forget them. - Who is Loving you, Don’t Hate them . - Who is Believing you, Don’t Cheat them. - -6. Anything that makes you weak physically, intellectually - and spiritually,reject as poison. - -7. Talk to yourself at least once in a Day, Otherwise you may, - miss a meeting with an EXCELLENT person in this World. - -8. Relationships are more important than life, - but it is important for those relationships to have life in them. - - -9. You have to grow from the inside out. - None can teach you, none can make you spiritual. - There is no other teacher but your own soul. - -10. Like me or Hate me,both are in my favor, - If you like me I am in your Heart, - If you hate me I am in your mind. - -11. BY the study of different religions we find that in essence they are one. - -12. Where can we go to find God if we cannot see Him. - In our own hearts and in every living being. - - -13. Fill the brain with high thoughts, highest ideals place them - day and night before you and out of that will come great work. - -14. Where can we go to find God if we cannot see Him , - In our own hearts and in every living being. - - - -[Read More](http://www.awakeningindia.org/life/Teachings.aspx) - -[Read More](http://rishikajain.com/2014/01/11/top-ten-famous-quotes-of-swami-vivekananda/) - -[OK, this was interesting, but something's weird about this place... is that marshmallow?](../../marshmallow.md) +Shri Swami Vivekananda says: + + +1. Education is not the amount of information that we put into your + +brain and runs riot there, undigested, all your life. + +We must have life building, man making, character making assimilation of ideas. + +If you have assimilated five ideas and made them your life and character + +you have more education than any man who has got by heart a whole library.. + + + + +2. Bear in mind, my children, that only cowards and those who are weak commit sin and tell lies. + +The brave are always moral. + +Try to be moral, try to be brave, try to be sympathising. + + + + +3. Have faith that you are all, my brave lads, born to do great things! +Let not the barks of puppies frighten you -- no, +not even the thunderbolts of heaven -- but stand up and work! + + + + +4. Know that every time you feel weak, you not only hurt yourself but also the Cause. + Infinite faith and strength are the only conditions of success. + + + + +5. Who is Helping You, Don’t Forget them. + Who is Loving you, Don’t Hate them . + Who is Believing you, Don’t Cheat them. + +6. Anything that makes you weak physically, intellectually + and spiritually,reject as poison. + +7. Talk to yourself at least once in a Day, Otherwise you may, + miss a meeting with an EXCELLENT person in this World. + +8. Relationships are more important than life, + but it is important for those relationships to have life in them. + + +9. You have to grow from the inside out. + None can teach you, none can make you spiritual. + There is no other teacher but your own soul. + +10. Like me or Hate me,both are in my favor, + If you like me I am in your Heart, + If you hate me I am in your mind. + +11. BY the study of different religions we find that in essence they are one. + +12. Where can we go to find God if we cannot see Him. + In our own hearts and in every living being. + + +13. Fill the brain with high thoughts, highest ideals place them + day and night before you and out of that will come great work. + +14. Where can we go to find God if we cannot see Him , + In our own hearts and in every living being. + + + +[Read More](http://www.awakeningindia.org/life/Teachings.aspx) + +[Read More](http://rishikajain.com/2014/01/11/top-ten-famous-quotes-of-swami-vivekananda/) + +[OK, this was interesting, but something's weird about this place... is that marshmallow?](../../marshmallow.md) diff --git a/english/test-driven-development-rules/AccordingToUncleBob.md b/english/test-driven-development-rules/AccordingToUncleBob.md index 44ed57ddfd..14317fc4f0 100644 --- a/english/test-driven-development-rules/AccordingToUncleBob.md +++ b/english/test-driven-development-rules/AccordingToUncleBob.md @@ -1,11 +1,11 @@ -Test Driven Development in terms of three simple rules. They are: - - -1) You are not allowed to write any production code -unless it is to make a failing unit test pass. - -2) You are not allowed to write any more of a unit test -than is sufficient to fail; and compilation failures are failures. - -3) You are not allowed to write any more production code -than is sufficient to pass the one failing unit test. +Test Driven Development in terms of three simple rules. They are: + + +1) You are not allowed to write any production code +unless it is to make a failing unit test pass. + +2) You are not allowed to write any more of a unit test +than is sufficient to fail; and compilation failures are failures. + +3) You are not allowed to write any more production code +than is sufficient to pass the one failing unit test. diff --git a/english/tunnel/continue/tunnel-end/tunnel-end.md b/english/tunnel/continue/tunnel-end/tunnel-end.md index bf2af93275..6ce0112d2a 100644 --- a/english/tunnel/continue/tunnel-end/tunnel-end.md +++ b/english/tunnel/continue/tunnel-end/tunnel-end.md @@ -1,9 +1,9 @@ -As you run towards the soft glow you come to the tunnel's end. -You see before you train tracks and a softly glowing light on the wall facing you. -The train tracks extend to your left and right. - -Which way should you go? - -[Left](turn-left/turn-left.md) - -[Right](turn-right/turn-right.md) +As you run towards the soft glow you come to the tunnel's end. +You see before you train tracks and a softly glowing light on the wall facing you. +The train tracks extend to your left and right. + +Which way should you go? + +[Left](turn-left/turn-left.md) + +[Right](turn-right/turn-right.md) diff --git a/english/tunnel/continue/tunnel-end/turn-left/turn-left.md b/english/tunnel/continue/tunnel-end/turn-left/turn-left.md index ce2c75b264..08e3b5f176 100644 --- a/english/tunnel/continue/tunnel-end/turn-left/turn-left.md +++ b/english/tunnel/continue/tunnel-end/turn-left/turn-left.md @@ -1,4 +1,4 @@ -You turn left and follow the tracks. -After some time, you come across an empty subway station. -The only light comes from the sparsely placed lights in the tunnel with the -tracks. +You turn left and follow the tracks. +After some time, you come across an empty subway station. +The only light comes from the sparsely placed lights in the tunnel with the +tracks. diff --git a/english/tunnel/continue/tunnel-end/turn-right/turn-right.md b/english/tunnel/continue/tunnel-end/turn-right/turn-right.md index 8bd6317344..12995c22d2 100644 --- a/english/tunnel/continue/tunnel-end/turn-right/turn-right.md +++ b/english/tunnel/continue/tunnel-end/turn-right/turn-right.md @@ -1,4 +1,4 @@ -You turn right and follow the tracks. -The soft light ebbs and grows, as you walk past the infreaquent lights placed -on the walls around you. -You keep walking, with no apparent end to this tunnel in sight. +You turn right and follow the tracks. +The soft light ebbs and grows, as you walk past the infreaquent lights placed +on the walls around you. +You keep walking, with no apparent end to this tunnel in sight. diff --git a/english/you-are-in-minecraft/dig_down/goright/goright.md b/english/you-are-in-minecraft/dig_down/goright/goright.md index b303010068..89aebdd084 100644 --- a/english/you-are-in-minecraft/dig_down/goright/goright.md +++ b/english/you-are-in-minecraft/dig_down/goright/goright.md @@ -1,12 +1,12 @@ -You enter a dimly lit chamber and see a tall dark figure. The enderman -immediately teleports over to you, smiling, and... - -He kills you. - -Game over! - -Score: &e0 - -You cannot respawn in hardcore mode! - +You enter a dimly lit chamber and see a tall dark figure. The enderman +immediately teleports over to you, smiling, and... + +He kills you. + +Game over! + +Score: &e0 + +You cannot respawn in hardcore mode! + Delete World \ No newline at end of file diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index a397a0ac5b..8d92330d1e 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -1,39 +1,39 @@ -Par un beau matin, vous vous réveillez dans une pièce étrange aux murs en pain d'épice. - -On aurait pû faire que les murs soient fait en pâte de guimave, mais ce sont des murs français. ;) - -Que faites-vous ? - -[J'appel au secours](appel-au-secours/appeler-au-secours.md) - -[Je me rendors](dormir/reve-etrange.md) - -[Je cherche une sortie](sortie/chercher-la-sortie.md) - -[Je panique](panique/frapper-le-mur.md) - -[Je mange](manger/faim.md) - -[Je me faufile dans un trou](manger/trou/trou.md) - -[J'appelle mon prof de musique](telephone/prof_musique.md) - -[J'appelle mon prof de maths](riddle/prof_maths.md) - -[Je dessine une porte avec un syphon de crème chantilly qui traine](dessine/porte.md) - -[Je ne parle pas francais](../english/marshmallow.md) - -[Je parle un peu arabe](../arabic/salamoAlikom.md) - -[J'appelle ma mère immédiatement](appel-maman/appeler-maman.md) - -[Je demande de l'aide a Google](google/google.md) - -[J'appelle le genie](appelle-genie/appelle-genie.md) - -[Je me lève et me dirige vers la sortie](sortie/pousser-porte/pousser-porte.md) - +Par un beau matin, vous vous réveillez dans une pièce étrange aux murs en pain d'épice. + +On aurait pû faire que les murs soient fait en pâte de guimave, mais ce sont des murs français. ;) + +Que faites-vous ? + +[J'appel au secours](appel-au-secours/appeler-au-secours.md) + +[Je me rendors](dormir/reve-etrange.md) + +[Je cherche une sortie](sortie/chercher-la-sortie.md) + +[Je panique](panique/frapper-le-mur.md) + +[Je mange](manger/faim.md) + +[Je me faufile dans un trou](manger/trou/trou.md) + +[J'appelle mon prof de musique](telephone/prof_musique.md) + +[J'appelle mon prof de maths](riddle/prof_maths.md) + +[Je dessine une porte avec un syphon de crème chantilly qui traine](dessine/porte.md) + +[Je ne parle pas francais](../english/marshmallow.md) + +[Je parle un peu arabe](../arabic/salamoAlikom.md) + +[J'appelle ma mère immédiatement](appel-maman/appeler-maman.md) + +[Je demande de l'aide a Google](google/google.md) + +[J'appelle le genie](appelle-genie/appelle-genie.md) + +[Je me lève et me dirige vers la sortie](sortie/pousser-porte/pousser-porte.md) + [Je ne fais rien](rien/rien.md) [Je commande du foie gras](foie-gras/foie-gras.md) diff --git a/french/panique/frapper-le-mur.md b/french/panique/frapper-le-mur.md index 7db7ec0fa7..f6ebf2022e 100644 --- a/french/panique/frapper-le-mur.md +++ b/french/panique/frapper-le-mur.md @@ -1,11 +1,11 @@ -Alors que vous laissez la panique s'emparer de vous, vous commencez à courir dans tous les sens. - -Finalement, emporté par votre élan, vous finissez par frapper un mur et vous vous écroulez à terre. Bien joué ! - -Maintenat que vous etes dehors, quoi faire? - -[Je sens des fleurs](sentir/fleurs.md) - -[Je reste là, on est bien là](./frapper-le-mur.md) - +Alors que vous laissez la panique s'emparer de vous, vous commencez à courir dans tous les sens. + +Finalement, emporté par votre élan, vous finissez par frapper un mur et vous vous écroulez à terre. Bien joué ! + +Maintenat que vous etes dehors, quoi faire? + +[Je sens des fleurs](sentir/fleurs.md) + +[Je reste là, on est bien là](./frapper-le-mur.md) + [Il fait froid. Je rentre](../feu-de-camp.md) \ No newline at end of file diff --git a/german/Oktoberfest/oktoberfest.md b/german/Oktoberfest/oktoberfest.md index 267489115e..66d0ef0cec 100644 --- a/german/Oktoberfest/oktoberfest.md +++ b/german/Oktoberfest/oktoberfest.md @@ -1,7 +1,7 @@ - -Sie besuchen die Wiesn. Sie sehen ein schnes Mdchen in einem hellgrnen Dirndl. -Sie ist blond und hat lange geflochtene Haare. Als Sie sie anblickten, merkt sie das und lchelt zurck. - -[Laden Sie sie zum etwas zu trinken ein](../Einladen/einladen.md) - -[Fragen Sie sie "Wie spaet ist es?"](../Fragen/fragen.md) + +Sie besuchen die Wiesn. Sie sehen ein schnes Mdchen in einem hellgrnen Dirndl. +Sie ist blond und hat lange geflochtene Haare. Als Sie sie anblickten, merkt sie das und lchelt zurck. + +[Laden Sie sie zum etwas zu trinken ein](../Einladen/einladen.md) + +[Fragen Sie sie "Wie spaet ist es?"](../Fragen/fragen.md) diff --git a/hindi/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md b/hindi/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md index 738690e689..df91b6cb78 100644 --- a/hindi/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md +++ b/hindi/swami-vivekananda/teachings-of-swami-vivekananda/quotes.md @@ -1,18 +1,18 @@ -श्री स्वामी विवेकानंद जी कहते थे : - - -1. एक अच्छे चरित्र का निर्माण हज़ारों बार ठोकर खाने के बाद ही होता है। - - -2. पहले स्वयं संपूर्ण मुक्तावस्था प्राप्त कर लो, उसके बाद इच्छा करने पर फिर अपने को सीमाबद्ध कर सकते हो। - - प्रत्येक कार्य में अपनी समस्त शक्ति का प्रयोग करो। - - -3. ज्ञान स्वयमेव वर्तमान है, मनुष्य केवल उसका आविष्कार करता है। - - -4. उठो, जागो और तब तक रुको नही जब तक मंजिल प्राप्त न हो जाये । - - +श्री स्वामी विवेकानंद जी कहते थे : + + +1. एक अच्छे चरित्र का निर्माण हज़ारों बार ठोकर खाने के बाद ही होता है। + + +2. पहले स्वयं संपूर्ण मुक्तावस्था प्राप्त कर लो, उसके बाद इच्छा करने पर फिर अपने को सीमाबद्ध कर सकते हो। + + प्रत्येक कार्य में अपनी समस्त शक्ति का प्रयोग करो। + + +3. ज्ञान स्वयमेव वर्तमान है, मनुष्य केवल उसका आविष्कार करता है। + + +4. उठो, जागो और तब तक रुको नही जब तक मंजिल प्राप्त न हो जाये । + + [और देखिये](http://www.hindisahityadarpan.in/2011/11/great-quotations-by-swami-vivekananda.html) \ No newline at end of file diff --git a/language.md b/language.md index 955ed400c9..c416057ee3 100644 --- a/language.md +++ b/language.md @@ -1,142 +1,142 @@ -If you speak English, [go here](english/marshmallow.md). - -Jei kalbi lietuviškai [spausk čia](lithuanian/startas.md) - -Nhar mai sai to, [nsit mai wefo](maibrat/tinyi.md) - -If you speak Telugu, మీరు తెలుగులొ మాట్లాడుతార [ఇక్కడ నొక్కండి](telugu/telangana-telugu/Telanganatelugu.md). - -If you understand Tamil, for Thirukural in Education [இங்கே அழுத்தவும்](Tamil/Thirukkural_Learning/Learning.md) - -If you understand Tamil, தமிழ் வணக்கம் [இங்கே அழுத்தவும்](Tamil/Thirukural.md) - -தமிழ் வணக்கம்! To view Tamil Proverb about Friendship [Click Here](Tamil/Thirukural.md) - -தமிழ் வணக்கம்!To view ponmozhigal [Click Here](Tamil/Vivekanandha/ponmozhigal.md) - -If you speak Punjabi, [go here](punjabi/punjabi.md). - -यिद तपाई नेपाली बोलनुहुनछ भने, [यहाँ िथचनुहोस ।](nepali/about_nepal.md) - -If you speak the language of love, [kiss here](love/love.md) - -如果你说中文，[点击这里](Chinese/大话西游.md). - -如果你说中文而且想要了解一个新的世界，[请点击这里](Chinese/DesertHell/NewWorld.md). - -Si hablas español, pasa [por aquí](espanol/canudos.md). - -اذا كنت تتحدث العربية، [اضغط هنا](arabic/salamoAlikom.md) - -Se parli italiano, [seguimi](Italian/caramelle.md). - -Türkçe konuşuyorsanız, [buraya](turkce/hatmisekeri.md). - -한국어를 사용하신다면, [여기를 클릭](korean/marshmallow.md). - -Si parles Català, fes [clic aquí](catala/catala.md). - -Daca vorbesti romana, [da click aici](romanian/nalba.md). - -Ifyay ouyay eakspay Igpay Atinlay, [ogay erehay](pig-latin/arshmallowmay.md). - -Si vous parlez français, [suivez-moi](french/feu-de-camp.md) - -Ha beszélsz magyarul, [kövess](hungarian/malyvacukor.md) - -Если вы говорите по-русски, то вам [сюда](russian/zefir.md) - -Калі вы размаўляеце па-беларуску, вам [сюды] (belarussian/zefir.md) - -Pokud mluvíš česky, [pokračuj zde](czech/marsmelouny.md). - -Toegang tot de [nederlandse versie](dutch/welkom.md). - -Jeśli mówisz po polsku, [kliknij tutaj](Polish/ptasieMleczko.md). - -Se você fala português, [entre aqui](portugues/colaborando.md) - -Se fala Português_PT, [clique aqui](portugues_pt/colaborar.md). - -Ако говорите български, кликнете [тук](bulgarian/burning_room.md). - -日本語を使う人は、[ここ](japanese/chasitsu.md)に行ってください。 - -Jos puhut suomea, jatka [tänne](finnish/sauna.md) - -Rägite eesti keeles, vajutage [siia](estonian/raamat.md). - -Якщо ви говорите українською, перейдіть за [посиланням](ukrainian/marshmallow.md). - -Falls Sie Deutsch sprechen, beginnen Sie [hier](german/ruderboot.md). - -Euskalduna bazara, joan [hona](basque/gaztelua.md). - -เรียนเชิญเข้าภาษาไทย Welcome to [Thailand](Thai/Songs/ThaiSong_FanJa.md) - -And if you like [Thai food](Thai/Cuisine/TomYumKung.md) - -Maligayang Bati! [Philippines](Philippines/salamat.md) - -אם אתה מדבר עברית, [לחץ כאן](hebrew/marshmallow.md). - -Εάν μιλάτε ελληνικά, συνεχίστε [εδώ](greek/marshmallow.md) - -Ja runā latviski, [dodies šeit](./latvian/zefirs.md). - -Hvis du taler dansk, [tryk her](danish/velkommen.md) - -Ifall du pratar svenska, [tryck här](swedish/start.md) - -Hvis du snakker norsk, [trykk her](norwegian/start.md) - -Ako govoris hrvatski, [klikni ovdje](croatian/sljez.md) - -Ak hovoríš po slovensky, [klikni sem](slovak/marsmelaci.md) - -اگر به زبان فارسی صحبت می‌کنید، [به اینجا بروید](persian/otagheh-basteh.md) - -आप हिंदी बोलते हैं ?,[go here](hindi/bollywood.md) - -ನೀವು ಕೆಚ್ಚೆದೆಯ ಕನ್ನಡಿಗರಾದರೆ, [ಇಲ್ಲಿ ಒತ್ತಿ](kannada/soochike.md). - -Če govoriš slovensko, [klikni sem](slovenian/začetek.md). - -తెలుగులో రాయుటకు [ఇక్కడ](telugu/telugu.md) నొక్కండి.:-) - -ಕುಡ್ಲದ ಜನ [ಇಡೆ ಒತ್ತುಲ](tulu/tulu.md)ೆ. - -Кыргызча сүйлөсөңөр, [бул жака.](kyrgyz/makal-lakaptar.md) - -Se falas galego, [achégate](galician/lua.md). - -click vaj tlhIngan Hol Dajatlh'a' [naDev click](klingon/start.md) - -तुम्हाला मराठी भाषा येत असेल तर इथे जा: [संकेथ्स्थळ ](Marathi/marathi.md) - -Po flisni shqip, [shkoni ketu](albanian/hyrje.md) - -നിങ്ങളുടെ ഭാഷ മലയാളം ആണെങ്കിൽ, -[ഇവിടെ ക്ലിക്ക് ചെയ്യുക](Malayalam/malayalam.md) - -[ئەگەر کوردی ئەزانیت کلیک بکە](kurdish/kurdi.md) - -Ako govorite srpski [klikni ovde](serbian/start.md) - -If you speak Urdu [click here](urdu/urdu-news.md) - -Ako govorite Bosanski jezik/If You speak Bosnian language [kliknite ovdje/click here](Bosnian/Bosnian_story.md) - -Nếu bạn nói tiếng Việt, [nhấn vào link này](vietnamese/kechuyen.md). - -Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). - -ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) - -Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) - -As jy Afrikaans kan praat, gaan [hier](afrikaans/kos.md) - +If you speak English, [go here](english/marshmallow.md). + +Jei kalbi lietuviškai [spausk čia](lithuanian/startas.md) + +Nhar mai sai to, [nsit mai wefo](maibrat/tinyi.md) + +If you speak Telugu, మీరు తెలుగులొ మాట్లాడుతార [ఇక్కడ నొక్కండి](telugu/telangana-telugu/Telanganatelugu.md). + +If you understand Tamil, for Thirukural in Education [இங்கே அழுத்தவும்](Tamil/Thirukkural_Learning/Learning.md) + +If you understand Tamil, தமிழ் வணக்கம் [இங்கே அழுத்தவும்](Tamil/Thirukural.md) + +தமிழ் வணக்கம்! To view Tamil Proverb about Friendship [Click Here](Tamil/Thirukural.md) + +தமிழ் வணக்கம்!To view ponmozhigal [Click Here](Tamil/Vivekanandha/ponmozhigal.md) + +If you speak Punjabi, [go here](punjabi/punjabi.md). + +यिद तपाई नेपाली बोलनुहुनछ भने, [यहाँ िथचनुहोस ।](nepali/about_nepal.md) + +If you speak the language of love, [kiss here](love/love.md) + +如果你说中文，[点击这里](Chinese/大话西游.md). + +如果你说中文而且想要了解一个新的世界，[请点击这里](Chinese/DesertHell/NewWorld.md). + +Si hablas español, pasa [por aquí](espanol/canudos.md). + +اذا كنت تتحدث العربية، [اضغط هنا](arabic/salamoAlikom.md) + +Se parli italiano, [seguimi](Italian/caramelle.md). + +Türkçe konuşuyorsanız, [buraya](turkce/hatmisekeri.md). + +한국어를 사용하신다면, [여기를 클릭](korean/marshmallow.md). + +Si parles Català, fes [clic aquí](catala/catala.md). + +Daca vorbesti romana, [da click aici](romanian/nalba.md). + +Ifyay ouyay eakspay Igpay Atinlay, [ogay erehay](pig-latin/arshmallowmay.md). + +Si vous parlez français, [suivez-moi](french/feu-de-camp.md) + +Ha beszélsz magyarul, [kövess](hungarian/malyvacukor.md) + +Если вы говорите по-русски, то вам [сюда](russian/zefir.md) + +Калі вы размаўляеце па-беларуску, вам [сюды] (belarussian/zefir.md) + +Pokud mluvíš česky, [pokračuj zde](czech/marsmelouny.md). + +Toegang tot de [nederlandse versie](dutch/welkom.md). + +Jeśli mówisz po polsku, [kliknij tutaj](Polish/ptasieMleczko.md). + +Se você fala português, [entre aqui](portugues/colaborando.md) + +Se fala Português_PT, [clique aqui](portugues_pt/colaborar.md). + +Ако говорите български, кликнете [тук](bulgarian/burning_room.md). + +日本語を使う人は、[ここ](japanese/chasitsu.md)に行ってください。 + +Jos puhut suomea, jatka [tänne](finnish/sauna.md) + +Rägite eesti keeles, vajutage [siia](estonian/raamat.md). + +Якщо ви говорите українською, перейдіть за [посиланням](ukrainian/marshmallow.md). + +Falls Sie Deutsch sprechen, beginnen Sie [hier](german/ruderboot.md). + +Euskalduna bazara, joan [hona](basque/gaztelua.md). + +เรียนเชิญเข้าภาษาไทย Welcome to [Thailand](Thai/Songs/ThaiSong_FanJa.md) + +And if you like [Thai food](Thai/Cuisine/TomYumKung.md) + +Maligayang Bati! [Philippines](Philippines/salamat.md) + +אם אתה מדבר עברית, [לחץ כאן](hebrew/marshmallow.md). + +Εάν μιλάτε ελληνικά, συνεχίστε [εδώ](greek/marshmallow.md) + +Ja runā latviski, [dodies šeit](./latvian/zefirs.md). + +Hvis du taler dansk, [tryk her](danish/velkommen.md) + +Ifall du pratar svenska, [tryck här](swedish/start.md) + +Hvis du snakker norsk, [trykk her](norwegian/start.md) + +Ako govoris hrvatski, [klikni ovdje](croatian/sljez.md) + +Ak hovoríš po slovensky, [klikni sem](slovak/marsmelaci.md) + +اگر به زبان فارسی صحبت می‌کنید، [به اینجا بروید](persian/otagheh-basteh.md) + +आप हिंदी बोलते हैं ?,[go here](hindi/bollywood.md) + +ನೀವು ಕೆಚ್ಚೆದೆಯ ಕನ್ನಡಿಗರಾದರೆ, [ಇಲ್ಲಿ ಒತ್ತಿ](kannada/soochike.md). + +Če govoriš slovensko, [klikni sem](slovenian/začetek.md). + +తెలుగులో రాయుటకు [ఇక్కడ](telugu/telugu.md) నొక్కండి.:-) + +ಕುಡ್ಲದ ಜನ [ಇಡೆ ಒತ್ತುಲ](tulu/tulu.md)ೆ. + +Кыргызча сүйлөсөңөр, [бул жака.](kyrgyz/makal-lakaptar.md) + +Se falas galego, [achégate](galician/lua.md). + +click vaj tlhIngan Hol Dajatlh'a' [naDev click](klingon/start.md) + +तुम्हाला मराठी भाषा येत असेल तर इथे जा: [संकेथ्स्थळ ](Marathi/marathi.md) + +Po flisni shqip, [shkoni ketu](albanian/hyrje.md) + +നിങ്ങളുടെ ഭാഷ മലയാളം ആണെങ്കിൽ, +[ഇവിടെ ക്ലിക്ക് ചെയ്യുക](Malayalam/malayalam.md) + +[ئەگەر کوردی ئەزانیت کلیک بکە](kurdish/kurdi.md) + +Ako govorite srpski [klikni ovde](serbian/start.md) + +If you speak Urdu [click here](urdu/urdu-news.md) + +Ako govorite Bosanski jezik/If You speak Bosnian language [kliknite ovdje/click here](Bosnian/Bosnian_story.md) + +Nếu bạn nói tiếng Việt, [nhấn vào link này](vietnamese/kechuyen.md). + +Se vi parolas esperanton, alklaki [tie] (esperanto/komenci.md). + +ئەگەر ئۇيغۇرچە سۆزلىسىڭىز، [بۇ يەرگە كىرىڭ](uyghurish/uyghurish-story.md) + +Na kama lugha yako ni Swahili, [click hapa](swahili/swahili.md) + +As jy Afrikaans kan praat, gaan [hier](afrikaans/kos.md) + ======= Kama unazungumza kiswahili [ingia hapa](swahili/marshmallow.md) @@ -149,7 +149,7 @@ If you want to know more about IoT, click [here](english/iot/intro.md). If GibberisHkjsbckjsjcn,[hereeekdcskj](Gibberish/Gibberish.md) તમે ગુજરાતી છો તો [અહી](Gujarati/અમે ગુજરાતી લોકો છીએ/અમે ગુજરાતી લોકો છીએ.md) જાઓ - + To explore the বাংলা (bangla/bengali) search engine, news portals, and blogs [click here](bangla/bangla-portals.md). If you speak oriya, click [here](oriya/oriya.md). diff --git a/portugues/toalha/nave.md b/portugues/toalha/nave.md index c20138cb23..979d441bc3 100644 --- a/portugues/toalha/nave.md +++ b/portugues/toalha/nave.md @@ -1,5 +1,5 @@ -Ao entrar no banheiro, você vê gigantescas coisas amarelas no céu. O que você faz? - -[Ignora e limpa o celular com a tolha.](limpar/limpar.md) - -[Tenta pegar uma carona numa dessas coisas amarelas.](carona/carona.md) +Ao entrar no banheiro, você vê gigantescas coisas amarelas no céu. O que você faz? + +[Ignora e limpa o celular com a tolha.](limpar/limpar.md) + +[Tenta pegar uma carona numa dessas coisas amarelas.](carona/carona.md) diff --git a/russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md b/russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md index c8d7359cb3..f1afb7c639 100644 --- a/russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md +++ b/russian/sleep/brushing/bluebrush/ask-for-help/ask-for-help.md @@ -1,5 +1,5 @@ -Вы начинаете звать на помощь и слышите, что кто-то бежит к вам на помощь. Кто это? - -[Дед Пихто] (Ded/ded.md) - -[Конь в пальто] (Kon/kon.md) +Вы начинаете звать на помощь и слышите, что кто-то бежит к вам на помощь. Кто это? + +[Дед Пихто] (Ded/ded.md) + +[Конь в пальто] (Kon/kon.md) diff --git a/russian/sleep/brushing/bluebrush/panic/panic.md b/russian/sleep/brushing/bluebrush/panic/panic.md index de5007e1c7..d2a96ad704 100644 --- a/russian/sleep/brushing/bluebrush/panic/panic.md +++ b/russian/sleep/brushing/bluebrush/panic/panic.md @@ -1 +1 @@ -Вы начинаете паниковать и громко кричите и вдруг все исчезает и вы опять просыпаетесь. Что будете делать дальше? +Вы начинаете паниковать и громко кричите и вдруг все исчезает и вы опять просыпаетесь. Что будете делать дальше? diff --git a/ukrainian/photo/photo.md b/ukrainian/photo/photo.md index 27cc45c7a5..3d627c3302 100644 --- a/ukrainian/photo/photo.md +++ b/ukrainian/photo/photo.md @@ -1,2 +1,2 @@ -Декілька хвилин лагів і [вуаля!](../marshmallow.md). +Декілька хвилин лагів і [вуаля!](../marshmallow.md). Телефон, замість сфотографувати стіну з зефіру, зробив моє селфі з вилкою в роті та завис. \ No newline at end of file From 07960b30a6954fd22bdb4377ece51e6a2f664f9c Mon Sep 17 00:00:00 2001 From: Alejandro Rodarte Date: Fri, 3 May 2019 22:33:06 -0600 Subject: [PATCH 5370/5486] Add my story to espanol/canudos.md; Add extra story to espanol/dio/dio.md --- espanol/canudos.md | 4 +++- espanol/dio/dio.md | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 espanol/dio/dio.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 442891c026..256851e058 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -193,4 +193,6 @@ Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/ [El ejército invasor avanza](ejercito-invasor/ejercito-invasor.md) -[Y de repente, sintió la necesidad de que la historia llegase a su fin](fin/fin.md) \ No newline at end of file +[Y de repente, sintió la necesidad de que la historia llegase a su fin](fin/fin.md) + +[Activo su Stand ZA WARUDO](dio/dio.md) \ No newline at end of file diff --git a/espanol/dio/dio.md b/espanol/dio/dio.md new file mode 100644 index 0000000000..650759df1b --- /dev/null +++ b/espanol/dio/dio.md @@ -0,0 +1,3 @@ +Gracias al glorioso STANDO POWAH detuvo el tiempo exclamando: ZA WARUDO, TOKI WO TOMARE! +El ejercito fue derrotado sin que ellos mismos se dieran cuenta, igual que a mi MILF lover, Kakyoin, recibiendo un glorioso MUDAMUDAMUDAMUDAMUDA +Todo concluyo cuando las palabras KYUU BIO KEIKA \ No newline at end of file From f566afce6c812b8453c6c7231eb5802f9a71ad6e Mon Sep 17 00:00:00 2001 From: Alejandro Rodarte Date: Fri, 3 May 2019 22:37:43 -0600 Subject: [PATCH 5371/5486] Repare new lines that made the story messy --- espanol/dio/dio.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/dio/dio.md b/espanol/dio/dio.md index 650759df1b..abacb1b2e2 100644 --- a/espanol/dio/dio.md +++ b/espanol/dio/dio.md @@ -1,3 +1,5 @@ Gracias al glorioso STANDO POWAH detuvo el tiempo exclamando: ZA WARUDO, TOKI WO TOMARE! + El ejercito fue derrotado sin que ellos mismos se dieran cuenta, igual que a mi MILF lover, Kakyoin, recibiendo un glorioso MUDAMUDAMUDAMUDAMUDA + Todo concluyo cuando las palabras KYUU BIO KEIKA \ No newline at end of file From 26a75e64454896f1e2758c789f8133104633071d Mon Sep 17 00:00:00 2001 From: Alejandro Rodarte Date: Fri, 3 May 2019 22:58:31 -0600 Subject: [PATCH 5372/5486] Repair one line that had more than 120 characters in it --- espanol/dio/dio.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/dio/dio.md b/espanol/dio/dio.md index abacb1b2e2..633e9ee973 100644 --- a/espanol/dio/dio.md +++ b/espanol/dio/dio.md @@ -1,5 +1,6 @@ Gracias al glorioso STANDO POWAH detuvo el tiempo exclamando: ZA WARUDO, TOKI WO TOMARE! -El ejercito fue derrotado sin que ellos mismos se dieran cuenta, igual que a mi MILF lover, Kakyoin, recibiendo un glorioso MUDAMUDAMUDAMUDAMUDA +El ejercito fue derrotado sin que ellos mismos se dieran cuenta, igual que a mi MILF lover, +Kakyoin, recibiendo un glorioso MUDAMUDAMUDAMUDAMUDA Todo concluyo cuando las palabras KYUU BIO KEIKA \ No newline at end of file From d8b40c105302519d355cf6280b824ab1de27ca61 Mon Sep 17 00:00:00 2001 From: Henok Date: Sat, 4 May 2019 12:07:07 +0300 Subject: [PATCH 5373/5486] update language.md --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index c416057ee3..d0c08da0f9 100644 --- a/language.md +++ b/language.md @@ -167,3 +167,5 @@ Dreams to Memories – Wisdom in Ladakh.To read this click [here](Himalayan_Odys Astoli Dothraki ? [Dothrae jinne](dothraki/dothraki_evoli.md) Si Latine legere vis, [hic preme](latin/arena.md) + +አማርኟ ኸቻልክ [ተጫን](amharic/ጀምር.md) From 51092937a3afb4d60e375f9eb93f3efd0c648853 Mon Sep 17 00:00:00 2001 From: Henok Date: Sat, 4 May 2019 12:08:35 +0300 Subject: [PATCH 5374/5486] add Amharic folder --- "Amharic/\341\210\200\341\211\240\341\210\273/\341\215\251.md" | 1 + "Amharic/\341\214\200\341\210\235\341\210\255.md" | 1 + .../\341\214\216\341\211\240\341\213\235.md" | 1 + 3 files changed, 3 insertions(+) create mode 100644 "Amharic/\341\210\200\341\211\240\341\210\273/\341\215\251.md" create mode 100644 "Amharic/\341\214\200\341\210\235\341\210\255.md" create mode 100644 "Amharic/\341\214\200\341\214\215\341\212\223/\341\214\216\341\211\240\341\213\235.md" diff --git "a/Amharic/\341\210\200\341\211\240\341\210\273/\341\215\251.md" "b/Amharic/\341\210\200\341\211\240\341\210\273/\341\215\251.md" new file mode 100644 index 0000000000..424aafeeac --- /dev/null +++ "b/Amharic/\341\210\200\341\211\240\341\210\273/\341\215\251.md" @@ -0,0 +1 @@ +ጀግና ከሆንክ [ተጫን](../ጀግና/ጎበዝ.md) diff --git "a/Amharic/\341\214\200\341\210\235\341\210\255.md" "b/Amharic/\341\214\200\341\210\235\341\210\255.md" new file mode 100644 index 0000000000..b26cf276f0 --- /dev/null +++ "b/Amharic/\341\214\200\341\210\235\341\210\255.md" @@ -0,0 +1 @@ +[ጀምር.md](ሀበሻ/፩.md) \ No newline at end of file diff --git "a/Amharic/\341\214\200\341\214\215\341\212\223/\341\214\216\341\211\240\341\213\235.md" "b/Amharic/\341\214\200\341\214\215\341\212\223/\341\214\216\341\211\240\341\213\235.md" new file mode 100644 index 0000000000..eb576c5352 --- /dev/null +++ "b/Amharic/\341\214\200\341\214\215\341\212\223/\341\214\216\341\211\240\341\213\235.md" @@ -0,0 +1 @@ +ጎበዝ!!! \ No newline at end of file From 6916054933a5711af81950684043f2e8b769f485 Mon Sep 17 00:00:00 2001 From: Hen0k <39389971+Hen0k@users.noreply.github.com> Date: Sat, 4 May 2019 12:13:05 +0300 Subject: [PATCH 5375/5486] Update language.md Review this @casey-collab --- language.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language.md b/language.md index d0c08da0f9..8f1321b6ba 100644 --- a/language.md +++ b/language.md @@ -168,4 +168,4 @@ Astoli Dothraki ? [Dothrae jinne](dothraki/dothraki_evoli.md) Si Latine legere vis, [hic preme](latin/arena.md) -አማርኟ ኸቻልክ [ተጫን](amharic/ጀምር.md) +አማርኟ ኸቻልክ [ተጫን](Amharic/ጀምር.md) From 6fe3f7b14b5faa04df820eb0a7f19dc1f07e0f66 Mon Sep 17 00:00:00 2001 From: Razikk Date: Sun, 5 May 2019 00:32:06 -0400 Subject: [PATCH 5376/5486] Proof that I'm lazy --- english/lazy/lazy.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/lazy/lazy.md b/english/lazy/lazy.md index 679eb1e31e..2ebfebd196 100644 --- a/english/lazy/lazy.md +++ b/english/lazy/lazy.md @@ -1,3 +1,5 @@ i really don't know what to say and im so lazy to write a story -I hear you friend. Here for the laziness! \ No newline at end of file +I hear you friend. Here for the laziness! + +Three's a lazy crowd. \ No newline at end of file From 0c864b64e659d1cc3f34e502d9cfe4022f16908d Mon Sep 17 00:00:00 2001 From: Syed Umair Date: Sun, 5 May 2019 12:05:32 +0530 Subject: [PATCH 5377/5486] add after-death story --- english/after-death/after-death.md | 9 +++++++++ english/marshmallow.md | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 english/after-death/after-death.md diff --git a/english/after-death/after-death.md b/english/after-death/after-death.md new file mode 100644 index 0000000000..cff5d0d586 --- /dev/null +++ b/english/after-death/after-death.md @@ -0,0 +1,9 @@ +And they say, There is not but our worldly life; +we die and live (i.e. some people die and others live, +replacing them) and nothing destroys us except time. +And they have of that no knowledge; they are only assuming. +And when Our verses are recited to them as clear evidences, +their argument is only that they say, Bring [back] our forefathers, +if you should be truthful. Say, God causes you to live, +then causes you to die; then He will assemble you for the Day of Resurrection, +about which there is no doubt, but most of the people do not know. \ No newline at end of file diff --git a/english/marshmallow.md b/english/marshmallow.md index b459910c85..d58202dd32 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,3 +1,5 @@ +Wanna know what after death? Click [here](after-death/after-death.md) + Once upon a time many authors collaborated to make meaningless linked story. [Escape earth and journey through space](space-travel/space-travel.md) From b7afd4349f5e88a681c9ff9631d946254c0e22e4 Mon Sep 17 00:00:00 2001 From: panda Date: Sun, 5 May 2019 17:08:54 +0800 Subject: [PATCH 5378/5486] =?UTF-8?q?Add=20the=20=E8=94=A1=E5=BE=90?= =?UTF-8?q?=E5=9D=A4=20story?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/Caixukun/\350\224\241\345\276\220\345\235\244.md" | 1 + 1 file changed, 1 insertion(+) create mode 100644 "Chinese/Caixukun/\350\224\241\345\276\220\345\235\244.md" diff --git "a/Chinese/Caixukun/\350\224\241\345\276\220\345\235\244.md" "b/Chinese/Caixukun/\350\224\241\345\276\220\345\235\244.md" new file mode 100644 index 0000000000..fcb66c0173 --- /dev/null +++ "b/Chinese/Caixukun/\350\224\241\345\276\220\345\235\244.md" @@ -0,0 +1 @@ +喜欢, 唱, 跳, rap, 篮球 \ No newline at end of file From d8ade966e5d4b97c0c87b0143cf7eb221b1e51af Mon Sep 17 00:00:00 2001 From: panda Date: Sun, 5 May 2019 17:13:22 +0800 Subject: [PATCH 5379/5486] =?UTF-8?q?Add=20the=20link=20of=20=E8=94=A1?= =?UTF-8?q?=E5=BE=90=E5=9D=A4.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index e86cedaff2..235146285f 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -167,3 +167,5 @@ [天河他娘](seever/天河他娘.md) [3月3号去香港](hongkong/go2HK.md) + +[蔡徐坤的篮球梦](caixukun/蔡徐坤.md) From 8660dbeb9f50fb2509493dd482bc66df852cd1b1 Mon Sep 17 00:00:00 2001 From: panda Date: Sun, 5 May 2019 17:38:06 +0800 Subject: [PATCH 5380/5486] fix the link --- "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 235146285f..756868bed2 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -168,4 +168,4 @@ [3月3号去香港](hongkong/go2HK.md) -[蔡徐坤的篮球梦](caixukun/蔡徐坤.md) +[蔡徐坤的篮球梦](Caixukun/蔡徐坤.md) From 56ea2d502ba8090145a6a9f4aceb2c103bccbcba Mon Sep 17 00:00:00 2001 From: Mcbook Date: Sun, 5 May 2019 16:58:55 +0530 Subject: [PATCH 5381/5486] Mahabharat file added under Hindi sub-directory. --- hindi/Mahabharat/mahabharat.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 hindi/Mahabharat/mahabharat.md diff --git a/hindi/Mahabharat/mahabharat.md b/hindi/Mahabharat/mahabharat.md new file mode 100644 index 0000000000..c61028631b --- /dev/null +++ b/hindi/Mahabharat/mahabharat.md @@ -0,0 +1 @@ +Indian culture is filled with the learnings of [Mahabharata](https://www.hotstar.com/tv/mahabharat/s-28) From e6508a41cc2c6a8dcfbc5a87d184dbc034ef0481 Mon Sep 17 00:00:00 2001 From: Mcbook Date: Sun, 5 May 2019 17:58:50 +0530 Subject: [PATCH 5382/5486] Added a link to Mahabharat file in Swami-Vivekananda folder --- hindi/swami-vivekananda/swami-vivekananda.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hindi/swami-vivekananda/swami-vivekananda.md b/hindi/swami-vivekananda/swami-vivekananda.md index c93005c775..d53a15ae1f 100644 --- a/hindi/swami-vivekananda/swami-vivekananda.md +++ b/hindi/swami-vivekananda/swami-vivekananda.md @@ -1,3 +1,6 @@ पता है स्वामी विवेकानंद जी क्या कहते थे? [यहाँ देखो|](teachings-of-swami-vivekananda/quotes.md) + +Mahabharat[click here](../Mahabharat/mahabharat.md) + स्वामी विवेकानंद जी की संक्षिप्त जीवनी [यहाँ है|](Introduction-of-Swami-vivekananda/introduction.md) From 44a1cc89a8a4fa7a6b656e97a25316cb95e98f83 Mon Sep 17 00:00:00 2001 From: Jochen Wulf <20891952+jocwulf@users.noreply.github.com> Date: Mon, 6 May 2019 12:45:14 +0200 Subject: [PATCH 5383/5486] Add sentence to ruderboot.md --- german/ruderboot.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/german/ruderboot.md b/german/ruderboot.md index 0ac49b7feb..ccce842e5b 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -4,6 +4,8 @@ in einem Ruderboot auf einem grossen See treiben. Ihre Hose ist vollkommen durch Sie bemerken, dass durch ein Loch in der Bootswand Wasser ins Boot dringt. +Die Situation ist eher unangenehm. + Werden Sie: [Festellen, dass Sie doch kein Deutsch sprechen](../language.md) From 32faaaf362f349ff6cf7399248156293f42cac1d Mon Sep 17 00:00:00 2001 From: Nelson Date: Mon, 6 May 2019 13:42:39 +0100 Subject: [PATCH 5384/5486] Add space points in Lead Programmer.md --- english/programmer/lead_programmer.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/english/programmer/lead_programmer.md b/english/programmer/lead_programmer.md index 9950150ce2..0ae2818c63 100644 --- a/english/programmer/lead_programmer.md +++ b/english/programmer/lead_programmer.md @@ -1,6 +1,10 @@ -You raise your hand slowly, but just as you did you notice in your peripheral vision that someone else has raised his hand. +You raise your hand slowly. + +But just as you did you notice in your peripheral vision that someone else has raised his hand. + You quickly turn to see who it is. It is the guy that has been working from the shadows. + The director knows everyone's abilities, and glances at both of you calmly. [You know Git better than him](better/you_get_position.md) From ed2f64de832cf2da60f4b75940a80ce621220c6b Mon Sep 17 00:00:00 2001 From: Nelson Date: Tue, 7 May 2019 13:44:08 +0100 Subject: [PATCH 5385/5486] Add deleted changes --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index e977a14994..859483aa25 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,5 +1,7 @@ There's a spot open for the role of [Lead Programmer](programmer/lead_programmer.md) +There's a spot open for the role of [Lead Programmer](programmer/lead_programmer.md) + Wanna know what after death? Click [here](after-death/after-death.md) Once upon a time many authors collaborated to make meaningless linked story. From 8ea060859d6515f539bd717c51cbf6af54dba5a5 Mon Sep 17 00:00:00 2001 From: Nelson Date: Tue, 7 May 2019 13:54:10 +0100 Subject: [PATCH 5386/5486] Add deleted changes 2x --- english/marshmallow.md | 1078 ++++++++++++++++++---------------------- 1 file changed, 493 insertions(+), 585 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 859483aa25..41377449b9 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,175 +1,158 @@ There's a spot open for the role of [Lead Programmer](programmer/lead_programmer.md) -There's a spot open for the role of [Lead Programmer](programmer/lead_programmer.md) - -Wanna know what after death? Click [here](after-death/after-death.md) +Wanna know what after death? Click here Once upon a time many authors collaborated to make meaningless linked story. -[Escape earth and journey through space](space-travel/space-travel.md) +Escape earth and journey through space -And that story was about [cricket](cricket/if-you-love-cricket/ifyoulovecricket.md) +And that story was about cricket Now what? -A few learned to [tango](tango/tango.md) +A few learned to tango -Some preferred to -Enter [The Forest!](forest/forest.md) +Some preferred to Enter The Forest! -If you are a fan of ZooZoo go [here](zoozoo/zoozoo.md) +If you are a fan of ZooZoo go here hi~ -NGE is [here](NGE/NGE.md) +NGE is here -[start](mad/mad.md) your journey into world of mad +start your journey into world of mad or -spend your time [wisely](http://www.pythonchallenge.com/) +spend your time wisely -[Click here](http://www.dvloper.me) to visit my dvloper.me blog . +Click here to visit my dvloper.me blog . Are you a: -[cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) +cat person or a -[dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? +dog person ? -Your adventure begins. You realize there are hundreds of paths for you to choose from. -Which way should you go? Only you can decide. +Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. Oh so many decisions - what will you do?? -In the end you will realize that it [doesn't really matter] -(https://goo.gl/1fd4wU). -The path you choose is as good as any. +In the end you will realize that it [doesn't really matter] (https://goo.gl/1fd4wU). The path you choose is as good as any. -You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! +You decide to drop everything you're doing and run out the door! -[Build time machine](time-machine/time-machine.md) +Build time machine -Take some [time](meditation/meditation.md) off! +Take some time off! -[Roll a D20](dungeons-and-dragons/dungeons-and-dragons.md) and see what luck brings. +Roll a D20 and see what luck brings. -Life is full of twists and turns like but try to cheer yourself and people around you. [Click Here](Happy/happie.md) +Life is full of twists and turns like but try to cheer yourself and people around you. Click Here Who is better? -[Click Here](captain/captain.md) to vote for Captain America +Click Here to vote for Captain America -[Click Here](ironman/ironman.md) to vote for Iron Man +Click Here to vote for Iron Man -[Click here](00_8_Agent/The_name_is_Bond_Milton_Bond.md) to vote for a Special Agent -[click here](london/london.md) to vote for london +Click here to vote for a Special Agent click here to vote for london January 2017 approaches. You have two presidential candidates to vote for. -[Click](vote-the-president/trump/trump.md) here to vote for Donald Trump. +Click here to vote for Donald Trump. -[Click](vote-the-president/hillary/Hillary.md) here to vote for Hillary Clinton. +Click here to vote for Hillary Clinton. -You don't like either of these candidates. -So instead, you decide to [write a symphony](write-a-symphony/symphony.md) -or -[paint a picture](paint-a-picture/paint-a-picture.md). +You don't like either of these candidates. So instead, you decide to write a symphony or paint a picture. -Keith the Unicorn approaches you. -He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) +Keith the Unicorn approaches you. He looks a little forlorn so you decide to cheer him up. -It is time to begin your adventure. -Your search for the grail begins [now](Monty-Python/search.md) +It is time to begin your adventure. Your search for the grail begins now -Down one path you see a person standing in the middle of the path. -They look familiar somehow, but you just can't figure out who they are. -They seem friendly so you decide to go [talk to them.](friendly-person/friendly-person.md) +Down one path you see a person standing in the middle of the path. They look familiar somehow, but you just can't figure out who they are. They seem friendly so you decide to go talk to them. -Ask them to join you on a life changing [quest?](zuluquest/choosequest.md) +Ask them to join you on a life changing quest? -Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) +Realize the truth about candidates' tax plans -How about some [chill music](chillmusic/chillmusic.md)? +How about some chill music? -[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) +Want to see my Quora profile -You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. +You decide the only way out is to climb, climb hard friend. -I also agree only way to find way is to keep climbing or walking or studying or learning or all of this is DOING. -DOING will definitely keep your sharpened with latest skills (which you can get by the way from Udacity !!!) +I also agree only way to find way is to keep climbing or walking or studying or learning or all of this is DOING. DOING will definitely keep your sharpened with latest skills (which you can get by the way from Udacity !!!) [Know about the life of this world](00-Life-of-this-world/Life of this world.md) -This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down +This is a story to look for your own, to fight your way out of this or to calm down -Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) +Talk to neighbour -Vist the master [liquid](liquid/liquid.md). +Vist the master liquid. -Drink some [bear](bear/bear.md) +Drink some bear -[play](http://pcottle.github.io/learnGitBranching/) with the (git) branches +play with the (git) branches -and search for your [destiny](destiny/destiny.md). +and search for your destiny. -Before we begin, do you need a [warm-up?](warm-up/warm-up.md) +Before we begin, do you need a warm-up? -Once you're warmed up, why not try a [work out?](work-out/work-out.md) +Once you're warmed up, why not try a work out? -or maybe [eat that delicious cucumber sandwich?](sandwich/sandwich.md) +or maybe eat that delicious cucumber sandwich? -After warming up, take a minute and reflect on your [love for udacity](love-udacity/love-udacity.md) +After warming up, take a minute and reflect on your love for udacity -You are are man (or woman) for all seasons but need help in choosing -your travel destinations.. Of course we are happy to help you with these -[suggestions](travel-destinations/travel-destinations.md) +You are are man (or woman) for all seasons but need help in choosing your travel destinations.. Of course we are happy to help you with these suggestions -Meet a [Schrodingers cat](schrodinger-cat/schrodinger-cat.md) +Meet a Schrodingers cat -Another visitor! [Stay a while...](impossible-adventure/start/start.md) +Another visitor! Stay a while... -[I am the one who knocks](say-my-name/say-my-name.md) +I am the one who knocks -[The Secret to Life...Seriously](https://www.youtube.com/watch?v=dQw4w9WgXcQ) +The Secret to Life...Seriously -[Some inspirational Lines](the-nights/the-nights.md) +Some inspirational Lines -[Time for some teachings on life and success](swami-vivekananda/swami-vivekananda.md) +Time for some teachings on life and success One morning, you wake up in a strange room with marshmallows for walls. Marshmallows smell funny. What is a marshmallow anyway? -Unexpectedly, the Chief Marshmallow demands to see your [references](references/references.md). +Unexpectedly, the Chief Marshmallow demands to see your references. -Show him your [references](https://youtu.be/uZbjlsX0DNY?t=10s). +Show him your references. -The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtube.com/watch?v=s9Dp20ydm1E) +The Chief Marshmallow also demands that you watch Sonicsgate -*(Must be a Tuesday.)* +(Must be a Tuesday.) Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. -Or a [Wednesday](make_changes_GitHub/make_changes_GitHub.md)... +Or a Wednesday... -[Thursday](doug-adams/arthur-dent/arthur-dent.md)... maybe even a Friday, but definetely not a Saturday. +Thursday... maybe even a Friday, but definetely not a Saturday. Ok, we have to consider Saturday too. -[this crazy thought popped into your head](yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md) +this crazy thought popped into your head -Alice doesn't live here anymore, [or does she?](scarab/goddess.md) +Alice doesn't live here anymore, or does she? -But not Monday; you never go out on a Sunday evening......[or do you](./or-do-you/or-do-you.md)? +But not Monday; you never go out on a Sunday evening......or do you? -Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. +Gee Whiz! You decide to share your story in the Acts of Kindness page. -For a second, you decide whether or not to just [go back to sleep](go-back-to-sleep/go-back-to-sleep.md) +For a second, you decide whether or not to just go back to sleep -Then, you consider playing a [chess puzzle](chess/chess.md) +Then, you consider playing a chess puzzle A sound from a Hitchcock movie fills the room, then quickly fades away. @@ -177,88 +160,59 @@ Was it the sound of a cry from the shower? Was it the sound of birds? -It sounded like it could have been a [heffalump](heffalump/heffalump.md) +It sounded like it could have been a heffalump No... perhaps not. Not at all. -I think it was an [animal](animal/animal.md). +I think it was an animal. -Nope, it was [Tim Berners-Lee](https://en.wikipedia.org/wiki/Tim_Berners-Lee) sobbing in despair. +Nope, it was Tim Berners-Lee sobbing in despair. -Thinking back, there are no memories to suggest that this should have been -anything but an ordinary morning. You didn't go out last night, you don't -usually take intoxicants, what's happening...? +Thinking back, there are no memories to suggest that this should have been anything but an ordinary morning. You didn't go out last night, you don't usually take intoxicants, what's happening...? Maybe this is a dream? -Or a [memory](memories/memories.md)? +Or a memory? -Or is it just boring old [real-life](real-life/real-life.md)? +Or is it just boring old real-life? -Or [The Force](https://www.youtube.com/watch?v=cFn-NobVaoI&feature=youtu.be)! +Or The Force! -Or is this just [fantasy](https://www.youtube.com/watch?v=fJ9rUzIMcZQ)? +Or is this just fantasy? -Maybe it's a dream within a dream? Maybe dreaming and reality are one and the -same. Maybe reality is an oxymoron when considering multiple dimensions. +Maybe it's a dream within a dream? Maybe dreaming and reality are one and the same. Maybe reality is an oxymoron when considering multiple dimensions. -Maybe you're in [Inception](inception/inception.md). +Maybe you're in Inception. But it's probably not worth dwelling on that right now, you could be in danger. Grave danger. Oh No! -*(Is there another kind?)* +(Is there another kind?) I actually used to know a guy named Dave Granger. We sure had some good times! Anyway, the possibility of danger lurks. -The type of extreme mortal danger that so often accompanies confectionary inspired interior design. -Quickly surveying your immediate surrounds, you notice a garishly dressed, -vacant-eyed young man lounging on a nearby sofa. +The type of extreme mortal danger that so often accompanies confectionary inspired interior design. Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. -The man is not large but not small, but not average either. -He is reciting poetry in a language you assume to be Egyptian, -though you are not familiar with Egyptian. You only assume this -because of the small pictograms that seem to rise into the -air above his head when he speaks. One looks like a small bird. -Another a small insect. A third is for all appearances the -third car your father ever bought you, a small Fiat 500, which -though in the picture above the man's head is purple, was -in reality more of a mauve. It had a tendency to bark whenever -you drove it over hills, not like the proud great dane from -Nova Scotia that most smaller cars tend to imitate when taking -on tasks greater than their strengths, but rather more like -the small pomerainian who is now barking at the blue music notes -hovering over the man's large-ish head, now peeing on the -back of the sofa, making it difficult for you to remember the -name of that dude you totally scored with in the back of your -Fiat 500. You're finding it difficult to think. You sit down on -the sofa to gather your thoughts. You think of all the men -you slept with on your hitch hiking journeys across the southern -american continent. +The man is not large but not small, but not average either. He is reciting poetry in a language you assume to be Egyptian, though you are not familiar with Egyptian. You only assume this because of the small pictograms that seem to rise into the air above his head when he speaks. One looks like a small bird. Another a small insect. A third is for all appearances the third car your father ever bought you, a small Fiat 500, which though in the picture above the man's head is purple, was in reality more of a mauve. It had a tendency to bark whenever you drove it over hills, not like the proud great dane from Nova Scotia that most smaller cars tend to imitate when taking on tasks greater than their strengths, but rather more like the small pomerainian who is now barking at the blue music notes hovering over the man's large-ish head, now peeing on the back of the sofa, making it difficult for you to remember the name of that dude you totally scored with in the back of your Fiat 500. You're finding it difficult to think. You sit down on the sofa to gather your thoughts. You think of all the men you slept with on your hitch hiking journeys across the southern american continent. -[Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) +Pinch yourself to see if this is a dream. -You recall what a man said to you once: "Live as one of them, Kal-El, to discover -where your strength and your power are needed. Always hold in your heart the -pride of your special heritage. They can be a great people, Kal-El; they wish to -be. They only lack the light to show the way. For this reason above all, their -capacity for good, I have sent them you... my only son." +You recall what a man said to you once: "Live as one of them, Kal-El, to discover where your strength and your power are needed. Always hold in your heart the pride of your special heritage. They can be a great people, Kal-El; they wish to be. They only lack the light to show the way. For this reason above all, their capacity for good, I have sent them you... my only son." -[Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) +Remember that you are superman. -Call in the [Justice League!](./justice-league/justice-league.md) +Call in the Justice League! -[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) +Interrogate the man for clues. -[That sure sounds familiar...](./sounds-familiar/sounds-familiar.md) +That sure sounds familiar... -These marshmallows are numerous and they look so delicious. -... despite the feeling they're somehow judging you for only wearing one sock. +These marshmallows are numerous and they look so delicious. ... despite the feeling they're somehow judging you for only wearing one sock. -[Turn one of the marshmallows into gold.](./alchemy/alchemy.md) +Turn one of the marshmallows into gold. You reach out to grab a handful of the marshmallow wall, but you can't seem to take the handful away from the wall. @@ -266,35 +220,33 @@ You also seem to be wearing an uncomfortable and restrictive jacket made of leat You don't own any uncomfortable and restrictive leather jackets... How did you end up sleeping in one? -Suddenly, fuzzy memories of a tavern and an exotic woman... -a house made of candy... -closets full of umbrellas and leather. +Suddenly, fuzzy memories of a tavern and an exotic woman... a house made of candy... closets full of umbrellas and leather. An umbrella (closed) automagically appears in your left hand. You tentatively -[poke the wall](./poke-the-wall/poke-the-wall.md) with it. +poke the wall with it. -[You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) +You decide to bite the marshmallow wall. You are feeling very anxious at this point. -You can't decide if anything is worth it anymore so you loose yourself at a [David Gray concert.](concert/concert.md) +You can't decide if anything is worth it anymore so you loose yourself at a David Gray concert. Goosebumps appear. This is because you do not like leather for ethical reasons. -Leather is all over [San Fransisco](sanfran/sanfran.md). +Leather is all over San Fransisco. -[Ethical reason? Seriously?](./ethical-reason/ethical-reason.md) +Ethical reason? Seriously? You begin to break out of the jacket and find a lighter, a fork, and rope. You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. -But only find out that the chocolate has expired [132 days ago](./132-days-ago/132-days-ago.md). +But only find out that the chocolate has expired 132 days ago. -Do you want to [try to fill the remaining space in the sock with marshmallows](./fill-sock/fill-sock.md)? +Do you want to try to fill the remaining space in the sock with marshmallows? You are not sure who placed these objects near you or why. @@ -302,24 +254,23 @@ But you have a growing sense that these mundane objects are vital to your surviv You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. -[You have the suspicion that you are being closely watched.](./watched/watched.md) +You have the suspicion that you are being closely watched. -[Of course, it's that man on the sofa; go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) +Of course, it's that man on the sofa; go talk to him again. -[Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) +Wait, I'm in front of a mirror... Am I? Let's see... You see a polar bear searching for food. -I see that you may be from the North. [How's it going?](./north/north.md) +I see that you may be from the North. How's it going? -[A Shotgun appears!](./shotgun/shotgun.md) +A Shotgun appears! -[Whilst cycling backwards.](./cycling-backwards/cycling-backwards.md) +Whilst cycling backwards. "Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" -In a brief moment of clarity, you decide it's time for a change and start to -[cycle forwards](./cycling-forwards/cycling-forwards.md). +In a brief moment of clarity, you decide it's time for a change and start to cycle forwards. You hear a small bird sound in the distance. @@ -329,16 +280,13 @@ Something lightly brushes the back of your neck, sending a chill down your spine Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. -You hear a strange noise then turn and see a large, wooden door. -Too large, in fact, and yet too small, for the frame it rests in. -You [walk through the door](./unnatural_door/unnatural_door.md). +You hear a strange noise then turn and see a large, wooden door. Too large, in fact, and yet too small, for the frame it rests in. You walk through the door. You turn for a third time and see a small, metal door. -You knock, hear nothing and decide to [enter](./strange-room/room.md). +You knock, hear nothing and decide to enter. -Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air -for alien life forms. +Click here to use your sonic screwdriver to scan the air for alien life forms. When you look away, a marshmallow hand attempts to grab the lighter. @@ -368,16 +316,13 @@ A soft echo of a torrent is fading from far... I felt a sudden ease of mind. -"Ok", I said to myself, "I need to get -[out of here](outta-here/outta-here.md)" +"Ok", I said to myself, "I need to get out of here" -"But first I must remember the magic spell needed to open the enchanted door!" -Where is Hermione Granger when you need her? Where I ask you? -Oh, I know. Click [here](hermione/hermioneHere.md) +"But first I must remember the magic spell needed to open the enchanted door!" Where is Hermione Granger when you need her? Where I ask you? Oh, I know. Click here You pick up the fork and wrap it in rope to fashion a crappy wand. -For more on wand history [here](./wand/wand.md). +For more on wand history here. Pointing it at the door, eyes closed, "Alohomora..." @@ -389,601 +334,581 @@ Sheepishly you look down on the crappy wand in your hand. You must be doing something wrong. You drink a beer and think about it, then Ah-ha! -so many [beer](drink-beer/drink-beer.md) options.. +so many beer options.. You notice your pants are now glowing, so you must have been holding the wand upside down. -Suddenly, you become aware of the need to take a leak. -You can't hold it. You wonder, Are glowing pants waterproof? -You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) - +Suddenly, you become aware of the need to take a leak. You can't hold it. You wonder, Are glowing pants waterproof? You Look for a toilet Do you: -Give up and [start over](marshmallow.md). +Give up and start over. -[Listen to Tales of the Inexpressable (By Shpongle)](https://www.youtube.com/watch?v=6WTxC8wnXQo) +Listen to Tales of the Inexpressable (By Shpongle) -[Watch the new Star Wars trailer](https://www.youtube.com/watch?v=sGbxmsDFVnE) +Watch the new Star Wars trailer -[Watch the second new Star Wars trailer](https://www.youtube.com/watch?v=ngElkyQ6Rhs) +Watch the second new Star Wars trailer -[Live Tweet the situation](tweet-it/tweet-it.md) +Live Tweet the situation -[Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) +Blackout and wake up in a strange place without knowing how -Take out your [knitting project](knit/knit.md) and finish your sock heel turn. +Take out your knitting project and finish your sock heel turn. -Take out your [crochet project](crochet/crochet.md) instead and finish that teddy bear you've been working on. +Take out your crochet project instead and finish that teddy bear you've been working on. -[Realize you are in the ...](in-matrix/matrix.md) +Realize you are in the ... -[Realize you better call Saul](better-call-saul/saul.md) +Realize you better call Saul -[Turn off all the lights](lightsoff/lightsoff.md) +Turn off all the lights -[Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) +Sit back a listen to your favourite White Stripes track -[Feel a sudden urge to dance](https://youtu.be/dQw4w9WgXcQ) +Feel a sudden urge to dance -[Make changes on GitHub to revise this crazy story](make_changes_GitHub/make_changes_GitHub.md) +Make changes on GitHub to revise this crazy story -[Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) +Pick up giant blowtorch -[Go eat some rainbows](eat-rainbows/rainbows.md) +Go eat some rainbows -[Admire your glowing pants](glowing-pants/glowing-pants.md) +Admire your glowing pants -[Grab some coffee?](coffee/coffee.md) +Grab some coffee? -[Grab some wine?](wine/wine.md) +Grab some wine? -[Call the GhostBusters](ghostbusters/ghostbusters.md) +Call the GhostBusters -[Talk to Bob Barker](bob-barker/barker.md) +Talk to Bob Barker -[Hop on a plane](forest/forest.md) +Hop on a plane -[Spend so long trying to decide that you fall asleep](sleep-and-wake/sleep_and_wake.md) +Spend so long trying to decide that you fall asleep -[Cry out for your Mommy](cry-out-for-mommy/oh_mommy.md) +Cry out for your Mommy -[Enter a Dim Reality](Enter-a-dim-reality/Dim_reality.md) +Enter a Dim Reality -[Watch the Warriors vs Cavaliers game 1 of the NBA Finals](warriors-game/watch-warriors.md) +Watch the Warriors vs Cavaliers game 1 of the NBA Finals -[Peek through the keyhole to reveal what is beyond](world-war-marshmallows/world-war-marshmallows.md) +Peek through the keyhole to reveal what is beyond -[Try the more effective "Apparation" spell to teleport elsewhere](movie-ripoffs/hogwarts/hogwarts.md) +Try the more effective "Apparation" spell to teleport elsewhere -[Begin to feel suspicious](lucidream/luciddream.md) +Begin to feel suspicious -[Want to break free](yuha/yuha.md) +Want to break free -[Open the door and run outside](open-door/open-door.md) +Open the door and run outside -[Give the marshmallow entity a turing test](turing-test/turing-test.md) +Give the marshmallow entity a turing test -[Step into an adjacent room to check your social media hubs](social-media/social-media.md) +Step into an adjacent room to check your social media hubs -[Try and interact with the marshmallow hand](interact/interact.md) +Try and interact with the marshmallow hand -[Check your phone for date, time and location?](check-your-phone/check-your-phone.md) +Check your phone for date, time and location? -[Check mspaintadventures](mspa/mspa.md) +Check mspaintadventures -[Lunge for the lighter](lunge-for-the-lighter/lunge-for-the-lighter.md) +Lunge for the lighter -[Ask to Alice](ask-to-alice/ask-to-alice.md) +Ask to Alice -[Close your eyes](experience/experience.md) +Close your eyes -[Grab the lighter first?](lighter/grab-lighter.md) +Grab the lighter first? -[Make a swing with rope and jacket](enjoy-DreamRide/ride.md) +Make a swing with rope and jacket -[Start eating the walls?](eating-walls/eating-marshmallows.md) +Start eating the walls? -[Give the marshmallow to the polar bear?](polar-bear/polar-bear.md) +Give the marshmallow to the polar bear? -[Realize you are in Minecraft](you-are-in-minecraft/minecraft.md) +Realize you are in Minecraft -[Try to pull a MacGyver with the lighter, fork and rope?](macgyver/macgyver.md) +Try to pull a MacGyver with the lighter, fork and rope? -[Quickly run outside and explore?](explore-outside/explore-outside.md) +Quickly run outside and explore? -[Light a fire?](light-fire/fire.md) +Light a fire? -[jump in a chocolate pool?](chocopool/choco.md) +jump in a chocolate pool? -[Hungry Kya?](hungry/hungry.md) +Hungry Kya? -[Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) +Offer to get the narrator a ladder, so they can get off your back? -[Dig a hole with your bare hands?](hands/hands.md) +Dig a hole with your bare hands? -[Go back to sleep?](sleep/marshmallow.md) +Go back to sleep? -[Stay puft?](staypuft/marshmallowman.md) +Stay puft? -[Dig at the walls with a fork](dig/dig.md) +Dig at the walls with a fork -[Invite some friends over?](invite-friends/friends.md) +Invite some friends over? -[Look for a way out?](find-exit/leave.md) +Look for a way out? -[Count the marshmallows?](count-the-marshmellows/count-the-marshmellows.md) +Count the marshmallows? -[Begin to dance to pass the time?](dance/dance.md) +Begin to dance to pass the time? -[You pinch yourself to see whether you are dreaming?](pinch/pinch.md) +You pinch yourself to see whether you are dreaming? -[Promise to yourself this is the last time you take hallucinogenic mushrooms?](shrooms/never-again.md) +Promise to yourself this is the last time you take hallucinogenic mushrooms? -[Think this is too surreal and decide to try the French version instead?](../french/feu-de-camp.md) +Think this is too surreal and decide to try the French version instead? -[Think this is a dream, and jam the fork into your hand to wake up?](fork-jam/not_dreaming.md) +Think this is a dream, and jam the fork into your hand to wake up? -[Go out and collect mushroom?](mushroom/collect_mushroom.md) +Go out and collect mushroom? -[Try to walk around](virtualreality/oculus.md) +Try to walk around -[Make one of those weird marshmallow Jell-O salads?](marshmallow-jello-o-salad/the-kind-your-grandma-used-to-make.md) +Make one of those weird marshmallow Jell-O salads? -[Begin to sing out of fear?](sing/sing.md) +Begin to sing out of fear? -[Go meditate and ponder about your next step?](meditate/meditate.md) +Go meditate and ponder about your next step? -[Scream out of fear?](scream/scream.md) +Scream out of fear? -[Get to work on the best batch of cookies ever made?](bake-cookies/cookies.md) +Get to work on the best batch of cookies ever made? -[Start tying knots on the fork?](fork-knots/melt-with-fork.md) +Start tying knots on the fork? -[Start pondering how you got yourself in a sticky situation?](ponder/ponder-about-life.md) +Start pondering how you got yourself in a sticky situation? -[Create a new jacket out of marshmallows?](jacket/marshmallow-jacket.md) +Create a new jacket out of marshmallows? -[Go straight to the solution!](http://youtu.be/dQw4w9WgXcQ) +Go straight to the solution! -[Cook them marshmallows](http://youtu.be/dQw4w9WgXcQ) +Cook them marshmallows -[Explore Wikipedia](wikipedia/wiki.md) +Explore Wikipedia -[Whip out your spork, start a fire and make giant s'mores?](http://easybaked.files.wordpress.com/2011/10/smores4.jpg) +Whip out your spork, start a fire and make giant s'mores? -[Ask yourself how you got yourself into this situation - AGAIN?](shrooms/never-again.md) +Ask yourself how you got yourself into this situation - AGAIN? -[Challenge the Marshmallows to a Rock Off!](challenge-marshmellow-to-rock-off/tenacious-d.md) +Challenge the Marshmallows to a Rock Off! -[Call a doctor](call-a-doctor/doctor.md) +Call a doctor -[Remember that pill you took](adipose/adipose.md) +Remember that pill you took -[Light up the wall](light-up/light-up.md) +Light up the wall -[Hide the lighter fork and rope in your pocket](hide/hide-chk.md) +Hide the lighter fork and rope in your pocket -[Make a necklace out of the marshmallows](necklace/necklace.md) +Make a necklace out of the marshmallows -[Light up the wall 2](light-up2/light-up2.md) +Light up the wall 2 -[Switch on your laptop and..](netflix/netflix.md) +Switch on your laptop and.. -[Lion King ](no-worries/hakuna-matata.md) +Lion King -[Perform some magic](magic/magic.md) +Perform some magic -[Raise your self so high](khudi/buland_very_high.md) +Raise your self so high -[Put yourself back in the straitjacket](backinstraitjacket/backinstraitjacket.md) +Put yourself back in the straitjacket -[Find the bird](find-bird/bird.md) +Find the bird -[Attempt to befriend the marshmellow man](make-friends/make-friends.md) +Attempt to befriend the marshmellow man -[Try to use one of your pokemon?](pokemon/pikachu_wins.md) +Try to use one of your pokemon? -[Throw a rock at it and see if it moves](moving/moving.md) +Throw a rock at it and see if it moves -[Start tickling the marshmallow](tickle/tickle.md) +Start tickling the marshmallow -[Enter the time tunnel](timeTunnel/timeTunnel.md) +Enter the time tunnel -[Tie the marshmallow's hands and legs](tying/tying.md) +Tie the marshmallow's hands and legs -[Use the fork, Luke!](use-the-fork-luke/use-the-fork.md) +Use the fork, Luke! -[B b b bird bird bird, bird is the word](birdistheword/birdistheword.md) +B b b bird bird bird, bird is the word -[Quote of the day](quote-of-the-day/quote.md) +Quote of the day -[Escape and find a phone to call...](call-these-guys/calltheseguys.md) +Escape and find a phone to call... -[Play some cricket](play-some-cricket/playsomecricket.md) +Play some cricket -[Run back and forth quickly slamming into the walls](indigestion/indigestion.md) +Run back and forth quickly slamming into the walls -[In their tongue he is Dovhakiin, DragonBorn, FUS ROH DAH](fus-roh-dah/fus-roh-dah.md) +In their tongue he is Dovhakiin, DragonBorn, FUS ROH DAH -[The walls start closing in](malaria/malaria.md) +The walls start closing in -[Come to Nepal](nepal/nepal.md) +Come to Nepal -[Order Pizza](order-pizza/order-pizza.md) +Order Pizza -[Summon your robot army](robot-army/robots-everywhere.md) +Summon your robot army -[Oh dear! You ended up in Candyland!](candyland/diabetes.md) +Oh dear! You ended up in Candyland! -[Give 'em the Leslie Howard!](slap-it-hard/teach-it-a-lesson.md) +Give 'em the Leslie Howard! -[You punch the first person you see!](punch/punch.md) +You punch the first person you see! -[Hulk smash?](hulk/smash.md) +Hulk smash? -[Marsh Attack!!!](marshmallow-attack/marsh-attack.md) +Marsh Attack!!! -[Got Lost](getsLost/getsLost.md) +Got Lost -[Try to make smores](smores/smores.md) +Try to make smores -[Summon your humble servant](humbleservant/humbleservant.md) +Summon your humble servant -[Summon the magical snuffbox](snuffbox/snuffbox.md) +Summon the magical snuffbox -[Become the One?](matrix/matrix.md) +Become the One? -[Melt all the marshmallows to make s'mores?](meltmarshmallows/meltmarshmallows.md) +Melt all the marshmallows to make s'mores? -[Want to cook boneless pork shoulder roast?](pork/roast.md) +Want to cook boneless pork shoulder roast? -[Take a selfie?](selfie/selfie.md) +Take a selfie? -[Say something](blah-balh/blah-blah.md) +Say something -[Try the Marshmallow Test on it?](https://youtu.be/QX_oy9614HQ) +Try the Marshmallow Test on it? -[Become an Octodog](be-octodog/octodog.md) +Become an Octodog -[Make a Marshmallow cake](https://www.youtube.com/watch?v=3l1SY3QREv4) +Make a Marshmallow cake -[I'm Batman](I'm-batman/batman.md) +I'm Batman -[You realize you are in NeverLand and you are - never going come... so you sing the Tinker Bell song](https://youtu.be/Sopngy6uucw) +You realize you are in NeverLand and you are never going come... so you sing the Tinker Bell song -[You decide to become a marshmallow yourself.](becomemarshmallow/becomemarshmallow.md) +You decide to become a marshmallow yourself. -[Explain Fizzbin to the marshmallow hand?](fizzbin/explain-fizzbin.md) +Explain Fizzbin to the marshmallow hand? -[Drool on the Marshmallow to show demonstrate your digestive superiority](drool/droolstrategem.md) +Drool on the Marshmallow to show demonstrate your digestive superiority -[Eat the Marshmallow](eatmarshmallow/eatmarshmallow.md) +Eat the Marshmallow -[Escape into Willy Wonka Lego-World](lego-world/lego-world.md) +Escape into Willy Wonka Lego-World -[Eat breakfast](../english/breakfast/breakfast.md) +Eat breakfast -[After breakfast you lookup triathlon](triathlon/triathlon.md) +After breakfast you lookup triathlon -[The inception protocol](dream_in_dream/inception.md) +The inception protocol -[Choose the blue pill or the red pill?](choose-pill/choose-pill.md) +Choose the blue pill or the red pill? -[Pull out your proton pack!](ghost-buster/ghost-busted.md) +Pull out your proton pack! -[You take the red pill](red-pill/red-pill.md) +You take the red pill -[Twas the Night Before Christmas](night-night/tale.md) +Twas the Night Before Christmas -[Check Reddit for any useful information.](reddit/ask-reddit.md) +Check Reddit for any useful information. -[Watch Up](watch-movie/Up.md) +Watch Up -[Give up and search for oil fields](oil-field/oil-field.md) +Give up and search for oil fields -[Appear on Falkor’s Back](appear-on-falkors-back/falkor.md) +Appear on Falkor’s Back -[Sit and ponder how you got into this situation](thesituation/situation.md) +Sit and ponder how you got into this situation -[Smart Ape roasting a marshmellow](https://www.youtube.com/watch?v=_ZEBrHe4hVs) +Smart Ape roasting a marshmellow -[Bruce Wayne is BATS !!](batman/batman.md) +Bruce Wayne is BATS !! -[Use your chance, master self-control](self-control/self-control.md) +Use your chance, master self-control -[Have a Pip-Boy](pipboy/pipboy.md) +Have a Pip-Boy -[Call upon one of your past lives as avatar](avatar/air.md) +Call upon one of your past lives as avatar -[Play some GTA5](play-gta5/play-gta5.md) +Play some GTA5 -[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) +Ask a question on Quora? -[Search for gluten](search-for-gluten/search-for-gluten.md) +Search for gluten -[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) +Ask a question on Quora? -[Go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) +Go afk and report the jungler? -[Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) +Leap on the Polar bear and charge -[Commit suicide](commit-suicide/suicide.md) +Commit suicide -[Make an appointment with the dentist](dentist/ouch.md) +Make an appointment with the dentist -[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) +Create an artificial intelligence to help you escape -[You Google what to do](https://www.google.co.in/) +You Google what to do -[Abdul kalam quotes on overcoming fear](apj/apj.md) +Abdul kalam quotes on overcoming fear -[If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) +If you want something done right, you have to do it yourself. -[There's no such thing as a free lunch.](free-lunch/free-lunch.md) +There's no such thing as a free lunch. -[Follow the dog...](play-with-dog/dog.md) +Follow the dog... -[What is LOVE ?](love/love.md) +What is LOVE ? -[Got to Singapore](singapore/singapore.md) +Got to Singapore -[Talk to Finn](talk-to-finn/finn.md) +Talk to Finn -[Play Guitar](guitar/guitar.md) +Play Guitar -[Contemplate the meaning of life](meaning/meaning.md) +Contemplate the meaning of life -[Rinse the marshmallow under the tap then eat it](dysentry/dysentry.md) +Rinse the marshmallow under the tap then eat it -[Wake up!](wake-up/wake-up.md) +Wake up! -[Thank Mr. Skeltal](2spooky/2spooky.md) +Thank Mr. Skeltal -[Utilize your wand once again...](utilize-wand/fork-rope-wand.md) +Utilize your wand once again... -[Draw a trapezoid](trapezoid/trapezoid.md) +Draw a trapezoid -[Stop, hammertime!](hammertime/hammertime.md) +Stop, hammertime! -[Analyze the composition of the marshmallow](analyze/analysis.md) +Analyze the composition of the marshmallow -[Watch Barcelona game](watch-barca/watch-barca.md) +Watch Barcelona game -[Oops! this story ain't ending..](unending-story/unending-story.md) +Oops! this story ain't ending.. -[Code](code/code.md) +Code -[Screaming goat is screaming](https://youtu.be/kh6c0SOfkH4) +Screaming goat is screaming -[Play on miniclip!](papa-louie/papa-louie.md) +Play on miniclip! -[Visit Sturgis 2015!](sturgis2015/sturgis.md) +Visit Sturgis 2015! -[Attack marshmallow pikachu!](pikachu/pokeball.md) +Attack marshmallow pikachu! -"I have problems with my sleep," you realise. "I'm going to [move to New York](new-york/new-york.md)." +"I have problems with my sleep," you realise. "I'm going to move to New York." -[Summon Dragons of the Khaleesi](dragons/fire-everywhere.md) +Summon Dragons of the Khaleesi -[Bounce](bounce/bounce.md) +Bounce -[Play some DotA 2](play-dota2/play-dota2.md) +Play some DotA 2 -[Play Starcraft 2](starcraft2/starcraft2.md) +Play Starcraft 2 -[Play some Geometry Dash](play-geometrydash/play-geometrydash.md) +Play some Geometry Dash -[See if there is a Udacity course on the subject](udacity/udacity.md) +See if there is a Udacity course on the subject -Click [here](young/young.md) to listen to music. +Click here to listen to music. -[Consult Flann O'Brien](flann-o-brien/truth-is-odd.md) +Consult Flann O'Brien -[Attack it with a lightsaber](lightsaber/lightsaber.md) +Attack it with a lightsaber -[Decide to browse Reddit instead](https://www.reddit.com/) +Decide to browse Reddit instead -[It's time to take a vacation](licked-cat/vacation.md) +It's time to take a vacation And then you realize that Burning Man is over, so no real vacations :( -[present-tense](present-tense/present-tense.md) +present-tense -[Think about happy thoughts while spinning around in circles](my-story/my-story.md) +Think about happy thoughts while spinning around in circles -[Story of DKER](DKER/DKER.md) +Story of DKER -[Get your prostate checked](prostate/prostate.md) +Get your prostate checked -If you eat a lot, you should also [exercise](exercise/exercise.md) +If you eat a lot, you should also exercise A quick brown fox jumps over the lazy dog! -[Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) +Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas -[Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) +Make marshmallow masala chai -[Watch a recording of an awesome jazz concert](https://www.youtube.com/watch?v=VMb3PX9gq78) +Watch a recording of an awesome jazz concert whilst wandering through the vastness of this universe. -[But what universe is this?](universe-test/blaze_verse.md) +But what universe is this? Either way we are cool, right? -This [miracle man](copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. +This miracle man can read your mind without uttering a word. -You decide that you do not want to visit the miracle man. [You check your -phone to find something else to do](check-phone/check-phone.md). +You decide that you do not want to visit the miracle man. You check your phone to find something else to do. -And you plug-in to [play some music](play-music/playmusic.md). +And you plug-in to play some music. The next thing you know, you're up all night in Croatia mixing a new playlist -You remember the story of a [robot](happy-robot/happy-robot.md). +You remember the story of a robot. -Wondering how you got here, you feel a strange tingling in your hands, almost as if -they are responding to your new surroundings. You feel an urge to gesture forward, -and as you do a large pink marshmallow shoots out of your hand into the wall before you. -[Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) +Wondering how you got here, you feel a strange tingling in your hands, almost as if they are responding to your new surroundings. You feel an urge to gesture forward, and as you do a large pink marshmallow shoots out of your hand into the wall before you. Explore your new marshmallow powers. -[The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) +The evil and heroic marshmallow -All in a hard days work, do you play some [music](play-music/playmusic.md). +All in a hard days work, do you play some music. -As you hold your pot of precious hunny, you begin to [hear an ominous voice...](ominous-voice/ominous-voice.md) +As you hold your pot of precious hunny, you begin to hear an ominous voice... -Honesty in a hard way [Watch it](few-good-men/fgm.md) +Honesty in a hard way Watch it -Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube.com/watch?v=lAF8D0ugyVk) +Maybe, just maybe, your not here, and this isn't happening But the call of of nature wasn't going away so you push open the toilet door and go in.. -Just then you recall the news story of what is causing the -[strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. - -...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) - -You escape into a [recording studio](more_cowbell/more_cowbell.md) +Just then you recall the news story of what is causing the [strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. -Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) +...and you are horrified by what you see -And then you stumble upon something [completely different](http://www.atlasobscura.com/) +You escape into a recording studio -After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) +Now for some music +And then you stumble upon something completely different -[What about skydiving](skydiving/skydiving.md) +After the stumble you trip over a plant guess what the plant is? -*Story intensifies!* +What about skydiving -You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie... +Story intensifies! -Instead of going to the movies, you decide to [solve the gase crisis](plow/plow.md) instead. +You decide to take a shortcut on the way to the movie... -You made it through the day and are starting to get sleepy... [Time to fall asleep](marshmallow.md) +Instead of going to the movies, you decide to solve the gase crisis instead. -You wake up in front of a computer screen. You begin reading -the text of a markdown file called marshmallow.md. As you read -you realize that the story is about you! -[remember this story!](this-story-is-about-you/this-story-is-about-you.md) +You made it through the day and are starting to get sleepy... Time to fall asleep -This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) +You wake up in front of a computer screen. You begin reading the text of a markdown file called marshmallow.md. As you read you realize that the story is about you! remember this story! -[Call a random number](call-a-random-number/answer.md) +This false egotism makes you forget something important. +Call a random number -You must be lonely. [Want a friend?](robofriend/AIRobot.md) +You must be lonely. Want a friend? -When I code over my weekend, I feel that this becomes my [whole life](code-my-life/code-my-life.md). +When I code over my weekend, I feel that this becomes my whole life. -Suddenly you feel a strong craving for [something.](craving/craving.md) +Suddenly you feel a strong craving for something. -Despite the little conundrum that you resolved, you realize that it's now -Friday, December 4th. +Despite the little conundrum that you resolved, you realize that it's now Friday, December 4th. "Wait a minute", you gasped, "The English Premier League is on tomorrow!!" -With that new revelation in mind, you quickly make like David Hasselhoff -and wiggle your wrist to show off a nice particular watch that even listens -to you when you speak to it. +With that new revelation in mind, you quickly make like David Hasselhoff and wiggle your wrist to show off a nice particular watch that even listens to you when you speak to it. -["Ahem!"](my-adventure/my-adventure.md) +"Ahem!" -So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... ->>>>>>> deb66146d3bd0481a4c19d27b8ef289b939d4156 +So the Epic Sexy Sax Guy saves the day, go here to read more about him ... -["Train Ride!"](train-ride/train-ride.md) +deb66146d3bd0481a4c19d27b8ef289b939d4156 -I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/star-wars.md) +"Train Ride!" + +I consider publishing a spoiler to the new Star Wars movie "What's a Heffelump?" asked Sheffield inquisitively. "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines -in the (not so near) future, -there are two options you must choose from. +When faced with a lot of work and impending deadlines in the (not so near) future, there are two options you must choose from. -You may either do [this](gtd/gtd.md), +You may either do this, - or [that](procrastinate/procrastinate.md). +or that. - This is one weird story. Did anybody read the whole page? +This is one weird story. Did anybody read the whole page? - I sure did not. This is as weird as it gets. +I sure did not. This is as weird as it gets. -[Get Crazy!](crazy/crazy.md) +Get Crazy! -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim -[move to Boston](boston/boston.md)." +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim move to Boston." -Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! +Wait a second, I actually meant to say that Camelot is where I really want to go! -"Who will you [serve](joshua_24_15/joshua_24_15.md)?" +"Who will you serve?" Yourself? Instead of reading this entire story, you decide to go see the new star wars! -As you're walking down the street you see [something](millenium-falcon/flyaway.md) +As you're walking down the street you see something -You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). +You decide that $1.5 billion is too much to pass up, so you buy a Powerball ticket. -[Do you have my stapler?](stapler/stapler.md) +Do you have my stapler? -[Build a car](build-a-car/build-a-car.md) +Build a car -What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? +What is Bayes' theorem? -The divergence is coming, [survive](divergence/divergence.md) or perish? +The divergence is coming, survive or perish? -[Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) +Hear a roaring sound in the distance -You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) +You decide to work on one of your big projects... You start off strong... -But there are [too many hurdles in your way](hurdles/hurdles.md). +But there are too many hurdles in your way. -"What a joke?", he said, after looking at the [news](joke/joke.md) +"What a joke?", he said, after looking at the news -Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... +Hmmm....I wonder what this fortune cookie says... -It says you should [brew some beer](beer-brewer/beer-brewer.md). +It says you should brew some beer. -The [news](joke/joke.md) says it all my people! +The news says it all my people! -Bible says... As you sow, so shall you [reap](think/growrich.md) +Bible says... As you sow, so shall you reap -So shall you reap, and the [steelers](steelers/steelers.md) know that all too well! +So shall you reap, and the steelers know that all too well! -Until you realize that even marshmallows need [LOVE](https://www.youtube.com/watch?v=i5fZ__mnHbU). +Until you realize that even marshmallows need LOVE. -Marcel needs a new pair of shoes, will you buy shoes for [Marcel](https://www.youtube.com/watch?v=VF9-sEbqDvU)? +Marcel needs a new pair of shoes, will you buy shoes for Marcel? -You look up and out to the ocean. In the distance you see a [mermaid](mermaid/mermaid.md) +You look up and out to the ocean. In the distance you see a mermaid -The mermaid above died, but [don't worry...](mermaid2/mermaid.md) +The mermaid above died, but don't worry... -A fairy tale about [a shoemaker and elves](elves-and-shoemaker/elves-and-shoemaker.md) +A fairy tale about a shoemaker and elves -The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) +The 3 Rules of Test Driven Development Read the Rules -The understanding of git [go here](Booyah/booyah.md) +The understanding of git go here -[Link to Git Official Website](git/git.md) +Link to Git Official Website -[link to google website](kumar/kumar.md) +link to google website -Do you want to know [Git disadvantage?](git_disadvantage/git_disadvantage.md) +Do you want to know Git disadvantage? Hi i got this one for udacity team. -As the sand encompassed her toes and -the ocean-spray breezed through her nose +As the sand encompassed her toes and the ocean-spray breezed through her nose she froze... @@ -993,244 +918,229 @@ Let it go, let it gooo... CANT HOLD IT BACK ANY MORE -Do you want to build a [snowman?](snowman/snowman.md) +Do you want to build a snowman? -It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) +It doesn't have to be a snowman I think I'll try defying gravity. -Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) +Do you know Indonesian Culture? -[Paint It Black](paint-it-black/PaintItBlack.md) +Paint It Black -[Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) +Try to solve Rubik's Cube -[To Infinity and Beyond](math/math.md) +To Infinity and Beyond -[I hope you aren't using a poorly built crawler on this](./marshmallow.md) +I hope you aren't using a poorly built crawler on this -[Read my story](magic2/magic2.md) +Read my story -[..and recall that Carl Johnson might be alive](Carl/carl-johnson.md) +..and recall that Carl Johnson might be alive -[Or, forget it all, and jump off the cliff](cliff/cliff.md) +Or, forget it all, and jump off the cliff -[Make a pie chart](http://i.imgur.com/uaFES1b.jpg) +Make a pie chart -[Read a story of a crouch dragon](crouch-dragon/crouch-dragon.md) +Read a story of a crouch dragon -[Write a hiku](write-a-hiku/hiku.md) +Write a hiku -Explore the unknown. Most people die without ever visiting this [place.](underwater/scuba-diving.md) +Explore the unknown. Most people die without ever visiting this place. As you attempt this, a voice booms!! -The [boom](day-dream/day-dream.md) - -Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) +The boom -You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) +Is it really? You see what appears to be a tunnel, a tunnel leading into the unknown -For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) +You start your way through the tunnel but you feel something coming on -You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). +For the love of Matt Murdock Daredevil -You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). +You feel woozy, you take a nap. -So what to do next? Three doors appear and all other ways out disappear. -So you pick the [right door](mysterydoor/mysterydoor.md) +You decide to go scuba diving and see a great submarine. -You put your [cowboy hat](cowboy/cowboy.md) back on your head. +So what to do next? Three doors appear and all other ways out disappear. So you pick the right door -Or... or... or... Oh, I forgot! -You foget something, but you decide to [move on](move-on/move-on.md). +You put your cowboy hat back on your head. -You follow the panda up the nearest tree, chewing bamboo shoots as you go [bamboo-shoots](bamboo/bamboo-shoots.md) +Or... or... or... Oh, I forgot! You foget something, but you decide to move on. -And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) +You follow the panda up the nearest tree, chewing bamboo shoots as you go bamboo-shoots -[Do nothing.](nothing/do-nothing.md) +And then you look up and see it, you can't bealive is him but there he is staring at you -[Rent a hydroplaning dog sled to get you to the other side of the world](dog-sled/dogsled.md) +Do nothing. -Toasted [marshmallow](toasted/smores_pie.md) +Rent a hydroplaning dog sled to get you to the other side of the world -While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. -[The new record is!](new_warriors_record/new_warriors_record.md) +Toasted marshmallow -Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). +While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. The new record is! -Life is full of [puzzles](LifePuzzle/LifePuzzle.md). +Of Course you must reach the end of your story, but remember this. -You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". +Life is full of puzzles. -A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) +You hear a hollow voice say "Plugh". Mesmerized, you say "Plugh". -Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) +A light appears all around you and something comes into focus in the distance. What is that? -If you have read this far, then you must be in pain. -Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. +Story about Indian Hockey Player Rupinder Pal Singh -As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. +If you have read this far, then you must be in pain. Click here to learn about Accupuncture. -Health and Life Lovely [Quotes](./health/health.md) +As you approach the Stargate with trepidation, you can hear the troops getting closer. -The lannisters always pays thier debts, says tyrion lannister. Interesting [character](./gameofthrones/tyrion.md) he is. +Health and Life Lovely Quotes -Time to [move to Canada](Canada/Canada.md), eh? +The lannisters always pays thier debts, says tyrion lannister. Interesting character he is. -You struggle to find a line break to add your own adventure. -You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) +Time to move to Canada, eh? +You struggle to find a line break to add your own adventure. You also want to undo the Brexit result. You try CTRL-Z... +The crushing weight of all these options causes you to end your life. -The crushing weight of all these options causes you to [end your life.](end/end.md) +You're reincarnated as a green starfish but wish you were blue instead. -You're reincarnated as a green starfish but wish you were [blue instead.](starfish/starfish.md) +Motivate yourself -[Motivate yourself](Motivate/Motivate.md) +You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you do -You wake up as Harry Potter ... and are facing Voldemort in a duel? -What should you [do](magicaladventure/decision_time/decision_time.md) +My tea's gone cold I'm wondering why I got out of bed at all... -My tea's gone cold I'm wondering [why](stan/stan.md) I got out of bed at all... +Click here to vote for Bernie Sanders. -[Click](vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. +You decide you want to be a pirate and remember a show called onepiece -You decide you want to be a pirate and remember a show called -[onepiece](onepiece/op.md) +You looking for a country for advanture? Try Taiwan! -You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Taiwan.md)! +you find a mysterious cup with clear liquid in it. drink? -you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) +Time to check out the latest Total War - Warhammer! -Time to check out the latest [Total War - Warhammer](total-war/war-start.md)! +You wake up in the morning and your computer is looking out of the window -You wake up in the morning and your [computer is looking out of the window](computer-window/computer-window.md) +Instragram, a great place to spend time. Visit my profile -Instragram, a great place to spend time. [Visit my profile](https://www.instagram.com/coding.imagination/) +You've been charged with treason against the King. You wake up in prison. -You've been charged with treason against the King. You wake up in [prison](prison/prison.md). +My visit to the zoo. -My visit to the [zoo](zoo/zoo.md). +You wake up confused, you faint you go back in time -You wake up confused, you faint you go back in [time](time-travel/time-travel.md) +The Hungry Prince -[The Hungry Prince](hungry_prince/hungry_prince.md) +The Angry Prince -[The Angry Prince](angry_prince/angry_prince.md) +The password is xyzzy -The password is [xyzzy](plugh/plugh.md) +Say "Hi" to Guangwu -[Say "Hi" to Guangwu](Guangwu/Guangwu.md) +Perishing in an avalanche of words, in a mundane collection of sentences called "stories". Devastated? -Perishing in an avalanche of words, in a mundane collection of sentences called "stories". -[Devastated?](devastated_greatness/devastated_greatness.md) +Ever the fan of Doug Adams. -Ever the fan of [Doug Adams](doug-adams/doug-adams.md). +If you really want to know the answer to the question.... "What is the answer to Life, the Universe and Everything?" then you need some Deep Thought -If you really want to know the answer to the question.... -"What is the answer to Life, the Universe and Everything?" then you -need some [Deep Thought](doug-adams/deep-thought/deep-thought.md) +Check out this showerthoughts subreddit -Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit +Discover a new genre of music! -[Discover](discover-new-genres/discover-new-genres.md) a new genre of music! +Watch Too Many Puppies! -[Watch](https://www.youtube.com/watch?v=-XJN7qqFqPE) Too Many Puppies! +You meet Rickson Gracie... -You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... +You decide to quit your job to play Pokemon Go full time. -You decide to quit your job to play [Pokemon Go](pokemon-go/pokemon-go.md) full time. +Learn about something random here! -Learn about something random [here](https://en.wikipedia.org/wiki/Special:Random)! +Learn about Ankesh here -Learn about Ankesh [here](characters/ankesh.md) +Hold the door! [Spoiller GOT] -[Hold the door!](hold_the_door/hodor.md) [Spoiller GOT] ->>>>>>> b6c70ae2fc2160a4b1b9c8639b4567de6b5a4a93 +b6c70ae2fc2160a4b1b9c8639b4567de6b5a4a93 -You realise that the philosphy of life in general boils down to -that one central question... will you? or will you not? -[So Will you?](philosophy/questions.md) +You realise that the philosphy of life in general boils down to that one central question... will you? or will you not? So Will you? -You recited [cosmological argument](cosmological_argument/cosmological_argument.md) in the morning in hub. +You recited cosmological argument in the morning in hub. -You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). +You take the time to contemplate the nature of identity. -Click [here](https://www.youtube.com/watch?v=aboZctrHfK8) to find out what the meaning of life is. +Click here to find out what the meaning of life is. -so lazy [here](lazy/lazy.md) +so lazy here -[Update](android/marshmallow6.0.md) your Smartphone to the Marshmallow 6.0! +Update your Smartphone to the Marshmallow 6.0! -Click [here](walrus/walrus.md) +Click here -Click here to learn more about the MEAN stack [here](mean-stack/mean.md) +Click here to learn more about the MEAN stack here -Do you like [stargazing](stargazing/stargazing.md) ? +Do you like stargazing ? -Let's learn some [mandarin](learn-mandarin/learn-mandarin.md) +Let's learn some mandarin -Neurons for social memories, [more info](http://news.mit.edu/2016/scientists-identify-neurons-social-memory-0929) +Neurons for social memories, more info -What is the meaning of life? -To find out click [here](meaning-of-life/meaning-of-life.md). +What is the meaning of life? To find out click here. -What is that shiny in the window? Come in and take a -[look](Computer-Man/Computer-Man.md) +What is that shiny in the window? Come in and take a look -The [shiny device](shiny-device/shiny-device.md) +The shiny device -Wanna trip yourself? Hue has a place you would like to [enter](Trip-Yourself-Hue/trippy.md) +Wanna trip yourself? Hue has a place you would like to enter -You decide to [slapa-da-bass](slapa-da-bass/slapa-da-bass.md) +You decide to slapa-da-bass -If you want to play soccer, click [here](Soccer/soccer.md) +If you want to play soccer, click here -If you are a soccer fan, see your team [here](soccerfan/soccerfan.md) +If you are a soccer fan, see your team here -I am also a soccer fan, I am a Man U fan from EPL. To see Man U click [here](ManU/ManU.md) +I am also a soccer fan, I am a Man U fan from EPL. To see Man U click here -Wow, you made it to the end! You are determined, [see](persistent/persistent.md) what awaits. +Wow, you made it to the end! You are determined, see what awaits. -Wait! This is not the end! OMG [click me](never_ended/never_ended.md) +Wait! This is not the end! OMG click me -have you already heard the story of the Choking Doberman? [click me](dog_finger/dog_finger.md) +have you already heard the story of the Choking Doberman? click me -Join me in [Tree of Savior!](tos/tos.md) +Join me in Tree of Savior! -Let's do the [Front-end Web Developer Nanodegree](front_end/front_end.md) together! +Let's do the Front-end Web Developer Nanodegree together! -How about we all [learn android](https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) ! +How about we all learn android ! -Let's finish a small goal, [for example](set_up_a_small_goal/setup_a_small_goal.md) +Let's finish a small goal, for example -You decide to teach google to be a [Pictionary](https://quickdraw.withgoogle.com/) champion. +You decide to teach google to be a Pictionary champion. -Jason Calacanis is one of the best interviewers I've seen. -[Here](https://www.youtube.com/channel/UCkkhmBWfS7pILYIk0izkc3A) they are +Jason Calacanis is one of the best interviewers I've seen. Here they are My best girls are Toujou Nozomi, Aragaki Ayase, and Sendouin Kaede. -Maybe this is a [dream](dream/dream.md)? +Maybe this is a dream? + +Or maybe you love pugs? + +Or maybe you're trying to avoid the cold outside -Or maybe you love [pugs](https://www.youtube.com/watch?v=3pPR7vk-e3Y)? +<<<<<<< HEAD Have you ever heard any unusual sounds when you're alone? They're not what you think. Get to know them here -Or maybe you're trying to avoid the cold [outside](cold_outside/cold_outside.md) +======= Like football or soccer(as many others call it)? Must Watch The_Greatest_Battle_Ever -Like football or soccer(as many others call it)? Must Watch -[The_Greatest_Battle_Ever](https://www.youtube.com/watch?v=KyHDZqp2ThU) +Some other guy beat me to it. Too lazy here -Some other guy beat me to it. Too lazy [here](lazy/lazy.md) +What if I told that all this is just a bunch of files -What if I told that all this is just a bunch of [files](see-files/files.md) +upstream/master -A Story of Being Alone -Read it [here](alone/alone.md) +A Story of Being Alone Read it here -Information on some famous tv series -[click here](famous-tv-series/famous-tv-series.md) +Information on some famous tv series click here I have atlast found a way to heaven...Want to go [there](00_PortBlair's Emerald blue/PortBlairVoyage.md) @@ -1238,10 +1148,8 @@ Why are you reading this line? smile and move on. Smile and move on gingerly. -What is your [passion?](passion/passion.md) - -- +What is your passion? -searching for [good](tvf-play/watch.md) content. +searching for good content. -Do you like [tigers](tiger/tiger.md)? +Do you like tigers? \ No newline at end of file From a47debc4d417c9b96fbfff11bd31bd6517ba3317 Mon Sep 17 00:00:00 2001 From: Nelson Date: Tue, 7 May 2019 14:20:58 +0100 Subject: [PATCH 5387/5486] Remove mistakes --- english/marshmallow.md | 1082 ++++++++++++++++++++++------------------ 1 file changed, 590 insertions(+), 492 deletions(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index 41377449b9..b0197062d2 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1,158 +1,173 @@ There's a spot open for the role of [Lead Programmer](programmer/lead_programmer.md) -Wanna know what after death? Click here +Wanna know what after death? Click [here](after-death/after-death.md) Once upon a time many authors collaborated to make meaningless linked story. -Escape earth and journey through space +[Escape earth and journey through space](space-travel/space-travel.md) -And that story was about cricket +And that story was about [cricket](cricket/if-you-love-cricket/ifyoulovecricket.md) Now what? -A few learned to tango +A few learned to [tango](tango/tango.md) -Some preferred to Enter The Forest! +Some preferred to +Enter [The Forest!](forest/forest.md) -If you are a fan of ZooZoo go here +If you are a fan of ZooZoo go [here](zoozoo/zoozoo.md) hi~ -NGE is here +NGE is [here](NGE/NGE.md) -start your journey into world of mad +[start](mad/mad.md) your journey into world of mad or -spend your time wisely +spend your time [wisely](http://www.pythonchallenge.com/) -Click here to visit my dvloper.me blog . +[Click here](http://www.dvloper.me) to visit my dvloper.me blog . Are you a: -cat person +[cat person](https://www.youtube.com/watch?v=-hIugp7p5O0) or a -dog person ? +[dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? -Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. +Your adventure begins. You realize there are hundreds of paths for you to choose from. +Which way should you go? Only you can decide. Oh so many decisions - what will you do?? -In the end you will realize that it [doesn't really matter] (https://goo.gl/1fd4wU). The path you choose is as good as any. +In the end you will realize that it [doesn't really matter] +(https://goo.gl/1fd4wU). +The path you choose is as good as any. -You decide to drop everything you're doing and run out the door! +You decide to drop everything you're doing and [run out the door](run_out_the_door/run_out_the_door.md)! -Build time machine +[Build time machine](time-machine/time-machine.md) -Take some time off! +Take some [time](meditation/meditation.md) off! -Roll a D20 and see what luck brings. +[Roll a D20](dungeons-and-dragons/dungeons-and-dragons.md) and see what luck brings. -Life is full of twists and turns like but try to cheer yourself and people around you. Click Here +Life is full of twists and turns like but try to cheer yourself and people around you. [Click Here](Happy/happie.md) Who is better? -Click Here to vote for Captain America +[Click Here](captain/captain.md) to vote for Captain America -Click Here to vote for Iron Man +[Click Here](ironman/ironman.md) to vote for Iron Man -Click here to vote for a Special Agent click here to vote for london +[Click here](00_8_Agent/The_name_is_Bond_Milton_Bond.md) to vote for a Special Agent +[click here](london/london.md) to vote for london January 2017 approaches. You have two presidential candidates to vote for. -Click here to vote for Donald Trump. +[Click](vote-the-president/trump/trump.md) here to vote for Donald Trump. -Click here to vote for Hillary Clinton. +[Click](vote-the-president/hillary/Hillary.md) here to vote for Hillary Clinton. -You don't like either of these candidates. So instead, you decide to write a symphony or paint a picture. +You don't like either of these candidates. +So instead, you decide to [write a symphony](write-a-symphony/symphony.md) +or +[paint a picture](paint-a-picture/paint-a-picture.md). -Keith the Unicorn approaches you. He looks a little forlorn so you decide to cheer him up. +Keith the Unicorn approaches you. +He looks a little forlorn so you decide to [cheer him up.](unicorn/thebigquestion/thebigquestion.md) -It is time to begin your adventure. Your search for the grail begins now +It is time to begin your adventure. +Your search for the grail begins [now](Monty-Python/search.md) -Down one path you see a person standing in the middle of the path. They look familiar somehow, but you just can't figure out who they are. They seem friendly so you decide to go talk to them. +Down one path you see a person standing in the middle of the path. +They look familiar somehow, but you just can't figure out who they are. +They seem friendly so you decide to go [talk to them.](friendly-person/friendly-person.md) -Ask them to join you on a life changing quest? +Ask them to join you on a life changing [quest?](zuluquest/choosequest.md) -Realize the truth about candidates' tax plans +Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) -How about some chill music? +How about some [chill music](chillmusic/chillmusic.md)? -Want to see my Quora profile +[Want to see my Quora profile](ismail-quora-profile/quora-profile.md) -You decide the only way out is to climb, climb hard friend. +You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. -I also agree only way to find way is to keep climbing or walking or studying or learning or all of this is DOING. DOING will definitely keep your sharpened with latest skills (which you can get by the way from Udacity !!!) +I also agree only way to find way is to keep climbing or walking or studying or learning or all of this is DOING. +DOING will definitely keep your sharpened with latest skills (which you can get by the way from Udacity !!!) [Know about the life of this world](00-Life-of-this-world/Life of this world.md) -This is a story to look for your own, to fight your way out of this or to calm down +This is a story to look for your own, to [fight your way out of this](fight-out/fight-out.md) or to calm down -Talk to neighbour +Talk to [neighbour](talk_to_neighbour/talk_to_neighbour.md) -Vist the master liquid. +Vist the master [liquid](liquid/liquid.md). -Drink some bear +Drink some [bear](bear/bear.md) -play with the (git) branches +[play](http://pcottle.github.io/learnGitBranching/) with the (git) branches -and search for your destiny. +and search for your [destiny](destiny/destiny.md). -Before we begin, do you need a warm-up? +Before we begin, do you need a [warm-up?](warm-up/warm-up.md) -Once you're warmed up, why not try a work out? +Once you're warmed up, why not try a [work out?](work-out/work-out.md) -or maybe eat that delicious cucumber sandwich? +or maybe [eat that delicious cucumber sandwich?](sandwich/sandwich.md) -After warming up, take a minute and reflect on your love for udacity +After warming up, take a minute and reflect on your [love for udacity](love-udacity/love-udacity.md) -You are are man (or woman) for all seasons but need help in choosing your travel destinations.. Of course we are happy to help you with these suggestions +You are are man (or woman) for all seasons but need help in choosing +your travel destinations.. Of course we are happy to help you with these +[suggestions](travel-destinations/travel-destinations.md) -Meet a Schrodingers cat +Meet a [Schrodingers cat](schrodinger-cat/schrodinger-cat.md) -Another visitor! Stay a while... +Another visitor! [Stay a while...](impossible-adventure/start/start.md) -I am the one who knocks +[I am the one who knocks](say-my-name/say-my-name.md) -The Secret to Life...Seriously +[The Secret to Life...Seriously](https://www.youtube.com/watch?v=dQw4w9WgXcQ) -Some inspirational Lines +[Some inspirational Lines](the-nights/the-nights.md) -Time for some teachings on life and success +[Time for some teachings on life and success](swami-vivekananda/swami-vivekananda.md) One morning, you wake up in a strange room with marshmallows for walls. Marshmallows smell funny. What is a marshmallow anyway? -Unexpectedly, the Chief Marshmallow demands to see your references. +Unexpectedly, the Chief Marshmallow demands to see your [references](references/references.md). -Show him your references. +Show him your [references](https://youtu.be/uZbjlsX0DNY?t=10s). -The Chief Marshmallow also demands that you watch Sonicsgate +The Chief Marshmallow also demands that you watch [Sonicsgate](https://www.youtube.com/watch?v=s9Dp20ydm1E) -(Must be a Tuesday.) +*(Must be a Tuesday.)* Or a Wednesday...Thursday...maybe even a Friday, but definetely not a Saturday. -Or a Wednesday... +Or a [Wednesday](make_changes_GitHub/make_changes_GitHub.md)... -Thursday... maybe even a Friday, but definetely not a Saturday. +[Thursday](doug-adams/arthur-dent/arthur-dent.md)... maybe even a Friday, but definetely not a Saturday. Ok, we have to consider Saturday too. -this crazy thought popped into your head +[this crazy thought popped into your head](yellow-baby-buggy-bumpers/yellow-baby-buggy-bumpers.md) -Alice doesn't live here anymore, or does she? +Alice doesn't live here anymore, [or does she?](scarab/goddess.md) -But not Monday; you never go out on a Sunday evening......or do you? +But not Monday; you never go out on a Sunday evening......[or do you](./or-do-you/or-do-you.md)? -Gee Whiz! You decide to share your story in the Acts of Kindness page. +Gee Whiz! You decide to share your story in the [Acts of Kindness](kindness/acts-of-kindness.md) page. -For a second, you decide whether or not to just go back to sleep +For a second, you decide whether or not to just [go back to sleep](go-back-to-sleep/go-back-to-sleep.md) -Then, you consider playing a chess puzzle +Then, you consider playing a [chess puzzle](chess/chess.md) A sound from a Hitchcock movie fills the room, then quickly fades away. @@ -160,59 +175,88 @@ Was it the sound of a cry from the shower? Was it the sound of birds? -It sounded like it could have been a heffalump +It sounded like it could have been a [heffalump](heffalump/heffalump.md) No... perhaps not. Not at all. -I think it was an animal. +I think it was an [animal](animal/animal.md). -Nope, it was Tim Berners-Lee sobbing in despair. +Nope, it was [Tim Berners-Lee](https://en.wikipedia.org/wiki/Tim_Berners-Lee) sobbing in despair. -Thinking back, there are no memories to suggest that this should have been anything but an ordinary morning. You didn't go out last night, you don't usually take intoxicants, what's happening...? +Thinking back, there are no memories to suggest that this should have been +anything but an ordinary morning. You didn't go out last night, you don't +usually take intoxicants, what's happening...? Maybe this is a dream? -Or a memory? +Or a [memory](memories/memories.md)? -Or is it just boring old real-life? +Or is it just boring old [real-life](real-life/real-life.md)? -Or The Force! +Or [The Force](https://www.youtube.com/watch?v=cFn-NobVaoI&feature=youtu.be)! -Or is this just fantasy? +Or is this just [fantasy](https://www.youtube.com/watch?v=fJ9rUzIMcZQ)? -Maybe it's a dream within a dream? Maybe dreaming and reality are one and the same. Maybe reality is an oxymoron when considering multiple dimensions. +Maybe it's a dream within a dream? Maybe dreaming and reality are one and the +same. Maybe reality is an oxymoron when considering multiple dimensions. -Maybe you're in Inception. +Maybe you're in [Inception](inception/inception.md). But it's probably not worth dwelling on that right now, you could be in danger. Grave danger. Oh No! -(Is there another kind?) +*(Is there another kind?)* I actually used to know a guy named Dave Granger. We sure had some good times! Anyway, the possibility of danger lurks. -The type of extreme mortal danger that so often accompanies confectionary inspired interior design. Quickly surveying your immediate surrounds, you notice a garishly dressed, vacant-eyed young man lounging on a nearby sofa. +The type of extreme mortal danger that so often accompanies confectionary inspired interior design. +Quickly surveying your immediate surrounds, you notice a garishly dressed, +vacant-eyed young man lounging on a nearby sofa. -The man is not large but not small, but not average either. He is reciting poetry in a language you assume to be Egyptian, though you are not familiar with Egyptian. You only assume this because of the small pictograms that seem to rise into the air above his head when he speaks. One looks like a small bird. Another a small insect. A third is for all appearances the third car your father ever bought you, a small Fiat 500, which though in the picture above the man's head is purple, was in reality more of a mauve. It had a tendency to bark whenever you drove it over hills, not like the proud great dane from Nova Scotia that most smaller cars tend to imitate when taking on tasks greater than their strengths, but rather more like the small pomerainian who is now barking at the blue music notes hovering over the man's large-ish head, now peeing on the back of the sofa, making it difficult for you to remember the name of that dude you totally scored with in the back of your Fiat 500. You're finding it difficult to think. You sit down on the sofa to gather your thoughts. You think of all the men you slept with on your hitch hiking journeys across the southern american continent. +The man is not large but not small, but not average either. +He is reciting poetry in a language you assume to be Egyptian, +though you are not familiar with Egyptian. You only assume this +because of the small pictograms that seem to rise into the +air above his head when he speaks. One looks like a small bird. +Another a small insect. A third is for all appearances the +third car your father ever bought you, a small Fiat 500, which +though in the picture above the man's head is purple, was +in reality more of a mauve. It had a tendency to bark whenever +you drove it over hills, not like the proud great dane from +Nova Scotia that most smaller cars tend to imitate when taking +on tasks greater than their strengths, but rather more like +the small pomerainian who is now barking at the blue music notes +hovering over the man's large-ish head, now peeing on the +back of the sofa, making it difficult for you to remember the +name of that dude you totally scored with in the back of your +Fiat 500. You're finding it difficult to think. You sit down on +the sofa to gather your thoughts. You think of all the men +you slept with on your hitch hiking journeys across the southern +american continent. -Pinch yourself to see if this is a dream. +[Pinch yourself to see if this is a dream.](./is-this-a-dream/is-this-a-dream.md) -You recall what a man said to you once: "Live as one of them, Kal-El, to discover where your strength and your power are needed. Always hold in your heart the pride of your special heritage. They can be a great people, Kal-El; they wish to be. They only lack the light to show the way. For this reason above all, their capacity for good, I have sent them you... my only son." +You recall what a man said to you once: "Live as one of them, Kal-El, to discover +where your strength and your power are needed. Always hold in your heart the +pride of your special heritage. They can be a great people, Kal-El; they wish to +be. They only lack the light to show the way. For this reason above all, their +capacity for good, I have sent them you... my only son." -Remember that you are superman. +[Remember that you are superman.](./remember-you-are-superman/remember-you-are-superman.md) -Call in the Justice League! +Call in the [Justice League!](./justice-league/justice-league.md) -Interrogate the man for clues. +[Interrogate the man for clues.](./movie-ripoffs/zoolander/zoolander.md) -That sure sounds familiar... +[That sure sounds familiar...](./sounds-familiar/sounds-familiar.md) -These marshmallows are numerous and they look so delicious. ... despite the feeling they're somehow judging you for only wearing one sock. +These marshmallows are numerous and they look so delicious. +... despite the feeling they're somehow judging you for only wearing one sock. -Turn one of the marshmallows into gold. +[Turn one of the marshmallows into gold.](./alchemy/alchemy.md) You reach out to grab a handful of the marshmallow wall, but you can't seem to take the handful away from the wall. @@ -220,33 +264,35 @@ You also seem to be wearing an uncomfortable and restrictive jacket made of leat You don't own any uncomfortable and restrictive leather jackets... How did you end up sleeping in one? -Suddenly, fuzzy memories of a tavern and an exotic woman... a house made of candy... closets full of umbrellas and leather. +Suddenly, fuzzy memories of a tavern and an exotic woman... +a house made of candy... +closets full of umbrellas and leather. An umbrella (closed) automagically appears in your left hand. You tentatively -poke the wall with it. +[poke the wall](./poke-the-wall/poke-the-wall.md) with it. -You decide to bite the marshmallow wall. +[You decide to bite the marshmallow wall.](./bite-the-marshmallow/tasty-marshmallow.md) You are feeling very anxious at this point. -You can't decide if anything is worth it anymore so you loose yourself at a David Gray concert. +You can't decide if anything is worth it anymore so you loose yourself at a [David Gray concert.](concert/concert.md) Goosebumps appear. This is because you do not like leather for ethical reasons. -Leather is all over San Fransisco. +Leather is all over [San Fransisco](sanfran/sanfran.md). -Ethical reason? Seriously? +[Ethical reason? Seriously?](./ethical-reason/ethical-reason.md) You begin to break out of the jacket and find a lighter, a fork, and rope. You also find a new packet of double chocolate caramel Tim Tams inside a pink sock. -But only find out that the chocolate has expired 132 days ago. +But only find out that the chocolate has expired [132 days ago](./132-days-ago/132-days-ago.md). -Do you want to try to fill the remaining space in the sock with marshmallows? +Do you want to [try to fill the remaining space in the sock with marshmallows](./fill-sock/fill-sock.md)? You are not sure who placed these objects near you or why. @@ -254,23 +300,24 @@ But you have a growing sense that these mundane objects are vital to your surviv You decide to try to light a fire to melt some of the marshmallows so you look for some kindling. -You have the suspicion that you are being closely watched. +[You have the suspicion that you are being closely watched.](./watched/watched.md) -Of course, it's that man on the sofa; go talk to him again. +[Of course, it's that man on the sofa; go talk to him again.](./movie-ripoffs/zoolander/zoolander.md) -Wait, I'm in front of a mirror... Am I? Let's see... +[Wait, I'm in front of a mirror... Am I? Let's see...](./mirror/enter-mirror.md) You see a polar bear searching for food. -I see that you may be from the North. How's it going? +I see that you may be from the North. [How's it going?](./north/north.md) -A Shotgun appears! +[A Shotgun appears!](./shotgun/shotgun.md) -Whilst cycling backwards. +[Whilst cycling backwards.](./cycling-backwards/cycling-backwards.md) "Well- OK," you admit to yourself, "perhaps I do indulge in the occasional intoxicant!" -In a brief moment of clarity, you decide it's time for a change and start to cycle forwards. +In a brief moment of clarity, you decide it's time for a change and start to +[cycle forwards](./cycling-forwards/cycling-forwards.md). You hear a small bird sound in the distance. @@ -280,13 +327,16 @@ Something lightly brushes the back of your neck, sending a chill down your spine Startled, you immediately whirl around to see who (or what) touched you...but there's no one behind you. -You hear a strange noise then turn and see a large, wooden door. Too large, in fact, and yet too small, for the frame it rests in. You walk through the door. +You hear a strange noise then turn and see a large, wooden door. +Too large, in fact, and yet too small, for the frame it rests in. +You [walk through the door](./unnatural_door/unnatural_door.md). You turn for a third time and see a small, metal door. -You knock, hear nothing and decide to enter. +You knock, hear nothing and decide to [enter](./strange-room/room.md). -Click here to use your sonic screwdriver to scan the air for alien life forms. +Click [here](./sonic-screwdriver/sonic-screwdriver.md) to use your sonic screwdriver to scan the air +for alien life forms. When you look away, a marshmallow hand attempts to grab the lighter. @@ -316,13 +366,16 @@ A soft echo of a torrent is fading from far... I felt a sudden ease of mind. -"Ok", I said to myself, "I need to get out of here" +"Ok", I said to myself, "I need to get +[out of here](outta-here/outta-here.md)" -"But first I must remember the magic spell needed to open the enchanted door!" Where is Hermione Granger when you need her? Where I ask you? Oh, I know. Click here +"But first I must remember the magic spell needed to open the enchanted door!" +Where is Hermione Granger when you need her? Where I ask you? +Oh, I know. Click [here](hermione/hermioneHere.md) You pick up the fork and wrap it in rope to fashion a crappy wand. -For more on wand history here. +For more on wand history [here](./wand/wand.md). Pointing it at the door, eyes closed, "Alohomora..." @@ -334,581 +387,601 @@ Sheepishly you look down on the crappy wand in your hand. You must be doing something wrong. You drink a beer and think about it, then Ah-ha! -so many beer options.. +so many [beer](drink-beer/drink-beer.md) options.. You notice your pants are now glowing, so you must have been holding the wand upside down. -Suddenly, you become aware of the need to take a leak. You can't hold it. You wonder, Are glowing pants waterproof? You Look for a toilet +Suddenly, you become aware of the need to take a leak. +You can't hold it. You wonder, Are glowing pants waterproof? +You [Look for a toilet](./eating-walls/find-a-toilet/find-a-toilet.md) + Do you: -Give up and start over. +Give up and [start over](marshmallow.md). -Listen to Tales of the Inexpressable (By Shpongle) +[Listen to Tales of the Inexpressable (By Shpongle)](https://www.youtube.com/watch?v=6WTxC8wnXQo) -Watch the new Star Wars trailer +[Watch the new Star Wars trailer](https://www.youtube.com/watch?v=sGbxmsDFVnE) -Watch the second new Star Wars trailer +[Watch the second new Star Wars trailer](https://www.youtube.com/watch?v=ngElkyQ6Rhs) -Live Tweet the situation +[Live Tweet the situation](tweet-it/tweet-it.md) -Blackout and wake up in a strange place without knowing how +[Blackout and wake up in a strange place without knowing how](33hours/wakingup.md) -Take out your knitting project and finish your sock heel turn. +Take out your [knitting project](knit/knit.md) and finish your sock heel turn. -Take out your crochet project instead and finish that teddy bear you've been working on. +Take out your [crochet project](crochet/crochet.md) instead and finish that teddy bear you've been working on. -Realize you are in the ... +[Realize you are in the ...](in-matrix/matrix.md) -Realize you better call Saul +[Realize you better call Saul](better-call-saul/saul.md) -Turn off all the lights +[Turn off all the lights](lightsoff/lightsoff.md) -Sit back a listen to your favourite White Stripes track +[Sit back a listen to your favourite White Stripes track](listen_white_stripes/listen_white_stripes.md) -Feel a sudden urge to dance +[Feel a sudden urge to dance](https://youtu.be/dQw4w9WgXcQ) -Make changes on GitHub to revise this crazy story +[Make changes on GitHub to revise this crazy story](make_changes_GitHub/make_changes_GitHub.md) -Pick up giant blowtorch +[Pick up giant blowtorch](pick-up-blowtorch/blowtorch.md) -Go eat some rainbows +[Go eat some rainbows](eat-rainbows/rainbows.md) -Admire your glowing pants +[Admire your glowing pants](glowing-pants/glowing-pants.md) -Grab some coffee? +[Grab some coffee?](coffee/coffee.md) -Grab some wine? +[Grab some wine?](wine/wine.md) -Call the GhostBusters +[Call the GhostBusters](ghostbusters/ghostbusters.md) -Talk to Bob Barker +[Talk to Bob Barker](bob-barker/barker.md) -Hop on a plane +[Hop on a plane](forest/forest.md) -Spend so long trying to decide that you fall asleep +[Spend so long trying to decide that you fall asleep](sleep-and-wake/sleep_and_wake.md) -Cry out for your Mommy +[Cry out for your Mommy](cry-out-for-mommy/oh_mommy.md) -Enter a Dim Reality +[Enter a Dim Reality](Enter-a-dim-reality/Dim_reality.md) -Watch the Warriors vs Cavaliers game 1 of the NBA Finals +[Watch the Warriors vs Cavaliers game 1 of the NBA Finals](warriors-game/watch-warriors.md) -Peek through the keyhole to reveal what is beyond +[Peek through the keyhole to reveal what is beyond](world-war-marshmallows/world-war-marshmallows.md) -Try the more effective "Apparation" spell to teleport elsewhere +[Try the more effective "Apparation" spell to teleport elsewhere](movie-ripoffs/hogwarts/hogwarts.md) -Begin to feel suspicious +[Begin to feel suspicious](lucidream/luciddream.md) -Want to break free +[Want to break free](yuha/yuha.md) -Open the door and run outside +[Open the door and run outside](open-door/open-door.md) -Give the marshmallow entity a turing test +[Give the marshmallow entity a turing test](turing-test/turing-test.md) -Step into an adjacent room to check your social media hubs +[Step into an adjacent room to check your social media hubs](social-media/social-media.md) -Try and interact with the marshmallow hand +[Try and interact with the marshmallow hand](interact/interact.md) -Check your phone for date, time and location? +[Check your phone for date, time and location?](check-your-phone/check-your-phone.md) -Check mspaintadventures +[Check mspaintadventures](mspa/mspa.md) -Lunge for the lighter +[Lunge for the lighter](lunge-for-the-lighter/lunge-for-the-lighter.md) -Ask to Alice +[Ask to Alice](ask-to-alice/ask-to-alice.md) -Close your eyes +[Close your eyes](experience/experience.md) -Grab the lighter first? +[Grab the lighter first?](lighter/grab-lighter.md) -Make a swing with rope and jacket +[Make a swing with rope and jacket](enjoy-DreamRide/ride.md) -Start eating the walls? +[Start eating the walls?](eating-walls/eating-marshmallows.md) -Give the marshmallow to the polar bear? +[Give the marshmallow to the polar bear?](polar-bear/polar-bear.md) -Realize you are in Minecraft +[Realize you are in Minecraft](you-are-in-minecraft/minecraft.md) -Try to pull a MacGyver with the lighter, fork and rope? +[Try to pull a MacGyver with the lighter, fork and rope?](macgyver/macgyver.md) -Quickly run outside and explore? +[Quickly run outside and explore?](explore-outside/explore-outside.md) -Light a fire? +[Light a fire?](light-fire/fire.md) -jump in a chocolate pool? +[jump in a chocolate pool?](chocopool/choco.md) -Hungry Kya? +[Hungry Kya?](hungry/hungry.md) -Offer to get the narrator a ladder, so they can get off your back? +[Offer to get the narrator a ladder, so they can get off your back?](can-i-get-you-a-ladder/can-i-get-you-a-ladder.md) -Dig a hole with your bare hands? +[Dig a hole with your bare hands?](hands/hands.md) -Go back to sleep? +[Go back to sleep?](sleep/marshmallow.md) -Stay puft? +[Stay puft?](staypuft/marshmallowman.md) -Dig at the walls with a fork +[Dig at the walls with a fork](dig/dig.md) -Invite some friends over? +[Invite some friends over?](invite-friends/friends.md) -Look for a way out? +[Look for a way out?](find-exit/leave.md) -Count the marshmallows? +[Count the marshmallows?](count-the-marshmellows/count-the-marshmellows.md) -Begin to dance to pass the time? +[Begin to dance to pass the time?](dance/dance.md) -You pinch yourself to see whether you are dreaming? +[You pinch yourself to see whether you are dreaming?](pinch/pinch.md) -Promise to yourself this is the last time you take hallucinogenic mushrooms? +[Promise to yourself this is the last time you take hallucinogenic mushrooms?](shrooms/never-again.md) -Think this is too surreal and decide to try the French version instead? +[Think this is too surreal and decide to try the French version instead?](../french/feu-de-camp.md) -Think this is a dream, and jam the fork into your hand to wake up? +[Think this is a dream, and jam the fork into your hand to wake up?](fork-jam/not_dreaming.md) -Go out and collect mushroom? +[Go out and collect mushroom?](mushroom/collect_mushroom.md) -Try to walk around +[Try to walk around](virtualreality/oculus.md) -Make one of those weird marshmallow Jell-O salads? +[Make one of those weird marshmallow Jell-O salads?](marshmallow-jello-o-salad/the-kind-your-grandma-used-to-make.md) -Begin to sing out of fear? +[Begin to sing out of fear?](sing/sing.md) -Go meditate and ponder about your next step? +[Go meditate and ponder about your next step?](meditate/meditate.md) -Scream out of fear? +[Scream out of fear?](scream/scream.md) -Get to work on the best batch of cookies ever made? +[Get to work on the best batch of cookies ever made?](bake-cookies/cookies.md) -Start tying knots on the fork? +[Start tying knots on the fork?](fork-knots/melt-with-fork.md) -Start pondering how you got yourself in a sticky situation? +[Start pondering how you got yourself in a sticky situation?](ponder/ponder-about-life.md) -Create a new jacket out of marshmallows? +[Create a new jacket out of marshmallows?](jacket/marshmallow-jacket.md) -Go straight to the solution! +[Go straight to the solution!](http://youtu.be/dQw4w9WgXcQ) -Cook them marshmallows +[Cook them marshmallows](http://youtu.be/dQw4w9WgXcQ) -Explore Wikipedia +[Explore Wikipedia](wikipedia/wiki.md) -Whip out your spork, start a fire and make giant s'mores? +[Whip out your spork, start a fire and make giant s'mores?](http://easybaked.files.wordpress.com/2011/10/smores4.jpg) -Ask yourself how you got yourself into this situation - AGAIN? +[Ask yourself how you got yourself into this situation - AGAIN?](shrooms/never-again.md) -Challenge the Marshmallows to a Rock Off! +[Challenge the Marshmallows to a Rock Off!](challenge-marshmellow-to-rock-off/tenacious-d.md) -Call a doctor +[Call a doctor](call-a-doctor/doctor.md) -Remember that pill you took +[Remember that pill you took](adipose/adipose.md) -Light up the wall +[Light up the wall](light-up/light-up.md) -Hide the lighter fork and rope in your pocket +[Hide the lighter fork and rope in your pocket](hide/hide-chk.md) -Make a necklace out of the marshmallows +[Make a necklace out of the marshmallows](necklace/necklace.md) -Light up the wall 2 +[Light up the wall 2](light-up2/light-up2.md) -Switch on your laptop and.. +[Switch on your laptop and..](netflix/netflix.md) -Lion King +[Lion King ](no-worries/hakuna-matata.md) -Perform some magic +[Perform some magic](magic/magic.md) -Raise your self so high +[Raise your self so high](khudi/buland_very_high.md) -Put yourself back in the straitjacket +[Put yourself back in the straitjacket](backinstraitjacket/backinstraitjacket.md) -Find the bird +[Find the bird](find-bird/bird.md) -Attempt to befriend the marshmellow man +[Attempt to befriend the marshmellow man](make-friends/make-friends.md) -Try to use one of your pokemon? +[Try to use one of your pokemon?](pokemon/pikachu_wins.md) -Throw a rock at it and see if it moves +[Throw a rock at it and see if it moves](moving/moving.md) -Start tickling the marshmallow +[Start tickling the marshmallow](tickle/tickle.md) -Enter the time tunnel +[Enter the time tunnel](timeTunnel/timeTunnel.md) -Tie the marshmallow's hands and legs +[Tie the marshmallow's hands and legs](tying/tying.md) -Use the fork, Luke! +[Use the fork, Luke!](use-the-fork-luke/use-the-fork.md) -B b b bird bird bird, bird is the word +[B b b bird bird bird, bird is the word](birdistheword/birdistheword.md) -Quote of the day +[Quote of the day](quote-of-the-day/quote.md) -Escape and find a phone to call... +[Escape and find a phone to call...](call-these-guys/calltheseguys.md) -Play some cricket +[Play some cricket](play-some-cricket/playsomecricket.md) -Run back and forth quickly slamming into the walls +[Run back and forth quickly slamming into the walls](indigestion/indigestion.md) -In their tongue he is Dovhakiin, DragonBorn, FUS ROH DAH +[In their tongue he is Dovhakiin, DragonBorn, FUS ROH DAH](fus-roh-dah/fus-roh-dah.md) -The walls start closing in +[The walls start closing in](malaria/malaria.md) -Come to Nepal +[Come to Nepal](nepal/nepal.md) -Order Pizza +[Order Pizza](order-pizza/order-pizza.md) -Summon your robot army +[Summon your robot army](robot-army/robots-everywhere.md) -Oh dear! You ended up in Candyland! +[Oh dear! You ended up in Candyland!](candyland/diabetes.md) -Give 'em the Leslie Howard! +[Give 'em the Leslie Howard!](slap-it-hard/teach-it-a-lesson.md) -You punch the first person you see! +[You punch the first person you see!](punch/punch.md) -Hulk smash? +[Hulk smash?](hulk/smash.md) -Marsh Attack!!! +[Marsh Attack!!!](marshmallow-attack/marsh-attack.md) -Got Lost +[Got Lost](getsLost/getsLost.md) -Try to make smores +[Try to make smores](smores/smores.md) -Summon your humble servant +[Summon your humble servant](humbleservant/humbleservant.md) -Summon the magical snuffbox +[Summon the magical snuffbox](snuffbox/snuffbox.md) -Become the One? +[Become the One?](matrix/matrix.md) -Melt all the marshmallows to make s'mores? +[Melt all the marshmallows to make s'mores?](meltmarshmallows/meltmarshmallows.md) -Want to cook boneless pork shoulder roast? +[Want to cook boneless pork shoulder roast?](pork/roast.md) -Take a selfie? +[Take a selfie?](selfie/selfie.md) -Say something +[Say something](blah-balh/blah-blah.md) -Try the Marshmallow Test on it? +[Try the Marshmallow Test on it?](https://youtu.be/QX_oy9614HQ) -Become an Octodog +[Become an Octodog](be-octodog/octodog.md) -Make a Marshmallow cake +[Make a Marshmallow cake](https://www.youtube.com/watch?v=3l1SY3QREv4) -I'm Batman +[I'm Batman](I'm-batman/batman.md) -You realize you are in NeverLand and you are never going come... so you sing the Tinker Bell song +[You realize you are in NeverLand and you are + never going come... so you sing the Tinker Bell song](https://youtu.be/Sopngy6uucw) -You decide to become a marshmallow yourself. +[You decide to become a marshmallow yourself.](becomemarshmallow/becomemarshmallow.md) -Explain Fizzbin to the marshmallow hand? +[Explain Fizzbin to the marshmallow hand?](fizzbin/explain-fizzbin.md) -Drool on the Marshmallow to show demonstrate your digestive superiority +[Drool on the Marshmallow to show demonstrate your digestive superiority](drool/droolstrategem.md) -Eat the Marshmallow +[Eat the Marshmallow](eatmarshmallow/eatmarshmallow.md) -Escape into Willy Wonka Lego-World +[Escape into Willy Wonka Lego-World](lego-world/lego-world.md) -Eat breakfast +[Eat breakfast](../english/breakfast/breakfast.md) -After breakfast you lookup triathlon +[After breakfast you lookup triathlon](triathlon/triathlon.md) -The inception protocol +[The inception protocol](dream_in_dream/inception.md) -Choose the blue pill or the red pill? +[Choose the blue pill or the red pill?](choose-pill/choose-pill.md) -Pull out your proton pack! +[Pull out your proton pack!](ghost-buster/ghost-busted.md) -You take the red pill +[You take the red pill](red-pill/red-pill.md) -Twas the Night Before Christmas +[Twas the Night Before Christmas](night-night/tale.md) -Check Reddit for any useful information. +[Check Reddit for any useful information.](reddit/ask-reddit.md) -Watch Up +[Watch Up](watch-movie/Up.md) -Give up and search for oil fields +[Give up and search for oil fields](oil-field/oil-field.md) -Appear on Falkor’s Back +[Appear on Falkor’s Back](appear-on-falkors-back/falkor.md) -Sit and ponder how you got into this situation +[Sit and ponder how you got into this situation](thesituation/situation.md) -Smart Ape roasting a marshmellow +[Smart Ape roasting a marshmellow](https://www.youtube.com/watch?v=_ZEBrHe4hVs) -Bruce Wayne is BATS !! +[Bruce Wayne is BATS !!](batman/batman.md) -Use your chance, master self-control +[Use your chance, master self-control](self-control/self-control.md) -Have a Pip-Boy +[Have a Pip-Boy](pipboy/pipboy.md) -Call upon one of your past lives as avatar +[Call upon one of your past lives as avatar](avatar/air.md) -Play some GTA5 +[Play some GTA5](play-gta5/play-gta5.md) -Ask a question on Quora? +[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) -Search for gluten +[Search for gluten](search-for-gluten/search-for-gluten.md) -Ask a question on Quora? +[Ask a question on Quora?](ask-on-quora/ask-on-quora.md) -Go afk and report the jungler? +[Go afk and report the jungler?](https://www.youtube.com/watch?v=jdg6cnE6IyM) -Leap on the Polar bear and charge +[Leap on the Polar bear and charge](polar-bear-attack/polar-bear-attack.md) -Commit suicide +[Commit suicide](commit-suicide/suicide.md) -Make an appointment with the dentist +[Make an appointment with the dentist](dentist/ouch.md) -Create an artificial intelligence to help you escape +[Create an artificial intelligence to help you escape](robot-rap-battle/robot-rap-battle.md) -You Google what to do +[You Google what to do](https://www.google.co.in/) -Abdul kalam quotes on overcoming fear +[Abdul kalam quotes on overcoming fear](apj/apj.md) -If you want something done right, you have to do it yourself. +[If you want something done right, you have to do it yourself.](untrustworthy/untrustworthy.md) -There's no such thing as a free lunch. +[There's no such thing as a free lunch.](free-lunch/free-lunch.md) -Follow the dog... +[Follow the dog...](play-with-dog/dog.md) -What is LOVE ? +[What is LOVE ?](love/love.md) -Got to Singapore +[Got to Singapore](singapore/singapore.md) -Talk to Finn +[Talk to Finn](talk-to-finn/finn.md) -Play Guitar +[Play Guitar](guitar/guitar.md) -Contemplate the meaning of life +[Contemplate the meaning of life](meaning/meaning.md) -Rinse the marshmallow under the tap then eat it +[Rinse the marshmallow under the tap then eat it](dysentry/dysentry.md) -Wake up! +[Wake up!](wake-up/wake-up.md) -Thank Mr. Skeltal +[Thank Mr. Skeltal](2spooky/2spooky.md) -Utilize your wand once again... +[Utilize your wand once again...](utilize-wand/fork-rope-wand.md) -Draw a trapezoid +[Draw a trapezoid](trapezoid/trapezoid.md) -Stop, hammertime! +[Stop, hammertime!](hammertime/hammertime.md) -Analyze the composition of the marshmallow +[Analyze the composition of the marshmallow](analyze/analysis.md) -Watch Barcelona game +[Watch Barcelona game](watch-barca/watch-barca.md) -Oops! this story ain't ending.. +[Oops! this story ain't ending..](unending-story/unending-story.md) -Code +[Code](code/code.md) -Screaming goat is screaming +[Screaming goat is screaming](https://youtu.be/kh6c0SOfkH4) -Play on miniclip! +[Play on miniclip!](papa-louie/papa-louie.md) -Visit Sturgis 2015! +[Visit Sturgis 2015!](sturgis2015/sturgis.md) -Attack marshmallow pikachu! +[Attack marshmallow pikachu!](pikachu/pokeball.md) -"I have problems with my sleep," you realise. "I'm going to move to New York." +"I have problems with my sleep," you realise. "I'm going to [move to New York](new-york/new-york.md)." -Summon Dragons of the Khaleesi +[Summon Dragons of the Khaleesi](dragons/fire-everywhere.md) -Bounce +[Bounce](bounce/bounce.md) -Play some DotA 2 +[Play some DotA 2](play-dota2/play-dota2.md) -Play Starcraft 2 +[Play Starcraft 2](starcraft2/starcraft2.md) -Play some Geometry Dash +[Play some Geometry Dash](play-geometrydash/play-geometrydash.md) -See if there is a Udacity course on the subject +[See if there is a Udacity course on the subject](udacity/udacity.md) -Click here to listen to music. +Click [here](young/young.md) to listen to music. -Consult Flann O'Brien +[Consult Flann O'Brien](flann-o-brien/truth-is-odd.md) -Attack it with a lightsaber +[Attack it with a lightsaber](lightsaber/lightsaber.md) -Decide to browse Reddit instead +[Decide to browse Reddit instead](https://www.reddit.com/) -It's time to take a vacation +[It's time to take a vacation](licked-cat/vacation.md) And then you realize that Burning Man is over, so no real vacations :( -present-tense +[present-tense](present-tense/present-tense.md) -Think about happy thoughts while spinning around in circles +[Think about happy thoughts while spinning around in circles](my-story/my-story.md) -Story of DKER +[Story of DKER](DKER/DKER.md) -Get your prostate checked +[Get your prostate checked](prostate/prostate.md) -If you eat a lot, you should also exercise +If you eat a lot, you should also [exercise](exercise/exercise.md) A quick brown fox jumps over the lazy dog! -Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas +[Buy a 1st class ticket and fly to Las Vegas NV; what happens in Vegas stays in Vegas](vegas/fear-loathing-las-vegas.md) -Make marshmallow masala chai +[Make marshmallow masala chai](chai/make-marshmallow-masala-chai.md) -Watch a recording of an awesome jazz concert +[Watch a recording of an awesome jazz concert](https://www.youtube.com/watch?v=VMb3PX9gq78) whilst wandering through the vastness of this universe. -But what universe is this? +[But what universe is this?](universe-test/blaze_verse.md) Either way we are cool, right? -This miracle man can read your mind without uttering a word. +This [miracle man](copper-plate-man/copper-plate-man.md) can read your mind without uttering a word. -You decide that you do not want to visit the miracle man. You check your phone to find something else to do. +You decide that you do not want to visit the miracle man. [You check your +phone to find something else to do](check-phone/check-phone.md). -And you plug-in to play some music. +And you plug-in to [play some music](play-music/playmusic.md). The next thing you know, you're up all night in Croatia mixing a new playlist -You remember the story of a robot. +You remember the story of a [robot](happy-robot/happy-robot.md). -Wondering how you got here, you feel a strange tingling in your hands, almost as if they are responding to your new surroundings. You feel an urge to gesture forward, and as you do a large pink marshmallow shoots out of your hand into the wall before you. Explore your new marshmallow powers. +Wondering how you got here, you feel a strange tingling in your hands, almost as if +they are responding to your new surroundings. You feel an urge to gesture forward, +and as you do a large pink marshmallow shoots out of your hand into the wall before you. +[Explore your new marshmallow powers.](marshmallow-wizard/marshmallow-wizard.md) -The evil and heroic marshmallow +[The evil and heroic marshmallow](the-slayer/marshmallow-slayer.md) -All in a hard days work, do you play some music. +All in a hard days work, do you play some [music](play-music/playmusic.md). -As you hold your pot of precious hunny, you begin to hear an ominous voice... +As you hold your pot of precious hunny, you begin to [hear an ominous voice...](ominous-voice/ominous-voice.md) -Honesty in a hard way Watch it +Honesty in a hard way [Watch it](few-good-men/fgm.md) -Maybe, just maybe, your not here, and this isn't happening +Maybe, just maybe, your not here, and this [isn't happening](https://www.youtube.com/watch?v=lAF8D0ugyVk) But the call of of nature wasn't going away so you push open the toilet door and go in.. -Just then you recall the news story of what is causing the [strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. +Just then you recall the news story of what is causing the +[strange noise] in toilet (http://nydn.us/1iLJF83) you look around.. -...and you are horrified by what you see +...and you are horrified by what you [see](https://www.youtube.com/watch?v=BROWqjuTM0g) -You escape into a recording studio +You escape into a [recording studio](more_cowbell/more_cowbell.md) -Now for some music +Now for some [music](https://www.youtube.com/watch?v=Ua2HPQUKJao) -And then you stumble upon something completely different +And then you stumble upon something [completely different](http://www.atlasobscura.com/) -After the stumble you trip over a plant guess what the plant is? +After the stumble you trip over a plant [guess what the plant is?](real-marsh-mallow/real-marsh-mallows.md) -What about skydiving -Story intensifies! +[What about skydiving](skydiving/skydiving.md) -You decide to take a shortcut on the way to the movie... +*Story intensifies!* -Instead of going to the movies, you decide to solve the gase crisis instead. +You decide to [take a shortcut](new-movie/new-movie.md) on the way to the movie... -You made it through the day and are starting to get sleepy... Time to fall asleep +Instead of going to the movies, you decide to [solve the gase crisis](plow/plow.md) instead. -You wake up in front of a computer screen. You begin reading the text of a markdown file called marshmallow.md. As you read you realize that the story is about you! remember this story! +You made it through the day and are starting to get sleepy... [Time to fall asleep](marshmallow.md) -This false egotism makes you forget something important. +You wake up in front of a computer screen. You begin reading +the text of a markdown file called marshmallow.md. As you read +you realize that the story is about you! +[remember this story!](this-story-is-about-you/this-story-is-about-you.md) -Call a random number +This false egotism makes you forget [something important.](watch-star-wars/watch-star-wars.md) -You must be lonely. Want a friend? +[Call a random number](call-a-random-number/answer.md) -When I code over my weekend, I feel that this becomes my whole life. -Suddenly you feel a strong craving for something. +You must be lonely. [Want a friend?](robofriend/AIRobot.md) -Despite the little conundrum that you resolved, you realize that it's now Friday, December 4th. +When I code over my weekend, I feel that this becomes my [whole life](code-my-life/code-my-life.md). -"Wait a minute", you gasped, "The English Premier League is on tomorrow!!" +Suddenly you feel a strong craving for [something.](craving/craving.md) -With that new revelation in mind, you quickly make like David Hasselhoff and wiggle your wrist to show off a nice particular watch that even listens to you when you speak to it. +Despite the little conundrum that you resolved, you realize that it's now +Friday, December 4th. + +"Wait a minute", you gasped, "The English Premier League is on tomorrow!!" -"Ahem!" +With that new revelation in mind, you quickly make like David Hasselhoff +and wiggle your wrist to show off a nice particular watch that even listens +to you when you speak to it. -So the Epic Sexy Sax Guy saves the day, go here to read more about him ... +["Ahem!"](my-adventure/my-adventure.md) -deb66146d3bd0481a4c19d27b8ef289b939d4156 +So the Epic Sexy Sax Guy saves the day, go [here](TheEpicSax/111_TheEpicSaxGuyArrives.md) to read more about him ... +>>>>>>> deb66146d3bd0481a4c19d27b8ef289b939d4156 -"Train Ride!" +["Train Ride!"](train-ride/train-ride.md) -I consider publishing a spoiler to the new Star Wars movie +I consider publishing a spoiler to the new [Star Wars movie](star-wars-spoiler/star-wars.md) "What's a Heffelump?" asked Sheffield inquisitively. "I dont't know! Why should I care?" replied Donald Trump. -When faced with a lot of work and impending deadlines in the (not so near) future, there are two options you must choose from. +When faced with a lot of work and impending deadlines +in the (not so near) future, +there are two options you must choose from. -You may either do this, +You may either do [this](gtd/gtd.md), -or that. + or [that](procrastinate/procrastinate.md). -This is one weird story. Did anybody read the whole page? + This is one weird story. Did anybody read the whole page? -I sure did not. This is as weird as it gets. + I sure did not. This is as weird as it gets. -Get Crazy! +[Get Crazy!](crazy/crazy.md) -"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim move to Boston." +"I should completely ignore all of the above boring messages and move to the greatest city on earth!" I exclaim +[move to Boston](boston/boston.md)." -Wait a second, I actually meant to say that Camelot is where I really want to go! +Wait a second, I actually meant to say that [Camelot](camelot/camelot.md) is where I really want to go! -"Who will you serve?" +"Who will you [serve](joshua_24_15/joshua_24_15.md)?" Yourself? Instead of reading this entire story, you decide to go see the new star wars! -As you're walking down the street you see something +As you're walking down the street you see [something](millenium-falcon/flyaway.md) -You decide that $1.5 billion is too much to pass up, so you buy a Powerball ticket. +You decide that $1.5 billion is too much to pass up, so you buy a [Powerball ticket](powerball/powerball.md). -Do you have my stapler? +[Do you have my stapler?](stapler/stapler.md) -Build a car +[Build a car](build-a-car/build-a-car.md) -What is Bayes' theorem? +What is [Bayes' theorem](BayesTheorem/BayesTheorem.md)? -The divergence is coming, survive or perish? +The divergence is coming, [survive](divergence/divergence.md) or perish? -Hear a roaring sound in the distance +[Hear a roaring sound in the distance](https://youtu.be/d-sALU_hveA?t=33s) -You decide to work on one of your big projects... +You decide to work on one of your [big projects...](https://www.youtube.com/watch?v=i84PRVPieeU&t=1h34m31s) You start off strong... -But there are too many hurdles in your way. +But there are [too many hurdles in your way](hurdles/hurdles.md). -"What a joke?", he said, after looking at the news +"What a joke?", he said, after looking at the [news](joke/joke.md) -Hmmm....I wonder what this fortune cookie says... +Hmmm....I wonder what this [fortune cookie](fortune/fortune.md) says... -It says you should brew some beer. +It says you should [brew some beer](beer-brewer/beer-brewer.md). -The news says it all my people! +The [news](joke/joke.md) says it all my people! -Bible says... As you sow, so shall you reap +Bible says... As you sow, so shall you [reap](think/growrich.md) -So shall you reap, and the steelers know that all too well! +So shall you reap, and the [steelers](steelers/steelers.md) know that all too well! -Until you realize that even marshmallows need LOVE. +Until you realize that even marshmallows need [LOVE](https://www.youtube.com/watch?v=i5fZ__mnHbU). -Marcel needs a new pair of shoes, will you buy shoes for Marcel? +Marcel needs a new pair of shoes, will you buy shoes for [Marcel](https://www.youtube.com/watch?v=VF9-sEbqDvU)? -You look up and out to the ocean. In the distance you see a mermaid +You look up and out to the ocean. In the distance you see a [mermaid](mermaid/mermaid.md) -The mermaid above died, but don't worry... +The mermaid above died, but [don't worry...](mermaid2/mermaid.md) -A fairy tale about a shoemaker and elves +A fairy tale about [a shoemaker and elves](elves-and-shoemaker/elves-and-shoemaker.md) -The 3 Rules of Test Driven Development Read the Rules +The 3 Rules of Test Driven Development [Read the Rules](test-driven-development-rules/AccordingToUncleBob.md) -The understanding of git go here +The understanding of git [go here](Booyah/booyah.md) -Link to Git Official Website +[Link to Git Official Website](git/git.md) -link to google website +[link to google website](kumar/kumar.md) -Do you want to know Git disadvantage? +Do you want to know [Git disadvantage?](git_disadvantage/git_disadvantage.md) Hi i got this one for udacity team. -As the sand encompassed her toes and the ocean-spray breezed through her nose +As the sand encompassed her toes and +the ocean-spray breezed through her nose she froze... @@ -918,229 +991,252 @@ Let it go, let it gooo... CANT HOLD IT BACK ANY MORE -Do you want to build a snowman? +Do you want to build a [snowman?](snowman/snowman.md) -It doesn't have to be a snowman +It doesn't have [to be a snowman](to-be-a-snowman/to-be-a-snowman.md) I think I'll try defying gravity. -Do you know Indonesian Culture? +Do you know [Indonesian Culture?](https://en.wikipedia.org/wiki/Culture_of_Indonesia) -Paint It Black +[Paint It Black](paint-it-black/PaintItBlack.md) -Try to solve Rubik's Cube +[Try to solve Rubik's Cube](rubik-cube/rubik-cube.md) -To Infinity and Beyond +[To Infinity and Beyond](math/math.md) -I hope you aren't using a poorly built crawler on this +[I hope you aren't using a poorly built crawler on this](./marshmallow.md) -Read my story +[Read my story](magic2/magic2.md) -..and recall that Carl Johnson might be alive +[..and recall that Carl Johnson might be alive](Carl/carl-johnson.md) -Or, forget it all, and jump off the cliff +[Or, forget it all, and jump off the cliff](cliff/cliff.md) -Make a pie chart +[Make a pie chart](http://i.imgur.com/uaFES1b.jpg) -Read a story of a crouch dragon +[Read a story of a crouch dragon](crouch-dragon/crouch-dragon.md) -Write a hiku +[Write a hiku](write-a-hiku/hiku.md) -Explore the unknown. Most people die without ever visiting this place. +Explore the unknown. Most people die without ever visiting this [place.](underwater/scuba-diving.md) As you attempt this, a voice booms!! -The boom +The [boom](day-dream/day-dream.md) -Is it really? You see what appears to be a tunnel, a tunnel leading into the unknown +Is it really? You see what appears to be a tunnel, a tunnel leading into the [unknown](dimensions/dimension.md) -You start your way through the tunnel but you feel something coming on +You start your way through the tunnel but you feel something coming [on](blackout/blackout.md) -For the love of Matt Murdock Daredevil +For the love of Matt Murdock [Daredevil](watch-movie/Daredevil-marshmallows/daredevil-marshmallows.md) -You feel woozy, you take a nap. +You feel woozy, [you take a nap](thunder-carrots/thunder-carrots.md). -You decide to go scuba diving and see a great submarine. +You decide to go scuba diving and see a [great submarine](submarine/greatDeep.md). -So what to do next? Three doors appear and all other ways out disappear. So you pick the right door +So what to do next? Three doors appear and all other ways out disappear. +So you pick the [right door](mysterydoor/mysterydoor.md) -You put your cowboy hat back on your head. +You put your [cowboy hat](cowboy/cowboy.md) back on your head. -Or... or... or... Oh, I forgot! You foget something, but you decide to move on. +Or... or... or... Oh, I forgot! +You foget something, but you decide to [move on](move-on/move-on.md). -You follow the panda up the nearest tree, chewing bamboo shoots as you go bamboo-shoots +You follow the panda up the nearest tree, chewing bamboo shoots as you go [bamboo-shoots](bamboo/bamboo-shoots.md) -And then you look up and see it, you can't bealive is him but there he is staring at you +And then you look up and see it, you can't bealive is him but there he is [staring at you](master/miMaster.md) -Do nothing. +[Do nothing.](nothing/do-nothing.md) -Rent a hydroplaning dog sled to get you to the other side of the world +[Rent a hydroplaning dog sled to get you to the other side of the world](dog-sled/dogsled.md) -Toasted marshmallow +Toasted [marshmallow](toasted/smores_pie.md) -While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. The new record is! +While having toasted marshmellows and watching the warriors beat the grizzlies, you realise they set a new record. +[The new record is!](new_warriors_record/new_warriors_record.md) -Of Course you must reach the end of your story, but remember this. +Of Course you must reach the end of your story, but remember [this](interstellar_quote/light.md). -Life is full of puzzles. +Life is full of [puzzles](LifePuzzle/LifePuzzle.md). -You hear a hollow voice say "Plugh". Mesmerized, you say "Plugh". +You hear a hollow voice say "Plugh". Mesmerized, you say "[Plugh](plugh/plugh.md)". -A light appears all around you and something comes into focus in the distance. What is that? +A light appears all around you and something comes into focus in the distance. [What is that?](disney/disney.md) -Story about Indian Hockey Player Rupinder Pal Singh +Story about Indian Hockey Player [Rupinder Pal Singh](Rupinderpal/rupinder.md) -If you have read this far, then you must be in pain. Click here to learn about Accupuncture. +If you have read this far, then you must be in pain. +Click [here](https://en.wikipedia.org/wiki/Acupuncture) to learn about Accupuncture. -As you approach the Stargate with trepidation, you can hear the troops getting closer. +As you approach the [Stargate](stargate/GateDial.md) with trepidation, you can hear the troops getting closer. -Health and Life Lovely Quotes +Health and Life Lovely [Quotes](./health/health.md) -The lannisters always pays thier debts, says tyrion lannister. Interesting character he is. +The lannisters always pays thier debts, says tyrion lannister. Interesting [character](./gameofthrones/tyrion.md) he is. -Time to move to Canada, eh? +Time to [move to Canada](Canada/Canada.md), eh? -You struggle to find a line break to add your own adventure. You also want to undo the Brexit result. You try CTRL-Z... +You struggle to find a line break to add your own adventure. +You also want to undo the Brexit result. [You try CTRL-Z...](great-tasmanian-adventure/great-tasmanian-adventure.md) -The crushing weight of all these options causes you to end your life. -You're reincarnated as a green starfish but wish you were blue instead. -Motivate yourself +The crushing weight of all these options causes you to [end your life.](end/end.md) -You wake up as Harry Potter ... and are facing Voldemort in a duel? What should you do +You're reincarnated as a green starfish but wish you were [blue instead.](starfish/starfish.md) -My tea's gone cold I'm wondering why I got out of bed at all... +[Motivate yourself](Motivate/Motivate.md) -Click here to vote for Bernie Sanders. +You wake up as Harry Potter ... and are facing Voldemort in a duel? +What should you [do](magicaladventure/decision_time/decision_time.md) -You decide you want to be a pirate and remember a show called onepiece +My tea's gone cold I'm wondering [why](stan/stan.md) I got out of bed at all... -You looking for a country for advanture? Try Taiwan! +[Click](vote-the-president/bernie/Bernie.md) here to vote for Bernie Sanders. -you find a mysterious cup with clear liquid in it. drink? +You decide you want to be a pirate and remember a show called +[onepiece](onepiece/op.md) -Time to check out the latest Total War - Warhammer! +You looking for a country for advanture? Try [Taiwan](trip-to-Taiwan/trip-to-Taiwan.md)! -You wake up in the morning and your computer is looking out of the window +you find a mysterious cup with clear liquid in it. [drink?](drink/drink.md) -Instragram, a great place to spend time. Visit my profile +Time to check out the latest [Total War - Warhammer](total-war/war-start.md)! -You've been charged with treason against the King. You wake up in prison. +You wake up in the morning and your [computer is looking out of the window](computer-window/computer-window.md) -My visit to the zoo. +Instragram, a great place to spend time. [Visit my profile](https://www.instagram.com/coding.imagination/) -You wake up confused, you faint you go back in time +You've been charged with treason against the King. You wake up in [prison](prison/prison.md). -The Hungry Prince +My visit to the [zoo](zoo/zoo.md). -The Angry Prince +You wake up confused, you faint you go back in [time](time-travel/time-travel.md) -The password is xyzzy +[The Hungry Prince](hungry_prince/hungry_prince.md) -Say "Hi" to Guangwu +[The Angry Prince](angry_prince/angry_prince.md) -Perishing in an avalanche of words, in a mundane collection of sentences called "stories". Devastated? +The password is [xyzzy](plugh/plugh.md) -Ever the fan of Doug Adams. +[Say "Hi" to Guangwu](Guangwu/Guangwu.md) -If you really want to know the answer to the question.... "What is the answer to Life, the Universe and Everything?" then you need some Deep Thought +Perishing in an avalanche of words, in a mundane collection of sentences called "stories". +[Devastated?](devastated_greatness/devastated_greatness.md) -Check out this showerthoughts subreddit +Ever the fan of [Doug Adams](doug-adams/doug-adams.md). -Discover a new genre of music! +If you really want to know the answer to the question.... +"What is the answer to Life, the Universe and Everything?" then you +need some [Deep Thought](doug-adams/deep-thought/deep-thought.md) -Watch Too Many Puppies! +Check out [this](showerthoughts/showerthoughts.md) showerthoughts subreddit -You meet Rickson Gracie... +[Discover](discover-new-genres/discover-new-genres.md) a new genre of music! -You decide to quit your job to play Pokemon Go full time. +[Watch](https://www.youtube.com/watch?v=-XJN7qqFqPE) Too Many Puppies! -Learn about something random here! +You meet [Rickson Gracie](rickson-armbar/ricksonbyarmbar.md)... -Learn about Ankesh here +You decide to quit your job to play [Pokemon Go](pokemon-go/pokemon-go.md) full time. -Hold the door! [Spoiller GOT] +Learn about something random [here](https://en.wikipedia.org/wiki/Special:Random)! -b6c70ae2fc2160a4b1b9c8639b4567de6b5a4a93 +Learn about Ankesh [here](characters/ankesh.md) -You realise that the philosphy of life in general boils down to that one central question... will you? or will you not? So Will you? +[Hold the door!](hold_the_door/hodor.md) [Spoiller GOT] +>>>>>>> b6c70ae2fc2160a4b1b9c8639b4567de6b5a4a93 -You recited cosmological argument in the morning in hub. +You realise that the philosphy of life in general boils down to +that one central question... will you? or will you not? +[So Will you?](philosophy/questions.md) -You take the time to contemplate the nature of identity. +You recited [cosmological argument](cosmological_argument/cosmological_argument.md) in the morning in hub. -Click here to find out what the meaning of life is. +You take the time to contemplate the [nature of identity](nature-of-identity/nature-of-identity.md). -so lazy here +Click [here](https://www.youtube.com/watch?v=aboZctrHfK8) to find out what the meaning of life is. -Update your Smartphone to the Marshmallow 6.0! +so lazy [here](lazy/lazy.md) -Click here +[Update](android/marshmallow6.0.md) your Smartphone to the Marshmallow 6.0! -Click here to learn more about the MEAN stack here +Click [here](walrus/walrus.md) -Do you like stargazing ? +Click here to learn more about the MEAN stack [here](mean-stack/mean.md) -Let's learn some mandarin +Do you like [stargazing](stargazing/stargazing.md) ? -Neurons for social memories, more info +Let's learn some [mandarin](learn-mandarin/learn-mandarin.md) -What is the meaning of life? To find out click here. +Neurons for social memories, [more info](http://news.mit.edu/2016/scientists-identify-neurons-social-memory-0929) -What is that shiny in the window? Come in and take a look +What is the meaning of life? +To find out click [here](meaning-of-life/meaning-of-life.md). -The shiny device +What is that shiny in the window? Come in and take a +[look](Computer-Man/Computer-Man.md) -Wanna trip yourself? Hue has a place you would like to enter +The [shiny device](shiny-device/shiny-device.md) -You decide to slapa-da-bass +Wanna trip yourself? Hue has a place you would like to [enter](Trip-Yourself-Hue/trippy.md) -If you want to play soccer, click here +You decide to [slapa-da-bass](slapa-da-bass/slapa-da-bass.md) -If you are a soccer fan, see your team here +If you want to play soccer, click [here](Soccer/soccer.md) -I am also a soccer fan, I am a Man U fan from EPL. To see Man U click here +If you are a soccer fan, see your team [here](soccerfan/soccerfan.md) -Wow, you made it to the end! You are determined, see what awaits. +I am also a soccer fan, I am a Man U fan from EPL. To see Man U click [here](ManU/ManU.md) -Wait! This is not the end! OMG click me +Wow, you made it to the end! You are determined, [see](persistent/persistent.md) what awaits. -have you already heard the story of the Choking Doberman? click me +Wait! This is not the end! OMG [click me](never_ended/never_ended.md) -Join me in Tree of Savior! +have you already heard the story of the Choking Doberman? [click me](dog_finger/dog_finger.md) -Let's do the Front-end Web Developer Nanodegree together! +Join me in [Tree of Savior!](tos/tos.md) -How about we all learn android ! +Let's do the [Front-end Web Developer Nanodegree](front_end/front_end.md) together! -Let's finish a small goal, for example +How about we all [learn android](https://www.udacity.com/course/android-developer-nanodegree-by-google--nd801) ! -You decide to teach google to be a Pictionary champion. +Let's finish a small goal, [for example](set_up_a_small_goal/setup_a_small_goal.md) -Jason Calacanis is one of the best interviewers I've seen. Here they are +You decide to teach google to be a [Pictionary](https://quickdraw.withgoogle.com/) champion. -My best girls are Toujou Nozomi, Aragaki Ayase, and Sendouin Kaede. +Jason Calacanis is one of the best interviewers I've seen. +[Here](https://www.youtube.com/channel/UCkkhmBWfS7pILYIk0izkc3A) they are -Maybe this is a dream? +My best girls are Toujou Nozomi, Aragaki Ayase, and Sendouin Kaede. -Or maybe you love pugs? +Maybe this is a [dream](dream/dream.md)? -Or maybe you're trying to avoid the cold outside +Or maybe you love [pugs](https://www.youtube.com/watch?v=3pPR7vk-e3Y)? -<<<<<<< HEAD Have you ever heard any unusual sounds when you're alone? They're not what you think. Get to know them here +Or maybe you're trying to avoid the cold [outside](cold_outside/cold_outside.md) -======= Like football or soccer(as many others call it)? Must Watch The_Greatest_Battle_Ever +<<<<<<< HEAD +Have you ever heard any unusual sounds +when you're alone? +They're not what you think. +Get to know them [here](blackAndwhite/blackAndwhite.md) -Some other guy beat me to it. Too lazy here +======= +Like football or soccer(as many others call it)? Must Watch +[The_Greatest_Battle_Ever](https://www.youtube.com/watch?v=KyHDZqp2ThU) -What if I told that all this is just a bunch of files +Some other guy beat me to it. Too lazy [here](lazy/lazy.md) -upstream/master +What if I told that all this is just a bunch of [files](see-files/files.md) +>>>>>>> upstream/master -A Story of Being Alone Read it here +A Story of Being Alone +Read it [here](alone/alone.md) -Information on some famous tv series click here +Information on some famous tv series +[click here](famous-tv-series/famous-tv-series.md) I have atlast found a way to heaven...Want to go [there](00_PortBlair's Emerald blue/PortBlairVoyage.md) @@ -1148,8 +1244,10 @@ Why are you reading this line? smile and move on. Smile and move on gingerly. -What is your passion? +What is your [passion?](passion/passion.md) + +- -searching for good content. +searching for [good](tvf-play/watch.md) content. -Do you like tigers? \ No newline at end of file +Do you like [tigers](tiger/tiger.md)? From 267a44fcc44573f8ddbf839db1a264d074192d64 Mon Sep 17 00:00:00 2001 From: Michael Penrose Date: Tue, 7 May 2019 15:48:55 +0100 Subject: [PATCH 5388/5486] add choice after sweet marshmallow --- english/sing/lightup/accept/accept.md | 12 +++++++++++- english/sing/lightup/accept/reciprocate/cake.md | 5 +++++ english/sing/lightup/accept/reciprocate/water.md | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 english/sing/lightup/accept/reciprocate/cake.md create mode 100644 english/sing/lightup/accept/reciprocate/water.md diff --git a/english/sing/lightup/accept/accept.md b/english/sing/lightup/accept/accept.md index 3ac4099fed..f609950131 100644 --- a/english/sing/lightup/accept/accept.md +++ b/english/sing/lightup/accept/accept.md @@ -1 +1,11 @@ -The marshamallow treats are delicious! \ No newline at end of file +The marshamallow treats are delicious! + +You are happy and decide to offer something back to your new friend. + +Do you: + +[Offer him a drink of water?](reciprocate/water.md) + +or + +[Offer him a piece of cake?](reciprocate/cake.md) diff --git a/english/sing/lightup/accept/reciprocate/cake.md b/english/sing/lightup/accept/reciprocate/cake.md new file mode 100644 index 0000000000..ec65bb3c4e --- /dev/null +++ b/english/sing/lightup/accept/reciprocate/cake.md @@ -0,0 +1,5 @@ +The monster is very happy with the cake you offer him. + +He gratefully eats it with surprisingly good etiquette for a monster. + +Perhaps he is not such a monster after all. \ No newline at end of file diff --git a/english/sing/lightup/accept/reciprocate/water.md b/english/sing/lightup/accept/reciprocate/water.md new file mode 100644 index 0000000000..4eecc842c5 --- /dev/null +++ b/english/sing/lightup/accept/reciprocate/water.md @@ -0,0 +1 @@ +The marshmallow monster gratefully accepts and says "Wow I needed that - I was so thirsty." \ No newline at end of file From 757bdbd269c8a8bca944a5bf258e9774c1641c13 Mon Sep 17 00:00:00 2001 From: Michael Penrose Date: Tue, 7 May 2019 16:13:52 +0100 Subject: [PATCH 5389/5486] move cake.md and water.md to each have their own directory. Delete the old directory. --- english/sing/lightup/accept/{reciprocate => cake}/cake.md | 0 english/sing/lightup/accept/{reciprocate => water}/water.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename english/sing/lightup/accept/{reciprocate => cake}/cake.md (100%) rename english/sing/lightup/accept/{reciprocate => water}/water.md (100%) diff --git a/english/sing/lightup/accept/reciprocate/cake.md b/english/sing/lightup/accept/cake/cake.md similarity index 100% rename from english/sing/lightup/accept/reciprocate/cake.md rename to english/sing/lightup/accept/cake/cake.md diff --git a/english/sing/lightup/accept/reciprocate/water.md b/english/sing/lightup/accept/water/water.md similarity index 100% rename from english/sing/lightup/accept/reciprocate/water.md rename to english/sing/lightup/accept/water/water.md From 2d0d28b83baaa9c986b5c278538c98da454926f2 Mon Sep 17 00:00:00 2001 From: Michael Penrose Date: Tue, 7 May 2019 16:18:38 +0100 Subject: [PATCH 5390/5486] correct folder path for cake.md and water.md in accept.md --- english/sing/lightup/accept/accept.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/sing/lightup/accept/accept.md b/english/sing/lightup/accept/accept.md index f609950131..c20a5ea421 100644 --- a/english/sing/lightup/accept/accept.md +++ b/english/sing/lightup/accept/accept.md @@ -4,8 +4,8 @@ You are happy and decide to offer something back to your new friend. Do you: -[Offer him a drink of water?](reciprocate/water.md) +[Offer him a drink of water?](water/water.md) or -[Offer him a piece of cake?](reciprocate/cake.md) +[Offer him a piece of cake?](cake/cake.md) From 080d6d0d53de098fff92930a9cada807dcc9ebf0 Mon Sep 17 00:00:00 2001 From: Appu Date: Fri, 10 May 2019 21:09:21 +0530 Subject: [PATCH 5391/5486] Add night owl vs. early bird option --- english/marshmallow.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index b0197062d2..c6fd37667c 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -37,6 +37,14 @@ or a [dog person](https://www.youtube.com/watch?v=59Zcx9YbZxI) ? +Are you an: + +[early bird](earlyBird/content.md) + +or an + +[night owl](nightOwl/content.md) ? + Your adventure begins. You realize there are hundreds of paths for you to choose from. Which way should you go? Only you can decide. From 97ce28d42553f7e842de4f07a6f80161cd75404d Mon Sep 17 00:00:00 2001 From: Appu Date: Fri, 10 May 2019 21:10:35 +0530 Subject: [PATCH 5392/5486] Add advantages of early bird --- english/earlyBird/content.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 english/earlyBird/content.md diff --git a/english/earlyBird/content.md b/english/earlyBird/content.md new file mode 100644 index 0000000000..5fe6d0351d --- /dev/null +++ b/english/earlyBird/content.md @@ -0,0 +1,13 @@ +Advantages early birds have over night owls +------------------------------------------- + +1. Becoming an early riser will make you more successful. +2. Morning people are happier than night owls. +3. Morning people are often in better shape than night owls. +4. Waking up early leads to increased productivity. +5. Possess healthy character traits. + +So kudos to you for being an early bird. + +Click [here](../marshmallow.md) to go back to the story. +Click [here](https://www.google.com/) to go back to the google. \ No newline at end of file From 4c3ce468e8498ce9a0c604255f56f374449a20b3 Mon Sep 17 00:00:00 2001 From: Appu Date: Fri, 10 May 2019 21:11:24 +0530 Subject: [PATCH 5393/5486] Add advantages of night owl --- english/nightOwl/content.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 english/nightOwl/content.md diff --git a/english/nightOwl/content.md b/english/nightOwl/content.md new file mode 100644 index 0000000000..21226f9beb --- /dev/null +++ b/english/nightOwl/content.md @@ -0,0 +1,13 @@ +Advantages night owls have over early birds +------------------------------------------- + +1. More creative. +2. Might be more intelligent. +3. Might have more mental stamina than early birds. +4. Might get an extra burst of strength. +5. Might be better at baseball. ;) + +So here's a shout out to all the night owls out there. + +Click [here](../marshmallow.md) to go back to the story. +Click [here](https://www.google.com/) to go back to the google. \ No newline at end of file From a561a087cdbb4855198d71ee177260724e889c4d Mon Sep 17 00:00:00 2001 From: Appu Date: Fri, 10 May 2019 22:59:53 +0530 Subject: [PATCH 5394/5486] Change wrong article usage --- english/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/marshmallow.md b/english/marshmallow.md index c6fd37667c..eabf3ffffd 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -41,7 +41,7 @@ Are you an: [early bird](earlyBird/content.md) -or an +or a [night owl](nightOwl/content.md) ? From 1e2d11acb789024e359ef944f228d7fe3bcbed88 Mon Sep 17 00:00:00 2001 From: Appu Date: Fri, 10 May 2019 23:01:13 +0530 Subject: [PATCH 5395/5486] Leave out the back in going back to google. --- english/nightOwl/content.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/nightOwl/content.md b/english/nightOwl/content.md index 21226f9beb..ad735083ed 100644 --- a/english/nightOwl/content.md +++ b/english/nightOwl/content.md @@ -10,4 +10,4 @@ Advantages night owls have over early birds So here's a shout out to all the night owls out there. Click [here](../marshmallow.md) to go back to the story. -Click [here](https://www.google.com/) to go back to the google. \ No newline at end of file +Click [here](https://www.google.com/) to go to the google. \ No newline at end of file From dc20143b50144b9ca569b8e13123a525df2f4976 Mon Sep 17 00:00:00 2001 From: Appu Date: Fri, 10 May 2019 23:10:12 +0530 Subject: [PATCH 5396/5486] Grammar correction --- english/nightOwl/content.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/nightOwl/content.md b/english/nightOwl/content.md index ad735083ed..70298af96f 100644 --- a/english/nightOwl/content.md +++ b/english/nightOwl/content.md @@ -10,4 +10,4 @@ Advantages night owls have over early birds So here's a shout out to all the night owls out there. Click [here](../marshmallow.md) to go back to the story. -Click [here](https://www.google.com/) to go to the google. \ No newline at end of file +Click [here](https://www.google.com/) to go to google. \ No newline at end of file From d525e7dadf58bd785328dd3c2d84fe98b03d56c8 Mon Sep 17 00:00:00 2001 From: Appu Date: Fri, 10 May 2019 23:12:15 +0530 Subject: [PATCH 5397/5486] Grammer corrections --- english/earlyBird/content.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/earlyBird/content.md b/english/earlyBird/content.md index 5fe6d0351d..00ec7e73b1 100644 --- a/english/earlyBird/content.md +++ b/english/earlyBird/content.md @@ -10,4 +10,4 @@ Advantages early birds have over night owls So kudos to you for being an early bird. Click [here](../marshmallow.md) to go back to the story. -Click [here](https://www.google.com/) to go back to the google. \ No newline at end of file +Click [here](https://www.google.com/) to go to google. \ No newline at end of file From 9d51b91b4af49427776d07165e5671f65e75cbc3 Mon Sep 17 00:00:00 2001 From: Appu Date: Fri, 10 May 2019 23:22:37 +0530 Subject: [PATCH 5398/5486] Add blank lines to make it more visually appealing@casey-collab --- english/earlyBird/content.md | 1 + english/nightOwl/content.md | 1 + 2 files changed, 2 insertions(+) diff --git a/english/earlyBird/content.md b/english/earlyBird/content.md index 00ec7e73b1..71cff51190 100644 --- a/english/earlyBird/content.md +++ b/english/earlyBird/content.md @@ -10,4 +10,5 @@ Advantages early birds have over night owls So kudos to you for being an early bird. Click [here](../marshmallow.md) to go back to the story. + Click [here](https://www.google.com/) to go to google. \ No newline at end of file diff --git a/english/nightOwl/content.md b/english/nightOwl/content.md index 70298af96f..277909538c 100644 --- a/english/nightOwl/content.md +++ b/english/nightOwl/content.md @@ -10,4 +10,5 @@ Advantages night owls have over early birds So here's a shout out to all the night owls out there. Click [here](../marshmallow.md) to go back to the story. + Click [here](https://www.google.com/) to go to google. \ No newline at end of file From 8109f3041e799b9e64a1dd949dc92f1e597c19f6 Mon Sep 17 00:00:00 2001 From: "pete.furtado" Date: Sat, 11 May 2019 15:09:49 -0400 Subject: [PATCH 5399/5486] Add Pete's changes --- .../go_back/drink_blue_liquid/drink_blue_liquid.md | 1 + english/dream_in_dream/go_back/drink_me.md | 8 +++++++- .../go_back/drink_red_liquid/drink_red_liquid.md | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 english/dream_in_dream/go_back/drink_blue_liquid/drink_blue_liquid.md create mode 100644 english/dream_in_dream/go_back/drink_red_liquid/drink_red_liquid.md diff --git a/english/dream_in_dream/go_back/drink_blue_liquid/drink_blue_liquid.md b/english/dream_in_dream/go_back/drink_blue_liquid/drink_blue_liquid.md new file mode 100644 index 0000000000..50dbbfeed4 --- /dev/null +++ b/english/dream_in_dream/go_back/drink_blue_liquid/drink_blue_liquid.md @@ -0,0 +1 @@ +Hmmmmmm, it tastes kind of red, weird. \ No newline at end of file diff --git a/english/dream_in_dream/go_back/drink_me.md b/english/dream_in_dream/go_back/drink_me.md index e83ee4248c..2a0ee65daf 100644 --- a/english/dream_in_dream/go_back/drink_me.md +++ b/english/dream_in_dream/go_back/drink_me.md @@ -1,3 +1,9 @@ When you return to the room you notice two new things. The first is a very small door that only a mouse could crawl through. The second is a small table with two bottles on -it. One bottle is filled with blue liquid. The other is filled with red. They both have a label that says, "Drink Me." \ No newline at end of file +it. One bottle is filled with blue liquid. The other is filled with red. They both have a label that says, "Drink Me." + +Do you: + +[Drink the blue liquid?](drink_blue_liquid/drink_blue_liquid.md) + +[Drink the the red liquid?](drink_red_liquid/drink_red_liquid.md) \ No newline at end of file diff --git a/english/dream_in_dream/go_back/drink_red_liquid/drink_red_liquid.md b/english/dream_in_dream/go_back/drink_red_liquid/drink_red_liquid.md new file mode 100644 index 0000000000..a97db5b06f --- /dev/null +++ b/english/dream_in_dream/go_back/drink_red_liquid/drink_red_liquid.md @@ -0,0 +1 @@ +Hmmmmmm, it tastes kind of blue, weird. \ No newline at end of file From 5626d64e92d158188b36103c4e4c6d63e2cd87f1 Mon Sep 17 00:00:00 2001 From: Boaz Ronkin Date: Sat, 11 May 2019 14:57:18 -0700 Subject: [PATCH 5400/5486] Add "not so nice" --- english/2spooky/2spooky.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index 4ca6dbaf8f..cfc08ee72a 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -4,7 +4,7 @@ good bones and calcium are in your future! plz updoot -mr. skeltal is nice! +mr. skeltal is nice! As in, "not nice" hahahaha From 38bfee3f77490639e64d13bcdeebaed3bc734935 Mon Sep 17 00:00:00 2001 From: Boaz Ronkin Date: Sat, 11 May 2019 15:02:58 -0700 Subject: [PATCH 5401/5486] Change on a different line --- english/2spooky/2spooky.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/2spooky/2spooky.md b/english/2spooky/2spooky.md index cfc08ee72a..420f5780ca 100644 --- a/english/2spooky/2spooky.md +++ b/english/2spooky/2spooky.md @@ -4,7 +4,9 @@ good bones and calcium are in your future! plz updoot -mr. skeltal is nice! As in, "not nice" +mr. skeltal is nice! + +As in, "not nice" hahahaha From f78ebe3b0566bcd2eb743f93a6f2adfa16ebeffe Mon Sep 17 00:00:00 2001 From: Katherine Date: Tue, 14 May 2019 12:04:17 -0400 Subject: [PATCH 5402/5486] Add story file for lumberjacks and add to storyline --- french/bucheron/apprend-bucheron.md | 7 +++++++ french/feu-de-camp.md | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 french/bucheron/apprend-bucheron.md diff --git a/french/bucheron/apprend-bucheron.md b/french/bucheron/apprend-bucheron.md new file mode 100644 index 0000000000..0ec6674762 --- /dev/null +++ b/french/bucheron/apprend-bucheron.md @@ -0,0 +1,7 @@ +Vous écoutez un documentaire sur les Bûcherons de la Manouane au Québec +pour savoir si vous pourriez apprendre à abattre du pain d'épice comme +ils abattaient des épinettes. +Vous ne trouvez pas de solution très concluante, mais vous êtes rempli +d'admiration pour les bûcherons et d'espoir de voir des jours meilleurs. + +[Je reconsidère mes options une fois de plus](../feu-de-camp.md) \ No newline at end of file diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 8d92330d1e..11c52bee25 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -1,4 +1,4 @@ -Par un beau matin, vous vous réveillez dans une pièce étrange aux murs en pain d'épice. +Par un beau matin, vous vous réveillez dans une pièce étrange aux murs en pain d'épice. On aurait pû faire que les murs soient fait en pâte de guimave, mais ce sont des murs français. ;) @@ -42,3 +42,4 @@ Que faites-vous ? [Je pense à ce que j'ai vu à la télévision.](millions/millions.md) +[J'apprends les techniques des bûcherons québécois](bucheron/apprend-bucheron.md) \ No newline at end of file From 905775e135cc3f80c1cf593c8ba8f8168ec6ad46 Mon Sep 17 00:00:00 2001 From: Katherine Date: Tue, 14 May 2019 12:09:01 -0400 Subject: [PATCH 5403/5486] Add link to documentary --- french/bucheron/apprend-bucheron.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/french/bucheron/apprend-bucheron.md b/french/bucheron/apprend-bucheron.md index 0ec6674762..509c553cbd 100644 --- a/french/bucheron/apprend-bucheron.md +++ b/french/bucheron/apprend-bucheron.md @@ -1,6 +1,6 @@ Vous écoutez un documentaire sur les Bûcherons de la Manouane au Québec pour savoir si vous pourriez apprendre à abattre du pain d'épice comme -ils abattaient des épinettes. +ils abattaient des épinettes. https://www.onf.ca/film/bucherons_de_la_manouane/ Vous ne trouvez pas de solution très concluante, mais vous êtes rempli d'admiration pour les bûcherons et d'espoir de voir des jours meilleurs. From ccc5d938281c478d5cc06db0070ee99f1e487462 Mon Sep 17 00:00:00 2001 From: KatherinePineault Date: Tue, 14 May 2019 12:21:29 -0400 Subject: [PATCH 5404/5486] Update feu-de-camp.md --- french/feu-de-camp.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/french/feu-de-camp.md b/french/feu-de-camp.md index 11c52bee25..be4050c619 100644 --- a/french/feu-de-camp.md +++ b/french/feu-de-camp.md @@ -1,4 +1,4 @@ -Par un beau matin, vous vous réveillez dans une pièce étrange aux murs en pain d'épice. +Par un beau matin, vous vous réveillez dans une pièce étrange aux murs en pain d'épice. On aurait pû faire que les murs soient fait en pâte de guimave, mais ce sont des murs français. ;) @@ -42,4 +42,4 @@ Que faites-vous ? [Je pense à ce que j'ai vu à la télévision.](millions/millions.md) -[J'apprends les techniques des bûcherons québécois](bucheron/apprend-bucheron.md) \ No newline at end of file +[J'apprends les techniques des bûcherons québécois](bucheron/apprend-bucheron.md) From 9e819709b5b066c2e2ad058b3f68dbfb287a4dc8 Mon Sep 17 00:00:00 2001 From: Hubert Oszywa Date: Tue, 14 May 2019 22:39:13 +0200 Subject: [PATCH 5405/5486] Add the continue of the story --- .../przygoda/jedzenie/korwin/prezent/pistolet/pistolet.md | 1 + Polish/przygoda/jedzenie/korwin/prezent/plakat/plakat.md | 1 + Polish/przygoda/jedzenie/korwin/prezent/rewolwer.md | 8 +++++++- Polish/przygoda/jedzenie/korwin/prezent/wladza/wladza.md | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 Polish/przygoda/jedzenie/korwin/prezent/pistolet/pistolet.md create mode 100644 Polish/przygoda/jedzenie/korwin/prezent/plakat/plakat.md create mode 100644 Polish/przygoda/jedzenie/korwin/prezent/wladza/wladza.md diff --git a/Polish/przygoda/jedzenie/korwin/prezent/pistolet/pistolet.md b/Polish/przygoda/jedzenie/korwin/prezent/pistolet/pistolet.md new file mode 100644 index 0000000000..39de3a2494 --- /dev/null +++ b/Polish/przygoda/jedzenie/korwin/prezent/pistolet/pistolet.md @@ -0,0 +1 @@ +Spod łóżka wyciągasz AK47. Korwin jest z Ciebie dumny, że masz taką broń i proponuje Ci wspólne poćwiczenie strzelania do tarczy na podwróku, przed domem. diff --git a/Polish/przygoda/jedzenie/korwin/prezent/plakat/plakat.md b/Polish/przygoda/jedzenie/korwin/prezent/plakat/plakat.md new file mode 100644 index 0000000000..81019c54fc --- /dev/null +++ b/Polish/przygoda/jedzenie/korwin/prezent/plakat/plakat.md @@ -0,0 +1 @@ +Z szafki wyciągasz plakat z wizerunkiem Korwina i dajesz mu, żeby go podpisał swoim imieniem i nazwiskiem. Niestety plakat nagle znika i ani Ty ani Korwin nie wiecie co właściwie się dzieje. diff --git a/Polish/przygoda/jedzenie/korwin/prezent/rewolwer.md b/Polish/przygoda/jedzenie/korwin/prezent/rewolwer.md index c67d602a41..5865fe9800 100644 --- a/Polish/przygoda/jedzenie/korwin/prezent/rewolwer.md +++ b/Polish/przygoda/jedzenie/korwin/prezent/rewolwer.md @@ -1,2 +1,8 @@ Korwin jest wielce zadowolony z Twojego prezentu, dlatego -zabiera Cię na wspólne polowanie na czerwonych. \ No newline at end of file +zabiera Cię na wspólne polowanie na czerwonych. + +[Wyciągasz swoją broń](pistolet/pistolet.md) + +[Przed wyjściem chcesz dostać autograf od Korwina](plakat/plakat.md) + +[Proponujesz zamiast wspólnego polowania, objęcie władzy w Polsce](wladza/wladza.md) diff --git a/Polish/przygoda/jedzenie/korwin/prezent/wladza/wladza.md b/Polish/przygoda/jedzenie/korwin/prezent/wladza/wladza.md new file mode 100644 index 0000000000..4d8604a696 --- /dev/null +++ b/Polish/przygoda/jedzenie/korwin/prezent/wladza/wladza.md @@ -0,0 +1 @@ +Proponujesz Korwinowi wyjazd do Nowego Jorku, gdzie spotkacie z Mariuszem Max Kolonko, żeby nakreślić plan objęcia władzy w Polsce. Korwin zgadza się, ale nie wiecie jak dostać się do Nowego Jorku. From 6ad8835fe88f5af4bfbe7d58c0a9881be462eaa4 Mon Sep 17 00:00:00 2001 From: Hubert Oszywa Date: Tue, 14 May 2019 22:51:31 +0200 Subject: [PATCH 5406/5486] Add spacing between lines --- Polish/przygoda/jedzenie/korwin/prezent/pistolet/pistolet.md | 3 ++- Polish/przygoda/jedzenie/korwin/prezent/plakat/plakat.md | 3 ++- Polish/przygoda/jedzenie/korwin/prezent/wladza/wladza.md | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Polish/przygoda/jedzenie/korwin/prezent/pistolet/pistolet.md b/Polish/przygoda/jedzenie/korwin/prezent/pistolet/pistolet.md index 39de3a2494..5e778767ed 100644 --- a/Polish/przygoda/jedzenie/korwin/prezent/pistolet/pistolet.md +++ b/Polish/przygoda/jedzenie/korwin/prezent/pistolet/pistolet.md @@ -1 +1,2 @@ -Spod łóżka wyciągasz AK47. Korwin jest z Ciebie dumny, że masz taką broń i proponuje Ci wspólne poćwiczenie strzelania do tarczy na podwróku, przed domem. +Spod łóżka wyciągasz AK47. +Korwin jest z Ciebie dumny, że masz taką broń i proponuje Ci wspólne poćwiczenie strzelania do tarczy przed domem. diff --git a/Polish/przygoda/jedzenie/korwin/prezent/plakat/plakat.md b/Polish/przygoda/jedzenie/korwin/prezent/plakat/plakat.md index 81019c54fc..c90dadc264 100644 --- a/Polish/przygoda/jedzenie/korwin/prezent/plakat/plakat.md +++ b/Polish/przygoda/jedzenie/korwin/prezent/plakat/plakat.md @@ -1 +1,2 @@ -Z szafki wyciągasz plakat z wizerunkiem Korwina i dajesz mu, żeby go podpisał swoim imieniem i nazwiskiem. Niestety plakat nagle znika i ani Ty ani Korwin nie wiecie co właściwie się dzieje. +Z szafki wyciągasz plakat z wizerunkiem Korwina i dajesz mu, żeby go podpisał swoim imieniem i nazwiskiem. +Niestety plakat nagle znika i ani Ty ani Korwin nie wiecie co właściwie się dzieje. diff --git a/Polish/przygoda/jedzenie/korwin/prezent/wladza/wladza.md b/Polish/przygoda/jedzenie/korwin/prezent/wladza/wladza.md index 4d8604a696..2fee561b54 100644 --- a/Polish/przygoda/jedzenie/korwin/prezent/wladza/wladza.md +++ b/Polish/przygoda/jedzenie/korwin/prezent/wladza/wladza.md @@ -1 +1,3 @@ -Proponujesz Korwinowi wyjazd do Nowego Jorku, gdzie spotkacie z Mariuszem Max Kolonko, żeby nakreślić plan objęcia władzy w Polsce. Korwin zgadza się, ale nie wiecie jak dostać się do Nowego Jorku. +Proponujesz Korwinowi wyjazd do Nowego Jorku, gdzie spotkacie z Mariuszem Max Kolonko. +Tam opracujecie plan objęcia władzy w Polsce. +Korwin zgadza się, ale nie wiecie jak dostać się do Nowego Jorku. From cfa2d410c4096808ce9c0f898544404ed52236fb Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 19 May 2019 17:04:24 +0300 Subject: [PATCH 5407/5486] Added folder: lighter --- ukrainian/lighter/lighter.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 ukrainian/lighter/lighter.md diff --git a/ukrainian/lighter/lighter.md b/ukrainian/lighter/lighter.md new file mode 100644 index 0000000000..e8050b915b --- /dev/null +++ b/ukrainian/lighter/lighter.md @@ -0,0 +1,2 @@ +Поки Ви бавились із запальничкою, зефір затвердів. +Тепер ніж не допоможе. \ No newline at end of file From 0c909cfc7af6b4d6936221be0b50034807505c56 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 19 May 2019 17:08:48 +0300 Subject: [PATCH 5408/5486] Added reference from ukrainian/marshmallow.md to ukrainian/lighter/lighter.md --- ukrainian/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 9dc95e18dd..43793cce58 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -48,4 +48,6 @@ [В телефоні ж є музічний плеєр](the-wall/the-wall.md) +[Побавлюся із запальничкою](lighter/lighter.md) + Перед вами вікно. Ви його [відкиваєте](window/open-the-window.md)... \ No newline at end of file From af91a2482a42735138f9b1131b36357f9134ff3f Mon Sep 17 00:00:00 2001 From: Christian Dibala Bell Date: Wed, 22 May 2019 21:09:17 -0400 Subject: [PATCH 5409/5486] adds travel destination feature --- english/marshmallow.md | 2 ++ english/travel/destinations.md | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 english/travel/destinations.md diff --git a/english/marshmallow.md b/english/marshmallow.md index eabf3ffffd..c48e2972a1 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1259,3 +1259,5 @@ What is your [passion?](passion/passion.md) searching for [good](tvf-play/watch.md) content. Do you like [tigers](tiger/tiger.md)? + +[Travel the world!](travel/destinations.md) diff --git a/english/travel/destinations.md b/english/travel/destinations.md new file mode 100644 index 0000000000..bd6082490b --- /dev/null +++ b/english/travel/destinations.md @@ -0,0 +1,4 @@ +Choose: +[Mexico](https://www.google.com/search?ei=-_HlXOTaH-7l_QaM35Iw&q=travel+mexico) + +[Japan](https://www.google.com/search?ei=__HlXMeYKI6Oggetm6CgCQ&q=travel+japan) From f31ad0bf31a25dea34ad9136111f9aeb707e59a6 Mon Sep 17 00:00:00 2001 From: Christian Dibala Bell Date: Wed, 22 May 2019 22:28:54 -0400 Subject: [PATCH 5410/5486] Add Portugal as a destination country --- english/travel/destinations.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/travel/destinations.md b/english/travel/destinations.md index bd6082490b..9689d96e6a 100644 --- a/english/travel/destinations.md +++ b/english/travel/destinations.md @@ -2,3 +2,5 @@ Choose: [Mexico](https://www.google.com/search?ei=-_HlXOTaH-7l_QaM35Iw&q=travel+mexico) [Japan](https://www.google.com/search?ei=__HlXMeYKI6Oggetm6CgCQ&q=travel+japan) + +[Portugal](https://www.google.com/search?q=portugal+travel&oq=portugal+travel) From c857587407b7701fc6d926ff789ae5c9138d32dd Mon Sep 17 00:00:00 2001 From: andre-lange Date: Mon, 27 May 2019 10:12:50 -0300 Subject: [PATCH 5411/5486] Add quase-fim/ainda-sem-fim.md && modify fim.md --- portugues/historia/fim.md | 4 +++- portugues/historia/quase-fim/ainda-sem-fim.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 portugues/historia/quase-fim/ainda-sem-fim.md diff --git a/portugues/historia/fim.md b/portugues/historia/fim.md index 19255c07ce..a1339f4e27 100644 --- a/portugues/historia/fim.md +++ b/portugues/historia/fim.md @@ -1,3 +1,5 @@ Fim muito legal :) -Ainda não acabou \ No newline at end of file +Ainda não acabou + +Agora acabou \ No newline at end of file diff --git a/portugues/historia/quase-fim/ainda-sem-fim.md b/portugues/historia/quase-fim/ainda-sem-fim.md new file mode 100644 index 0000000000..3634b8978c --- /dev/null +++ b/portugues/historia/quase-fim/ainda-sem-fim.md @@ -0,0 +1 @@ +Talvez no seja o fim ainda \ No newline at end of file From 45a20a73ecd01e393e982b0c89bdee186ab6be8a Mon Sep 17 00:00:00 2001 From: andre-lange Date: Mon, 27 May 2019 11:01:56 -0300 Subject: [PATCH 5412/5486] Add links in history --- portugues/colaborando.md | 2 ++ portugues/historia/fim.md | 2 +- portugues/historia/quase-fim/ainda-sem-fim.md | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 54a4aa0cdc..e70ea9798b 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -35,6 +35,8 @@ Você: [Toda vez que eu chego em casa...](barata/baratadavizinha.md) +[Será o fim?](historia/fim.md) + Na verdade, isto tudo é a sua imaginação. Você vive em 1991 e usa MS-DOS 5.0 e um modem de 9600 baud. A sua linha telefônica está uma droga hoje e você tem que baixar a ultima versão do XTree para enciumar os seus amigos. diff --git a/portugues/historia/fim.md b/portugues/historia/fim.md index a1339f4e27..db1a3e6e93 100644 --- a/portugues/historia/fim.md +++ b/portugues/historia/fim.md @@ -1,5 +1,5 @@ Fim muito legal :) -Ainda não acabou +[Ainda não acabou](quase-fim/ainda-sem-fim.md) Agora acabou \ No newline at end of file diff --git a/portugues/historia/quase-fim/ainda-sem-fim.md b/portugues/historia/quase-fim/ainda-sem-fim.md index 3634b8978c..84c04ccc7e 100644 --- a/portugues/historia/quase-fim/ainda-sem-fim.md +++ b/portugues/historia/quase-fim/ainda-sem-fim.md @@ -1 +1 @@ -Talvez no seja o fim ainda \ No newline at end of file +Talvez não seja o fim ainda \ No newline at end of file From 5c5dc0c13ce1712b68202f3f5ea962edb86efcaf Mon Sep 17 00:00:00 2001 From: andre-lange Date: Mon, 27 May 2019 11:09:23 -0300 Subject: [PATCH 5413/5486] New demand --- portugues/historia/fim.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portugues/historia/fim.md b/portugues/historia/fim.md index db1a3e6e93..d4a33f1271 100644 --- a/portugues/historia/fim.md +++ b/portugues/historia/fim.md @@ -1,5 +1,5 @@ Fim muito legal :) -[Ainda não acabou](quase-fim/ainda-sem-fim.md) +Ainda não acabou -Agora acabou \ No newline at end of file +[Agora acabou?](quase-fim/ainda-sem-fim.md) \ No newline at end of file From 630a209b70e6c46a388c45e1714bfec2f309221c Mon Sep 17 00:00:00 2001 From: andre-lange Date: Mon, 27 May 2019 11:27:36 -0300 Subject: [PATCH 5414/5486] Bug fix --- portugues/colaborando.md | 2 ++ portugues/historia/fim.md | 4 +++- portugues/historia/quase-fim/ainda-sem-fim.md | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 portugues/historia/quase-fim/ainda-sem-fim.md diff --git a/portugues/colaborando.md b/portugues/colaborando.md index 54a4aa0cdc..95da9887f9 100644 --- a/portugues/colaborando.md +++ b/portugues/colaborando.md @@ -71,3 +71,5 @@ BR BR BR Hue hue hue!!!! [Você quer ser um desenvolvedor de jogos independente](jornada-indie/O inicio.md) [Você faz uma simpatia para o código funcionar](simpatia/simpatia.md) + +[Será o fim?](historia/fim.md) \ No newline at end of file diff --git a/portugues/historia/fim.md b/portugues/historia/fim.md index 19255c07ce..9855795acd 100644 --- a/portugues/historia/fim.md +++ b/portugues/historia/fim.md @@ -1,3 +1,5 @@ Fim muito legal :) -Ainda não acabou \ No newline at end of file +Ainda não acabou + +[Será que acabou?](quase-fim/ainda-sem-fim.md) \ No newline at end of file diff --git a/portugues/historia/quase-fim/ainda-sem-fim.md b/portugues/historia/quase-fim/ainda-sem-fim.md new file mode 100644 index 0000000000..442c39862f --- /dev/null +++ b/portugues/historia/quase-fim/ainda-sem-fim.md @@ -0,0 +1 @@ +Ainda sem fim... \ No newline at end of file From 88ebaea7da378e9c671cad8704593411c492ee2e Mon Sep 17 00:00:00 2001 From: Gopal Date: Sat, 1 Jun 2019 21:05:48 -0400 Subject: [PATCH 5415/5486] Adding more reddit --- english/showerthoughts/showerthoughts.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/showerthoughts/showerthoughts.md b/english/showerthoughts/showerthoughts.md index 4f59813d42..b915f3a674 100644 --- a/english/showerthoughts/showerthoughts.md +++ b/english/showerthoughts/showerthoughts.md @@ -1 +1,3 @@ -in reddit, check out /r/showerthoughts \ No newline at end of file +in reddit, check out /r/showerthoughts + +in reddit, check out r/programminghumor \ No newline at end of file From 70fae52686cea96c29469380cc2066aac5c9d265 Mon Sep 17 00:00:00 2001 From: Paul Rankin Date: Sat, 8 Jun 2019 10:02:30 +0100 Subject: [PATCH 5416/5486] one liner added by PR --- english/love-udacity/love-udacity.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/love-udacity/love-udacity.md b/english/love-udacity/love-udacity.md index cd5e4b1c45..48648e8376 100644 --- a/english/love-udacity/love-udacity.md +++ b/english/love-udacity/love-udacity.md @@ -17,3 +17,5 @@ No you aren't going to quit. There are a ton of other resouces, just please keep Thanks alot Udacity for teaching me git and github [Udacity taught me Spanish](../../espanol/canudos.md) + +I hope udacity offers nano degrees in law, accountancy and engineering one day too. From 7ddb5cfbdda801f57469b29a435b5b08bb425827 Mon Sep 17 00:00:00 2001 From: Kal Parvanov Date: Sun, 9 Jun 2019 15:37:32 -0500 Subject: [PATCH 5417/5486] The story continues --- bulgarian/fire-police/fire-police.md | 1 + 1 file changed, 1 insertion(+) diff --git a/bulgarian/fire-police/fire-police.md b/bulgarian/fire-police/fire-police.md index 3c3775cd2a..e1aa16efe1 100644 --- a/bulgarian/fire-police/fire-police.md +++ b/bulgarian/fire-police/fire-police.md @@ -1,2 +1,3 @@ +Но за сметка на това един паяк идва и бързо ти вдига колата докато ти се чудиш как да измъкнеш горкия Пешо от пламъците. Оказва се, че си в България и на пожарникарите им отнема четири часа да дойдат. Това каза кучето Пешо преди да изгори преди го приберат в местната дюнерджийница. \ No newline at end of file From 6718b8ab23c1628c79c82ce756c7b6701d005d42 Mon Sep 17 00:00:00 2001 From: Razan Rajab Date: Sat, 15 Jun 2019 21:38:04 +0300 Subject: [PATCH 5418/5486] my-change add sentence to fire story --- english/light-fire/fire.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/light-fire/fire.md b/english/light-fire/fire.md index f555892b89..35edc8d5f1 100644 --- a/english/light-fire/fire.md +++ b/english/light-fire/fire.md @@ -19,6 +19,8 @@ The rat smiles and says, "Come on, let's go!" I add them. There is no conflict！ +***add sentence change. + [Enter that opening](magic-world/alice.md) [Start screaming seeing the rat](fire/alone.md) From 30cf3e0d427e67ec8ad3528289928dca78b694b1 Mon Sep 17 00:00:00 2001 From: Thilak Chander Date: Mon, 17 Jun 2019 10:20:14 +0530 Subject: [PATCH 5419/5486] Create metallica.md --- english/metallica/metallica.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 english/metallica/metallica.md diff --git a/english/metallica/metallica.md b/english/metallica/metallica.md new file mode 100644 index 0000000000..b5732e34b1 --- /dev/null +++ b/english/metallica/metallica.md @@ -0,0 +1,8 @@ +Metallica Wiki? [here](https://en.wikipedia.org/wiki/Metallica) + +The Metallica website [here](https://www.metallica.com/) + +Metallica Twitter [here](https://twitter.com/Metallica) + +Metallica YouTube Channel [here](https://www.youtube.com/user/MetallicaTV) + From 478bcdc3734213baf0521ad08faa95822f5f9636 Mon Sep 17 00:00:00 2001 From: Thilak Chander Date: Mon, 17 Jun 2019 10:22:58 +0530 Subject: [PATCH 5420/5486] Update marshmallow.md --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index c48e2972a1..03a2f961eb 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -100,6 +100,8 @@ Realize the [truth about candidates' tax plans](stopbernie/stopbernie.md) How about some [chill music](chillmusic/chillmusic.md)? +[Metallica](metallica/metallica.md)? + [Want to see my Quora profile](ismail-quora-profile/quora-profile.md) You decide the only way out is to climb, [climb](climbing/climbing.md) hard friend. From 395d9a68117a6835b22b757548e8b2eedfd34786 Mon Sep 17 00:00:00 2001 From: Abdulrahman Aminu <24601677+aaminu@users.noreply.github.com> Date: Tue, 18 Jun 2019 15:17:39 +0200 Subject: [PATCH 5421/5486] Added history of yoruba people --- yoruba/history/yoruba_history.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 yoruba/history/yoruba_history.md diff --git a/yoruba/history/yoruba_history.md b/yoruba/history/yoruba_history.md new file mode 100644 index 0000000000..f94d2855d1 --- /dev/null +++ b/yoruba/history/yoruba_history.md @@ -0,0 +1 @@ +Click [here](https://en.wikipedia.org/wiki/Yoruba_people) to learn about the yoruba people and their origin. \ No newline at end of file From e65bdc23de875b19e2845a931895c4ab48d9a974 Mon Sep 17 00:00:00 2001 From: Abdulrahman Aminu <24601677+aaminu@users.noreply.github.com> Date: Tue, 18 Jun 2019 15:25:50 +0200 Subject: [PATCH 5422/5486] added link to the yoruba in language.md --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index 8f1321b6ba..9214d8bbd0 100644 --- a/language.md +++ b/language.md @@ -169,3 +169,5 @@ Astoli Dothraki ? [Dothrae jinne](dothraki/dothraki_evoli.md) Si Latine legere vis, [hic preme](latin/arena.md) አማርኟ ኸቻልክ [ተጫን](Amharic/ጀምር.md) + +ti o ba so ede yoruba, [gba ono yi](yoruba/history/yoruba_history.md) From f4f93ac433a8afd71bdac07566b33e2cdcad815b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B8=E7=91=8B=E6=81=A9?= Date: Wed, 19 Jun 2019 01:51:41 +0800 Subject: [PATCH 5423/5486] Add go.md --- Chinese/go/go.md | 1 + "Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 Chinese/go/go.md diff --git a/Chinese/go/go.md b/Chinese/go/go.md new file mode 100644 index 0000000000..9400454e52 --- /dev/null +++ b/Chinese/go/go.md @@ -0,0 +1 @@ +gogogo \ No newline at end of file diff --git "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" index 756868bed2..660749c785 100644 --- "a/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" +++ "b/Chinese/\345\244\247\350\257\235\350\245\277\346\270\270.md" @@ -169,3 +169,5 @@ [3月3号去香港](hongkong/go2HK.md) [蔡徐坤的篮球梦](Caixukun/蔡徐坤.md) + +[go](go/go.md) \ No newline at end of file From 381395b2e1c16938887e68325e620851209b8c38 Mon Sep 17 00:00:00 2001 From: Ashley Teo Date: Sun, 23 Jun 2019 11:20:50 +0800 Subject: [PATCH 5424/5486] added one line to story --- english/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/marshmallow.md b/english/marshmallow.md index 03a2f961eb..6bf05fbfb5 100644 --- a/english/marshmallow.md +++ b/english/marshmallow.md @@ -1263,3 +1263,5 @@ searching for [good](tvf-play/watch.md) content. Do you like [tigers](tiger/tiger.md)? [Travel the world!](travel/destinations.md) + +Do you like [apple?](https://www.youtube.com/watch?v=1goJcurIMig) \ No newline at end of file From f115a3563391f03561f58221ac04b9430fd740a1 Mon Sep 17 00:00:00 2001 From: Baibhab Date: Mon, 24 Jun 2019 14:42:12 +0530 Subject: [PATCH 5425/5486] Add Bangla Song --- bangla/AmiBanglayGaanGai/MonThekeBangali.md | 63 +++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 bangla/AmiBanglayGaanGai/MonThekeBangali.md diff --git a/bangla/AmiBanglayGaanGai/MonThekeBangali.md b/bangla/AmiBanglayGaanGai/MonThekeBangali.md new file mode 100644 index 0000000000..e078d7e8a1 --- /dev/null +++ b/bangla/AmiBanglayGaanGai/MonThekeBangali.md @@ -0,0 +1,63 @@ +আমি বাংলায় গান গাই +আমি বাংলার গান গাই +আমি, আমার আমিকে চিরদিন এই বাংলায় খুঁজে পাই +আমি বাংলায় গান গাই +আমি বাংলার গান গাই +আমি, আমার আমিকে চিরদিন এই বাংলায় খুঁজে পাই +আমি বাংলায় দেখি স্বপ্ন +আমি বাংলায় বাঁধি সুর +আমি এই বাংলার মায়াভরা পথে হেঁটেছি এতটা দূর +বাংলা আমার জীবনানন্দ +বাংলা প্রানের সুর +আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ +বাংলা আমার জীবনানন্দ +বাংলা প্রানের সুর +আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ +আহা +আমি বাংলায় কথা কই +আমি বাংলার কথা কই +আমি বাংলায় ভাসি, বাংলায় হাসি, বাংলায় জেগে রই +আমি বাংলায় কথা কই +আমি বাংলার কথা কই +আমি বাংলায় ভাসি, বাংলায় হাসি, বাংলায় জেগে রই +আমি বাংলায় মাতি উল্লাসে +করি বাংলায় হাহাকার +আমি সব দেখে শুনে ক্ষেপে গিয়ে করি বাংলায় চিৎকার +বাংলা আমার দৃপ্ত স্লোগান +ক্ষিপ্ত তীর ধনুক +আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ +বাংলা আমার দৃপ্ত স্লোগান +ক্ষিপ্ত তীর ধনুক +আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ +আহা +আমি বাংলায় ভালবাসি +আমি বাংলাকে ভালবাসি +আমি তারি হাত ধরে সারা পৃথিবীর মানুষের কাছে আসি +আমি বাংলায় ভালবাসি +আমি বাংলাকে ভালবাসি +আমি তারি হাত ধরে সারা পৃথিবীর মানুষের কাছে আসি +আমি যা কিছু মহান বরণ করেছি +বিনম্র শ্রদ্ধায় +মেশে তেরো নদী সাত সাগরের জল গঙ্গায় পদ্মায় +বাংলা আমার তৃষ্ণার জল +তৃপ্ত শেষ চুমুক +আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ +বাংলা আমার তৃষ্ণার জল +তৃপ্ত শেষ চুমুক +আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ +আমি বাংলায় গান গাই +আমি বাংলার গান গাই +আমি, আমার আমিকে চিরদিন এই বাংলায় খুঁজে পাই +আমি বাংলায় গান গাই +আমি বাংলার গান গাই +আমি, আমার আমিকে চিরদিন এই বাংলায় খুঁজে পাই +আমি বাংলায় দেখি স্বপ্ন +আমি বাংলায় বাঁধি সুর +আমি এই বাংলার মায়াভরা পথে হেঁটেছি এতটা দূর +বাংলা আমার জীবনানন্দ +বাংলা প্রানের সুর +আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ +বাংলা আমার জীবনানন্দ +বাংলা প্রানের সুর +আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ +আহা From 441c534ed9a1f7100f21c60eddf6fc9470bde913 Mon Sep 17 00:00:00 2001 From: Baibhab Date: Mon, 24 Jun 2019 15:51:33 +0530 Subject: [PATCH 5426/5486] Modify language.md to add the bangla song --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index 9214d8bbd0..c21ab8cdb1 100644 --- a/language.md +++ b/language.md @@ -1,3 +1,5 @@ +বাংলা বুজলে, [এখানে আসুন](bangla/AmiBanglayGaanGai/MonThekeBangali.md) + If you speak English, [go here](english/marshmallow.md). Jei kalbi lietuviškai [spausk čia](lithuanian/startas.md) From 76ec89855772b4f29be8a116925c69ba0e6a857c Mon Sep 17 00:00:00 2001 From: Baibhab Debnath Date: Mon, 24 Jun 2019 15:57:48 +0530 Subject: [PATCH 5427/5486] Update MonThekeBangali.md --- bangla/AmiBanglayGaanGai/MonThekeBangali.md | 62 +++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/bangla/AmiBanglayGaanGai/MonThekeBangali.md b/bangla/AmiBanglayGaanGai/MonThekeBangali.md index e078d7e8a1..6f9403e172 100644 --- a/bangla/AmiBanglayGaanGai/MonThekeBangali.md +++ b/bangla/AmiBanglayGaanGai/MonThekeBangali.md @@ -1,63 +1,125 @@ আমি বাংলায় গান গাই + আমি বাংলার গান গাই + আমি, আমার আমিকে চিরদিন এই বাংলায় খুঁজে পাই + আমি বাংলায় গান গাই + আমি বাংলার গান গাই + আমি, আমার আমিকে চিরদিন এই বাংলায় খুঁজে পাই + আমি বাংলায় দেখি স্বপ্ন + আমি বাংলায় বাঁধি সুর + আমি এই বাংলার মায়াভরা পথে হেঁটেছি এতটা দূর + বাংলা আমার জীবনানন্দ + বাংলা প্রানের সুর + আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ + বাংলা আমার জীবনানন্দ + বাংলা প্রানের সুর + আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ + আহা + আমি বাংলায় কথা কই + আমি বাংলার কথা কই + আমি বাংলায় ভাসি, বাংলায় হাসি, বাংলায় জেগে রই + আমি বাংলায় কথা কই + আমি বাংলার কথা কই + আমি বাংলায় ভাসি, বাংলায় হাসি, বাংলায় জেগে রই + আমি বাংলায় মাতি উল্লাসে + করি বাংলায় হাহাকার + আমি সব দেখে শুনে ক্ষেপে গিয়ে করি বাংলায় চিৎকার + বাংলা আমার দৃপ্ত স্লোগান + ক্ষিপ্ত তীর ধনুক + আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ + বাংলা আমার দৃপ্ত স্লোগান + ক্ষিপ্ত তীর ধনুক + আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ + আহা + আমি বাংলায় ভালবাসি + আমি বাংলাকে ভালবাসি + আমি তারি হাত ধরে সারা পৃথিবীর মানুষের কাছে আসি + আমি বাংলায় ভালবাসি + আমি বাংলাকে ভালবাসি + আমি তারি হাত ধরে সারা পৃথিবীর মানুষের কাছে আসি + আমি যা কিছু মহান বরণ করেছি + বিনম্র শ্রদ্ধায় + মেশে তেরো নদী সাত সাগরের জল গঙ্গায় পদ্মায় + বাংলা আমার তৃষ্ণার জল + তৃপ্ত শেষ চুমুক + আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ + বাংলা আমার তৃষ্ণার জল + তৃপ্ত শেষ চুমুক + আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ + আমি বাংলায় গান গাই + আমি বাংলার গান গাই + আমি, আমার আমিকে চিরদিন এই বাংলায় খুঁজে পাই + আমি বাংলায় গান গাই + আমি বাংলার গান গাই + আমি, আমার আমিকে চিরদিন এই বাংলায় খুঁজে পাই + আমি বাংলায় দেখি স্বপ্ন + আমি বাংলায় বাঁধি সুর + আমি এই বাংলার মায়াভরা পথে হেঁটেছি এতটা দূর + বাংলা আমার জীবনানন্দ + বাংলা প্রানের সুর + আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ + বাংলা আমার জীবনানন্দ + বাংলা প্রানের সুর + আমি একবার দেখি, বার বার দেখি, দেখি বাংলার মুখ + আহা From a5b5dd0e51d46883a07c6d1f4c4911c8adf4ca49 Mon Sep 17 00:00:00 2001 From: philippds Date: Mon, 24 Jun 2019 11:42:17 +0100 Subject: [PATCH 5428/5486] making an addition to the red-pill story --- english/red-pill/red-pill.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/english/red-pill/red-pill.md b/english/red-pill/red-pill.md index 7c02c508d1..c02df455cd 100644 --- a/english/red-pill/red-pill.md +++ b/english/red-pill/red-pill.md @@ -1,3 +1,5 @@ An wrinkled old man with a funny hat appears and hands you a red pill and a glass of chocolate milk. -You take the pill then drink the milk and within seconds you become extremely hungry but only for tacos. \ No newline at end of file +You take the pill then drink the milk and within seconds you become extremely hungry but only for tacos. + +The only problem is, there is no taco-place in the proximity of 1000 kilometers and you are a terrible cook. \ No newline at end of file From 226c1bf4255f6d53937120264f8c565fa846be49 Mon Sep 17 00:00:00 2001 From: agbai1 Date: Tue, 25 Jun 2019 00:32:03 -0400 Subject: [PATCH 5429/5486] Add Igbo peoples news folder --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index 9214d8bbd0..9522cffe17 100644 --- a/language.md +++ b/language.md @@ -171,3 +171,5 @@ Si Latine legere vis, [hic preme](latin/arena.md) አማርኟ ኸቻልክ [ተጫን](Amharic/ጀምር.md) ti o ba so ede yoruba, [gba ono yi](yoruba/history/yoruba_history.md) + +If you speak Igbo, [go here](igbo/igbo-news.md) From 8422c26b38c17af3d6ad4b94305c5e08e731febb Mon Sep 17 00:00:00 2001 From: agbai1 Date: Tue, 25 Jun 2019 00:53:28 -0400 Subject: [PATCH 5430/5486] Add link for Igbo news and a bit of history lesson. --- igbo/igbo-news.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 igbo/igbo-news.md diff --git a/igbo/igbo-news.md b/igbo/igbo-news.md new file mode 100644 index 0000000000..a9d6d742ec --- /dev/null +++ b/igbo/igbo-news.md @@ -0,0 +1,3 @@ +All the latest news about [Igbo people](https://www.bbc.com/igbo) + +For a bit of history, [indulge here](https://www.britannica.com/topic/Igbo) From c0c565b6d5f970009a31bad76eec7d321fa46cae Mon Sep 17 00:00:00 2001 From: Enrique Lopez Date: Tue, 25 Jun 2019 15:09:29 -0500 Subject: [PATCH 5431/5486] Adding new line in the story --- espanol/canudos.md | 4 +++- espanol/space/space.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 espanol/space/space.md diff --git a/espanol/canudos.md b/espanol/canudos.md index 256851e058..8ae9a58cee 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -195,4 +195,6 @@ Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/ [Y de repente, sintió la necesidad de que la historia llegase a su fin](fin/fin.md) -[Activo su Stand ZA WARUDO](dio/dio.md) \ No newline at end of file +[Activo su Stand ZA WARUDO](dio/dio.md) + +Y despues de varios disparos decidio ir a comer, mientras su amigo lo cubria el encendia el coche para iniciar su viaje directo al [espacio](space/space.md). \ No newline at end of file diff --git a/espanol/space/space.md b/espanol/space/space.md new file mode 100644 index 0000000000..38de91ada1 --- /dev/null +++ b/espanol/space/space.md @@ -0,0 +1 @@ +Lugar donde se encuentran los objetos y en el que los eventos que ocurren tienen una posición y dirección relativas. El espacio físico es habitualmente concebido con tres dimensiones lineales, aunque los físicos modernos usualmente lo consideran, con el tiempo, como una parte de un infinito continuo de cuatro dimensiones conocido como espacio-tiempo, que en presencia de materia es curvo. \ No newline at end of file From 3f27e41f43a3c2026ce8e96ea7848b859bd175c4 Mon Sep 17 00:00:00 2001 From: Enrique Lopez Date: Tue, 25 Jun 2019 15:25:05 -0500 Subject: [PATCH 5432/5486] Split in two lines --- espanol/canudos.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 8ae9a58cee..ed4c0a55bf 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -197,4 +197,5 @@ Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/ [Activo su Stand ZA WARUDO](dio/dio.md) -Y despues de varios disparos decidio ir a comer, mientras su amigo lo cubria el encendia el coche para iniciar su viaje directo al [espacio](space/space.md). \ No newline at end of file +Y despues de varios disparos decidio ir a comer, mientras su amigo lo cubria el encendia el coche +para iniciar su viaje directo al [espacio](space/space.md). From 9863dae07c82d02519bd66369b011e741fc9c779 Mon Sep 17 00:00:00 2001 From: Enrique Lopez Date: Tue, 25 Jun 2019 15:28:23 -0500 Subject: [PATCH 5433/5486] reducing lenght --- espanol/space/space.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/space/space.md b/espanol/space/space.md index 38de91ada1..88b7106d12 100644 --- a/espanol/space/space.md +++ b/espanol/space/space.md @@ -1 +1 @@ -Lugar donde se encuentran los objetos y en el que los eventos que ocurren tienen una posición y dirección relativas. El espacio físico es habitualmente concebido con tres dimensiones lineales, aunque los físicos modernos usualmente lo consideran, con el tiempo, como una parte de un infinito continuo de cuatro dimensiones conocido como espacio-tiempo, que en presencia de materia es curvo. \ No newline at end of file +Lugar donde se encuentran los objetos y en el que los eventos que ocurren tienen una posición y dirección relativas. \ No newline at end of file From 883b022b9b353a5096dfe8b6db53d167e8207133 Mon Sep 17 00:00:00 2001 From: Alex_K Date: Wed, 26 Jun 2019 14:34:49 +0000 Subject: [PATCH 5434/5486] feat: Add part of story --- ukrainian/marshmallow.md | 4 +++- ukrainian/music/links_to_music.md | 1 + ukrainian/music/listen_to_music/listen.md | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 ukrainian/music/links_to_music.md create mode 100644 ukrainian/music/listen_to_music/listen.md diff --git a/ukrainian/marshmallow.md b/ukrainian/marshmallow.md index 43793cce58..08a60cdb71 100644 --- a/ukrainian/marshmallow.md +++ b/ukrainian/marshmallow.md @@ -50,4 +50,6 @@ [Побавлюся із запальничкою](lighter/lighter.md) -Перед вами вікно. Ви його [відкиваєте](window/open-the-window.md)... \ No newline at end of file +Перед вами вікно. Ви його [відкиваєте](window/open-the-window.md)... + +Послухаю [музику](music/links_to_music.md) diff --git a/ukrainian/music/links_to_music.md b/ukrainian/music/links_to_music.md new file mode 100644 index 0000000000..c99a23ff04 --- /dev/null +++ b/ukrainian/music/links_to_music.md @@ -0,0 +1 @@ +Іноді треба просто відпочити і [послухати музику](listen_to_music/listen.md) diff --git a/ukrainian/music/listen_to_music/listen.md b/ukrainian/music/listen_to_music/listen.md new file mode 100644 index 0000000000..bc7a3fcea0 --- /dev/null +++ b/ukrainian/music/listen_to_music/listen.md @@ -0,0 +1,4 @@ +Можна послухати, наприклад, [таку музичку....](https://youtu.be/BI8N2569jSg?t=220) + +або [таку...](https://youtu.be/BI8N2569jSg?t=5402) + From 6a8aa39239d7495adc221ffc24b97d0b8271ea26 Mon Sep 17 00:00:00 2001 From: sankirna Date: Sat, 29 Jun 2019 19:42:26 +0530 Subject: [PATCH 5435/5486] End of chapter 1. Begin Chapter 2 --- english/alone/alone.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/english/alone/alone.md b/english/alone/alone.md index 901fd5f4bb..10203a05d6 100644 --- a/english/alone/alone.md +++ b/english/alone/alone.md @@ -75,4 +75,14 @@ Bella ushers Kristy on to her bed and calm her down. Bella palms her head while Kristy gets normalized. -Stranger smirks seeing Kristy and escape into the dark. \ No newline at end of file +Stranger smirks seeing Kristy and escape into the dark. + +End of Chapter 1. + +-------------------------------- + +Chapter 2: + +One month ago.... + +It was like a usual Saturday night for Kristy. She was lonely and wished that she had any friends at all... \ No newline at end of file From 8b31e6a3bb4998ace4f8858583bd2a1e53a6ed06 Mon Sep 17 00:00:00 2001 From: RoiPeleg <37403170+RoiPeleg@users.noreply.github.com> Date: Sun, 30 Jun 2019 02:09:06 +0300 Subject: [PATCH 5436/5486] added button on walls to be realesed --- english/lookwalls/lookwalls.md | 5 +++++ english/lookwalls/press/press.md | 2 ++ english/sleep/marshmallow.md | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 english/lookwalls/lookwalls.md create mode 100644 english/lookwalls/press/press.md diff --git a/english/lookwalls/lookwalls.md b/english/lookwalls/lookwalls.md new file mode 100644 index 0000000000..c8621a6d84 --- /dev/null +++ b/english/lookwalls/lookwalls.md @@ -0,0 +1,5 @@ +you find a big red button. +do you press it ? + +[PRESS](press/press.md) + diff --git a/english/lookwalls/press/press.md b/english/lookwalls/press/press.md new file mode 100644 index 0000000000..8c95f46a3b --- /dev/null +++ b/english/lookwalls/press/press.md @@ -0,0 +1,2 @@ +BOOOM!! +You have blown the room and now you covered with melted mashmellow but you are free! \ No newline at end of file diff --git a/english/sleep/marshmallow.md b/english/sleep/marshmallow.md index d43aa5181f..5a25d76d0c 100644 --- a/english/sleep/marshmallow.md +++ b/english/sleep/marshmallow.md @@ -40,3 +40,5 @@ Do you: [Sit down to meditate](sit-down-to-meditate/sit-down-to-meditate.md) [Wish for ice cream](./ice-cream/ice-cream.md) + +[look for something that will help you on the walls](lookwalls/lookwalls.md) From 507d0bbd847a4483621166dcdf6b9b64edd5903b Mon Sep 17 00:00:00 2001 From: RoiPeleg <37403170+RoiPeleg@users.noreply.github.com> Date: Sun, 30 Jun 2019 02:20:46 +0300 Subject: [PATCH 5437/5486] fixes for pull request --- english/sleep/lookwalls/lookwalls.md | 5 +++++ english/sleep/lookwalls/press/press.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 english/sleep/lookwalls/lookwalls.md create mode 100644 english/sleep/lookwalls/press/press.md diff --git a/english/sleep/lookwalls/lookwalls.md b/english/sleep/lookwalls/lookwalls.md new file mode 100644 index 0000000000..c8621a6d84 --- /dev/null +++ b/english/sleep/lookwalls/lookwalls.md @@ -0,0 +1,5 @@ +you find a big red button. +do you press it ? + +[PRESS](press/press.md) + diff --git a/english/sleep/lookwalls/press/press.md b/english/sleep/lookwalls/press/press.md new file mode 100644 index 0000000000..8c95f46a3b --- /dev/null +++ b/english/sleep/lookwalls/press/press.md @@ -0,0 +1,2 @@ +BOOOM!! +You have blown the room and now you covered with melted mashmellow but you are free! \ No newline at end of file From 666d0d7d29848eb2acef2f97bc0618b2b7aa7c62 Mon Sep 17 00:00:00 2001 From: RoiPeleg <37403170+RoiPeleg@users.noreply.github.com> Date: Sun, 30 Jun 2019 02:25:22 +0300 Subject: [PATCH 5438/5486] fixes for pull request --- english/sleep/lookwalls/lookwalls.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sleep/lookwalls/lookwalls.md b/english/sleep/lookwalls/lookwalls.md index c8621a6d84..194a58939d 100644 --- a/english/sleep/lookwalls/lookwalls.md +++ b/english/sleep/lookwalls/lookwalls.md @@ -1,5 +1,5 @@ you find a big red button. do you press it ? -[PRESS](press/press.md) +[PRESS](/press/press.md) From ece5710091b168eca82a2f8996f14f8cf762ac52 Mon Sep 17 00:00:00 2001 From: RoiPeleg <37403170+RoiPeleg@users.noreply.github.com> Date: Sun, 30 Jun 2019 02:32:43 +0300 Subject: [PATCH 5439/5486] fixes for pull request --- english/sleep/lookwalls/lookwalls.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sleep/lookwalls/lookwalls.md b/english/sleep/lookwalls/lookwalls.md index 194a58939d..4efc909445 100644 --- a/english/sleep/lookwalls/lookwalls.md +++ b/english/sleep/lookwalls/lookwalls.md @@ -1,5 +1,5 @@ you find a big red button. do you press it ? -[PRESS](/press/press.md) +[PRESS](./press/press.md) From 98bdf078cbb4c72775e57335c3f730c219d60c69 Mon Sep 17 00:00:00 2001 From: RoiPeleg <37403170+RoiPeleg@users.noreply.github.com> Date: Sun, 30 Jun 2019 02:38:45 +0300 Subject: [PATCH 5440/5486] xxx --- english/lookwalls/lookwalls.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 english/lookwalls/lookwalls.md diff --git a/english/lookwalls/lookwalls.md b/english/lookwalls/lookwalls.md deleted file mode 100644 index c8621a6d84..0000000000 --- a/english/lookwalls/lookwalls.md +++ /dev/null @@ -1,5 +0,0 @@ -you find a big red button. -do you press it ? - -[PRESS](press/press.md) - From 5b4d850836d8a6ef8ab840b4ba641065fcafb99f Mon Sep 17 00:00:00 2001 From: RoiPeleg <37403170+RoiPeleg@users.noreply.github.com> Date: Sun, 30 Jun 2019 02:42:28 +0300 Subject: [PATCH 5441/5486] 123 --- english/sleep/lookwalls/lookwalls.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/english/sleep/lookwalls/lookwalls.md b/english/sleep/lookwalls/lookwalls.md index 4efc909445..c8621a6d84 100644 --- a/english/sleep/lookwalls/lookwalls.md +++ b/english/sleep/lookwalls/lookwalls.md @@ -1,5 +1,5 @@ you find a big red button. do you press it ? -[PRESS](./press/press.md) +[PRESS](press/press.md) From 486088af1088b79972150b2dbe89cec6da235239 Mon Sep 17 00:00:00 2001 From: Manas Goel Date: Mon, 1 Jul 2019 14:10:42 +0530 Subject: [PATCH 5442/5486] Add about Ramayana --- hindi/Ramayana/ramayana.md | 3 +++ hindi/bollywood.md | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 hindi/Ramayana/ramayana.md diff --git a/hindi/Ramayana/ramayana.md b/hindi/Ramayana/ramayana.md new file mode 100644 index 0000000000..ea0fb0b862 --- /dev/null +++ b/hindi/Ramayana/ramayana.md @@ -0,0 +1,3 @@ +Ramayana is one of the two major Sanskrit epics of ancient India, the other being the [Mahabharat](../Mahabharat/mahabharat.md). Along with the Mahabharat, it forms the Hindu Itihasa. + +To read more about Ramayana , [Ramayana](https://en.wikipedia.org/wiki/Ramayana) [रामायण](https://hi.wikipedia.org/wiki/%E0%A4%B0%E0%A4%BE%E0%A4%AE%E0%A4%BE%E0%A4%AF%E0%A4%A3) \ No newline at end of file diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 9d8eb513e7..b3b367a2c9 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -1,4 +1,6 @@ -चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) +[Ramanyana](Ramyana/ramayana.md) + +चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) बॉलीवुड में आपका स्वागत है ! From b0510ae4107eabf8e360a4d2c08ba9f05d436d46 Mon Sep 17 00:00:00 2001 From: Manas Goel Date: Mon, 1 Jul 2019 14:14:54 +0530 Subject: [PATCH 5443/5486] Remove conflict --- hindi/bollywood.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index b3b367a2c9..82b5301e57 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -1,6 +1,4 @@ -[Ramanyana](Ramyana/ramayana.md) - -चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) +चलो अब कुछ श्री स्वामी विवेकानंद जी से कुछ शिक्षाएं लें।[यहाँ देखें](swami-vivekananda/swami-vivekananda.md) बॉलीवुड में आपका स्वागत है ! @@ -42,3 +40,5 @@ Check out [Tiger Shroff](https://www.instagram.com/tigerjackieshroff/?hl=en) Checkout [Babita Phogat](https://www.instagram.com/explore/tags/babitaphogat/) Why are you reading this line? + +[Ramanyana](Ramyana/ramayana.md) \ No newline at end of file From 65fab10e3c42a0d20dbb7aa9cfb97ecbb4458c60 Mon Sep 17 00:00:00 2001 From: Manas-Goel <33648155+Manas-Goel@users.noreply.github.com> Date: Mon, 1 Jul 2019 14:17:18 +0530 Subject: [PATCH 5444/5486] Fixed typo --- hindi/bollywood.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hindi/bollywood.md b/hindi/bollywood.md index 82b5301e57..c42d2f42a0 100644 --- a/hindi/bollywood.md +++ b/hindi/bollywood.md @@ -41,4 +41,4 @@ Checkout [Babita Phogat](https://www.instagram.com/explore/tags/babitaphogat/) Why are you reading this line? -[Ramanyana](Ramyana/ramayana.md) \ No newline at end of file +[Ramanyana](Ramayana/ramayana.md) From fef73ef4404adf3dc2107ddcd1190aad369c9563 Mon Sep 17 00:00:00 2001 From: Manas Goel Date: Mon, 1 Jul 2019 14:22:53 +0530 Subject: [PATCH 5445/5486] Make short text --- hindi/Ramayana/ramayana.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hindi/Ramayana/ramayana.md b/hindi/Ramayana/ramayana.md index ea0fb0b862..b01d0488fe 100644 --- a/hindi/Ramayana/ramayana.md +++ b/hindi/Ramayana/ramayana.md @@ -1,3 +1 @@ -Ramayana is one of the two major Sanskrit epics of ancient India, the other being the [Mahabharat](../Mahabharat/mahabharat.md). Along with the Mahabharat, it forms the Hindu Itihasa. - -To read more about Ramayana , [Ramayana](https://en.wikipedia.org/wiki/Ramayana) [रामायण](https://hi.wikipedia.org/wiki/%E0%A4%B0%E0%A4%BE%E0%A4%AE%E0%A4%BE%E0%A4%AF%E0%A4%A3) \ No newline at end of file +[Ramayana](https://en.wikipedia.org/wiki/Ramayana) \ No newline at end of file From eb24fdd12d4af7bce00774d48aef6418eaec072a Mon Sep 17 00:00:00 2001 From: Idan Kimchi <45351640+Urlord2089@users.noreply.github.com> Date: Tue, 2 Jul 2019 17:10:16 +0300 Subject: [PATCH 5446/5486] add new sane option --- hebrew/marshmallow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hebrew/marshmallow.md b/hebrew/marshmallow.md index ca67bc5792..511c0a8d4c 100644 --- a/hebrew/marshmallow.md +++ b/hebrew/marshmallow.md @@ -11,3 +11,5 @@ [אתה קורא את מה שכתוב, יוצא מההלם, ומחפש אופציה שפויה](sane-option/fresh-start.md) [אתה מבין שלזיין את בר רפאלי זאת בעצם אופציה מאוד שפוייה](bar/bar.md) + +[אתה נגעל ממה שאתה קורא פה ומתאכזב שדווקא האנשים שכביכול דומים לך הם בדיוק כמו כל השאר, ורוצה הרפתקאה אמיתית.] (shame-on-you/Adventure!) \ No newline at end of file From 92600209a1422ead09bf84e34eefa1eace346ba5 Mon Sep 17 00:00:00 2001 From: Idan Kimchi <45351640+Urlord2089@users.noreply.github.com> Date: Tue, 2 Jul 2019 17:16:00 +0300 Subject: [PATCH 5447/5486] fix file ending --- hebrew/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hebrew/marshmallow.md b/hebrew/marshmallow.md index 511c0a8d4c..56765e9569 100644 --- a/hebrew/marshmallow.md +++ b/hebrew/marshmallow.md @@ -12,4 +12,4 @@ [אתה מבין שלזיין את בר רפאלי זאת בעצם אופציה מאוד שפוייה](bar/bar.md) -[אתה נגעל ממה שאתה קורא פה ומתאכזב שדווקא האנשים שכביכול דומים לך הם בדיוק כמו כל השאר, ורוצה הרפתקאה אמיתית.] (shame-on-you/Adventure!) \ No newline at end of file +[אתה נגעל ממה שאתה קורא פה ומתאכזב שדווקא האנשים שכביכול דומים לך הם בדיוק כמו כל השאר, ורוצה הרפתקאה אמיתית.] (shame-on-you/Adventure.md) \ No newline at end of file From bbdb207ec49bb933ac510fca1cae45c44848725c Mon Sep 17 00:00:00 2001 From: Idan Kimchi <45351640+Urlord2089@users.noreply.github.com> Date: Tue, 2 Jul 2019 17:45:51 +0300 Subject: [PATCH 5448/5486] add new adventure file --- hebrew/shame-on-you/Adventure.md | 58 ++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 hebrew/shame-on-you/Adventure.md diff --git a/hebrew/shame-on-you/Adventure.md b/hebrew/shame-on-you/Adventure.md new file mode 100644 index 0000000000..fb3e162679 --- /dev/null +++ b/hebrew/shame-on-you/Adventure.md @@ -0,0 +1,58 @@ +ראלוף: היי, אתה. סוף סוף התעוררת. ניסית לעבור את הגבול נכון? הלכת ישר לתוך המארב האימפרלי הזה, בדיוק כמונו, וכמו הגנב הזה שם. + +לוקיר: תקוללו סטורמקלאוקס. סקיירים הייתה במצב מצויין לפני שאתם הגעתם. האימפריה הייתה כה נחמדה ועצלנית. אם הם לא היו מחפשים אתכם, הייתי יכול לגנוב את הסוס ההוא +ולהיות כבר באמצע הדרך אל האמרפל. היי אתה! אני ואתה - אנחנו לא צריכים להיות כאן. אלה הסטורמקלואקס שהאימפריה רוצה. + +ראלוף: כולנו אחים ואחיות בשלשלאות עכשיו, גנב. + +חייל אימפריאלי: תשתקו שם מאחורה! + +[לוקיר מסתכל על האיש עם הפה החסום לידך] +לוקיר: ומה הבעיה שלו? + +ראלוף: תזהר עם מה שאתה אומר! אתה מדבר אל אולפריק סטורמקלאוק, המלך האמיתי של סקיירים. + +לוקיר: אולפריק? השליט של ווינדהלם? אתה המנהיג של המרד. אך אם הם תפסו אותך... או אלוהים, לאן הם לוקחים אותנו? + +ראלוף: איני יודע לאן אנו הולכים, אך גן העדן מחכה. + +לוקיר: לא, זה לא יכול לקרות. זה לא קורה. + +ראלוף: היי, מאיפה אתה, גנב סוסים? + +לוקיר: למה שלך יהיה אכפת? + +ראלוף: המחשבות האחרונות של נורד צריכות להיות על הבית. + +לוקיר: רוריקסטד. אני.... אני מרוריקסטד + +[הם מתקרבים לכפר בשם הלגן. חייל מדבר עם המרכבה הראשונה בשורה.] +חייל אימפריאלי: האלוף טוליוס, המפקד! המוציא להורג מחכה! + +האלוף טוליוס: טוב מאוד, בואו נסיים עם זה. + +לוקיר: גבריאל ,מיכאל, אוריאל, רפאל, קפציאל, ברכיאל, מטטרון! מלאכים, בבקשה תעזרו לי. + +Ralof: Look at him, General Tullius the Military Governor. And it looks like the Thalmor are with him. Damn elves. I bet they had something to do with this. +This is Helgen. I used to be sweet on a girl from here. Wonder if Vilod is still making that mead with juniper berries mixed in. Funny...when I was a boy, +Imperial walls and towers used to make me feel so safe. + +ראלוף: תראו אותו, האלוף טוליוס השליט הצבאי, ונראה כאילו הת'אלמור איתו. אלפים מקוללים. אני מהמר שהם קשורים לזה. +זו הלגן, היה לי פעם סיפור עם בחורה מכאן. אני תוהה האם וויילוד עדיין מכין את השיכר עם האוכמניות בתוכו. זה מצחיק... כשהייתי ילד, +חומות ומגדלים אימפריאלים גרמו לי להרגיש כה מוגן. + +[גבר ובנו רואים את האסירים נכנסים העירה] +האמינג: מי אלה, אבא? לאן הם הולכים? + +טורולף: אתה צריך להיכנס פנימה, כפיר שלי. + +האמינג: מדוע? אני רוצה לצפות בחיילים. + +טורולף: פנימה. עכשיו. + +[הכרכרה עוצרת על יד בלוק הכריתה.] +חייל אימפריאלי: וואו. + +לוקיר: למה עצרנו? + +ראלוף: למה נראה לך? סוף הדרך... \ No newline at end of file From c64f34934d64d7d8b21b68e8964f77e0839e43d6 Mon Sep 17 00:00:00 2001 From: Idan Kimchi <45351640+Urlord2089@users.noreply.github.com> Date: Tue, 2 Jul 2019 17:47:43 +0300 Subject: [PATCH 5449/5486] fix some english i forgot to delete after translating --- hebrew/shame-on-you/Adventure.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hebrew/shame-on-you/Adventure.md b/hebrew/shame-on-you/Adventure.md index fb3e162679..5e9c3c45b1 100644 --- a/hebrew/shame-on-you/Adventure.md +++ b/hebrew/shame-on-you/Adventure.md @@ -33,10 +33,6 @@ לוקיר: גבריאל ,מיכאל, אוריאל, רפאל, קפציאל, ברכיאל, מטטרון! מלאכים, בבקשה תעזרו לי. -Ralof: Look at him, General Tullius the Military Governor. And it looks like the Thalmor are with him. Damn elves. I bet they had something to do with this. -This is Helgen. I used to be sweet on a girl from here. Wonder if Vilod is still making that mead with juniper berries mixed in. Funny...when I was a boy, -Imperial walls and towers used to make me feel so safe. - ראלוף: תראו אותו, האלוף טוליוס השליט הצבאי, ונראה כאילו הת'אלמור איתו. אלפים מקוללים. אני מהמר שהם קשורים לזה. זו הלגן, היה לי פעם סיפור עם בחורה מכאן. אני תוהה האם וויילוד עדיין מכין את השיכר עם האוכמניות בתוכו. זה מצחיק... כשהייתי ילד, חומות ומגדלים אימפריאלים גרמו לי להרגיש כה מוגן. @@ -55,4 +51,4 @@ Imperial walls and towers used to make me feel so safe. לוקיר: למה עצרנו? -ראלוף: למה נראה לך? סוף הדרך... \ No newline at end of file +ראלוף: למה נראה לך? סוף הדרך... From b3b16f4f14fac0c47568b44f1b395cb770475c06 Mon Sep 17 00:00:00 2001 From: Idan Kimchi <45351640+Urlord2089@users.noreply.github.com> Date: Tue, 2 Jul 2019 17:48:11 +0300 Subject: [PATCH 5450/5486] try to fix link --- hebrew/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hebrew/marshmallow.md b/hebrew/marshmallow.md index 56765e9569..ebe8ad3fd4 100644 --- a/hebrew/marshmallow.md +++ b/hebrew/marshmallow.md @@ -12,4 +12,4 @@ [אתה מבין שלזיין את בר רפאלי זאת בעצם אופציה מאוד שפוייה](bar/bar.md) -[אתה נגעל ממה שאתה קורא פה ומתאכזב שדווקא האנשים שכביכול דומים לך הם בדיוק כמו כל השאר, ורוצה הרפתקאה אמיתית.] (shame-on-you/Adventure.md) \ No newline at end of file +[אתה נגעל ממה שאתה קורא פה ומתאכזב שדווקא האנשים שכביכול דומים לך הם בדיוק כמו כל השאר, ורוצה הרפתקאה אמיתית.](shame-on-you/Adventure.md) From bdfcc834b77561e5b1cb8545147859fe1f9c32f3 Mon Sep 17 00:00:00 2001 From: Idan Kimchi <45351640+Urlord2089@users.noreply.github.com> Date: Tue, 2 Jul 2019 17:51:11 +0300 Subject: [PATCH 5451/5486] add links to new choices --- hebrew/shame-on-you/Adventure.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hebrew/shame-on-you/Adventure.md b/hebrew/shame-on-you/Adventure.md index 5e9c3c45b1..7a9e8cd525 100644 --- a/hebrew/shame-on-you/Adventure.md +++ b/hebrew/shame-on-you/Adventure.md @@ -52,3 +52,7 @@ לוקיר: למה עצרנו? ראלוף: למה נראה לך? סוף הדרך... + +[אני רוצה להמשיך את ההרפתקאה האפית הזאת!!](https://store.steampowered.com/app/72850/The_Elder_Scrolls_V_Skyrim/) + +[זה נשמע משעמם](boring/you-failed.md) From 9e74db7885fcfa8f8d3c264f581cf2220354e44f Mon Sep 17 00:00:00 2001 From: Idan Kimchi <45351640+Urlord2089@users.noreply.github.com> Date: Tue, 2 Jul 2019 17:54:50 +0300 Subject: [PATCH 5452/5486] add the boring path --- hebrew/shame-on-you/boring/you-failed.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 hebrew/shame-on-you/boring/you-failed.md diff --git a/hebrew/shame-on-you/boring/you-failed.md b/hebrew/shame-on-you/boring/you-failed.md new file mode 100644 index 0000000000..20ecf3a47e --- /dev/null +++ b/hebrew/shame-on-you/boring/you-failed.md @@ -0,0 +1,2 @@ +מצטער, אך נראה כאילו נכשלת בהרפתקאה שלך... +[נסה שוב!](https://github.com/Urlord2089/create-your-own-adventure/blob/appropriate_hebrew/hebrew/marshmallow.md) From 3d0f0798c367167ba3880b1b81ac03ad4e253201 Mon Sep 17 00:00:00 2001 From: Gowtham Ram Pagadala Date: Thu, 4 Jul 2019 01:21:35 -0700 Subject: [PATCH 5453/5486] Thirukkural 1 and 2 out of 1330 --- Tamil/Thirukkural_Learning/Learning.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Tamil/Thirukkural_Learning/Learning.md b/Tamil/Thirukkural_Learning/Learning.md index fa07cb8cab..2564b80c20 100644 --- a/Tamil/Thirukkural_Learning/Learning.md +++ b/Tamil/Thirukkural_Learning/Learning.md @@ -1,5 +1,27 @@ திருக்குறள் =============================================================================== + +அதிகாரம்/Chapter: கடவுள் வாழ்த்து/ Prayer to God + +குறள் 1: +அகர முதல எழுத்தெல்லாம் ஆதி +பகவன் முதற்றே உலகு + +All the letters are voiced subsequent to the letter "A" and hence we call them as alphabets. +For the world that came to existence there is One Who stood +before beginningless (and stands endless). +That God is the ultimate Precedent of the world. + + +குறள் 2: +கற்றதனால் ஆய பயனென்கொல் வாலறிவன் +நற்றாள் தொழாஅர் எனின் + +No fruit have men of all their studied lore, +Save they the 'Purely Wise One's' feet adore + +=============================================================================== + பால்: பொருட்பால் அதிகாரம்/Chapter: கல்வி / Learning From 6504a43baeb8ca155badae4a7e8ce2ddbf1c51cb Mon Sep 17 00:00:00 2001 From: RoiPeleg <37403170+RoiPeleg@users.noreply.github.com> Date: Thu, 4 Jul 2019 18:57:47 +0300 Subject: [PATCH 5454/5486] fixixix --- -w | 0 english/lookwalls/press/press.md | 2 -- english/sleep/lookwalls/lookwalls.md | 5 ++--- english/sleep/lookwalls/press/press.md | 2 -- 4 files changed, 2 insertions(+), 7 deletions(-) create mode 100644 -w delete mode 100644 english/lookwalls/press/press.md delete mode 100644 english/sleep/lookwalls/press/press.md diff --git a/-w b/-w new file mode 100644 index 0000000000..e69de29bb2 diff --git a/english/lookwalls/press/press.md b/english/lookwalls/press/press.md deleted file mode 100644 index 8c95f46a3b..0000000000 --- a/english/lookwalls/press/press.md +++ /dev/null @@ -1,2 +0,0 @@ -BOOOM!! -You have blown the room and now you covered with melted mashmellow but you are free! \ No newline at end of file diff --git a/english/sleep/lookwalls/lookwalls.md b/english/sleep/lookwalls/lookwalls.md index c8621a6d84..2f245ae5a7 100644 --- a/english/sleep/lookwalls/lookwalls.md +++ b/english/sleep/lookwalls/lookwalls.md @@ -1,5 +1,4 @@ you find a big red button. -do you press it ? - -[PRESS](press/press.md) +and pressed it you could not ressit. +GG mate you hear and off you go to login. diff --git a/english/sleep/lookwalls/press/press.md b/english/sleep/lookwalls/press/press.md deleted file mode 100644 index 8c95f46a3b..0000000000 --- a/english/sleep/lookwalls/press/press.md +++ /dev/null @@ -1,2 +0,0 @@ -BOOOM!! -You have blown the room and now you covered with melted mashmellow but you are free! \ No newline at end of file From 871bfc9f62e2b5b3b3a60ad2541393ae9d207275 Mon Sep 17 00:00:00 2001 From: RoiPeleg <37403170+RoiPeleg@users.noreply.github.com> Date: Thu, 4 Jul 2019 19:01:37 +0300 Subject: [PATCH 5455/5486] fix --- -w | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 -w diff --git a/-w b/-w deleted file mode 100644 index e69de29bb2..0000000000 From 31ba11ffe4c030404f33760d73a108ee5c9160ed Mon Sep 17 00:00:00 2001 From: Black Bean Date: Fri, 5 Jul 2019 18:43:38 +0700 Subject: [PATCH 5456/5486] Make dir,list and perfect song --- english/Ed-Sheeran-music/Perfect/perfect-lyric.md | 5 +++++ english/Ed-Sheeran-music/list-song.md | 3 +++ language.md | 2 ++ 3 files changed, 10 insertions(+) create mode 100644 english/Ed-Sheeran-music/Perfect/perfect-lyric.md create mode 100644 english/Ed-Sheeran-music/list-song.md diff --git a/english/Ed-Sheeran-music/Perfect/perfect-lyric.md b/english/Ed-Sheeran-music/Perfect/perfect-lyric.md new file mode 100644 index 0000000000..22e5da24ea --- /dev/null +++ b/english/Ed-Sheeran-music/Perfect/perfect-lyric.md @@ -0,0 +1,5 @@ +[Chorus] +Baby, I'm dancing in the dark with you between my arms +Barefoot on the grass, listening to our favourite song +When you said you looked a mess, I whispered underneath my breath +But you heard it, darling, you look perfect tonight \ No newline at end of file diff --git a/english/Ed-Sheeran-music/list-song.md b/english/Ed-Sheeran-music/list-song.md new file mode 100644 index 0000000000..86b129d042 --- /dev/null +++ b/english/Ed-Sheeran-music/list-song.md @@ -0,0 +1,3 @@ +List of songs +=============================== +1.[Perfect-Ed Sheeran](../Ed-Sheeran-music/perfect-lyric.md) diff --git a/language.md b/language.md index 528cc9db3b..d0fad1c80f 100644 --- a/language.md +++ b/language.md @@ -1,3 +1,5 @@ +If you like Ed Sheeran's songs [for you](english/Ed-Sheeran-music/list-song.md) + বাংলা বুজলে, [এখানে আসুন](bangla/AmiBanglayGaanGai/MonThekeBangali.md) If you speak English, [go here](english/marshmallow.md). From f591816039fdba20377bcd0d65e85932ab4871f1 Mon Sep 17 00:00:00 2001 From: Black Bean Date: Fri, 5 Jul 2019 18:56:55 +0700 Subject: [PATCH 5457/5486] Add happier song and update list --- english/Ed-Sheeran-music/Happier/happier-lyric.md | 5 +++++ english/Ed-Sheeran-music/list-song.md | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 english/Ed-Sheeran-music/Happier/happier-lyric.md diff --git a/english/Ed-Sheeran-music/Happier/happier-lyric.md b/english/Ed-Sheeran-music/Happier/happier-lyric.md new file mode 100644 index 0000000000..1c07c76914 --- /dev/null +++ b/english/Ed-Sheeran-music/Happier/happier-lyric.md @@ -0,0 +1,5 @@ +[Chorus] +'Cause baby you look happier, you do +My friends told me one day I'll feel it too +And until then I'll smile to hide the truth +But I know I was happier with you \ No newline at end of file diff --git a/english/Ed-Sheeran-music/list-song.md b/english/Ed-Sheeran-music/list-song.md index 86b129d042..424f30b55c 100644 --- a/english/Ed-Sheeran-music/list-song.md +++ b/english/Ed-Sheeran-music/list-song.md @@ -1,3 +1,4 @@ List of songs =============================== -1.[Perfect-Ed Sheeran](../Ed-Sheeran-music/perfect-lyric.md) +1.[Happier-Ed Sheeran](../Ed-Sheeran-music/happier-lyric.md) +2.[Perfect-Ed Sheeran](../Ed-Sheeran-music/perfect-lyric.md) From 5d76cb4d939fdb652d8931b7e405978558f87c06 Mon Sep 17 00:00:00 2001 From: Black Bean <37586319+BlackBeaner@users.noreply.github.com> Date: Fri, 5 Jul 2019 19:14:24 +0700 Subject: [PATCH 5458/5486] Fix links in list --- english/Ed-Sheeran-music/list-song.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/Ed-Sheeran-music/list-song.md b/english/Ed-Sheeran-music/list-song.md index 424f30b55c..cb6725ce6e 100644 --- a/english/Ed-Sheeran-music/list-song.md +++ b/english/Ed-Sheeran-music/list-song.md @@ -1,4 +1,4 @@ List of songs =============================== -1.[Happier-Ed Sheeran](../Ed-Sheeran-music/happier-lyric.md) -2.[Perfect-Ed Sheeran](../Ed-Sheeran-music/perfect-lyric.md) +1.[Happier-Ed Sheeran](english/Ed-Sheeran-music/happier-lyric.md)
+2.[Perfect-Ed Sheeran](english/Ed-Sheeran-music/perfect-lyric.md) From 5788df9d12dd0b4dce9080ca09353e981387a841 Mon Sep 17 00:00:00 2001 From: Black Bean <37586319+BlackBeaner@users.noreply.github.com> Date: Fri, 5 Jul 2019 19:24:28 +0700 Subject: [PATCH 5459/5486] Fix #1 links in list --- english/Ed-Sheeran-music/list-song.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/english/Ed-Sheeran-music/list-song.md b/english/Ed-Sheeran-music/list-song.md index cb6725ce6e..bac3f5d21f 100644 --- a/english/Ed-Sheeran-music/list-song.md +++ b/english/Ed-Sheeran-music/list-song.md @@ -1,4 +1,4 @@ List of songs =============================== -1.[Happier-Ed Sheeran](english/Ed-Sheeran-music/happier-lyric.md)
-2.[Perfect-Ed Sheeran](english/Ed-Sheeran-music/perfect-lyric.md) +1.[Happier-Ed Sheeran](Happier/happier-lyric.md)
+2.[Perfect-Ed Sheeran](Perfect/perfect-lyric.md) From 8e90cd2ffa7dc5035bf5f1a4932401d1759803bf Mon Sep 17 00:00:00 2001 From: Black Bean Date: Fri, 5 Jul 2019 20:24:10 +0700 Subject: [PATCH 5460/5486] Fix blank line in list --- english/Ed-Sheeran-music/list-song.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/Ed-Sheeran-music/list-song.md b/english/Ed-Sheeran-music/list-song.md index bac3f5d21f..d1a48b3089 100644 --- a/english/Ed-Sheeran-music/list-song.md +++ b/english/Ed-Sheeran-music/list-song.md @@ -1,4 +1,5 @@ List of songs =============================== 1.[Happier-Ed Sheeran](Happier/happier-lyric.md)
+ 2.[Perfect-Ed Sheeran](Perfect/perfect-lyric.md) From df2cceed3ba96148cfe3d1ec7b8bdfd4b72ac4a9 Mon Sep 17 00:00:00 2001 From: Idan Kimchi <45351640+Urlord2089@users.noreply.github.com> Date: Fri, 5 Jul 2019 23:23:47 +0300 Subject: [PATCH 5461/5486] trim lines that were too long --- hebrew/marshmallow.md | 2 +- hebrew/shame-on-you/Adventure.md | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/hebrew/marshmallow.md b/hebrew/marshmallow.md index 56765e9569..b2b1549ad4 100644 --- a/hebrew/marshmallow.md +++ b/hebrew/marshmallow.md @@ -12,4 +12,4 @@ [אתה מבין שלזיין את בר רפאלי זאת בעצם אופציה מאוד שפוייה](bar/bar.md) -[אתה נגעל ממה שאתה קורא פה ומתאכזב שדווקא האנשים שכביכול דומים לך הם בדיוק כמו כל השאר, ורוצה הרפתקאה אמיתית.] (shame-on-you/Adventure.md) \ No newline at end of file +[אתה נגעל ממה שאתה קורא פה, ורוצה הרפתקאה אמיתית.] (shame-on-you/Adventure.md) \ No newline at end of file diff --git a/hebrew/shame-on-you/Adventure.md b/hebrew/shame-on-you/Adventure.md index fb3e162679..2ae075a3b5 100644 --- a/hebrew/shame-on-you/Adventure.md +++ b/hebrew/shame-on-you/Adventure.md @@ -1,6 +1,9 @@ -ראלוף: היי, אתה. סוף סוף התעוררת. ניסית לעבור את הגבול נכון? הלכת ישר לתוך המארב האימפרלי הזה, בדיוק כמונו, וכמו הגנב הזה שם. +ראלוף: היי, אתה. סוף סוף התעוררת. ניסית לעבור את הגבול נכון? +הלכת ישר לתוך המארב האימפרלי הזה, בדיוק כמונו, וכמו הגנב הזה שם. -לוקיר: תקוללו סטורמקלאוקס. סקיירים הייתה במצב מצויין לפני שאתם הגעתם. האימפריה הייתה כה נחמדה ועצלנית. אם הם לא היו מחפשים אתכם, הייתי יכול לגנוב את הסוס ההוא +לוקיר: תקוללו סטורמקלאוקס. סקיירים הייתה במצב מצויין לפני שאתם הגעתם. +האימפריה הייתה כה נחמדה ועצלנית. +אם הם לא היו מחפשים אתכם, הייתי יכול לגנוב את הסוס ההוא ולהיות כבר באמצע הדרך אל האמרפל. היי אתה! אני ואתה - אנחנו לא צריכים להיות כאן. אלה הסטורמקלואקס שהאימפריה רוצה. ראלוף: כולנו אחים ואחיות בשלשלאות עכשיו, גנב. @@ -33,12 +36,10 @@ לוקיר: גבריאל ,מיכאל, אוריאל, רפאל, קפציאל, ברכיאל, מטטרון! מלאכים, בבקשה תעזרו לי. -Ralof: Look at him, General Tullius the Military Governor. And it looks like the Thalmor are with him. Damn elves. I bet they had something to do with this. -This is Helgen. I used to be sweet on a girl from here. Wonder if Vilod is still making that mead with juniper berries mixed in. Funny...when I was a boy, -Imperial walls and towers used to make me feel so safe. - -ראלוף: תראו אותו, האלוף טוליוס השליט הצבאי, ונראה כאילו הת'אלמור איתו. אלפים מקוללים. אני מהמר שהם קשורים לזה. -זו הלגן, היה לי פעם סיפור עם בחורה מכאן. אני תוהה האם וויילוד עדיין מכין את השיכר עם האוכמניות בתוכו. זה מצחיק... כשהייתי ילד, +ראלוף: תראו אותו, האלוף טוליוס השליט הצבאי, ונראה כאילו הת'אלמור איתו. +אלפים מקוללים. אני מהמר שהם קשורים לזה. +זו הלגן, היה לי פעם סיפור עם בחורה מכאן. אני תוהה האם וויילוד עדיין מכין את +השיכר עם האוכמניות בתוכו. זה מצחיק... כשהייתי ילד, חומות ומגדלים אימפריאלים גרמו לי להרגיש כה מוגן. [גבר ובנו רואים את האסירים נכנסים העירה] From 852228944984947281cde4763e4167993fa2826a Mon Sep 17 00:00:00 2001 From: Idan Kimchi <45351640+Urlord2089@users.noreply.github.com> Date: Fri, 5 Jul 2019 23:31:16 +0300 Subject: [PATCH 5462/5486] Update you-failed.md --- hebrew/shame-on-you/boring/you-failed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hebrew/shame-on-you/boring/you-failed.md b/hebrew/shame-on-you/boring/you-failed.md index 20ecf3a47e..60ef05aa3e 100644 --- a/hebrew/shame-on-you/boring/you-failed.md +++ b/hebrew/shame-on-you/boring/you-failed.md @@ -1,2 +1,2 @@ מצטער, אך נראה כאילו נכשלת בהרפתקאה שלך... -[נסה שוב!](https://github.com/Urlord2089/create-your-own-adventure/blob/appropriate_hebrew/hebrew/marshmallow.md) +[נסה שוב!](https://github.com/udacity/create-your-own-adventure/blob/master/hebrew/marshmallow.md) From a5752080eff8652c18630e91a51d9c8e935370fe Mon Sep 17 00:00:00 2001 From: Maxeem Date: Sun, 7 Jul 2019 16:19:17 +0300 Subject: [PATCH 5463/5486] ru adventure --- language.md | 2 ++ ru/lang.md | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 ru/lang.md diff --git a/language.md b/language.md index d0fad1c80f..0b79cfd170 100644 --- a/language.md +++ b/language.md @@ -177,3 +177,5 @@ Si Latine legere vis, [hic preme](latin/arena.md) ti o ba so ede yoruba, [gba ono yi](yoruba/history/yoruba_history.md) If you speak Igbo, [go here](igbo/igbo-news.md) + +[Russian lang? | Русский язык?](ru/lang.md) diff --git a/ru/lang.md b/ru/lang.md new file mode 100644 index 0000000000..4343d852da --- /dev/null +++ b/ru/lang.md @@ -0,0 +1,3 @@ +It's OK. Это отлично. + +Русский - реально хороший язык =) From 23d13ccde2b4da5386c57ca45652afb5d21208da Mon Sep 17 00:00:00 2001 From: Maxeem Date: Sun, 7 Jul 2019 18:04:20 +0300 Subject: [PATCH 5464/5486] Continue the RU adventure --- language.md | 2 +- ru/lang.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/language.md b/language.md index 0b79cfd170..b96f8c4998 100644 --- a/language.md +++ b/language.md @@ -178,4 +178,4 @@ ti o ba so ede yoruba, [gba ono yi](yoruba/history/yoruba_history.md) If you speak Igbo, [go here](igbo/igbo-news.md) -[Russian lang? | Русский язык?](ru/lang.md) +[Russian lang? | Рус. яз.?](ru/lang.md) diff --git a/ru/lang.md b/ru/lang.md index 4343d852da..325ddb2fd7 100644 --- a/ru/lang.md +++ b/ru/lang.md @@ -1,3 +1,5 @@ It's OK. Это отлично. -Русский - реально хороший язык =) +[Russian](https://www.merriam-webster.com/dictionary/Russian) - is a really good language =) + +[Русский](https://ru.wikipedia.org/wiki/%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9_%D1%8F%D0%B7%D1%8B%D0%BA) - реально хороший язык =) From f4a79238d7ffabf3eae94a84343d744d3bd9237e Mon Sep 17 00:00:00 2001 From: Maxeem Date: Sun, 7 Jul 2019 18:11:47 +0300 Subject: [PATCH 5465/5486] Replace long wikipedia link to short one --- ru/lang.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/lang.md b/ru/lang.md index 325ddb2fd7..978828889e 100644 --- a/ru/lang.md +++ b/ru/lang.md @@ -2,4 +2,4 @@ It's OK. Это отлично. [Russian](https://www.merriam-webster.com/dictionary/Russian) - is a really good language =) -[Русский](https://ru.wikipedia.org/wiki/%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9_%D1%8F%D0%B7%D1%8B%D0%BA) - реально хороший язык =) +[Русский](http://gramota.ru) - реально хороший язык =) From 666f6993521dfe7dea99c4745c01f37fbf61d348 Mon Sep 17 00:00:00 2001 From: Idan Kimchi <45351640+Urlord2089@users.noreply.github.com> Date: Sun, 7 Jul 2019 22:28:25 +0300 Subject: [PATCH 5466/5486] Update you-failed.md --- hebrew/shame-on-you/boring/you-failed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hebrew/shame-on-you/boring/you-failed.md b/hebrew/shame-on-you/boring/you-failed.md index 60ef05aa3e..6e701555a6 100644 --- a/hebrew/shame-on-you/boring/you-failed.md +++ b/hebrew/shame-on-you/boring/you-failed.md @@ -1,2 +1,2 @@ מצטער, אך נראה כאילו נכשלת בהרפתקאה שלך... -[נסה שוב!](https://github.com/udacity/create-your-own-adventure/blob/master/hebrew/marshmallow.md) +[נסה שוב!](hebrew/marshmallow.md) From 7c4459dded166b568ca94740230503a923455278 Mon Sep 17 00:00:00 2001 From: Idan Kimchi <45351640+Urlord2089@users.noreply.github.com> Date: Sun, 7 Jul 2019 22:29:19 +0300 Subject: [PATCH 5467/5486] try to fix link --- hebrew/shame-on-you/boring/you-failed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hebrew/shame-on-you/boring/you-failed.md b/hebrew/shame-on-you/boring/you-failed.md index 60ef05aa3e..1f7ecc1a8e 100644 --- a/hebrew/shame-on-you/boring/you-failed.md +++ b/hebrew/shame-on-you/boring/you-failed.md @@ -1,2 +1,2 @@ מצטער, אך נראה כאילו נכשלת בהרפתקאה שלך... -[נסה שוב!](https://github.com/udacity/create-your-own-adventure/blob/master/hebrew/marshmallow.md) +[נסה שוב!](../../marshmallow.md) From 3ed76168b7806d4c8173ab234d8103c7f101f342 Mon Sep 17 00:00:00 2001 From: Idan Kimchi <45351640+Urlord2089@users.noreply.github.com> Date: Sun, 7 Jul 2019 22:32:08 +0300 Subject: [PATCH 5468/5486] Update marshmallow.md --- hebrew/marshmallow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hebrew/marshmallow.md b/hebrew/marshmallow.md index 2603fd6119..852fb7f266 100644 --- a/hebrew/marshmallow.md +++ b/hebrew/marshmallow.md @@ -12,4 +12,4 @@ [אתה מבין שלזיין את בר רפאלי זאת בעצם אופציה מאוד שפוייה](bar/bar.md) -[אתה נגעל ממה שאתה קורא פה, ורוצה הרפתקאה אמיתית.] (shame-on-you/Adventure.md) +[אתה נגעל ממה שאתה קורא פה, ורוצה הרפתקאה אמיתית.](shame-on-you/Adventure.md) From fe81ebb3de6e93dabe2d60b124a10e2c3db431af Mon Sep 17 00:00:00 2001 From: Toni Date: Mon, 8 Jul 2019 18:37:15 +0200 Subject: [PATCH 5469/5486] Add new option in language --- language.md | 2 ++ rock/first_step.md | 6 ++++++ rock/metal/metal.md | 1 + rock/posher/posher.md | 1 + 4 files changed, 10 insertions(+) create mode 100644 rock/first_step.md create mode 100644 rock/metal/metal.md create mode 100644 rock/posher/posher.md diff --git a/language.md b/language.md index b96f8c4998..ccac62cc3d 100644 --- a/language.md +++ b/language.md @@ -1,5 +1,7 @@ If you like Ed Sheeran's songs [for you](english/Ed-Sheeran-music/list-song.md) +If you wanna rock and roll [Headbang to here](rock/first_step.md) + বাংলা বুজলে, [এখানে আসুন](bangla/AmiBanglayGaanGai/MonThekeBangali.md) If you speak English, [go here](english/marshmallow.md). diff --git a/rock/first_step.md b/rock/first_step.md new file mode 100644 index 0000000000..5befe1c52b --- /dev/null +++ b/rock/first_step.md @@ -0,0 +1,6 @@ +Wellcome to your first steps into rock. + +You should now choose: + +Go [here](metal/metal.md) to start the path to metal +Go [here](posher/posher.md) to run away in fear as a poser \ No newline at end of file diff --git a/rock/metal/metal.md b/rock/metal/metal.md new file mode 100644 index 0000000000..42834858a4 --- /dev/null +++ b/rock/metal/metal.md @@ -0,0 +1 @@ +Up the irons! \ No newline at end of file diff --git a/rock/posher/posher.md b/rock/posher/posher.md new file mode 100644 index 0000000000..e57f83a941 --- /dev/null +++ b/rock/posher/posher.md @@ -0,0 +1 @@ +Go and listen to some reggaeton... \ No newline at end of file From 5af1cca92e77dc54e91007eb4d0ee104c9b5fc77 Mon Sep 17 00:00:00 2001 From: Toni Date: Mon, 8 Jul 2019 18:40:27 +0200 Subject: [PATCH 5470/5486] Fix new option --- rock/first_step.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rock/first_step.md b/rock/first_step.md index 5befe1c52b..748bc3fce2 100644 --- a/rock/first_step.md +++ b/rock/first_step.md @@ -3,4 +3,5 @@ Wellcome to your first steps into rock. You should now choose: Go [here](metal/metal.md) to start the path to metal + Go [here](posher/posher.md) to run away in fear as a poser \ No newline at end of file From bf4a5ef3d5294ffb2da262cb42c3bdc87db07f05 Mon Sep 17 00:00:00 2001 From: Julien Weiss Date: Tue, 9 Jul 2019 22:00:58 +0200 Subject: [PATCH 5471/5486] add wakeup option to german story --- german/Traum/aufwachen.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 german/Traum/aufwachen.md diff --git a/german/Traum/aufwachen.md b/german/Traum/aufwachen.md new file mode 100644 index 0000000000..0f116c3a77 --- /dev/null +++ b/german/Traum/aufwachen.md @@ -0,0 +1,2 @@ +Vielleicht ist alles nur ein Traum. +[Wenn ich warten werde ich wieder aufwachen...](../abwarten/abwarten.md) From 7a87c20cb60e2a559522b88004f7b1e065a1b138 Mon Sep 17 00:00:00 2001 From: Julien Weiss Date: Tue, 9 Jul 2019 22:05:21 +0200 Subject: [PATCH 5472/5486] extend ruderboot.md with wakeup option --- german/ruderboot.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/german/ruderboot.md b/german/ruderboot.md index ccce842e5b..14704fff67 100644 --- a/german/ruderboot.md +++ b/german/ruderboot.md @@ -45,3 +45,5 @@ Werden Sie: [Zum fliegenden Spaghettimonster beten, damit sie ueberleben?](beten/beten.md) [Das MacGyver-Messer aus der Hosentasche zu holen und das Ruderboot zu einem U-Boot umbauen](MacGyver/uboot.md) + +[Das ist doch alles nur ein Traum, oder?](Traum/aufwachen.md) From f5aefe628cdbb04ad5f70f6b860cd168ec09f176 Mon Sep 17 00:00:00 2001 From: Julien Weiss Date: Tue, 9 Jul 2019 22:09:34 +0200 Subject: [PATCH 5473/5486] Correct text and typo in german wakeup option --- german/Traum/aufwachen.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/german/Traum/aufwachen.md b/german/Traum/aufwachen.md index 0f116c3a77..c2ca352f40 100644 --- a/german/Traum/aufwachen.md +++ b/german/Traum/aufwachen.md @@ -1,2 +1,2 @@ -Vielleicht ist alles nur ein Traum. -[Wenn ich warten werde ich wieder aufwachen...](../abwarten/abwarten.md) +Ich träume nur, schauen wir mal, ob das alles echt ist. +[Wenn ich warte werde ich wieder aufwachen...](../abwarten/abwarten.md) From 3d0dd118e41c2ff9eb815294df5281ffb7ec97c0 Mon Sep 17 00:00:00 2001 From: Sourabh-Appachhi Date: Wed, 10 Jul 2019 15:35:19 +0530 Subject: [PATCH 5474/5486] Add link for developer.google.com --- english/android-dev/dev.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 english/android-dev/dev.md diff --git a/english/android-dev/dev.md b/english/android-dev/dev.md new file mode 100644 index 0000000000..c5b92e1746 --- /dev/null +++ b/english/android-dev/dev.md @@ -0,0 +1 @@ +Click [here](https://developer.android.com/) to visit Google Developer. \ No newline at end of file From 8eaca0d665adaf727b9e49b18574189595dde5fb Mon Sep 17 00:00:00 2001 From: Sourabh-Appachhi Date: Wed, 10 Jul 2019 15:43:52 +0530 Subject: [PATCH 5475/5486] Update langauge.md --- language.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/language.md b/language.md index ccac62cc3d..647e22f9f9 100644 --- a/language.md +++ b/language.md @@ -181,3 +181,5 @@ ti o ba so ede yoruba, [gba ono yi](yoruba/history/yoruba_history.md) If you speak Igbo, [go here](igbo/igbo-news.md) [Russian lang? | Рус. яз.?](ru/lang.md) + +If you want to visit google developer , [go here](english/android-dev/dev.md). From 952e3f9ddd540f5c113b0c10d0a8864c49d0ef1d Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 11 Jul 2019 11:24:06 +0530 Subject: [PATCH 5476/5486] added changes --- english/art/art.md | 1 + 1 file changed, 1 insertion(+) diff --git a/english/art/art.md b/english/art/art.md index 38dd99ca65..8c8ce6d9a1 100644 --- a/english/art/art.md +++ b/english/art/art.md @@ -1,3 +1,4 @@ When it is time, it will be time. But is it time yet? [How will we know?](http://www.campingdude.com/content/skit/is_it_time_yet-101.asp) +when \ No newline at end of file From 082f70b1fd83eca8477178846731137e0c2f0784 Mon Sep 17 00:00:00 2001 From: Yash Date: Thu, 11 Jul 2019 11:28:37 +0530 Subject: [PATCH 5477/5486] added: the thunderous time --- english/art/art.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/english/art/art.md b/english/art/art.md index 8c8ce6d9a1..2d5582b808 100644 --- a/english/art/art.md +++ b/english/art/art.md @@ -1,4 +1,5 @@ When it is time, it will be time. But is it time yet? [How will we know?](http://www.campingdude.com/content/skit/is_it_time_yet-101.asp) -when \ No newline at end of file +when it will be thunderous all around, when there is a lightning in the sky. +when the earth is shaking. Yes, it is the indiacation of our [time](http://chitrasoundar.com/kids/?p=601). \ No newline at end of file From d7bc4aa7d828bb6e45a790c72f9d9d2be93d46c7 Mon Sep 17 00:00:00 2001 From: Sod0o Date: Thu, 11 Jul 2019 11:09:56 +0200 Subject: [PATCH 5478/5486] add story about a man and the lion --- english/stole/.DS_Store | Bin 0 -> 6148 bytes english/stole/stole.md | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100644 english/stole/.DS_Store create mode 100644 english/stole/stole.md diff --git a/english/stole/.DS_Store b/english/stole/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..fdcc2f03a2d90242de65143f2dca6457d991c13a GIT binary patch literal 6148 zcmeHKyG{c^3>-s>lW0;>Zb^kiO|yzZLCp`K5V}KG0R2_@F8&P04;4K@0~qLzICxl^pSv&Yq%uaN^BIr0#1rdA`479MU%ZELC6fYDKnh3!DIf)Yqk#8b+HjVrC*bC>x_;fJD z2tZsh9maLc62#^SVlSK%nW0%yiAl8@F)ZoKx2o%fb7InAaWkJ&H(O087Pm9sq8!!} z6{Ua_I9A{^w`=eJH}oIo|6`JNQa}p)D+O$|z1wd1O4VBzFXz3s(eLSA^G0{$Iw%a$ lj)~EZx$$;<9z|K#e9iM-I41_3`JfZ^XTWulNrAss-~-i#8#(|0 literal 0 HcmV?d00001 diff --git a/english/stole/stole.md b/english/stole/stole.md new file mode 100644 index 0000000000..9a5a5a2f2e --- /dev/null +++ b/english/stole/stole.md @@ -0,0 +1,8 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +{\*\expandedcolortbl;;} +\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0 +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0 + +\f0\fs24 \cf0 So the lion stole his baby in return.} \ No newline at end of file From 3a71a864c1f481c2932402faf4c50a6f2959d29d Mon Sep 17 00:00:00 2001 From: Sod0o Date: Thu, 11 Jul 2019 12:05:37 +0200 Subject: [PATCH 5479/5486] remove /stole/.DS_Store --- english/stole/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 english/stole/.DS_Store diff --git a/english/stole/.DS_Store b/english/stole/.DS_Store deleted file mode 100644 index fdcc2f03a2d90242de65143f2dca6457d991c13a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyG{c^3>-s>lW0;>Zb^kiO|yzZLCp`K5V}KG0R2_@F8&P04;4K@0~qLzICxl^pSv&Yq%uaN^BIr0#1rdA`479MU%ZELC6fYDKnh3!DIf)Yqk#8b+HjVrC*bC>x_;fJD z2tZsh9maLc62#^SVlSK%nW0%yiAl8@F)ZoKx2o%fb7InAaWkJ&H(O087Pm9sq8!!} z6{Ua_I9A{^w`=eJH}oIo|6`JNQa}p)D+O$|z1wd1O4VBzFXz3s(eLSA^G0{$Iw%a$ lj)~EZx$$;<9z|K#e9iM-I41_3`JfZ^XTWulNrAss-~-i#8#(|0 From 66fc5515e77b833a5d712f2c368ef6c9b7cac4a8 Mon Sep 17 00:00:00 2001 From: Sod0o Date: Thu, 11 Jul 2019 12:09:08 +0200 Subject: [PATCH 5480/5486] fix link --- english/zoo/zoo.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/english/zoo/zoo.md b/english/zoo/zoo.md index 70aa872711..a19b7ef4aa 100644 --- a/english/zoo/zoo.md +++ b/english/zoo/zoo.md @@ -11,3 +11,5 @@ As I lift the lemonade to my mouth I see the tigers have broken loose. [tiger-attack](../tiger-attack/tiger-attack.md) then a lion attacked me [lion](./lion/lion.md) + +and a man [stole](../stole/stole.md) a baby lion. From add13cc400d933335b9f857ebe4ab44466f4a180 Mon Sep 17 00:00:00 2001 From: Yukuan Jia Date: Fri, 12 Jul 2019 11:28:46 -0700 Subject: [PATCH 5481/5486] Add c, t, r, l to Caixukun --- "Chinese/Caixukun/\350\224\241\345\276\220\345\235\244.md" | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git "a/Chinese/Caixukun/\350\224\241\345\276\220\345\235\244.md" "b/Chinese/Caixukun/\350\224\241\345\276\220\345\235\244.md" index fcb66c0173..da285b3d39 100644 --- "a/Chinese/Caixukun/\350\224\241\345\276\220\345\235\244.md" +++ "b/Chinese/Caixukun/\350\224\241\345\276\220\345\235\244.md" @@ -1 +1,2 @@ -喜欢, 唱, 跳, rap, 篮球 \ No newline at end of file +喜欢, 唱, 跳, rap, 篮球 +c,t,r,l From 9cb75aebbcab04bbd57a17a2933f8f248abe0661 Mon Sep 17 00:00:00 2001 From: YMRodriguez Date: Tue, 16 Jul 2019 21:16:50 +0200 Subject: [PATCH 5482/5486] Add macarrones --- espanol/macarrones/macarras.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 espanol/macarrones/macarras.md diff --git a/espanol/macarrones/macarras.md b/espanol/macarrones/macarras.md new file mode 100644 index 0000000000..0bdb63a6c7 --- /dev/null +++ b/espanol/macarrones/macarras.md @@ -0,0 +1 @@ +Los macarrones le devuelven la vida a cualquier persona. From c26ab1316edbd6ef1e7d268f427cc651096983d7 Mon Sep 17 00:00:00 2001 From: YMRodriguez <40146009+YMRodriguez@users.noreply.github.com> Date: Tue, 16 Jul 2019 21:29:06 +0200 Subject: [PATCH 5483/5486] Update canudos.md --- espanol/canudos.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/espanol/canudos.md b/espanol/canudos.md index ed4c0a55bf..3744ae6c7b 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -199,3 +199,5 @@ Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/ Y despues de varios disparos decidio ir a comer, mientras su amigo lo cubria el encendia el coche para iniciar su viaje directo al [espacio](space/space.md). + +Lo que le sirvieron en el restaurante fueros unos [macarrones con tomatito del lidl, queao y choricito].(macarrones/macarras.md). From 9fa5ffef1439628ea91c82d55e25c78a3c2707a4 Mon Sep 17 00:00:00 2001 From: YMRodriguez <40146009+YMRodriguez@users.noreply.github.com> Date: Tue, 16 Jul 2019 21:29:37 +0200 Subject: [PATCH 5484/5486] Update canudos.md --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 3744ae6c7b..36a12d4fa0 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -200,4 +200,4 @@ Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/ Y despues de varios disparos decidio ir a comer, mientras su amigo lo cubria el encendia el coche para iniciar su viaje directo al [espacio](space/space.md). -Lo que le sirvieron en el restaurante fueros unos [macarrones con tomatito del lidl, queao y choricito].(macarrones/macarras.md). +Lo que le sirvieron en el restaurante fueros unos [macarrones con tomatito del lidl, queso y choricito].(macarrones/macarras.md). From a4582a218af915969ff53a50adb2df0f4b8f41cc Mon Sep 17 00:00:00 2001 From: YMRodriguez <40146009+YMRodriguez@users.noreply.github.com> Date: Tue, 16 Jul 2019 21:30:55 +0200 Subject: [PATCH 5485/5486] Update canudos.md --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 36a12d4fa0..8328fd5d85 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -200,4 +200,4 @@ Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/ Y despues de varios disparos decidio ir a comer, mientras su amigo lo cubria el encendia el coche para iniciar su viaje directo al [espacio](space/space.md). -Lo que le sirvieron en el restaurante fueros unos [macarrones con tomatito del lidl, queso y choricito].(macarrones/macarras.md). +Lo que le sirvieron en el restaurante fueros unos [macarrones con tomatito del lidl, queso y choricito](macarrones/macarras.md). From fd493d01c3c8093e70cdee08c432374506f8248c Mon Sep 17 00:00:00 2001 From: YMRodriguez <40146009+YMRodriguez@users.noreply.github.com> Date: Tue, 16 Jul 2019 21:39:03 +0200 Subject: [PATCH 5486/5486] Update canudos.md --- espanol/canudos.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espanol/canudos.md b/espanol/canudos.md index 8328fd5d85..623fbf0bc8 100644 --- a/espanol/canudos.md +++ b/espanol/canudos.md @@ -200,4 +200,4 @@ Luego de su viaje extraordinario se acordó de su [máquina del tiempo](maquina/ Y despues de varios disparos decidio ir a comer, mientras su amigo lo cubria el encendia el coche para iniciar su viaje directo al [espacio](space/space.md). -Lo que le sirvieron en el restaurante fueros unos [macarrones con tomatito del lidl, queso y choricito](macarrones/macarras.md). +Se tomo unos [macarrones con tomatito del lidl, queso y choricito](macarrones/macarras.md).