Merge pull request #116 from gao-sun/v1.4.6

v1.4.6
gao-sun · Nov 30, 2020 · 643df62 · 643df62
2 parents a0fc078 + 8d2d537
commit 643df62
Show file tree

Hide file tree

Showing 25 changed files with 264 additions and 45 deletions.
diff --git a/Resource/ar.lproj/Localizable.strings b/Resource/ar.lproj/Localizable.strings
@@ -150,6 +150,7 @@
 "ui.hidden_by_system.message" = "افتح التفضيل وحاول تقليل عدد المكونات";
 "ui.hidden_by_system.open" = "افتح";
 "ui.hidden_by_system.dismiss" = "رفض";
+"ui.check_status_item_visibility" = "Check status item visibility";
 
 // MARK: Component
 "component.show_icon" = "Show icon";
@@ -166,6 +167,14 @@
 "text_component.download" = "Download";
 "text_component.percentage" = "Percentage";
 "text_component.mah" = "mAh";
+"text_component.loadAverage1Min" = "Load Average (1 min)";
+"text_component.loadAverage5Min" = "Load Average (5 min)";
+"text_component.loadAverage15Min" = "Load Average (15 min)";
+
+// MARK: CPU Display Mode
+"cpu_display_mode" = "CPU Display Mode";
+"cpu_display_mode.usage_percentage" = "Usage %";
+"cpu_display_mode.load_average" = "Load Average";
 
 //MARK: Widget
 "widget.not_available" = "eul لا يعمل";

diff --git a/Resource/de.lproj/Localizable.strings b/Resource/de.lproj/Localizable.strings
@@ -149,6 +149,7 @@
 "ui.hidden_by_system.message" = "Öffne Einstellungen und verringere die Anzahl der Komponenten";
 "ui.hidden_by_system.open" = "Öffnen";
 "ui.hidden_by_system.dismiss" = "Verwerfen";
+"ui.check_status_item_visibility" = "Check status item visibility";
 
 // MARK: Component
 "component.show_icon" = "Symbol anzeigen";
@@ -165,6 +166,14 @@
 "text_component.download" = "Download";
 "text_component.percentage" = "Percentage";
 "text_component.mah" = "mAh";
+"text_component.loadAverage1Min" = "Load Average (1 min)";
+"text_component.loadAverage5Min" = "Load Average (5 min)";
+"text_component.loadAverage15Min" = "Load Average (15 min)";
+
+// MARK: CPU Display Mode
+"cpu_display_mode" = "CPU Display Mode";
+"cpu_display_mode.usage_percentage" = "Usage %";
+"cpu_display_mode.load_average" = "Load Average";
 
 //MARK: Widget
 "widget.not_available" = "eul läuft nicht";

diff --git a/Resource/en.lproj/Localizable.strings b/Resource/en.lproj/Localizable.strings
@@ -127,7 +127,6 @@
 "language.ko" = "한국어";
 "language.dk" = "Dansk";
 
-
 // MARK: General UI
 "ui.app" = "App";
 "ui.general" = "General";
@@ -149,6 +148,7 @@
 "ui.hidden_by_system.message" = "Open preference and try to reduce component count";
 "ui.hidden_by_system.open" = "Open";
 "ui.hidden_by_system.dismiss" = "Dismiss";
+"ui.check_status_item_visibility" = "Check status item visibility";
 
 // MARK: Component
 "component.show_icon" = "Show icon";
@@ -165,6 +165,14 @@
 "text_component.download" = "Download";
 "text_component.percentage" = "Percentage";
 "text_component.mah" = "mAh";
+"text_component.loadAverage1Min" = "Load Average (1 min)";
+"text_component.loadAverage5Min" = "Load Average (5 min)";
+"text_component.loadAverage15Min" = "Load Average (15 min)";
+
+// MARK: CPU Display Mode
+"cpu_display_mode" = "CPU Display Mode";
+"cpu_display_mode.usage_percentage" = "Usage %";
+"cpu_display_mode.load_average" = "Load Average";
 
 //MARK: Widget
 "widget.not_available" = "eul isn't running";

diff --git a/Resource/es.lproj/Localizable.strings b/Resource/es.lproj/Localizable.strings
@@ -148,6 +148,7 @@
 "ui.hidden_by_system.message" = "Open preference and try to reduce component count";
 "ui.hidden_by_system.open" = "Open";
 "ui.hidden_by_system.dismiss" = "Dismiss";
+"ui.check_status_item_visibility" = "Check status item visibility";
 
 // MARK: Component
 "component.show_icon" = "Mostrar icono";
@@ -164,6 +165,14 @@
 "text_component.download" = "Download";
 "text_component.percentage" = "Percentage";
 "text_component.mah" = "mAh";
+"text_component.loadAverage1Min" = "Load Average (1 min)";
+"text_component.loadAverage5Min" = "Load Average (5 min)";
+"text_component.loadAverage15Min" = "Load Average (15 min)";
+
+// MARK: CPU Display Mode
+"cpu_display_mode" = "CPU Display Mode";
+"cpu_display_mode.usage_percentage" = "Usage %";
+"cpu_display_mode.load_average" = "Load Average";
 
 //MARK: Widget
 "widget.not_available" = "eul no está arrancado";

diff --git a/Resource/fr.lproj/Localizable.strings b/Resource/fr.lproj/Localizable.strings
@@ -149,6 +149,7 @@
 "ui.hidden_by_system.message" = "Ouvrez les préférences et essayez de réduire le nombre de composants.";
 "ui.hidden_by_system.open" = "Ouvrir";
 "ui.hidden_by_system.dismiss" = "Ignorer";
+"ui.check_status_item_visibility" = "Check status item visibility";
 
 // MARK: Component
 "component.show_icon" = "Afficher l'icône";
@@ -165,6 +166,14 @@
 "text_component.download" = "Téléchargement";
 "text_component.percentage" = "Pourcentage";
 "text_component.mah" = "mAh";
+"text_component.loadAverage1Min" = "Load Average (1 min)";
+"text_component.loadAverage5Min" = "Load Average (5 min)";
+"text_component.loadAverage15Min" = "Load Average (15 min)";
+
+// MARK: CPU Display Mode
+"cpu_display_mode" = "CPU Display Mode";
+"cpu_display_mode.usage_percentage" = "Usage %";
+"cpu_display_mode.load_average" = "Load Average";
 
 //MARK: Widget
 "widget.not_available" = "eul n'est pas en cours d'exécution";

diff --git a/Resource/ja.lproj/Localizable.strings b/Resource/ja.lproj/Localizable.strings
@@ -149,6 +149,7 @@
 "ui.hidden_by_system.message" = "設定からメニューバーに表示するコンポーネントを減らしてみてください。";
 "ui.hidden_by_system.open" = "設定を開く";
 "ui.hidden_by_system.dismiss" = "閉じる";
+"ui.check_status_item_visibility" = "Check status item visibility";
 
 // MARK: Component
 "component.show_icon" = "アイコンを表示";
@@ -165,6 +166,14 @@
 "text_component.download" = "受信";
 "text_component.percentage" = "割合（%）";
 "text_component.mah" = "mAh";
+"text_component.loadAverage1Min" = "Load Average (1 min)";
+"text_component.loadAverage5Min" = "Load Average (5 min)";
+"text_component.loadAverage15Min" = "Load Average (15 min)";
+
+// MARK: CPU Display Mode
+"cpu_display_mode" = "CPU Display Mode";
+"cpu_display_mode.usage_percentage" = "Usage %";
+"cpu_display_mode.load_average" = "Load Average";
 
 //MARK: Widget
 "widget.not_available" = "eul は実行されていません";

diff --git a/Resource/ko.lproj/Localizable.strings b/Resource/ko.lproj/Localizable.strings
@@ -150,6 +150,7 @@
 "ui.hidden_by_system.message" = "설정에서 컴포넌트 수를 줄여주세요";
 "ui.hidden_by_system.open" = "열기";
 "ui.hidden_by_system.dismiss" = "취소";
+"ui.check_status_item_visibility" = "Check status item visibility";
 
 // MARK: Component
 "component.show_icon" = "아이콘 보여주기";
@@ -166,6 +167,14 @@
 "text_component.download" = "Download";
 "text_component.percentage" = "Percentage";
 "text_component.mah" = "mAh";
+"text_component.loadAverage1Min" = "Load Average (1 min)";
+"text_component.loadAverage5Min" = "Load Average (5 min)";
+"text_component.loadAverage15Min" = "Load Average (15 min)";
+
+// MARK: CPU Display Mode
+"cpu_display_mode" = "CPU Display Mode";
+"cpu_display_mode.usage_percentage" = "Usage %";
+"cpu_display_mode.load_average" = "Load Average";
 
 //MARK: Widget
 "widget.not_available" = "eul이 시작되지 않음";

diff --git a/Resource/mn.lproj/Localizable.strings b/Resource/mn.lproj/Localizable.strings
@@ -150,6 +150,7 @@
 "ui.hidden_by_system.message" = "Тохиргоог нээж, нэгжүүдийг багасгана уу";
 "ui.hidden_by_system.open" = "Нээх";
 "ui.hidden_by_system.dismiss" = "Цуцлах";
+"ui.check_status_item_visibility" = "Check status item visibility";
 
 // MARK: Component
 "component.show_icon" = "Аякон харах";
@@ -166,6 +167,14 @@
 "text_component.download" = "Download";
 "text_component.percentage" = "Percentage";
 "text_component.mah" = "mAh";
+"text_component.loadAverage1Min" = "Load Average (1 min)";
+"text_component.loadAverage5Min" = "Load Average (5 min)";
+"text_component.loadAverage15Min" = "Load Average (15 min)";
+
+// MARK: CPU Display Mode
+"cpu_display_mode" = "CPU Display Mode";
+"cpu_display_mode.usage_percentage" = "Usage %";
+"cpu_display_mode.load_average" = "Load Average";
 
 //MARK: Widget
 "widget.not_available" = "eul ачааллаагүй байна";

diff --git a/Resource/pt.lproj/Localizable.strings b/Resource/pt.lproj/Localizable.strings
@@ -144,6 +144,11 @@
 "ui.network" = "Rede";
 "ui.menu_view" = "Vista de Menu";
 "ui.empty" = "Vazio";
+"ui.hidden_by_system.title" = "eul menu components are force hidden by system";
+"ui.hidden_by_system.message" = "Open preference and try to reduce component count";
+"ui.hidden_by_system.open" = "Open";
+"ui.hidden_by_system.dismiss" = "Dismiss";
+"ui.check_status_item_visibility" = "Check status item visibility";
 
 // MARK: Component
 "component.show_icon" = "Mostrar ícone";
@@ -160,6 +165,14 @@
 "text_component.download" = "Download";
 "text_component.percentage" = "Percentage";
 "text_component.mah" = "mAh";
+"text_component.loadAverage1Min" = "Load Average (1 min)";
+"text_component.loadAverage5Min" = "Load Average (5 min)";
+"text_component.loadAverage15Min" = "Load Average (15 min)";
+
+// MARK: CPU Display Mode
+"cpu_display_mode" = "CPU Display Mode";
+"cpu_display_mode.usage_percentage" = "Usage %";
+"cpu_display_mode.load_average" = "Load Average";
 
 //MARK: Widget
 "widget.not_available" = "eul não está disponível";

diff --git a/Resource/ru.lproj/Localizable.strings b/Resource/ru.lproj/Localizable.strings
@@ -148,6 +148,7 @@
 "ui.hidden_by_system.message" = "Open preference and try to reduce component count";
 "ui.hidden_by_system.open" = "Open";
 "ui.hidden_by_system.dismiss" = "Dismiss";
+"ui.check_status_item_visibility" = "Check status item visibility";
 
 // MARK: Component
 "component.show_icon" = "Показать иконки";
@@ -164,6 +165,14 @@
 "text_component.download" = "Download";
 "text_component.percentage" = "Percentage";
 "text_component.mah" = "mAh";
+"text_component.loadAverage1Min" = "Load Average (1 min)";
+"text_component.loadAverage5Min" = "Load Average (5 min)";
+"text_component.loadAverage15Min" = "Load Average (15 min)";
+
+// MARK: CPU Display Mode
+"cpu_display_mode" = "CPU Display Mode";
+"cpu_display_mode.usage_percentage" = "Usage %";
+"cpu_display_mode.load_average" = "Load Average";
 
 //MARK: Widget
 "widget.not_available" = "eul еще не готов";

diff --git a/Resource/zh-Hans.lproj/Localizable.strings b/Resource/zh-Hans.lproj/Localizable.strings
@@ -148,6 +148,7 @@
 "ui.hidden_by_system.message" = "打开偏好设置并尝试减少状态栏组件数量";
 "ui.hidden_by_system.open" = "打开";
 "ui.hidden_by_system.dismiss" = "忽略";
+"ui.check_status_item_visibility" = "检查状态栏可见性";
 
 // MARK: Component
 "component.show_icon" = "显示图标";
@@ -164,6 +165,14 @@
 "text_component.download" = "下载";
 "text_component.percentage" = "百分比";
 "text_component.mah" = "mAh";
+"text_component.loadAverage1Min" = "平均负载 (1分钟)";
+"text_component.loadAverage5Min" = "平均负载 (5分钟)";
+"text_component.loadAverage15Min" = "平均负载 (15分钟)";
+
+// MARK: CPU Display Mode
+"cpu_display_mode" = "CPU 显示";
+"cpu_display_mode.usage_percentage" = "百分比";
+"cpu_display_mode.load_average" = "平均负载";
 
 //MARK: Widget
 "widget.not_available" = "eul 未启动";

diff --git a/SharedLibrary/Extension/Text.swift b/SharedLibrary/Extension/Text.swift
@@ -48,8 +48,7 @@ public extension Text {
 
     func menuSection() -> some View {
         font(.system(size: 12, weight: .bold))
-            .padding(.top, 4)
-            .padding(.bottom, 6)
+            .padding(.vertical, 4)
             .frame(maxWidth: .infinity, alignment: .leading)
     }