Commit f1f922f4 authored by Robert Roth's avatar Robert Roth

Merge branch 'master' into wip/diskio

parents 60a787b4 be9c2366
......@@ -8,36 +8,36 @@
msgid ""
msgstr ""
"Project-Id-Version: gnome-system-monitor\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-23 23:01+0100\n"
"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\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-06-15 09:10+0000\n"
"PO-Revision-Date: 2017-05-26 23:17+0100\n"
"Last-Translator: Isak Östlund <translate@catnip.nu>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.11\n"
"X-Generator: Poedit 1.6.10\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 "Systemövervakare"
#: ../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 "Visa aktuella processer och övervaka systemtillståndet"
#: ../gnome-system-monitor.desktop.in.in.h:3
msgid ""
"Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;"
"Manager;"
"Manager;Activity;"
msgstr ""
"Övervakning;System;Process;CPU;Processor;Minne;Nätverk;Historik;Användning;"
"Prestanda;Uppgift;Hanterare;"
"Prestanda;Uppgift;Hanterare;Aktivitet;"
#: ../gnome-system-monitor-kde.desktop.in.in.h:1
#: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:299
......@@ -134,12 +134,12 @@ msgstr "Processorhistorik"
msgid "Memory and Swap History"
msgstr "Historik över användning av minne och växlingsutrymme"
#: ../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:336
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 "Växlingsutrymme"
......@@ -147,7 +147,7 @@ msgstr "Växlingsutrymme"
msgid "Network History"
msgstr "Nätverkshistorik"
#: ../data/interface.ui.h:10 ../src/interface.cpp:298
#: ../data/interface.ui.h:10 ../src/interface.cpp:302
msgid "Receiving"
msgstr "Mottaget"
......@@ -155,7 +155,7 @@ msgstr "Mottaget"
msgid "Total Received"
msgstr "Totalt mottaget"
#: ../data/interface.ui.h:12 ../src/interface.cpp:312
#: ../data/interface.ui.h:12 ../src/interface.cpp:317
msgid "Sending"
msgstr "Sänt"
......@@ -390,7 +390,8 @@ msgstr "Enhet"
msgid "Directory"
msgstr "Katalog"
#: ../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 "Typ"
......@@ -410,96 +411,96 @@ msgstr "Tillgängligt"
msgid "Used"
msgstr "Använt"
#. Translators: color picker title, %s is CPU, Memory, Swap, Receiving, Sending
#: ../src/interface.cpp:185
#, c-format
msgid "Pick a Color for “%s”"
msgstr "Välj en färg för ”%s”"
#: ../src/interface.cpp:219 ../src/procproperties.cpp:78
msgid "CPU"
msgstr "Processor"
#: ../src/interface.cpp:221
#, c-format
msgid "CPU%d"
msgstr "Processor%d"
#: ../src/interface.cpp:374
msgid "translator-credits"
msgstr ""
"Daniel Nylander <po@danielnylander.se>\n"
"Christian Rose\n"
"\n"
"Skicka synpunkter på översättningen till\n"
"<tp-sv@listor.tp-sv.se>."
#. 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 "Idag %H∶%M"
#: ../src/e_date.c:172
#: ../src/legacy/e_date.c:172
msgid "Yesterday %l∶%M %p"
msgstr "Igå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 "Procentandel full för pajfärgsväljare"
#: ../src/gsm_color_button.c:150
#: ../src/legacy/gsm_color_button.c:150
msgid "Title"
msgstr "Titel"
#: ../src/gsm_color_button.c:151
#: ../src/legacy/gsm_color_button.c:151
msgid "The title of the color selection dialog"
msgstr "Titeln på färgväljardialogen"
#: ../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 "Välj en färg"
#: ../src/gsm_color_button.c:158
#: ../src/legacy/gsm_color_button.c:158
msgid "Current Color"
msgstr "Aktuell färg"
#: ../src/gsm_color_button.c:159
#: ../src/legacy/gsm_color_button.c:159
msgid "The selected color"
msgstr "Den valda färgen"
#: ../src/gsm_color_button.c:166
#: ../src/legacy/gsm_color_button.c:166
msgid "Type of color picker"
msgstr "Typ av färgväljare"
#: ../src/gsm_color_button.c:437
#: ../src/legacy/gsm_color_button.c:437
msgid "Received invalid color data\n"
msgstr "Tog emot ogiltigt färgdata\n"
#: ../src/gsm_color_button.c:538
#: ../src/legacy/gsm_color_button.c:538
msgid "Click to set graph colors"
msgstr "Klicka för att ange diagramfärger"
#. Translators: color picker title, %s is CPU, Memory, Swap, Receiving, Sending
#: ../src/interface.cpp:185
#, c-format
msgid "Pick a Color for “%s”"
msgstr "Välj en färg för ”%s”"
#: ../src/interface.cpp:218 ../src/procproperties.cpp:78
msgid "CPU"
msgstr "Processor"
#: ../src/interface.cpp:220
#, c-format
msgid "CPU%d"
msgstr "Processor%d"
#: ../src/interface.cpp:369
msgid "translator-credits"
msgstr ""
"Daniel Nylander <po@danielnylander.se>\n"
"Christian Rose\n"
"\n"
"Skicka synpunkter på översättningen till\n"
"<tp-sv@listor.tp-sv.se>."
#: ../src/load-graph.cpp:157
#, c-format
msgid "%u second"
......@@ -531,15 +532,15 @@ msgid_plural "%d matching open files"
msgstr[0] "%d matchande öppen fil"
msgstr[1] "%d matchande öppna filer"
#: ../src/lsof.cpp:247
#: ../src/lsof.cpp:245
msgid "Process"
msgstr "Process"
#: ../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 "Filnamn"
......@@ -565,7 +566,7 @@ msgstr "Flaggor"
#. xgettext: virtual memory offset
#: ../src/memmaps.cpp:316
msgid "VM Offset"
msgstr "VM-offset"
msgstr "VM-avstånd"
#. xgettext: memory that has not been modified since
#. it has been allocated
......@@ -577,7 +578,7 @@ msgstr "Privat rent"
#. has been allocated
#: ../src/memmaps.cpp:322
msgid "Private dirty"
msgstr "Privat fult"
msgstr "Privat smutsigt"
#. xgettext: shared memory that has not been modified
#. since it has been allocated
......@@ -589,7 +590,7 @@ msgstr "Delat rent"
#. since it has been allocated
#: ../src/memmaps.cpp:328
msgid "Shared dirty"
msgstr "Delat fult"
msgstr "Delat smutsigt"
#: ../src/memmaps.cpp:330
msgid "Inode"
......@@ -631,15 +632,15 @@ msgstr "okänd typ"
#. 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 öppnats av processen ”%s” (PID %u):"
......@@ -1188,72 +1189,72 @@ msgstr ""
msgid "N/A"
msgstr "Inte tillgänglig"
#: ../src/procproperties.cpp:67 ../src/proctable.cpp:325
#: ../src/procproperties.cpp:67 ../src/proctable.cpp:321
msgid "Process Name"
msgstr "Processnamn"
#: ../src/procproperties.cpp:68 ../src/proctable.cpp:326
#: ../src/procproperties.cpp:68 ../src/proctable.cpp:322
msgid "User"
msgstr "Användare"
#: ../src/procproperties.cpp:69 ../src/proctable.cpp:327
#: ../src/procproperties.cpp:69 ../src/proctable.cpp:323
msgid "Status"
msgstr "Status"
#: ../src/procproperties.cpp:71 ../src/proctable.cpp:328
#: ../src/procproperties.cpp:71 ../src/proctable.cpp:324
msgid "Virtual Memory"
msgstr "Virtuellt minne"
#: ../src/procproperties.cpp:72 ../src/proctable.cpp:329
#: ../src/procproperties.cpp:72 ../src/proctable.cpp:325
msgid "Resident Memory"
msgstr "Beständigt minne"
#: ../src/procproperties.cpp:73 ../src/proctable.cpp:330
#: ../src/procproperties.cpp:73 ../src/proctable.cpp:326
msgid "Writable Memory"
msgstr "Skrivbart minne"
#: ../src/procproperties.cpp:74 ../src/proctable.cpp:331
#: ../src/procproperties.cpp:74 ../src/proctable.cpp:327
msgid "Shared Memory"
msgstr "Delat minne"
#: ../src/procproperties.cpp:76 ../src/proctable.cpp:332
#: ../src/procproperties.cpp:76 ../src/proctable.cpp:328
msgid "X Server Memory"
msgstr "X-serverminne"
#: ../src/procproperties.cpp:79 ../src/proctable.cpp:334
#: ../src/procproperties.cpp:79 ../src/proctable.cpp:330
msgid "CPU Time"
msgstr "Processortid"
#: ../src/procproperties.cpp:80 ../src/proctable.cpp:335
#: ../src/procproperties.cpp:80 ../src/proctable.cpp:331
msgid "Started"
msgstr "Startad"
#: ../src/procproperties.cpp:81 ../src/proctable.cpp:336
#: ../src/procproperties.cpp:81 ../src/proctable.cpp:332
msgid "Nice"
msgstr "Processprioritet"
#: ../src/procproperties.cpp:82 ../src/proctable.cpp:350
#: ../src/procproperties.cpp:82 ../src/proctable.cpp:346
msgid "Priority"
msgstr "Prioritet"
#: ../src/procproperties.cpp:83 ../src/proctable.cpp:337
#: ../src/procproperties.cpp:83 ../src/proctable.cpp:333
msgid "ID"
msgstr "ID"
#: ../src/procproperties.cpp:84 ../src/proctable.cpp:338
#: ../src/procproperties.cpp:84 ../src/proctable.cpp:334
msgid "Security Context"
msgstr "Säkerhetskontext"
#: ../src/procproperties.cpp:85 ../src/proctable.cpp:339
#: ../src/procproperties.cpp:85 ../src/proctable.cpp:335
msgid "Command Line"
msgstr "Kommandorad"
#. 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:338
msgid "Waiting Channel"
msgstr "Väntande kanal"
#: ../src/procproperties.cpp:87 ../src/proctable.cpp:343
#: ../src/procproperties.cpp:87 ../src/proctable.cpp:339
msgid "Control Group"
msgstr "Styrgrupp"
......@@ -1262,26 +1263,26 @@ msgstr "Styrgrupp"
msgid "%s (PID %u)"
msgstr "%s (PID %u)"
#: ../src/proctable.cpp:333
#: ../src/proctable.cpp:329
#, no-c-format
msgid "% CPU"
msgstr "Processor %"
#: ../src/proctable.cpp:344
#: ../src/proctable.cpp:340
msgid "Unit"
msgstr "Enhet"
#: ../src/proctable.cpp:345
#: ../src/proctable.cpp:341
msgid "Session"
msgstr "Session"
#. 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:344
msgid "Seat"
msgstr "Seat"
#: ../src/proctable.cpp:349
#: ../src/proctable.cpp:345
msgid "Owner"
msgstr "Ägare"
......
......@@ -172,7 +172,7 @@ public:
std::lock_guard<std::mutex> lg(data_lock);
return data.erase(it);
}
ProcInfo* add(pid_t pid) { return &data.emplace(pid, pid).first->second; }
ProcInfo* add(pid_t pid) { return &data.emplace(std::piecewise_construct, std::forward_as_tuple(pid), std::forward_as_tuple(pid)).first->second; }
void clear() { return data.clear(); }
ProcInfo* find(pid_t pid);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment