up

iliakan · iliakan · commit db39a8be86e8 · 2015-08-24T16:04:42.000+03:00
diff --git a/1-js/2-first-steps/12-ifelse/1-if-zero-string/task.md b/1-js/2-first-steps/12-ifelse/1-if-zero-string/task.md
@@ -1,12 +1,12 @@
-# if (строка с нулём)
+# if (a string with zero)
 
 [importance 5]
 
-Выведется ли `alert`?
+Will `alert` be shown?
 
 ```js
 if ("0") {
-  alert( 'Привет' );
+  alert( 'Hello' );
 }
 ```
 
diff --git a/1-js/2-first-steps/12-ifelse/2-check-standard/ifelse_task2/index.html b/1-js/2-first-steps/12-ifelse/2-check-standard/ifelse_task2/index.html
@@ -3,12 +3,12 @@
 
 <body>
   <script>
-    var value = prompt('Каково "официальное" название JavaScript?', '');
+    var value = prompt('What is the "official" name of JavaScript?', '');
 
     if (value == 'EcmaScript') {
-      alert('Верно!');
+      alert('Right!');
     } else {
-      alert('Не знаете? "EcmaScript"!');
+      alert("Didn't know? EcmaScript!");
     }
   </script>
 
diff --git a/1-js/2-first-steps/7-types-intro/article.md b/1-js/2-first-steps/7-types-intro/article.md
@@ -43,16 +43,35 @@ We'll cover working with numbers in the chapter [](/number).
 ```js
 var str = "Hello";
 var str2 = 'Single quotes are ok too';
-var prase = `can embed ${str}`;
+var phrase = `can embed ${str}`;
 ```
 
 In JavaScript, there are 3 types of quotes.
 
 <ol>
-<li>Double quotes and single quotes are essentially the same.</li>
+<li>Double quotes: `"Hello"`.</li>
+<li>Single quotes: `'Hello'`.</li>
 <li>Backtricks are "extended functionality" quotes. They allow to embed other variables or even expressions into the string wrapping them by `${…}`.</li>
 </ol>
 
+Double and single quotes are essentially the same. The only difference between them can be seen when the string includes the quotation character `"` or `'`.
+
+A double quote symbol may appear inside single-quoted lines and vise versa:
+
+```js
+var hello = "I'm JavaScript"; // single-quote inside "…"
+var name = 'My "official" name is "EcmaScript"'; // vise versa
+```
+
+If we want to include a single quote inside a same-quoted string, we can do it too. But we need to prepend it with a slash:
+
+```js
+// prepend ' inside the string with a slash \'
+var hello = 'I\'m JavaScript'; 
+```
+
+Similarly with double quotes.
+
 [smart header="There is no *character* type."]
 In some languages, there is a special "character" type for a single character. For example, in the C language it is `char`.
 
