summaryrefslogtreecommitdiff
path: root/lang/ru/conflict.txt
diff options
context:
space:
mode:
Diffstat (limited to 'lang/ru/conflict.txt')
-rw-r--r--lang/ru/conflict.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/lang/ru/conflict.txt b/lang/ru/conflict.txt
new file mode 100644
index 000000000..bd5fb6854
--- /dev/null
+++ b/lang/ru/conflict.txt
@@ -0,0 +1,9 @@
+====== ÁãéÕáâÒãÕâ ÑÞÛÕÕ ÝÞÒÐï ÒÕàáØï ======
+
+ÁãéÕáâÒãÕâ ÑÞÛÕÕ ÝÞÒÐï ÒÕàáØï ÔÞÚãÜÕÝâÐ, ÚÞâÞàëÙ Òë àÕÔÐÚâØàÞÒÐÛØ. ÂÐÚÞÕ
+áÛãçÐÕâáï ÚÞÓÔÐ ÔàãÓÞÙ ßÞÛì×ÞÒÐâÕÛì Ø×ÜÕÝØÛ ÔÞÚãÜÕÝâ ßÞÚÐ Òë
+ÔÕÛÐÛØ âÞ ÖÕ áÐÜÞÕ.
+
+²ÝØÜÐâÕÛìÝÞ Ø×ãçØâÕ àÐ×ÛØçØï, ßàØÒÕÔÕÝÝëÕ ÝØÖÕ Ø àÕèØâÕ ÚÐÚãî
+ÒÕàáØî ÞáâÐÒØâì. µáÛØ Òë ÒëÑÕàØâÕ ''ÁÞåàÐÝØâì'', âÞ ÒÐèÐ ÒÕàáØï ÑãÔÕâ
+áÞåàÐÝÕÝÐ. ½ÐÖÐÒ ''¾âÜÕÝØâì'' Òë ÞáâÐÒØâÕ âÕÚãéãî ÒÕàáØî.