# HG changeset patch
# User Sergey Surkov <surkovsv93@gmail.com>
# Date 1488811169 -10800
# Node ID a079b0322a48d8977f0a145dfabbfa3c269ac867
# Parent  f4696d85552a8c50af021066a292d3647a7f42f2# Parent  f077f8fb9ba7d99c9cf90058cee934fb1f952a0d
Merged skvorl/beremiz into default

diff -r f4696d85552a -r a079b0322a48 .hgignore
--- a/.hgignore	Fri Mar 03 15:57:58 2017 +0300
+++ b/.hgignore	Mon Mar 06 17:39:29 2017 +0300
@@ -1,5 +1,7 @@
 .project
 
+.directory
+
 syntax: regexp
 ^tests/.*/build$
 ^.idea/.*
diff -r f4696d85552a -r a079b0322a48 i18n/Beremiz_ru_RU.po
--- a/i18n/Beremiz_ru_RU.po	Fri Mar 03 15:57:58 2017 +0300
+++ b/i18n/Beremiz_ru_RU.po	Mon Mar 06 17:39:29 2017 +0300
@@ -3127,7 +3127,7 @@
 
 #: ../ProjectController.py:1804
 msgid "Show IEC code generated by PLCGenerator"
-msgstr "Показать год, сгенерированный PLCGenerator"
+msgstr "Показать код, сгенерированный PLCGenerator"
 
 #: ../canfestival/canfestival.py:387
 msgid "Show Master"
diff -r f4696d85552a -r a079b0322a48 locale/ru_RU/LC_MESSAGES/Beremiz.mo
Binary file locale/ru_RU/LC_MESSAGES/Beremiz.mo has changed