beremiz

Merged skvorl/beremiz into default

2017-03-06, Sergey Surkov
a079b0322a48
Parents f4696d85552af077f8fb9ba7
Children bb5440697405
Merged skvorl/beremiz into default
3 files changed, 3 insertions(+), 1 deletions(-)
  • +2 -0
    .hgignore
  • +1 -1
    i18n/Beremiz_ru_RU.po
  • +0 -0
    locale/ru_RU/LC_MESSAGES/Beremiz.mo
    • --- 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