Make the "show inline images as attachments" optional and cleanup localization data

dev/External/SquireUI.js

@@ -81,8 +81,8 @@ class SquireUI
 //						html: '〈〉',
 //						cmd: () => this.setMode('plain' == this.mode ? 'wysiwyg' : 'plain'),
 						select: [
-							[i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML'),'wysiwyg'],
-							[i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN'),'plain']
+							[i18n('SETTINGS_GENERAL/EDITOR_HTML'),'wysiwyg'],
+							[i18n('SETTINGS_GENERAL/EDITOR_PLAIN'),'plain']
 						],
 						cmd: s => this.setMode('plain' == s.value ? 'plain' : 'wysiwyg'),
 						hint: i18n('EDITOR/TEXT_SWITCHER_PLAIN_TEXT', 'Plain')

dev/Model/Message.js

@@ -150,8 +150,9 @@ export class MessageModel extends AbstractModel {
 		this.addComputables({
 			attachmentIconClass: () => FileInfo.getAttachmentsIconClass(this.attachments()),
 			threadsLen: () => this.threads().length,
-//			hasAttachments: () => this.attachments().filter(item => !item.isLinked()).length,
-			hasAttachments: () => this.attachments().length,
+			listAttachments: () => this.attachments()
+				.filter(item => SettingsUserStore.listInlineAttachments() || !item.isLinked()),
+			hasAttachments: () => this.listAttachments().length,
 
 			isUnseen: () => !this.flags().includes('\\seen'),
 			isFlagged: () => this.flags().includes('\\flagged'),

dev/Settings/User/General.js

@@ -42,7 +42,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 
 		['layout', 'messageReadDelay', 'messagesPerPage',
 		 'editorDefaultType', 'requestReadReceipt', 'requestDsn', 'pgpSign', 'pgpEncrypt',
-		 'viewHTML', 'showImages', 'removeColors', 'hideDeleted',
+		 'viewHTML', 'showImages', 'removeColors', 'hideDeleted', 'listInlineAttachments',
 		 'useCheckboxesInList', 'useThreads', 'replySameFolder', 'msgDefaultAction'
 		].forEach(name => this[name] = SettingsUserStore[name]);
 
@@ -68,8 +68,8 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 			editorDefaultTypes: () => {
 				translatorTrigger();
 				return [
-					{ id: EditorDefaultType.Html, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML') },
-					{ id: EditorDefaultType.Plain, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN') }
+					{ id: EditorDefaultType.Html, name: i18n('SETTINGS_GENERAL/EDITOR_HTML') },
+					{ id: EditorDefaultType.Plain, name: i18n('SETTINGS_GENERAL/EDITOR_PLAIN') }
 				];
 			},
 
@@ -84,9 +84,9 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 			layoutTypes: () => {
 				translatorTrigger();
 				return [
-					{ id: Layout.NoPreview, name: i18n('SETTINGS_GENERAL/LABEL_LAYOUT_NO_SPLIT') },
-					{ id: Layout.SidePreview, name: i18n('SETTINGS_GENERAL/LABEL_LAYOUT_VERTICAL_SPLIT') },
-					{ id: Layout.BottomPreview, name: i18n('SETTINGS_GENERAL/LABEL_LAYOUT_HORIZONTAL_SPLIT') }
+					{ id: Layout.NoPreview, name: i18n('SETTINGS_GENERAL/LAYOUT_NO_SPLIT') },
+					{ id: Layout.SidePreview, name: i18n('SETTINGS_GENERAL/LAYOUT_VERTICAL_SPLIT') },
+					{ id: Layout.BottomPreview, name: i18n('SETTINGS_GENERAL/LAYOUT_HORIZONTAL_SPLIT') }
 				];
 			}
 		});
@@ -97,7 +97,8 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 		this.addSetting('MessagesPerPage');
 		this.addSetting('Layout');
 
-		this.addSettings(['ViewHTML', 'ShowImages', 'HideDeleted', 'UseCheckboxesInList', 'ReplySameFolder',
+		this.addSettings(['ViewHTML', 'ShowImages', 'HideDeleted', 'ListInlineAttachments',
+			'UseCheckboxesInList', 'ReplySameFolder',
 			'requestReadReceipt', 'requestDsn', 'pgpSign', 'pgpEncrypt',
 			'DesktopNotifications', 'SoundNotification']);
 

dev/Stores/User/Settings.js

@@ -19,6 +19,7 @@ export const SettingsUserStore = new class {
 			viewHTML: 1,
 			showImages: 0,
 			removeColors: 0,
+			listInlineAttachments: 0,
 			useCheckboxesInList: 1,
 			allowDraftAutosave: 1,
 			useThreads: 0,
@@ -78,6 +79,7 @@ export const SettingsUserStore = new class {
 		self.viewHTML(SettingsGet('ViewHTML'));
 		self.showImages(SettingsGet('ShowImages'));
 		self.removeColors(SettingsGet('RemoveColors'));
+		self.listInlineAttachments(SettingsGet('ListInlineAttachments'));
 		self.useCheckboxesInList(SettingsGet('UseCheckboxesInList'));
 		self.allowDraftAutosave(SettingsGet('AllowDraftAutosave'));
 		self.useThreads(SettingsGet('UseThreads'));

snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -720,6 +720,7 @@ class Actions
 			'ViewHTML' => (bool) $oConfig->Get('defaults', 'view_html', true),
 			'ShowImages' => (bool) $oConfig->Get('defaults', 'show_images', false),
 			'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false),
+			'ListInlineAttachments' => false,
 			'MessagesPerPage' => (int) $oConfig->Get('webmail', 'messages_per_page', 25),
 			'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5),
 			'MsgDefaultAction' => 1,
@@ -860,6 +861,7 @@ class Actions
 					$aResult['ViewHTML'] = (bool)$oSettings->GetConf('ViewHTML', $aResult['ViewHTML']);
 					$aResult['ShowImages'] = (bool)$oSettings->GetConf('ShowImages', $aResult['ShowImages']);
 					$aResult['RemoveColors'] = (bool)$oSettings->GetConf('RemoveColors', $aResult['RemoveColors']);
+					$aResult['ListInlineAttachments'] = (bool)$oSettings->GetConf('ListInlineAttachments', $aResult['ListInlineAttachments']);
 					$aResult['ContactsAutosave'] = (bool)$oSettings->GetConf('ContactsAutosave', $aResult['ContactsAutosave']);
 					$aResult['MessagesPerPage'] = (int)$oSettings->GetConf('MessagesPerPage', $aResult['MessagesPerPage']);
 					$aResult['MessageReadDelay'] = (int)$oSettings->GetConf('MessageReadDelay', $aResult['MessageReadDelay']);

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php

@@ -338,6 +338,7 @@ trait User
 		$this->setSettingsFromParams($oSettings, 'ViewHTML', 'bool');
 		$this->setSettingsFromParams($oSettings, 'ShowImages', 'bool');
 		$this->setSettingsFromParams($oSettings, 'RemoveColors', 'bool');
+		$this->setSettingsFromParams($oSettings, 'ListInlineAttachments', 'bool');
 		$this->setSettingsFromParams($oSettings, 'ContactsAutosave', 'bool');
 		$this->setSettingsFromParams($oSettings, 'DesktopNotifications', 'bool');
 		$this->setSettingsFromParams($oSettings, 'SoundNotification', 'bool');

snappymail/v/0.0.0/app/localization/ar-SA/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "أجاب"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "إعداد افتراضي لوضع ملء الشاشة",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "أغلق (Esc)",
-		"GALLERY_PREV": "السابق( السهم اليسار)",
-		"GALLERY_NEXT": "اليمين(السهم اليميني)",
-		"GALLERY_COUNTER": "%curr% of %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "إنشاء",
 		"BUTTON_NEW_MESSAGE": "New message",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "عام",
-		"LABEL_LANGUAGE": "اللغة",
-		"LABEL_IDENTITY": "الهوية",
-		"LABEL_LAYOUT": "التصميم",
-		"LABEL_LAYOUT_NO_SPLIT": "بدون إنقسام",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "إنقسام عمودي",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "إنقسام أفقي",
-		"LABEL_EDITOR": "المحرر النصي الأساسي",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "عادي",
-		"LABEL_VIEW_OPTIONS": "إظهار الخيارات",
-		"LABEL_USE_PREVIEW_PANE": "استخدام جزئية العرض الجانبي",
+		"LANGUAGE": "اللغة",
+		"IDENTITY": "الهوية",
+		"LAYOUT": "التصميم",
+		"LAYOUT_NO_SPLIT": "بدون إنقسام",
+		"LAYOUT_VERTICAL_SPLIT": "إنقسام عمودي",
+		"LAYOUT_HORIZONTAL_SPLIT": "إنقسام أفقي",
+		"EDITOR": "المحرر النصي الأساسي",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "عادي",
+		"VIEW_OPTIONS": "إظهار الخيارات",
+		"USE_PREVIEW_PANE": "استخدام جزئية العرض الجانبي",
 		"HIDE_DELETED_MESSAGES": "إخفاء الرسائل المحددة للحذف",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "عرض مربعات التحديد في القائمة",
-		"LABEL_USE_THREADS": "إستخدام المواضيع",
-		"LABEL_REPLY_SAME_FOLDER": "ضع الردود في مجلد الرسالة التي يتم الرد عليها",
-		"LABEL_SHOW_IMAGES": "قم دائماَ بعرض الصور القادمة في الرسالة",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "الرسائل في الصفحة",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "عرض مربعات التحديد في القائمة",
+		"USE_THREADS": "إستخدام المواضيع",
+		"REPLY_SAME_FOLDER": "ضع الردود في مجلد الرسالة التي يتم الرد عليها",
+		"SHOW_IMAGES": "قم دائماَ بعرض الصور القادمة في الرسالة",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "الرسائل في الصفحة",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "التنبيهات",
-		"LABEL_SOUND_NOTIFICATION": "صوت التنبيهات",
-		"LABEL_CHROME_NOTIFICATION_DESC": "إظهار نافذة منبثقة في حالة قدوم ايميل جديد",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(تم إعتراضها من قبل المتصفح)"
+		"NOTIFICATIONS": "التنبيهات",
+		"SOUND_NOTIFICATION": "صوت التنبيهات",
+		"CHROME_NOTIFICATION_DESC": "إظهار نافذة منبثقة في حالة قدوم ايميل جديد",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(تم إعتراضها من قبل المتصفح)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "قم باضافة المستلمين تلقائيا الى دفتر العناوين",

snappymail/v/0.0.0/app/localization/bg-BG/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Отговорено"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "На цял екран",
-		"ZOOM": "Приближи\/отдалечи",
-		"CLOSE": "Затваряне (Esc)",
-		"GALLERY_PREV": "Предишно (Бутон лява стрелка)",
-		"GALLERY_NEXT": "Следващо (Бутон дясна стрелка)",
-		"GALLERY_COUNTER": "%curr% от %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Създай",
 		"BUTTON_NEW_MESSAGE": "Ново съобщение",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Общи",
-		"LABEL_LANGUAGE": "Език",
-		"LABEL_IDENTITY": "Идентичност",
-		"LABEL_LAYOUT": "Стил",
-		"LABEL_LAYOUT_NO_SPLIT": "Не разделяй",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Вертикално разделяне",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Хоризонтално разделяне",
-		"LABEL_EDITOR": "Текстов редактор по подразбиране",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Чист текст",
-		"LABEL_VIEW_OPTIONS": "Настройки на изгледа",
-		"LABEL_USE_PREVIEW_PANE": "Използвай поле за преглед",
+		"LANGUAGE": "Език",
+		"IDENTITY": "Идентичност",
+		"LAYOUT": "Стил",
+		"LAYOUT_NO_SPLIT": "Не разделяй",
+		"LAYOUT_VERTICAL_SPLIT": "Вертикално разделяне",
+		"LAYOUT_HORIZONTAL_SPLIT": "Хоризонтално разделяне",
+		"EDITOR": "Текстов редактор по подразбиране",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Чист текст",
+		"VIEW_OPTIONS": "Настройки на изгледа",
+		"USE_PREVIEW_PANE": "Използвай поле за преглед",
 		"HIDE_DELETED_MESSAGES": "Скриване на съобщенията, маркирани за изтриване",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Показавай отметките в списъка",
-		"LABEL_USE_THREADS": "Използвай групиране на съобщенията",
-		"LABEL_REPLY_SAME_FOLDER": "Постави отговорите с папката на отговаряното съобщение",
-		"LABEL_SHOW_IMAGES": "Винаги показвай външни картинки в текста на съобщението",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Съобщения на страница",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Показавай отметките в списъка",
+		"USE_THREADS": "Използвай групиране на съобщенията",
+		"REPLY_SAME_FOLDER": "Постави отговорите с папката на отговаряното съобщение",
+		"SHOW_IMAGES": "Винаги показвай външни картинки в текста на съобщението",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Съобщения на страница",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Известия",
-		"LABEL_SOUND_NOTIFICATION": "Звуково известяване",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Покажи известие при ново съобщение",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Блокирано от браузъра)"
+		"NOTIFICATIONS": "Известия",
+		"SOUND_NOTIFICATION": "Звуково известяване",
+		"CHROME_NOTIFICATION_DESC": "Покажи известие при ново съобщение",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Блокирано от браузъра)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматично добавяне на получателите към адресната ви книга",

snappymail/v/0.0.0/app/localization/cs-CZ/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Odpovězeno"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Celá obrazovka",
-		"ZOOM": "Zvětšit\/zmenšit",
-		"CLOSE": "Zavřít (Esc)",
-		"GALLERY_PREV": "Předchozí",
-		"GALLERY_NEXT": "Další",
-		"GALLERY_COUNTER": "%curr% z %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Vytvořit",
 		"BUTTON_NEW_MESSAGE": "Nová zpráva",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Všeobecné",
-		"LABEL_LANGUAGE": "Jazyk",
-		"LABEL_IDENTITY": "Uživatel",
-		"LABEL_LAYOUT": "Rozložení",
-		"LABEL_LAYOUT_NO_SPLIT": "Nerozdělovat",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertikální rozdělení",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontální rozdělení",
-		"LABEL_EDITOR": "Přednastavený editor zpráv",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Text",
-		"LABEL_VIEW_OPTIONS": "Možnosti zobrazení",
-		"LABEL_USE_PREVIEW_PANE": "Používáte panel rychlého zobrazení",
+		"LANGUAGE": "Jazyk",
+		"IDENTITY": "Uživatel",
+		"LAYOUT": "Rozložení",
+		"LAYOUT_NO_SPLIT": "Nerozdělovat",
+		"LAYOUT_VERTICAL_SPLIT": "Vertikální rozdělení",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontální rozdělení",
+		"EDITOR": "Přednastavený editor zpráv",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Text",
+		"VIEW_OPTIONS": "Možnosti zobrazení",
+		"USE_PREVIEW_PANE": "Používáte panel rychlého zobrazení",
 		"HIDE_DELETED_MESSAGES": "Skrýt zprávy označené ke smazání",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Zobrazení zaškrtávacích políček v seznamu",
-		"LABEL_USE_THREADS": "Zobrazit jako konverzace",
-		"LABEL_REPLY_SAME_FOLDER": "Ukládat odpovědi do složky se zprávou, které se týkají",
-		"LABEL_SHOW_IMAGES": "Vždy zobrazovat obrázky v těle zprávy",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Zpráv na stranu",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Zobrazení zaškrtávacích políček v seznamu",
+		"USE_THREADS": "Zobrazit jako konverzace",
+		"REPLY_SAME_FOLDER": "Ukládat odpovědi do složky se zprávou, které se týkají",
+		"SHOW_IMAGES": "Vždy zobrazovat obrázky v těle zprávy",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Zpráv na stranu",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifikace",
-		"LABEL_SOUND_NOTIFICATION": "Zvukové notifikace",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Zobrazovat upozornění na nové zprávy",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prohlížečem)"
+		"NOTIFICATIONS": "Notifikace",
+		"SOUND_NOTIFICATION": "Zvukové notifikace",
+		"CHROME_NOTIFICATION_DESC": "Zobrazovat upozornění na nové zprávy",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prohlížečem)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automaticky přidávat adresy příjemců do Adresáře",

snappymail/v/0.0.0/app/localization/da-DK/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Besvarede"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Fuld skærm",
-		"ZOOM": "Zoom ind\/ud",
-		"CLOSE": "Luk (Esc)",
-		"GALLERY_PREV": "Forrige (venstrepil)",
-		"GALLERY_NEXT": "Næste (højrepil)",
-		"GALLERY_COUNTER": "%curr% af %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Forfat",
 		"BUTTON_NEW_MESSAGE": "Ny meddelelse",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Generelt",
-		"LABEL_LANGUAGE": "Sprog",
-		"LABEL_IDENTITY": "Identitet",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "Del ikke",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Del lodret",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Del vandret",
-		"LABEL_EDITOR": "Standard tekst program",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Plain",
-		"LABEL_VIEW_OPTIONS": "Visningsindstillinger",
-		"LABEL_USE_PREVIEW_PANE": "Brug preview panel",
+		"LANGUAGE": "Sprog",
+		"IDENTITY": "Identitet",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "Del ikke",
+		"LAYOUT_VERTICAL_SPLIT": "Del lodret",
+		"LAYOUT_HORIZONTAL_SPLIT": "Del vandret",
+		"EDITOR": "Standard tekst program",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Plain",
+		"VIEW_OPTIONS": "Visningsindstillinger",
+		"USE_PREVIEW_PANE": "Brug preview panel",
 		"HIDE_DELETED_MESSAGES": "Skjul beskeder, der er markeret til sletning",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Vis afkrydsningsfelt i oversigten",
-		"LABEL_USE_THREADS": "Brug samtaler",
-		"LABEL_REPLY_SAME_FOLDER": "Placer svar i samme mappe som oprindelig meddelelse",
-		"LABEL_SHOW_IMAGES": "Vis altid eksterne billeder",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Meddelelser per side",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Vis afkrydsningsfelt i oversigten",
+		"USE_THREADS": "Brug samtaler",
+		"REPLY_SAME_FOLDER": "Placer svar i samme mappe som oprindelig meddelelse",
+		"SHOW_IMAGES": "Vis altid eksterne billeder",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Meddelelser per side",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifikationer",
-		"LABEL_SOUND_NOTIFICATION": "Lyd notifikationer",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Vis ny meddelelses notifikations popup",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Blokeret af browseren)"
+		"NOTIFICATIONS": "Notifikationer",
+		"SOUND_NOTIFICATION": "Lyd notifikationer",
+		"CHROME_NOTIFICATION_DESC": "Vis ny meddelelses notifikations popup",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Blokeret af browseren)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Tilføj automatisk modtager til adressebog",

snappymail/v/0.0.0/app/localization/de-DE/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Antwortete"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Vollbild umschalten",
-		"ZOOM": "Rein-\/Rauszoomen",
-		"CLOSE": "Schließen (Esc)",
-		"GALLERY_PREV": "Zurück (Linke Pfeil-Taste)",
-		"GALLERY_NEXT": "Weiter (Rechte Pfeil-Taste)",
-		"GALLERY_COUNTER": "%curr% von %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Erstellen",
 		"BUTTON_NEW_MESSAGE": "Neue Nachricht",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Allgemein",
-		"LABEL_LANGUAGE": "Sprache",
-		"LABEL_IDENTITY": "Identität",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "Keine Aufteilung",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertikale Aufteilung",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontale Aufteilung",
-		"LABEL_EDITOR": "Standard-Texteditor",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Unformatierter Text",
-		"LABEL_VIEW_OPTIONS": "Optionen anzeigen",
-		"LABEL_USE_PREVIEW_PANE": "Vorschaufenster nutzen",
+		"LANGUAGE": "Sprache",
+		"IDENTITY": "Identität",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "Keine Aufteilung",
+		"LAYOUT_VERTICAL_SPLIT": "Vertikale Aufteilung",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontale Aufteilung",
+		"EDITOR": "Standard-Texteditor",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Unformatierter Text",
+		"VIEW_OPTIONS": "Optionen anzeigen",
+		"USE_PREVIEW_PANE": "Vorschaufenster nutzen",
 		"HIDE_DELETED_MESSAGES": "Zum Löschen markierte Nachrichten ausblenden",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Kontrollkästchen in der Liste anzeigen",
-		"LABEL_USE_THREADS": "Als Unterhaltungen anzeigen",
-		"LABEL_REPLY_SAME_FOLDER": "Antworten im gleichen Ordner wie die Nachricht, auf die geantwortet wurde, abspeichern",
-		"LABEL_SHOW_IMAGES": "In der Nachricht enthaltene Bilder immer anzeigen",
-		"LABEL_PREFER_HTML": "HTML gegenüber Klartext bevorzugen",
-		"LABEL_PREFER_HTML_INFO": "Nachrichten können manchmal in beiden Formaten empfangen werden. Diese Option setzt, ob die Nachricht standardmäßig in HTML oder als Klartext angezeigt wird.",
-		"LABEL_REMOVE_COLORS": "Entferne Hintergrund- und Textfarben aus der Nachricht",
-		"LABEL_MESSAGE_PER_PAGE": "Nachrichten pro Seite",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Nachricht als gelesen markieren nach",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Kontrollkästchen in der Liste anzeigen",
+		"USE_THREADS": "Als Unterhaltungen anzeigen",
+		"REPLY_SAME_FOLDER": "Antworten im gleichen Ordner wie die Nachricht, auf die geantwortet wurde, abspeichern",
+		"SHOW_IMAGES": "In der Nachricht enthaltene Bilder immer anzeigen",
+		"PREFER_HTML": "HTML gegenüber Klartext bevorzugen",
+		"PREFER_HTML_INFO": "Nachrichten können manchmal in beiden Formaten empfangen werden. Diese Option setzt, ob die Nachricht standardmäßig in HTML oder als Klartext angezeigt wird.",
+		"REMOVE_COLORS": "Entferne Hintergrund- und Textfarben aus der Nachricht",
+		"MESSAGE_PER_PAGE": "Nachrichten pro Seite",
+		"MARK_MESSAGE_READ_AFTER": "Nachricht als gelesen markieren nach",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "Sekunden",
-		"LABEL_NOTIFICATIONS": "Benachrichtigungen",
-		"LABEL_SOUND_NOTIFICATION": "Benachrichtigungston",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Popups einblenden, wenn neue Nachrichten vorhanden sind",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Vom Browser blockiert.)"
+		"NOTIFICATIONS": "Benachrichtigungen",
+		"SOUND_NOTIFICATION": "Benachrichtigungston",
+		"CHROME_NOTIFICATION_DESC": "Popups einblenden, wenn neue Nachrichten vorhanden sind",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Vom Browser blockiert.)",
+		"LIST_INLINE_ATTACHMENTS": "Inline-Anhänge in der Liste anzeigen"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Empfänger automatisch zu Ihrem Adressbuch hinzuzufügen",

snappymail/v/0.0.0/app/localization/el-GR/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Απάντησε"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Ενναλαγή πλήρους οθόνης",
-		"ZOOM": "Μεγέθυνση\/Σμίκρυνση",
-		"CLOSE": "Κλείσιμο (Esc)",
-		"GALLERY_PREV": "Προηγούμενο (αριστερό βέλος)",
-		"GALLERY_NEXT": "Επόμενο (δεξί βέλος)",
-		"GALLERY_COUNTER": "%curr% από %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Νέο μήνυμα",
 		"BUTTON_NEW_MESSAGE": "New message",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Γενικό",
-		"LABEL_LANGUAGE": "Γλώσσα",
-		"LABEL_IDENTITY": "Ταυτότητα",
-		"LABEL_LAYOUT": "Σχέδιο",
-		"LABEL_LAYOUT_NO_SPLIT": "Χωρίς χώρισμα",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Κάθετο χώρισμα",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Οριζόντιο χώρισμα",
-		"LABEL_EDITOR": "Προεπιλεγμένος συντάκτης κειμένου",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Απλό",
-		"LABEL_VIEW_OPTIONS": "Επιλογές προβολής",
-		"LABEL_USE_PREVIEW_PANE": "Χρήση προεπισκόπησης ",
+		"LANGUAGE": "Γλώσσα",
+		"IDENTITY": "Ταυτότητα",
+		"LAYOUT": "Σχέδιο",
+		"LAYOUT_NO_SPLIT": "Χωρίς χώρισμα",
+		"LAYOUT_VERTICAL_SPLIT": "Κάθετο χώρισμα",
+		"LAYOUT_HORIZONTAL_SPLIT": "Οριζόντιο χώρισμα",
+		"EDITOR": "Προεπιλεγμένος συντάκτης κειμένου",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Απλό",
+		"VIEW_OPTIONS": "Επιλογές προβολής",
+		"USE_PREVIEW_PANE": "Χρήση προεπισκόπησης ",
 		"HIDE_DELETED_MESSAGES": "Απόκρυψη μηνυμάτων που έχουν επισημανθεί για διαγραφή",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Εμφάνιση των κουτιών επιλογής σε λίστα",
-		"LABEL_USE_THREADS": "Χρήση νημάτων",
-		"LABEL_REPLY_SAME_FOLDER": "Τοποθέτηση απαντήσεων στο φάκελο που ανήκει το μήνυμα που απαντάται",
-		"LABEL_SHOW_IMAGES": "Να εμφανίζονται πάντα οι εξωτερικές εικόνες στο σώμα του μηνύματος",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Μηνύματα στη σελίδα",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Εμφάνιση των κουτιών επιλογής σε λίστα",
+		"USE_THREADS": "Χρήση νημάτων",
+		"REPLY_SAME_FOLDER": "Τοποθέτηση απαντήσεων στο φάκελο που ανήκει το μήνυμα που απαντάται",
+		"SHOW_IMAGES": "Να εμφανίζονται πάντα οι εξωτερικές εικόνες στο σώμα του μηνύματος",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Μηνύματα στη σελίδα",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Επισημάνσεις",
-		"LABEL_SOUND_NOTIFICATION": "Ηχητική επισήμανση",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Να εμφανίζονται τα νέα μηνύματα σε αναδυόμενες επισημάνσεις",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Αποκλείστηκε από το φυλλομετρητή)"
+		"NOTIFICATIONS": "Επισημάνσεις",
+		"SOUND_NOTIFICATION": "Ηχητική επισήμανση",
+		"CHROME_NOTIFICATION_DESC": "Να εμφανίζονται τα νέα μηνύματα σε αναδυόμενες επισημάνσεις",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Αποκλείστηκε από το φυλλομετρητή)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Αυτόματη προσθήκη επαφών στον κατάλογο διευθύνσεων",

snappymail/v/0.0.0/app/localization/en-GB/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Answered"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "Close (Esc)",
-		"GALLERY_PREV": "Previous (arrow left)",
-		"GALLERY_NEXT": "Next (arrow right)",
-		"GALLERY_COUNTER": "%curr% of %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Compose",
 		"BUTTON_NEW_MESSAGE": "New message",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "General",
-		"LABEL_LANGUAGE": "Language",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Default text editor",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Plain",
-		"LABEL_VIEW_OPTIONS": "View options",
-		"LABEL_USE_PREVIEW_PANE": "Use preview pane",
+		"LANGUAGE": "Language",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"EDITOR": "Default text editor",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Plain",
+		"VIEW_OPTIONS": "View options",
+		"USE_PREVIEW_PANE": "Use preview pane",
 		"HIDE_DELETED_MESSAGES": "Hide messages marked for deletion",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Display checkboxes in list",
-		"LABEL_USE_THREADS": "Use threads",
-		"LABEL_REPLY_SAME_FOLDER": "Place replies in the folder of the message being replied to",
-		"LABEL_SHOW_IMAGES": "Always display external images in message body",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Messages on page",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Display checkboxes in list",
+		"USE_THREADS": "Use threads",
+		"REPLY_SAME_FOLDER": "Place replies in the folder of the message being replied to",
+		"SHOW_IMAGES": "Always display external images in message body",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Messages on page",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifications",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Show new messages notification popups",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)"
+		"NOTIFICATIONS": "Notifications",
+		"SOUND_NOTIFICATION": "Sound notification",
+		"CHROME_NOTIFICATION_DESC": "Show new messages notification popups",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book",

snappymail/v/0.0.0/app/localization/en/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Answered"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "Close (Esc)",
-		"GALLERY_PREV": "Previous (arrow left)",
-		"GALLERY_NEXT": "Next (arrow right)",
-		"GALLERY_COUNTER": "%curr% of %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Compose",
 		"BUTTON_NEW_MESSAGE": "New message",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "General",
-		"LABEL_LANGUAGE": "Language",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Default text editor",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Plain",
-		"LABEL_VIEW_OPTIONS": "View options",
-		"LABEL_USE_PREVIEW_PANE": "Use preview pane",
+		"LANGUAGE": "Language",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"EDITOR": "Default text editor",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Plain",
+		"VIEW_OPTIONS": "View options",
+		"USE_PREVIEW_PANE": "Use preview pane",
 		"HIDE_DELETED_MESSAGES": "Hide messages marked for deletion",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Display checkboxes in list",
-		"LABEL_USE_THREADS": "Use threads",
-		"LABEL_REPLY_SAME_FOLDER": "Place replies in the folder of the message being replied to",
-		"LABEL_SHOW_IMAGES": "Always display external images in message body",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Messages on page",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Display checkboxes in list",
+		"USE_THREADS": "Use threads",
+		"REPLY_SAME_FOLDER": "Place replies in the folder of the message being replied to",
+		"SHOW_IMAGES": "Always display external images in message body",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Messages on page",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifications",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Show new messages notification popups",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)"
+		"NOTIFICATIONS": "Notifications",
+		"SOUND_NOTIFICATION": "Sound notification",
+		"CHROME_NOTIFICATION_DESC": "Show new messages notification popups",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book",

snappymail/v/0.0.0/app/localization/es-ES/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Contestada"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Cambiar a pantalla completa",
-		"ZOOM": "Acercar \/ Alejar",
-		"CLOSE": "Cerrar (Esc)",
-		"GALLERY_PREV": "Anterior (Flecha Izquierda)",
-		"GALLERY_NEXT": "Siguiente (Flecha Derecha)",
-		"GALLERY_COUNTER": "%curr% de %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Redactar",
 		"BUTTON_NEW_MESSAGE": "Nuevo mensaje",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "General",
-		"LABEL_LANGUAGE": "Idioma",
-		"LABEL_IDENTITY": "Identidad",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "Sin División",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "División Vertical",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "División Horizontal",
-		"LABEL_EDITOR": "Editor de texto predeterminado",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Texto plano",
-		"LABEL_VIEW_OPTIONS": "Ver opciones",
-		"LABEL_USE_PREVIEW_PANE": "Utilice el panel de vista previa",
+		"LANGUAGE": "Idioma",
+		"IDENTITY": "Identidad",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "Sin División",
+		"LAYOUT_VERTICAL_SPLIT": "División Vertical",
+		"LAYOUT_HORIZONTAL_SPLIT": "División Horizontal",
+		"EDITOR": "Editor de texto predeterminado",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Texto plano",
+		"VIEW_OPTIONS": "Ver opciones",
+		"USE_PREVIEW_PANE": "Utilice el panel de vista previa",
 		"HIDE_DELETED_MESSAGES": "Ocultar mensajes marcados para borrar",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Mostrar casillas de verificación en la lista",
-		"LABEL_USE_THREADS": "Usar hilos de conversación",
-		"LABEL_REPLY_SAME_FOLDER": "Coloque las respuestas en la carpeta del mensaje que esta respondiendo.",
-		"LABEL_SHOW_IMAGES": "Mostrar siempre las imágenes en el cuerpo del mensaje",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Eliminar el fondo y los colores del texto del mensaje",
-		"LABEL_MESSAGE_PER_PAGE": "Mensajes en página",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Marcar el mensaje como leído después de",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Mostrar casillas de verificación en la lista",
+		"USE_THREADS": "Usar hilos de conversación",
+		"REPLY_SAME_FOLDER": "Coloque las respuestas en la carpeta del mensaje que esta respondiendo.",
+		"SHOW_IMAGES": "Mostrar siempre las imágenes en el cuerpo del mensaje",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Eliminar el fondo y los colores del texto del mensaje",
+		"MESSAGE_PER_PAGE": "Mensajes en página",
+		"MARK_MESSAGE_READ_AFTER": "Marcar el mensaje como leído después de",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "segundos",
-		"LABEL_NOTIFICATIONS": "Notificaciones",
-		"LABEL_SOUND_NOTIFICATION": "Sonido de la notificación",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Mostrar notificación de nuevos mensajes en Popup",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado por el explorador)"
+		"NOTIFICATIONS": "Notificaciones",
+		"SOUND_NOTIFICATION": "Sonido de la notificación",
+		"CHROME_NOTIFICATION_DESC": "Mostrar notificación de nuevos mensajes en Popup",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado por el explorador)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Agregar automáticamente destinatarios a la libreta de direcciones",

snappymail/v/0.0.0/app/localization/et-EE/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Vastatud"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Täisekraan sisse\/välja",
-		"ZOOM": "Suurenda\/vähenda",
-		"CLOSE": "Sulge (Esc)",
-		"GALLERY_PREV": "Eelmine (nool vasakule)",
-		"GALLERY_NEXT": "Järgmine (nool paremale)",
-		"GALLERY_COUNTER": "%curr%. %total%-st"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Koosta uus kiri",
 		"BUTTON_NEW_MESSAGE": "Uus kiri",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Üldine",
-		"LABEL_LANGUAGE": "Keel",
-		"LABEL_IDENTITY": "Identiteet",
-		"LABEL_LAYOUT": "Vaade",
-		"LABEL_LAYOUT_NO_SPLIT": "Jaotuseta",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertikaalse jaotusega",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horisontaalse jaotusega",
-		"LABEL_EDITOR": "Vaikimisi tekstiredaktor",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Lihttekst",
-		"LABEL_VIEW_OPTIONS": "Vaate seaded",
-		"LABEL_USE_PREVIEW_PANE": "Kasuta eelvaadet",
+		"LANGUAGE": "Keel",
+		"IDENTITY": "Identiteet",
+		"LAYOUT": "Vaade",
+		"LAYOUT_NO_SPLIT": "Jaotuseta",
+		"LAYOUT_VERTICAL_SPLIT": "Vertikaalse jaotusega",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horisontaalse jaotusega",
+		"EDITOR": "Vaikimisi tekstiredaktor",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Lihttekst",
+		"VIEW_OPTIONS": "Vaate seaded",
+		"USE_PREVIEW_PANE": "Kasuta eelvaadet",
 		"HIDE_DELETED_MESSAGES": "Peida kustutamiseks märgitud kirjad",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Kuva nimekirjas valikukastikesi",
-		"LABEL_USE_THREADS": "Kasuta vestluse lõimesid",
-		"LABEL_REPLY_SAME_FOLDER": "Pane vastused samasse kausta, kus asub vastatud kiri",
-		"LABEL_SHOW_IMAGES": "Näita alati kirja sisus viidatud väliseid pilte",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Lehel kuvatavate kirjade arv",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Kuva nimekirjas valikukastikesi",
+		"USE_THREADS": "Kasuta vestluse lõimesid",
+		"REPLY_SAME_FOLDER": "Pane vastused samasse kausta, kus asub vastatud kiri",
+		"SHOW_IMAGES": "Näita alati kirja sisus viidatud väliseid pilte",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Lehel kuvatavate kirjade arv",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Teavitused",
-		"LABEL_SOUND_NOTIFICATION": "Teavitused heliga",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Näita uute kirjade teavitust hüpikaknaga",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Veebilehitseja poolt blokeeritud)"
+		"NOTIFICATIONS": "Teavitused",
+		"SOUND_NOTIFICATION": "Teavitused heliga",
+		"CHROME_NOTIFICATION_DESC": "Näita uute kirjade teavitust hüpikaknaga",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Veebilehitseja poolt blokeeritud)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Lisa saajad automaatselt aadressiraamatusse",

snappymail/v/0.0.0/app/localization/fa-IR/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "جواب داد"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "ضامن تمام صفحه",
-		"ZOOM": "بزرگنمایی داخل\/بیرون",
-		"CLOSE": "بستن (Esc)",
-		"GALLERY_PREV": "قبلی (جهت چپ)",
-		"GALLERY_NEXT": "بعدی (جهت راست)",
-		"GALLERY_COUNTER": "%curr% از %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "ایجاد",
 		"BUTTON_NEW_MESSAGE": "پیام جدید",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "عمومی",
-		"LABEL_LANGUAGE": "زبان",
-		"LABEL_IDENTITY": "شناسه",
-		"LABEL_LAYOUT": "لایه",
-		"LABEL_LAYOUT_NO_SPLIT": "بدون تقسیم",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "تقسیم عمودی",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "تقسیم افقی",
-		"LABEL_EDITOR": "ویرایشگر پیش‌فرض",
-		"LABEL_EDITOR_HTML": "تحت فرمت Html",
-		"LABEL_EDITOR_PLAIN": "ساده",
-		"LABEL_VIEW_OPTIONS": "مشاهده گزینه‌ها",
-		"LABEL_USE_PREVIEW_PANE": "استفاده از پنجره پیش‌نمایش",
+		"LANGUAGE": "زبان",
+		"IDENTITY": "شناسه",
+		"LAYOUT": "لایه",
+		"LAYOUT_NO_SPLIT": "بدون تقسیم",
+		"LAYOUT_VERTICAL_SPLIT": "تقسیم عمودی",
+		"LAYOUT_HORIZONTAL_SPLIT": "تقسیم افقی",
+		"EDITOR": "ویرایشگر پیش‌فرض",
+		"EDITOR_HTML": "تحت فرمت Html",
+		"EDITOR_PLAIN": "ساده",
+		"VIEW_OPTIONS": "مشاهده گزینه‌ها",
+		"USE_PREVIEW_PANE": "استفاده از پنجره پیش‌نمایش",
 		"HIDE_DELETED_MESSAGES": "پنهان کردن پیام های علامت گذاری شده برای حذف",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "نمایش چک‌باکس در لیست",
-		"LABEL_USE_THREADS": "استفاده از حالت موضوعی",
-		"LABEL_REPLY_SAME_FOLDER": " جوابها را در پوشه‌ای که پیامها در آن جواب داده شده است قراردهید",
-		"LABEL_SHOW_IMAGES": "همیشه تصاویر بیرونی را در بدنه پیام‌ها نشان بده",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "پیام‌ها در صفحه",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "نمایش چک‌باکس در لیست",
+		"USE_THREADS": "استفاده از حالت موضوعی",
+		"REPLY_SAME_FOLDER": " جوابها را در پوشه‌ای که پیامها در آن جواب داده شده است قراردهید",
+		"SHOW_IMAGES": "همیشه تصاویر بیرونی را در بدنه پیام‌ها نشان بده",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "پیام‌ها در صفحه",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "اطلاعیه‌ها",
-		"LABEL_SOUND_NOTIFICATION": "آگاه‌سازی با صدا",
-		"LABEL_CHROME_NOTIFICATION_DESC": "پنجره اعلان دریافت پیام جدید را نمایش بده",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(مسدود شده توسط مرورگر)"
+		"NOTIFICATIONS": "اطلاعیه‌ها",
+		"SOUND_NOTIFICATION": "آگاه‌سازی با صدا",
+		"CHROME_NOTIFICATION_DESC": "پنجره اعلان دریافت پیام جدید را نمایش بده",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(مسدود شده توسط مرورگر)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "اطلاعات تماس گیرندگان را بصورت خودکار در آدرس‌بوک ذخیره کن",

snappymail/v/0.0.0/app/localization/fi-FI/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Vastattu"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Koko ruutu",
-		"ZOOM": "Zoomaa",
-		"CLOSE": "Sulje (Esc)",
-		"GALLERY_PREV": "Edellinen (nuoli vasemmalle)",
-		"GALLERY_NEXT": "Seuraava (nuoli oikealle)",
-		"GALLERY_COUNTER": "%curr% %total% sta"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Luo",
 		"BUTTON_NEW_MESSAGE": "Uusi viesti",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Yleiset",
-		"LABEL_LANGUAGE": "Kieli",
-		"LABEL_IDENTITY": "Identiteetti",
-		"LABEL_LAYOUT": "Asettelu",
-		"LABEL_LAYOUT_NO_SPLIT": "Ei jakoa",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Pystysuora jako",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Vaakataso jako",
-		"LABEL_EDITOR": "Oletus tekstieditori",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Pelkkä teksti",
-		"LABEL_VIEW_OPTIONS": "Näyttö-valinnat",
-		"LABEL_USE_PREVIEW_PANE": "Käytä esikatselua",
+		"LANGUAGE": "Kieli",
+		"IDENTITY": "Identiteetti",
+		"LAYOUT": "Asettelu",
+		"LAYOUT_NO_SPLIT": "Ei jakoa",
+		"LAYOUT_VERTICAL_SPLIT": "Pystysuora jako",
+		"LAYOUT_HORIZONTAL_SPLIT": "Vaakataso jako",
+		"EDITOR": "Oletus tekstieditori",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Pelkkä teksti",
+		"VIEW_OPTIONS": "Näyttö-valinnat",
+		"USE_PREVIEW_PANE": "Käytä esikatselua",
 		"HIDE_DELETED_MESSAGES": "Piilota poistettavaksi merkityt viestit",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Näytä valintaruudut listassa",
-		"LABEL_USE_THREADS": "Käytä keskustelunäkymää",
-		"LABEL_REPLY_SAME_FOLDER": "Siirrä vastaukset samaan kansioon vastattavien kanssa",
-		"LABEL_SHOW_IMAGES": "Näytä aina ulkopuoliset kuvat viestissä",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Viestiä sivulla",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Näytä valintaruudut listassa",
+		"USE_THREADS": "Käytä keskustelunäkymää",
+		"REPLY_SAME_FOLDER": "Siirrä vastaukset samaan kansioon vastattavien kanssa",
+		"SHOW_IMAGES": "Näytä aina ulkopuoliset kuvat viestissä",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Viestiä sivulla",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Ilmoitukset",
-		"LABEL_SOUND_NOTIFICATION": "Äänimerkit",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Näytä uusien viestien ponnahdusikkuna",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Estetty selaimessa)"
+		"NOTIFICATIONS": "Ilmoitukset",
+		"SOUND_NOTIFICATION": "Äänimerkit",
+		"CHROME_NOTIFICATION_DESC": "Näytä uusien viestien ponnahdusikkuna",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Estetty selaimessa)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Lisää yhetystieto automaattisesti osoitekirjaan",

snappymail/v/0.0.0/app/localization/fr-FR/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Répondu"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Basculer en plein écran",
-		"ZOOM": "Zoom Avant\/Arrière",
-		"CLOSE": "Fermer (Esc)",
-		"GALLERY_PREV": "Précédent (flèche gauche)",
-		"GALLERY_NEXT": "Suivant (flèche droite)",
-		"GALLERY_COUNTER": "%curr% de %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Nouveau message",
 		"BUTTON_NEW_MESSAGE": "Nouveau message",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Général",
-		"LABEL_LANGUAGE": "Langue",
-		"LABEL_IDENTITY": "Identité",
-		"LABEL_LAYOUT": "Disposition",
-		"LABEL_LAYOUT_NO_SPLIT": "Pas de séparation",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Séparation verticale",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Séparation horizontale",
-		"LABEL_EDITOR": "Éditeur de texte par défaut",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Non-formaté",
-		"LABEL_VIEW_OPTIONS": "Voir les options",
-		"LABEL_USE_PREVIEW_PANE": "Utiliser le panneau de prévisualisation",
+		"LANGUAGE": "Langue",
+		"IDENTITY": "Identité",
+		"LAYOUT": "Disposition",
+		"LAYOUT_NO_SPLIT": "Pas de séparation",
+		"LAYOUT_VERTICAL_SPLIT": "Séparation verticale",
+		"LAYOUT_HORIZONTAL_SPLIT": "Séparation horizontale",
+		"EDITOR": "Éditeur de texte par défaut",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Non-formaté",
+		"VIEW_OPTIONS": "Voir les options",
+		"USE_PREVIEW_PANE": "Utiliser le panneau de prévisualisation",
 		"HIDE_DELETED_MESSAGES": "Masquer les messages marqués pour suppression",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Afficher des cases à cocher dans la liste",
-		"LABEL_USE_THREADS": "Regrouper en conversations",
-		"LABEL_REPLY_SAME_FOLDER": "Placer les réponses dans le dossier du message",
-		"LABEL_SHOW_IMAGES": "Toujours afficher les images dans le mail",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Supprimer les couleurs d'arrière-plan et de texte du message",
-		"LABEL_MESSAGE_PER_PAGE": "Messages par page",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Marquer le message comme lu après",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Afficher des cases à cocher dans la liste",
+		"USE_THREADS": "Regrouper en conversations",
+		"REPLY_SAME_FOLDER": "Placer les réponses dans le dossier du message",
+		"SHOW_IMAGES": "Toujours afficher les images dans le mail",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Supprimer les couleurs d'arrière-plan et de texte du message",
+		"MESSAGE_PER_PAGE": "Messages par page",
+		"MARK_MESSAGE_READ_AFTER": "Marquer le message comme lu après",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "secondes",
-		"LABEL_NOTIFICATIONS": "Notifications",
-		"LABEL_SOUND_NOTIFICATION": "Son de notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Afficher un pop-up de notification pour les nouveaux messages",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Bloqué par le navigateur)"
+		"NOTIFICATIONS": "Notifications",
+		"SOUND_NOTIFICATION": "Son de notification",
+		"CHROME_NOTIFICATION_DESC": "Afficher un pop-up de notification pour les nouveaux messages",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqué par le navigateur)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Ajouter automatiquement les destinataires à votre carnet d'adresses",

snappymail/v/0.0.0/app/localization/hu-HU/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Válaszolt"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Teljes képernyő váltása",
-		"ZOOM": "Nagyítás ki\/be",
-		"CLOSE": "Bezárás (Esc)",
-		"GALLERY_PREV": "Előző (Bal nyíl gomb)",
-		"GALLERY_NEXT": "Következő (Jobb nyíl gomb)",
-		"GALLERY_COUNTER": "%curr% \/ %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Levélírás",
 		"BUTTON_NEW_MESSAGE": "Új üzenet",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Általános",
-		"LABEL_LANGUAGE": "Nyelv",
-		"LABEL_IDENTITY": "Identitás",
-		"LABEL_LAYOUT": "Elrendezés",
-		"LABEL_LAYOUT_NO_SPLIT": "Felosztás nélkül",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Függőleges felosztás",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Vízszintes felosztás",
-		"LABEL_EDITOR": "Alapértelmezett szövegszerkesztő",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Egyszerű",
-		"LABEL_VIEW_OPTIONS": "Nézet beállítások",
-		"LABEL_USE_PREVIEW_PANE": "Előnézeti ablak használata",
+		"LANGUAGE": "Nyelv",
+		"IDENTITY": "Identitás",
+		"LAYOUT": "Elrendezés",
+		"LAYOUT_NO_SPLIT": "Felosztás nélkül",
+		"LAYOUT_VERTICAL_SPLIT": "Függőleges felosztás",
+		"LAYOUT_HORIZONTAL_SPLIT": "Vízszintes felosztás",
+		"EDITOR": "Alapértelmezett szövegszerkesztő",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Egyszerű",
+		"VIEW_OPTIONS": "Nézet beállítások",
+		"USE_PREVIEW_PANE": "Előnézeti ablak használata",
 		"HIDE_DELETED_MESSAGES": "A törlésre megjelölt üzenetek elrejtése",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Jelölőnégyzetek megjelenítése a listában",
-		"LABEL_USE_THREADS": "Szálak használata",
-		"LABEL_REPLY_SAME_FOLDER": "Válaszüzenetek elhelyezése az eredeti üzenet mappájában",
-		"LABEL_SHOW_IMAGES": "Mindig jelenítse meg a külső képeket az üzenet törzsében",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Üzenetek egy oldalon",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Jelölje meg az üzenetet olvasottként",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Jelölőnégyzetek megjelenítése a listában",
+		"USE_THREADS": "Szálak használata",
+		"REPLY_SAME_FOLDER": "Válaszüzenetek elhelyezése az eredeti üzenet mappájában",
+		"SHOW_IMAGES": "Mindig jelenítse meg a külső képeket az üzenet törzsében",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Üzenetek egy oldalon",
+		"MARK_MESSAGE_READ_AFTER": "Jelölje meg az üzenetet olvasottként",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "másodperc után",
-		"LABEL_NOTIFICATIONS": "Értesítések",
-		"LABEL_SOUND_NOTIFICATION": "Hangos értesítés",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Új üzenetek értesítő ablakainak megjelenítése",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(a böngésző blokkolta)"
+		"NOTIFICATIONS": "Értesítések",
+		"SOUND_NOTIFICATION": "Hangos értesítés",
+		"CHROME_NOTIFICATION_DESC": "Új üzenetek értesítő ablakainak megjelenítése",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(a böngésző blokkolta)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Címzettek automatikus hozzáadása a címtárhoz",

snappymail/v/0.0.0/app/localization/id-ID/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Dijawab"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Beralih ke layar penuh",
-		"ZOOM": "Perbesar\/perkecil",
-		"CLOSE": "Tutup (esc)",
-		"GALLERY_PREV": "Sebelumnya (panah kiri)",
-		"GALLERY_NEXT": "Selanjutnya (panah kanan)",
-		"GALLERY_COUNTER": "%curr% dari %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Tulis baru",
 		"BUTTON_NEW_MESSAGE": "Pesan Baru",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Umum",
-		"LABEL_LANGUAGE": "Bahasa",
-		"LABEL_IDENTITY": "Identitas",
-		"LABEL_LAYOUT": "Tampilan",
-		"LABEL_LAYOUT_NO_SPLIT": "Tanpa pemisah",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Pemisah vertikal",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Pemisah horizontal",
-		"LABEL_EDITOR": "Editor teks bawaan",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Polos",
-		"LABEL_VIEW_OPTIONS": "Tampilkan Opsi",
-		"LABEL_USE_PREVIEW_PANE": "Gunakan panel pratinjau",
+		"LANGUAGE": "Bahasa",
+		"IDENTITY": "Identitas",
+		"LAYOUT": "Tampilan",
+		"LAYOUT_NO_SPLIT": "Tanpa pemisah",
+		"LAYOUT_VERTICAL_SPLIT": "Pemisah vertikal",
+		"LAYOUT_HORIZONTAL_SPLIT": "Pemisah horizontal",
+		"EDITOR": "Editor teks bawaan",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Polos",
+		"VIEW_OPTIONS": "Tampilkan Opsi",
+		"USE_PREVIEW_PANE": "Gunakan panel pratinjau",
 		"HIDE_DELETED_MESSAGES": "Sembunyikan pesan yang ditandai untuk dihapus",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Tampilkan centang dalam daftar",
-		"LABEL_USE_THREADS": "Gunakan tread",
-		"LABEL_REPLY_SAME_FOLDER": "Tempatkan pesan balasan di folder pesan yang dibalas",
-		"LABEL_SHOW_IMAGES": "Selalu tampilkan gambar eksternal di dalam pesan",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Pesan di halaman",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Tampilkan centang dalam daftar",
+		"USE_THREADS": "Gunakan tread",
+		"REPLY_SAME_FOLDER": "Tempatkan pesan balasan di folder pesan yang dibalas",
+		"SHOW_IMAGES": "Selalu tampilkan gambar eksternal di dalam pesan",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Pesan di halaman",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifikasi",
-		"LABEL_SOUND_NOTIFICATION": "Notifikasi suara",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Tampilkan jendela sembul notifikasi pesan",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(diblokir oleh browser)"
+		"NOTIFICATIONS": "Notifikasi",
+		"SOUND_NOTIFICATION": "Notifikasi suara",
+		"CHROME_NOTIFICATION_DESC": "Tampilkan jendela sembul notifikasi pesan",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(diblokir oleh browser)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Tambah penerima ke daftar alamat secara otomatis",

snappymail/v/0.0.0/app/localization/is-IS/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Svarað"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Víxla heilskjá af\/á",
-		"ZOOM": "Aðdráttur að\/frá",
-		"CLOSE": "Loka (Esc)",
-		"GALLERY_PREV": "Fyrra (vinstri örvarhnappur)",
-		"GALLERY_NEXT": "Næsta (hægri örvarhnappur)",
-		"GALLERY_COUNTER": "%curr% af %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Semja",
 		"BUTTON_NEW_MESSAGE": "Ný skilaboð",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Almennt",
-		"LABEL_LANGUAGE": "Tungumál",
-		"LABEL_IDENTITY": "Auðkenni",
-		"LABEL_LAYOUT": "Framsetning",
-		"LABEL_LAYOUT_NO_SPLIT": "Ekki klofið",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Klofið lóðrétt",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Klofið lárétt",
-		"LABEL_EDITOR": "Sjálfgefinn textaritill",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Venjulegt",
-		"LABEL_VIEW_OPTIONS": "Valkostir skoðunar",
-		"LABEL_USE_PREVIEW_PANE": "Nota forskoðunarham",
+		"LANGUAGE": "Tungumál",
+		"IDENTITY": "Auðkenni",
+		"LAYOUT": "Framsetning",
+		"LAYOUT_NO_SPLIT": "Ekki klofið",
+		"LAYOUT_VERTICAL_SPLIT": "Klofið lóðrétt",
+		"LAYOUT_HORIZONTAL_SPLIT": "Klofið lárétt",
+		"EDITOR": "Sjálfgefinn textaritill",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Venjulegt",
+		"VIEW_OPTIONS": "Valkostir skoðunar",
+		"USE_PREVIEW_PANE": "Nota forskoðunarham",
 		"HIDE_DELETED_MESSAGES": "Fela skilaboð merkt til eyðingar",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Sýna valkassa í listanum",
-		"LABEL_USE_THREADS": "Nota þræði",
-		"LABEL_REPLY_SAME_FOLDER": "Setja svör í möppu skilaboðanna sem er verið að svara",
-		"LABEL_SHOW_IMAGES": "Sýna ávallt myndir í skilaboðum",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Skilaboð á síðu",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Sýna valkassa í listanum",
+		"USE_THREADS": "Nota þræði",
+		"REPLY_SAME_FOLDER": "Setja svör í möppu skilaboðanna sem er verið að svara",
+		"SHOW_IMAGES": "Sýna ávallt myndir í skilaboðum",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Skilaboð á síðu",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Tilkynningar",
-		"LABEL_SOUND_NOTIFICATION": "Tilkynningarhljóð",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Sýna tilkynningarglugga fyrir ný skilaboð",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Lokað af vafra)"
+		"NOTIFICATIONS": "Tilkynningar",
+		"SOUND_NOTIFICATION": "Tilkynningarhljóð",
+		"CHROME_NOTIFICATION_DESC": "Sýna tilkynningarglugga fyrir ný skilaboð",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Lokað af vafra)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Bæta viðtakendum sjálfkrafa í nafnaskrá",

snappymail/v/0.0.0/app/localization/it-IT/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "Primo livello",
 		"LABEL_REPLIED": "Risposto"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Passa a schermo intero",
-		"ZOOM": "Ingrandisci +\/-",
-		"CLOSE": "Chiudi (Esc)",
-		"GALLERY_PREV": "Precedente (Freccia sinistra)",
-		"GALLERY_NEXT": "Successivo (Freccia destra)",
-		"GALLERY_COUNTER": "%curr% di %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Scrivi messaggio",
 		"BUTTON_NEW_MESSAGE": "Nuovo messaggio",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Generali",
-		"LABEL_LANGUAGE": "Lingua",
-		"LABEL_IDENTITY": "Identità",
-		"LABEL_LAYOUT": "Struttura",
-		"LABEL_LAYOUT_NO_SPLIT": "A pagina intera",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Divisione verticale",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Divisione orizzontale",
-		"LABEL_EDITOR": "Editor di testo predefinito",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Testo semplice",
-		"LABEL_VIEW_OPTIONS": "Impostazioni di visualizzazione",
-		"LABEL_USE_PREVIEW_PANE": "Mostra l'anteprima del messaggio",
+		"LANGUAGE": "Lingua",
+		"IDENTITY": "Identità",
+		"LAYOUT": "Struttura",
+		"LAYOUT_NO_SPLIT": "A pagina intera",
+		"LAYOUT_VERTICAL_SPLIT": "Divisione verticale",
+		"LAYOUT_HORIZONTAL_SPLIT": "Divisione orizzontale",
+		"EDITOR": "Editor di testo predefinito",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Testo semplice",
+		"VIEW_OPTIONS": "Impostazioni di visualizzazione",
+		"USE_PREVIEW_PANE": "Mostra l'anteprima del messaggio",
 		"HIDE_DELETED_MESSAGES": "Nascondi i messaggi contrassegnati per l'eliminazione",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Mostra le caselle di spunta nella lista",
-		"LABEL_USE_THREADS": "Usa le conversazioni",
-		"LABEL_REPLY_SAME_FOLDER": "Posiziona le risposte nella cartella del messaggio a cui si è risposto",
-		"LABEL_SHOW_IMAGES": "Visualizza sempre le immagini esterne nel messaggio",
-		"LABEL_PREFER_HTML": "Usa HTML predefinito anziché formato testo",
-		"LABEL_PREFER_HTML_INFO": "Il messaggio a volte contiene entrambi i formati. Questa opzione agisce sulla visualizzazione del messaggio in HTML o della versione in formato testo.",
-		"LABEL_REMOVE_COLORS": "Rimuovi lo sfondo e i colori del testo dal messaggio",
-		"LABEL_MESSAGE_PER_PAGE": "Messaggi per pagina",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Contrassegna il messaggio come letto dopo",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Mostra le caselle di spunta nella lista",
+		"USE_THREADS": "Usa le conversazioni",
+		"REPLY_SAME_FOLDER": "Posiziona le risposte nella cartella del messaggio a cui si è risposto",
+		"SHOW_IMAGES": "Visualizza sempre le immagini esterne nel messaggio",
+		"PREFER_HTML": "Usa HTML predefinito anziché formato testo",
+		"PREFER_HTML_INFO": "Il messaggio a volte contiene entrambi i formati. Questa opzione agisce sulla visualizzazione del messaggio in HTML o della versione in formato testo.",
+		"REMOVE_COLORS": "Rimuovi lo sfondo e i colori del testo dal messaggio",
+		"MESSAGE_PER_PAGE": "Messaggi per pagina",
+		"MARK_MESSAGE_READ_AFTER": "Contrassegna il messaggio come letto dopo",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifiche",
-		"LABEL_SOUND_NOTIFICATION": "Notifica sonora",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Mostra le notifiche in caso di nuovi messaggi",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Bloccate dal browser)"
+		"NOTIFICATIONS": "Notifiche",
+		"SOUND_NOTIFICATION": "Notifica sonora",
+		"CHROME_NOTIFICATION_DESC": "Mostra le notifiche in caso di nuovi messaggi",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloccate dal browser)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Aggiungi automaticamente le persone che ti inviano mail alla rubrica",

snappymail/v/0.0.0/app/localization/ja-JP/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "一段のみ",
 		"LABEL_REPLIED": "回答済み"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "フルスクリーン",
-		"ZOOM": "拡大\/縮小",
-		"CLOSE": "閉じる(Esc)",
-		"GALLERY_PREV": "前(←)",
-		"GALLERY_NEXT": "次(→)",
-		"GALLERY_COUNTER": "%curr% \/ %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "作成",
 		"BUTTON_NEW_MESSAGE": "新規作成",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "全般",
-		"LABEL_LANGUAGE": "言語",
-		"LABEL_IDENTITY": "表示名",
-		"LABEL_LAYOUT": "レイアウト",
-		"LABEL_LAYOUT_NO_SPLIT": "分割しない",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "縦に分割",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "横に分割",
-		"LABEL_EDITOR": "メール形式",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "プレーンテキスト",
-		"LABEL_VIEW_OPTIONS": "表示",
-		"LABEL_USE_PREVIEW_PANE": "プレビューペインを使用する",
+		"LANGUAGE": "言語",
+		"IDENTITY": "表示名",
+		"LAYOUT": "レイアウト",
+		"LAYOUT_NO_SPLIT": "分割しない",
+		"LAYOUT_VERTICAL_SPLIT": "縦に分割",
+		"LAYOUT_HORIZONTAL_SPLIT": "横に分割",
+		"EDITOR": "メール形式",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "プレーンテキスト",
+		"VIEW_OPTIONS": "表示",
+		"USE_PREVIEW_PANE": "プレビューペインを使用する",
 		"HIDE_DELETED_MESSAGES": "削除のマークが付いたメッセージを非表示にする",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "リストにチェックボックスを表示",
-		"LABEL_USE_THREADS": "スレッドを使う",
-		"LABEL_REPLY_SAME_FOLDER": "返信したメッセージのフォルダに送信メールを置く",
-		"LABEL_SHOW_IMAGES": "外部画像を常に表示する",
-		"LABEL_PREFER_HTML": "プレーンテキストよりHTMLを優先する",
-		"LABEL_PREFER_HTML_INFO": "メッセージがHTMLとプレーンテキストの両方の形式を含むことがあります。このオプションはそのような場合にどちらの形式を表示するかを制御します。",
-		"LABEL_REMOVE_COLORS": "本文の文字色及び背景色の設定を無視する",
-		"LABEL_MESSAGE_PER_PAGE": "1ページに表示する件数",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "メッセージが既読となるまでの秒数",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "リストにチェックボックスを表示",
+		"USE_THREADS": "スレッドを使う",
+		"REPLY_SAME_FOLDER": "返信したメッセージのフォルダに送信メールを置く",
+		"SHOW_IMAGES": "外部画像を常に表示する",
+		"PREFER_HTML": "プレーンテキストよりHTMLを優先する",
+		"PREFER_HTML_INFO": "メッセージがHTMLとプレーンテキストの両方の形式を含むことがあります。このオプションはそのような場合にどちらの形式を表示するかを制御します。",
+		"REMOVE_COLORS": "本文の文字色及び背景色の設定を無視する",
+		"MESSAGE_PER_PAGE": "1ページに表示する件数",
+		"MARK_MESSAGE_READ_AFTER": "メッセージが既読となるまでの秒数",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "秒",
-		"LABEL_NOTIFICATIONS": "通知設定",
-		"LABEL_SOUND_NOTIFICATION": "サウンド通知",
-		"LABEL_CHROME_NOTIFICATION_DESC": "新しいメッセージを受信したらポップアップで知らせる",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(ブラウザでブロックされています)"
+		"NOTIFICATIONS": "通知設定",
+		"SOUND_NOTIFICATION": "サウンド通知",
+		"CHROME_NOTIFICATION_DESC": "新しいメッセージを受信したらポップアップで知らせる",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(ブラウザでブロックされています)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "返信したアドレスをアドレス帳へ自動的に追加する",

snappymail/v/0.0.0/app/localization/ko-KR/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Odgovoreno"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "전체화면으로 보기",
-		"ZOOM": "확대\/축소",
-		"CLOSE": "닫기 (Esc)",
-		"GALLERY_PREV": "이전 (왼쪽 방향키)",
-		"GALLERY_NEXT": "다음 (오른쪽 방향키)",
-		"GALLERY_COUNTER": "%total% 중 %curr%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "메일 쓰기",
 		"BUTTON_NEW_MESSAGE": "새 메시지",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "일반",
-		"LABEL_LANGUAGE": "언어",
-		"LABEL_IDENTITY": "신원",
-		"LABEL_LAYOUT": "레이아웃",
-		"LABEL_LAYOUT_NO_SPLIT": "분할 해제",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "세로 분할",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "가로 분할",
-		"LABEL_EDITOR": "기본 텍스트 편집기",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "평문",
-		"LABEL_VIEW_OPTIONS": "보기 옵션",
-		"LABEL_USE_PREVIEW_PANE": "미리보기 창 사용",
+		"LANGUAGE": "언어",
+		"IDENTITY": "신원",
+		"LAYOUT": "레이아웃",
+		"LAYOUT_NO_SPLIT": "분할 해제",
+		"LAYOUT_VERTICAL_SPLIT": "세로 분할",
+		"LAYOUT_HORIZONTAL_SPLIT": "가로 분할",
+		"EDITOR": "기본 텍스트 편집기",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "평문",
+		"VIEW_OPTIONS": "보기 옵션",
+		"USE_PREVIEW_PANE": "미리보기 창 사용",
 		"HIDE_DELETED_MESSAGES": "삭제 표시된 메시지 숨기기",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "목록에서 확인상자 표시",
-		"LABEL_USE_THREADS": "대화형 목록 사용",
-		"LABEL_REPLY_SAME_FOLDER": "회신 메시지를 원본과 동일한 폴더 위치에 저장",
-		"LABEL_SHOW_IMAGES": "메시지 본문에 포함된 외부 이미지를 항상 표시",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "페이지 당 메시지 개수",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "목록에서 확인상자 표시",
+		"USE_THREADS": "대화형 목록 사용",
+		"REPLY_SAME_FOLDER": "회신 메시지를 원본과 동일한 폴더 위치에 저장",
+		"SHOW_IMAGES": "메시지 본문에 포함된 외부 이미지를 항상 표시",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "페이지 당 메시지 개수",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "알림",
-		"LABEL_SOUND_NOTIFICATION": "소리 알림",
-		"LABEL_CHROME_NOTIFICATION_DESC": "새 메시지 알림 팝업 사용",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(브라우저에 의해 차단됨)"
+		"NOTIFICATIONS": "알림",
+		"SOUND_NOTIFICATION": "소리 알림",
+		"CHROME_NOTIFICATION_DESC": "새 메시지 알림 팝업 사용",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(브라우저에 의해 차단됨)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "수신인을 주소록에 자동으로 추가",

snappymail/v/0.0.0/app/localization/lt-LT/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Atsakyta"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Perjungti viso ekrano režimą",
-		"ZOOM": "Didinti \/ mažinti",
-		"CLOSE": "Uždaryti (Esc)",
-		"GALLERY_PREV": "Ankstesnis (Rodyklė kairėn)",
-		"GALLERY_NEXT": "Kitas (Rodyklė dešinėn)",
-		"GALLERY_COUNTER": "%curr% iš %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Sukurti",
 		"BUTTON_NEW_MESSAGE": "Rašyti naują",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Pagrindiniai",
-		"LABEL_LANGUAGE": "Kalba",
-		"LABEL_IDENTITY": "Tapatybė",
-		"LABEL_LAYOUT": "Išdėstymas",
-		"LABEL_LAYOUT_NO_SPLIT": "Skaidymo nėra",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertikalus skaidymas",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontalus skaidymas",
-		"LABEL_EDITOR": "Numatytas teksto redaktorius",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Paprastas",
-		"LABEL_VIEW_OPTIONS": "Peržiūros parinktys",
-		"LABEL_USE_PREVIEW_PANE": "Naudokite peržiūros sritį",
+		"LANGUAGE": "Kalba",
+		"IDENTITY": "Tapatybė",
+		"LAYOUT": "Išdėstymas",
+		"LAYOUT_NO_SPLIT": "Skaidymo nėra",
+		"LAYOUT_VERTICAL_SPLIT": "Vertikalus skaidymas",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontalus skaidymas",
+		"EDITOR": "Numatytas teksto redaktorius",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Paprastas",
+		"VIEW_OPTIONS": "Peržiūros parinktys",
+		"USE_PREVIEW_PANE": "Naudokite peržiūros sritį",
 		"HIDE_DELETED_MESSAGES": "Slėpti pranešimus, pažymėtus ištrinti",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Rodyti žymėjimo langelius sąraše",
-		"LABEL_USE_THREADS": "Naudoti gijas",
-		"LABEL_REPLY_SAME_FOLDER": "Atsakymus dėti į katalogą, kuriame yra pradinė žinutė",
-		"LABEL_SHOW_IMAGES": "Visada rodyti išorinius vaizdus žinutėse",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Žinučių lape",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Rodyti žymėjimo langelius sąraše",
+		"USE_THREADS": "Naudoti gijas",
+		"REPLY_SAME_FOLDER": "Atsakymus dėti į katalogą, kuriame yra pradinė žinutė",
+		"SHOW_IMAGES": "Visada rodyti išorinius vaizdus žinutėse",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Žinučių lape",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Pranešimai",
-		"LABEL_SOUND_NOTIFICATION": "Garsinis pranešimas",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Rodyti iššokančius pranešimus apie naujas žinutes",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Blokuoja naršyklė)"
+		"NOTIFICATIONS": "Pranešimai",
+		"SOUND_NOTIFICATION": "Garsinis pranešimas",
+		"CHROME_NOTIFICATION_DESC": "Rodyti iššokančius pranešimus apie naujas žinutes",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Blokuoja naršyklė)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatiškai pridėti gavėjus į adresų knygą",

snappymail/v/0.0.0/app/localization/lv-LV/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Atbildēja"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "Aizvērt (Esc)",
-		"GALLERY_PREV": "Iepriekšejā (Kreisā būltiņa)",
-		"GALLERY_NEXT": "Nākamā (Labā būltiņa)",
-		"GALLERY_COUNTER": "%curr% no %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Rakstīt",
 		"BUTTON_NEW_MESSAGE": "Jauns ziņojums",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Vispārējie",
-		"LABEL_LANGUAGE": "Valoda",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Galvenais teksta editors",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Teksts",
-		"LABEL_VIEW_OPTIONS": "Apskates opcijas",
-		"LABEL_USE_PREVIEW_PANE": "Lietot priekšskatu",
+		"LANGUAGE": "Valoda",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"EDITOR": "Galvenais teksta editors",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Teksts",
+		"VIEW_OPTIONS": "Apskates opcijas",
+		"USE_PREVIEW_PANE": "Lietot priekšskatu",
 		"HIDE_DELETED_MESSAGES": "Slēpt ziņojumus, kas atzīmēti dzēšanai",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Rādīt checkboxes sarakstā",
-		"LABEL_USE_THREADS": "Lietot saraksti",
-		"LABEL_REPLY_SAME_FOLDER": "Atbildes ziņojumus ielikt mapē kurā atrodas vēstule uz kuru tiek atbildēts.",
-		"LABEL_SHOW_IMAGES": "Vienmēr rādīt attēlus ziņojumos",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Ziņojumi lapā",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Rādīt checkboxes sarakstā",
+		"USE_THREADS": "Lietot saraksti",
+		"REPLY_SAME_FOLDER": "Atbildes ziņojumus ielikt mapē kurā atrodas vēstule uz kuru tiek atbildēts.",
+		"SHOW_IMAGES": "Vienmēr rādīt attēlus ziņojumos",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Ziņojumi lapā",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Paziņojumi",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Rādīt jaunus paziņojumus kā izlecošus logus",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Parlūkprogramma bloķēja)"
+		"NOTIFICATIONS": "Paziņojumi",
+		"SOUND_NOTIFICATION": "Sound notification",
+		"CHROME_NOTIFICATION_DESC": "Rādīt jaunus paziņojumus kā izlecošus logus",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Parlūkprogramma bloķēja)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book",

snappymail/v/0.0.0/app/localization/nb-NO/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "Ett nivå",
 		"LABEL_REPLIED": "Besvart"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Fullskjerm av\/på",
-		"ZOOM": "Zoom inn\/ut",
-		"CLOSE": "Lukk (Esc)",
-		"GALLERY_PREV": "Forrige (venstre piltast)",
-		"GALLERY_NEXT": "Neste (høyre piltast)",
-		"GALLERY_COUNTER": "%curr% av %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Skriv",
 		"BUTTON_NEW_MESSAGE": "Ny melding",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Generelt",
-		"LABEL_LANGUAGE": "Språk",
-		"LABEL_IDENTITY": "Identitet",
-		"LABEL_LAYOUT": "Utforming",
-		"LABEL_LAYOUT_NO_SPLIT": "Ingen deling",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertikal deling",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horisontal deling",
-		"LABEL_EDITOR": "Standard tekstbehandler",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Ren tekst",
-		"LABEL_VIEW_OPTIONS": "Vis valg",
-		"LABEL_USE_PREVIEW_PANE": "Bruk forhåndsvisningsrute",
+		"LANGUAGE": "Språk",
+		"IDENTITY": "Identitet",
+		"LAYOUT": "Utforming",
+		"LAYOUT_NO_SPLIT": "Ingen deling",
+		"LAYOUT_VERTICAL_SPLIT": "Vertikal deling",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horisontal deling",
+		"EDITOR": "Standard tekstbehandler",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Ren tekst",
+		"VIEW_OPTIONS": "Vis valg",
+		"USE_PREVIEW_PANE": "Bruk forhåndsvisningsrute",
 		"HIDE_DELETED_MESSAGES": "Skjul meldinger som er merket for sletting",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Vis avkrysningsbokser i liste",
-		"LABEL_USE_THREADS": "Bruk tråder",
-		"LABEL_REPLY_SAME_FOLDER": "Legg svar i samme mappe som opprinnelig melding",
-		"LABEL_SHOW_IMAGES": "Vis alltid eksterne bilder i meldingstekst",
-		"LABEL_PREFER_HTML": "Foretrekk HTML fremfor",
-		"LABEL_PREFER_HTML_INFO": "Meldinger kan ankomme i både HTML og ren tekst. Dette valget styrer hvilken av dem du vil se.",
-		"LABEL_REMOVE_COLORS": "Fjern bakgrunn og tekstfarger fra brødtekst",
-		"LABEL_MESSAGE_PER_PAGE": "Meldinger per side",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Marker melding som lest etter",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Vis avkrysningsbokser i liste",
+		"USE_THREADS": "Bruk tråder",
+		"REPLY_SAME_FOLDER": "Legg svar i samme mappe som opprinnelig melding",
+		"SHOW_IMAGES": "Vis alltid eksterne bilder i meldingstekst",
+		"PREFER_HTML": "Foretrekk HTML fremfor",
+		"PREFER_HTML_INFO": "Meldinger kan ankomme i både HTML og ren tekst. Dette valget styrer hvilken av dem du vil se.",
+		"REMOVE_COLORS": "Fjern bakgrunn og tekstfarger fra brødtekst",
+		"MESSAGE_PER_PAGE": "Meldinger per side",
+		"MARK_MESSAGE_READ_AFTER": "Marker melding som lest etter",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "sekunder",
-		"LABEL_NOTIFICATIONS": "Varsler",
-		"LABEL_SOUND_NOTIFICATION": "Lydvarsel",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Vis sprettopp-varsel om nye meldinger",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(blokkert av nettleser)"
+		"NOTIFICATIONS": "Varsler",
+		"SOUND_NOTIFICATION": "Lydvarsel",
+		"CHROME_NOTIFICATION_DESC": "Vis sprettopp-varsel om nye meldinger",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(blokkert av nettleser)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Legg til mottakere i adresseboka automatisk",

snappymail/v/0.0.0/app/localization/nl-NL/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "Één niveau",
 		"LABEL_REPLIED": "Beantwoord"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Schakel volledig scherm in\/uit",
-		"ZOOM": "Zoom in\/uit",
-		"CLOSE": "Sluiten (Esc)",
-		"GALLERY_PREV": "Vorige (Linker Pijl toets)",
-		"GALLERY_NEXT": "Volgende (Rechter Pijl toets)",
-		"GALLERY_COUNTER": "%curr% van %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Nieuw bericht",
 		"BUTTON_NEW_MESSAGE": "Nieuw bericht",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Algemeen",
-		"LABEL_LANGUAGE": "Taal",
-		"LABEL_IDENTITY": "Identiteit",
-		"LABEL_LAYOUT": "Indeling",
-		"LABEL_LAYOUT_NO_SPLIT": "Geen splitsing",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Verticale splitsing",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontale splitsing",
-		"LABEL_EDITOR": "Standaard tekst editor",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Platte tekst",
-		"LABEL_VIEW_OPTIONS": "Bekijk opties",
-		"LABEL_USE_PREVIEW_PANE": "Toon leesvenster",
+		"LANGUAGE": "Taal",
+		"IDENTITY": "Identiteit",
+		"LAYOUT": "Indeling",
+		"LAYOUT_NO_SPLIT": "Geen splitsing",
+		"LAYOUT_VERTICAL_SPLIT": "Verticale splitsing",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontale splitsing",
+		"EDITOR": "Standaard tekst editor",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Platte tekst",
+		"VIEW_OPTIONS": "Bekijk opties",
+		"USE_PREVIEW_PANE": "Toon leesvenster",
 		"HIDE_DELETED_MESSAGES": "Berichten verbergen die zijn gemarkeerd voor verwijdering",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Toon selectievakjes in de lijst",
-		"LABEL_USE_THREADS": "Groepeer berichten",
-		"LABEL_REPLY_SAME_FOLDER": "Plaats antwoorden in de map van het originele bericht",
-		"LABEL_SHOW_IMAGES": "Afbeeldingen altijd weergeven in het bericht",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Verwijder achtergrond- en tekstkleuren uit het bericht",
-		"LABEL_MESSAGE_PER_PAGE": "Berichten op pagina",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Bericht markeren als gelezen na",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Toon selectievakjes in de lijst",
+		"USE_THREADS": "Groepeer berichten",
+		"REPLY_SAME_FOLDER": "Plaats antwoorden in de map van het originele bericht",
+		"SHOW_IMAGES": "Afbeeldingen altijd weergeven in het bericht",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Verwijder achtergrond- en tekstkleuren uit het bericht",
+		"MESSAGE_PER_PAGE": "Berichten op pagina",
+		"MARK_MESSAGE_READ_AFTER": "Bericht markeren als gelezen na",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconden",
-		"LABEL_NOTIFICATIONS": "Notificaties",
-		"LABEL_SOUND_NOTIFICATION": "Notificatie geluid",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Toon nieuwe berichten popup",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Geblokkeerd door de browser)"
+		"NOTIFICATIONS": "Notificaties",
+		"SOUND_NOTIFICATION": "Notificatie geluid",
+		"CHROME_NOTIFICATION_DESC": "Toon nieuwe berichten popup",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Geblokkeerd door de browser)",
+		"LIST_INLINE_ATTACHMENTS": "Toon inline bijlagen in lijst"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatisch ontvangers toevoegen aan uw adresboek",

snappymail/v/0.0.0/app/localization/pl-PL/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Odebrano"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Pełny ekran",
-		"ZOOM": "Przybliż\/oddal",
-		"CLOSE": "Zamknij (Esc)",
-		"GALLERY_PREV": "Poprzedni (strzałka w lewo)",
-		"GALLERY_NEXT": "Następny (strzałka w prawo)",
-		"GALLERY_COUNTER": "%curr% z %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Utwórz",
 		"BUTTON_NEW_MESSAGE": "Nowa wiadomość",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Ogólne",
-		"LABEL_LANGUAGE": "Język",
-		"LABEL_IDENTITY": "Tożsamość",
-		"LABEL_LAYOUT": "Układ",
-		"LABEL_LAYOUT_NO_SPLIT": "bez podziału",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "podział w pionie",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "podział w poziomie",
-		"LABEL_EDITOR": "Format wiadomości",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "zwykły tekst",
-		"LABEL_VIEW_OPTIONS": "Opcje wyświetlania",
-		"LABEL_USE_PREVIEW_PANE": "Wyświetl okno podglądu",
+		"LANGUAGE": "Język",
+		"IDENTITY": "Tożsamość",
+		"LAYOUT": "Układ",
+		"LAYOUT_NO_SPLIT": "bez podziału",
+		"LAYOUT_VERTICAL_SPLIT": "podział w pionie",
+		"LAYOUT_HORIZONTAL_SPLIT": "podział w poziomie",
+		"EDITOR": "Format wiadomości",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "zwykły tekst",
+		"VIEW_OPTIONS": "Opcje wyświetlania",
+		"USE_PREVIEW_PANE": "Wyświetl okno podglądu",
 		"HIDE_DELETED_MESSAGES": "Ukryj wiadomości oznaczone do usunięcia",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Pokazuj pola zaznaczenia na listach",
-		"LABEL_USE_THREADS": "Używaj wątków",
-		"LABEL_REPLY_SAME_FOLDER": "Umieść odpowiedzi w folderach, z których pochodzą wiadomości",
-		"LABEL_SHOW_IMAGES": "Zawsze wyświetlaj zewnętrzne obrazy w treści wiadomości",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Wiadomości na stronę",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Pokazuj pola zaznaczenia na listach",
+		"USE_THREADS": "Używaj wątków",
+		"REPLY_SAME_FOLDER": "Umieść odpowiedzi w folderach, z których pochodzą wiadomości",
+		"SHOW_IMAGES": "Zawsze wyświetlaj zewnętrzne obrazy w treści wiadomości",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Wiadomości na stronę",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Powiadomienia",
-		"LABEL_SOUND_NOTIFICATION": "Powiadomienia dźwiękowe",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Wyświetlaj powiadomienia o nowych wiadomościach",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Zablokowane przez przeglądarkę)"
+		"NOTIFICATIONS": "Powiadomienia",
+		"SOUND_NOTIFICATION": "Powiadomienia dźwiękowe",
+		"CHROME_NOTIFICATION_DESC": "Wyświetlaj powiadomienia o nowych wiadomościach",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Zablokowane przez przeglądarkę)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatycznie dodawaj odbiorców do książki adresowej",

snappymail/v/0.0.0/app/localization/pt-BR/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Respondidas"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Em tela cheia",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "Fechar (Esc)",
-		"GALLERY_PREV": "Anterior (Seta p\/ Esquerda)",
-		"GALLERY_NEXT": "Posterior (Seta p\/ Direita)",
-		"GALLERY_COUNTER": "%curr% de %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Compor",
 		"BUTTON_NEW_MESSAGE": "Nova mensagem",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Geral",
-		"LABEL_LANGUAGE": "Idioma",
-		"LABEL_IDENTITY": "Identidade",
-		"LABEL_LAYOUT": "Painel de Leitura",
-		"LABEL_LAYOUT_NO_SPLIT": "Sem divisão",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Divisão Vertical",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Divisão Horizontal",
-		"LABEL_EDITOR": "Editor de texto padrão",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Texto Simples",
-		"LABEL_VIEW_OPTIONS": "Opções de Visualização",
-		"LABEL_USE_PREVIEW_PANE": "Usar painel de pré-visualização",
+		"LANGUAGE": "Idioma",
+		"IDENTITY": "Identidade",
+		"LAYOUT": "Painel de Leitura",
+		"LAYOUT_NO_SPLIT": "Sem divisão",
+		"LAYOUT_VERTICAL_SPLIT": "Divisão Vertical",
+		"LAYOUT_HORIZONTAL_SPLIT": "Divisão Horizontal",
+		"EDITOR": "Editor de texto padrão",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Texto Simples",
+		"VIEW_OPTIONS": "Opções de Visualização",
+		"USE_PREVIEW_PANE": "Usar painel de pré-visualização",
 		"HIDE_DELETED_MESSAGES": "Ocultar mensagens marcadas para exclusão",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Exibir caixas de seleção na lista",
-		"LABEL_USE_THREADS": "Agrupar mensagens por conversa",
-		"LABEL_REPLY_SAME_FOLDER": "Colocar resposta na mesma pasta da mensagem respondida",
-		"LABEL_SHOW_IMAGES": "Sempre exibir imagens no corpo da mensagem",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Mensagens por Página",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Exibir caixas de seleção na lista",
+		"USE_THREADS": "Agrupar mensagens por conversa",
+		"REPLY_SAME_FOLDER": "Colocar resposta na mesma pasta da mensagem respondida",
+		"SHOW_IMAGES": "Sempre exibir imagens no corpo da mensagem",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Mensagens por Página",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notificações",
-		"LABEL_SOUND_NOTIFICATION": "Notificação sonora",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Mostrar notificação popup para novas mensagens",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)"
+		"NOTIFICATIONS": "Notificações",
+		"SOUND_NOTIFICATION": "Notificação sonora",
+		"CHROME_NOTIFICATION_DESC": "Mostrar notificação popup para novas mensagens",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adicionar automaticamente os destinatários na lista de endereços",

snappymail/v/0.0.0/app/localization/pt-PT/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "Um nível",
 		"LABEL_REPLIED": "Respondidas"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Alternar ecrã-inteiro",
-		"ZOOM": "Zoom +\/-",
-		"CLOSE": "Fechar (Esc)",
-		"GALLERY_PREV": "Anterior (seta p\/ esquerda)",
-		"GALLERY_NEXT": "Próxima (seta p\/ direita)",
-		"GALLERY_COUNTER": "%curr% de %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Compor",
 		"BUTTON_NEW_MESSAGE": "Nova mensagem",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Geral",
-		"LABEL_LANGUAGE": "Idioma",
-		"LABEL_IDENTITY": "Identidade",
-		"LABEL_LAYOUT": "Apresentação",
-		"LABEL_LAYOUT_NO_SPLIT": "Sem separação",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Separação vertical",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Separação horizontal",
-		"LABEL_EDITOR": "Editor de texto padrão",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Texto simples",
-		"LABEL_VIEW_OPTIONS": "Ver opções",
-		"LABEL_USE_PREVIEW_PANE": "Use o painel de pré-visualização",
+		"LANGUAGE": "Idioma",
+		"IDENTITY": "Identidade",
+		"LAYOUT": "Apresentação",
+		"LAYOUT_NO_SPLIT": "Sem separação",
+		"LAYOUT_VERTICAL_SPLIT": "Separação vertical",
+		"LAYOUT_HORIZONTAL_SPLIT": "Separação horizontal",
+		"EDITOR": "Editor de texto padrão",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Texto simples",
+		"VIEW_OPTIONS": "Ver opções",
+		"USE_PREVIEW_PANE": "Use o painel de pré-visualização",
 		"HIDE_DELETED_MESSAGES": "Ocultar mensagens marcadas para exclusão",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Apresentar caixas de seleção na lista",
-		"LABEL_USE_THREADS": "Usar tópicos de conversa",
-		"LABEL_REPLY_SAME_FOLDER": "Colocar respostas na pasta das mensagens a que responde",
-		"LABEL_SHOW_IMAGES": "Apresentar sempre as imagens no corpo da mensagem",
-		"LABEL_PREFER_HTML": "Preferir HTML em vez de texto simples",
-		"LABEL_PREFER_HTML_INFO": "Por vezes as mensagens são recebidas em ambos os formatos. Esta opção determina se prefere apresentar o conteúdo em HTML ou em texto simples.",
-		"LABEL_REMOVE_COLORS": "Retirar imagens de fundo e coloração de texto do corpo das mensagens",
-		"LABEL_MESSAGE_PER_PAGE": "Mensagens por página",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Marcar mensagem como lida após",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Apresentar caixas de seleção na lista",
+		"USE_THREADS": "Usar tópicos de conversa",
+		"REPLY_SAME_FOLDER": "Colocar respostas na pasta das mensagens a que responde",
+		"SHOW_IMAGES": "Apresentar sempre as imagens no corpo da mensagem",
+		"PREFER_HTML": "Preferir HTML em vez de texto simples",
+		"PREFER_HTML_INFO": "Por vezes as mensagens são recebidas em ambos os formatos. Esta opção determina se prefere apresentar o conteúdo em HTML ou em texto simples.",
+		"REMOVE_COLORS": "Retirar imagens de fundo e coloração de texto do corpo das mensagens",
+		"MESSAGE_PER_PAGE": "Mensagens por página",
+		"MARK_MESSAGE_READ_AFTER": "Marcar mensagem como lida após",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "segundos",
-		"LABEL_NOTIFICATIONS": "Notificações",
-		"LABEL_SOUND_NOTIFICATION": "Notificações sonoras",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Apresentar notificações para novas mensagens",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)"
+		"NOTIFICATIONS": "Notificações",
+		"SOUND_NOTIFICATION": "Notificações sonoras",
+		"CHROME_NOTIFICATION_DESC": "Apresentar notificações para novas mensagens",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adicionar destinatários automaticamente à sua lista de endereços",

snappymail/v/0.0.0/app/localization/pt/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "Um nível",
 		"LABEL_REPLIED": "Respondidas"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Alternar ecrã-inteiro",
-		"ZOOM": "Zoom +\/-",
-		"CLOSE": "Fechar (Esc)",
-		"GALLERY_PREV": "Anterior (seta p\/ esquerda)",
-		"GALLERY_NEXT": "Próxima (seta p\/ direita)",
-		"GALLERY_COUNTER": "%curr% de %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Compor",
 		"BUTTON_NEW_MESSAGE": "Nova mensagem",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Geral",
-		"LABEL_LANGUAGE": "Idioma",
-		"LABEL_IDENTITY": "Identidade",
-		"LABEL_LAYOUT": "Apresentação",
-		"LABEL_LAYOUT_NO_SPLIT": "Sem separação",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Separação vertical",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Separação horizontal",
-		"LABEL_EDITOR": "Editor de texto padrão",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Texto simples",
-		"LABEL_VIEW_OPTIONS": "Ver opções",
-		"LABEL_USE_PREVIEW_PANE": "Use o painel de pré-visualização",
+		"LANGUAGE": "Idioma",
+		"IDENTITY": "Identidade",
+		"LAYOUT": "Apresentação",
+		"LAYOUT_NO_SPLIT": "Sem separação",
+		"LAYOUT_VERTICAL_SPLIT": "Separação vertical",
+		"LAYOUT_HORIZONTAL_SPLIT": "Separação horizontal",
+		"EDITOR": "Editor de texto padrão",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Texto simples",
+		"VIEW_OPTIONS": "Ver opções",
+		"USE_PREVIEW_PANE": "Use o painel de pré-visualização",
 		"HIDE_DELETED_MESSAGES": "Ocultar mensagens marcadas para exclusão",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Apresentar caixas de seleção na lista",
-		"LABEL_USE_THREADS": "Usar tópicos de conversa",
-		"LABEL_REPLY_SAME_FOLDER": "Colocar respostas na pasta das mensagens a que responde",
-		"LABEL_SHOW_IMAGES": "Apresentar sempre as imagens no corpo da mensagem",
-		"LABEL_PREFER_HTML": "Preferir HTML em vez de texto simples",
-		"LABEL_PREFER_HTML_INFO": "Por vezes as mensagens são recebidas em ambos os formatos. Esta opção determina se prefere apresentar o conteúdo em HTML ou em texto simples.",
-		"LABEL_REMOVE_COLORS": "Retirar imagens de fundo e coloração de texto do corpo das mensagens",
-		"LABEL_MESSAGE_PER_PAGE": "Mensagens por página",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Marcar mensagem como lida após",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Apresentar caixas de seleção na lista",
+		"USE_THREADS": "Usar tópicos de conversa",
+		"REPLY_SAME_FOLDER": "Colocar respostas na pasta das mensagens a que responde",
+		"SHOW_IMAGES": "Apresentar sempre as imagens no corpo da mensagem",
+		"PREFER_HTML": "Preferir HTML em vez de texto simples",
+		"PREFER_HTML_INFO": "Por vezes as mensagens são recebidas em ambos os formatos. Esta opção determina se prefere apresentar o conteúdo em HTML ou em texto simples.",
+		"REMOVE_COLORS": "Retirar imagens de fundo e coloração de texto do corpo das mensagens",
+		"MESSAGE_PER_PAGE": "Mensagens por página",
+		"MARK_MESSAGE_READ_AFTER": "Marcar mensagem como lida após",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "segundos",
-		"LABEL_NOTIFICATIONS": "Notificações",
-		"LABEL_SOUND_NOTIFICATION": "Notificações sonoras",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Apresentar notificações para novas mensagens",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)"
+		"NOTIFICATIONS": "Notificações",
+		"SOUND_NOTIFICATION": "Notificações sonoras",
+		"CHROME_NOTIFICATION_DESC": "Apresentar notificações para novas mensagens",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adicionar destinatários automaticamente à sua lista de endereços",

snappymail/v/0.0.0/app/localization/ro-RO/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Răspuns"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "Închide (Esc)",
-		"GALLERY_PREV": "Precedentul (săgeată stânga)",
-		"GALLERY_NEXT": "Următorul (săgeată dreapta)",
-		"GALLERY_COUNTER": "%curr% din %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Compune",
 		"BUTTON_NEW_MESSAGE": "Mesaj nou",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Setări de bază",
-		"LABEL_LANGUAGE": "Limbă",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Editor de text implicit",
-		"LABEL_EDITOR_HTML": "Formatat",
-		"LABEL_EDITOR_PLAIN": "Simplu",
-		"LABEL_VIEW_OPTIONS": "Afișare",
-		"LABEL_USE_PREVIEW_PANE": "Folosiți un mod de afișare cu trei coloane",
+		"LANGUAGE": "Limbă",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"EDITOR": "Editor de text implicit",
+		"EDITOR_HTML": "Formatat",
+		"EDITOR_PLAIN": "Simplu",
+		"VIEW_OPTIONS": "Afișare",
+		"USE_PREVIEW_PANE": "Folosiți un mod de afișare cu trei coloane",
 		"HIDE_DELETED_MESSAGES": "Ascunde mesajele marcate pentru ștergere",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Afișează listele checkbox",
-		"LABEL_USE_THREADS": "Minimizează scrisorile",
-		"LABEL_REPLY_SAME_FOLDER": "Răspunsurile în același folder cu originalul",
-		"LABEL_SHOW_IMAGES": "Arată imaginile externe în corpul mesajului, fără avertisment",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Mesaje pe o pagină",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Afișează listele checkbox",
+		"USE_THREADS": "Minimizează scrisorile",
+		"REPLY_SAME_FOLDER": "Răspunsurile în același folder cu originalul",
+		"SHOW_IMAGES": "Arată imaginile externe în corpul mesajului, fără avertisment",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Mesaje pe o pagină",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notificări",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Afișați notificări desktop pentru mesaje noi",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(browser-ul blocat)"
+		"NOTIFICATIONS": "Notificări",
+		"SOUND_NOTIFICATION": "Sound notification",
+		"CHROME_NOTIFICATION_DESC": "Afișați notificări desktop pentru mesaje noi",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(browser-ul blocat)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adaugă automat destinatarii la agenda de scrisori",

snappymail/v/0.0.0/app/localization/ru-RU/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Ответил"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Полный экран",
-		"ZOOM": "Увеличить\/уменьшить",
-		"CLOSE": "Закрыть (Esc)",
-		"GALLERY_PREV": "Назад (Стрелка ←)",
-		"GALLERY_NEXT": "Вперед (Стрелка →)",
-		"GALLERY_COUNTER": "%curr% из %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Написать",
 		"BUTTON_NEW_MESSAGE": "Новое сообщение",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Основные Настройки",
-		"LABEL_LANGUAGE": "Язык",
-		"LABEL_IDENTITY": "Профиль",
-		"LABEL_LAYOUT": "Разметка",
-		"LABEL_LAYOUT_NO_SPLIT": "Одна панель",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Вертикальные панели",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Горизонтальные панели",
-		"LABEL_EDITOR": "Редактор текста по умолчанию",
-		"LABEL_EDITOR_HTML": "Форматированный",
-		"LABEL_EDITOR_PLAIN": "Простой",
-		"LABEL_VIEW_OPTIONS": "Отображение",
-		"LABEL_USE_PREVIEW_PANE": "Использовать трехколоночный режим отображения",
+		"LANGUAGE": "Язык",
+		"IDENTITY": "Профиль",
+		"LAYOUT": "Разметка",
+		"LAYOUT_NO_SPLIT": "Одна панель",
+		"LAYOUT_VERTICAL_SPLIT": "Вертикальные панели",
+		"LAYOUT_HORIZONTAL_SPLIT": "Горизонтальные панели",
+		"EDITOR": "Редактор текста по умолчанию",
+		"EDITOR_HTML": "Форматированный",
+		"EDITOR_PLAIN": "Простой",
+		"VIEW_OPTIONS": "Отображение",
+		"USE_PREVIEW_PANE": "Использовать трехколоночный режим отображения",
 		"HIDE_DELETED_MESSAGES": "Скрыть сообщения, помеченные для удаления",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Показывать чекбоксы в списках",
-		"LABEL_USE_THREADS": "Сворачивать письма в переписках",
-		"LABEL_REPLY_SAME_FOLDER": "Помещать ответы в ту же папку, где находится оригинал",
-		"LABEL_SHOW_IMAGES": "Показывать внешние изображения в теле письма без предупреждения",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Cообщений на одной странице",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Показывать чекбоксы в списках",
+		"USE_THREADS": "Сворачивать письма в переписках",
+		"REPLY_SAME_FOLDER": "Помещать ответы в ту же папку, где находится оригинал",
+		"SHOW_IMAGES": "Показывать внешние изображения в теле письма без предупреждения",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Cообщений на одной странице",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Уведомления",
-		"LABEL_SOUND_NOTIFICATION": "Звуковые уведомления",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Показывать уведомления о новых сообщениях в всплывающих подсказках",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Блокировано браузером)"
+		"NOTIFICATIONS": "Уведомления",
+		"SOUND_NOTIFICATION": "Звуковые уведомления",
+		"CHROME_NOTIFICATION_DESC": "Показывать уведомления о новых сообщениях в всплывающих подсказках",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Блокировано браузером)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматически добавлять получателей писем в адресную книгу",

snappymail/v/0.0.0/app/localization/sk-SK/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Odpovedané"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Prepnúť na celú obrazovku",
-		"ZOOM": "Zoom",
-		"CLOSE": "Zatvoriť (Esc)",
-		"GALLERY_PREV": "Predchádzajúci (šípka vľavo)",
-		"GALLERY_NEXT": "Nasledujúci (šípka vpravo)",
-		"GALLERY_COUNTER": "%curr% z %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Vytvoriť",
 		"BUTTON_NEW_MESSAGE": "Nová správa",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Všeobecné",
-		"LABEL_LANGUAGE": "Jazyk",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Predvolený editor správ",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Text",
-		"LABEL_VIEW_OPTIONS": "Možnosti zobrazenia",
-		"LABEL_USE_PREVIEW_PANE": "Používať panel rýchleho zobrazenia",
+		"LANGUAGE": "Jazyk",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"EDITOR": "Predvolený editor správ",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Text",
+		"VIEW_OPTIONS": "Možnosti zobrazenia",
+		"USE_PREVIEW_PANE": "Používať panel rýchleho zobrazenia",
 		"HIDE_DELETED_MESSAGES": "Skryť správy označené na odstránenie",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Zobrazenie zaštkrtávacích políčok v zozname",
-		"LABEL_USE_THREADS": "Zobraziť ako konverzácie",
-		"LABEL_REPLY_SAME_FOLDER": "Umiestňovať odpovede do priečinka so správou ktorej sa týkajú",
-		"LABEL_SHOW_IMAGES": "Vždy zobrazovať obrázky v tele správy",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Správ na stranu",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Zobrazenie zaštkrtávacích políčok v zozname",
+		"USE_THREADS": "Zobraziť ako konverzácie",
+		"REPLY_SAME_FOLDER": "Umiestňovať odpovede do priečinka so správou ktorej sa týkajú",
+		"SHOW_IMAGES": "Vždy zobrazovať obrázky v tele správy",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Správ na stranu",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifikácie",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Zobrazovať upozornenia na nové správy",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prehliadačom)"
+		"NOTIFICATIONS": "Notifikácie",
+		"SOUND_NOTIFICATION": "Sound notification",
+		"CHROME_NOTIFICATION_DESC": "Zobrazovať upozornenia na nové správy",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prehliadačom)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automaticky pridávať príjemcov správ do Adresára",

snappymail/v/0.0.0/app/localization/sl-SI/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Odgovoril"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Preklopi celozaslonski pogled",
-		"ZOOM": "Približaj\/oddalji",
-		"CLOSE": "Zapri (Esc)",
-		"GALLERY_PREV": "Nazaj (puščica levo)",
-		"GALLERY_NEXT": "Naprej (puščica desno)",
-		"GALLERY_COUNTER": "%curr% od %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Sestavi",
 		"BUTTON_NEW_MESSAGE": "Novo sporočilo",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Splošno",
-		"LABEL_LANGUAGE": "Jezik",
-		"LABEL_IDENTITY": "Identiteta",
-		"LABEL_LAYOUT": "Postavitev",
-		"LABEL_LAYOUT_NO_SPLIT": "Brez razdelitve",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Navpično razdeljeno",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Vodoravno razdeljeno",
-		"LABEL_EDITOR": "Privzeta vrsta besedila",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Navadno besedilo",
-		"LABEL_VIEW_OPTIONS": "Možnosti ogleda",
-		"LABEL_USE_PREVIEW_PANE": "Uporabi polje za predogled",
+		"LANGUAGE": "Jezik",
+		"IDENTITY": "Identiteta",
+		"LAYOUT": "Postavitev",
+		"LAYOUT_NO_SPLIT": "Brez razdelitve",
+		"LAYOUT_VERTICAL_SPLIT": "Navpično razdeljeno",
+		"LAYOUT_HORIZONTAL_SPLIT": "Vodoravno razdeljeno",
+		"EDITOR": "Privzeta vrsta besedila",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Navadno besedilo",
+		"VIEW_OPTIONS": "Možnosti ogleda",
+		"USE_PREVIEW_PANE": "Uporabi polje za predogled",
 		"HIDE_DELETED_MESSAGES": "Skrij sporočila, označena za brisanje",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Na seznamu pokaži kvadratke za izbor",
-		"LABEL_USE_THREADS": "Uporabi niti",
-		"LABEL_REPLY_SAME_FOLDER": "Shrani odgovore v mapo sporočila, na katerega se odgovarja",
-		"LABEL_SHOW_IMAGES": "Vedno prikaži zunanje slike v telesu sporočila",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Sporočil na strani",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Na seznamu pokaži kvadratke za izbor",
+		"USE_THREADS": "Uporabi niti",
+		"REPLY_SAME_FOLDER": "Shrani odgovore v mapo sporočila, na katerega se odgovarja",
+		"SHOW_IMAGES": "Vedno prikaži zunanje slike v telesu sporočila",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Sporočil na strani",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Obvestila",
-		"LABEL_SOUND_NOTIFICATION": "Zvočno obvestilo",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Prikaži obvestila ob novih sporočilih",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Zavrnil brskalnik)"
+		"NOTIFICATIONS": "Obvestila",
+		"SOUND_NOTIFICATION": "Zvočno obvestilo",
+		"CHROME_NOTIFICATION_DESC": "Prikaži obvestila ob novih sporočilih",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Zavrnil brskalnik)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Samodejno dodaj prejemnike v imenik",

snappymail/v/0.0.0/app/localization/sv-SE/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "Svarade"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Växla fullskärmsläge",
-		"ZOOM": "Zooma in\/ut",
-		"CLOSE": "Stäng (Esc)",
-		"GALLERY_PREV": "Föregående (Vänster pil knapp)",
-		"GALLERY_NEXT": "Nästa (Höger pil knapp)",
-		"GALLERY_COUNTER": "%curr% av %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Skriv nytt",
 		"BUTTON_NEW_MESSAGE": "Nytt meddelande",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Allmänt",
-		"LABEL_LANGUAGE": "Språk",
-		"LABEL_IDENTITY": "Identitet",
-		"LABEL_LAYOUT": "Stil",
-		"LABEL_LAYOUT_NO_SPLIT": "Utan delad vy",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertikalt delad vy",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horisontellt delad vy",
-		"LABEL_EDITOR": "Textredigerare",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Oformaterad text",
-		"LABEL_VIEW_OPTIONS": "Visa alternativ",
-		"LABEL_USE_PREVIEW_PANE": "Avänd förhandsgranskningsfönster",
+		"LANGUAGE": "Språk",
+		"IDENTITY": "Identitet",
+		"LAYOUT": "Stil",
+		"LAYOUT_NO_SPLIT": "Utan delad vy",
+		"LAYOUT_VERTICAL_SPLIT": "Vertikalt delad vy",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horisontellt delad vy",
+		"EDITOR": "Textredigerare",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Oformaterad text",
+		"VIEW_OPTIONS": "Visa alternativ",
+		"USE_PREVIEW_PANE": "Avänd förhandsgranskningsfönster",
 		"HIDE_DELETED_MESSAGES": "Dölj meddelanden som är markerade för radering",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Visa kryssrutor i listan",
-		"LABEL_USE_THREADS": "Använd trådar",
-		"LABEL_REPLY_SAME_FOLDER": "Placera svar i samma mapp som mottagna meddelandet",
-		"LABEL_SHOW_IMAGES": "Visa alltid bilder i mail",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Meddelanden per sida",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Markera meddelandet som läst efter",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Visa kryssrutor i listan",
+		"USE_THREADS": "Använd trådar",
+		"REPLY_SAME_FOLDER": "Placera svar i samma mapp som mottagna meddelandet",
+		"SHOW_IMAGES": "Visa alltid bilder i mail",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Meddelanden per sida",
+		"MARK_MESSAGE_READ_AFTER": "Markera meddelandet som läst efter",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "sekunder",
-		"LABEL_NOTIFICATIONS": "Aviseringar",
-		"LABEL_SOUND_NOTIFICATION": "Ljudnotifikation",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Visa nya meddelande-aviseringar som popup-fönster",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Blockat av webbläsaren)"
+		"NOTIFICATIONS": "Aviseringar",
+		"SOUND_NOTIFICATION": "Ljudnotifikation",
+		"CHROME_NOTIFICATION_DESC": "Visa nya meddelande-aviseringar som popup-fönster",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Blockat av webbläsaren)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Lägg till mottagare automatiskt i din adressbok",

snappymail/v/0.0.0/app/localization/tr-TR/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "cevaplandı"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Yakınlaştır\/Uzaklaştır",
-		"CLOSE": "Kapat (Esc)",
-		"GALLERY_PREV": "Önceki (Sol yön tuşu)",
-		"GALLERY_NEXT": "Sonraki (Sağ yön tuşu)",
-		"GALLERY_COUNTER": "%curr% of %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Yaz",
 		"BUTTON_NEW_MESSAGE": "Yeni Mesaj",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Genel",
-		"LABEL_LANGUAGE": "Dil",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Varsayılan text editör",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Düz",
-		"LABEL_VIEW_OPTIONS": "Ayarları görüntüle",
-		"LABEL_USE_PREVIEW_PANE": "Önizleme bölmesini kullanın",
+		"LANGUAGE": "Dil",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"EDITOR": "Varsayılan text editör",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Düz",
+		"VIEW_OPTIONS": "Ayarları görüntüle",
+		"USE_PREVIEW_PANE": "Önizleme bölmesini kullanın",
 		"HIDE_DELETED_MESSAGES": "Silinmek üzere işaretlenen mesajları gizle",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Listede ekran onay kutularını göster",
-		"LABEL_USE_THREADS": "Konuları kullanın",
-		"LABEL_REPLY_SAME_FOLDER": "Klasördeki cevapları mesajlarda göster",
-		"LABEL_SHOW_IMAGES": "Herzaman gelen maillerdeki resimleri görüntüle.",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Messages on page",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Listede ekran onay kutularını göster",
+		"USE_THREADS": "Konuları kullanın",
+		"REPLY_SAME_FOLDER": "Klasördeki cevapları mesajlarda göster",
+		"SHOW_IMAGES": "Herzaman gelen maillerdeki resimleri görüntüle.",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Messages on page",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Bildirimler",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Yeni mesajları pop-up ile göster",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Tarayıcınız tarafından engellendi)"
+		"NOTIFICATIONS": "Bildirimler",
+		"SOUND_NOTIFICATION": "Sound notification",
+		"CHROME_NOTIFICATION_DESC": "Yeni mesajları pop-up ile göster",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Tarayıcınız tarafından engellendi)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Otomatik olarak adres defterinize alıcıyı ekle",

snappymail/v/0.0.0/app/localization/uk-UA/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "відповів"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "Закрити (Esc)",
-		"GALLERY_PREV": "Назад (Стрілка ←)",
-		"GALLERY_NEXT": "Вперед (Стрілка →)",
-		"GALLERY_COUNTER": "%curr% з %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Написати",
 		"BUTTON_NEW_MESSAGE": "New message",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Основні налаштування",
-		"LABEL_LANGUAGE": "Мова",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Редактор тексту за змовчуванням",
-		"LABEL_EDITOR_HTML": "Форматований",
-		"LABEL_EDITOR_PLAIN": "Простий",
-		"LABEL_VIEW_OPTIONS": "Відображення",
-		"LABEL_USE_PREVIEW_PANE": "Використовувати трьохколонний режим відображення",
+		"LANGUAGE": "Мова",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"EDITOR": "Редактор тексту за змовчуванням",
+		"EDITOR_HTML": "Форматований",
+		"EDITOR_PLAIN": "Простий",
+		"VIEW_OPTIONS": "Відображення",
+		"USE_PREVIEW_PANE": "Використовувати трьохколонний режим відображення",
 		"HIDE_DELETED_MESSAGES": "Приховати повідомлення, позначені для видалення",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Показувати чекбокси у списках",
-		"LABEL_USE_THREADS": "Згортати листи у листуваннях",
-		"LABEL_REPLY_SAME_FOLDER": "Поміщати відповіді в ту ж теку, де знаходиться оригінал",
-		"LABEL_SHOW_IMAGES": "Показувати зовнішні зображення в тілі листа без попередження",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Повідомлень на одній сторінці",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Показувати чекбокси у списках",
+		"USE_THREADS": "Згортати листи у листуваннях",
+		"REPLY_SAME_FOLDER": "Поміщати відповіді в ту ж теку, де знаходиться оригінал",
+		"SHOW_IMAGES": "Показувати зовнішні зображення в тілі листа без попередження",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "Повідомлень на одній сторінці",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Сповіщення",
-		"LABEL_SOUND_NOTIFICATION": "Звукове сповіщення",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Показувати сповіщення про нові повідомлення у підказках",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Заблоковано браузером)"
+		"NOTIFICATIONS": "Сповіщення",
+		"SOUND_NOTIFICATION": "Звукове сповіщення",
+		"CHROME_NOTIFICATION_DESC": "Показувати сповіщення про нові повідомлення у підказках",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Заблоковано браузером)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматично додавати отримувачів у адресну книгу",

snappymail/v/0.0.0/app/localization/vi-VN/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "Một cấp độ",
 		"LABEL_REPLIED": "Đã trả lời"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Đóng\/mở toàn màn hình",
-		"ZOOM": "Phóng vào\/ra",
-		"CLOSE": "Đóng (phím Esc)",
-		"GALLERY_PREV": "Phần trước (mũi tên bên trái)",
-		"GALLERY_NEXT": "Phần tiếp (mũi tên bên phải)",
-		"GALLERY_COUNTER": "%curr% của tổng %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Viết thư",
 		"BUTTON_NEW_MESSAGE": "Viết thư mới",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "Tổng quan",
-		"LABEL_LANGUAGE": "Ngôn ngữ",
-		"LABEL_IDENTITY": "Tên gọi",
-		"LABEL_LAYOUT": "Bố cục",
-		"LABEL_LAYOUT_NO_SPLIT": "Không phân màn hình",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Phân dọc màn hình",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Phân ngang màn hình",
-		"LABEL_EDITOR": "Chỉnh dạng văn bản mặc định",
-		"LABEL_EDITOR_HTML": "Dạng Html",
-		"LABEL_EDITOR_PLAIN": "Dạng chữ viết thường",
-		"LABEL_VIEW_OPTIONS": "Xem những lựa chọn",
-		"LABEL_USE_PREVIEW_PANE": "Dùng bảng xem trước thư",
+		"LANGUAGE": "Ngôn ngữ",
+		"IDENTITY": "Tên gọi",
+		"LAYOUT": "Bố cục",
+		"LAYOUT_NO_SPLIT": "Không phân màn hình",
+		"LAYOUT_VERTICAL_SPLIT": "Phân dọc màn hình",
+		"LAYOUT_HORIZONTAL_SPLIT": "Phân ngang màn hình",
+		"EDITOR": "Chỉnh dạng văn bản mặc định",
+		"EDITOR_HTML": "Dạng Html",
+		"EDITOR_PLAIN": "Dạng chữ viết thường",
+		"VIEW_OPTIONS": "Xem những lựa chọn",
+		"USE_PREVIEW_PANE": "Dùng bảng xem trước thư",
 		"HIDE_DELETED_MESSAGES": "Ẩn các tin nhắn được đánh dấu để xóa",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Hiển thị ô đánh dấu dưới dạng danh sách",
-		"LABEL_USE_THREADS": "Nối thư qua lại cùng một tiêu đề thành một chuỗi hội thoại",
-		"LABEL_REPLY_SAME_FOLDER": "Đặt thư phản hồi gửi đi vào chung thư mục của bức thư nhận được",
-		"LABEL_SHOW_IMAGES": "Luôn hiển thị hình ảnh bên ngoài gửi vào trong phần thân của thư",
-		"LABEL_PREFER_HTML": "Nghiêng về lựa chọn HTML hơn dạng chữ viết thường",
-		"LABEL_PREFER_HTML_INFO": "Đôi lúc thư nhận được sẽ ở cả hai dạng. Lựa chọn này cho phép bạn chỉnh phần HTML hay phần chữ viết thường trong thư bạn muốn hiển thị lên.",
-		"LABEL_REMOVE_COLORS": "Loại bỏ hình nền và màu chữ trong phần thân của thư",
-		"LABEL_MESSAGE_PER_PAGE": "Số thư hiển thị trên trang",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Đánh dấu thư là để đọc sau",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "Hiển thị ô đánh dấu dưới dạng danh sách",
+		"USE_THREADS": "Nối thư qua lại cùng một tiêu đề thành một chuỗi hội thoại",
+		"REPLY_SAME_FOLDER": "Đặt thư phản hồi gửi đi vào chung thư mục của bức thư nhận được",
+		"SHOW_IMAGES": "Luôn hiển thị hình ảnh bên ngoài gửi vào trong phần thân của thư",
+		"PREFER_HTML": "Nghiêng về lựa chọn HTML hơn dạng chữ viết thường",
+		"PREFER_HTML_INFO": "Đôi lúc thư nhận được sẽ ở cả hai dạng. Lựa chọn này cho phép bạn chỉnh phần HTML hay phần chữ viết thường trong thư bạn muốn hiển thị lên.",
+		"REMOVE_COLORS": "Loại bỏ hình nền và màu chữ trong phần thân của thư",
+		"MESSAGE_PER_PAGE": "Số thư hiển thị trên trang",
+		"MARK_MESSAGE_READ_AFTER": "Đánh dấu thư là để đọc sau",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "giây",
-		"LABEL_NOTIFICATIONS": "Thông báo",
-		"LABEL_SOUND_NOTIFICATION": "Thông báo âm thanh",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Hiện thị thông báo nẩy lên nhanh khi có thư mới",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Đang bị chặn bởi trình duyệt web)"
+		"NOTIFICATIONS": "Thông báo",
+		"SOUND_NOTIFICATION": "Thông báo âm thanh",
+		"CHROME_NOTIFICATION_DESC": "Hiện thị thông báo nẩy lên nhanh khi có thư mới",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Đang bị chặn bởi trình duyệt web)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Tự động thêm người nhận thư vào sổ địa chỉ của bạn",

snappymail/v/0.0.0/app/localization/zh-CN/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "已回答"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "切换全屏",
-		"ZOOM": "放大\/缩小",
-		"CLOSE": "关闭 (Esc)",
-		"GALLERY_PREV": "向前 (左箭头键)",
-		"GALLERY_NEXT": "向后 (右箭头键)",
-		"GALLERY_COUNTER": "%curr% \/ %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "写邮件",
 		"BUTTON_NEW_MESSAGE": "新邮件",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "一般设置",
-		"LABEL_LANGUAGE": "语言",
-		"LABEL_IDENTITY": "身份",
-		"LABEL_LAYOUT": "布局",
-		"LABEL_LAYOUT_NO_SPLIT": "不分隔",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "垂直分隔",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "水平分隔",
-		"LABEL_EDITOR": "默认格式",
-		"LABEL_EDITOR_HTML": "html文本",
-		"LABEL_EDITOR_PLAIN": "普通文本",
-		"LABEL_VIEW_OPTIONS": "视图选项",
-		"LABEL_USE_PREVIEW_PANE": "使用预览",
+		"LANGUAGE": "语言",
+		"IDENTITY": "身份",
+		"LAYOUT": "布局",
+		"LAYOUT_NO_SPLIT": "不分隔",
+		"LAYOUT_VERTICAL_SPLIT": "垂直分隔",
+		"LAYOUT_HORIZONTAL_SPLIT": "水平分隔",
+		"EDITOR": "默认格式",
+		"EDITOR_HTML": "html文本",
+		"EDITOR_PLAIN": "普通文本",
+		"VIEW_OPTIONS": "视图选项",
+		"USE_PREVIEW_PANE": "使用预览",
 		"HIDE_DELETED_MESSAGES": "隱藏標記為刪除的郵件",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "列表中显示多选框",
-		"LABEL_USE_THREADS": "使用对话",
-		"LABEL_REPLY_SAME_FOLDER": "将回复的邮件置于被回复的邮件所在的文件夹",
-		"LABEL_SHOW_IMAGES": "总是显示外部图片信息",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "从消息中删除背景和文本颜色",
-		"LABEL_MESSAGE_PER_PAGE": "封邮件每页",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "将消息标记为已读",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "列表中显示多选框",
+		"USE_THREADS": "使用对话",
+		"REPLY_SAME_FOLDER": "将回复的邮件置于被回复的邮件所在的文件夹",
+		"SHOW_IMAGES": "总是显示外部图片信息",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "从消息中删除背景和文本颜色",
+		"MESSAGE_PER_PAGE": "封邮件每页",
+		"MARK_MESSAGE_READ_AFTER": "将消息标记为已读",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "秒",
-		"LABEL_NOTIFICATIONS": "通知",
-		"LABEL_SOUND_NOTIFICATION": "提示音",
-		"LABEL_CHROME_NOTIFICATION_DESC": "显示新邮件弹窗",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(被浏览器阻止)"
+		"NOTIFICATIONS": "通知",
+		"SOUND_NOTIFICATION": "提示音",
+		"CHROME_NOTIFICATION_DESC": "显示新邮件弹窗",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(被浏览器阻止)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "自动添加到你的地址簿",

snappymail/v/0.0.0/app/localization/zh-TW/user.json

@@ -68,14 +68,6 @@
 		"LABEL_SUBFOLDERS_SUBTREE_ONE": "One level",
 		"LABEL_REPLIED": "已回答"
 	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "關閉 (Esc)",
-		"GALLERY_PREV": "向前 (Left arrow key)",
-		"GALLERY_NEXT": "向後 (Right arrow key)",
-		"GALLERY_COUNTER": "%curr% \/ %total%"
-	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "寫郵件",
 		"BUTTON_NEW_MESSAGE": "New message",
@@ -389,33 +381,34 @@
 	},
 	"SETTINGS_GENERAL": {
 		"LEGEND_GENERAL": "一般設置",
-		"LABEL_LANGUAGE": "語言",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "默認格式",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Plain",
-		"LABEL_VIEW_OPTIONS": "視圖選項",
-		"LABEL_USE_PREVIEW_PANE": "使用預覽",
+		"LANGUAGE": "語言",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"EDITOR": "默認格式",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Plain",
+		"VIEW_OPTIONS": "視圖選項",
+		"USE_PREVIEW_PANE": "使用預覽",
 		"HIDE_DELETED_MESSAGES": "隐藏标记为删除的邮件",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "清單中顯示多選框",
-		"LABEL_USE_THREADS": "使用對話",
-		"LABEL_REPLY_SAME_FOLDER": "將回復的郵件放置到其回復的郵件所在資料夾",
-		"LABEL_SHOW_IMAGES": "總是顯示外部圖片資訊",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "封郵件每頁",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"LABEL_MSG_DEFAULT_ACTION": "Default action",
+		"USE_CHECKBOXES_IN_LIST": "清單中顯示多選框",
+		"USE_THREADS": "使用對話",
+		"REPLY_SAME_FOLDER": "將回復的郵件放置到其回復的郵件所在資料夾",
+		"SHOW_IMAGES": "總是顯示外部圖片資訊",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"MESSAGE_PER_PAGE": "封郵件每頁",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "通知",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "顯示新郵件彈窗",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(被瀏覽器阻止)"
+		"NOTIFICATIONS": "通知",
+		"SOUND_NOTIFICATION": "Sound notification",
+		"CHROME_NOTIFICATION_DESC": "顯示新郵件彈窗",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(被瀏覽器阻止)",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "自動添加到你的位址簿",

snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html

@@ -224,7 +224,7 @@
 							<div class="readReceipt" data-bind="visible: !isDraftOrSentFolder() && message().readReceipt() && !message().isReadReceipt(), click: readReceipt"
 								data-icon="✉" data-i18n="MESSAGE/BUTTON_NOTIFY_READ_RECEIPT"></div>
 							<div class="attachmentsPlace" data-bind="visible: message().hasAttachments(), css: {'selection-mode' : showAttachmentControls}">
-								<ul class="attachmentList" data-bind="foreach: message().attachments()">
+								<ul class="attachmentList" data-bind="foreach: message().listAttachments()">
 									<li class="attachmentItem" draggable="true"
 											data-bind="event: { 'dragstart': eventDragStart }, attr: { 'title': fileName }, css: {'checked': checked}">
 										<div class="attachmentIconParent" data-bind="css: { 'hasPreview': hasPreview(), 'hasPreplay': hasPreplay(), 'isImage': isImage() }">

snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html

@@ -1,18 +1,18 @@
 <div class="form-horizontal">
 	<div class="legend" data-i18n="SETTINGS_GENERAL/LEGEND_GENERAL"></div>
 	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_IDENTITY"></label>
+		<label data-i18n="SETTINGS_GENERAL/IDENTITY"></label>
 		<b class="editMainIdentity" data-bind="click: editMainIdentity, text: identityMainDesc"></b>
 	</div>
 	<div class="control-group" data-bind="visible: allowLanguagesOnSettings">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_LANGUAGE"></label>
+		<label data-i18n="SETTINGS_GENERAL/LANGUAGE"></label>
 		<div>
 			<span class="select" tabindex="0" data-bind="text: languageFullName, click: selectLanguage, onSpace: selectLanguage, onEnter: selectLanguage"></span>
 			<span data-bind="saveTrigger: languageTrigger"></span>
 		</div>
 	</div>
 	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_LAYOUT"></label>
+		<label data-i18n="SETTINGS_GENERAL/LAYOUT"></label>
 		<div data-bind="component: {
 			name: 'Select',
 			params: {
@@ -25,7 +25,7 @@
 		}"></div>
 	</div>
 	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_MESSAGE_PER_PAGE"></label>
+		<label data-i18n="SETTINGS_GENERAL/MESSAGE_PER_PAGE"></label>
 		<div>
 			<input type="number" min="10" max="50" step="1" class="span1" data-bind="textInput: messagesPerPage">
 			&nbsp;
@@ -44,21 +44,21 @@
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					label: 'SETTINGS_GENERAL/LABEL_USE_CHECKBOXES_IN_LIST',
+					label: 'SETTINGS_GENERAL/USE_CHECKBOXES_IN_LIST',
 					value: useCheckboxesInList
 				}
 			}"></div>
 			<div data-bind="visible: threadsAllowed, component: {
 				name: 'Checkbox',
 				params: {
-					label: 'SETTINGS_GENERAL/LABEL_USE_THREADS',
+					label: 'SETTINGS_GENERAL/USE_THREADS',
 					value: useThreads
 				}
 			}"></div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					label: 'SETTINGS_GENERAL/LABEL_REPLY_SAME_FOLDER',
+					label: 'SETTINGS_GENERAL/REPLY_SAME_FOLDER',
 					value: replySameFolder
 				}
 			}"></div>
@@ -67,7 +67,7 @@
 
 	<div class="legend" data-i18n="SHORTCUTS_HELP/TAB_COMPOSE"></div>
 	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_EDITOR"></label>
+		<label data-i18n="SETTINGS_GENERAL/EDITOR"></label>
 		<div data-bind="component: {
 			name: 'Select',
 			params: {
@@ -114,7 +114,7 @@
 
 	<div class="legend" data-i18n="SHORTCUTS_HELP/TAB_MESSAGE_VIEW"></div>
 	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_MARK_MESSAGE_READ_AFTER"></label>
+		<label data-i18n="SETTINGS_GENERAL/MARK_MESSAGE_READ_AFTER"></label>
 		<div>
 			<input type="number" min="0" step="1" class="span1" data-bind="textInput: messageReadDelay">
 			&nbsp;
@@ -123,7 +123,7 @@
 		</div>
 	</div>
 	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_MSG_DEFAULT_ACTION"></label>
+		<label data-i18n="SETTINGS_GENERAL/MSG_DEFAULT_ACTION"></label>
 		<div data-bind="component: {
 			name: 'Select',
 			params: {
@@ -140,50 +140,57 @@
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					label: 'SETTINGS_GENERAL/LABEL_SHOW_IMAGES',
+					label: 'SETTINGS_GENERAL/SHOW_IMAGES',
 					value: showImages
 				}
 			}"></div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					label: 'SETTINGS_GENERAL/LABEL_REMOVE_COLORS',
+					label: 'SETTINGS_GENERAL/REMOVE_COLORS',
 					value: removeColors
 				}
 			}"></div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					label: 'SETTINGS_GENERAL/LABEL_PREFER_HTML',
+					label: 'SETTINGS_GENERAL/LIST_INLINE_ATTACHMENTS',
+					value: listInlineAttachments
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/PREFER_HTML',
 					value: viewHTML
 				}
 			}"></div>
-			<em style="margin: 0 0 1em 2em;display: block;" data-i18n="SETTINGS_GENERAL/LABEL_PREFER_HTML_INFO"></em>
+			<em style="margin: 0 0 1em 2em;display: block;" data-i18n="SETTINGS_GENERAL/PREFER_HTML_INFO"></em>
 		</div>
 	</div>
 
-	<div class="legend" data-i18n="SETTINGS_GENERAL/LABEL_NOTIFICATIONS"></div>
+	<div class="legend" data-i18n="SETTINGS_GENERAL/NOTIFICATIONS"></div>
 	<div class="control-group">
 		<div>
 			<div>
 				<div data-bind="component: {
 					name: 'Checkbox',
 					params: {
-						label: 'SETTINGS_GENERAL/LABEL_CHROME_NOTIFICATION_DESC',
+						label: 'SETTINGS_GENERAL/CHROME_NOTIFICATION_DESC',
 						value: desktopNotification,
 						enable: isDesktopNotificationAllowed,
 						inline: true
 					}
 				}"></div>
 				&nbsp;
-				<span data-bind="visible: !isDesktopNotificationAllowed()" style="color: #999" data-i18n="SETTINGS_GENERAL/LABEL_CHROME_NOTIFICATION_DESC_DENIED"></span>
+				<span data-bind="visible: !isDesktopNotificationAllowed()" style="color: #999" data-i18n="SETTINGS_GENERAL/CHROME_NOTIFICATION_DESC_DENIED"></span>
 				<span class="fontastic" data-bind="click: testSystemNotification" style="color:green;cursor:pointer">▶️</span>
 			</div>
 			<div>
 				<div data-bind="component: {
 					name: 'Checkbox',
 					params: {
-						label: 'SETTINGS_GENERAL/LABEL_SOUND_NOTIFICATION',
+						label: 'SETTINGS_GENERAL/SOUND_NOTIFICATION',
 						value: soundNotification,
 						inline: true
 					}