Merge branch 'CWA-173-fix-russian-translate-and-add-ukrainian-translate' into ru-and-ua-local-fixes

# Conflicts:
#	lib/generated/i18n.dart
#	res/values/strings_ru.arb

lib/src/screens/dashboard/dashboard_page.dart

@@ -388,7 +388,7 @@ class DashboardPageBodyState extends State<DashboardPageBody> {
                                   child: Text(S.of(context).transactions,
                                       style: TextStyle(
                                           fontWeight: FontWeight.bold,
-                                          color: Colors.black))),
+                                          color: Theme.of(context).primaryTextTheme.caption.color))),
                               PopupMenuItem(
                                   value: 0,
                                   child: Observer(
@@ -438,7 +438,7 @@ class DashboardPageBodyState extends State<DashboardPageBody> {
                                   child: Text(S.of(context).trades,
                                       style: TextStyle(
                                           fontWeight: FontWeight.bold,
-                                          color: Colors.black))),
+                                          color: Theme.of(context).primaryTextTheme.caption.color))),
                               PopupMenuItem(
                                   value: 3,
                                   child: Observer(

lib/src/screens/faq/faq_page.dart

@@ -54,6 +54,8 @@ class FaqPage extends BasePage {
     switch (settingsStore.languageCode) {
       case 'en':
         return 'assets/faq/faq_en.json';
+      case 'uk':
+        return 'assets/faq/faq_uk.json';
       case 'ru':
         return 'assets/faq/faq_ru.json';
       case 'es':

lib/src/screens/settings/change_language.dart

@@ -8,16 +8,17 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 
 const Map<String, String> _languages = {
   'en': 'English',
-  'ru': 'Русский (Russian)',
+  'de': 'Deutsch (German)',
   'es': 'Español (Spanish)',
+  'hi': 'हिंदी (Hindi)',
   'ja': '日本 (Japanese)',
   'ko': '한국어 (Korean)',
-  'hi': 'हिंदी (Hindi)',
-  'de': 'Deutsch (German)',
-  'zh': '中文 (Chinese)',
-  'pt': 'Português (Portuguese)',
+  'nl': 'Nederlands (Dutch)',
   'pl': 'Polski (Polish)',
-  'nl': 'Nederlands (Dutch)'
+  'pt': 'Português (Portuguese)',
+  'ru': 'Русский (Russian)',
+  'uk': 'Українська (Ukrainian)',
+  'zh': '中文 (Chinese)'
 };
 
 class ChangeLanguage extends BasePage {