From eaa54f9bdd45ef0e761785829abd0f3deafae31b Mon Sep 17 00:00:00 2001
From: garfield69 <garfield69@outlook.com>
Date: Fri, 2 Oct 2015 18:12:07 +1300
Subject: [PATCH] Fix #564

standalone settings to choose minimize location (Taskbar or Systray),
and fixes for minimize recognition (which was trying to use localstorage
boolean values without json parsing/stringify. Duh!
@SchizoDuckie  please check the Dutch translations.
---
 _locales/de_de.json                    |  10 +++++--
 _locales/en_uk.json                    |  10 +++++--
 _locales/en_us.json                    |  10 +++++--
 _locales/es_es.json                    |  10 +++++--
 _locales/fr_fr.json                    |  10 +++++--
 _locales/it_it.json                    |  10 +++++--
 _locales/ja_jp.json                    |  10 +++++--
 _locales/ko_kr.json                    |  10 +++++--
 _locales/nl_nl.json                    |  10 +++++--
 _locales/pt_pt.json                    |  10 +++++--
 _locales/ro_ro.json                    |  10 +++++--
 _locales/ru_ru.json                    |  10 +++++--
 _locales/sl_si.json                    |  10 +++++--
 _locales/sv_se.json                    |  10 +++++--
 _locales/zh_cn.json                    |  10 +++++--
 css/main.css                           |  16 +++++++++++
 img/icon-systray.png                   | Bin 0 -> 333 bytes
 img/icon-taskbar.png                   | Bin 0 -> 334 bytes
 js/app.standalone.systray.js           |  35 ++++++++++++++-----------
 js/app.standalone.windowdressing.js    |   2 +-
 js/controllers/settings/DisplayCtrl.js |  14 +++++++---
 js/services/SettingsService.js         |   1 -
 templates/settings/display.html        |  15 +++++++++++
 23 files changed, 182 insertions(+), 51 deletions(-)
 create mode 100644 img/icon-systray.png
 create mode 100644 img/icon-taskbar.png

diff --git a/_locales/de_de.json b/_locales/de_de.json
index 7c214d7ca..f99ff4a0d 100644
--- a/_locales/de_de.json
+++ b/_locales/de_de.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimieren in die Taskleiste",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "Minimieren Sie bis Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "Wählen Sie, ob DuckieTV die Fenster in die Taskleiste oder bis Systray minimieren.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "Minimieren Ort",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "Minimieren Sie bis Taskbar",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "Taskbar",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimieren",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "Minimierte",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "Normale",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "Normalized",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Wählen Sie, ob Fenster DuckieTV sollte in der Taskleiste auf Start-up zu minimieren.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Wählen Sie, ob Fenster DuckieTV sollte beim Start zu minimieren.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "Fenster auf Start-up",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Topsites Aktivierungsmodus",
     "SETTINGS/DISPLAY/topsites-hide/btn": "Behindert Meistbesuchte Seiten",
diff --git a/_locales/en_uk.json b/_locales/en_uk.json
index c294f6ac1..dc7166638 100644
--- a/_locales/en_uk.json
+++ b/_locales/en_uk.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimize to system-tray",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "Minimise to Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "Choose whether to minimise DuckieTV's window to the Taskbar or the Systray.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "Minimise Location",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "Minimise to Taskbar",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "Taskbar",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimise",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "Minimized",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "Normal",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "Normalized",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Choose whether DuckieTV's window should minimize to the system-tray on start-up.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Choose whether DuckieTV's window should minimise on start-up.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "Window on start-up",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Topsites activation mode",
     "SETTINGS/DISPLAY/topsites-hide/btn": "Disable Most Visited Sites",
diff --git a/_locales/en_us.json b/_locales/en_us.json
index 8d8518a8e..88524a1d9 100644
--- a/_locales/en_us.json
+++ b/_locales/en_us.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimize to system-tray",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "Minimize to Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "Choose whether to minimize DuckieTV's window to the Taskbar or the Systray.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "Minimize Location",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "Minimize to Taskbar",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "Taskbar",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimize",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "Minimized",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "Normal",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "Normalized",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Choose whether DuckieTV's window should minimize to the system-tray on start-up.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Choose whether DuckieTV's window should minimize on start-up.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "Window on start-up",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Topsites activation mode",
     "SETTINGS/DISPLAY/topsites-hide/btn": "Disable Most Visited Sites",
diff --git a/_locales/es_es.json b/_locales/es_es.json
index 27e37e365..7d2c17b1a 100644
--- a/_locales/es_es.json
+++ b/_locales/es_es.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimizar a la bandeja del sistema",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "Minimizar a la bandeja del sistema",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "Elija si desea minimizar la ventana de DuckieTV a la barra de tareas o la bandeja del sistema.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "Minimizar Ubicación",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "Minimizar a la barra de tareas",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "Barra de tareas",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimizar",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "Minimiza",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "Normal",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "Normalizado",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Elija si la ventana de DuckieTV debe minimizar a la bandeja del sistema en el arranque.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Elija si la ventana de DuckieTV debe minimizar en el arranque.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "Ventana en el arranque",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Modo de activación Topsites",
     "SETTINGS/DISPLAY/topsites-hide/btn": "Desactivar Lugares más visitados",
diff --git a/_locales/fr_fr.json b/_locales/fr_fr.json
index bd166eaa3..59233696c 100644
--- a/_locales/fr_fr.json
+++ b/_locales/fr_fr.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Réduire dans la zone de notification",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "Réduire à la barre d'état système",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "Choisissez si vous voulez minimiser la fenêtre de DuckieTV à la barre des tâches ou la barre d'état système.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "Réduire Localisation",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "Réduire à la barre des tâches",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "Taskbar",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimiser",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "Minimisé",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "Normal",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "Normal",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Choisir si la fenêtre de DuckieTV doit se minimiser dans la zone de notification au démarrage.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Choisissez si la fenêtre de DuckieTV devrait minimiser au démarrage.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "Mode d'affichage au lancement",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Mode d'activation des Top sites",
     "SETTINGS/DISPLAY/topsites-hide/btn": "Désactiver les sites les plus visités",
diff --git a/_locales/it_it.json b/_locales/it_it.json
index d5cca1c86..31fec4b9c 100644
--- a/_locales/it_it.json
+++ b/_locales/it_it.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimizzare al vassoio del sistema",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "Riduci a Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "Scegliere se per ridurre al minimo la finestra di DuckieTV alla barra delle applicazioni o Systray.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "Minimizzare Località",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "Minimizzare a barra delle applicazioni",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "Barra delle applicazioni",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Ridurre al minimo",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "Ridotto al minimo",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "Normale",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "Normalizzato",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Scegliere se la finestra di DuckieTV dovrebbe ridurre al minimo la barra delle applicazioni all'avvio.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Scegliere se la finestra di DuckieTV dovrebbe ridurre al minimo all'avvio.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "Finestra su start-up",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Modalità di attivazione Topsites",
     "SETTINGS/DISPLAY/topsites-hide/btn": "Disattivare  siti più visitati",
diff --git a/_locales/ja_jp.json b/_locales/ja_jp.json
index 1110fca86..00e3e4635 100644
--- a/_locales/ja_jp.json
+++ b/_locales/ja_jp.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "システムトレイに最小化",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "システムトレイに最小化",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "タスクバーまたはシステムトレイにDuckieTVのウィンドウを最小化するかどうかを選択します.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "場所を最小化",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "システムトレイ",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "タスクバーする最小化",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "タスクバー",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "最小化",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "最小化",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "ノーマル",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "正規化された",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "DuckieTVのウィンドウが起動時にシステムトレイに最小化する必要があるかどうかを選択します.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "DuckieTVのウィンドウが起動時に最小化するかどうかを選択します.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "起動時にウィンドウ",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "誰でも簡単に設置できる高機能のアクティブ化モード",
     "SETTINGS/DISPLAY/topsites-hide/btn": "使用禁止最も訪問されたサイト",
diff --git a/_locales/ko_kr.json b/_locales/ko_kr.json
index 7913a52ac..779ad049f 100644
--- a/_locales/ko_kr.json
+++ b/_locales/ko_kr.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "시스템 트레이에 최소화",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "시스템 트레이에 최소화",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "작업 표시 줄 또는 시스템 트레이에 DuckieTV의 창을 최소화할지 여부를 선택합니다.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "위치 최소화",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "시스템 트레이",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "작업 표시 줄에 최소화",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "작업 표시 줄",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "최소화",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "최소화",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "표준",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "정규화",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "DuckieTV의 윈도우가 부팅시 시스템 트레이에 최소화해야할지 여부를 선택합니다.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "DuckieTV의 창은 시작에 최소화할지 여부를 선택합니다.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "시작에 창",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Topsites 활성화 모드",
     "SETTINGS/DISPLAY/topsites-hide/btn": "장애인 자주 방문한 사이트",
diff --git a/_locales/nl_nl.json b/_locales/nl_nl.json
index d4bd0e3bd..6b7ad98b7 100644
--- a/_locales/nl_nl.json
+++ b/_locales/nl_nl.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimaliseren naar het systeemvak",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "Minimaliseren naar Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "Kiezen of raam DuckieTV aan de taakbalk of Systray minimaliseren.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "Minimaliseren Locatie",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "Minimaliseren naar Taakbalk",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "Taakbalk",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimaliseren",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "Geminimaliseerd",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "Normaal",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "DuckieTV venster normaal tonen",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Minimaliseer DuckieTV naar het systeemvak bij opstarten.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Kiezen of raam DuckieTV zou moeten minimaliseren bij opstarten.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "Minimaliseren bij opstarten",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Topsites activering modus",
     "SETTINGS/DISPLAY/topsites-hide/btn": "Meest Bezochte Sites uitgeschakeld",
diff --git a/_locales/pt_pt.json b/_locales/pt_pt.json
index 981c265f6..afdc8a8bd 100644
--- a/_locales/pt_pt.json
+++ b/_locales/pt_pt.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimizar para a bandeja do sistema",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "Minimizar para Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "Escolha se pretende minimizar a janela de DuckieTV para a barra de tarefas ou o Systray.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "Minimizar Localização",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "Minimizar para Taskbar",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "Taskbar",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimizar",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "Reduzido ao mínimo",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "Normal",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "Normalizado",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Escolha se a janela de DuckieTV deve minimizar para a bandeja do sistema no start-up",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Escolha se a janela de DuckieTV deve minimizar no start-up.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "Janela no start-up",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Modo de ativação Topsites",
     "SETTINGS/DISPLAY/topsites-hide/btn": "Inválido Sites Mais Visitados",
diff --git a/_locales/ro_ro.json b/_locales/ro_ro.json
index 2f5643c78..21de45ac2 100644
--- a/_locales/ro_ro.json
+++ b/_locales/ro_ro.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimizați în bara de notificări",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "Minimizarea la systray",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "Alegeți dacă pentru a minimiza fereastra DuckieTV la bara de activități sau stare a sistemului.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "Minimiza Locație",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "Minimizarea la Taskbar",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "Taskbar",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Reduce la minimum",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "Minimizat",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "Normal",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "Normalizat",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Alegeți dacă fereastra DuckieTV ar trebui minimizată în bara de notificări la pornire.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Alegeți dacă fereastra DuckieTV ar trebui să reducă la minimum pe start-up.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "Fereastra la pornire",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Mod activare cele mai vizitate site-uri",
     "SETTINGS/DISPLAY/topsites-hide/btn": "Dezactivați cele mai vizitate site-uri",
diff --git a/_locales/ru_ru.json b/_locales/ru_ru.json
index 884e9054f..783988333 100644
--- a/_locales/ru_ru.json
+++ b/_locales/ru_ru.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Минимизировать в системном трее",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "Минимизировать в Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "Выберите, нужно ли минимизировать окно DuckieTV в панель задач или Systray.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "Минимизировать Место",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "Минимизировать в панели задач",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "Панель задач",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Минимизировать",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "Минимизация",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "нормальный",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "нормированный",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Выберите, следует ли окно DuckieTV минимизируют в системном трее при запуске.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Выберите, следует ли окно DuckieTV минимизируют при запуске.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "Окно при запуске",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Режим активации Топсайты",
     "SETTINGS/DISPLAY/topsites-hide/btn": "инвалид Самые посещаемые сайты",
diff --git a/_locales/sl_si.json b/_locales/sl_si.json
index ee1ab2ba4..b39d53328 100644
--- a/_locales/sl_si.json
+++ b/_locales/sl_si.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Čim bolj zmanjšati na sistemski pladenj",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "Čim bolj zmanjšati kotiček",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "Izberite, ali naj se zmanjša okno DuckieTV k opravilni vrstici ali Systray.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "čim bolj zmanjšati Lokacija",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "Čim bolj zmanjšati na penzum",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "Opravilna vrstica",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "čim bolj zmanjšati",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "Minimirano",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "Normal",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "Normalizirana",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Izberite, ali naj se okno DuckieTV je zmanjšati na sistemski pladenj o zagonu.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Izberite, ali naj se okno DuckieTV je zmanjšati na start-up.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "Okno na start-up",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Način aktivacije najbolj obiskanih spletnih strani",
     "SETTINGS/DISPLAY/topsites-hide/btn": "Onemogoči Najbolj obiskane spletne strani",
diff --git a/_locales/sv_se.json b/_locales/sv_se.json
index 425283208..6e0c80ddc 100644
--- a/_locales/sv_se.json
+++ b/_locales/sv_se.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimera till systemfältet",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "Minimera till Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "Välj om du vill minimera DuckieTV fönster till aktivitetsfältet eller Systray.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "Minimera Läge",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "Systray",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "Minimera till aktivitetsfältet",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "Aktivitetsfältet",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "Minimera",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "Minimerad",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "Normal",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "Normaliserad",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Välj om DuckieTV fönster bör minimera till aktivitetsfältet vid uppstart.",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "Välj om DuckieTV fönster bör minimera vid start-up.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "Fönster på start-up",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Topsites aktiveringsläge",
     "SETTINGS/DISPLAY/topsites-hide/btn": "Funktionshindrade mest besökta webbplatser",
diff --git a/_locales/zh_cn.json b/_locales/zh_cn.json
index 63970a6ca..95c4d6943 100644
--- a/_locales/zh_cn.json
+++ b/_locales/zh_cn.json
@@ -246,11 +246,17 @@
     "SETTINGS/DISPLAY/locale/uk": "English (United Kingdom)",
     "SETTINGS/DISPLAY/locale/us": "English (United States)",
     "SETTINGS/DISPLAY/locale/zh_cn": "简体中文（中国）",
-    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "最小化到系统托盘",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/btn": "最小化到系统托盘",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/desc": "选择是否减少DuckieTV的窗口,任务栏和系统托盘.",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/hdr": "最小化定位",
+    "SETTINGS/DISPLAY/standalone-minimize-systray/tooltip": "系统托盘",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/btn": "最小化到任务栏",
+    "SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip": "任务栏",
+    "SETTINGS/DISPLAY/standalone-startup-minimize/btn": "最小化",
     "SETTINGS/DISPLAY/standalone-startup-minimized/tooltip": "最小化",
     "SETTINGS/DISPLAY/standalone-startup-normal/btn": "正常",
     "SETTINGS/DISPLAY/standalone-startup-normalized/tooltip": "标准化",
-    "SETTINGS/DISPLAY/standalone-startup-window/desc": "选择DuckieTV的窗口是否应该尽量减少启动时的系统托盘中",
+    "SETTINGS/DISPLAY/standalone-startup-window/desc": "选择DuckieTV的窗口是否应在启动时最小化.",
     "SETTINGS/DISPLAY/standalone-startup-window/hdr": "窗口在启动",
     "SETTINGS/DISPLAY/topsites-activation/hdr": "Topsites激活模式",
     "SETTINGS/DISPLAY/topsites-hide/btn": "残最常访问的网站",
diff --git a/css/main.css b/css/main.css
index 9564349ab..8fddc1ab3 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1485,6 +1485,22 @@ calendar-event .progress-bar {
     background-repeat:no-repeat;
     opacity:0.3;
 }
+.glyphicon.glyphicon-win-taskbar {
+    background-image: url('../img/icon-taskbar.png');
+    background-size: contain;
+    width: 24px;
+    height:22px;
+    background-repeat:no-repeat;
+    opacity:0.3;
+}
+.glyphicon.glyphicon-win-systray {
+    background-image: url('../img/icon-systray.png');
+    background-size: contain;
+    width: 24px;
+    height:22px;
+    background-repeat:no-repeat;
+    opacity:0.3;
+}
 calendar-event h2 {
     font-size: 24px;
 }
diff --git a/img/icon-systray.png b/img/icon-systray.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7d61e3798373850bc78676a9f05936d47fb66b6
GIT binary patch
literal 333
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1*!3HF6)y8xHDVB6cUq=Rpjs4tz5?O(Kwj^(N
z7l!{JxM1({$v_d#0*}aI1_o{+5N5n|x9$&6@UEweV~EG`ty52P9dh7t^}iLgtN8J;
z|NqT*i-}CU6=yEl>8vgLf~Ac|@yRpU$u6Nq46+~A?er0fJz&LbexTvr)Tjq<Ysw@K
z2<>pKkG;n1&oH@VrspKtnKM&1FEk2ee_?hg+i9Qf>8<}vPQT-L(&|-Te3v7Oaf@!(
z0o$t7MV7@1ZZR><mtIDDF?vOZZQZ?MC2zo-Mf*w$ycw6>(zIIBy=%vu2EiR`zI+Sc
z=lJ-V&Jjmz#_v<VN-vI`eMj|$-#T-K{`t+1Ydo}VB)P4Rsl2rcxR~~}dcySw1)FZU
b|7Xr!(sJ^h)%G($k1}|=`njxgN@xNAsGx?m

literal 0
HcmV?d00001

diff --git a/img/icon-taskbar.png b/img/icon-taskbar.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ac61a3d247ddb82ef712db95f71b17e0a17869e
GIT binary patch
literal 334
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1*!3HF6)y8xHDVB6cUq=Rpjs4tz5?O(Kwj^(N
z7l!{JxM1({$v_d#0*}aI1_o{+5N5n|x9$&6@SdlOV~EG`ty2$j9dh7tiO-7MQ~B}H
z|Npb+*>-eneXKflM?~%tX^rSZlTM}>cX}>bY1t6=qi?IfQ0;+R%;^Uj9!)np@ZkC3
zT83l`-Dj`&F~u<Y2&JicZc9sDHbb^|t)+v#^Lp;D+g4rsbxEgN@`QZWFZ2D<j=Bwb
zK|D5#qn}oVaJn3OX?|i={u!o}=&-fBS7h@}&<i}tWzJoYAG_%4t`+@<IV~95`S<?)
zbpA%BA9rAe^#h@h$o{rRGx<b6Z<M;qv`y}HZH#qy{^`t(cFSh`-OqUG@|W;$_4@O!
cdH?4uTATAI;oeeTpidb*UHx3vIVCg!0CL!g3;+NC

literal 0
HcmV?d00001

diff --git a/js/app.standalone.systray.js b/js/app.standalone.systray.js
index 8f64a96a7..faf432209 100644
--- a/js/app.standalone.systray.js
+++ b/js/app.standalone.systray.js
@@ -10,22 +10,25 @@ if (navigator.userAgent.toLowerCase().indexOf('standalone') !== -1) {
 
     // Get the minimize event
     win.on('minimize', function() {
-        // Hide window
-        win.hide();
-
-        // Show tray
-        tray = new gui.Tray({
-            title: navigator.userAgent,
-            icon: 'img/logo/icon64.png',
-            menu: new gui.Menu()
-        });
-        tray.tooltip = navigator.userAgent;
-        tray.on('click', function() {
-            win.show();
-            tray.remove();
-            tray = null;
-            win.emit('restore');
-        });
+        // should we minimize to systray or taskbar?
+        if (localStorage.getItem('standalone.minimizeSystray') === 'Y') {
+            // Hide window
+            win.hide();
 
+            // Show tray
+            tray = new gui.Tray({
+                title: navigator.userAgent,
+                icon: 'img/logo/icon64.png',
+                menu: new gui.Menu()
+            });
+            tray.tooltip = navigator.userAgent;
+            tray.on('click', function() {
+                win.show();
+                tray.remove();
+                tray = null;
+                win.emit('restore');
+            });
+        }
     });
+
 }
\ No newline at end of file
diff --git a/js/app.standalone.windowdressing.js b/js/app.standalone.windowdressing.js
index 1ba474f61..3ba15180d 100644
--- a/js/app.standalone.windowdressing.js
+++ b/js/app.standalone.windowdressing.js
@@ -20,7 +20,7 @@ if (navigator.userAgent.toLowerCase().indexOf('standalone') !== -1) {
         win.moveTo(parseInt(pos.x), parseInt(pos.y));
     }
 
-    if (localStorage.getItem('standalone.startupMinimized')) {
+    if (localStorage.getItem('standalone.startupMinimized') === 'Y') {
         win.minimize();
     }
 
diff --git a/js/controllers/settings/DisplayCtrl.js b/js/controllers/settings/DisplayCtrl.js
index 49c678a37..9ce9bb9d4 100644
--- a/js/controllers/settings/DisplayCtrl.js
+++ b/js/controllers/settings/DisplayCtrl.js
@@ -12,7 +12,8 @@ DuckieTV.controller('DisplayCtrl', ["$scope", "SettingsService",
         $scope.bgOpacity = SettingsService.get('background-rotator.opacity');
         $scope.showRatings = SettingsService.get('download.ratings');
         $scope.isStandalone = (navigator.userAgent.toLowerCase().indexOf('standalone') !== -1);
-        $scope.standaloneStartupMinimized = localStorage.getItem('standalone.startupMinimized');
+        $scope.standaloneStartupMinimized = (localStorage.getItem('standalone.startupMinimized') === 'Y');
+        $scope.standaloneMinimizeSystray = (localStorage.getItem('standalone.minimizeSystray') === 'Y');
         $scope.sgEnabled = SettingsService.get('library.seriesgrid');
 
         $scope.toggleTopSites = function() {
@@ -37,11 +38,18 @@ DuckieTV.controller('DisplayCtrl', ["$scope", "SettingsService",
             SettingsService.set('download.ratings', $scope.showRatings);
         };
 
-        // Toggles whether to minimize the Standalone window at startup 
+        // Toggles whether to minimize the Standalone window at start-up 
         // stored in localStorage because this code runs early
         $scope.toggleStandaloneStartupMinimized = function() {
             $scope.standaloneStartupMinimized = !$scope.standaloneStartupMinimized;
-            localStorage.setItem('standalone.startupMinimized', $scope.standaloneStartupMinimized);
+            localStorage.setItem('standalone.startupMinimized', $scope.standaloneStartupMinimized ? 'Y' : 'N');
+        };
+
+        // Toggles whether to minimize to Systray or Taskbar
+        // stored in localStorage because this code runs early
+        $scope.toggleStandaloneMinimizeSystray = function() {
+            $scope.standaloneMinimizeSystray = !$scope.standaloneMinimizeSystray;
+            localStorage.setItem('standalone.minimizeSystray', $scope.standaloneMinimizeSystray ? 'Y' : 'N');
         };
 
         // Toggles the Series-Grid on Series-List
diff --git a/js/services/SettingsService.js b/js/services/SettingsService.js
index 29dc71909..2382ff59a 100644
--- a/js/services/SettingsService.js
+++ b/js/services/SettingsService.js
@@ -112,7 +112,6 @@ DuckieTV.factory('ChromePermissions', ["$q",
                 'qbittorrent32plus.username': 'admin',
                 'qbittorrent32plus.password': 'admin',
                 'series.displaymode': 'poster',
-                'standalone.startupMinimized': false,
                 'storage.sync': false, // off by default so that permissions must be requested
                 'sync.progress': true,
                 'tixati.server': 'http://localhost',
diff --git a/templates/settings/display.html b/templates/settings/display.html
index 9da329550..c21924a47 100644
--- a/templates/settings/display.html
+++ b/templates/settings/display.html
@@ -110,5 +110,20 @@ <h2>
     <a ng-click="toggleStandaloneStartupMinimized()" class="btn btn-{{standaloneStartupMinimized ? 'info' : 'success'}}">
       <i class="glyphicon glyphicon-{{standaloneStartupMinimized ? 'win-maximize' : 'win-minimize'}}"  style="-webkit-transform: scale(1.5);-webkit-filter: invert(100%)"></i> {{standaloneStartupMinimized ? 'SETTINGS/DISPLAY/standalone-startup-normal/btn' : 'SETTINGS/DISPLAY/standalone-startup-minimize/btn'|translate}}
     </a>
+    <hr class="setting-divider">
+
+    <h2>
+      <span tooltip="{{standaloneMinimizeSystray ? 'SETTINGS/DISPLAY/standalone-minimize-systray/tooltip' : 'SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip'|translate}}">
+        <i class="glyphicon glyphicon-{{standaloneMinimizeSystray ? 'win-systray alert-success' : 'win-taskbar alert-info'}}" style="-webkit-transform: scale(1.5);-webkit-filter: invert(100%)"></i>
+      </span>
+      <li translate-once="SETTINGS/DISPLAY/standalone-minimize-systray/hdr"></li>
+    </h2>
+    
+    <p translate-once="SETTINGS/DISPLAY/standalone-minimize-systray/desc"></p>
+    <p><strong  translate-once="COMMON/current-setting/hdr"></strong>
+     {{standaloneMinimizeSystray ? 'SETTINGS/DISPLAY/standalone-minimize-systray/tooltip' : 'SETTINGS/DISPLAY/standalone-minimize-taskbar/tooltip'|translate}}</p>
+    <a ng-click="toggleStandaloneMinimizeSystray()" class="btn btn-{{standaloneMinimizeSystray ? 'info' : 'success'}}">
+      <i class="glyphicon glyphicon-{{standaloneMinimizeSystray ? 'win-taskbar' : 'win-systray'}}"  style="-webkit-transform: scale(1.5);-webkit-filter: invert(100%)"></i> {{standaloneMinimizeSystray ? 'SETTINGS/DISPLAY/standalone-minimize-taskbar/btn' : 'SETTINGS/DISPLAY/standalone-minimize-systray/btn'|translate}}
+    </a>
   </div>
 </div>
\ No newline at end of file