From: fsLeg <fsleg@t-rg.ws>
Date: Sat, 19 Nov 2016 23:04:31 +0000 (+0300)
Subject: Разрешён конфликт при слиянии файла вопросов с версией в репозитории.
X-Git-Url: https://git.t-rg.ws/?a=commitdiff_plain;h=d8dcc0a3d040cb009cf01c5d9724732e4921043d;p=w2.git

Разрешён конфликт при слиянии файла вопросов с версией в репозитории.
---

d8dcc0a3d040cb009cf01c5d9724732e4921043d
diff --cc questions.txt
index b8e42b7,9672c5b..dc566c8
--- a/questions.txt
+++ b/questions.txt
@@@ -1,25 -1,17 +1,21 @@@
- 1. ÐÑÐºÐ²Ð° Ð
- 2. Nintendo DS (0073.txt, ÑÑÑÐ¾ÐºÐ° 69)
- 3. "Nintendo Wi-Fi Connection" vs "ÐÐ°ÑÑÑÐ¸Ð´Ð¶ ÐÐ¸Ð½ÑÐµÐ½Ð´Ð¾"
- 4. Ð ÐµÐ³Ð¸ÑÑÑ Ð¿ÑÐ½ÐºÑÐ¾Ð² Ð¼ÐµÐ½Ñ (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, "CHECK THE CARD ALBUM")
- 5. ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² Ð´Ð»Ñ Ð¿ÑÐ½ÐºÑÐ¾Ð² Ð¼ÐµÐ½Ñ Ð¸ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ¾Ð² Ð¸Ð½ÑÐµÑÑÐµÐ¹ÑÐ° (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÐ¼ÑÐ¹ ÑÑÐ°ÑÑÑ Ð¿Ð¾ÐºÐµÐ¼Ð¾Ð½Ð°)
- 6. INFRARED - ÐÐ-ÐÐÐ Ð¢ (0073.txt, ÑÑÑÐ¾ÐºÐ° 71)
- 7. GET VIA WIRELESS - ÐÐÐÐ£Ð§ÐÐ¢Ð¬ Ð§ÐÐ ÐÐ WI-FI (0073.txt, ÑÑÑÐ¾ÐºÐ° 71)
- 8. Battle Competition - Ð¢ÑÑÐ½Ð¸Ñ ÐÐ¸ÑÐ² (Ð² ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²Ð¸Ð¸ ÑÐ¾ Ð¡Ð»Ð¾Ð²Ð°ÑÑÐ¼; 0073.txt, ÑÑÑÐ¾ÐºÐ° 74)
- 9. The Official Pokemon website (0073.txt, ÑÑÑÐ¾ÐºÐ° 75)
- 10. Battle ÐºÐ°Ðº Ð³Ð»Ð°Ð³Ð¾Ð» (0073.txt, ÑÑÑÐ¾ÐºÐ° 82)
- 11. Ð­ÑÐ°Ð¶ (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, 2F; 0073.txt, ÑÑÑÐ¾ÐºÐ° 85)
- 12. Party - Ð³ÑÑÐ¿Ð¿Ð°/ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° (0073.txt, ÑÑÑÐ¾ÐºÐ° 86)
- 13. MOVE - ÐÐÐ ÐÐÐÐ¡Ð¢ÐÐ¢Ð¬ (0073.txt, ÑÑÑÐ¾ÐºÐ° 88)
- 14. Ð¡ÑÑÐ¾ÐºÐ¸ Ñ 39+ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² Ð¸Ð·Ð½Ð°ÑÐ°Ð»ÑÐ½Ð¾ (0073.txt, ÑÑÑÐ¾ÐºÐ° 88)
- 15. Relocate Mode - Ð ÐµÐ¶Ð¸Ð¼ ÐÐµÑÐµÐ½Ð¾ÑÐ° (0073.txt, ÑÑÑÐ¾ÐºÐ° 89)
- 16. Group Move Mode - Ð ÐµÐ¶Ð¸Ð¼ ÐÑÑÐ¿Ð¿Ð¾Ð²Ð¾Ð³Ð¾ ÐÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ñ (0073.txt, ÑÑÑÐ¾ÐºÐ° 90)
- 17. Wi-Fi Club - ÐÐ»ÑÐ± Wi-Fi (0073.txt, ÑÑÑÐ¾ÐºÐ° 92)
- 18. Globe Terminal - ÐÐ»Ð¾Ð±Ð°Ð»ÑÐ½ÑÐ¹ Ð¢ÐµÑÐ¼Ð¸Ð½Ð°Ð» (0073.txt, ÑÑÑÐ¾ÐºÐ° 92)
- 19. Trade ÐºÐ°Ðº Ð³Ð»Ð°Ð³Ð¾Ð»
- 20. SHIFT - ÐÐÐ ÐÐ¡Ð¢ÐÐÐÐÐÐ (0073.txt, ÑÑÑÐ¾ÐºÐ° 105)
- 21. ON - ÐÐÐ (0073.txt, ÑÑÑÐ¾ÐºÐ° 108)
- 22. ÐÑÐ¸ÑÐ¸ÑÐ½Ð¾ Ð»Ð¸ Ð¾ÑÑÑÑÑÑÐ²Ð¸Ðµ Ð¿ÑÑÑÐ¾Ð¹ ÑÑÑÐ¾ÐºÐ¸ Ð² ÐºÐ¾Ð½ÑÐµ ÑÐ°Ð¹Ð»Ð°?
- 23. Voice Chat - ÐÐ¾Ð»Ð¾ÑÐ¾Ð²Ð¾Ð¹ Ð§Ð°Ñ
- 24. 40 ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð², Ð½Ð¾ Ð±Ð¾Ð»ÑÑÐ°Ñ ÑÐ°ÑÑÑ ÑÑÑÐ¾ÐºÐ¸ - Ð½ÐµÐ¿ÐµÑÐµÐ²ÐµÐ´ÑÐ½Ð½ÑÐ¹ ÑÐµÑÐ¼Ð¸Ð½ (0073.txt, ÑÑÑÐ¾ÐºÐ° 114)
- 25. ÐÑÑÑÑÐ¿Ñ Ð² Ð¿ÐµÑÐ²Ð¾Ð¼ ÑÐ»ÑÑÐ°Ðµ Ð¿ÑÐ¸ÑÐ»Ð¾ÑÑ ÑÐ¾ÐºÑÐ°ÑÐ¸ÑÑ Ð½Ð° Ð´Ð²Ð° Ð¿ÑÐ¾Ð±ÐµÐ»Ð° Ð¸Ð·-Ð·Ð° ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð², Ð²Ð¾ Ð²ÑÐ¾ÑÐ¾Ð¼ - Ð´Ð»Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ ÐµÐ´Ð¸Ð½Ð¾Ð±ÑÐ°Ð·Ð¸Ñ.
+ 1. Nintendo DS - Ð±ÐµÐ· Ð¿ÐµÑÐµÐ²Ð¾Ð´Ð° (0073.txt, ÑÑÑÐ¾ÐºÐ° 69)
+ 2. Ð ÐµÐ³Ð¸ÑÑÑ Ð¿ÑÐ½ÐºÑÐ¾Ð² Ð¼ÐµÐ½Ñ (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, "CHECK THE CARD ALBUM")
+ 3. ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² Ð´Ð»Ñ Ð¿ÑÐ½ÐºÑÐ¾Ð² Ð¼ÐµÐ½Ñ Ð¸ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ¾Ð² Ð¸Ð½ÑÐµÑÑÐµÐ¹ÑÐ° (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÐ¼ÑÐ¹ ÑÑÐ°ÑÑÑ Ð¿Ð¾ÐºÐµÐ¼Ð¾Ð½Ð°)
+ 4. INFRARED - ÐÐ-ÐÐÐ Ð¢ (0073.txt, ÑÑÑÐ¾ÐºÐ° 71)
+ 5. GET VIA WIRELESS - ÐÐÐÐ£Ð§ÐÐ¢Ð¬ Ð§ÐÐ ÐÐ WI-FI (0073.txt, ÑÑÑÐ¾ÐºÐ° 71)
+ 6. Battle Competition - Ð¢ÑÑÐ½Ð¸Ñ ÐÐ¸ÑÐ² (Ð² ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²Ð¸Ð¸ ÑÐ¾ Ð¡Ð»Ð¾Ð²Ð°ÑÑÐ¼; 0073.txt, ÑÑÑÐ¾ÐºÐ° 74)
+ 7. The Official Pokemon website (0073.txt, ÑÑÑÐ¾ÐºÐ° 75)
+ 8. Battle ÐºÐ°Ðº Ð³Ð»Ð°Ð³Ð¾Ð» (0073.txt, ÑÑÑÐ¾ÐºÐ° 82)
+ 9. Ð­ÑÐ°Ð¶ (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, 2F; 0073.txt, ÑÑÑÐ¾ÐºÐ° 85)
+ 10. Party - Ð³ÑÑÐ¿Ð¿Ð°/ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° (0073.txt, ÑÑÑÐ¾ÐºÐ° 86)
+ 11. MOVE - ÐÐÐ ÐÐÐÐ¡Ð¢ÐÐ¢Ð¬ (0073.txt, ÑÑÑÐ¾ÐºÐ° 88)
+ 12. Relocate Mode - Ð ÐµÐ¶Ð¸Ð¼ ÐÐµÑÐµÐ½Ð¾ÑÐ° (0073.txt, ÑÑÑÐ¾ÐºÐ° 89)
+ 13. Group Move Mode - Ð ÐµÐ¶Ð¸Ð¼ ÐÑÑÐ¿Ð¿Ð¾Ð²Ð¾Ð³Ð¾ ÐÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ñ (0073.txt, ÑÑÑÐ¾ÐºÐ° 90)
+ 14. Wi-Fi Club - ÐÐ»ÑÐ± Wi-Fi (0073.txt, ÑÑÑÐ¾ÐºÐ° 92)
+ 15. Globe Terminal - ÐÐ»Ð¾Ð±Ð°Ð»ÑÐ½ÑÐ¹ Ð¢ÐµÑÐ¼Ð¸Ð½Ð°Ð» (0073.txt, ÑÑÑÐ¾ÐºÐ° 92)
+ 16. Trade ÐºÐ°Ðº Ð³Ð»Ð°Ð³Ð¾Ð»
+ 17. SHIFT - ÐÐÐ ÐÐ¡Ð¢ÐÐÐÐÐÐ (0073.txt, ÑÑÑÐ¾ÐºÐ° 105)
++18. ON - ÐÐÐ (0073.txt, ÑÑÑÐ¾ÐºÐ° 108)
++19. ÐÑÐ¸ÑÐ¸ÑÐ½Ð¾ Ð»Ð¸ Ð¾ÑÑÑÑÑÑÐ²Ð¸Ðµ Ð¿ÑÑÑÐ¾Ð¹ ÑÑÑÐ¾ÐºÐ¸ Ð² ÐºÐ¾Ð½ÑÐµ ÑÐ°Ð¹Ð»Ð°?
++20. Voice Chat - ÐÐ¾Ð»Ð¾ÑÐ¾Ð²Ð¾Ð¹ Ð§Ð°Ñ
++21. ÐÑÑÑÑÐ¿Ñ Ð² Ð¿ÐµÑÐ²Ð¾Ð¼ ÑÐ»ÑÑÐ°Ðµ Ð¿ÑÐ¸ÑÐ»Ð¾ÑÑ ÑÐ¾ÐºÑÐ°ÑÐ¸ÑÑ Ð½Ð° Ð´Ð²Ð° Ð¿ÑÐ¾Ð±ÐµÐ»Ð° Ð¸Ð·-Ð·Ð° ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð², Ð²Ð¾ Ð²ÑÐ¾ÑÐ¾Ð¼ - Ð´Ð»Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ ÐµÐ´Ð¸Ð½Ð¾Ð±ÑÐ°Ð·Ð¸Ñ.