Merge branch 'unstable'

stsdc · stsdc · commit 0d3edab10281 · 2019-03-11T21:24:05.000+01:00
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ You'll need the following dependencies to build:
     sudo ninja install
 
 ### Debug
-    `G_MESSAGES_DEBUG=all ./com.github.stsdc.monitor`
+`G_MESSAGES_DEBUG=all ./com.github.stsdc.monitor`
 
 ## Arch Linux
 
diff --git a/data/com.github.stsdc.monitor.appdata.xml.in b/data/com.github.stsdc.monitor.appdata.xml.in
@@ -11,7 +11,7 @@
   </description>
     <custom>
      <value key="x-appcenter-color-primary">#d7f4d7</value>
-     <value key="x-appcenter-color-primary-text">rgb(255, 255, 255)</value>
+     <value key="x-appcenter-color-primary-text">#242d40</value>
      <value key="x-appcenter-suggested-price">0</value>
   </custom>
     <screenshots>
@@ -25,12 +25,12 @@
 <url type="help">https://github.com/stsdc/monitor/issues</url>
 
 <releases>
-    <release version="0.4.1" date="2019-02-20">
+    <release version="0.4.2" date="2019-03-11">
 ​      <description>
 ​         <ul>
-            <li>Add CPU and RAM icons</li>
-            <li>Update Polish and Russian translation</li>
-            <li>Fix bug, that caused hanging</li>
+            <li>Minor bug fix</li>
+            <li>End process button is now red</li>
+            <li>Add Japanese translation</li>
         </ul>
 ​      </description>
 ​    </release>
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+com.github.stsdc.monitor (0.4.2) bionic; urgency=low
+
+    * Minor bug fix
+    * Make End process button red
+    * Add Japanese translation
+
+-- Stanisław Dac <stanislawdac@gmail.com>  Mon, 11 Mar 2019 21:06:18 +0100
+
 com.github.stsdc.monitor (0.4.1) bionic; urgency=low
 
     * Add CPU and RAM icons
diff --git a/po/POTFILES b/po/POTFILES
@@ -5,7 +5,7 @@ src/Indicator/Indicator.vala
 src/Widgets/Headerbar.vala
 src/Widgets/OverallView.vala
 src/Widgets/Search.vala
-src/Widgets/Statusbar.vala
+src/Widgets/Statusbar/Statusbar.vala
 src/Managers/AppManager.vala
 src/Managers/ProcessManager.vala
 src/Managers/Process.vala
diff --git a/po/extra/ja.po b/po/extra/ja.po
@@ -0,0 +1,64 @@
+# Japanese translations for extra package.
+# Copyright (C) 2019 THE extra'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the extra package.
+# Ryo Nakano <ryonakaknock3@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: extra\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-02-20 11:51+0900\n"
+"PO-Revision-Date: 2019-02-20 11:58+0900\n"
+"Last-Translator: Ryo Nakano <ryonakaknock3@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.2.1\n"
+
+#: data/com.github.stsdc.monitor.appdata.xml.in:7
+#: data/com.github.stsdc.monitor.desktop.in:3
+msgid "Monitor"
+msgstr "モニター"
+
+#: data/com.github.stsdc.monitor.appdata.xml.in:8
+msgid "Manage processes and monitor system resources"
+msgstr "プロセスを管理し、システムリソースを監視します"
+
+#: data/com.github.stsdc.monitor.appdata.xml.in:10
+msgid "Display usage of system resources, filter and manage processes."
+msgstr "システムリソースの消費量を表示し、プロセスをフィルターし管理します。"
+
+#: data/com.github.stsdc.monitor.appdata.xml.in:22
+msgid "Stanisław Dac"
+msgstr "Stanisław Dac"
+
+#: data/com.github.stsdc.monitor.appdata.xml.in:31
+msgid "Add CPU and RAM icons"
+msgstr "CPU と RAM のアイコンを追加"
+
+#: data/com.github.stsdc.monitor.appdata.xml.in:32
+msgid "Update Polish and Russian translation"
+msgstr "ポーランド語とロシア語の翻訳をアップデート"
+
+#: data/com.github.stsdc.monitor.appdata.xml.in:33
+msgid "Fix bug, that caused hanging"
+msgstr "フリーズの原因となるバグを修正"
+
+#: data/com.github.stsdc.monitor.desktop.in:4
+msgid "System Monitor"
+msgstr "システムモニター"
+
+#: data/com.github.stsdc.monitor.desktop.in:5
+msgid "Manage processes and monitor resource usage of the system"
+msgstr "プロセスを管理し、システムリソースの消費量を監視します"
+
+#: data/com.github.stsdc.monitor.desktop.in:8
+msgid "com.github.stsdc.monitor"
+msgstr "com.github.stsdc.monitor"
+
+#: data/com.github.stsdc.monitor.desktop.in:12
+msgid "System monitor;System usage;Task manager;"
+msgstr "System monitor;System usage;Task manager;システムモニター;システム消費量;タスクマネージャー;"
diff --git a/po/ja.po b/po/ja.po
@@ -0,0 +1,104 @@
+# Japanese translations for com.github.stsdc.monitor package.
+# Copyright (C) 2019 THE com.github.stsdc.monitor'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the com.github.stsdc.monitor package.
+# Ryo Nakano <ryonakaknock3@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: com.github.stsdc.monitor\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-02-20 11:51+0900\n"
+"PO-Revision-Date: 2019-02-20 11:53+0900\n"
+"Last-Translator: Ryo Nakano <ryonakaknock3@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.2.1\n"
+
+#: src/Indicator/Widgets/PopoverWidget.vala:12
+msgid "Show Monitor"
+msgstr "モニターを表示"
+
+#: src/Indicator/Widgets/PopoverWidget.vala:13
+msgid "Quit Monitor"
+msgstr "モニターを終了"
+
+#. Some information about the indicator
+#. Unique name
+#: src/Indicator/Indicator.vala:44
+msgid "Monitor Indicator"
+msgstr "モニターインジケーター"
+
+#. Localised name
+#: src/Indicator/Indicator.vala:45
+msgid "Show system resources"
+msgstr "システムリソースを表示"
+
+#: src/Widgets/Headerbar.vala:11
+msgid "Monitor"
+msgstr "モニター"
+
+#: src/Widgets/Headerbar.vala:18
+msgid "End process"
+msgstr "プロセスを終了"
+
+#: src/Widgets/Headerbar.vala:21
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+#: src/Widgets/Headerbar.vala:28
+msgid "Settings"
+msgstr "設定"
+
+#: src/Widgets/Headerbar.vala:46
+msgid "Show an indicator"
+msgstr "インジケーターを表示"
+
+#. setup name column
+#: src/Widgets/OverallView.vala:21
+msgid "Process Name"
+msgstr "プロセス名"
+
+#: src/Widgets/OverallView.vala:42 src/Widgets/Statusbar/Statusbar.vala:7
+msgid "CPU"
+msgstr "CPU"
+
+#: src/Widgets/OverallView.vala:53 src/Widgets/Statusbar/Statusbar.vala:10
+msgid "Memory"
+msgstr "メモリー"
+
+#: src/Widgets/OverallView.vala:63
+msgid "PID"
+msgstr "PID"
+
+#: src/Widgets/OverallView.vala:107
+msgid "KiB"
+msgstr "KiB"
+
+#: src/Widgets/OverallView.vala:112
+msgid "MiB"
+msgstr "MiB"
+
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar/Statusbar.vala:28
+msgid "GiB"
+msgstr "GiB"
+
+#: src/Widgets/Search.vala:9
+msgid "Search Process"
+msgstr "プロセスを検索"
+
+#: src/Widgets/Search.vala:10
+msgid "Type Process Name or PID"
+msgstr "プロセス名か PID を入力してください"
+
+#: src/Widgets/Statusbar/Statusbar.vala:12
+#: src/Widgets/Statusbar/Statusbar.vala:16
+msgid "Calculating…"
+msgstr "計算しています…"
+
+#: src/Models/GenericModel.vala:274
+msgid "Background Applications"
+msgstr "バックグランドアプリケーション"
diff --git a/src/Managers/AppManager.vala b/src/Managers/AppManager.vala
@@ -86,7 +86,7 @@ namespace Monitor {
             }
         }
 
-        private bool has_desktop_file (string desktop_file) {
+        private bool has_desktop_file (string? desktop_file) {
             return !(desktop_file == null || desktop_file == "");
         }
 
diff --git a/src/Widgets/Headerbar.vala b/src/Widgets/Headerbar.vala
@@ -19,6 +19,8 @@ namespace Monitor {
             kill_process_button.valign = Gtk.Align.CENTER;
             kill_process_button.clicked.connect (window.process_view.kill_process);
             kill_process_button.tooltip_text = (_("Ctrl+E"));
+            var kill_process_button_context = kill_process_button.get_style_context ();
+            kill_process_button_context.add_class (Gtk.STYLE_CLASS_DESTRUCTIVE_ACTION);
 
             button_box.add (kill_process_button);
             pack_start (button_box);

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ namespace Monitor {`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`89`		`- private bool has_desktop_file (string desktop_file) {`
	`89`	`+ private bool has_desktop_file (string? desktop_file) {`
`90`	`90`	`return !(desktop_file == null \|\| desktop_file == "");`
`91`	`91`	`}`
`92`	`92`