Browse Source

- fixing merge errors

Marius Stanciu 6 years ago
parent
commit
e8dc4aece7
3 changed files with 410 additions and 402 deletions
  1. BIN
      locale/ru/LC_MESSAGES/strings.mo
  2. 190 186
      locale/ru/LC_MESSAGES/strings.po
  3. 220 216
      locale_template/strings.pot

BIN
locale/ru/LC_MESSAGES/strings.mo


File diff suppressed because it is too large
+ 190 - 186
locale/ru/LC_MESSAGES/strings.po


File diff suppressed because it is too large
+ 220 - 216
locale_template/strings.pot


Some files were not shown because too many files changed in this diff