Merge branch 'master' into develop

2017-05-18 14:35:18 +08:00
parent 6ca3e8abda 095f4831db
commit 2b985686a4
29 changed files with 221 additions and 138 deletions
@@ -6,4 +6,10 @@

 <!-- feature category -->
 <string name="feature_cat">"Дополнительные Настройки"</string>
+
+<!-- alert category -->
+<string name="yes">"Да"</string>
+<string name="no">"Нет"</string>
+<string name="unsaved_changes_prompt">"Изменения не сохранены. Сохранить?"</string>
+<string name="apply">"Применить"</string>
 </resources>