Merged skvorl/beremiz into default
authorSergey Surkov <surkovsv93@gmail.com>
Mon, 06 Mar 2017 17:39:29 +0300
changeset 1655 a079b0322a48
parent 1654 f4696d85552a (current diff)
parent 1651 f077f8fb9ba7 (diff)
child 1656 bb5440697405
Merged skvorl/beremiz into default
--- 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/.*
--- 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"
Binary file locale/ru_RU/LC_MESSAGES/Beremiz.mo has changed