merge from dev

This commit is contained in:
Luke Pulverenti
2016-01-12 14:55:45 -05:00
parent 9e1a2cf66a
commit 189942e289
298 changed files with 53049 additions and 5413 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
{
"LabelFromHelp": "Example: {0} (on the server)",
"LabelFromHelp": "\u041c\u044b\u0441\u0430\u043b: {0} (\u0441\u0435\u0440\u0432\u0435\u0440\u0434\u0435)",
"SettingsSaved": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440 \u0441\u0430\u049b\u0442\u0430\u043b\u0434\u044b.",
"AddUser": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043d\u044b \u04af\u0441\u0442\u0435\u0443",
"Users": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043b\u0430\u0440",