diff --git a/electron_app/src/lang/index.js b/electron_app/src/lang/index.js
index cbf9484d3..841ddd4d4 100644
--- a/electron_app/src/lang/index.js
+++ b/electron_app/src/lang/index.js
@@ -1,5 +1,8 @@
const en = require('./en.json');
const es = require('./es.json');
+const de = require('./de.json');
+const fr = require('./fr.json');
+const ru = require('./ru.json');
const mySettings = require('./../Settings');
const languageSettings = {
@@ -16,6 +19,18 @@ const languageSettings = {
this.currentLanguage = 'es';
this.strings = es;
return;
+ case 'de':
+ this.currentLanguage = 'de';
+ this.strings = de;
+ return;
+ case 'fr':
+ this.currentLanguage = 'fr';
+ this.strings = fr;
+ return;
+ case 'ru':
+ this.currentLanguage = 'ru';
+ this.strings = ru;
+ return;
default:
this.currentLanguage = 'en';
this.strings = en;
diff --git a/email_composer/src/app.scss b/email_composer/src/app.scss
index 142c8ed80..cfdcdfc68 100644
--- a/email_composer/src/app.scss
+++ b/email_composer/src/app.scss
@@ -177,14 +177,14 @@ TABLE OF CONTENTS
@font-face {
font-family: "Roboto";
- src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Thin.ttf) format("truetype");
+ src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Regular.ttf) format("truetype");
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: "Roboto";
- src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-ThinItalic.ttf) format("truetype");
+ src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Italic.ttf) format("truetype");
font-weight: normal;
font-style: italic;
}
diff --git a/email_composer/src/lang/index.js b/email_composer/src/lang/index.js
index 07e5f9990..0ee23c0e3 100644
--- a/email_composer/src/lang/index.js
+++ b/email_composer/src/lang/index.js
@@ -2,10 +2,16 @@ import LocalizedStrings from 'react-localization';
import { mySettings } from '../utils/electronInterface';
import en from './en.json';
import es from './es.json';
+import de from './de.json';
+import fr from './fr.json';
+import ru from './ru.json';
const string = new LocalizedStrings({
en,
- es
+ es,
+ de,
+ fr,
+ ru
});
string.setLanguage(mySettings.language);
diff --git a/email_loading/src/lang/index.js b/email_loading/src/lang/index.js
index 07e5f9990..0ee23c0e3 100644
--- a/email_loading/src/lang/index.js
+++ b/email_loading/src/lang/index.js
@@ -2,10 +2,16 @@ import LocalizedStrings from 'react-localization';
import { mySettings } from '../utils/electronInterface';
import en from './en.json';
import es from './es.json';
+import de from './de.json';
+import fr from './fr.json';
+import ru from './ru.json';
const string = new LocalizedStrings({
en,
- es
+ es,
+ de,
+ fr,
+ ru
});
string.setLanguage(mySettings.language);
diff --git a/email_login/src/lang/index.js b/email_login/src/lang/index.js
index 28cc9cc73..fa8d43c46 100644
--- a/email_login/src/lang/index.js
+++ b/email_login/src/lang/index.js
@@ -2,10 +2,16 @@ import LocalizedStrings from 'react-localization';
import { mySettings } from '../utils/electronInterface.js';
import en from './en.json';
import es from './es.json';
+import de from './de.json';
+import fr from './fr.json';
+import ru from './ru.json';
const string = new LocalizedStrings({
en,
- es
+ es,
+ de,
+ fr,
+ ru
});
string.setLanguage(mySettings.language);
diff --git a/email_mailbox/src/app.scss b/email_mailbox/src/app.scss
index 822d59167..2772899b9 100644
--- a/email_mailbox/src/app.scss
+++ b/email_mailbox/src/app.scss
@@ -181,14 +181,14 @@ TABLE OF CONTENTS
@font-face {
font-family: "Roboto";
- src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Thin.ttf) format("truetype");
+ src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Regular.ttf) format("truetype");
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: "Roboto";
- src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-ThinItalic.ttf) format("truetype");
+ src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Italic.ttf) format("truetype");
font-weight: normal;
font-style: italic;
}
diff --git a/email_mailbox/src/components/ActivityPanel.js b/email_mailbox/src/components/ActivityPanel.js
index 429fb8db8..5512c2186 100644
--- a/email_mailbox/src/components/ActivityPanel.js
+++ b/email_mailbox/src/components/ActivityPanel.js
@@ -108,8 +108,8 @@ class ActivityPanel extends Component {
-
There's nothing new yet
-
Enjoy your day
+
{string.activity.empty_title}
+
{string.activity.empty_message}
);
diff --git a/email_mailbox/src/components/labeladd.scss b/email_mailbox/src/components/labeladd.scss
index 04d94ddbc..8c533095a 100644
--- a/email_mailbox/src/components/labeladd.scss
+++ b/email_mailbox/src/components/labeladd.scss
@@ -1,6 +1,7 @@
li{
&.nav-item-label-add{
color: #0091ff;
+ white-space: nowrap;
div{
align-items: center;
diff --git a/email_mailbox/src/lang/de.json b/email_mailbox/src/lang/de.json
index 11e12d4db..48a41e271 100644
--- a/email_mailbox/src/lang/de.json
+++ b/email_mailbox/src/lang/de.json
@@ -3,6 +3,8 @@
"activity_feed": "Aktivitäten-Feed",
"deleted": "Gelöscht",
"downloaded": "heruntergeladen",
+ "empty_message": "Genießt dein Tag",
+ "empty_title": "Bis jetzt nichts neues",
"new": "neu",
"older": "älter",
"opened": "geöffnet",
@@ -677,7 +679,7 @@
"show_in_label_list": "In der Labelliste anzeigen",
"signature": "Unterschrift",
"sign_footer": {
- "description": "Fußzeile \"Gesendet mit Criptext\" anzeigen"
+ "description": "\"Gesendet mit Criptext\" anzeigen"
},
"system_labels": "Systemlabels",
"theme": {
diff --git a/email_mailbox/src/lang/en.json b/email_mailbox/src/lang/en.json
index f2e26d6bb..4d1f92d36 100644
--- a/email_mailbox/src/lang/en.json
+++ b/email_mailbox/src/lang/en.json
@@ -3,6 +3,8 @@
"activity_feed": "Activity Feed",
"deleted": "Deleted",
"downloaded": "downloaded",
+ "empty_message": "Enjoy your day",
+ "empty_title": "There's nothing new yet",
"new": "new",
"older": "older",
"opened": "opened",
diff --git a/email_mailbox/src/lang/es.json b/email_mailbox/src/lang/es.json
index b6c116614..922ab4c23 100644
--- a/email_mailbox/src/lang/es.json
+++ b/email_mailbox/src/lang/es.json
@@ -3,6 +3,8 @@
"activity_feed": "Actividad Reciente",
"deleted": "Borrado",
"downloaded": "ha descargado",
+ "empty_message": "Disfruta tu día",
+ "empty_title": "No hay nada nuevo aún",
"new": "nuevo",
"older": "antiguo",
"opened": "ha abierto",
diff --git a/email_mailbox/src/lang/fr.json b/email_mailbox/src/lang/fr.json
index d970b0691..f47e1622f 100644
--- a/email_mailbox/src/lang/fr.json
+++ b/email_mailbox/src/lang/fr.json
@@ -3,6 +3,8 @@
"activity_feed": "Flux d'activité",
"deleted": "Supprimé",
"downloaded": "téléchargé",
+ "empty_message": "Profiter de votre journée",
+ "empty_title": "Il n'y a encore rien de nouveau",
"new": "nouveau",
"older": "précédent",
"opened": "ouvert(s)",
@@ -677,7 +679,7 @@
"show_in_label_list": "Afficher dans la liste de marqueurs",
"signature": "Signature",
"sign_footer": {
- "description": "Afficher le pied de page «Envoyé avec Criptext»"
+ "description": "Afficher «Envoyé avec Criptext»"
},
"system_labels": "Marqueurs Système",
"theme": {
diff --git a/email_mailbox/src/lang/index.js b/email_mailbox/src/lang/index.js
index d5e1e8c32..33f9395e2 100644
--- a/email_mailbox/src/lang/index.js
+++ b/email_mailbox/src/lang/index.js
@@ -3,10 +3,16 @@ import { mySettings } from '../utils/electronInterface';
import { updateSettings } from '../utils/ipc';
import en from './en.json';
import es from './es.json';
+import de from './de.json';
+import fr from './fr.json';
+import ru from './ru.json';
const string = new LocalizedStrings({
en,
- es
+ es,
+ de,
+ fr,
+ ru
});
export const currentLanguage = mySettings.language;
@@ -14,7 +20,10 @@ string.setLanguage(currentLanguage || 'en');
export const languages = [
{ text: 'English', value: 'en' },
- { text: 'Español', value: 'es' }
+ { text: 'Español', value: 'es' },
+ { text: 'Français', value: 'fr' },
+ { text: 'Deutsch', value: 'de' },
+ { text: 'Русский', value: 'ru' }
];
export const setLang = async lang => {
diff --git a/email_mailbox/src/lang/ru.json b/email_mailbox/src/lang/ru.json
index cd6b27f0c..4f7296586 100644
--- a/email_mailbox/src/lang/ru.json
+++ b/email_mailbox/src/lang/ru.json
@@ -3,6 +3,8 @@
"activity_feed": "Лента Активности",
"deleted": "удаленный",
"downloaded": "загружено",
+ "empty_message": "Приятного дня",
+ "empty_title": "Там нет ничего нового пока",
"new": "новое",
"older": "старое",
"opened": "открыто",
@@ -677,7 +679,7 @@
"show_in_label_list": "Показать в списке этикеток",
"signature": "Подпись",
"sign_footer": {
- "description": "Показать нижний колонтитул «Отправлено с криптекстом»"
+ "description": "Показать «Отправлено с Criptext»"
},
"system_labels": "Системные метки",
"theme": {