1
0

Accepting request 586242 from GNOME:Factory

Update to 3.28.0 (forwarded request 586178 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/586242
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-system-monitor?expand=0&rev=101
This commit is contained in:
Dominique Leuenberger 2018-03-14 18:30:42 +00:00 committed by Git OBS Bridge
commit e059510072
7 changed files with 88 additions and 721 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3
size 941144

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76e7dd342cd442df19a99be2a7a4dee85d902cbd36e673bf472d09056ee96ff3
size 1207660

View File

@ -1,606 +0,0 @@
From cc0eea5c7be5c4ffdc92de54b05f255df98e7b8d Mon Sep 17 00:00:00 2001
From: Kjartan Maraas <kmaraas@gnome.org>
Date: Wed, 8 Nov 2017 20:06:39 +0100
Subject: =?UTF-8?q?Updated=20Norwegian=20bokm=C3=A5l=20translation.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
po/nb.po | 278 +++++++++++++++++++++++++++++++++++++++------------------------
1 file changed, 171 insertions(+), 107 deletions(-)
diff --git a/po/nb.po b/po/nb.po
index f7a66b7..f6e4a76 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,11 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gnome-system-monitor 3.23.x\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=system-"
-"monitor&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-13 22:00+0000\n"
-"PO-Revision-Date: 2017-02-18 11:13+0100\n"
+"Project-Id-Version: gnome-system-monitor 3.26.x\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-11-01 18:43+0000\n"
+"PO-Revision-Date: 2017-11-08 20:06+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language: nb\n"
@@ -20,22 +19,20 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../gnome-system-monitor.desktop.in.in.h:1 ../data/interface.ui.h:1
-#: ../src/application.cpp:244 ../src/interface.cpp:358
+#: ../src/application.cpp:244 ../src/interface.cpp:363
msgid "System Monitor"
msgstr "Systemmonitor"
#: ../gnome-system-monitor.desktop.in.in.h:2
-#: ../gnome-system-monitor-kde.desktop.in.in.h:2 ../src/interface.cpp:359
+#: ../gnome-system-monitor-kde.desktop.in.in.h:2 ../src/interface.cpp:364
msgid "View current processes and monitor system state"
msgstr "Vis aktive prosesser og overvåk systemets tilstand"
#: ../gnome-system-monitor.desktop.in.in.h:3
msgid ""
"Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;"
-"Manager;"
-msgstr ""
-"Skjerm;System;Prosess;CPU;Minne;Nettverk;Historikk;Bruk;Ytelse;Oppgave;"
-"Behandler;"
+"Manager;Activity;"
+msgstr "Skjerm;System;Prosess;CPU;Minne;Nettverk;Historikk;Bruk;Ytelse;Oppgave;Behandler;Aktivitet;"
#: ../gnome-system-monitor-kde.desktop.in.in.h:1
#: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:299
@@ -130,12 +127,12 @@ msgstr "Historikk for CPU-bruk"
msgid "Memory and Swap History"
msgstr "Historikk for minne- og swap-bruk"
-#: ../data/interface.ui.h:7 ../src/interface.cpp:258
-#: ../src/procproperties.cpp:70 ../src/proctable.cpp:340
+#: ../data/interface.ui.h:7 ../src/interface.cpp:260
+#: ../src/procproperties.cpp:70 ../src/proctable.cpp:337
msgid "Memory"
msgstr "Minne"
-#: ../data/interface.ui.h:8 ../src/interface.cpp:270
+#: ../data/interface.ui.h:8 ../src/interface.cpp:272
msgid "Swap"
msgstr "Swap"
@@ -143,7 +140,7 @@ msgstr "Swap"
msgid "Network History"
msgstr "Nettverkshistorikk"
-#: ../data/interface.ui.h:10 ../src/interface.cpp:298
+#: ../data/interface.ui.h:10 ../src/interface.cpp:302
msgid "Receiving"
msgstr "Mottar"
@@ -151,7 +148,7 @@ msgstr "Mottar"
msgid "Total Received"
msgstr "Totalt mottatt"
-#: ../data/interface.ui.h:12 ../src/interface.cpp:312
+#: ../data/interface.ui.h:12 ../src/interface.cpp:317
msgid "Sending"
msgstr "Sender"
@@ -386,7 +383,8 @@ msgstr "Enhet"
msgid "Directory"
msgstr "Mappe"
-#: ../src/disks.cpp:354 ../src/gsm_color_button.c:165 ../src/openfiles.cpp:252
+#: ../src/disks.cpp:354 ../src/legacy/gsm_color_button.c:165
+#: ../src/openfiles.cpp:253
msgid "Type"
msgstr "Type"
@@ -406,93 +404,93 @@ msgstr "Tilgjengelig"
msgid "Used"
msgstr "Brukt"
+#. Translators: color picker title, %s is CPU, Memory, Swap, Receiving, Sending
+#: ../src/interface.cpp:185
+#, c-format
+msgid "Pick a Color for “%s”"
+msgstr "Velg en farge for «%s»"
+
+#: ../src/interface.cpp:219 ../src/procproperties.cpp:78
+msgid "CPU"
+msgstr "CPU"
+
+#: ../src/interface.cpp:221
+#, c-format
+msgid "CPU%d"
+msgstr "CPU%d"
+
+#: ../src/interface.cpp:374
+msgid "translator-credits"
+msgstr ""
+"Kjartan Maraas <kmaraas@gnome.org>\n"
+"Torstein Adolf Winterseth <kvikende@fsfe.org>"
+
#. xgettext: ? stands for unknown
-#: ../src/e_date.c:156
+#: ../src/legacy/e_date.c:156
msgid "?"
msgstr "?"
-#: ../src/e_date.c:163
+#: ../src/legacy/e_date.c:163
msgid "Today %l%M %p"
msgstr "I dag %H.%M"
-#: ../src/e_date.c:172
+#: ../src/legacy/e_date.c:172
msgid "Yesterday %l%M %p"
msgstr "I går %H.%M"
-#: ../src/e_date.c:184
+#: ../src/legacy/e_date.c:184
msgid "%a %l%M %p"
msgstr "%a %H.%M"
-#: ../src/e_date.c:192
+#: ../src/legacy/e_date.c:192
msgid "%b %d %l%M %p"
msgstr "%d %b %H.%M"
-#: ../src/e_date.c:194
+#: ../src/legacy/e_date.c:194
msgid "%b %d %Y"
msgstr "%d %b %Y"
-#: ../src/gsm_color_button.c:141
+#: ../src/legacy/gsm_color_button.c:141
msgid "Fraction"
msgstr "Del"
#. TRANSLATORS: description of the pie color picker's (mem, swap) filled percentage property
-#: ../src/gsm_color_button.c:143
+#: ../src/legacy/gsm_color_button.c:143
msgid "Percentage full for pie color pickers"
msgstr "Prosent full for fargevelgere for pai"
-#: ../src/gsm_color_button.c:150
+#: ../src/legacy/gsm_color_button.c:150
msgid "Title"
msgstr "Tittel"
-#: ../src/gsm_color_button.c:151
+#: ../src/legacy/gsm_color_button.c:151
msgid "The title of the color selection dialog"
msgstr "Tittel for fargevalg-dialogen"
-#: ../src/gsm_color_button.c:152 ../src/gsm_color_button.c:515
+#: ../src/legacy/gsm_color_button.c:152 ../src/legacy/gsm_color_button.c:515
msgid "Pick a Color"
msgstr "Velg en farge"
-#: ../src/gsm_color_button.c:158
+#: ../src/legacy/gsm_color_button.c:158
msgid "Current Color"
msgstr "Aktiv farge"
-#: ../src/gsm_color_button.c:159
+#: ../src/legacy/gsm_color_button.c:159
msgid "The selected color"
msgstr "Valgt farge"
-#: ../src/gsm_color_button.c:166
+#: ../src/legacy/gsm_color_button.c:166
msgid "Type of color picker"
msgstr "Type fargevelger"
-#: ../src/gsm_color_button.c:437
+#: ../src/legacy/gsm_color_button.c:437
msgid "Received invalid color data\n"
msgstr "Fargedata for ugyldig mottak\n"
-#: ../src/gsm_color_button.c:538
+#: ../src/legacy/gsm_color_button.c:538
msgid "Click to set graph colors"
msgstr "Klikk for å sette farger for grafen"
-#. Translators: color picker title, %s is CPU, Memory, Swap, Receiving, Sending
-#: ../src/interface.cpp:185
-#, c-format
-msgid "Pick a Color for “%s”"
-msgstr "Velg en farge for «%s»"
-
-#: ../src/interface.cpp:218 ../src/procproperties.cpp:78
-msgid "CPU"
-msgstr "CPU"
-
-#: ../src/interface.cpp:220
-#, c-format
-msgid "CPU%d"
-msgstr "CPU%d"
-
-#: ../src/interface.cpp:369
-msgid "translator-credits"
-msgstr ""
-"Kjartan Maraas <kmaraas@gnome.org>\n"
-"Torstein Adolf Winterseth <kvikende@fsfe.org>"
-
#: ../src/load-graph.cpp:157
#, c-format
msgid "%u second"
@@ -524,15 +522,15 @@ msgid_plural "%d matching open files"
msgstr[0] "%d åpen fil funnet"
msgstr[1] "%d åpne filer funnet"
-#: ../src/lsof.cpp:247
+#: ../src/lsof.cpp:245
msgid "Process"
msgstr "Prosess"
-#: ../src/lsof.cpp:259
+#: ../src/lsof.cpp:257
msgid "PID"
msgstr "PID"
-#: ../src/lsof.cpp:269 ../src/memmaps.cpp:307
+#: ../src/lsof.cpp:267 ../src/memmaps.cpp:307
msgid "Filename"
msgstr "Filnavn"
@@ -624,15 +622,15 @@ msgstr "ukjent type"
#. Translators: "FD" here means "File Descriptor". Please use
#. a very short translation if possible, and at most
#. 2-3 characters for it to be able to fit in the UI.
-#: ../src/openfiles.cpp:251
+#: ../src/openfiles.cpp:252
msgid "FD"
msgstr "FD"
-#: ../src/openfiles.cpp:253
+#: ../src/openfiles.cpp:254
msgid "Object"
msgstr "Objekt"
-#: ../src/openfiles.cpp:336
+#: ../src/openfiles.cpp:337
#, c-format
msgid "_Files opened by process “%s” (PID %u):"
msgstr "_Filer som er åpnet av prosess «%s» (PID %u):"
@@ -684,7 +682,9 @@ msgstr "Vis CPU-graf som en myk graf med Bezier-kurver"
msgid ""
"If TRUE, system-monitor shows the CPU chart as a smoothed graph, otherwise "
"as a line chart."
-msgstr "Systemovervåking viser CPU-grafen som en myk graf i stedet for som et linjeplott hvis denne er TRUE."
+msgstr ""
+"Systemovervåking viser CPU-grafen som en myk graf i stedet for som et "
+"linjeplott hvis denne er TRUE."
#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:10
msgid "Enable/Disable smooth refresh"
@@ -947,94 +947,142 @@ msgid "Show process “Owner” column on startup"
msgstr "Vis kolonne «Eier» for prosess ved oppstart"
#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:75
+#, fuzzy
+#| msgid "Width of process “Started” column"
+msgid "Width of process “Total disk write” column"
+msgstr "Bredde på kolonne «Startet» for prosess"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:76
+#, fuzzy
+#| msgid "Show process “Started” column on startup"
+msgid "Show process “Total disk write” column on startup"
+msgstr "Vis kolonne «Startet» for prosess ved oppstart"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:77
+#, fuzzy
+#| msgid "Width of process “Started” column"
+msgid "Width of process “Total disk read” column"
+msgstr "Bredde på kolonne «Startet» for prosess"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:78
+#, fuzzy
+#| msgid "Show process “Started” column on startup"
+msgid "Show process “Total disk read” column on startup"
+msgstr "Vis kolonne «Startet» for prosess ved oppstart"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:79
+#, fuzzy
+#| msgid "Width of process “User” column"
+msgid "Width of process “Disk read” column"
+msgstr "Bredde på kolonne «Bruker» for prosess"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:80
+#, fuzzy
+#| msgid "Show process “User” column on startup"
+msgid "Show process “Disk read” column on startup"
+msgstr "Vis kolonne «Bruker» for prosess ved oppstart"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:81
+#, fuzzy
+#| msgid "Width of process “Priority” column"
+msgid "Width of process “Disk write” column"
+msgstr "Bredde på «Prioritet»-kolonne for prosess"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:82
+#, fuzzy
+#| msgid "Show process “Priority” column on startup"
+msgid "Show process “Disk write” column on startup"
+msgstr "Vis kolonne «Prioritet» for prosess ved oppstart"
+
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:83
msgid "Width of process “Priority” column"
msgstr "Bredde på «Prioritet»-kolonne for prosess"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:76
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:84
msgid "Show process “Priority” column on startup"
msgstr "Vis kolonne «Prioritet» for prosess ved oppstart"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:77
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:85
msgid "Disk view sort column"
msgstr "Sorteringskolonne for diskvisning"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:78
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:86
msgid "Disk view sort order"
msgstr "Sorteringsrekkefølge for diskvisning"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:79
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:87
msgid "Disk view columns order"
msgstr "Rekkefølge på kolonnene for diskvisning"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:80
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:88
msgid "Width of disk view “Device” column"
msgstr "Bredde på «Enhet»-kolonne for disk"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:81
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:89
msgid "Show disk view “Device” column on startup"
msgstr "Vis kolonne «Enhet» for disk ved oppstart"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:82
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:90
msgid "Width of disk view “Directory” column"
msgstr "Bredde på «Katalog»-kolonne for disk"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:83
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:91
msgid "Show disk view “Directory” column on startup"
msgstr "Vis kolonne «Katalog» for disk ved oppstart"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:84
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:92
msgid "Width of disk view “Type” column"
msgstr "Bredde på kolonne «Type» for disk"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:85
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:93
msgid "Show disk view “Type” column on startup"
msgstr "Vis kolonne «Type» for disk ved oppstart"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:86
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:94
msgid "Width of disk view “Total” column"
msgstr "Bredde på kolonne «Total» for disk"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:87
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:95
msgid "Show disk view “Total” column on startup"
msgstr "Vis kolonne «Total» for disk ved oppstart"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:88
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:96
msgid "Width of disk view “Free” column"
msgstr "Bredde på kolonne «Ledig» for disk"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:89
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:97
msgid "Show disk view “Free” column on startup"
msgstr "Vis kolonne «Ledig» for disk ved oppstart"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:90
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:98
msgid "Width of disk view “Available” column"
msgstr "Bredde på kolonne «Tilgjengelig» for disk"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:91
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:99
msgid "Show disk view “Available” column on startup"
msgstr "Vis kolonne «Tilgjengelig» for disk ved oppstart"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:92
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:100
msgid "Width of disk view “Used” column"
msgstr "Bredde på kolonne «Brukt» for prosess"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:93
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:101
msgid "Show disk view “Used” column on startup"
msgstr "Vis kolonne «Brukt» for disk ved oppstart"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:94
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:102
msgid "Memory map sort column"
msgstr "Sorteringskolonne for minnekart"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:95
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:103
msgid "Memory map sort order"
msgstr "Sorteringsrekkefølge for minnekart"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:96
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:104
msgid "Open files sort column"
msgstr "Sorteringskolonne for åpne filer"
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:97
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.in.h:105
msgid "Open files sort order"
msgstr "Sorteringsrekkefølge for åpne filer"
@@ -1178,76 +1226,76 @@ msgstr ""
"høyere prioritet."
#: ../src/procproperties.cpp:50 ../src/procproperties.cpp:84
-#: ../src/procproperties.cpp:87 ../src/util.cpp:432
+#: ../src/procproperties.cpp:87 ../src/util.cpp:432 ../src/util.cpp:471
msgid "N/A"
msgstr "I/T"
-#: ../src/procproperties.cpp:67 ../src/proctable.cpp:325
+#: ../src/procproperties.cpp:67 ../src/proctable.cpp:322
msgid "Process Name"
msgstr "Prosessnavn"
-#: ../src/procproperties.cpp:68 ../src/proctable.cpp:326
+#: ../src/procproperties.cpp:68 ../src/proctable.cpp:323
msgid "User"
msgstr "Bruker"
-#: ../src/procproperties.cpp:69 ../src/proctable.cpp:327
+#: ../src/procproperties.cpp:69 ../src/proctable.cpp:324
msgid "Status"
msgstr "Status"
-#: ../src/procproperties.cpp:71 ../src/proctable.cpp:328
+#: ../src/procproperties.cpp:71 ../src/proctable.cpp:325
msgid "Virtual Memory"
msgstr "Virtuelt minne"
-#: ../src/procproperties.cpp:72 ../src/proctable.cpp:329
+#: ../src/procproperties.cpp:72 ../src/proctable.cpp:326
msgid "Resident Memory"
msgstr "Resident minne"
-#: ../src/procproperties.cpp:73 ../src/proctable.cpp:330
+#: ../src/procproperties.cpp:73 ../src/proctable.cpp:327
msgid "Writable Memory"
msgstr "Skrivbart minne"
-#: ../src/procproperties.cpp:74 ../src/proctable.cpp:331
+#: ../src/procproperties.cpp:74 ../src/proctable.cpp:328
msgid "Shared Memory"
msgstr "Delt minne"
-#: ../src/procproperties.cpp:76 ../src/proctable.cpp:332
+#: ../src/procproperties.cpp:76 ../src/proctable.cpp:329
msgid "X Server Memory"
msgstr "Minne for X-tjener"
-#: ../src/procproperties.cpp:79 ../src/proctable.cpp:334
+#: ../src/procproperties.cpp:79 ../src/proctable.cpp:331
msgid "CPU Time"
msgstr "CPU-tid"
-#: ../src/procproperties.cpp:80 ../src/proctable.cpp:335
+#: ../src/procproperties.cpp:80 ../src/proctable.cpp:332
msgid "Started"
msgstr "Startet"
-#: ../src/procproperties.cpp:81 ../src/proctable.cpp:336
+#: ../src/procproperties.cpp:81 ../src/proctable.cpp:333
msgid "Nice"
msgstr "Nice"
-#: ../src/procproperties.cpp:82 ../src/proctable.cpp:350
+#: ../src/procproperties.cpp:82 ../src/proctable.cpp:351
msgid "Priority"
msgstr "Prioritet"
-#: ../src/procproperties.cpp:83 ../src/proctable.cpp:337
+#: ../src/procproperties.cpp:83 ../src/proctable.cpp:334
msgid "ID"
msgstr "ID"
-#: ../src/procproperties.cpp:84 ../src/proctable.cpp:338
+#: ../src/procproperties.cpp:84 ../src/proctable.cpp:335
msgid "Security Context"
msgstr "Sikkerhetskontekst"
-#: ../src/procproperties.cpp:85 ../src/proctable.cpp:339
+#: ../src/procproperties.cpp:85 ../src/proctable.cpp:336
msgid "Command Line"
msgstr "Kommandolinje"
#. xgettext: combined noun, the function the process is waiting in, see wchan ps(1)
-#: ../src/procproperties.cpp:86 ../src/proctable.cpp:342
+#: ../src/procproperties.cpp:86 ../src/proctable.cpp:339
msgid "Waiting Channel"
msgstr "Ventende kanal"
-#: ../src/procproperties.cpp:87 ../src/proctable.cpp:343
+#: ../src/procproperties.cpp:87 ../src/proctable.cpp:340
msgid "Control Group"
msgstr "Kontrollgruppe"
@@ -1256,29 +1304,45 @@ msgstr "Kontrollgruppe"
msgid "%s (PID %u)"
msgstr "%s (PID %u)"
-#: ../src/proctable.cpp:333
+#: ../src/proctable.cpp:330
#, no-c-format
msgid "% CPU"
msgstr "% CPU"
-#: ../src/proctable.cpp:344
+#: ../src/proctable.cpp:341
msgid "Unit"
msgstr "Enhet"
-#: ../src/proctable.cpp:345
+#: ../src/proctable.cpp:342
msgid "Session"
msgstr "Økt"
#. TRANSLATORS: Seat = i.e. the physical seat the session of the process belongs to, only
#. for multi-seat environments. See http://en.wikipedia.org/wiki/Multiseat_configuration
-#: ../src/proctable.cpp:348
+#: ../src/proctable.cpp:345
msgid "Seat"
msgstr "Sete"
-#: ../src/proctable.cpp:349
+#: ../src/proctable.cpp:346
msgid "Owner"
msgstr "Eier"
+#: ../src/proctable.cpp:347
+msgid "Disk read total"
+msgstr "Lesing fra disk totalt"
+
+#: ../src/proctable.cpp:348
+msgid "Disk write total"
+msgstr "Skriving til disk totalt"
+
+#: ../src/proctable.cpp:349
+msgid "Disk read"
+msgstr "Lesing fra disk"
+
+#: ../src/proctable.cpp:350
+msgid "Disk write"
+msgstr "SKriving til disk"
+
#: ../src/util.cpp:27
msgid "Running"
msgstr "Kjører"
@@ -1398,7 +1462,7 @@ msgid "Very Low Priority"
msgstr "Meget lav prioritet"
#. xgettext: rate, 10MiB/s or 10Mbit/s
-#: ../src/util.cpp:630
+#: ../src/util.cpp:667
#, c-format
msgid "%s/s"
msgstr "%s/s"
--
cgit v0.12

View File

@ -1,3 +1,69 @@
-------------------------------------------------------------------
Tue Mar 13 07:58:05 UTC 2018 - dimstar@opensuse.org
- Update to version 3.28.0:
+ Updated translations.
-------------------------------------------------------------------
Tue Mar 6 10:51:10 UTC 2018 - dimstar@opensuse.org
- Update to version 3.27.92:
+ Updated translations.
-------------------------------------------------------------------
Wed Feb 28 16:29:50 UTC 2018 - dimstar@opensuse.org
- Modernize spec-file by calling spec-cleaner
-------------------------------------------------------------------
Sun Feb 18 19:53:43 UTC 2018 - bjorn.lie@gmail.com
- Do minor spec cleaning, use autosetup and make_build macros.
- Drop update-desktop-files BuildRequires and stop using
suse_update_desktop_file, and no longer inject docpath to desktop
file: No longer needed.
-------------------------------------------------------------------
Fri Feb 9 23:54:11 UTC 2018 - luc14n0@linuxmail.org
- Update to version 3.27.90:
+ Fixed bugs:
- Translation rules fixes (bgo#790570).
- Scroll process table to selected row (bgo#792574).
- Theme-based background color for charts (bgo#792360).
- Multipe token entry for search (bgo#789905).
- Use a scrolledwindow for resources (bgo#778697).
- Better alignment for network stats. Style the kill
confirmation as destructive action. And redraw loadgraph
background on theme change (bgo#789603).
+ Updated translations.
- Update Url tag to https://wiki.gnome.org/Apps/SystemMonitor:
it's the current System Monitor's web page.
- Drop pkgconfig(dbus-glib-1) BuildRequires: it's no longer needed/
used anymore.
- Add pkgconfig(glib-2.0) BuildRequires then avoiding implicit
dependency.
-------------------------------------------------------------------
Wed Feb 7 11:29:48 UTC 2018 - dimstar@opensuse.org
- Update to version 3.27.2:
+ bgo#788922: fix inaccurate CPU% values in the Processes table.
+ bgo#786944: gettext migration
+ bgo#790146: install appdata to the new location
+ Updated translations.
- Drop intlool BuildRequires: no longer needed, since upstream
migrated to gettext.
- Drop glib2_gsettings_schema_requires,
desktop_database_post/postun and
glib2_gsettings_schema_post/postun handling: the functionality is
covered by RPM file triggers now.
- Drop gsm-fix-inaccurate-cpu-values.patch,
gnome-system-monitor-nb-translation.patch and
gsm-bsc1020294-add-resources-scrollbar.patch: fixed upstream.
- Add polkit-devel BuildRequires: needed for the its translation
instructions.
-------------------------------------------------------------------
Tue Feb 6 14:18:38 UTC 2018 - bjorn.lie@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-system-monitor
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,42 +17,33 @@
Name: gnome-system-monitor
Version: 3.26.0
Version: 3.28.0
Release: 0
Summary: A process monitor for the GNOME desktop
License: GPL-2.0+
License: GPL-2.0-or-later
Group: System/GUI/GNOME
Url: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-system-monitor/3.26/%{name}-%{version}.tar.xz
# PATCH-FEATURE-UPSTREAM gsm-bsc1020294-add-resources-scrollbar.patch bsc#1020294 bgo#778697 mgorse@suse.com -- add a scrollbar to the resources tab.
Patch0: gsm-bsc1020294-add-resources-scrollbar.patch
# PATCH-FIX-UPSTREAM gsm-fix-inaccurate-cpu-values.patch bgo#788922 mgorse@suse.com -- fix inaccurate %CPU values in the Process table.
Patch1: gsm-fix-inaccurate-cpu-values.patch
# PATCH-FIX-UPSTREAM gnome-system-monitor-nb-translation.patch zaitor@opensuse.org -- Update Norwegian Bokmål translation
Patch2: gnome-system-monitor-nb-translation.patch
URL: https://wiki.gnome.org/Apps/SystemMonitor
Source0: http://download.gnome.org/sources/gnome-system-monitor/3.28/%{name}-%{version}.tar.xz
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: intltool
BuildRequires: pkgconfig
%if !0%{?is_opensuse}
BuildRequires: translation-update-upstream
%endif
BuildRequires: update-desktop-files
BuildRequires: polkit-devel
BuildRequires: yelp-tools
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gdk-x11-3.0)
BuildRequires: pkgconfig(giomm-2.4) >= 2.46
BuildRequires: pkgconfig(glib-2.0) >= 2.55.0
BuildRequires: pkgconfig(glibmm-2.4) >= 2.46
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0
BuildRequires: pkgconfig(gtkmm-3.0) >= 3.3.18
BuildRequires: pkgconfig(libgtop-2.0) >= 2.28.2
BuildRequires: pkgconfig(libgtop-2.0) >= 2.37.2
BuildRequires: pkgconfig(librsvg-2.0) >= 2.35
BuildRequires: pkgconfig(libsystemd) >= 44
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxml-2.0) >= 2.0
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires
%if !0%{?is_opensuse}
BuildRequires: translation-update-upstream
%endif
%description
GNOME-system-monitor is a process and system monitor for the GNOME
@ -62,46 +53,32 @@ processor time, memory, and disk space are being used.
%lang_package
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%autosetup
%if !0%{?is_opensuse}
translation-update-upstream
%endif
%build
%configure \
--enable-systemd
make %{?_smp_mflags} V=1
--enable-systemd \
%{nil}
%make_build
%install
%make_install
echo DocPath=gnome-system-monitor >> %{buildroot}/%{_datadir}/applications/gnome-system-monitor.desktop
%suse_update_desktop_file %{name}
%suse_update_desktop_file %{name}-kde
%find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot}/%{_prefix}
%post
%desktop_database_post
%glib2_gsettings_schema_post
%postun
%desktop_database_postun
%glib2_gsettings_schema_postun
%files
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
%license COPYING
%doc AUTHORS ChangeLog NEWS README
%doc %{_datadir}/help/C/%{name}/
%{_bindir}/gnome-system-monitor
%dir %{_datadir}/appdata
%{_datadir}/appdata/gnome-system-monitor.appdata.xml
%{_datadir}/applications/gnome-system-monitor.desktop
%{_datadir}/applications/gnome-system-monitor-kde.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.gschema.xml
%{_datadir}/metainfo/gnome-system-monitor.appdata.xml
%dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions
%{_datadir}/polkit-1/actions/org.gnome.gnome-system-monitor.policy
@ -112,6 +89,5 @@ echo DocPath=gnome-system-monitor >> %{buildroot}/%{_datadir}/applications/gnome
%{_datadir}/%{name}/gsm.gresource
%files lang -f %{name}.lang
%defattr(-,root,root)
%changelog

View File

@ -1,26 +0,0 @@
diff -urp gnome-system-monitor-3.20.1.orig/data/interface.ui gnome-system-monitor-3.20.1/data/interface.ui
--- gnome-system-monitor-3.20.1.orig/data/interface.ui 2016-02-03 11:11:26.000000000 -0600
+++ gnome-system-monitor-3.20.1/data/interface.ui 2017-02-13 10:57:00.815968998 -0600
@@ -167,6 +167,13 @@
</packing>
</child>
<child>
+ <object class="GtkScrolledWindow" id="res_scrolled">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">none</property>
+ <child>
<object class="GtkBox" id="res_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -466,6 +473,8 @@
</packing>
</child>
</object>
+ </child>
+ </object>
<packing>
<property name="name">resources</property>
<property name="title" translatable="yes">Resources</property>

View File

@ -1,43 +0,0 @@
From 9224515cd6b19ba2dc59afe14684749b4dbf0349 Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Fri, 27 Oct 2017 19:11:33 +0800
Subject: [PATCH] Fix inaccurate %CPU values in the Processes table
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Multi-core machines were displaying inaccurate %CPU values due to a
loss of precision from performing integer division before multiplication.
This changes the order of operations so that no precision is lost, and
now all machines will display process %CPU values to within 1% accuracy.
https://bugzilla.gnome.org/show_bug.cgi?id=788922
Signed-off-by: Benoît Dejean <bdejean@gmail.com>
---
src/proctable.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/proctable.cpp b/src/proctable.cpp
index e41d6d08..c37a48b2 100644
--- a/src/proctable.cpp
+++ b/src/proctable.cpp
@@ -917,11 +917,13 @@ update_info (GsmApplication *app, ProcInfo *info)
guint64 difference = proctime.rtime - info->cpu_time;
if (difference > 0)
info->status = GLIBTOP_PROCESS_RUNNING;
- info->pcpu = difference * 100 / app->cpu_total_time;
- info->pcpu = MIN(info->pcpu, 100);
+ guint cpu_scale = 100;
if (not app->config.solaris_mode)
- info->pcpu *= app->config.num_cpus;
+ cpu_scale *= app->config.num_cpus;
+
+ info->pcpu = difference * cpu_scale / app->cpu_total_time;
+ info->pcpu = MIN(info->pcpu, cpu_scale);
app->processes.cpu_times[info->pid] = info->cpu_time = proctime.rtime;
info->nice = procuid.nice;
--
2.15.0