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
@@ -499,7 +499,7 @@
"HeaderTo": "\u049a\u0430\u0439\u0434\u0430",
"LabelFrom": "\u049a\u0430\u0439\u0434\u0430\u043d:",
"LabelTo": "\u049a\u0430\u0439\u0434\u0430:",
"LabelToHelp": "Example: \\\\MyServer\\Movies (a path clients can access)",
"LabelToHelp": "\u041c\u044b\u0441\u0430\u043b: \\\\MyServer\\Movies (\u043a\u043b\u0438\u0435\u043d\u0442\u0442\u0435\u0440 \u049b\u0430\u0442\u044b\u043d\u0430\u0439\u0442\u044b\u043d \u0436\u043e\u043b)",
"ButtonAddPathSubstitution": "\u0410\u043b\u043c\u0430\u0441\u0442\u044b\u0440\u0443\u0434\u044b \u04af\u0441\u0442\u0435\u0443",
"OptionSpecialEpisode": "\u0410\u0440\u043d\u0430\u0439\u044b \u0431\u04e9\u043b\u0456\u043c\u0434\u0435\u0440",
"OptionMissingEpisode": "\u0416\u043e\u049b \u0431\u04e9\u043b\u0456\u043c\u0434\u0435\u0440",