Resolved Merge issue; Added Russian;

browser/main/Main.js

@@ -171,6 +171,8 @@ class Main extends React.Component {
       i18n.setLocale('pl')
     } else if (config.ui.language === 'pt') {
       i18n.setLocale('pt')
+    } else if (config.ui.language === 'ru') {
+      i18n.setLocale('ru')
     } else if (config.ui.language === 'es') {
       i18n.setLocale('es')
     } else {

browser/main/NoteList/index.js

@@ -15,7 +15,7 @@ import path from 'path'
 import { hashHistory } from 'react-router'
 import copy from 'copy-to-clipboard'
 import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
-import markdown from '../../lib/markdown'
+import Markdown from '../../lib/markdown'
 import i18n from 'browser/lib/i18n'
 
 const { remote } = require('electron')

browser/main/lib/ConfigManager.js

@@ -157,6 +157,8 @@ function set (updates) {
     i18n.setLocale('pl')
   } else if (newConfig.ui.language === 'pt') {
     i18n.setLocale('pt')
+  } else if (newConfig.ui.language === 'ru') {
+    i18n.setLocale('ru')
   } else if (newConfig.ui.language === 'es') {
     i18n.setLocale('es')
   } else {

browser/main/modals/PreferencesModal/UiTab.js

@@ -190,6 +190,7 @@ class UiTab extends React.Component {
                 <option value='no'>{i18n.__('Norwegian')}</option>
                 <option value='pl'>{i18n.__('Polish')}</option>
                 <option value='pt'>{i18n.__('Portuguese')}</option>
+                <option value='ru'>{i18n.__('Russian')}</option>
                 <option value='es'>{i18n.__('Spanish')}</option>
               </select>
             </div>